Merge lp:~diegosarmentero/pay-ui/error-page into lp:pay-ui

[Diego Sarmentero]

- Show an error dialog if the server fails to reply on loading

[lp:~diegosarmentero/pay-ui/error-page]

9. By Diego Sarmentero on 2014-07-10

improves in button alignment

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:8
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/23/rebuild

review: Approve (continuous-integration)

[lp:~diegosarmentero/pay-ui/error-page]

10. By Diego Sarmentero on 2014-07-10

show error dialog instead of page

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:9
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/24/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:10
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/22

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/25/rebuild

review: Approve (continuous-integration)

[lp:~diegosarmentero/pay-ui/error-page]

11. By Diego Sarmentero on 2014-07-10

using currentPage instead of baseLoaded

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:11
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/26/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

I think that hideLoading() needs to get pulled out of the if statement.

I think it would perhaps be better if we could instantiate the three(?) error dialogs as different objects instead of having the function. That way their strings end up in the same object together and we don't end up duplicating them in the different functions. I was thinking something like "PopupUtils.open(AuthErrorDialog)"

review: Needs Fixing

[lp:~diegosarmentero/pay-ui/error-page]

12. By Diego Sarmentero on 2014-07-14

Using different components popups for errors as requested

[Ted Gould (ted)]

Cool, love the Open property!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/267
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/24

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/27/rebuild

review: Approve (continuous-integration)

=== modified file 'app/payui.qml'
--- app/payui.qml	2014-07-02 20:36:40 +0000
+++ app/payui.qml	2014-07-14 19:55:00 +0000
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
@@ -35,8 +51,6 @@
 
     property bool loading: true
     property bool purchasing: false
-    property string errorTitle: ""
-    property string errorMessage: ""
 
 
     AccountServiceModel {
@@ -72,9 +86,7 @@
         onBuyItemFailed: {
             mainView.purchasing = false;
             hideLoading();
-            var title = i18n.tr("Purchase failed");
-            var message = i18n.tr("The purchase couldn't be completed.");
-            mainView.showErrorDialog(title, message);
+            purchaseErrorDialog.open = true;
         }
 
         onBuyItemSucceeded: {
@@ -91,20 +103,24 @@
 
         onError: {
             hideLoading();
-            var title = i18n.tr("Error contacting the server");
-            var message = i18n.tr("Do you want to try again?");
-            mainView.showErrorDialog(title, message);
+            serverErrorDialog.open = true;
         }
 
         onAuthenticationError: {
-            hideLoading();
-            pageStack.currentPage.showWrongPassword();
+            if (pageStack.currentPage) {
+                mainView.hideLoading();
+                pageStack.currentPage.showWrongPassword();
+            } else {
+                mainView.state = "no-credentials";
+                pageStack.push(noCredentials);
+                mainView.hideLoading();
+            }
         }
 
         onCredentialsNotFound: {
             mainView.state = "no-credentials";
             pageStack.push(noCredentials);
-            hideLoading();
+            mainView.hideLoading();
         }
     }
 
@@ -117,10 +133,49 @@
         mainView.loading = false;
     }
 
-    function showErrorDialog(title, message) {
-        mainView.errorTitle = title;
-        mainView.errorMessage = message;
-        PopupUtils.open(errorDialogContainer);
+    ErrorDialog {
+        id: purchaseErrorDialog
+        title: i18n.tr("Purchase failed")
+        message: i18n.tr("The purchase couldn't be completed.")
+
+        onRetry: {
+            mainView.showLoading();
+            purchase.checkCredentials();
+        }
+
+        onClose: {
+            purchase.quitCancel();
+        }
+    }
+
+    ErrorDialog {
+        id: serverErrorDialog
+        title: i18n.tr("Error contacting the server")
+        message: i18n.tr("Do you want to try again?")
+
+        onRetry: {
+            mainView.showLoading();
+            purchase.checkCredentials();
+        }
+
+        onClose: {
+            purchase.quitCancel();
+        }
+    }
+
+    ErrorDialog {
+        id: creditCardErrorDialog
+        title: i18n.tr("Adding Credit Card failed")
+        message: i18n.tr("Do you want to try again?")
+
+        onRetry: {
+            mainView.showLoading();
+            purchase.checkCredentials();
+        }
+
+        onClose: {
+            purchase.quitCancel();
+        }
     }
 
     Component {
@@ -135,7 +190,7 @@
 
                  onRunningChanged: {
                      if(!running) {
-                         PopupUtils.close(loadingDialog);                         
+                         PopupUtils.close(loadingDialog);
                      }
                  }
              }
@@ -151,33 +206,6 @@
          }
     }
 
