Merge lp:~stolowski/unity-scopes-shell/fix-1335761 into lp:unity-scopes-shell

[Paweł Stołowski]

Emit showDash() signal if canned query is executed for current scope.

Emit showDash() signal if canned query is executed for current scope. This hides the preview if displayed (the solution was consulted with tsdgeos and I've tested it with a modified version of mediascanner scope that reproduces the bug linked with this branch).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:209
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/330/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/72/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/72

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/330/rebuild

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

9 + } else {
10 + Q_EMIT showDash();
11 + }

Sorry! The smallest of fixes: The last curly bracket is not indented correctly. Its picking at my OCD man... :P

review: Needs Fixing

[lp:~stolowski/unity-scopes-shell/fix-1335761]

210. By Paweł Stołowski on 2015-04-24

Updated scope harness for showDash signal when canned query is executed.

[Paweł Stołowski (stolowski)]

> 9 + } else {
> 10 + Q_EMIT showDash();
> 11 + }
>
> Sorry! The smallest of fixes: The last curly bracket is not indented
> correctly. Its picking at my OCD man... :P

Fixed :)

Unfortunately the change you reviewed was a tip of an iceberg; Pete requested that I update scope harness code to reflect this change, so here it some extra stuff to review ;)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:210
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/331/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/73
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/73
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/73/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/73

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/331/rebuild

review: Approve (continuous-integration)

[Pete Woods (pete-woods)]

Thanks for adding the tests :)

review: Approve

[lp:~stolowski/unity-scopes-shell/fix-1335761]

211. By Paweł Stołowski on 2015-04-27

More friendly trigger method.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:211
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/332/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/74
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/74/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/74

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/332/rebuild

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

LGTM

review: Approve

=== modified file 'po/unity-plugin-scopes.pot'
--- po/unity-plugin-scopes.pot	2015-03-04 10:10:56 +0000
+++ po/unity-plugin-scopes.pot	2015-04-27 11:28:49 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 11:02+0100\n"
+"POT-Creation-Date: 2015-04-27 13:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"

=== modified file 'src/Unity/previewstack.cpp'
--- src/Unity/previewstack.cpp	2015-01-30 07:45:25 +0000
+++ src/Unity/previewstack.cpp	2015-04-27 11:28:49 +0000
@@ -84,6 +84,11 @@
     m_userAgent = userAgent;
 }
 
+scopes_ng::Scope* PreviewStack::associatedScope() const
+{
+    return m_associatedScope;
+}
+
 void PreviewStack::loadForResult(scopes::Result::SPtr const& result)
 {
     m_previewedResult = result;

=== modified file 'src/Unity/previewstack.h'
--- src/Unity/previewstack.h	2014-09-23 11:33:38 +0000
+++ src/Unity/previewstack.h	2015-04-27 11:28:49 +0000
@@ -61,6 +61,7 @@
     void setWidgetColumnCount(int columnCount) override;
     int widgetColumnCount() const override;
     void setAssociatedScope(scopes_ng::Scope*, QUuid const&, QString const&);
+    scopes_ng::Scope* associatedScope() const;
 
 private Q_SLOTS:
     void widgetTriggered(QString const&, QString const&, QVariantMap const&);

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2015-03-20 14:44:32 +0000
+++ src/Unity/scope.cpp	2015-04-27 11:28:49 +0000
@@ -298,6 +298,8 @@
         }
         if (scope != this) {
             Q_EMIT gotoScope(scopeId);
+        } else {
+            Q_EMIT showDash();
         }
     } else {
         // create temp dash page

=== modified file 'src/scope-harness/internal/preview-widget-arguments.h'
--- src/scope-harness/internal/preview-widget-arguments.h	2015-01-07 14:22:42 +0000
+++ src/scope-harness/internal/preview-widget-arguments.h	2015-04-27 11:28:49 +0000
@@ -31,6 +31,7 @@
 {
     class PreviewWidgetModelInterface;
     class PreviewModelInterface;
+    class PreviewStackInterface;
 }
 }
 namespace scopeharness
@@ -53,6 +54,8 @@
     std::shared_ptr<view::ResultsView> resultsView;
 
     std::shared_ptr<view::PreviewView> previewView;
