Przeglądaj źródła

HUE-3980 [hbase] Silence errors from getColumnDescriptors API call

Johan Ahlen 9 lat temu
rodzic
commit
8d26ccf

+ 4 - 1
apps/hbase/src/hbase/static/hbase/js/api.js

@@ -34,8 +34,11 @@ var API = {
       url += '/' + encodeURIComponent(arguments[i]);
     }
     var queryObject = {url: url, method: 'POST', startTime: new Date().getTime(), status: 'running...'};
+    var functionName = arguments.length > 0 ? arguments[0] : '';
     var handler = $.post(url, $_POST).error(function (response) {
-      $(document).trigger("error", JSON.parse(response.responseText).message);
+      if (functionName !== 'getColumnDescriptors') {
+        $(document).trigger("error", JSON.parse(response.responseText).message);
+      }
     });
     var doneHandle = handler.done;
     handler.done = function () {

+ 1 - 1
apps/hbase/src/hbase/static/hbase/js/base.js

@@ -141,7 +141,7 @@ var ListViewModel = function (options) {
         callback();
       self.sortDropDown.sort();
       self.isLoading(false);
-      if (self.searchQuery()) {
+      if (self._table && self.searchQuery()) {
         self._table.fnFilter(self.searchQuery());
       }
     }]);

+ 7 - 2
apps/hbase/src/hbase/static/hbase/js/controls.js

@@ -272,14 +272,19 @@ var SmartViewModel = function (options) {
   });
 
   self._reloadcfs = function (callback) {
-    return API.queryTable("getColumnDescriptors").done(function (data) {
+    var descriptorCallback = function (data) {
       self.columnFamilies.removeAll();
       var keys = Object.keys(data);
       for (var i = 0; i < keys.length; i++) {
         self.columnFamilies.push(new ColumnFamily({name: keys[i], enabled: false}));
       }
-      if (callback != null)
+      if (typeof callback !== 'undefined' && callback !== null) {
         callback();
+      }
+    }
+
+    return API.queryTable("getColumnDescriptors").done(descriptorCallback).error(function () {
+      descriptorCallback({});
     });
   };