Jelajahi Sumber

HUE-1840 [beeswax] Query with no result set error the editor

Abraham Elmahrek 12 tahun lalu
induk
melakukan
66f767b

+ 3 - 3
apps/beeswax/src/beeswax/templates/execute.mako

@@ -1323,7 +1323,7 @@ $(document).ready(function () {
     $("#log pre").css("overflow", "auto").height($(window).height() - $("#log pre").offset().top - 40);
   }
 
-  viewModel.logs.subscribe(function(val){
+  viewModel.query.watch.logs.subscribe(function(val){
     if (logsAtEnd) {
       var _logsEl = $("#log pre");
       _logsEl.scrollTop(_logsEl[0].scrollHeight - _logsEl.height());
@@ -1355,8 +1355,8 @@ function addResults(viewModel, dataTable, index, pageSize) {
   }
 }
 
-function resultsTable() {
-  if (!dataTable) {
+function resultsTable(e, data) {
+  if (!dataTable && viewModel.query.results.columns().length > 0) {
     dataTable = $(".resultTable").dataTable({
       "bPaginate": false,
       "bLengthChange": false,

+ 10 - 2
apps/beeswax/static/js/beeswax.vm.js

@@ -388,7 +388,15 @@ function BeeswaxViewModel(server, query_id) {
       success: function(data) {
         $(document).trigger('watched.query', data);
       },
-      error: error_fn,
+      error: function(jqXHR, status, errorThrown) {
+        self.query.isRunning(false);
+        try {
+          var data = $.parseJSON(jqXHR.responseText);
+          self.query.errors.push(data.error);
+        } catch(e) {
+          $(document).trigger('server.unmanageable_error', jqXHR.responseText);
+        }
+      },
       data: data
     };
     $.ajax(request);
@@ -444,7 +452,7 @@ function BeeswaxViewModel(server, query_id) {
         } else {
           self.query.results.url(null);
         }
-        $(document).trigger('fetched.results', data);
+        $(document).trigger('fetched.results', [data]);
       },
       error: error_fn
     };