@rancher/shell 3.0.9-rc.5 → 3.0.9-rc.6

package/dialog/Ipv6NetworkingDialog.vue

@@ -0,0 +1,156 @@
+<script>
+import AsyncButton from '@shell/components/AsyncButton';
+import { Card } from '@components/Card';
+
+export default {
+  emits: ['close'],
+
+  components: {
+    Card,
+    AsyncButton,
+  },
+  props: {
+    warnings: {
+      type:    Array,
+      default: () => []
+    },
+
+    isK3s: {
+      type:    Boolean,
+      default: false
+    },
+
+    /**
+     * Callback to identify response of the prompt
+     */
+    confirm: {
+      type:    Function,
+      default: () => { }
+    },
+
+  },
+
+  methods: {
+    close() {
+      this.confirm(false);
+      this.$emit('close');
+    },
+
+    async apply(buttonDone) {
+      this.applyErrors = [];
+      try {
+        this.confirm(true);
+        this.$emit('close');
+      } catch (err) {
+        console.error(err); // eslint-disable-line
+        buttonDone(false);
+      }
+    }
+  },
+};
+</script>
+
+<template>
+  <Card
+    class="prompt-restore"
+    :show-highlight-border="false"
+    data-testid="ipv6-dialog"
+  >
+    <template #title>
+      <h4
+        v-clean-html="t('cluster.rke2.modal.ipv6Warning.title')"
+        class="text-default-text"
+      />
+    </template>
+
+    <template #body>
+      <div
+        class="pl-10 pr-10"
+        style="min-height: 50px;"
+      >
+        <t
+          k="cluster.rke2.modal.ipv6Warning.body"
+          raw
+        />
+        <t
+          :k="isK3s ? 'cluster.rke2.modal.ipv6Warning.readMoreK3s' : 'cluster.rke2.modal.ipv6Warning.readMoreRke2'"
+          raw
+        />
+        <div class="list-pretext">
+          <t
+            k="cluster.rke2.modal.ipv6Warning.verifySettings"
+            raw
+          />
+        </div>
+        <ul
+          data-testid="ipv6-dialog-reasons"
+          class="warning-list"
+        >
+          <li
+            v-for="warning in warnings"
+            :key="warning"
+          >
+            <t
+              :k="warning"
+              raw
+            />
+          </li>
+        </ul>
+      </div>
+    </template>
+
+    <template #actions>
+      <div class="bottom">
+        <div
+
+          class="buttons"
+        >
+          <button
+            data-testid="ipv6-dialog-cancel"
+            class="btn role-secondary mr-10"
+            @click="close"
+          >
+            {{ t('generic.cancel') }}
+          </button>
+
+          <AsyncButton
+            data-testid="ipv6-dialog-continue"
+            mode="continue"
+            action-color="role-primary"
+            @click="apply"
+          />
+        </div>
+      </div>
+    </template>
+  </Card>
+</template>
+<style lang='scss' scoped>
+  .prompt-restore {
+    margin: 0;
+  }
+  .bottom {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    .banner {
+      margin-top: 0
+    }
+    .buttons {
+      display: flex;
+      justify-content: flex-end;
+      width: 100%;
+    }
+  }
+
+.list-pretext {
+    margin-top: 16px;
+}
+
+.warning-list {
+    padding-inline-start: 24px;
+
+    & li {
+        margin-bottom: 8px;
+    }
+}
+</style>

package/dialog/ScalePoolDownDialog.vue

