Przeglądaj źródła

HUE-7877 [dashboard] Support a query history from a multi statement query

Romain Rigaux 7 lat temu
rodzic
commit
1a16bf6

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

@@ -1355,7 +1355,8 @@ var Collection = function (vm, collection) {
   self.syncFields = function() {
     $.post("/dashboard/get_collection", {
         name: self.name(),
-        engine: self.engine()
+        engine: self.engine(),
+        source: self.source()
       }, function (data) {
         if (data.status == 0) {
           self.idField(data.collection.collection.idField);
@@ -2026,7 +2027,7 @@ var SearchViewModel = function (collection_json, query_json, initial_json, is_gr
           $(document).trigger("error", xhr.responseText);
           self.queryResult().status('failed');
         }).always(function () {
-          // self.isCanceling(false);
+          self.isCanceling(false);
         });
       });
     };

+ 1 - 1
desktop/libs/notebook/src/notebook/dashboard_api.py

@@ -640,7 +640,7 @@ class SQLDashboardApi(DashboardApi):
     nb_doc = Document2.objects.document(user=self.user, doc_id=name)
     notebook = Notebook(document=nb_doc).get_data()
     snippet = notebook['snippets'][0]
-    return snippet['statement']
+    return snippet['statement'].strip(';')
 
 
   def _convert_notebook_facet(self, result, facet, query):