Merge lp:~dobey/unity-scope-click/missing-reviews into lp:unity-scope-click

[dobey]

Refactor showing review widget to only do work if app is installed.
Add qualifier to only show review widget if app has download_url from store.
Don't check review.rating again to see if review is being submitted or not.

This branch should fix it so that the review entry box is always shown for installed apps in the store scope, and is not shown for side-loaded apps which are not in the store, in the apps scope. Unfortunately, this is all done inside the preview machinery, and very tightly coupled to needing the Qt bridge, so there are no new tests added in this branch, and it has to be tested manually.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:412
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/702/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/106/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/102/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/702/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dobey/unity-scope-click/missing-reviews]

413. By dobey on 2016-02-05

Don't use the struct initializer here.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:413
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/703/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/107/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/103/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/703/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dobey/unity-scope-click/missing-reviews]

414. By dobey on 2016-02-08

Use a member variable to cache the details instead.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:414
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/704/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/104/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/704/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

LGTM.

review: Approve

=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2016-01-27 16:50:50 +0000
+++ libclickscope/click/preview.cpp	2016-02-08 16:24:44 +0000
@@ -902,37 +902,36 @@
     }
     getApplicationUri(manifest, [this, reply, manifest, app_name, &review, userid](const std::string& uri) {
             populateDetails([this, reply, uri, manifest, app_name](const PackageDetails &details){
+                cachedDetails = details;
                 store_department(details);
                 pushPackagePreviewWidgets(cachedWidgets, details, createButtons(uri, manifest));
             },
             [this, reply, &review, manifest, userid](const ReviewList& reviewlist,
-                          click::Reviews::Error error) {
+                                                     click::Reviews::Error error) {
                 auto reviews = bring_to_front(reviewlist, userid);
-                scopes::PreviewWidgetList review_input;
-                bool has_reviewed = reviews.size() > 0 && reviews.front().reviewer_username == userid;
+                if (manifest.removable && !cachedDetails.download_url.empty()) {
+                    scopes::PreviewWidgetList review_input;
+                    bool has_reviewed = reviews.size() > 0 && reviews.front().reviewer_username == userid;
 
-                if (has_reviewed) {
-                    auto existing_review = reviews.front();
-                    reviews.pop_front();
-                    qDebug() << "Review for current user already exists, review id:" << existing_review.id;
-                    if (manifest.removable) {
+                    if (has_reviewed) {
+                        auto existing_review = reviews.front();
+                        reviews.pop_front();
+                        qDebug() << "Review for current user already exists, review id:" << existing_review.id;
                         scopes::PreviewWidget rating(std::to_string(existing_review.id), "rating-edit"); // pass review id via widget id
                         rating.add_attribute_value("required", scopes::Variant("rating"));
                         rating.add_attribute_value("review", scopes::Variant(existing_review.review_text));
                         rating.add_attribute_value("rating", scopes::Variant(existing_review.rating));
                         rating.add_attribute_value("author", scopes::Variant(existing_review.reviewer_name));
                         review_input.push_back(rating);
-                    }
-                } else {
-                    if (review.rating == 0 && manifest.removable) {
+                    } else {
                         scopes::PreviewWidget rating("rating", "rating-input");
                         rating.add_attribute_value("required", scopes::Variant("rating"));
                         review_input.push_back(rating);
                     }
+                    cachedWidgets.push(review_input);
+                    cachedWidgets.layout.appendToColumn(cachedWidgets.layout.singleColumn.column1, review_input);
+                    cachedWidgets.layout.appendToColumn(cachedWidgets.layout.twoColumns.column1, review_input);
                 }
-                cachedWidgets.push(review_input);
-                cachedWidgets.layout.appendToColumn(cachedWidgets.layout.singleColumn.column1, review_input);
-                cachedWidgets.layout.appendToColumn(cachedWidgets.layout.twoColumns.column1, review_input);
 
                 if (error == click::Reviews::Error::NoError) {
                     auto const revs = reviewsWidgets(reviews);

=== modified file 'libclickscope/click/preview.h'
--- libclickscope/click/preview.h	2016-01-28 12:30:31 +0000
+++ libclickscope/click/preview.h	2016-02-08 16:24:44 +0000
@@ -265,6 +265,7 @@
 private:
     scopes::ActionMetadata metadata;
     CachedPreviewWidgets cachedWidgets;
+    PackageDetails cachedDetails;
 };
 
 class InstalledScopePreview : public PreviewStrategy