@rancher/shell 3.0.5-rc.5 → 3.0.5-rc.7

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

@@ -101,6 +101,10 @@ export default {
       type:     Function,
       required: true
     },
+    useTabbedHash: {
+      type:    Boolean,
+      default: undefined
+    }
   },
 
   mixins: [CreateEditView, FormValidation],
@@ -300,6 +304,7 @@ export default {
       ref="tabbed"
       :side-tabs="true"
       default-tab="overview"
+      :use-hash="useTabbedHash"
       @changed="tabChanged"
     >
       <Tab

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

@@ -154,6 +154,7 @@ export default {
         v-if="filteredGroups.length > 0"
         :side-tabs="true"
         :show-tabs-add-remove="mode !== 'view'"
+        :use-hash="useTabbedHash"
         @addTab="addRuleGroup"
         @removeTab="removeGroupRule"
       >

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

@@ -81,38 +81,38 @@ export default {
     </div>
     <div class="row mb-20">
       <div class="col span-12">
-        <LabeledSelect
-          v-model:value="authType"
-          :options="authOptions"
-          label="Auth Type"
-          @update:value="initializeType(authOptions, authType)"
+        <LabeledSelect
+          v-model:value="authType"
+          :options="authOptions"
+          label="Auth Type"
+          @update:value="initializeType(authOptions, authType)"
         />
       </div>
     </div>
-    <div
-      v-if="authType === 'basic_auth'"
-      class="row mb-20"
+    <div
+      v-if="authType === 'basic_auth'"
+      class="row mb-20"
     >
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.basic_auth.username"
-          :mode="mode"
-          :label="t('monitoringReceiver.auth.username')"
+        <LabeledInput
+          v-model:value="value.basic_auth.username"
+          :mode="mode"
+          :label="t('monitoringReceiver.auth.username')"
         />
       </div>
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.basic_auth.password"
-          :mode="mode"
-          :label="t('monitoringReceiver.auth.password')"
-          type="password"
-          autocomplete="password"
+        <LabeledInput
+          v-model:value="value.basic_auth.password"
+          :mode="mode"
+          :label="t('monitoringReceiver.auth.password')"
+          type="password"
+          autocomplete="current-password"
         />
       </div>
     </div>
-    <div
-      v-else-if="authType === 'bearer_token'"
-      class="row mb-20"
+    <div
+      v-else-if="authType === 'bearer_token'"
+      class="row mb-20"
     >
       <div class="col span-6">
         <LabeledInput
@@ -121,20 +121,20 @@ export default {
           :label="t('monitoringReceiver.auth.bearerToken.label')"
           :placeholder="t('monitoringReceiver.auth.bearerToken.placeholder')"
           type="password"
-          autocomplete="password"
+          autocomplete="current-password"
         />
       </div>
     </div>
-    <div
-      v-else-if="authType === 'bearer_token_file'"
-      class="row mb-20"
+    <div
+      v-else-if="authType === 'bearer_token_file'"
+      class="row mb-20"
     >
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.bearer_token_file"
-          :mode="mode"
-          :label="t('monitoringReceiver.auth.bearerTokenFile.label')"
-          :placeholder="t('monitoringReceiver.auth.bearerTokenFile.placeholder')"
+        <LabeledInput
+          v-model:value="value.bearer_token_file"
+          :mode="mode"
+          :label="t('monitoringReceiver.auth.bearerTokenFile.label')"
+          :placeholder="t('monitoringReceiver.auth.bearerTokenFile.placeholder')"
         />
       </div>
     </div>

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

@@ -219,6 +219,7 @@ export default {
       ref="tabbed"
       :side-tabs="true"
       default-tab="overview"
+      :use-hash="useTabbedHash"
       @changed="tabChanged"
     >
       <Tab

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

@@ -116,7 +116,7 @@ export default {
           :mode="mode"
           label="Password"
           type="password"
-          autocomplete="password"
+          autocomplete="current-password"
         />
       </div>
     </div>

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

@@ -103,6 +103,7 @@ export default {
       ref="tabbed"
       :side-tabs="true"
       default-tab="overview"
+      :use-hash="useTabbedHash"
     >
       <Tab
         label="Receiver"

package/edit/namespace.vue

@@ -202,6 +202,7 @@ export default {
       :value="value"
       :mode="mode"
       :side-tabs="true"
+      :use-hash="useTabbedHash"
       @update:value="$emit('input', $event)"
     >
       <Tab

package/edit/networking.istio.io.destinationrule/index.vue

@@ -66,7 +66,10 @@ export default {
     </div>
 
     <div class="mb-20">
-      <Tabbed :side-tabs="true">
+      <Tabbed
+        :side-tabs="true"
+        :use-hash="useTabbedHash"
+      >
         <Tab
           name="subsets"
           :label="t('istio.destinationRule.subsets.label')"

package/edit/networking.k8s.io.ingress/Certificate.vue

@@ -35,8 +35,16 @@ export default {
       defaultCert,
       hosts,
       secretName,
+      secretVal: this.value.secretName ?? DEFAULT_CERT_VALUE,
     };
   },
+  watch: {
+    value(newVal) {
+      this.hosts = newVal.hosts;
+      this.secretName = newVal.secretName;
+      this.secretVal = this.secretName === null ? DEFAULT_CERT_VALUE : this.secretName;
+    },
+  },
   computed: {
     certsWithDefault() {
       return [this.defaultCert, ...this.certs.map((c) => ({ label: c, value: c }))];
@@ -51,15 +59,10 @@ export default {
     },
   },
   methods: {
-    addHost(ev) {
-      ev.preventDefault();
-      this.hosts.push('');
-      this.update();
-    },
     update() {
       const out = { hosts: this.hosts };
 
-      out.secretName = this.secretName;
+      out.secretName = this.secretVal;
 
       if (out.secretName === DEFAULT_CERT_VALUE) {
         out.secretName = null;
@@ -68,7 +71,7 @@ export default {
       this.$emit('update:value', out);
     },
     onSecretInput(e) {
-      this.secretName = e && typeof e === 'object' ? e.label : e;
+      this.secretVal = e && typeof e === 'object' ? e.label : e;
       this.update();
     },
     onHostsInput(e) {
@@ -80,13 +83,10 @@ export default {
 </script>
 
 <template>
-  <div
-    class="cert row"
-    @update:value="update"
-  >
+  <div class="cert row">
     <div class="col span-6">
       <LabeledSelect
-        v-model:value="secretName"
+        v-model:value="secretVal"
         class="secret-name"
         :options="certsWithDefault"
         :label="t('ingress.certificates.certificate.label')"

package/edit/networking.k8s.io.ingress/__tests__/Certificate.test.ts

@@ -0,0 +1,165 @@
+import { shallowMount } from '@vue/test-utils';
+import Certificate from '../Certificate.vue';
+
+const DEFAULT_CERT_VALUE = '__[[DEFAULT_CERT]]__';
+
+const createWrapper = (propsData = {}) => {
+  return shallowMount(Certificate, { propsData });
+};
+
+describe('networking.k8s.io.ingress/Certificate.vue', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('initializes with default values', () => {
+    const wrapper = createWrapper();
+
+    expect(wrapper.vm.hosts).toStrictEqual(['']);
+    expect(wrapper.vm.secretVal).toStrictEqual(DEFAULT_CERT_VALUE);
+    expect(wrapper.vm.secretName).toStrictEqual(DEFAULT_CERT_VALUE);
+  });
+
+  it('initializes with provided props', () => {
+    const value = { hosts: ['host1', 'host2'], secretName: 'some-secret' };
+    const certs = ['cert1', 'cert2'];
+    const rules = { host: ['rule1'] };
+    const wrapper = createWrapper({
+      value, certs, rules
+    });
+
+    expect(wrapper.vm.hosts).toStrictEqual(['host1', 'host2']);
+    expect(wrapper.vm.secretVal).toStrictEqual('some-secret');
+    expect(wrapper.vm.secretName).toStrictEqual('some-secret');
+    expect(wrapper.vm.certs).toStrictEqual(certs);
+    expect(wrapper.vm.rules).toStrictEqual(rules);
+  });
+
+  it('emits update:value when update is called', async() => {
+    const wrapper = createWrapper();
+
+    wrapper.vm.hosts = ['host1'];
+    wrapper.vm.secretVal = 'cert1';
+    wrapper.vm.update();
+    await wrapper.vm.$nextTick();
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')[0][0]).toStrictEqual({
+      hosts:      ['host1'],
+      secretName: 'cert1',
+    });
+  });
+
+  it('sets secretName to null when secretVal is DEFAULT_CERT_VALUE', async() => {
+    const wrapper = createWrapper();
+
+    wrapper.vm.hosts = ['host1'];
+    wrapper.vm.secretVal = DEFAULT_CERT_VALUE;
+    wrapper.vm.update();
+    await wrapper.vm.$nextTick();
+    expect(wrapper.emitted('update:value')[0][0].secretName).toBeNull();
+  });
+
+  it('updates secretVal when onSecretInput is called with an object', async() => {
+    const wrapper = createWrapper();
+    const newCert = { label: 'cert1', value: 'cert1' };
+
+    wrapper.vm.onSecretInput(newCert);
+    await wrapper.vm.$nextTick();
+    expect(wrapper.vm.secretVal).toStrictEqual('cert1');
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')[0][0].secretName).toStrictEqual('cert1');
+  });
+
+  it('updates secretVal when onSecretInput is called with a string', async() => {
+    const wrapper = createWrapper();
+
+    wrapper.vm.onSecretInput('cert1');
+    await wrapper.vm.$nextTick();
+    expect(wrapper.vm.secretVal).toStrictEqual('cert1');
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')[0][0].secretName).toStrictEqual('cert1');
+  });
+
+  it('updates hosts when onHostsInput is called', async() => {
+    const wrapper = createWrapper();
+
+    wrapper.vm.onHostsInput(['host1', 'host2']);
+    await wrapper.vm.$nextTick();
+    expect(wrapper.vm.hosts).toStrictEqual(['host1', 'host2']);
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')[0][0].hosts).toStrictEqual(['host1', 'host2']);
+  });
+
+  it('computes certsWithDefault correctly', () => {
+    const certs = ['cert1', 'cert2'];
+    const wrapper = createWrapper({ certs });
+    const expectedCerts = [
+      { label: '%ingress.certificates.defaultCertLabel%', value: DEFAULT_CERT_VALUE },
+      { label: 'cert1', value: 'cert1' },
+      { label: 'cert2', value: 'cert2' },
+    ];
+
+    expect(wrapper.vm.certsWithDefault).toStrictEqual(expectedCerts);
+  });
+
+  it('returns warning status for non-existent certificate', () => {
+    const wrapper = createWrapper({
+      certs: ['cert1', 'cert2'],
+      value: { hosts: [''], secretName: 'non-existent-cert' },
+    });
+
+    expect(wrapper.vm.certificateStatus).toStrictEqual('warning');
+  });
+
+  it('returns null status for existing certificate', () => {
+    const wrapper = createWrapper({
+      certs: ['cert1', 'cert2'],
+      value: { hosts: [''], secretName: 'cert1' },
+    });
+
+    expect(wrapper.vm.certificateStatus).toBeNull();
+  });
+
+  it('returns null status for default certificate', () => {
+    const wrapper = createWrapper({
+      certs: ['cert1', 'cert2'],
+      value: { hosts: [''], secretName: null },
+    });
+
+    expect(wrapper.vm.certificateStatus).toBeNull();
+  });
+
+  it('returns correct tooltip for non-existent certificate', () => {
+    const wrapper = createWrapper({
+      certs: ['cert1', 'cert2'],
+      value: { hosts: [''], secretName: 'non-existent-cert' },
+    });
+
+    expect(wrapper.vm.certificateTooltip).toStrictEqual('%ingress.certificates.certificate.doesntExist%');
+  });
+
+  it('returns null tooltip for existing certificate', () => {
+    const wrapper = createWrapper({
+      certs: ['cert1', 'cert2'],
+      value: { hosts: [''], secretName: 'cert1' },
+    });
+
+    expect(wrapper.vm.certificateTooltip).toBeNull();
+  });
+
+  it('watches value prop changes', async() => {
+    const wrapper = createWrapper({ value: { hosts: ['host1'], secretName: 'cert1' } });
+
+    await wrapper.setProps({ value: { hosts: ['host2'], secretName: 'cert2' } });
+    expect(wrapper.vm.hosts).toStrictEqual(['host2']);
+    expect(wrapper.vm.secretVal).toStrictEqual('cert2');
+    expect(wrapper.vm.secretName).toStrictEqual('cert2');
+  });
+
+  it('handles null secretName in value prop', async() => {
+    const wrapper = createWrapper({ value: { hosts: ['host1'], secretName: null } });
+
+    expect(wrapper.vm.secretVal).toStrictEqual(DEFAULT_CERT_VALUE);
+    expect(wrapper.vm.secretName).toBeNull();
+  });
+});

package/edit/networking.k8s.io.ingress/index.vue

@@ -226,7 +226,10 @@ export default {
       :rules="fvGetAndReportPathRules('spec')"
       as-banner
     />
-    <Tabbed :side-tabs="true">
+    <Tabbed
+      :side-tabs="true"
+      :use-hash="useTabbedHash"
+    >
       <Tab
         :label="firstTabLabel"
         name="rules"

package/edit/networking.k8s.io.networkpolicy/PolicyRules.vue

@@ -27,6 +27,10 @@ export default {
       type:    String,
       default: 'ingress'
     },
+    useTabbedHash: {
+      type:    Boolean,
+      default: undefined
+    }
   },
   data() {
     if (!this.value.spec[this.type]) {
@@ -42,7 +46,7 @@ export default {
     removePolicyRule(idx) {
       removeAt(this.value.spec[this.type], idx);
     },
-    policyRouleLabel(idx) {
+    policyRuleLabel(idx) {
       return this.t('networkpolicy.rules.ruleLabel', { index: idx + 1 });
     }
   }
@@ -56,6 +60,7 @@ export default {
         <Tabbed
           :side-tabs="true"
           :show-tabs-add-remove="mode !== 'view'"
+          :use-hash="useTabbedHash"
           @addTab="addPolicyRule"
           @removeTab="removePolicyRule"
         >
@@ -63,7 +68,7 @@ export default {
             v-for="(policyRule, idx) in value.spec[type]"
             :key="idx"
             :name="'rule-' + type + idx"
-            :label="policyRouleLabel(idx)"
+            :label="policyRuleLabel(idx)"
             :show-header="false"
             class="container-group"
           >

package/edit/networking.k8s.io.networkpolicy/index.vue

@@ -148,6 +148,7 @@ export default {
         $store:        this.$store,
         inStore:       this.inStore,
         namespace:     this.value.metadata.namespace,
+        transient:     true,
       });
     }, 250, { leading: true }),
   },
@@ -174,7 +175,10 @@ export default {
 
     <div class="row mb-40">
       <div class="col span-12">
-        <Tabbed :side-tabs="true">
+        <Tabbed
+          :side-tabs="true"
+          :use-hash="useTabbedHash"
+        >
           <Tab
             name="ingress"
             label-key="networkpolicy.ingress.label"
@@ -196,7 +200,7 @@ export default {
               :value="value"
               type="ingress"
               :mode="mode"
-
+              :use-tabbed-hash="useTabbedHash"
               @update:value="$emit('input', $event)"
             />
           </Tab>

package/edit/node.vue

@@ -50,6 +50,7 @@ export default {
     <ResourceTabs
       :value="value"
       :mode="mode"
+      :use-hash="useTabbedHash"
       @update:value="$emit('input', $event)"
     >
       <Tab

package/edit/persistentvolume/index.vue

@@ -277,7 +277,10 @@ export default {
         />
       </div>
     </div>
-    <Tabbed :side-tabs="true">
+    <Tabbed
+      :side-tabs="true"
+      :use-hash="useTabbedHash"
+    >
       <Tab
         name="plugin-configuration"
         :label="t('persistentVolume.pluginConfiguration.label')"

package/edit/provisioning.cattle.io.cluster/__tests__/rke2.test.ts

@@ -240,11 +240,12 @@ describe('component: rke2', () => {
 
     // we need to mock the "save" method from the create-edit-view-mixin
     // otherwise we get console errors
-    jest.spyOn(wrapper.vm, 'save').mockImplementation();
+    // jest.spyOn(wrapper.vm, 'save').mockImplementation();
 
     await wrapper.vm._doSaveOverride(jest.fn());
+    const chartKey = wrapper.vm.chartVersionKey(HARVESTER_CLOUD_PROVIDER);
 
-    const cloudConfigPath = get(wrapper.vm.chartValues, `${ HARVESTER_CLOUD_PROVIDER }.cloudConfigPath`);
+    const cloudConfigPath = get(wrapper.vm.userChartValues, `${ chartKey }.cloudConfigPath`);
 
     expect(cloudConfigPath).toStrictEqual('my-k8s-distro-path/etc/config-files/cloud-provider-config');
   });