Merge lp:~aacid/unity8/edit_reviews into lp:unity8

[Albert Astals Cid]

Implement "rating-edit" preview widget

 * Are there any related MPs required for this MP to build/function as expected?
Not required but should probably land with https://code.launchpad.net/~stolowski/unity-scope-click/edit-review and the rest of unlanded stuff in the bug

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
Not yet, Will pass it around once we have a silo so it's easier to show live in a phone

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1759
http://jenkins.qa.ubuntu.com/job/unity8-ci/5692/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2690/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/857/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/857/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/858/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2688/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5692/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/edit_reviews]

1760. By Albert Astals Cid on 2015-05-11

whitespaaaaaaaaaaaace

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1760
http://jenkins.qa.ubuntu.com/job/unity8-ci/5698/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2699
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/864
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/863
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/864
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2697
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2697/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20349

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5698/rebuild

review: Needs Fixing (continuous-integration)

[Paweł Stołowski (stolowski)]

Works as expected with corresponding unity-scope-click branch. Thanks!

review: Approve

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
Ap
 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

=== modified file 'qml/Dash/Previews/PreviewRatingDisplay.qml'
--- qml/Dash/Previews/PreviewRatingDisplay.qml	2014-08-13 10:29:21 +0000
+++ qml/Dash/Previews/PreviewRatingDisplay.qml	2015-05-11 07:33:57 +0000
@@ -49,53 +49,18 @@
             objectName: "reviewsRepeater"
             model: root.widgetData["reviews"]
 
-            delegate: Column {
-                id: reviewItem
+            delegate: PreviewRatingSingleDisplay {
                 objectName: "reviewItem" + index
-                anchors { left: parent.left; right: parent.right;}
-                spacing: units.gu(1)
-
-                Rating {
-                    id: rating
-                    objectName: "rating"
-                    size: 5
-                    value: modelData["rating"] || -1
-                    visible: value >= 0
-                    interactive: false
-
-                    property var urlIconEmpty: widgetData["rating-icon-empty"]
-                    property var urlIconFull: widgetData["rating-icon-full"]
-                    property var urlIconHalf: widgetData["rating-icon-half"]
-                }
-
-                Label {
-                    id: authorLabel
-                    objectName: "authorLabel"
-                    anchors { left: parent.left; right: parent.right }
-                    color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
-                    opacity: .8
-                    text: modelData["author"] || ""
-                    visible: text !== ""
-                    wrapMode: Text.Wrap
-                }
-
-                Label {
-                    id: reviewLabel
-                    objectName: "reviewLabel"
-                    anchors { left: parent.left; right: parent.right }
-                    color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
-                    opacity: .8
-                    text: modelData["review"] || ""
-                    visible: text !== ""
-                    wrapMode: Text.Wrap
-                }
-
-                Item {
-                    id: spacing
-                    anchors { left: parent.left; right: parent.right }
-                    height: units.gu(2)
-                    visible: rating.visible || authorLabel.visible || reviewLabel.visible
-                }
+
+                anchors { left: parent.left; right: parent.right; }
+
+                rating: modelData["rating"] || -1
+                author: modelData["author"] || ""
+                review: modelData["review"] || ""
+                urlIconEmpty: widgetData["rating-icon-empty"]
+                urlIconFull: widgetData["rating-icon-full"]
+                urlIconHalf: widgetData["rating-icon-half"]
+                labelColor: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
             }
         }
     }

=== added file 'qml/Dash/Previews/PreviewRatingEdit.qml'
--- qml/Dash/Previews/PreviewRatingEdit.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Previews/PreviewRatingEdit.qml	2015-05-11 07:33:57 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2015 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.4
+import Ubuntu.Components 0.1
+import "../../Components"
+
+/*! \brief Preview widget for editable rating.
+
+    Shows a single display rating that can be switched by the user to edit mode
+    and then behaves as a rating display widget
+
+    The display part uses widgetData["author"], widgetData["review"] and widgetData["rating"].
+
+    The edit part uses the same fields as the "rating-input" widget
+*/
+
+PreviewWidget {
+    id: root
+    implicitHeight: display.visible ? display.implicitHeight : input.implicitHeight
+
+    Button {
+        id: editIcon
+        objectName: "editButton"
+
+        iconName: "edit"
+        width: height
+        anchors.right: parent.right
+        visible: display.visible
+        onClicked: display.visible = false
+    }
+
+    PreviewRatingSingleDisplay {
+        id: display
+        objectName: "display"
+
+        anchors.left: parent.left
+        anchors.right: editIcon.left
+
+        rating: widgetData["rating"] || -1
+        author: widgetData["author"] || ""
+        review: widgetData["review"] || ""
+        urlIconEmpty: widgetData["rating-icon-empty"]
+        urlIconFull: widgetData["rating-icon-full"]
+        urlIconHalf: widgetData["rating-icon-half"]
+        labelColor: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+    }
+
+    PreviewRatingInput {
+        id: input
+        objectName: "input"
+
+        visible: !display.visible
+        width: parent.width
+
+        widgetId: root.widgetId
+        widgetData: root.widgetData
+        isCurrentPreview: root.isCurrentPreview
+        scopeStyle: root.scopeStyle
+
+        ratingValue: widgetData["rating"]
+        reviewText: widgetData["review"]
+
+        onTriggered: root.triggered(widgetId, actionId, data);
+    }
+
+}

=== modified file 'qml/Dash/Previews/PreviewRatingInput.qml'
--- qml/Dash/Previews/PreviewRatingInput.qml	2014-08-13 10:29:21 +0000
+++ qml/Dash/Previews/PreviewRatingInput.qml	2015-05-11 07:33:57 +0000
@@ -48,6 +48,9 @@
             }
     }
 
