Merge lp:~gary-wzl77/scope-aggregator/fix_1609230 into lp:scope-aggregator

[Gary.Wang]

Enable hints display when using child hints scope.

When playing around this branch,
https://code.launchpad.net/~zhangew401/scope-aggregator/fix-lp-1524597
find that hints doesn't work out when using hints child scope rather than new hints definition(local) in aggregator scope.

The above issue affects all aggregator scopes for hints display if using hints child scope.

[Kyle Nitzsche (knitzsche)]

Hi Gary.

Thanks for seeing this. It *did* work at one time but it looks like I dropped it in the end.

review: Approve

[Kyle Nitzsche (knitzsche)]

no need for this anymore - trunk was fixed a while ago. marking rejected but thanks for the fix!

Unmerged revisions

172. By Gary.Wang on 2016-08-03

Enable hints display when using child hints scope.

=== modified file '4.8-rebase-local-hints-README.md'
--- 4.8-rebase-local-hints-README.md	2016-06-27 15:48:22 +0000
+++ 4.8-rebase-local-hints-README.md	2016-08-03 05:34:48 +0000
@@ -182,8 +182,7 @@
         {
             "hints_scope_id": "com.canonical.scopes.hints_hints",
             "hints_this_scope": "dashboard",
-            "hints_help": "dashboard",
-            "hints_hide": "start"
+            "hints_help": "dashboard"
         }
     }
 
 
=== modified file 'data/hints.json'
--- data/hints.json	2016-07-19 17:32:37 +0000
+++ data/hints.json	2016-08-03 05:34:48 +0000
@@ -10,8 +10,7 @@
     {
         "hints_scope_id": "com.canonical.scopes.hints_hints",
         "hints_this_scope": "dashboard",
-        "hints_help": "dashboard",
-        "hints_hide": "start"
+        "hints_help": "dashboard"
     },
     "COMMENT_local": "when 'hints_source' is 'local', the following must be completed", 
     "local":
 
=== modified file 'include/query.h'
--- include/query.h	2016-08-03 05:34:48 +0000
+++ include/query.h	2016-08-03 05:34:48 +0000
@@ -226,7 +226,6 @@
 
     std::string HINTS_SCOPE_ID;//fqn of hints scope
     std::string HINTS_THIS_SCOPE;//tells hints which agg scope this is
-    std::string HINTS_HIDE;//tells hints to stop displaying
 
     bool has_one_source=false;//true means scope is installed
     int keyword_cardinality = 5;
 
=== modified file 'src/query.cpp'
--- src/query.cpp	2016-07-12 17:14:05 +0000
+++ src/query.cpp	2016-08-03 05:34:48 +0000
@@ -172,6 +172,7 @@
         } else {
             qDebug() << "=== HINTS CASE 4";
             show_normal = false; 
+            dismiss_hints_quickstart();// write "hints_is_hidden" cache file
         }
     }
 
@@ -372,13 +373,6 @@
                 HINTS_THIS_SCOPE = sstr(hints_scope[QStringLiteral("hints_this_scope")].toString());
             else
                 uses_hints = false;
-            //this key is deprecated. it previously specified the query string the hints scope
-            //sent to the agg scope to signal hints quick start should be permanently dismissed.
-            //scope-aggregator 4.4 stopped using this.
-            if (hints_scope.contains(QStringLiteral("hints_hide")))
-                HINTS_HIDE = sstr(hints_scope[QStringLiteral("hints_hide")].toString());
-            else
-                uses_hints = false;
         }
     }
 }
 
=== modified file 'src/utils.cpp'
--- src/utils.cpp	2016-08-03 05:34:48 +0000
+++ src/utils.cpp	2016-08-03 05:34:48 +0000
@@ -1373,8 +1373,8 @@
               metadata, reply);
 }
 
-bool Query::hints_hidden() {
-
+bool Query::hints_hidden()
+{
     auto filepath1 = QString::fromStdString(cache_dir_) +"/" + hints_file;
     auto filepath2 = QString::fromStdString(cache_dir_) +"/" + firstboot;
     if (QFile::exists(filepath1) || QFile::exists(filepath2))
@@ -1382,7 +1382,8 @@
     return false; //don't show hints as fall back
 }
 
-void Query::dismiss_hints_quickstart() {
+void Query::dismiss_hints_quickstart()
+{
     qDebug() << "==== HINTS in dismiss()";
     auto filepath= QString::fromStdString(cache_dir_) +"/" + hints_file;
     QFile file(filepath);