iguazio.dashboard-controls 0.37.7 → 0.37.11

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iguazio.dashboard-controls",
-    "version": "0.37.7",
+    "version": "0.37.11",
     "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

@@ -8,6 +8,7 @@
                 loadingStatusSize: '@?',
                 name: '@',
                 refresh: '<?',
+                textStatus: '<?',
                 title: '@?',
                 tooltipLabel: '@?'
             },
@@ -16,9 +17,8 @@
             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;
@@ -26,12 +26,10 @@
         ctrl.isShowError = false;
 
         ctrl.$onInit = onInit;
-        ctrl.$postLink = postLink;
         ctrl.$onChanges = onChanges;
 
         ctrl.checkSize = checkSize;
         ctrl.refreshPage = refreshPage;
-        ctrl.setWrapperHeight = setWrapperHeight;
 
         //
         // Hook methods
@@ -41,18 +39,11 @@
          * Initialization method
          */
         function onInit() {
-            $scope.$on('element-loading-status_show-spinner', showSpinner);
-            $scope.$on('element-loading-status_hide-spinner', hideSpinner);
+            $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', showError);
-            $scope.$on('element-loading-status_hide-error', hideError);
-        }
-
-        /**
-         * Post linking method
-         */
-        function postLink() {
-            setWrapperHeight();
+            $scope.$on('element-loading-status_show-error_' + ctrl.name, showError);
+            $scope.$on('element-loading-status_hide-error_' + ctrl.name, hideError);
         }
 
         /**
@@ -73,8 +64,6 @@
                     refresh: true
                 });
             }
-
-            defaultHeight = ctrl.loadingStatusSize === 'small' ? 20 : 40;
         }
 
         //
@@ -101,80 +90,40 @@
             $state.go($state.current, {}, {reload: true});
         }
 
-        /**
-         * Set height of spinner wrapper
-         */
-        function setWrapperHeight() {
-            $timeout(function () {
-                var elementHeight = $element.height() > 0 ? $element.height() : defaultHeight;
-                var elementParentHeight = $element.parent().height() > 0 ? $element.parent().height() : defaultHeight;
-
-                if (ctrl.isShowSpinner) {
-                    $element.find('.loader-wrapper').height(elementParentHeight || elementHeight);
-                    $element.find('.loader-wrapper').addClass('appeared');
-                }
-
-                if (ctrl.isShowError) {
-                    $element.find('.loading-error').height(elementHeight || elementParentHeight);
-                    $element.find('.loading-error').addClass('appeared');
-                }
-            });
-        }
-
         //
         // Private methods
         //
 
         /**
          * Show given loading spinner
-         * @param {Object} ev - angular event object
-         * @param {Object} args - arguments passed from $broadcast
          */
