iguazio.dashboard-controls 1.0.12 → 1.0.13-1.13.x

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iguazio.dashboard-controls",
-    "version": "1.0.12",
+    "version": "1.0.13-1.13.x",
     "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": {
@@ -33,7 +33,7 @@
         "bootstrap": "~3.4.1",
         "del": "^6.1.1",
         "eslint-plugin-angular": "^4.0.1",
-        "express": "4.19.2",
+        "express": "4.18.1",
         "gulp": "^4.0.2",
         "gulp-babel": "^8.0.0",
         "gulp-concat": "^2.6.1",

package/src/i18n/en/common.json

@@ -103,6 +103,7 @@
     "DISABLING": "Disabling",
     "DISCARD": "Discard",
     "DISCARD_ALL_PENDING_CHANGES_CONFIRM": "Discard all pending changes?",
+    "DO_NOT_CREATE_HTTP_TRIGGER_BY_DEFAULT": "Do not create http trigger by default",
     "DO_NOT_SHOW_AGAIN": "Do not show again",
     "DOCS": "Docs",
     "DONE": "Done",
@@ -523,7 +524,6 @@
     "UNDO_EDIT": "Undo edit",
     "UNDO_RESTART": "Undo restart",
     "UNHEALTHY": "Unhealthy",
-    "UNIQUENESS": "Uniqueness",
     "UNKNOWN": "Unknown",
     "UNSTABLE": "Unstable",
     "UPDATE": "Update",

package/src/i18n/en/functions.json

@@ -324,6 +324,7 @@
         "DEPLOY_IN_PROGRESS": "Deploy is already in-progress",
         "DISABLE_CACHE": "Build the function's Docker image from scratch without reusing any previously built Docker image layers",
         "DISABLED_FUNCTION": "Only running and scaled-to-zero functions can be tested",
+        "DO_NOT_CREATE_HTTP_TRIGGER_BY_DEFAULT": "When not checked, an http trigger will be created for the function by default",
         "GIT": {
             "BRANCH": "The Git repository branch from which to download the function code",
             "BRANCH_TAG_REFERENCE_DISABLED": "Exactly one of Branch, Tag, and Reference fields must be filled. When one is filled, the others are disabled.",
@@ -388,6 +389,7 @@
     "TRIGGER_CRON_INTERVAL_NO_SCHEDULE": "Applicable only when \"Schedule\" is empty",
     "TRIGGER_SECRET_ACCESS_KEY": "\"{{triggerName}}\" trigger secret access key",
     "TRIGGERS_NOT_FOUND": "There are currently no triggers, you can create a trigger by clicking the ‘Create a new trigger’ button",
+    "UNIQUENESS": "Uniqueness",
     "UNSPECIFIED_FIELD_NAME": "Unspecified field name",
     "URL_NOT_EXPOSED": "URL not exposed",
     "V3IO": "V3IO",

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

@@ -32,7 +32,6 @@ such restriction.
                 dns1123Subdomain: 253,
                 prefixedQualifiedName: 253,
                 qualifiedName: 63,
-                qualifiedValue: 63,
                 secretName: 253,
                 wildcardDns1123Subdomain: 253
             },
@@ -152,12 +151,12 @@ such restriction.
                     pattern: new RegExp('[^' + convertToPattern(chars) + ']$')
                 };
             },
-            beginEndWith: function (chars, labelPrefix = '') {
+            beginEndWith: function (chars) {
                 var convertedPattern = convertToPattern(chars);
 
                 return {
                     name: 'beginEnd',
-                    label: labelPrefix + $i18next.t('common:BEGIN_END_WITH', { lng: lng }) + ': ' + convertToLabel(chars),
+                    label: $i18next.t('common:BEGIN_END_WITH', { lng: lng }) + ': ' + convertToLabel(chars),
                     pattern: new RegExp('^([' + convertedPattern + '].*)?[' + convertedPattern + ']$')
                 };
             },
@@ -179,10 +178,10 @@ such restriction.
                     pattern: new RegExp('^([' + convertedPattern + '])?[^' + convertedPattern + ']+$')
                 };
             },
