iguazio.dashboard-controls 0.37.9 → 0.37.12-patch1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iguazio.dashboard-controls",
-    "version": "0.37.9",
+    "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/i18n/en/functions.json

@@ -182,7 +182,8 @@
     "NO_LOGS_HAVE_BEEN_FOUND": "No logs have been found...",
     "NODE_SELECTORS": "Node selector",
     "NORMAL": "Normal",
-    "NOT_START_WITH_FORBIDDEN_WORDS": "Must not start with 'kubernetes.io', 'k8s.io' or 'nuclio.io'",
+    "NOT_START_WITH_FORBIDDEN_WORDS_ANNOTATION": "Must not start with 'kubernetes.io', 'k8s.io'",
+    "NOT_START_WITH_FORBIDDEN_WORDS_LABEL": "Must not start with 'kubernetes.io', 'k8s.io' or 'nuclio.io'",
     "NOT_YET_DEPLOYED": "Not yet deployed",
     "OAUTH2": "OAuth2",
     "ONBUILD_IMAGE": "Onbuild image",

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

@@ -17,15 +17,20 @@
             transclude: true
         });
 
-    function IgzElementLoadingStatusController($element, $scope, $state, $timeout, $i18next, i18next, lodash) {
+    function IgzElementLoadingStatusController($element, $scope, $state, $i18next, i18next, lodash) {
         var ctrl = this;
-        var defaultHeight = 0;
         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;
 
@@ -36,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,
@@ -66,7 +75,10 @@
                 });
             }
 
-            defaultHeight = ctrl.loadingStatusSize === 'small' ? 20 : 40;
+            if (changes && changes.name && changes.name.currentValue !== changes.name.previousValue) {
+                deregisterBroadcasts();
+                registerBroadcasts();
+            }
         }
 
         //
@@ -98,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;
         }
 
         /**
@@ -114,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
          */
@@ -123,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/size/size.component.js

@@ -341,7 +341,7 @@
             $scope.$on('info-page-pane_toggled', updateChart);
             $scope.$on('resize-size-cells', updateChart);
 
-            timeout = $timeout(updateChart);
+            updateChart();
         }
 
         /**

package/src/igz_controls/directives/resizable-table-column.directive.js

@@ -43,7 +43,11 @@
                 $timeout(initColumnsWidths);
                 $timeout(initElements);
 
-                angular.element($window).on('resize', reloadColumns);
+                angular.element($window).on('resize', function () {
+                    $timeout(function () {
+                        reloadColumns()
+                    }, 200)
+                });
                 $scope.$on('reload-columns', reloadColumns);
                 $scope.$on('resizable-table-column_reset-data', resetData);
                 $scope.$on('$destroy', onDestroy);
@@ -243,7 +247,7 @@
                             columnWidth: ctrl.columnHeadWidth + 'px',
                             nextColumnWidth: ctrl.nextBlockWidth + 'px'
                         });
-                    }, 200);
+                    });
                 }
             }
 

package/src/igz_controls/services/validation.service.js

@@ -294,12 +294,6 @@
                         $i18next.t('common:BEGIN_END_WITH', { lng: lng }) + ': a–z, 0–9',
                     pattern: /^([a-z0-9]([^/]*[a-z0-9])?\/)?[^/]+$/
                 },
-                {
-                    name: 'prefixNotStart',
-                    label: '[' + $i18next.t('functions:PREFIX', { lng: lng }) + '] ' +
-                        $i18next.t('functions:NOT_START_WITH_FORBIDDEN_WORDS', { lng: lng }),
-                    pattern: /^(?!kubernetes\.io\/)(?!k8s\.io\/)(?!nuclio\.io\/)/
-                },
                 {
                     name: 'prefixMaxLength',
                     label: '[' + $i18next.t('functions:PREFIX', { lng: lng }) + '] ' +
@@ -330,7 +324,6 @@
                     generateRule.validCharacters('a-z A-Z 0-9 - _ .'),
                     generateRule.beginNotWith('0-9 .')
                 ],
-                prefixedQualifiedName: commonRules.prefixedQualifiedName,
                 qualifiedName: [
                     generateRule.validCharacters('a-z A-Z 0-9 - _ .'),
                     generateRule.beginEndWith('a-z A-Z 0-9'),
@@ -358,9 +351,25 @@
                     generateRule.length({ max: lengths.function.name })
                 ),
                 label: {
-                    key: commonRules.prefixedQualifiedName.concat(generateRule.length({
-                        max: lengths.function.label.key
-                    }))
+                    key: commonRules.prefixedQualifiedName.concat(
+                        {
+                            name: 'prefixNotStart',
+                            label: '[' + $i18next.t('functions:PREFIX', {lng: lng}) + '] ' +
+                                $i18next.t('functions:NOT_START_WITH_FORBIDDEN_WORDS_LABEL', {lng: lng}),
+                            pattern: /^(?!kubernetes\.io\/)(?!k8s\.io\/)(?!nuclio\.io\/)/
+                        },
+                        generateRule.length({
+                            max: lengths.function.label.key
+                        }))
+                },
+                annotation: {
+                    key: commonRules.prefixedQualifiedName.concat(
+                        {
+                            name: 'prefixNotStart',
+                            label: '[' + $i18next.t('functions:PREFIX', {lng: lng}) + '] ' +
+                                $i18next.t('functions:NOT_START_WITH_FORBIDDEN_WORDS_ANNOTATION', {lng: lng}),
+                            pattern: /^(?!kubernetes\.io\/)(?!k8s\.io\/)/
+                        })
                 },
                 itemPath: [generateRule.length({ max: lengths.function.itemPath })],
                 subscriptionQoS: [

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

@@ -38,7 +38,7 @@
             name: $i18next.t('functions:TOOLTIP.ANNOTATION', { lng: lng })
         });
         ctrl.validationRules = {
-            key: ValidationService.getValidationRules('k8s.prefixedQualifiedName', [
+            key: ValidationService.getValidationRules('function.annotation.key', [
                 {
                     name: 'uniqueness',
                     label: $i18next.t('functions:UNIQUENESS', { lng: lng }),
@@ -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();
         }