Browse Source

HUE-5979 [metastore] Fix js error when listing tags fails with status: -1 and no message

Johan Ahlen 8 years ago
parent
commit
6618fd5927
1 changed files with 7 additions and 8 deletions
  1. 7 8
      desktop/core/src/desktop/static/desktop/js/apiHelper.js

+ 7 - 8
desktop/core/src/desktop/static/desktop/js/apiHelper.js

@@ -249,12 +249,11 @@ var ApiHelper = (function () {
    */
    */
   ApiHelper.prototype.assistErrorCallback = function (options) {
   ApiHelper.prototype.assistErrorCallback = function (options) {
     return function (errorResponse) {
     return function (errorResponse) {
-      if (typeof errorResponse.statusText !== 'undefined' && errorResponse.statusText === 'abort') {
-        return;
-      }
       var errorMessage = 'Unknown error occurred';
       var errorMessage = 'Unknown error occurred';
-      if (errorResponse !== 'undefined') {
-        if (typeof errorResponse.responseText !== 'undefined') {
+      if (typeof errorResponse !== 'undefined' && errorResponse !== null) {
+        if (typeof errorResponse.statusText !== 'undefined' && errorResponse.statusText === 'abort') {
+          return;
+        } else if (typeof errorResponse.responseText !== 'undefined') {
           try {
           try {
             var errorJs = JSON.parse(errorResponse.responseText);
             var errorJs = JSON.parse(errorResponse.responseText);
             if (typeof errorJs.message !== 'undefined') {
             if (typeof errorJs.message !== 'undefined') {
@@ -265,9 +264,9 @@ var ApiHelper = (function () {
           } catch(err) {
           } catch(err) {
             errorMessage = errorResponse.responseText;
             errorMessage = errorResponse.responseText;
           }
           }
-        } else if (typeof errorResponse.message !== 'undefined') {
+        } else if (typeof errorResponse.message !== 'undefined' && errorResponse.message !== null) {
           errorMessage = errorResponse.message;
           errorMessage = errorResponse.message;
-        } else if (typeof errorResponse.statusText !== 'undefined') {
+        } else if (typeof errorResponse.statusText !== 'undefined' && errorResponse.statusText !== null) {
           errorMessage = errorResponse.statusText;
           errorMessage = errorResponse.statusText;
         } else if (errorResponse.error !== 'undefined' && Object.prototype.toString.call(errorResponse.error) === '[object String]' ) {
         } else if (errorResponse.error !== 'undefined' && Object.prototype.toString.call(errorResponse.error) === '[object String]' ) {
           errorMessage = errorResponse.error;
           errorMessage = errorResponse.error;
@@ -279,7 +278,7 @@ var ApiHelper = (function () {
       if (! options.silenceErrors) {
       if (! options.silenceErrors) {
         hueUtils.logError(errorResponse);
         hueUtils.logError(errorResponse);
         $(document).trigger("error", errorMessage);
         $(document).trigger("error", errorMessage);
-      };
+      }
 
 
       if (options.errorCallback) {
       if (options.errorCallback) {
         options.errorCallback(errorMessage);
         options.errorCallback(errorMessage);