Explorar el Código

[assist] Switch to database view on refresh

This prevents the assist panel from going blank on refresh if the loading of the databases takes time.
Johan Ahlen hace 10 años
padre
commit
28100a1a02

+ 4 - 3
desktop/core/src/desktop/static/desktop/js/assist/assistDbSource.js

@@ -114,8 +114,7 @@
       showTables: ko.observable(true),
       showTables: ko.observable(true),
       showViews: ko.observable(true)
       showViews: ko.observable(true)
     };
     };
-    var updateDatabases = function (names) {
-      var lastSelectedDb = self.selectedDatabase() ? self.selectedDatabase().definition.name : null;
+    var updateDatabases = function (names, lastSelectedDb) {
       dbIndex = {};
       dbIndex = {};
       self.databases($.map(names, function(name) {
       self.databases($.map(names, function(name) {
         var database = new AssistDbEntry({
         var database = new AssistDbEntry({
@@ -156,11 +155,13 @@
         return;
         return;
       }
       }
       self.loading(true);
       self.loading(true);
+      var lastSelectedDb = self.selectedDatabase() ? self.selectedDatabase().definition.name : null;
+      self.selectedDatabase(null);
       self.assistHelper.loadDatabases({
       self.assistHelper.loadDatabases({
         sourceType: self.type,
         sourceType: self.type,
         successCallback: function(data) {
         successCallback: function(data) {
           self.hasErrors(false);
           self.hasErrors(false);
-          updateDatabases(data)
+          updateDatabases(data, lastSelectedDb)
         },
         },
         errorCallback: function() {
         errorCallback: function() {
           self.hasErrors(true);
           self.hasErrors(true);