-            validCharacters: function (chars, labelPrefix = '') {
+            validCharacters: function (chars) {
                 return {
                     name: 'validCharacters',
-                    label: labelPrefix + $i18next.t('common:VALID_CHARACTERS', { lng: lng }) + ': ' + convertToLabel(chars),
+                    label: $i18next.t('common:VALID_CHARACTERS', { lng: lng }) + ': ' + convertToLabel(chars),
                     pattern: new RegExp('^[' + convertToPattern(chars) + ']+$')
                 };
             },
@@ -239,12 +238,12 @@ such restriction.
                     }
                 };
             },
-            length: function (options, labelPrefix = '') {
+            length: function (options) {
                 var min = Number.isSafeInteger(options.min) ? options.min : 0;
                 var max = Number.isSafeInteger(options.max) ? options.max : '';
 
                 if (min || max) {
-                    var label = labelPrefix + $i18next.t('common:LENGTH', { lng: lng }) + ' – ' +
+                    var label = $i18next.t('common:LENGTH', { lng: lng }) + ' – ' +
                         (min ? 'min: ' + options.min + '\xa0\xa0' : '') + (max ? 'max: ' + options.max : '');
 
                     return {
@@ -295,17 +294,6 @@ such restriction.
                 generateRule.validCharacters('a-z 0-9 -'),
                 generateRule.beginEndWith('a-z 0-9')
             ],
-            k8s: {
-                getValue: function (withPrefix = false) {
-                    var labelPrefix = withPrefix ? '[' + $i18next.t('common:VALUE', { lng: lng }) + '] ' : '';
-
-                    return [
-                        generateRule.beginEndWith('a-z A-Z 0-9', labelPrefix),
-                        generateRule.length({ max: lengths.k8s.qualifiedValue }, labelPrefix),
-                        generateRule.validCharacters('a-z A-Z 0-9 - _ .', labelPrefix)
-                    ]
-                }
-            },
             prefixedQualifiedName: [
                 {
                     name: 'nameValidCharacters',
@@ -502,7 +490,26 @@ such restriction.
                                 $i18next.t('common:NOT_START_WITH_FORBIDDEN_WORDS_K8S', { lng: lng }),
                             pattern: /^(?!kubernetes\.io\/)(?!k8s\.io\/)/
                         }),
-                    value: commonRules.k8s.getValue(true)
+                    value: [
+                        {
+                            name: 'valueBeginEnd',
+                            label: '[' + $i18next.t('common:VALUE', { lng: lng }) + '] ' +
+                                $i18next.t('common:BEGIN_END_WITH', { lng: lng }) + ': a–z, A–Z, 0–9',
+                            pattern: /^([^/]+\/)?([A-Za-z0-9][^/]*)?[A-Za-z0-9]$/
+                        },
+                        {
+                            name: 'valueMaxLength',
+                            label: '[' + $i18next.t('common:VALUE', { lng: lng }) + '] ' +
+                                $i18next.t('common:MAX_LENGTH_CHARACTERS', { lng: lng, count: 63 }),
+                            pattern: /^([^/]+\/)?[^/]{1,63}$/
+                        },
+                        {
+                            name: 'valueValidCharacters',
+                            label: '[' + $i18next.t('common:VALUE', { lng: lng }) + '] ' +
+                                $i18next.t('common:VALID_CHARACTERS', { lng: lng }) + ': a–z, A–Z, 0–9, –, _, .',
+                            pattern: /^[a-zA-Z0-9\-_.]+$/
+                        }
+                    ]
                 },
                 supportLogs: {
                     contextId: [
@@ -599,8 +606,8 @@ such restriction.
                 address: [
                     {
                         name: 'begin',
-                        label: $i18next.t('common:BEGIN_WITH', { lng: lng }) + ': ldap://',
-                        pattern: /^ldap?:\/\//
+                        label: $i18next.t('common:BEGIN_WITH', { lng: lng }) + ': ldaps://, ldap://',
+                        pattern: /^ldaps?:\/\//
                     }
                 ]
             },
@@ -670,11 +677,7 @@ such restriction.
                 generateRule.beginWith('0-9 +'),
                 generateRule.endWith('0-9'),
                 generateRule.length({ min: 4, max: lengths.phone })
-            ],
-            nodeSelectors: {
-                key: commonRules.prefixedQualifiedName,
-                value: commonRules.k8s.getValue(false)
-            }
+            ]
         };
 
         return {

package/src/nuclio/common/screens/create-function/function-from-scratch/function-from-scratch.component.js

@@ -218,20 +218,6 @@ such restriction.
                     '0sIGVycm9yKSB7DQogICAgcmV0dXJuIG5pbCwgbmlsDQp9', // source code in base64
                     visible: true
                 },