@@ -26,7 +26,7 @@ export default {
     };
   },
   computed: {
-    machinenName() {
+    machineName() {
       const name = this.resources.length > 0 ? this.resources[0]?.id?.split('/')[1] : '';
 
       return name;
@@ -81,7 +81,7 @@ export default {
     <template #body>
       <div class="pl-10 pr-10">
         <div>
-          {{ t('promptRemove.attemptingToRemove', { type }) }} <b>{{ machinenName }}</b>
+          {{ t('promptScaleMachineDown.attemptingToScaleDown', { type }) }} <b>{{ machineName }}</b>
         </div>
         <div>
           <Checkbox

package/edit/__tests__/fleet.cattle.io.gitrepo.test.ts

@@ -244,7 +244,7 @@ describe('view: fleet.cattle.io.gitrepo, GitHub password banner - should', () =>
     const wrapper = mount(GitRepoComponent, initGitRepo({ mode: _CREATE }, { spec: { repo: 'https://github.com/rancher/fleet-examples' } }));
 
     // Check computed properties
-    expect(wrapper.vm.isGitHubDotComRepository).toBeTruthy();
+    expect(wrapper.vm.isGithubDotComRepository).toBeTruthy();
 
     // Set basic auth selection in tempCachedValues
     await wrapper.setData({ tempCachedValues: { clientSecretName: { selected: AUTH_TYPE._BASIC } } });

package/edit/__tests__/fleet.cattle.io.helmop.test.ts

@@ -264,6 +264,7 @@ describe.each([
 
     wrapper.vm.pollingInterval = inputValue;
     wrapper.vm.updatePollingInterval(inputValue);
+    wrapper.vm.validatePollingInterval();
 
     await wrapper.vm.$nextTick();
 

package/edit/__tests__/management.cattle.io.project.test.js

@@ -27,119 +27,75 @@ const defaultMountOptions = {
 };
 
 describe('component: ManagementCattleIoProject', () => {
-  it('should remove a standard resource quota correctly', async() => {
-    const value = {
-      spec: {
-        resourceQuota:                 { limit: { limitsCpu: '100m', limitsMemory: '1Gi' } },
-        namespaceDefaultResourceQuota: { limit: { limitsCpu: '50m', limitsMemory: '500Mi' } }
-      },
-      metadata:     { namespace: 'test-ns', annotations: {} },
-      save:         jest.fn(),
-      listLocation: { name: 'list' }
-    };
-
-    const wrapper = shallowMount(
-      ManagementCattleIoProject,
-      {
-        ...defaultMountOptions,
-        props: {
-          ...defaultMountOptions.props,
-          value,
+  describe('onQuotasInput', () => {
+    it('should update resourceQuota limit while preserving other resourceQuota fields', () => {
+      const value = {
+        spec: {
+          resourceQuota:                 { limit: { limitsCpu: '100m' }, usedLimit: { limitsCpu: '50m' } },
+          namespaceDefaultResourceQuota: { limit: { limitsCpu: '50m' } }
         },
-      }
-    );
-
-    wrapper.vm.removeQuota('limitsCpu');
+        metadata:     { namespace: 'test-ns', annotations: {} },
+        save:         jest.fn(),
+        listLocation: { name: 'list' }
+      };
 
-    expect(wrapper.vm.value.spec.resourceQuota.limit.limitsCpu).toBeUndefined();
-    expect(wrapper.vm.value.spec.namespaceDefaultResourceQuota.limit.limitsCpu).toBeUndefined();
-    expect(wrapper.vm.value.spec.resourceQuota.limit.limitsMemory).toBe('1Gi'); // Ensure other quotas are not affected
-  });
-
-  it('should remove a custom resource quota with single period in name correctly', async() => {
-    const value = {
-      spec: {
-        resourceQuota:                 { limit: { extended: { test2: '1' } } },
-        namespaceDefaultResourceQuota: { limit: { extended: { test2: '2' } } }
-      },
-      metadata:     { namespace: 'test-ns', annotations: {} },
-      save:         jest.fn(),
-      listLocation: { name: 'list' }
-    };
-
-    const wrapper = shallowMount(
-      ManagementCattleIoProject,
-      {
+      const wrapper = shallowMount(ManagementCattleIoProject, {
         ...defaultMountOptions,
-        props: {
-          ...defaultMountOptions.props,
-          value,
-        },
-      }
-    );
+        props: { ...defaultMountOptions.props, value },
+      });
 
-    wrapper.vm.removeQuota(`extended.test2`);
+      wrapper.vm.onQuotasInput({ projectLimit: { limitsCpu: '200m' }, nsLimit: { limitsCpu: '100m' } });
 
-    expect(wrapper.vm.value.spec.resourceQuota.limit.extended).toBeUndefined();
-    expect(wrapper.vm.value.spec.namespaceDefaultResourceQuota.limit.extended).toBeUndefined();
-  });
+      expect(wrapper.vm.value.spec.resourceQuota.limit).toStrictEqual({ limitsCpu: '200m' });
+      expect(wrapper.vm.value.spec.resourceQuota.usedLimit).toStrictEqual({ limitsCpu: '50m' });
+    });
 
-  it('should remove a custom resource quota with multiple periods in name correctly', async() => {
-    const value = {
-      spec: {
-        resourceQuota:                 { limit: { extended: { 'requests.nvidia.com/gpu': '4' } } },
-        namespaceDefaultResourceQuota: { limit: { extended: { 'requests.nvidia.com/gpu': '2' } } }
-      },
-      metadata:     { namespace: 'test-ns', annotations: {} },
-      save:         jest.fn(),
-      listLocation: { name: 'list' }
-    };
-
-    const wrapper = shallowMount(
-      ManagementCattleIoProject,
-      {
-        ...defaultMountOptions,
-        props: {
-          ...defaultMountOptions.props,
-          value,
+    it('should update namespaceDefaultResourceQuota limit while preserving other namespaceDefaultResourceQuota fields', () => {
+      const value = {
+        spec: {
+          resourceQuota:                 { limit: { limitsCpu: '100m' } },
+          namespaceDefaultResourceQuota: { limit: { limitsCpu: '50m' }, extraField: 'preserved' }
         },
-      }
-    );
+        metadata:     { namespace: 'test-ns', annotations: {} },
+        save:         jest.fn(),
+        listLocation: { name: 'list' }
+      };
 
-    wrapper.vm.removeQuota(`extended.requests.nvidia.com/gpu`);
+      const wrapper = shallowMount(ManagementCattleIoProject, {
+        ...defaultMountOptions,
+        props: { ...defaultMountOptions.props, value },
+      });
 
-    expect(wrapper.vm.value.spec.resourceQuota.limit.extended).toBeUndefined();
-    expect(wrapper.vm.value.spec.namespaceDefaultResourceQuota.limit.extended).toBeUndefined();
-  });
+      wrapper.vm.onQuotasInput({ projectLimit: { limitsCpu: '200m' }, nsLimit: { limitsCpu: '100m' } });
 
-  it('should remove one of multiple custom resource quotas correctly', async() => {
-    const value = {
-      spec: {
-        resourceQuota:                 { limit: { extended: { test1: '1', test2: '2' } } },
-        namespaceDefaultResourceQuota: { limit: { extended: { test1: '3', test2: '4' } } }
-      },
-      metadata:     { namespace: 'test-ns', annotations: {} },
-      save:         jest.fn(),
-      listLocation: { name: 'list' }
-    };
-
-    const wrapper = shallowMount(
-      ManagementCattleIoProject,
-      {
-        ...defaultMountOptions,
-        props: {
-          ...defaultMountOptions.props,
-          value,
+      expect(wrapper.vm.value.spec.namespaceDefaultResourceQuota.limit).toStrictEqual({ limitsCpu: '100m' });
+      expect(wrapper.vm.value.spec.namespaceDefaultResourceQuota.extraField).toStrictEqual('preserved');
+    });
+
+    it('should set both resourceQuota and namespaceDefaultResourceQuota limits from input', () => {
+      const value = {
+        spec: {
+          resourceQuota:                 { limit: {} },
+          namespaceDefaultResourceQuota: { limit: {} }
         },
-      }
-    );
+        metadata:     { namespace: 'test-ns', annotations: {} },
+        save:         jest.fn(),
+        listLocation: { name: 'list' }
+      };
+
+      const wrapper = shallowMount(ManagementCattleIoProject, {
+        ...defaultMountOptions,
+        props: { ...defaultMountOptions.props, value },
+      });
 
-    wrapper.vm.removeQuota('extended.test1');
+      wrapper.vm.onQuotasInput({
+        projectLimit: { limitsCpu: '500m', limitsMemory: '2Gi' },
+        nsLimit:      { limitsCpu: '250m', limitsMemory: '1Gi' },
+      });
 
-    expect(wrapper.vm.value.spec.resourceQuota.limit.extended.test1).toBeUndefined();
-    expect(wrapper.vm.value.spec.resourceQuota.limit.extended.test2).toBe('2');
-    expect(wrapper.vm.value.spec.namespaceDefaultResourceQuota.limit.extended.test1).toBeUndefined();
-    expect(wrapper.vm.value.spec.namespaceDefaultResourceQuota.limit.extended.test2).toBe('4');
+      expect(wrapper.vm.value.spec.resourceQuota.limit).toStrictEqual({ limitsCpu: '500m', limitsMemory: '2Gi' });
+      expect(wrapper.vm.value.spec.namespaceDefaultResourceQuota.limit).toStrictEqual({ limitsCpu: '250m', limitsMemory: '1Gi' });
+    });
   });
 
   it('should update isQuotasValid when validateQuotas is called', () => {
@@ -161,32 +117,4 @@ describe('component: ManagementCattleIoProject', () => {
 
     expect(cruResource.props('validationPassed')).toStrictEqual(false);
   });
-
-  it('should remove an extended resource quota correctly with fixed startsWith', async() => {
-    const value = {
-      spec: {
-        resourceQuota:                 { limit: { extended: { test2: '1' } } },
-        namespaceDefaultResourceQuota: { limit: { extended: { test2: '2' } } }
-      },
-      metadata:     { namespace: 'test-ns', annotations: {} },
-      save:         jest.fn(),
-      listLocation: { name: 'list' }
-    };
-
-    const wrapper = shallowMount(
-      ManagementCattleIoProject,
-      {
-        ...defaultMountOptions,
-        props: {
-          ...defaultMountOptions.props,
-          value,
-        },
-      }
-    );
-
-    wrapper.vm.removeQuota('extended.test2');
-
-    expect(wrapper.vm.value.spec.resourceQuota.limit.extended).toBeUndefined();
-    expect(wrapper.vm.value.spec.namespaceDefaultResourceQuota.limit.extended).toBeUndefined();
-  });
 });

package/edit/auth/oidc.vue

@@ -273,7 +273,7 @@ export default {
 
       this.model.issuer = `${ url }/${ realmsPath }/${ this.oidcUrls.realm || '' }`;
 
-      if ( isKeycloak ) {
+      if ( isKeycloak || this.isGenericOidc ) {
         this.model.authEndpoint = `${ this.model.issuer || '' }/protocol/openid-connect/auth`;
       }
     },