iguazio.dashboard-controls 0.37.11 → 0.37.12-patch3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iguazio.dashboard-controls",
-    "version": "0.37.11",
+    "version": "0.37.12-patch3",
     "main": "dist/js/iguazio.dashboard-controls.js",
     "description": "Collection of resources (such as CSS styles, fonts and images) and AngularJs 1.x components and services to share among different Iguazio repos.",
     "repository": {

package/src/igz_controls/components/element-loading-status/element-loading-status.component.js

@@ -21,10 +21,16 @@
         var ctrl = this;
         var lng = i18next.language;
 
-        ctrl.isShowSpinner = true;
         ctrl.isShowContent = false;
         ctrl.isShowError = false;
+        ctrl.isShowSpinner = true;
 
+        ctrl.deregisterHideError = null;
+        ctrl.deregisterHideSpinner = null;
+        ctrl.deregisterShowError = null;
+        ctrl.deregisterShowSpinner = null;
+
+        ctrl.$onDestroy = onDestroy;
         ctrl.$onInit = onInit;
         ctrl.$onChanges = onChanges;
 
@@ -35,21 +41,25 @@
         // Hook methods
         //
 
+        /**
+         * Destructor method
+         */
+        function onDestroy() {
+            deregisterBroadcasts();
+        }
+
         /**
          * Initialization method
          */
         function onInit() {
-            $scope.$on('element-loading-status_show-spinner_' + ctrl.name, showSpinner);
-            $scope.$on('element-loading-status_hide-spinner_' + ctrl.name, hideSpinner);
-
-            $scope.$on('element-loading-status_show-error_' + ctrl.name, showError);
-            $scope.$on('element-loading-status_hide-error_' + ctrl.name, hideError);
+            registerBroadcasts();
         }
 
         /**
          * Changes method
+         * @param {Object} changes
          */
-        function onChanges() {
+        function onChanges(changes) {
             lodash.defaults(ctrl, {
                 loadingStatusSize: 'default',
                 refresh: false,
@@ -64,6 +74,11 @@
                     refresh: true
                 });
             }
+
+            if (changes && changes.name && changes.name.currentValue !== changes.name.previousValue) {
+                deregisterBroadcasts();
+                registerBroadcasts();
+            }
         }
 
         //
@@ -95,12 +110,20 @@
         //
 
         /**
-         * Show given loading spinner
+         * Deregister broadcasts
          */
-        function showSpinner() {
+        function deregisterBroadcasts() {
+            ctrl.deregisterHideError();
+            ctrl.deregisterHideSpinner();
+            ctrl.deregisterShowError();
+            ctrl.deregisterShowSpinner();
+        }
+
+        /**
+         * Hide given loading error
+         */
+        function hideError() {
             ctrl.isShowError = false;
-            ctrl.isShowContent = false;
-            ctrl.isShowSpinner = true;
         }
 
         /**
@@ -111,6 +134,16 @@
             ctrl.isShowContent = true;
         }
 
+        /**
+         * Register broadcasts
+         */
+        function registerBroadcasts() {
+            ctrl.deregisterHideError = $scope.$on('element-loading-status_hide-error_' + ctrl.name, hideError);
+            ctrl.deregisterHideSpinner = $scope.$on('element-loading-status_hide-spinner_' + ctrl.name, hideSpinner);
+            ctrl.deregisterShowError = $scope.$on('element-loading-status_show-error_' + ctrl.name, showError);
+            ctrl.deregisterShowSpinner = $scope.$on('element-loading-status_show-spinner_' + ctrl.name, showSpinner);
+        }
+
         /**
          * Show given loading error
          */
@@ -120,10 +153,12 @@
         }
 
         /**
-         * Hide given loading error
+         * Show given loading spinner
          */
-        function hideError() {
+        function showSpinner() {
             ctrl.isShowError = false;
+            ctrl.isShowContent = false;
+            ctrl.isShowSpinner = true;
         }
     }
 }());

package/src/igz_controls/components/pagination/pagination.controller.js

@@ -4,8 +4,8 @@
         .controller('PaginationController', PaginationController);
 
     /*eslint no-shadow: 0*/
