Browse Source

HUE-8244 [dashboard] Hide right assist after choosing a search layout

Enrico Berti 7 years ago
parent
commit
d31b886ff2

+ 2 - 2
desktop/core/src/desktop/templates/common_dashboard.mako

@@ -157,7 +157,7 @@
           </div>
           <div class="preview-row" style="margin-top: 40px; padding-top: 40px; padding-bottom: 0; min-height: 200px !important;">
             <i class="fa fa-table" style="font-size: 120px"></i><br/>
-            <div style="font-size: 40px; padding-top: 20px">${ _('Compute and calculate metrics') }</div>
+            <div style="font-size: 40px; padding-top: 20px; line-height: 48px">${ _('Compute and calculate metrics') }</div>
           </div>
         </div>
       </div>
@@ -168,7 +168,7 @@
         <div class="span10">
           <div class="preview-row" style="font-size: 80px; ">
             <i class="fa fa-search" style="font-size: 120px; padding-top: 100px"></i><br/>
-            <div style="font-size: 40px; padding-top: 20px">${ _('Retrieve and display records of data') }</div>
+            <div style="font-size: 40px; padding-top: 20px; line-height: 48px">${ _('Retrieve and display records of data') }</div>
           </div>
         </div>
       </div>

+ 17 - 10
desktop/core/src/desktop/templates/hue.mako

@@ -1425,7 +1425,7 @@ ${ smart_unicode(login_modal(request).content) | n,unicode }
         huePubSub.publish('get.current.app.view.model');
 
         var previousVisibilityValues = {};
-        huePubSub.subscribe('side.panels.hide', function(withoutStorage){
+        huePubSub.subscribe('both.assists.hide', function(withoutStorage){
           previousVisibilityValues = {
             left: self.leftAssistVisible(),
             right: self.rightAssistVisible()
@@ -1438,7 +1438,16 @@ ${ smart_unicode(login_modal(request).content) | n,unicode }
           }, 0);
         });
 
-        huePubSub.subscribe('side.panel.right.hide', function(withoutStorage){
+        huePubSub.subscribe('both.assists.show', function(withoutStorage){
+          self.assistWithoutStorage(withoutStorage);
+          self.leftAssistVisible(previousVisibilityValues.left);
+          self.rightAssistVisible(previousVisibilityValues.right);
+          window.setTimeout(function(){
+            self.assistWithoutStorage(false);
+          }, 0);
+        });
+
+        huePubSub.subscribe('right.assist.hide', function(withoutStorage){
           previousVisibilityValues = {
             left: self.leftAssistVisible(),
             right: self.rightAssistVisible()
@@ -1450,20 +1459,18 @@ ${ smart_unicode(login_modal(request).content) | n,unicode }
           }, 0);
         });
 
-        huePubSub.subscribe('side.panels.show', function(withoutStorage){
-          self.assistWithoutStorage(withoutStorage);
-          self.leftAssistVisible(previousVisibilityValues.left);
-          self.rightAssistVisible(previousVisibilityValues.right);
-          window.setTimeout(function(){
-            self.assistWithoutStorage(false);
-          }, 0);
+        huePubSub.subscribe('right.assist.show', function () {
+          if (!self.rightAssistVisible()) {
+            self.rightAssistVisible(true);
+          }
         });
 
         huePubSub.subscribe('left.assist.show', function () {
           if (!self.leftAssistVisible()) {
             self.leftAssistVisible(true);
           }
-        })
+        });
+
       }
 
       var sidePanelViewModel = new SidePanelViewModel();

+ 2 - 0
desktop/libs/dashboard/src/dashboard/static/dashboard/js/search.ko.js

@@ -25,6 +25,7 @@ function queryBuilderSearchLayout(vm, isQueryBuilder) {
   loadSearchLayout(vm, vm.initial.qbLayout);
   $(document).trigger("magicSearchLayout");
   huePubSub.publish('dashboard.set.layout');
+  huePubSub.publish('right.assist.show', true);
 }
 
 function textSearchLayout(vm, isQueryBuilder) {
@@ -32,6 +33,7 @@ function textSearchLayout(vm, isQueryBuilder) {
   loadSearchLayout(vm, vm.initial.textSearchLayout);
   $(document).trigger("magicSearchLayout");
   huePubSub.publish('dashboard.set.layout');
+  huePubSub.publish('right.assist.hide', true);
 }
 
 function loadSearchLayout(viewModel, json_layout) {

+ 3 - 3
desktop/libs/dashboard/src/dashboard/views.py

@@ -67,14 +67,14 @@ QUERY_BUILDER_LAYOUT = [
 ]
 
 TEXT_SEARCH_LAYOUT = [
-     {"size":2,"rows":[{"widgets":[]}],"drops":["temp"],"klass":"card card-home card-column span2"},
-     {"size":10,"rows":[{"widgets":[
+     {"size":3,"rows":[{"widgets":[]}],"drops":["temp"],"klass":"card card-home card-column span3"},
+     {"size":9,"rows":[{"widgets":[
          {"size":12,"name":"Filter Bar","widgetType":"filter-widget", "id":"99923aef-b233-9420-96c6-15d48293532b",
           "properties":{},"offset":0,"isLoading":True,"klass":"card card-widget span12"}]},
                         {"widgets":[
          {"size":12,"name":"Grid Results","widgetType":"html-resultset-widget", "id":"14023aef-b233-9420-96c6-15d48293532b",
           "properties":{},"offset":0,"isLoading":True,"klass":"card card-widget span12"}]}],
-        "drops":["temp"],"klass":"card card-home card-column span10"},
+        "drops":["temp"],"klass":"card card-home card-column span9"},
 ]
 
 

+ 3 - 3
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -3415,9 +3415,9 @@ function togglePresentation(value) {};
           wasRightPanelVisible = viewModel.isRightPanelVisible();
 
           if (wasResultFullScreenMode) {
-            huePubSub.publish('side.panels.hide', true);
+            huePubSub.publish('both.assists.hide', true);
           } else {
-            huePubSub.publish('side.panel.right.hide', true);
+            huePubSub.publish('right.assist.hide', true);
           }
 
           viewModel.assistWithoutStorage(true);
@@ -3438,7 +3438,7 @@ function togglePresentation(value) {};
           $(window).bind("keydown", "esc", exitPlayerMode);
         } else {
           hideFixedHeaders();
-          huePubSub.publish('side.panels.show', true);
+          huePubSub.publish('both.assists.show', true);
           viewModel.assistWithoutStorage(true);
           viewModel.isLeftPanelVisible(wasLeftPanelVisible);
           viewModel.isRightPanelVisible(wasRightPanelVisible);