Эх сурвалжийг харах

HUE-7949 [dashboard] Remove plus button when in Query Builder mode

Enrico Berti 7 жил өмнө
parent
commit
77db9f19eb

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

@@ -66,7 +66,7 @@
     </a>
     % endif
     % if HAS_QUERY_BUILDER_ENABLED.get():
-    <a href="javascript: queryBuilderSearchLayout(searchViewModel)" title="${ _('Query Builder to slice and dice dimensions') }" onmouseover="searchViewModel.previewColumns('qbuilder')" onmouseout="searchViewModel.previewColumns('')">
+    <a href="javascript: queryBuilderSearchLayout(searchViewModel, true)" title="${ _('Query Builder to slice and dice dimensions') }" onmouseover="searchViewModel.previewColumns('qbuilder')" onmouseout="searchViewModel.previewColumns('')">
       <div class="layout-container">
         <div class="layout-box" style="width: 100px;"><i class="fa fa-superscript"></i></div>
       </div>

+ 3 - 1
desktop/libs/dashboard/src/dashboard/static/dashboard/js/search.ko.js

@@ -20,7 +20,8 @@ function magicSearchLayout(vm) {
   huePubSub.publish('dashboard.set.layout');
 }
 
-function queryBuilderSearchLayout(vm) {
+function queryBuilderSearchLayout(vm, isQueryBuilder) {
+  vm.isQueryBuilder(!!isQueryBuilder);
   loadSearchLayout(vm, vm.initial.qbLayout);
   $(document).trigger("magicSearchLayout");
   huePubSub.publish('dashboard.set.layout');
@@ -1827,6 +1828,7 @@ var SearchViewModel = function (collection_json, query_json, initial_json, has_g
   self.initialJson = initial_json;
 
   self.isGridster = ko.observable(!!has_gridster_enabled && (collection_json.layout.length === 0 || (collection_json.layout.length && collection_json.gridItems.length)));
+  self.isQueryBuilder = ko.observable(false);
 
   if ($.totalStorage('hue.enable.gridster') === false) {
     self.isGridster(false);

+ 1 - 1
desktop/libs/dashboard/src/dashboard/templates/common_search.mako

@@ -139,7 +139,7 @@ from dashboard.conf import USE_GRIDSTER, HAS_REPORT_ENABLED, HAS_WIDGET_FILTER
     </div>
 
     <div class="search-bar-operations">
-      <!-- ko if: $root.isGridster -->
+      <!-- ko if: $root.isGridster() && !$root.isQueryBuilder() -->
       <div class="btn-group">
         <a class="btn pointer" title="${ _('Add widget') }" rel="tooltip" data-placement="bottom" data-bind="visible: columns().length, click: function() { isToolbarVisible(!isToolbarVisible()) }, css: {'btn': true, 'btn-inverse': isToolbarVisible }">
           <i class="fa fa-plus"></i>