Просмотр исходного кода

HUE-6077 [editor] Inform when suggestions are missing DDL or stats

Romain Rigaux 8 лет назад
Родитель
Сommit
1b696db

+ 12 - 3
desktop/core/src/desktop/templates/assist.mako

@@ -1772,11 +1772,11 @@ from notebook.conf import get_ordered_interpreters
           <!-- /ko -->
           <!-- /ko -->
         </div>
         </div>
 
 
-        <!-- ko if: hasActiveRisks() && activeRisks()['noDDL'].length > 0 -->
+        <!-- ko if: hasMissingRisks() -->
         <div class="assist-flex-fill">
         <div class="assist-flex-fill">
           <br>
           <br>
-          <a href="javascript:void(0)" data-bind="visible: activeTables().length > 0, click: function() { huePubSub.publish('editor.table.stats.upload', activeTables()); }" title="${ _('Some table and columns DDL/stats are missing. Load them in order to improve the recommendations') }">
-            <i class="fa fa-fw fa-gears"></i> ${_('Optimize more')}
+          <a href="javascript:void(0)" data-bind="visible: activeTables().length > 0, click: function() { huePubSub.publish('editor.table.stats.upload', activeTables()); }, attr: { 'title': ('${ _("Add available table and columns") }'  + (isMissingDDL() ? ' DDL' : '') + (isMissingStats() ? ' stats' : '')) }">
+            <i class="fa fa-fw fa-plus-circle"></i> ${_('Improve Analysis')}
           </a>
           </a>
         </div>
         </div>
         <!-- /ko -->
         <!-- /ko -->
@@ -1803,6 +1803,15 @@ from notebook.conf import get_ordered_interpreters
         self.hasActiveRisks = ko.pureComputed(function () {
         self.hasActiveRisks = ko.pureComputed(function () {
            return self.activeRisks().hints && self.activeRisks().hints.length > 0;
            return self.activeRisks().hints && self.activeRisks().hints.length > 0;
         });
         });
+        self.hasMissingRisks = ko.pureComputed(function () {
+          return self.isMissingDDL() || self.isMissingStats();
+        });
+        self.isMissingDDL = ko.pureComputed(function () {
+          return self.activeRisks().noDDL && self.activeRisks().noDDL.length > 0
+        });
+        self.isMissingStats = ko.pureComputed(function () {
+          return self.activeRisks().noStats && self.activeRisks().noStats.length > 0;
+        });
         self.statementCount = ko.observable(0);
         self.statementCount = ko.observable(0);
         self.activeStatementIndex = ko.observable(0);
         self.activeStatementIndex = ko.observable(0);
 
 

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

@@ -3075,7 +3075,7 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, ENABLE_
       });
       });
 
 
       huePubSub.subscribe("editor.workload.upload", function () {
       huePubSub.subscribe("editor.workload.upload", function () {
-        viewModel.selectedNotebook().snippets()[0].loadQueryHistory(100);
+        viewModel.selectedNotebook().snippets()[0].loadQueryHistory(5);
       });
       });
 
 
       huePubSub.subscribe('active.editor.statement.changed', function (statement) {
       huePubSub.subscribe('active.editor.statement.changed', function (statement) {