Ver Fonte

HUE-8656 [tb] Make sure a compute is always set in the table browser

Johan Ahlen há 7 anos atrás
pai
commit
e6ea83f

+ 1 - 1
desktop/core/src/desktop/static/desktop/js/apiHelper.js

@@ -1683,7 +1683,7 @@ var ApiHelper = (function () {
         deferred.resolve(data);
       } else {
         cancellablePromises.push(
-          self.whenAvailable({ notebookJson: notebookJson, snippetJson: snippetJson, silenceErrors: options.silenceErrors }).done(function () {
+          self.whenAvailable({ notebookJson: notebookJson, snippetJson: snippetJson, compute: options.compute, silenceErrors: options.silenceErrors }).done(function () {
             var resultRequest = self.simplePost('/notebook/api/fetch_result_data', {
               notebook: notebookJson,
               snippet: snippetJson,

+ 11 - 7
desktop/core/src/desktop/static/desktop/js/assist/assistDbSource.js

@@ -164,13 +164,17 @@ var AssistDbSource = (function () {
         assistNamespaces.push(assistNamespace);
       });
       self.namespaces(assistNamespaces);
-      if (!refresh && activeNamespace) {
-        self.selectedNamespace(activeNamespace);
-      } else if (!refresh && assistNamespaces.length) {
-        self.selectedNamespace(assistNamespaces[0]);
-      }
-      if (!refresh && activeCompute) {
-        self.selectedNamespace().compute(activeCompute);
+      if (!refresh) {
+        if (activeNamespace) {
+          self.selectedNamespace(activeNamespace);
+        } else if (assistNamespaces.length) {
+          self.selectedNamespace(assistNamespaces[0]);
+        }
+        if (activeCompute) {
+          self.selectedNamespace().compute(activeCompute);
+        } else if (self.selectedNamespace() && self.selectedNamespace().namespace && self.selectedNamespace().namespace.computes && self.selectedNamespace().namespace.computes.length) {
+          self.selectedNamespace().compute(self.selectedNamespace().namespace.computes[0]);
+        }
       }
     }).fail(function () {
       self.hasErrors(true);