Explorar o código

[assist] Make assist event names less ambiguous

Johan Ahlen %!s(int64=10) %!d(string=hai) anos
pai
achega
977cf9f

+ 3 - 3
apps/beeswax/src/beeswax/static/beeswax/js/beeswax.vm.js

@@ -75,9 +75,9 @@ function BeeswaxViewModel(server, assistHelper) {
   self.database = ko.observable(null);
 
   var type = server === "beeswax" ? "hive" : "impala";
-  huePubSub.subscribe("assist.request.status", function () {
-    huePubSub.publish('assist.select.database', {
-      sourceType: type,
+  huePubSub.subscribe("assist.ready", function () {
+    huePubSub.publish('assist.set.database', {
+      source: type,
       name: self.database()
     });
   });

+ 2 - 2
desktop/core/src/desktop/static/desktop/js/assist/assistSource.js

@@ -74,8 +74,8 @@
           newValue.loadEntries()
         }
         $.totalStorage("hue.assist.lastSelectedDb." + self.assistHelper.getTotalStorageUserPrefix(), newValue.definition.name);
-        huePubSub.publish("assist.database.selected", {
-          sourceType: self.type,
+        huePubSub.publish("assist.database.set", {
+          source: self.type,
           name: newValue.definition.name
         })
       }

+ 6 - 5
desktop/core/src/desktop/templates/assist.mako

@@ -335,15 +335,16 @@ from desktop.views import _ko
           }
         };
 
-        huePubSub.subscribe("assist.select.database", function (database) {
-          if (! database.sourceType || ! sourceIndex[database.sourceType]) {
+        huePubSub.subscribe("assist.set.database", function (databaseDef) {
+          if (! databaseDef.source || ! sourceIndex[databaseDef.source]) {
             return;
           }
-          self.selectedSource(sourceIndex[database.sourceType]);
-          setDatabaseWhenLoaded(database.name);
+          self.selectedSource(sourceIndex[databaseDef.source]);
+          setDatabaseWhenLoaded(databaseDef.name);
+        });
         });
 
-        huePubSub.publish("assist.request.status");
+        huePubSub.publish("assist.ready");
 
         self.selectedSource.subscribe(function (newSource) {
           if (newSource) {

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

@@ -174,9 +174,9 @@
 
     self.database = ko.observable(typeof snippet.database != "undefined" && snippet.database != null ? snippet.database : null);
 
-    huePubSub.subscribe("assist.database.selected", function (database) {
-      if (database.sourceType === self.type() && self.database() !== database.name) {
-        self.database(database.name);
+    huePubSub.subscribe("assist.database.set", function (databaseDef) {
+      if (databaseDef.source === self.type() && self.database() !== databaseDef.name) {
+        self.database(databaseDef.name);
       }
     });
 
@@ -1020,18 +1020,13 @@
       download(JSON.stringify(jupyterNotebook), self.name() + ".ipynb", "text/plain");
     }
 
-    huePubSub.subscribe("assist.request.status", function () {
+    huePubSub.subscribe("assist.ready", function () {
       if (self.type() == 'query' && self.snippets().length == 1) {
-        huePubSub.publish('assist.select.database', {
-          sourceType: self.snippets()[0].type(),
+        huePubSub.publish('assist.set.database', {
+          source: self.snippets()[0].type(),
           name: self.snippets()[0].database()
         });
       }
-      // TODO: Uncomment when we switch to the new impala and hive editors
-      //huePubSub.publish('assist.select.database', {
-      //  sourceType: null,
-      //  name: null
-      //});
     });
   };