iguazio.dashboard-controls 0.37.11 → 0.37.12-patch1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iguazio.dashboard-controls",
-    "version": "0.37.11",
+    "version": "0.37.12-patch1",
     "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/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();
         }