iguazio.dashboard-controls 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iguazio.dashboard-controls",
-    "version": "1.0.6",
+    "version": "1.0.8",
     "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/common.json

@@ -106,7 +106,6 @@
     "DO_NOT_SHOW_AGAIN": "Do not show again",
     "DOCS": "Docs",
     "DONE": "Done",
-    "DO_NOT_CREATE_HTTP_TRIGGER_BY_DEFAULT": "Do not create http trigger by default",
     "DONT_LEAVE": "Don't leave",
     "DONT_REFRESH": "Don't refresh",
     "DONT_SAVE": "Don't save",

package/src/i18n/en/functions.json

@@ -323,7 +323,6 @@
         "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.",

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

@@ -200,9 +200,16 @@ such restriction.
             },
             notContainCharacters: function (chars) {
                 return {
-                    name: 'notContain',
+                    name: 'notContainCharacters',
                     label: $i18next.t('common:NOT_CONTAIN', { lng: lng }) + ': ' + convertToLabel(chars),
-                    pattern: new RegExp('^[^' + convertToLabel(chars) + ']+$')
+                    pattern: new RegExp('^[^' + convertToPattern(chars) + ']+$')
+                }
+            },
+            notContainString: function (string) {
+                return {
+                    name: 'notContainString',
+                    label: $i18next.t('common:NOT_CONTAIN', { lng: lng }) + ': ' + convertToLabel(string),
+                    pattern: new RegExp('^(?!.*' + convertToPattern(string) + ').+$')
                 }
             },
             maxLengthBetweenDelimiters: function (delimiter, maxLength, delimiterDescription) {
@@ -465,10 +472,9 @@ such restriction.
                 dockerRegistryUrl: [
                     {
                         name: 'beginNot',
-                        label: $i18next.t('common:BEGIN_NOT_WITH', { lng: lng }) + ': https://',
-                        pattern: /^(?!https:\/\/)/
-                    },
-                    generateRule.notContainCharacters('/ :')
+                        label: $i18next.t('common:BEGIN_NOT_WITH', { lng: lng }) + ': <schema>:/',
+                        pattern: /^(?![^:/]+:\/).*/
+                    }
                 ]
             },
             clusters: {

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

@@ -83,7 +83,6 @@ such restriction.
         ctrl.editTriggerCallback = editTriggerCallback;
         ctrl.handleAction = handleAction;
         ctrl.isCreateNewTriggerEnabled = isCreateNewTriggerEnabled;
-        ctrl.isHttpTriggerCheckboxShown = isHttpTriggerCheckboxShown;
         ctrl.isHttpTriggerMsgShown = isHttpTriggerMsgShown;
 
         //
@@ -254,21 +253,14 @@ 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.
          */
         function isHttpTriggerMsgShown() {
-            return isHttpTriggerCheckboxShown() && !ctrl.version.spec.disableDefaultHTTPTrigger;
+            const disableDefaultHttpTrigger = lodash.get(ConfigService, 'nuclio.disableDefaultHttpTrigger', false);
+
+            return !disableDefaultHttpTrigger && !lodash.some(ctrl.version.spec.triggers, ['kind', 'http']);
         }
 
         //

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

@@ -28,10 +28,6 @@
         }
     }
 
-    .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,22 +3,6 @@
         <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 }}