Browse Source

HUE-3640 [editor] Zero result query always closes Query History tab

Enrico Berti 9 years ago
parent
commit
9cfa11d126

+ 6 - 1
desktop/libs/notebook/src/notebook/static/notebook/js/notebook.ko.js

@@ -583,6 +583,8 @@
         }
         }
       });
       });
 
 
+      self.currentQueryTab('queryHistory');
+
       if (self.result.fetchedOnce()) {
       if (self.result.fetchedOnce()) {
         self.close();
         self.close();
         self.statusForButtons('executed');
         self.statusForButtons('executed');
@@ -592,7 +594,6 @@
         notebook: vm.editorMode ? ko.mapping.toJSON(notebook, NOTEBOOK_MAPPING) : ko.mapping.toJSON(notebook.getContext()),
         notebook: vm.editorMode ? ko.mapping.toJSON(notebook, NOTEBOOK_MAPPING) : ko.mapping.toJSON(notebook.getContext()),
         snippet: ko.mapping.toJSON(self.getContext())
         snippet: ko.mapping.toJSON(self.getContext())
       }, function (data) {
       }, function (data) {
-        self.currentQueryTab('queryResults');
         self.statusForButtons('executed');
         self.statusForButtons('executed');
         if (vm.editorMode && data.history_id) {
         if (vm.editorMode && data.history_id) {
           var url = '/notebook/editor?editor=' + data.history_id;
           var url = '/notebook/editor?editor=' + data.history_id;
@@ -763,6 +764,10 @@
     self.loadData = function (data, rows) {
     self.loadData = function (data, rows) {
       rows -= data.result.data.length;
       rows -= data.result.data.length;
 
 
+      if (data.result.data.length > 0) {
+        self.currentQueryTab('queryResults');
+      }
+
       var _initialIndex = self.result.data().length;
       var _initialIndex = self.result.data().length;
       var _tempData = [];
       var _tempData = [];
       $.each(data.result.data, function (index, row) {
       $.each(data.result.data, function (index, row) {