+
+    std::shared_ptr<unity::shell::scopes::PreviewStackInterface> previewStack;
 };
 }
 }

=== modified file 'src/scope-harness/preview/preview-widget.cpp'
--- src/scope-harness/preview/preview-widget.cpp	2015-03-10 11:23:01 +0000
+++ src/scope-harness/preview/preview-widget.cpp	2015-04-27 11:28:49 +0000
@@ -20,15 +20,18 @@
 #include <scope-harness/preview/preview-widget.h>
 #include <scope-harness/view/abstract-view.h>
 #include <scope-harness/view/preview-view.h>
+#include <scope-harness/view/results-view.h>
 #include <scope-harness/test-utils.h>
 
 #include <unity/shell/scopes/PreviewModelInterface.h>
 #include <unity/shell/scopes/PreviewWidgetModelInterface.h>
 
 #include <Unity/utils.h>
+#include <Unity/previewstack.h>
 
 #include <QDebug>
 #include <QSignalSpy>
+#include <memory>
 
 using namespace std;
 namespace ng = scopes_ng;
@@ -54,6 +57,8 @@
     weak_ptr<view::ResultsView> m_resultsView;
 
     weak_ptr<view::PreviewView> m_previewView;
+
+    std::shared_ptr<unity::shell::scopes::PreviewStackInterface> m_previewStack;
 };
 
 PreviewWidget::PreviewWidget(const internal::PreviewWidgetArguments& arguments) :
@@ -64,6 +69,7 @@
     p->m_index = arguments.index;
     p->m_resultsView = arguments.resultsView;
     p->m_previewView = arguments.previewView;
+    p->m_previewStack = arguments.previewStack;
 }
 
 
@@ -85,6 +91,7 @@
     p->m_index = other.p->m_index;
     p->m_resultsView = other.p->m_resultsView;
     p->m_previewView = other.p->m_previewView;
+    p->m_previewStack = other.p->m_previewStack;
     return *this;
 }
 
@@ -120,9 +127,40 @@
 
 view::AbstractView::SPtr PreviewWidget::trigger(const string& name, const sc::Variant& v)
 {
+    auto ps = std::dynamic_pointer_cast<ng::PreviewStack>(p->m_previewStack);
+    TestUtils::throwIfNot(bool(ps), "No preview stack");
+    TestUtils::throwIfNot(bool(ps->associatedScope()), "Preview stack has no associated scope");
+    QSignalSpy showDashSpy(ps->associatedScope(), SIGNAL(showDash()));
+
+    QVariant widgetData;
+
+    if (type() == "actions" &&
+            v.which() == sc::Variant::Dict &&
+            v.get_dict()["actions"].which() == sc::Variant::Array)
+    {
+        for (auto el: v.get_dict()["actions"].get_array())
+        {
+            auto d = el.get_dict();
+            if (d["id"].get_string() == name)
+            {
+                widgetData = ng::scopeVariantToQVariant(el);
+                break;
+            }
+        }
+    }
+    else
+    {
+        widgetData = ng::scopeVariantToQVariant(v);
+    }
+
     Q_EMIT p->m_previewModel->triggered(
             QString::fromStdString(id()), QString::fromStdString(name),
-            ng::scopeVariantToQVariant(v).toMap());
+            widgetData.toMap());
+
+    if (!showDashSpy.empty())
+    {
+        return p->m_resultsView.lock();
+    }
 
     TestUtils::throwIfNot(p->m_previewModel->processingAction(), "Should be processing action");
     QSignalSpy spy(p->m_previewModel, SIGNAL(processingActionChanged()));

=== modified file 'src/scope-harness/view/preview-view.cpp'
--- src/scope-harness/view/preview-view.cpp	2015-03-10 11:23:01 +0000
+++ src/scope-harness/view/preview-view.cpp	2015-04-27 11:28:49 +0000
@@ -53,7 +53,7 @@
         {
             previewWidgets.emplace_back(
                     preview::PreviewWidget(internal::PreviewWidgetArguments
-                    { previewWidgetModel, previewWidgetModel->index(row), previewModel, m_resultsView.lock(), previewView}));
+                    { previewWidgetModel, previewWidgetModel->index(row), previewModel, m_resultsView.lock(), previewView, m_previewStack}));
         }
 
         return preview::PreviewWidgetList(internal::PreviewWidgetListArguments{previewWidgets});