+    property alias ratingValue: rating.value
+    property alias reviewText: reviewTextArea.text
+
     function submit() {
         // checks rating-input requirements
         if (((widgetData["required"] === "both" ||

=== added file 'qml/Dash/Previews/PreviewRatingSingleDisplay.qml'
--- qml/Dash/Previews/PreviewRatingSingleDisplay.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Previews/PreviewRatingSingleDisplay.qml	2015-05-11 07:33:57 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2015 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.4
+import Ubuntu.Components 0.1
+import "../../Components"
+
+Column {
+    id: reviewItem
+    spacing: units.gu(1)
+
+    property alias rating: ratingItem.value
+    property alias author: authorLabel.text
+    property alias review: reviewLabel.text
+    property alias urlIconEmpty: ratingItem.urlIconEmpty
+    property alias urlIconFull: ratingItem.urlIconFull
+    property alias urlIconHalf: ratingItem.urlIconHalf
+    property alias labelColor: authorLabel.color
+
+    Rating {
+        id: ratingItem
+        objectName: "rating"
+        size: 5
+        visible: value >= 0
+        interactive: false
+
+        property var urlIconEmpty
+        property var urlIconFull
+        property var urlIconHalf
+    }
+
+    Label {
+        id: authorLabel
+        objectName: "authorLabel"
+        anchors { left: parent.left; right: parent.right }
+        opacity: .8
+        visible: text !== ""
+        wrapMode: Text.Wrap
+    }
+
+    Label {
+        id: reviewLabel
+        objectName: "reviewLabel"
+        anchors { left: parent.left; right: parent.right }
+        color: authorLabel.color
+        opacity: .8
+        visible: text !== ""
+        wrapMode: Text.Wrap
+    }
+
+    Item {
+        id: spacing
+        anchors { left: parent.left; right: parent.right }
+        height: units.gu(2)
+        visible: rating.visible || authorLabel.visible || reviewLabel.visible
+    }
+}
\ No newline at end of file

=== modified file 'qml/Dash/Previews/PreviewWidgetFactory.qml'
--- qml/Dash/Previews/PreviewWidgetFactory.qml	2014-08-26 10:54:49 +0000
+++ qml/Dash/Previews/PreviewWidgetFactory.qml	2015-05-11 07:33:57 +0000
@@ -57,6 +57,7 @@
             case "progress": return "PreviewProgress.qml";
             case "payments": return "PreviewPayments.qml";
             case "rating-input": return "PreviewRatingInput.qml";
+            case "rating-edit": return "PreviewRatingEdit.qml";
             case "reviews": return "PreviewRatingDisplay.qml";
             case "table": return "PreviewTable.qml";
             case "text": return "PreviewTextSummary.qml";

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2015-03-18 10:18:52 +0000
+++ tests/qmltests/CMakeLists.txt	2015-05-11 07:33:57 +0000
@@ -49,6 +49,7 @@
 add_qml_test(Dash/Previews PreviewPayments)
 add_qml_test(Dash/Previews PreviewProgress)
 add_qml_test(Dash/Previews PreviewRatingDisplay)
+add_qml_test(Dash/Previews PreviewRatingEdit)
 add_qml_test(Dash/Previews PreviewRatingInput)
 add_qml_test(Dash/Previews PreviewTable)
 add_qml_test(Dash/Previews PreviewTextSummary)

=== added file 'tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml	2015-05-11 07:33:57 +0000
@@ -0,0 +1,80 @@
+/*
+ * 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 QtTest 1.0
+import Ubuntu.Components 0.1
+import "../../../../qml/Dash/Previews"
+import Unity.Test 0.1 as UT
+
+Rectangle {
+    id: root
+    width: units.gu(40)
+    height: units.gu(80)
+    color: Theme.palette.selected.background
+
+    property var widgetData0: { "visible": "both", "required": "both", author: "Some dude", rating: 4.5, review: "Very cool app" }
+
+    PreviewRatingEdit {
+        id: previewRatingEdit
+        anchors.left: parent.left
+        anchors.right: parent.right
+        widgetData: widgetData0
+        widgetId: "previewRatingInput"
+    }
+
+    SignalSpy {
+        id: spy
+        signalName: "triggered"
+    }
+
+    UT.UnityTestCase {
+        name: "PreviewRatingEditTest"
+        when: windowShown
+
+        function test_switch_and_trigger(data) {
+            spy.target = previewRatingEdit;
+
+            var authorLabel = findChild(previewRatingEdit, "authorLabel");
+            var reviewTextArea = findChild(previewRatingEdit, "reviewTextArea");
+            var inputRating = findChild(findChild(previewRatingEdit, "input"), "rating");
+            verify(authorLabel.visible)
+            verify(!reviewTextArea.visible)
+
+            var editButton = findChild(previewRatingEdit, "editButton");
+            mouseClick(editButton);
+            verify(!authorLabel.visible)
+            verify(reviewTextArea.visible)
+
+            compare(reviewTextArea.text, "Very cool app");
+            compare(inputRating.value, 4.5);
+
+            reviewTextArea.text = "Ho Ho";
+            inputRating.value = 3;
+
+            var submitButton = findChild(previewRatingEdit, "submitButton")
+            mouseClick(submitButton);
+
+            compare(spy.count, 1);
+            var args = spy.signalArguments[0];
+            compare(args[0], previewRatingEdit.widgetId);
+            compare(args[1], "rated");
+            compare(args[2]["rating"], 3);
+            compare(args[2]["review"], "Ho Ho");
+            verify(args[2]["author"] !== undefined); // Just verifying it exists now
+        }
+    }
+}