-    Component {
-         id: errorDialogContainer
-         Dialog {
-             id: errorDialog
-             title: mainView.errorTitle
-             text: mainView.errorMessage
-
-             Button {
-                 text: i18n.tr("Retry")
-                 color: UbuntuColors.orange
-                 onClicked: {
-                     showLoading();
-                     purchase.checkCredentials();
-                     PopupUtils.close(errorDialog);
-                 }
-             }
-             Button {
-                 text: i18n.tr("Exit")
-                 color: UbuntuColors.coolGrey
-                 onClicked: {
-                     PopupUtils.close(errorDialog);
-                     purchase.quitCancel();
-                 }
-             }
-         }
-    }
-
     PageStack {
         id: pageStack
         Component.onCompleted: {
@@ -236,13 +264,9 @@
             onPurchaseCanceled: {
                 hideLoading();
                 if (mainView.state == "add-payment") {
-                    var title = i18n.tr("Adding Credit Card failed");
-                    var message = i18n.tr("Do you want to try again?");
-                    mainView.showErrorDialog(title, message);
+                    creditCardErrorDialog.open = true;
                 } else {
-                    var title = i18n.tr("Purchase failed");
-                    var message = i18n.tr("The purchase couldn't be completed.");
-                    mainView.showErrorDialog(title, message);
+                    purchaseErrorDialog.open = true;
                 }
             }
             onPurchaseSucceeded: {

=== added file 'app/ui/ErrorDialog.qml'
--- app/ui/ErrorDialog.qml	1970-01-01 00:00:00 +0000
+++ app/ui/ErrorDialog.qml	2014-07-14 19:55:00 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+Item {
+    id: dialogErrorItem
+    property string title: ""
+    property string message: ""
+    property bool open: false
+
+    signal retry
+    signal close
+
+    onOpenChanged: {
+        if (dialogErrorItem.open) {
+            PopupUtils.open(errorDialogContainer);
+        }
+    }
+
+    Component {
+         id: errorDialogContainer
+
+         Dialog {
+             id: errorDialog
+             title: dialogErrorItem.title
+             text: dialogErrorItem.message
+
+             Button {
+                 text: i18n.tr("Retry")
+                 color: UbuntuColors.orange
+                 onClicked: {
+                     dialogErrorItem.retry();
+                     dialogErrorItem.open = false;
+                     PopupUtils.close(errorDialog);
+                 }
+             }
+             Button {
+                 text: i18n.tr("Close")
+                 color: UbuntuColors.coolGrey
+                 onClicked: {
+                     dialogErrorItem.close();
+                     dialogErrorItem.open = false;
+                     PopupUtils.close(errorDialog);
+                 }
+             }
+         }
+    }
+
+}

=== removed file 'app/ui/SuccessPage.qml'
--- app/ui/SuccessPage.qml	2014-04-16 18:29:09 +0000
+++ app/ui/SuccessPage.qml	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-/*
- * Copyright 2013-2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-
-Page {
-    id: pageSuccess
-    objectName: "pageSuccess"
-
-    property alias successMessage: successLabel
-
-    Label {
-        id: successLabel
-        text: "Success"
-        fontSize: "x-large"
-        anchors.centerIn: parent
-    }
-}

=== modified file 'manifest.json'
--- manifest.json	2014-07-04 14:24:22 +0000
+++ manifest.json	2014-07-14 19:55:00 +0000
@@ -10,6 +10,6 @@
             "desktop": "payui.desktop"
         }
     },
-    "version": "0.2.7",
+    "version": "0.2.8",
     "maintainer": "Sarmentero Diego <[e-mail]>"
 }
\ No newline at end of file