-    function PaginationController($i18next, $injector , $location, $rootScope, $stateParams, $timeout,
-                                  i18next, lodash, ActionCheckboxAllService, PaginationService,
+    function PaginationController($i18next, $injector , $location, $q, $rootScope, $stateParams, $timeout,
+                                  i18next, lodash, ActionCheckboxAllService, GeneralDataService, PaginationService,
                                   entitiesType, onChangePageCallback, dataServiceName, vm, emptyOnPageChange) {
 
         // entityId - id of nested entity
@@ -34,6 +34,7 @@
          *     (e.g. filter, include, sort, etc.).
          */
         function changePage(pageNumber, perPage, additionalParams) {
+            var previousData = angular.copy(vm[entitiesType]);
             var pageAdditionalParams = lodash.cloneDeep(additionalParams);
             selectedItemId = lodash.defaultTo($stateParams.selectedItemId, $location.search().id);
             selectedItemId = isNumeric(selectedItemId) ? lodash.toInteger(selectedItemId) : selectedItemId;
@@ -122,17 +123,24 @@
                     vm.isSplashShowed.value = false;
                 })
                 .catch(function (error) {
-                    var errorMessages = {
-                        '400': $i18next.t('common:ERROR_MSG.PAGINATION.400', { lng: lng }),
-                        '403': $i18next.t('common:ERROR_MSG.PAGINATION.403', { lng: lng }),
-                        '500': $i18next.t('common:ERROR_MSG.ERROR_ON_SERVER_SIDE', { lng: lng }),
-                        'default': $i18next.t('common:ERROR_MSG.UNKNOWN_ERROR', { lng: lng })
-                    };
-                    var message = lodash.get(errorMessages, String(error.status), errorMessages.default);
-
-                    $rootScope.$broadcast('splash-screen_show-error', {
-                        alertText: message + ' ' + $i18next.t('common:ERROR_MSG.YOU_CAN_TRY_TO_REFRESH_PAGE', { lng: lng })
-                    });
+                    if (GeneralDataService.isDisconnectionError(error.status)) {
+                        vm[entitiesType] = previousData;
+                        vm.isSplashShowed.value = false;
+
+                        return $q.reject(error)
+                    } else {
+                        var errorMessages = {
+                            '400': $i18next.t('common:ERROR_MSG.PAGINATION.400', { lng: lng }),
+                            '403': $i18next.t('common:ERROR_MSG.PAGINATION.403', { lng: lng }),
+                            '500': $i18next.t('common:ERROR_MSG.ERROR_ON_SERVER_SIDE', { lng: lng }),
+                            'default': $i18next.t('common:ERROR_MSG.UNKNOWN_ERROR', { lng: lng })
+                        };
+                        var message = lodash.get(errorMessages, String(error.status), errorMessages.default);
+
+                        $rootScope.$broadcast('splash-screen_show-error', {
+                            alertText: message + ' ' + $i18next.t('common:ERROR_MSG.YOU_CAN_TRY_TO_REFRESH_PAGE', { lng: lng })
+                        });
+                    }
                 });
         }
 

package/src/igz_controls/services/general-data.service.js

@@ -10,6 +10,7 @@
         return {
             fetchAllPages: fetchAllPages,
             getErrorMessage: getErrorMessage,
+            isDisconnectionError: isDisconnectionError,
             poll: poll,
             pruneObject: pruneObject,
             trackDeletion: trackDeletion
@@ -144,6 +145,15 @@
             return lodash.defaultTo(result, messages.default);
         }
 
+        /**
+         * Checks if the error status is equal '-1'. It means, that server is unreachable.
+         * @param {number} errorStatus - Error status code.
+         * @returns {Boolean} if true - server is unreachable
+         */
+        function isDisconnectionError(errorStatus) {
+            return errorStatus === -1;
+        }
+
         /**
          * Polls by calling `pollMethod` and then invoking `isDone` method with `pollMethod`'s result. Stops polling
          * when `isDone` returned `true`. Keeps on polling as long as `isDone` returns `false`.

package/src/igz_controls/services/server-status.service.js

@@ -0,0 +1,91 @@
+(function () {
+    'use strict';
+
+    angular.module('iguazio.dashboard-controls')
+        .factory('ServerStatusService', ServerStatusService);
+
+    function ServerStatusService($http, $q, $i18next, i18next, lodash, ConfigService, DialogsService) {
+        var dialogPromise = null;
+        var errors = [];
+
+        return {
+            resolveInterceptor: resolveInterceptor,
+            rejectInterceptor: rejectInterceptor
+        };
+
+        //
+        // Public methods
+        //
+
+        /**
+         * Removes error from errors list if server becomes reachable
+         * @param {Object} response - backend response object
+         * @returns {Promise} returns promise
+         */
+        function resolveInterceptor(response) {
+            if (response && response.status && response.status !== -1) {
+                if (errors.length > 0) {
+                    errors = errors.filter(function (err) {
+                        return err.method !== response.config.method && err.url !== response.config.url;
+                    });
+                }
+
+                return $q.resolve(response);
+            }
+        }
+
+        /**
+         * Adds request to errors list if it`s failed and pops a modal if server isn`t reachable more than 60sec
+         * @param {Object} rejectionResponse - backend response object
+         * @returns {Promise} returns promise
+         */
+        function rejectInterceptor(rejectionResponse) {
+            const currentError = {
+                method: rejectionResponse.config.method,
+                url: rejectionResponse.config.url
+            };
+
+            if (rejectionResponse.status === -1 && rejectionResponse.xhrStatus === 'error') {
+                const existingFailedResponse = errors.find(function (err) {
+                    return err.method === rejectionResponse.config.method && err.url === rejectionResponse.config.url;
+                });
+
+                if (existingFailedResponse) {
+                    const dateNow = new Date();
+                    const timeFromFirstFailure = (dateNow.getTime() - existingFailedResponse.date.getTime());
+
+                    if (timeFromFirstFailure >= 3000) {
+                        return showAlert()
+                            .then(function () {
+                                location.reload();
+                            });
+                    }
+                } else {
+                    currentError.date = new Date();
+                    errors.push(currentError);
+                }
+            }
+
+            return $q.reject(rejectionResponse);
+        }
+
+        /**
+         * Pops a modal with an error message and makes sure there's only one open.
+         * When the modal is resolved, all pending flows that awaited it will continue.
+         * @returns {Promise} resolved when modal is closed ("Refresh" button is clicked)
+         */
+        function showAlert() {
+            var lng = i18next.language;
+
+            if (lodash.isNull(dialogPromise)) {
+                dialogPromise = DialogsService.oopsAlert($i18next.t('common:SERVER_UNREACHABLE_ALERT', {lng: lng}),
+                                                         $i18next.t('common:REFRESH', {lng: lng}))
+                    .then(function () {
+                        dialogPromise = null;
+                    });
+            }
+
+            return dialogPromise;
+        }
+    }
+}());