-        function showSpinner(ev, args) {
-            if (args.name === ctrl.name) {
-                ctrl.isShowError = false;
-                ctrl.isShowContent = false;
-                ctrl.isShowSpinner = true;
-                ctrl.setWrapperHeight();
-            }
+        function showSpinner() {
+            ctrl.isShowError = false;
+            ctrl.isShowContent = false;
+            ctrl.isShowSpinner = true;
         }
 
         /**
          * Hide given loading spinner
-         * @param {Object} ev - angular event object
-         * @param {Object} args - arguments passed from $broadcast
          */
-        function hideSpinner(ev, args) {
-            if (args.name === ctrl.name) {
-                ctrl.isShowSpinner = false;
-                $timeout(function () {
-                    ctrl.isShowContent = true;
-                }, 2);
-            }
+        function hideSpinner() {
+            ctrl.isShowSpinner = false;
+            ctrl.isShowContent = true;
         }
 
         /**
          * Show given loading error
-         * @param {Object} ev - angular event object
-         * @param {Object} args - arguments passed from $broadcast
          */
-        function showError(ev, args) {
-            if (args.name === ctrl.name) {
-                ctrl.isShowError = true;
-                ctrl.isShowSpinner = false;
-                ctrl.setWrapperHeight();
-            }
+        function showError() {
+            ctrl.isShowError = true;
+            ctrl.isShowSpinner = false;
         }
 
         /**
          * Hide given loading error
-         * @param {Object} ev - angular event object
-         * @param {Object} args - arguments passed from $broadcast
          */
-        function hideError(ev, args) {
-            if (args.name === ctrl.name) {
-                ctrl.isShowError = false;
-            }
+        function hideError() {
+            ctrl.isShowError = false;
         }
     }
 }());

package/src/igz_controls/components/element-loading-status/element-loading-status.less

@@ -9,20 +9,9 @@
         height: 100%;
         width: 100%;
         position: relative;
-        opacity: 0;
-        transition: opacity .2s;
 
-        &.appeared {
-            opacity: 1;
-            transition: opacity .5s;
-        }
-
-        // Overcome ngAnimate delay (hide this ng-if block immediately)
-        &.ng-leave {
-            transition: initial;
-            display: none;
-            height: 0;
-            width: 0;
+        .loader-text {
+            color: @loading-text-color;
         }
     }
 
@@ -32,18 +21,6 @@
         width: 100%;
         height: 100%;
         position: relative;
-        opacity: 0;
-        transition: opacity .2s;
-
-        &.appeared {
-            opacity: 1;
-            transition: opacity .5s;
-        }
-
-        // Overcome ngAnimate delay (hide this ng-if block immediately)
-        &.ng-leave {
-            display: none;
-        }
 
         .sad-icon {
             position: absolute;
@@ -95,4 +72,4 @@
             }
         }
     }
-}
+}

package/src/igz_controls/components/element-loading-status/element-loading-status.tpl.html

@@ -1,6 +1,7 @@
 <div class="element-loading-status" data-ng-class="'loading-status-' + $ctrl.loadingStatusSize">
     <div class="loader-wrapper" data-ng-if="$ctrl.isShowSpinner">
         <div class="loader-fading-circle"
+             data-ng-if="!$ctrl.textStatus"
              data-uib-tooltip="{{$ctrl.tooltipLabel}}"
              data-tooltip-placement="top"
              data-tooltip-popup-delay="100"
@@ -18,6 +19,7 @@
             <div class="loader-circle11 loader-circle"></div>
             <div class="loader-circle12 loader-circle"></div>
         </div>
+        <div data-ng-if="$ctrl.textStatus" class="loader-text">{{ 'common:LOADING_CAPITALIZE_ELLIPSIS' | i18next }}</div>
     </div>
 
     <div data-ng-if="$ctrl.isShowContent && !$ctrl.isShowError">

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/element-loading-status.service.js

