@rancher/shell 0.3.14 → 0.3.16

package/edit/constraints.gatekeeper.sh.constraint/index.vue

@@ -21,12 +21,12 @@ import Scope, { SCOPE_OPTIONS } from './Scope';
 
 function findConstraintTypes(schemas) {
   return schemas
-    .filter(schema => schema?.attributes?.group === 'constraints.gatekeeper.sh');
+    .filter((schema) => schema?.attributes?.group === 'constraints.gatekeeper.sh');
 }
 
 function findConstraintTypesIds(schemas) {
   return findConstraintTypes(schemas)
-    .map(schema => schema.id);
+    .map((schema) => schema.id);
 }
 
 const CONSTRAINT_PREFIX = 'constraints.gatekeeper.sh.';
@@ -145,8 +145,8 @@ export default {
     },
     systemNamespaceIds() {
       return this.$store.getters['cluster/all'](NAMESPACE)
-        .filter(namespace => namespace.isSystem)
-        .map(namespace => namespace.id);
+        .filter((namespace) => namespace.isSystem)
+        .map((namespace) => namespace.id);
     },
     emptyDefaults() {
       return {

package/edit/fleet.cattle.io.gitrepo.vue

@@ -185,7 +185,7 @@ export default {
         .filter((x) => {
           return x.metadata.namespace === this.value.metadata.namespace;
         })
-        .filter(x => !isHarvesterCluster(x))
+        .filter((x) => !isHarvesterCluster(x))
         .map((x) => {
           return { label: x.nameDisplay, value: `cluster://${ x.metadata.name }` };
         });
@@ -202,7 +202,7 @@ export default {
       }
 
       const groups = this.allClusterGroups
-        .filter(x => x.metadata.namespace === this.value.metadata.namespace)
+        .filter((x) => x.metadata.namespace === this.value.metadata.namespace)
         .map((x) => {
           return { label: x.nameDisplay, value: `group://${ x.metadata.name }` };
         });
@@ -223,16 +223,16 @@ export default {
 
     clusterNames() {
       const out = this.allClusters
-        .filter(x => x.metadata.namespace === this.value.metadata.namespace)
-        .map(x => x.metadata.name);
+        .filter((x) => x.metadata.namespace === this.value.metadata.namespace)
+        .map((x) => x.metadata.name);
 
       return out;
     },
 
     clusterGroupNames() {
       const out = this.allClusterGroups
-        .filter(x => x.metadata.namespace === this.value.metadata.namespace)
-        .map(x => x.metadata.name);
+        .filter((x) => x.metadata.namespace === this.value.metadata.namespace)
+        .map((x) => x.metadata.name);
 
       return out;
     },

package/edit/helm.cattle.io.projecthelmchart.vue

@@ -63,20 +63,20 @@ export default {
     selectedNamespaceQuestions() {
       const inStore = this.$store.getters['currentStore']();
 
-      const configMapRelationship = this.currentNamespace?.metadata?.relationships.find(relationship => relationship?.toType === 'configmap');
+      const configMapRelationship = this.currentNamespace?.metadata?.relationships.find((relationship) => relationship?.toType === 'configmap');
 
       const questionsYaml = this.$store.getters[`${ inStore }/byId`](configMapRelationship?.toType, configMapRelationship?.toId)?.data?.['questions.yaml'];
 
       return jsyaml.load(questionsYaml)?.questions;
     },
     currentNamespace() {
-      return this.namespaces.find(namespace => namespace.id === this.value?.metadata?.namespace);
+      return this.namespaces.find((namespace) => namespace.id === this.value?.metadata?.namespace);
     }
   },
 
   methods: {
     getNamespaceConfigMapId(namespace) {
-      return this.currentNamespace?.metadata?.relationships.find(relationship => relationship?.toType === 'configmap')?.toId;
+      return this.currentNamespace?.metadata?.relationships.find((relationship) => relationship?.toType === 'configmap')?.toId;
     },
     async getConfigMap(id) {
       return await this.$store.dispatch('cluster/find', { type: CONFIG_MAP, id });

package/edit/logging-flow/index.vue

@@ -109,8 +109,8 @@ export default {
       matches.push(emptyMatch(true));
     }
 
-    const globalOutputRefs = (this.value.spec.globalOutputRefs || []).map(ref => ({ label: ref, value: ref }));
-    const localOutputRefs = (this.value.spec.localOutputRefs || []).map(ref => ({ label: ref, value: ref }));
+    const globalOutputRefs = (this.value.spec.globalOutputRefs || []).map((ref) => ({ label: ref, value: ref }));
+    const localOutputRefs = (this.value.spec.localOutputRefs || []).map((ref) => ({ label: ref, value: ref }));
 
     return {
       formSupported,
@@ -309,7 +309,7 @@ export default {
 
         const select = match.select || {};
         const exclude = match.exclude || {};
-        const allValuesAreEmpty = o => Object.values(o).every(isEmpty);
+        const allValuesAreEmpty = (o) => Object.values(o).every(isEmpty);
 
         return allValuesAreEmpty(select) && allValuesAreEmpty(exclude);
       });
@@ -329,7 +329,7 @@ export default {
       cm.execCommand('unfold');
     },
     isTag(options, option) {
-      return !options.find(o => o.value === option.value);
+      return !options.find((o) => o.value === option.value);
     }
   }
 };

package/edit/logging.banzaicloud.io.output/index.vue

@@ -37,7 +37,7 @@ export default {
 
     set(this.value, 'spec', this.value.spec || {});
 
-    const providers = PROVIDERS.map(provider => ({
+    const providers = PROVIDERS.map((provider) => ({
       ...provider,
       value: provider.name,
       label: this.t(provider.labelKey)
@@ -89,7 +89,7 @@ export default {
       return EDITOR_MODES;
     },
     enabledProviders() {
-      return this.providers.filter(p => p.enabled);
+      return this.providers.filter((p) => p.enabled);
     },
     isNamespaced() {
       return this.value.type !== LOGGING?.CLUSTER_OUTPUT;
@@ -114,7 +114,7 @@ export default {
       const t = this.$store.getters['i18n/t'];
 
       if (this.selectedProvider === 'loki') {
-        const urlCheck = ['https://', 'http://'].some(checkValue => this.value.spec['loki'].url.toLowerCase().startsWith(checkValue));
+        const urlCheck = ['https://', 'http://'].some((checkValue) => this.value.spec['loki'].url.toLowerCase().startsWith(checkValue));
         const isLokiHttps = this.value.spec['loki'].url ? urlCheck : undefined;
 
         if (!isLokiHttps) {

package/edit/logging.banzaicloud.io.output/providers/elasticsearch.vue

@@ -60,7 +60,7 @@ export default {
         return this.value.port;
       },
       set(port) {
-        updatePort(value => this.$set(this.value, 'port', value), port);
+        updatePort((value) => this.$set(this.value, 'port', value), port);
       }
     }
   }

package/edit/logging.banzaicloud.io.output/providers/forward.vue

@@ -31,7 +31,7 @@ export default {
         return this.value.servers[0].port;
       },
       set(port) {
-        updatePort(value => this.$set(this.value.servers[0], 'port', value), port);
+        updatePort((value) => this.$set(this.value.servers[0], 'port', value), port);
       }
     }
   }

package/edit/logging.banzaicloud.io.output/providers/logz.vue

@@ -34,7 +34,7 @@ export default {
         return this.value.endpoint.port;
       },
       set(port) {
-        updatePort(value => this.$set(this.value.endpoint, 'port', value), port);
+        updatePort((value) => this.$set(this.value.endpoint, 'port', value), port);
       }
     }
   }

package/edit/logging.banzaicloud.io.output/providers/opensearch.vue

@@ -60,7 +60,7 @@ export default {
         return this.value.port;
       },
       set(port) {
-        updatePort(value => this.$set(this.value, 'port', value), port);
+        updatePort((value) => this.$set(this.value, 'port', value), port);
       }
     }
   }

package/edit/logging.banzaicloud.io.output/providers/redis.vue

@@ -41,7 +41,7 @@ export default {
         return this.value.port;
       },
       set(port) {
-        updatePort(value => this.$set(this.value, 'port', value), port);
+        updatePort((value) => this.$set(this.value, 'port', value), port);
       }
     }
   }

package/edit/logging.banzaicloud.io.output/providers/splunkHec.vue

@@ -40,7 +40,7 @@ export default {
         return this.value.hec_port;
       },
       set(port) {
-        updatePort(value => this.$set(this.value, 'hec_port', value), port);
+        updatePort((value) => this.$set(this.value, 'hec_port', value), port);
       }
     }
   }

package/edit/management.cattle.io.clusterroletemplatebinding.vue

@@ -32,7 +32,7 @@ export default {
     async saveOverride(btnCb) {
       this.errors = [];
       try {
-        await Promise.all(this.bindings.map(binding => binding.save()));
+        await Promise.all(this.bindings.map((binding) => binding.save()));
 
         btnCb(true);
       } catch (err) {

package/edit/management.cattle.io.podsecurityadmissionconfigurationtemplate.vue

@@ -71,7 +71,7 @@ export default (Vue as VueConstructor<Vue & InstanceType<typeof CreateEditView>>
     if (!this.value.configuration) {
       this.value.configuration = {
         defaults:   {},
-        exemptions: Object.assign({}, ...PSADimensions.map(dimension => ({ [dimension]: [] }))),
+        exemptions: Object.assign({}, ...PSADimensions.map((dimension) => ({ [dimension]: [] }))),
       } as PSAConfig;
     }
   }

package/edit/management.cattle.io.project.vue

@@ -14,8 +14,8 @@ import NameNsDescription from '@shell/components/form/NameNsDescription';
 import { MANAGEMENT } from '@shell/config/types';
 import { NAME } from '@shell/config/product/explorer';
 import { PROJECT_ID, _VIEW, _CREATE, _EDIT } from '@shell/config/query-params';
-import ProjectMembershipEditor from '@shell/components/form/Members/ProjectMembershipEditor';
-import { canViewProjectMembershipEditor } from '@shell/components/form/Members/ProjectMembershipEditor.vue';
+import ProjectMembershipEditor, { canViewProjectMembershipEditor } from '@shell/components/form/Members/ProjectMembershipEditor';
+
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import { Banner } from '@components/Banner';
 
@@ -109,7 +109,7 @@ export default {
 
       const cur = this.value.status?.podSecurityPolicyTemplateId;
 
-      if ( cur && !out.find(x => x.value === cur) ) {
+      if ( cur && !out.find((x) => x.value === cur) ) {
         out.unshift({ label: this.t('project.psp.current', { value: cur }), value: cur });
       }
 

package/edit/management.cattle.io.projectroletemplatebinding.vue

@@ -47,7 +47,7 @@ export default {
       this.$set(this, 'principalId', principalId);
     },
     async saveOverride() {
-      const asyncBindings = this.binding.roleTemplateIds.map(roleTemplateId => this.$store.dispatch(`management/create`, {
+      const asyncBindings = this.binding.roleTemplateIds.map((roleTemplateId) => this.$store.dispatch(`management/create`, {
         type:             MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING,
         roleTemplateName: roleTemplateId,
         principalName:    this.member.principalId,
@@ -56,7 +56,7 @@ export default {
 
       const bindings = await Promise.all(asyncBindings);
 
-      await Promise.all(bindings.map(binding => binding.save()));
+      await Promise.all(bindings.map((binding) => binding.save()));
       await this.$store.dispatch(`management/findAll`, { type: MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING, opt: { force: true } });
 
       this.$router.replace(this.doneLocationOverride);

package/edit/management.cattle.io.setting.vue

@@ -39,7 +39,7 @@ export default {
 
   created() {
     this.value.value = this.value.value || this.value.default;
-    this.enumOptions = this.setting?.kind === 'enum' ? this.setting.options.map(id => ({
+    this.enumOptions = this.setting?.kind === 'enum' ? this.setting.options.map((id) => ({
       label: `advancedSettings.enum.${ this.value.id }.${ id }`,
       value: id,
     })) : [];

package/edit/management.cattle.io.user.vue

@@ -120,7 +120,7 @@ export default {
       // Ensure username is unique (this does not happen in the backend)
       const users = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.USER });
 
-      if (users.find(u => u.username === this.form.username)) {
+      if (users.find((u) => u.username === this.form.username)) {
         throw new Error(this.t('user.edit.credentials.username.exists'));
       }
 
@@ -159,7 +159,7 @@ export default {
         // - Fetching the norman user again sometimes shows the correct value, sometimes not
         // - Even if the fetched norman user shows the correct value, it doesn't show up in the steve user
         //   - Looks like we re-request the stale version via socket?
-        await new Promise(resolve => setTimeout(resolve, 5000));
+        await new Promise((resolve) => setTimeout(resolve, 5000));
       }
 
       // Save user updates

package/edit/monitoring.coreos.com.alertmanagerconfig/auth.vue

@@ -39,9 +39,9 @@ export default {
         default: {},
       },
     ];
-    const authTypes = authOptions.map(option => option.value);
+    const authTypes = authOptions.map((option) => option.value);
     const authType =
-      authTypes.find(authType => !isEmpty(this.value[authType])) ||
+      authTypes.find((authType) => !isEmpty(this.value[authType])) ||
       authTypes[0];
 
     this.initializeType(authOptions, authType);

package/edit/monitoring.coreos.com.alertmanagerconfig/index.vue

@@ -50,7 +50,7 @@ export default {
     const defaultReceiverValues = {};
     const receiverSchema = this.$store.getters['cluster/schemaFor'](MONITORING.SPOOFED.ALERTMANAGERCONFIG_RECEIVER_SPEC);
     const routeSchema = this.$store.getters['cluster/schemaFor'](MONITORING.SPOOFED.ALERTMANAGERCONFIG_ROUTE_SPEC);
-    const receiverOptions = (this.value?.spec?.receivers || []).map(receiver => receiver.name);
+    const receiverOptions = (this.value?.spec?.receivers || []).map((receiver) => receiver.name);
 
     return {
       actionMenuTargetElement:  null,

package/edit/monitoring.coreos.com.alertmanagerconfig/receiverConfig.vue

@@ -185,7 +185,7 @@ export default {
       return {
         duplicateName: () => {
           const receiversArray = this.alertmanagerConfigResource.spec.receivers;
-          const receiverNamesArray = receiversArray.map(R => R.name);
+          const receiverNamesArray = receiversArray.map((R) => R.name);
           const receiversSet = new Set(receiverNamesArray);
 
           if (receiversArray.length !== receiversSet.size) {

package/edit/monitoring.coreos.com.alertmanagerconfig/types/opsgenie.vue

@@ -65,7 +65,7 @@ export default {
     this.$set(this.value, 'responders', this.value.responders || []);
 
     const responders = this.value.responders.map((responder) => {
-      const target = TARGETS.find(target => responder[target.value]);
+      const target = TARGETS.find((target) => responder[target.value]);
 
       return {
         type:   responder.type,
@@ -118,10 +118,10 @@ export default {
       row.value = text;
     },
     typeLabel(type) {
-      return TYPES.find(t => t.value === type).label;
+      return TYPES.find((t) => t.value === type).label;
     },
     targetLabel(target) {
-      return TARGETS.find(t => t.value === target).label;
+      return TARGETS.find((t) => t.value === target).label;
     },
     updateApiKeySecretName(name) {
       const existingKey = this.value.apiKey?.key || '';

package/edit/monitoring.coreos.com.prometheusrule/GroupRules.vue

@@ -51,18 +51,18 @@ export default {
     recordingRules() {
       const { value: rules } = this;
 
-      return rules.filter(rule => has(rule, 'record'));
+      return rules.filter((rule) => has(rule, 'record'));
     },
     alertingRules() {
       const { value: rules } = this;
 
-      return rules.filter(rule => has(rule, 'alert'));
+      return rules.filter((rule) => has(rule, 'alert'));
     },
     customRules() {
       const { value: rules } = this;
 
       return rules.filter(
-        rule => !has(rule, 'alert') && !has(rule, 'record')
+        (rule) => !has(rule, 'alert') && !has(rule, 'record')
       );
     },
     hideRecordingRulesOnView() {
@@ -77,12 +77,12 @@ export default {
     disableAddRecord() {
       const { value: rules } = this;
 
-      return rules.find(rule => has(rule, 'alert'));
+      return rules.find((rule) => has(rule, 'alert'));
     },
     disableAddAlert() {
       const { value: rules } = this;
 
-      return rules.find(rule => has(rule, 'record'));
+      return rules.find((rule) => has(rule, 'record'));
     },
   },
 

package/edit/monitoring.coreos.com.prometheusrule/duration.js

@@ -21,7 +21,7 @@ export function toMilliseconds(input) {
 
   if (d) {
     const properties = d.slice(1);
-    const numberD = properties.map(value => ([null, undefined].includes(value) ? 0 : Number(value)));
+    const numberD = properties.map((value) => ([null, undefined].includes(value) ? 0 : Number(value)));
     const data = {};
 
     [

package/edit/monitoring.coreos.com.prometheusrule/index.vue

@@ -42,7 +42,10 @@ export default {
   },
 
   data() {
-    return { fvFormRuleSets: [{ path: 'metadata.name', rules: ['dnsLabel'] }] };
+    return {
+      fvFormRuleSets:      [{ path: 'metadata.name', rules: ['dnsLabel'] }],
+      closedErrorMessages: []
+    };
   },
 
   computed: {
@@ -54,7 +57,7 @@ export default {
         return [this.t('validation.prometheusRule.noEdit')];
       }
 
-      return this.fvUnreportedValidationErrors;
+      return this.fvUnreportedValidationErrors.filter((e) => !this.closedErrorMessages.includes(e));
     }
   },
 
@@ -102,6 +105,8 @@ export default {
         }
       });
 
+      this.closedErrorMessages = [];
+
       return true;
     },
 
@@ -125,7 +130,7 @@ export default {
     :mode="mode"
     :resource="value"
     :validation-passed="fvFormIsValid"
-    @error="(e) => (errors = e)"
+    @error="(_, closedError) => closedErrorMessages.push(closedError)"
     @finish="save"
   >
     <div class="row">

package/edit/monitoring.coreos.com.receiver/auth.vue

@@ -47,8 +47,8 @@ export default {
         default: ''
       }
     ];
-    const authTypes = authOptions.map(option => option.value);
-    const authType = authTypes.find(authType => !isEmpty(this.value[authType])) || authTypes[0];
+    const authTypes = authOptions.map((option) => option.value);
+    const authType = authTypes.find((authType) => !isEmpty(this.value[authType])) || authTypes[0];
 
     this.initializeType(authOptions, authType);
 

package/edit/monitoring.coreos.com.receiver/tls.vue

@@ -35,10 +35,9 @@ export default {
     <div class="row">
       <div class="col span-12">
         <h3>{{ t('monitoring.receiver.tls.label') }}</h3>
-        <Banner
-          v-clean-html="t('monitoring.receiver.tls.secretsBanner', {}, true)"
-          color="info"
-        />
+        <Banner color="info">
+          <span v-clean-html="t('monitoring.receiver.tls.secretsBanner', {}, true)" />
+        </Banner>
       </div>
     </div>
     <div class="row mb-20">

package/edit/monitoring.coreos.com.receiver/types/__tests__/email.test.ts

@@ -0,0 +1,53 @@
+import { mount } from '@vue/test-utils';
+import Email from '@shell/edit/monitoring.coreos.com.receiver/types/email.vue';
+
+describe('page: Routes and Receivers', () => {
+  it('should have host field with a valid integer value under Email form', () => {
+    const wrapper = mount(Email, {
+      propsData: {
+        mode:  'create',
+        value: {}
+      },
+      mocks: {
+        t:      (text: string) => text, // Mock i18n global function used as alternative to the getter
+        $store: {
+          getters: {
+            'i18n/t':      jest.fn(),
+            'i18n/exists': jest.fn()
+          }
+        }
+      },
+    });
+
+    const host = wrapper.find('[data-testid="input-email-host"]');
+
+    host.setValue('10.2.300.3');
+
+    expect(host.exists()).toBe(true);
+    expect(host.element.value).toStrictEqual('10.2.300.3');
+  });
+  it('should have port field with a valid integer value under Email form', () => {
+    const wrapper = mount(Email, {
+      propsData: {
+        mode:  'create',
+        value: {}
+      },
+      mocks: {
+        t:      (text: string) => text, // Mock i18n global function used as alternative to the getter
+        $store: {
+          getters: {
+            'i18n/t':      jest.fn(),
+            'i18n/exists': jest.fn()
+          }
+        }
+      },
+    });
+
+    const port = wrapper.find('[data-testid="input-email-port"]');
+
+    port.setValue('8080');
+
+    expect(port.exists()).toBe(true);
+    expect(port.element.value).toStrictEqual('8080');
+  });
+});

package/edit/monitoring.coreos.com.receiver/types/email.vue

@@ -78,6 +78,7 @@ export default {
           v-model="value.host"
           :mode="mode"
           label="Host"
+          data-testid="input-email-host"
           placeholder="e.g. 192.168.1.121"
         />
       </div>
@@ -86,6 +87,7 @@ export default {
           v-model="value.port"
           :mode="mode"
           label="Port"
+          data-testid="input-email-port"
           placeholder="e.g. 80"
         />
       </div>

package/edit/monitoring.coreos.com.receiver/types/opsgenie.vue

@@ -68,7 +68,7 @@ export default {
     this.$set(this.value, 'responders', this.value.responders || []);
 
     const responders = this.value.responders.map((responder) => {
-      const target = TARGETS.find(target => responder[target.value]);
+      const target = TARGETS.find((target) => responder[target.value]);
 
       return {
         type:   responder.type,
@@ -117,10 +117,10 @@ export default {
       row.value = text;
     },
     typeLabel(type) {
-      return TYPES.find(t => t.value === type).label;
+      return TYPES.find((t) => t.value === type).label;
     },
     targetLabel(target) {
-      return TARGETS.find(t => t.value === target).label;
+      return TARGETS.find((t) => t.value === target).label;
     }
   }
 };

package/edit/monitoring.coreos.com.receiver/types/webhook.add.vue

@@ -34,7 +34,7 @@ export default {
           value: 'alibaba-cloud-sms'
         }
       ],
-      webhookType: RECEIVERS_TYPES.find(type => type.name === 'webhook'),
+      webhookType: RECEIVERS_TYPES.find((type) => type.name === 'webhook'),
       isView:      this.mode === _VIEW
     };
   },

package/edit/monitoring.coreos.com.route.vue

@@ -39,10 +39,10 @@ export default {
     const receivers = this.$store.dispatch('cluster/findAll', { type: MONITORING.SPOOFED.RECEIVER });
     const routes = this.$store.dispatch('cluster/findAll', { type: MONITORING.SPOOFED.ROUTE });
 
-    this.receiverOptions = (await receivers).map(receiver => receiver.spec.name);
+    this.receiverOptions = (await receivers).map((receiver) => receiver.spec.name);
 
     if (this.isCreate) {
-      const nonRootRoutes = (await routes).filter(route => !route.isRoot);
+      const nonRootRoutes = (await routes).filter((route) => !route.isRoot);
 
       this.$set(this.value.spec, 'name', createDefaultRouteName(nonRootRoutes.length));
     }