package/src/nuclio/functions/functions.component.js

@@ -22,8 +22,8 @@
 
     function FunctionsController($filter, $interval, $q, $rootScope, $scope, $state, $stateParams, $timeout,
                                  $transitions, $i18next, i18next, lodash, CommonTableService, ConfigService,
-                                 DialogsService, ElementLoadingStatusService, FunctionsService, NuclioHeaderService,
-                                 TableSizeService) {
+                                 DialogsService, ElementLoadingStatusService, FunctionsService, GeneralDataService,
+                                 NuclioHeaderService, TableSizeService) {
         var ctrl = this;
         var lng = i18next.language;
         var updatingFunctionsInterval = null;
@@ -344,9 +344,11 @@
                     sortTable(true);
                 })
                 .catch(function (error) {
-                    var defaultMsg = $i18next.t('functions:ERROR_MSG.GET_FUNCTIONS', { lng: lng });
+                    if (!GeneralDataService.isDisconnectionError(error.status)) {
+                        var defaultMsg = $i18next.t('functions:ERROR_MSG.GET_FUNCTIONS', {lng: lng});
 
-                    return DialogsService.alert(lodash.get(error, 'data.error', defaultMsg));
+                        return DialogsService.alert(lodash.get(error, 'data.error', defaultMsg));
+                    }
                 })
                 .finally(function () {
                     ctrl.isSplashShowed.value = false;

package/src/nuclio/functions/version/version-configuration/tabs/version-configuration-annotations/version-configuration-annotations.component.js

@@ -75,9 +75,6 @@
             if (lodash.has(changes, 'version')) {
                 ctrl.annotations = lodash.chain(ctrl.version)
                     .get('metadata.annotations', {})
-                    .omitBy(function (value, key) {
-                        return lodash.startsWith(key, 'nuclio.io/');
-                    })
                     .map(function (value, key) {
                         return {
                             name: key,
@@ -165,10 +162,6 @@
          */
         function updateAnnotations() {
             var isFormValid = true;
-            var annotations = lodash.get(ctrl.version, 'metadata.annotations', {});
-            var nuclioAnnotations = lodash.pickBy(annotations, function (value, key) {
-                return lodash.startsWith(key, 'nuclio.io/');
-            });
             var newAnnotations = {};
 
             lodash.forEach(ctrl.annotations, function (annotation) {
@@ -188,8 +181,6 @@
                 isDisabled: !isFormValid
             });
 
-            lodash.merge(newAnnotations, nuclioAnnotations);
-
             lodash.set(ctrl.version, 'metadata.annotations', newAnnotations);
             ctrl.onChangeCallback();
         }

package/src/nuclio/functions/version/version.component.js

@@ -20,7 +20,7 @@
 
     function NclVersionController($i18next, $interval, $rootScope, $scope, $state, $stateParams, $transitions, $timeout,
                                   i18next, lodash, ngDialog, ConfigService, DialogsService, ExportService,
-                                  FunctionsService, NuclioHeaderService, VersionHelperService) {
+                                  FunctionsService, GeneralDataService, NuclioHeaderService, VersionHelperService) {
         var ctrl = this;
         var deregisterFunction = null;
         var interval = null;
@@ -369,9 +369,12 @@
                     setIngressHost();
                 })
                 .catch(function (error) {
-                    var defaultMsg = $i18next.t('functions:ERROR_MSG.GET_FUNCTION', { lng: lng });
+                    if (!GeneralDataService.isDisconnectionError(error.status)) {
 
-                    DialogsService.alert(lodash.get(error, 'data.error', defaultMsg));
+                        var defaultMsg = $i18next.t('functions:ERROR_MSG.GET_FUNCTION', {lng: lng});
+
+                        DialogsService.alert(lodash.get(error, 'data.error', defaultMsg));
+                    }
                 })
                 .finally(function () {
                     ctrl.isSplashShowed.value = false;