iguazio.dashboard-controls 1.0.15-3.6.2 → 1.0.16-1.13.x

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