-                {
-                    id: 'python:3.7',
-                    name: 'Python 3.7 ' + $i18next.t('functions:DEPRECATED_SOON_LABEL', {lng: lng}),
-                    sourceCode: 'ZGVmIGhhbmRsZXIoY29udGV4dCwgZXZlbnQpOg0KICAgIHJldHVybiAiIg==', // source code in base64
-                    nameTemplate: 'Python 3.7 ' + '<b>' + $i18next.t('functions:DEPRECATED_SOON_LABEL', {lng: lng}) + '</b>',
-                    visible: true
-                },
-                {
-                    id: 'python:3.8',
-                    name: 'Python 3.8 ' + $i18next.t('functions:DEPRECATED_SOON_LABEL', {lng: lng}),
-                    sourceCode: 'ZGVmIGhhbmRsZXIoY29udGV4dCwgZXZlbnQpOg0KICAgIHJldHVybiAiIg==', // source code in base64
-                    nameTemplate: 'Python 3.8 ' + '<b>' + $i18next.t('functions:DEPRECATED_SOON_LABEL', {lng: lng}) + '</b>',
-                    visible: true
-                },
                 {
                     id: 'python:3.9',
                     name: 'Python 3.9',

package/src/nuclio/common/screens/create-function/function-from-template/function-from-template.component.js

@@ -385,20 +385,6 @@ such restriction.
                     name: 'Go',
                     visible: true
                 },