@@ -22,7 +22,7 @@
          * @param {string} name - spinner name
          */
         function showSpinner(name) {
-            $rootScope.$broadcast('element-loading-status_show-spinner', {name: name});
+            $rootScope.$broadcast('element-loading-status_show-spinner_' + name);
         }
 
         /**
@@ -30,7 +30,7 @@
          * @param {string} name - spinner name
          */
         function hideSpinner(name) {
-            $rootScope.$broadcast('element-loading-status_hide-spinner', {name: name});
+            $rootScope.$broadcast('element-loading-status_hide-spinner_' + name);
         }
 
         /**
@@ -54,7 +54,7 @@
          * @param {string} name - spinner name
          */
         function showLoadingError(name) {
-            $rootScope.$broadcast('element-loading-status_show-error', {name: name});
+            $rootScope.$broadcast('element-loading-status_show-error_' + name);
         }
 
         /**
@@ -62,7 +62,7 @@
          * @param {string} name - spinner name
          */
         function hideLoadingError(name) {
-            $rootScope.$broadcast('element-loading-status_hide-error', {name: name});
+            $rootScope.$broadcast('element-loading-status_hide-error_' + name);
         }
 
         /**

package/src/igz_controls/services/element-loading-status.service.spec.js

@@ -20,81 +20,81 @@ describe('ElementLoadingStatusService: ', function () {
 
     describe('loading spinners: ', function () {
         it('showSpinner() ', function () {
-            ElementLoadingStatusService.showSpinner('show spinner');
-            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_show-spinner', {name: 'show spinner'});
+            ElementLoadingStatusService.showSpinner('show-spinner');
+            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_show-spinner_show-spinner' );
         });
 
         it('hideSpinner() ', function () {
-            ElementLoadingStatusService.hideSpinner('hide spinner');
-            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_hide-spinner', {name: 'hide spinner'});
+            ElementLoadingStatusService.hideSpinner('hide-spinner');
+            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_hide-spinner_hide-spinner');
         });
 
         it('showSpinnerGroup() ', function () {
             var names = [
-                'show spinner 1',
-                'show spinner 2',
-                'show spinner 3'
+                'first-spinner',
+                'second-spinner',
+                'third-spinner'
             ];
 
             ElementLoadingStatusService.showSpinnerGroup(names);
 
-            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_show-spinner', {name: 'show spinner 1'});
-            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_show-spinner', {name: 'show spinner 2'});
-            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_show-spinner', {name: 'show spinner 3'});
+            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_show-spinner_first-spinner');
+            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_show-spinner_second-spinner');
+            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_show-spinner_third-spinner');
         });
 
         it('hideSpinnerGroup() ', function () {
             var names = [
-                'show spinner 1',
-                'show spinner 2',
-                'show spinner 3'
+                'first-spinner',
+                'second-spinner',
+                'third-spinner'
             ];
 
             ElementLoadingStatusService.hideSpinnerGroup(names);
 
-            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_hide-spinner', {name: 'show spinner 1'});
-            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_hide-spinner', {name: 'show spinner 2'});
-            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_hide-spinner', {name: 'show spinner 3'});
+            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_hide-spinner_first-spinner');
+            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_hide-spinner_second-spinner');
+            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_hide-spinner_third-spinner');
         });
     });
 
     describe('loading errors: ', function () {
         it('showLoadingError() ', function () {
-            ElementLoadingStatusService.showLoadingError('show error');
-            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_show-error', {name: 'show error'});
+            ElementLoadingStatusService.showLoadingError('show-error');
+            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_show-error_show-error');
         });
 
         it('hideLoadingError() ', function () {
-            ElementLoadingStatusService.hideLoadingError('hide error');
-            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_hide-error', {name: 'hide error'});
+            ElementLoadingStatusService.hideLoadingError('hide-error');
+            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_hide-error_hide-error');
         });
 
         it('showLoadingErrorGroup() ', function () {
             var names = [
-                'show error 1',
-                'show error 2',
-                'show error 3'
+                'first-error',
+                'second-error',
+                'third-error'
             ];
 
             ElementLoadingStatusService.showLoadingErrorGroup(names);
 
-            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_show-error', {name: 'show error 1'});
-            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_show-error', {name: 'show error 2'});
-            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_show-error', {name: 'show error 3'});
+            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_show-error_first-error');
+            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_show-error_second-error');
+            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_show-error_third-error');
         });
 
         it('hideLoadingErrorGroup() ', function () {
             var names = [
-                'show error 1',
-                'show error 2',
-                'show error 3'
+                'first-error',
+                'second-error',
+                'third-error'
             ];
 
             ElementLoadingStatusService.hideLoadingErrorGroup(names);
 
-            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_hide-error', {name: 'show error 1'});
-            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_hide-error', {name: 'show error 2'});
-            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_hide-error', {name: 'show error 3'});
+            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_hide-error_first-error');
+            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_hide-error_second-error');
+            expect($rootScope.$broadcast).toHaveBeenCalledWith('element-loading-status_hide-error_third-error');
         });
     });
-});
+});

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 }),