=== modified file 'src/scope-harness/view/results-view.h'
--- src/scope-harness/view/results-view.h	2015-03-10 11:23:01 +0000
+++ src/scope-harness/view/results-view.h	2015-04-27 11:28:49 +0000
@@ -23,6 +23,7 @@
 #include <scope-harness/view/preview-view.h>
 #include <scope-harness/results/category.h>
 #include <scope-harness/results/department.h>
+#include <scope-harness/preview/preview-widget.h>
 
 #include <string>
 
@@ -127,6 +128,7 @@
 
 protected:
     friend ScopeHarness;
+    friend preview::PreviewWidget;
 
     void setPreviewView(std::shared_ptr<PreviewView> previewView);
 

=== modified file 'tests/data/mock-scope/mock-scope.cpp'
--- tests/data/mock-scope/mock-scope.cpp	2015-03-04 10:10:56 +0000
+++ tests/data/mock-scope/mock-scope.cpp	2015-04-27 11:28:49 +0000
@@ -136,6 +136,15 @@
             res.set_title("result for: \"" + query_ + "\"");
             reply->push(res);
         }
+        else if (query_ == "query")
+        {
+            CategoryRenderer minimal_rndr(R"({"schema-version": 1, "components": {"title": "title"}})");
+            auto cat = reply->register_category("cat1", "Category 1", "", minimal_rndr);
+            CategorisedResult res(cat);
+            res.set_uri("test:query");
+            res.set_title("result for: \"" + query_ + "\"");
+            reply->push(res);
+        }
         else if (query_ == "expandable-widget")
         {
             CategoryRenderer minimal_rndr(R"({"schema-version": 1, "components": {"title": "title"}})");
@@ -317,6 +326,31 @@
             reply->push(widgets);
             return;
         }
+        else if (result().uri().find("query") != std::string::npos)
+        {
+            PreviewWidget w1("actions", "actions");
+
+            VariantBuilder builder;
+            auto uri = CannedQuery("mock-scope").to_uri();
+            builder.add_tuple({
+                {"id", Variant("nothing")},
+                {"label", Variant("Do nothing")}
+            });
+            builder.add_tuple({
+                {"id", Variant("query")},
+                {"label", Variant("Search")},
+                {"uri", Variant(uri)}
+            });
+            w1.add_attribute_value("actions", builder.end());
+
+            ColumnLayout l1(1);
+            l1.add_column({"actions"});
+
+            reply->register_layout({l1});
+            PreviewWidgetList widgets({w1});
+            reply->push(widgets);
+            return;
+        }
         else if (result().uri().find("expandable-widget") != std::string::npos)
         {
             PreviewWidget w1("exp", "expandable");

=== modified file 'tests/previewtest.cpp'
--- tests/previewtest.cpp	2015-03-04 10:10:56 +0000
+++ tests/previewtest.cpp	2015-04-27 11:28:49 +0000
@@ -280,6 +280,32 @@
         QVERIFY(bool(previewView2));
     }
 
+    void testPreviewActionRequestingSearch()
+    {
+        m_resultsView->setQuery("query");
+
+        auto abstractView = m_resultsView->category(0).result(0).longPress();
+        QVERIFY(bool(abstractView));
+        auto previewView = dynamic_pointer_cast<shv::PreviewView>(abstractView);
+        QVERIFY(bool(previewView));
+
+        QVERIFY_MATCHRESULT(
+            shm::PreviewColumnMatcher()
+            .column(
+                shm::PreviewMatcher()
+                .widget(shm::PreviewWidgetMatcher("actions"))
+            )
+            .match(previewView->widgets())
+        );
+
+        auto resView = previewView->widgetsInFirstColumn().at("actions").trigger("query",
+                previewView->widgetsInFirstColumn().at("actions").data());
+        // action with canned query uri should trigger a search
+        auto resultsView2 = dynamic_pointer_cast<shv::ResultsView>(resView);
+        QVERIFY(bool(resultsView2));
+        QCOMPARE(m_resultsView, resultsView2);
+    }
+
     void testPreviewReplacingPreview()
     {
         m_resultsView->setQuery("layout");