-                {
-                    id: 'python:3.7',
-                    name: 'Python 3.7 ' + $i18next.t('functions:DEPRECATED_SOON_LABEL', {lng: lng}),
-                    sourceCode: 'ZGVmIGhhbmRsZXIoY29udGV4dCwgZXZlbnQpOg0KICAgIHJldHVybiAiIg==', // source code in base64
-                    nameTemplate: 'Python 3.7 ' + '<b>' + $i18next.t('functions:DEPRECATED_SOON_LABEL', {lng: lng}) + '</b>',
-                    visible: true
-                },
-                {
-                    id: 'python:3.8',
-                    name: 'Python 3.8 ' + $i18next.t('functions:DEPRECATED_SOON_LABEL', {lng: lng}),
-                    sourceCode: 'ZGVmIGhhbmRsZXIoY29udGV4dCwgZXZlbnQpOg0KICAgIHJldHVybiAiIg==', // source code in base64
-                    nameTemplate: 'Python 3.8 ' + '<b>' + $i18next.t('functions:DEPRECATED_SOON_LABEL', {lng: lng}) + '</b>',
-                    visible: true
-                },
                 {
                     id: 'python:3.9',
                     name: 'Python 3.9',

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

@@ -58,7 +58,7 @@ such restriction.
             key: ValidationService.getValidationRules('function.annotation.key', [
                 {
                     name: 'uniqueness',
-                    label: $i18next.t('common:UNIQUENESS', { lng: lng }),
+                    label: $i18next.t('functions:UNIQUENESS', { lng: lng }),
                     pattern: validateUniqueness
                 }
             ])

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

@@ -38,19 +38,19 @@ such restriction.
         var envVariableFromValidationRules = ValidationService.getValidationRules('k8s.configMapKey', [
             {
                 name: 'uniqueness',
-                label: $i18next.t('common:UNIQUENESS', {lng: lng}),
+                label: $i18next.t('functions:UNIQUENESS', {lng: lng}),
                 pattern: validateUniqueness.bind(null, ['configMapRef.name', 'secretRef.name'])
             }
         ]);
         var envVariableKeyValidationRule = ValidationService.getValidationRules('k8s.envVarName', [{
             name: 'uniqueness',
-            label: $i18next.t('common:UNIQUENESS', {lng: lng}),
+            label: $i18next.t('functions:UNIQUENESS', {lng: lng}),
             pattern: validateUniqueness.bind(null, ['name'])
         }]);
         var envVariableConfigmapKeyValidationRule = ValidationService.getValidationRules('k8s.configMapKey', [
             {
                 name: 'uniqueness',
-                label: $i18next.t('common:UNIQUENESS', {lng: lng}),
+                label: $i18next.t('functions:UNIQUENESS', {lng: lng}),
                 pattern: validateUniqueness.bind(null, ['valueFrom.configMapKeyRef.key'])
             }
         ]);

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

@@ -60,7 +60,7 @@ such restriction.
             key: ValidationService.getValidationRules('function.label.key', [
                 {
                     name: 'uniqueness',
-                    label: $i18next.t('common:UNIQUENESS', { lng: lng }),
+                    label: $i18next.t('functions:UNIQUENESS', { lng: lng }),
                     pattern: validateUniqueness
                 }
             ]),

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

@@ -99,14 +99,14 @@ such restriction.
         ];
         ctrl.nodeSelectors = [];
         ctrl.nodeSelectorsValidationRules = {
-            key: ValidationService.getValidationRules('nodeSelectors.key').concat([
+            key: [
                 {
                     name: 'uniqueness',
-                    label: $i18next.t('common:UNIQUENESS', {lng: lng}),
+                    label: $i18next.t('functions:UNIQUENESS', {lng: lng}),
                     pattern: validateNodeSelectorUniqueness
                 }
-            ]),
-            value: ValidationService.getValidationRules('nodeSelectors.value')
+            ],
+            value: ValidationService.getValidationRules('k8s.qualifiedName')
         };
         ctrl.podsPriorityOptions = [
             {
@@ -210,7 +210,7 @@ such restriction.
                 ctrl.maxReplicas = lodash.get(ctrl.version, 'spec.maxReplicas');
 
                 initScaleToZeroData();
-                initNodeSelectors();
+                initNodeSelectors(changes.version.isFirstChange());
 
                 $timeout(function () {
                     setFormValidity();
@@ -346,11 +346,10 @@ such restriction.
          */
         function handleRevertToDefaultsClick() {
             DialogsService.confirm($i18next.t('functions:REVERT_NODE_SELECTORS_TO_DEFAULTS_CONFIRM', {lng: lng}),
-                                   $i18next.t('functions:YES_REVERT_CONFIRM', {lng: lng}))
-                .then(function () {
-                    setNodeSelectorsDefaultValue();
-                    $rootScope.$broadcast('igzWatchWindowResize::resize');
-                });
+                                   $i18next.t('functions:YES_REVERT_CONFIRM', {lng: lng}),
+                                   $i18next.t('common:CANCEL', {lng: lng})).then(function () {
+                setNodeSelectorsDefaultValue();
+            });
         }
 
         /**
@@ -560,14 +559,15 @@ such restriction.
          * Checks whether the `Revert to defaults` button must be hidden
          */
         function checkNodeSelectorsIdentity() {
-            var nodeSelectors = lodash.reduce(ctrl.nodeSelectors, function (acc, nodeSelector) {
-                acc[nodeSelector.name] = nodeSelector.value;
-
-                return acc;
-            }, {});
+            const nodeSelectors = lodash.map(ctrl.nodeSelectors, function (selector) {
+                return {
+                    key: selector.name,
+                    value: selector.value
+                }
+            });
 
             ctrl.revertToDefaultsBtnIsHidden = lodash.isEqual(
-                lodash.get(ConfigService,'nuclio.defaultFunctionConfig.attributes.spec.nodeSelector', {}), nodeSelectors);
+                lodash.get(ConfigService,'nuclio.defaultFunctionConfig.attributes.spec.nodeSelector', []), nodeSelectors);
         }
 
         /**
@@ -611,7 +611,7 @@ such restriction.
         /**
          * Initializes data for Node selectors section
          */
-        function initNodeSelectors() {
+        function initNodeSelectors(isFirstInit) {
             ctrl.nodeSelectors = lodash.chain(ctrl.version)
                 .get('spec.nodeSelector', {})
                 .map(function (value, key) {
@@ -627,7 +627,7 @@ such restriction.
                 })
                 .value();
 
-            if ($stateParams.isNewFunction && lodash.isEmpty(ctrl.nodeSelectors)) {
+            if ($stateParams.isNewFunction && isFirstInit) {
                 setNodeSelectorsDefaultValue();
             } else {
                 checkNodeSelectorsIdentity();
@@ -798,10 +798,6 @@ such restriction.
                     };
                 })
                 .value();
-
-            $timeout(function () {
-                updateNodeSelectors();
-            }, 0);
         }
 
         /**

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

@@ -50,7 +50,7 @@ such restriction.
         ctrl.validationRules = {
             itemName: [],
             itemPath: ValidationService.getValidationRules('function.itemPath', [{
-                label: $i18next.t('common:UNIQUENESS', { lng: lng }),
+                label: $i18next.t('functions:UNIQUENESS', { lng: lng }),
                 pattern: validateUniqueness.bind(null, 'volumeMount.mountPath')
             }]),
             containerName: ValidationService.getValidationRules('container.name')

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

@@ -47,6 +47,7 @@ such restriction.
         };
 
         ctrl.$onInit = onInit;
+        ctrl.$onChanges = onChanges;
 
         ctrl.checkIsErrorState = checkIsErrorState;
         ctrl.onRowCollapse = onRowCollapse;
@@ -64,6 +65,16 @@ such restriction.
             initEnrichedNodeSelectors();
         }
 
+        /**
+         * On changes hook method
+         * @param {Object} changes
+         */
+        function onChanges(changes) {
+            if (lodash.has(changes, 'version')) {
+                initEnrichedNodeSelectors();
+            }
+        }
+
         //
         // Public methods
         //

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

@@ -52,7 +52,7 @@ such restriction.
             },
             itemName: ValidationService.getValidationRules('function.triggerName', [{
                 name: 'uniqueness',
-                label: $i18next.t('common:UNIQUENESS', { lng: lng }),
+                label: $i18next.t('functions:UNIQUENESS', { lng: lng }),
                 pattern: function (value) {
                     return lodash.filter(ctrl.triggers, ['name', value]).length <= 1;
                 }
@@ -83,6 +83,7 @@ such restriction.
         ctrl.editTriggerCallback = editTriggerCallback;
         ctrl.handleAction = handleAction;
         ctrl.isCreateNewTriggerEnabled = isCreateNewTriggerEnabled;
+        ctrl.isHttpTriggerCheckboxShown = isHttpTriggerCheckboxShown;
         ctrl.isHttpTriggerMsgShown = isHttpTriggerMsgShown;
 
         //
@@ -253,6 +254,15 @@ such restriction.
             });
         }
 
+        /**
+         * Tests whether the `Do not create http trigger by default` checkbox is shown
+         * @returns {boolean}
+         */
+        function isHttpTriggerCheckboxShown() {
+            return !lodash.get(ConfigService, 'nuclio.disableDefaultHttpTrigger', false) &&
+              !lodash.some(ctrl.version.spec.triggers, ['kind', 'http']);
+        }
+
         /**
          * Tests whether the `HTTP trigger message` is shown
          * @returns {boolean} `true` in case "HTTP trigger message" is shown, or `false` otherwise.

package/src/nuclio/functions/version/version-triggers/version-triggers.less

@@ -28,6 +28,10 @@
         }
     }
 
+    .http-trigger-checkbox {
+        display: flex;
+    }
+
     .item-row .item-name, .item-row .item-class, .item-row .item-info {
         padding-left: 0;
     }

package/src/nuclio/functions/version/version-triggers/version-triggers.tpl.html

@@ -3,6 +3,22 @@
         <div class="content-message-pane"
              data-ng-if="$ctrl.isHttpTriggerMsgShown()" data-ng-i18next="[html]functions:HTTP_TRIGGER_MSG">
         </div>
+        <div class="http-trigger-checkbox" data-ng-if="$ctrl.isHttpTriggerCheckboxShown()">
+            <input type="checkbox"
+                   class="small"
+                   id="disable-default-http-trigger"
+                   name="disableDefaultHTTPTrigger"
+                   data-ng-model="$ctrl.version.spec.disableDefaultHTTPTrigger"
+                   data-ng-disabled="$ctrl.isFunctionDeploying()"
+            >
+            <label for="disable-default-http-trigger"
+                   class="checkbox-inline">{{ 'common:DO_NOT_CREATE_HTTP_TRIGGER_BY_DEFAULT' | i18next }}</label>
+            <igz-more-info
+                    data-description="{{ 'functions:TOOLTIP.DO_NOT_CREATE_HTTP_TRIGGER_BY_DEFAULT' | i18next }}"
+                    data-trigger="click"
+                    data-default-tooltip-placement="right">
+            </igz-more-info>
+        </div>
         <div class="common-table-header header-row">
             <div class="common-table-cell header-name">
                 {{ 'common:NAME' | i18next }}