@rancher/shell 3.0.11 → 3.0.12-rc.2

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

@@ -4,6 +4,7 @@ import HelmOp from '@shell/models/fleet.cattle.io.helmop';
 import HelmOpComponent from '@shell/edit/fleet.cattle.io.helmop.vue';
 import FleetSecretSelector from '@shell/components/fleet/FleetSecretSelector.vue';
 import FleetConfigMapSelector from '@shell/components/fleet/FleetConfigMapSelector.vue';
+import { createStore } from 'vuex';
 
 const mockStore = {
   dispatch: jest.fn(),
@@ -85,6 +86,14 @@ const initHelmOp = (props: any, options = {}) => {
       value,
       ...props
     },
+    provide: {
+      store: createStore({
+        getters: {
+          currentStore:                   () => 'current_store',
+          'management/paginationEnabled': () => () => false
+        }
+      })
+    },
     computed: mockComputed,
     global:   { mocks },
   };

package/edit/__tests__/kontainerDriver.test.ts

@@ -30,7 +30,6 @@ describe('view: kontainerdriver should', () => {
           active:           true,
           checksum:         '',
           url:              '',
-          uiUrl:            '',
           whitelistDomains: []
         }
       },
@@ -65,32 +64,22 @@ describe('view: kontainerdriver should', () => {
 
   it('have "Create" button enabled and disabled depending on validation results', async() => {
     const urlField = wrapper.find('[data-testid="driver-create-url-field"]');
-    const uiurlField = wrapper.find('[data-testid="driver-create-uiurl-field"]');
     const checksumField = wrapper.find('[data-testid="driver-create-checksum-field"]');
     const saveButton = wrapper.find('[data-testid="kontainer-driver-edit-save"]').element as HTMLInputElement;
 
     const testCases = [
       {
         url:      '1111',
-        uiurl:    'http://test.com',
         checksum: 'aaaaaBBBBdddd',
         result:   true
       },
       {
         url:      'http://test.com',
-        uiurl:    '1111',
-        checksum: 'aaaaaBBBBdddd',
-        result:   true
-      },
-      {
-        url:      'http://test.com',
-        uiurl:    'http://test.com',
         checksum: '!!!',
         result:   true
       },
       {
         url:      'http://test.com',
-        uiurl:    'http://test.com',
         checksum: 'aaaaaBBBBdddd',
         result:   false
       }
@@ -99,8 +88,6 @@ describe('view: kontainerdriver should', () => {
     for (const testCase of testCases) {
       urlField.setValue(testCase.url);
       await nextTick();
-      uiurlField.setValue(testCase.uiurl);
-      await nextTick();
       checksumField.setValue(testCase.checksum);
       await nextTick();
 

package/edit/__tests__/nodeDriver.test.ts

@@ -31,7 +31,6 @@ describe('view: nodedriver should', () => {
           active:           true,
           checksum:         '',
           url:              '',
-          uiUrl:            '',
           whitelistDomains: []
         }
       },
@@ -65,21 +64,16 @@ describe('view: nodedriver should', () => {
   });
 
   it.each`
-    url                    | uiurl                  | checksum             | expected
-    ${ '1111' }            | ${ 'http://test.com' } | ${ 'aaaaaBBBBdddd' } | ${ true }
-    ${ 'http://test.com' } | ${ '1111' }            | ${ 'aaaaaBBBBdddd' } | ${ true }
-    ${ 'http://test.com' } | ${ 'http://test.com' } | ${ '!!!' }           | ${ true }
-    ${ 'http://test.com' } | ${ 'http://test.com' } | ${ 'aaaaaBBBBdddd' } | ${ false }
-  `('have "Create" button enabled and disabled depending on validation results', async({
-    url, uiurl, checksum, expected
-  }) => {
+    url                    | checksum             | expected
+    ${ '1111' }            | ${ 'aaaaaBBBBdddd' } | ${ true }
+    ${ 'http://test.com' } | ${ '!!!' }           | ${ true }
+    ${ 'http://test.com' } | ${ 'aaaaaBBBBdddd' } | ${ false }
+  `('have "Create" button enabled and disabled depending on validation results', async({ url, checksum, expected }) => {
     const urlField = wrapper.find('[data-testid="driver-create-url-field"]');
-    const uiurlField = wrapper.find('[data-testid="driver-create-uiurl-field"]');
     const checksumField = wrapper.find('[data-testid="driver-create-checksum-field"]');
     const saveButton = wrapper.find('[data-testid="node-driver-edit-save"]').element as HTMLInputElement;
 
     urlField.setValue(url);
-    uiurlField.setValue(uiurl);
     checksumField.setValue(checksum);
 
     await nextTick();

package/edit/__tests__/resources.cattle.io.restore.test.ts

@@ -2,6 +2,7 @@ import { nextTick } from 'vue';
 import { mount } from '@vue/test-utils';
 import RestoreComponent from '@shell/edit/resources.cattle.io.restore.vue';
 import { _CREATE } from '@shell/config/query-params';
+import { createStore } from 'vuex';
 
 describe('view: restore storage source switching', () => {
   let wrapper: any;
@@ -30,6 +31,14 @@ describe('view: restore storage source switching', () => {
     };
 
     return mount(RestoreComponent, {
+      provide: {
+        store: createStore({
+          getters: {
+            currentStore:                () => 'current_store',
+            'cluster/paginationEnabled': () => () => false
+          }
+        })
+      },
       global: {
         mocks: {
           $store:      mockStore,

package/edit/auditlog.cattle.io.auditpolicy/__tests__/__snapshots__/General.test.ts.snap

@@ -65,7 +65,9 @@ exports[`component: General rendering & initial state should render with default
               clearable="false"
               closeonselect="true"
               disabled="false"
+              filterable="true"
               hovertooltip="true"
+              instore="cluster"
               label="auditPolicy.general.verbosity.level.label"
               loading="false"
               localizedlabel="false"
@@ -73,8 +75,12 @@ exports[`component: General rendering & initial state should render with default
               nooptionslabelkey="labelSelect.noOptions.empty"
               optionlabel="label"
               options="[object Object],[object Object],[object Object],[object Object]"
+              placeholder=""
               reduce="[Function]"
               required="false"
+              requiredirty="true"
+              rules=""
+              searchable="false"
               selectable="[Function]"
               value="0"
             />

package/edit/auth/__tests__/oidc.test.ts

@@ -297,5 +297,59 @@ describe('oidc.vue', () => {
       expect(groupsClaim.exists()).toBe(false);
       expect(emailClaim.exists()).toBe(false);
     });
+
+    describe('clientAuthenticatedSearch checkbox', () => {
+      it('is not rendered for genericoidc', async() => {
+        const checkbox = wrapper.find('[data-testid="input-client-authenticated-group-search"]');
+
+        expect(checkbox.exists()).toBe(false);
+      });
+
+      it('is not rendered for cognito', async() => {
+        await wrapper.setData({ model: { ...mockModel, id: 'cognito' } });
+
+        const checkbox = wrapper.find('[data-testid="input-client-authenticated-group-search"]');
+
+        expect(checkbox.exists()).toBe(false);
+      });
+
+      it('is rendered for keycloakoidc', async() => {
+        await wrapper.setData({ model: { ...mockModel, id: 'keycloakoidc' } });
+
+        const checkbox = wrapper.find('[data-testid="input-client-authenticated-group-search"]');
+
+        expect(checkbox.exists()).toBe(true);
+      });
+
+      it('defaults to falsy when not set on keycloakoidc', async() => {
+        await wrapper.setData({ model: { ...mockModel, id: 'keycloakoidc' } });
+
+        expect(wrapper.vm.model.clientAuthenticatedSearch).toBeFalsy();
+      });
+
+      it('updates model when checkbox is clicked', async() => {
+        await wrapper.setData({
+          model: {
+            ...mockModel, id: 'keycloakoidc', clientAuthenticatedSearch: false
+          }
+        });
+
+        const checkbox = wrapper.getComponent('[data-testid="input-client-authenticated-group-search"]');
+
+        await checkbox.find('[role="checkbox"]').trigger('click');
+
+        expect(wrapper.vm.model.clientAuthenticatedSearch).toBe(true);
+      });
+
+      it('reflects a pre-existing true value from the model', async() => {
+        await wrapper.setData({
+          model: {
+            ...mockModel, id: 'keycloakoidc', clientAuthenticatedSearch: true
+          }
+        });
+
+        expect(wrapper.vm.model.clientAuthenticatedSearch).toBe(true);
+      });
+    });
   });
 });

package/edit/auth/azuread.vue

@@ -144,7 +144,7 @@ export default {
         config: {
           ...this.model,
           enabled:     true,
-          description: 'Enable AzureAD'
+          description: 'Enable Microsoft Entra ID'
         }
       };
     },

package/edit/auth/oidc.vue

@@ -452,6 +452,14 @@ export default {
               :tooltip="t('authConfig.oidc.groupSearch.tooltip')"
               :mode="mode"
             />
+            <Checkbox
+              v-if="isKeycloak"
+              v-model:value="model.clientAuthenticatedSearch"
+              data-testid="input-client-authenticated-group-search"
+              :label="t('authConfig.oidc.clientAuthenticatedSearch.label')"
+              :tooltip="t('authConfig.oidc.clientAuthenticatedSearch.tooltip')"
+              :mode="mode"
+            />
             <Checkbox
               v-if="supportsCustomClaims"
               v-model:value="addCustomClaims"

package/edit/kontainerDriver.vue

@@ -21,7 +21,6 @@ export default {
     return {
       fvFormRuleSets: [
         { path: 'url', rules: ['required', 'url'] },
-        { path: 'uiUrl', rules: ['url'] },
         { path: 'checksum', rules: ['alphanumeric'] },
         { path: 'whitelistDomains', rules: ['wildcardHostname'] }
       ]
@@ -61,7 +60,7 @@ export default {
     <CreateDriver
       :mode="mode"
       :value="value"
-      :rules="{url:fvGetAndReportPathRules('url'), uiUrl:fvGetAndReportPathRules('uiUrl'), checksum:fvGetAndReportPathRules('checksum'), whitelistDomains:fvGetAndReportPathRules('whitelistDomains')}"
+      :rules="{url:fvGetAndReportPathRules('url'), checksum:fvGetAndReportPathRules('checksum'), whitelistDomains:fvGetAndReportPathRules('whitelistDomains')}"
     />
   </CruResource>
 </template>

package/edit/nodeDriver.vue

@@ -21,7 +21,6 @@ export default {
     return {
       fvFormRuleSets: [
         { path: 'url', rules: ['required', 'url'] },
-        { path: 'uiUrl', rules: ['url'] },
         { path: 'checksum', rules: ['alphanumeric'] },
         { path: 'whitelistDomains', rules: ['wildcardHostname'] }
       ]
@@ -63,7 +62,6 @@ export default {
       :value="value"
       :rules="{
         url: fvGetAndReportPathRules('url'),
-        uiUrl: fvGetAndReportPathRules('uiUrl'),
         checksum: fvGetAndReportPathRules('checksum'),
         whitelistDomains: fvGetAndReportPathRules('whitelistDomains')
       }"

package/edit/provisioning.cattle.io.cluster/AgentEnv.vue

@@ -33,6 +33,7 @@ export default {
       :supported="(row) => typeof row.valueFrom === 'undefined'"
       :read-allowed="true"
       :value-can-be-empty="true"
+      :read-accept="'text/plain'"
       :key-label="t('cluster.agentEnvVars.keyLabel')"
       :parse-lines-from-file="true"
     />

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

@@ -0,0 +1,25 @@
+import { mount } from '@vue/test-utils';
+import AgentEnv from '@shell/edit/provisioning.cattle.io.cluster/AgentEnv.vue';
+
+describe('component: AgentEnv', () => {
+  it('should only accept text files (not binary) on the KeyValue file upload', () => {
+    const wrapper = mount(AgentEnv, {
+      props: {
+        mode:  'edit',
+        value: { spec: { agentEnvVars: [] } },
+      },
+      global: {
+        mocks: { t: (key: string) => key },
+        stubs: {
+          Tab:      { template: '<div><slot /></div>' },
+          KeyValue: true,
+        },
+      },
+    });
+
+    const keyValue = wrapper.findComponent({ name: 'KeyValue' });
+
+    expect(keyValue.exists()).toBe(true);
+    expect(keyValue.props('readAccept')).toBe('text/plain');
+  });
+});

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

@@ -0,0 +1,176 @@
+import { mount } from '@vue/test-utils';
+import Ingress from '@shell/edit/provisioning.cattle.io.cluster/tabs/Ingress.vue';
+import { _EDIT } from '@shell/config/query-params';
+import { INGRESS_DUAL, TRAEFIK, INGRESS_NGINX, INGRESS_NONE } from '@shell/edit/provisioning.cattle.io.cluster/shared';
+
+jest.mock('vuex', () => ({
+  useStore:   () => ({ getters: { 'i18n/t': (key: string) => key } }),
+  mapGetters: () => ({ t: (key: string) => key })
+}));
+
+jest.mock('@shell/edit/provisioning.cattle.io.cluster/shared', () => ({
+
+  INGRESS_NGINX:   'ingress-nginx',
+  TRAEFIK:         'traefik',
+  INGRESS_DUAL:    'dual',
+  INGRESS_NONE:    'none',
+  INGRESS_OPTIONS: [{
+    id:        'traefik',
+    image:     { src: '', alt: 'Traefik' },
+    header:    { title: { key: 'cluster.ingress.traefik.header' } },
+    subHeader: { label: { key: 'cluster.ingress.recommended' } },
+    content:   { key: 'cluster.ingress.traefik.content' },
+    doc:       { url: 'https://docs.rke2.io/networking/networking_services?_highlight=ingress#ingress-controller' }
+  },
+  {
+    id:        'ingress-nginx',
+    image:     { src: '', alt: 'NGINX' },
+    header:    { title: { key: 'cluster.ingress.nginx.header' } },
+    subHeader: { label: { key: 'cluster.ingress.legacy' } },
+    content:   { key: 'cluster.ingress.nginx.content' },
+    doc:       { url: 'https://www.kubernetes.dev/blog/2025/11/12/ingress-nginx-retirement/' }
+  },
+  {
+    id:        'dual',
+    header:    { title: { key: 'cluster.ingress.dual.header' } },
+    subHeader: { label: { key: 'cluster.ingress.migration' } },
+    content:   { key: 'cluster.ingress.dual.content' }
+  }],
+  INGRESS_MIGRATION_KB_LINK:          'mock-link',
+  INGRESS_CONTROLLER_CLASS_MIGRATION: 'rke2.cattle.io/ingress-nginx-migration',
+  INGRESS_CLASS_DEFAULT:              'rke2.cattle.io/ingress-nginx-default',
+  INGRESS_CONTROLLER_CLASS_DEFAULT:   'rke2.cattle.io/ingress-nginx-controller-default',
+  INGRESS_CLASS_MIGRATION:            'rke2.cattle.io/ingress-nginx-migration'
+}));
+
+describe('ingress.vue', () => {
+  const defaultProps = {
+    mode:             _EDIT,
+    value:            INGRESS_NONE,
+    nginxSupported:   true,
+    traefikSupported: true,
+    nginxChart:       'rancher-ingress-nginx',
+    traefikChart:     'traefik',
+    userChartValues:  {},
+    versionInfo:      {
+      'rancher-ingress-nginx': { values: {} },
+      traefik:                 { values: {} }
+    }
+  };
+
+  const createWrapper = (props = {}) => mount(Ingress, {
+    props:  { ...defaultProps, ...props },
+    global: {
+      stubs: {
+        Checkbox:             true,
+        Banner:               true,
+        IngressCards:         true,
+        IngressConfiguration: true,
+        YamlEditor:           true,
+        RichTranslation:      true
+      }
+    }
+  });
+
+  it('renders checkbox to enable/disable ingress', () => {
+    const wrapper = createWrapper();
+    const checkbox = wrapper.findComponent({ name: 'Checkbox' });
+
+    expect(checkbox.exists()).toBe(true);
+  });
+
+  it('emits update:value with INGRESS_NONE when ingress is disabled', async() => {
+    const wrapper = createWrapper({ value: TRAEFIK });
+    const checkbox = wrapper.findComponent({ name: 'Checkbox' });
+
+    await checkbox.vm.$emit('update:value', false);
+
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')?.[0]).toStrictEqual([INGRESS_NONE]);
+  });
+
+  it('emits update:value with TRAEFIK when ingress is enabled and traefik is supported', async() => {
+    const wrapper = createWrapper({ value: INGRESS_NONE });
+    const checkbox = wrapper.findComponent({ name: 'Checkbox' });
+
+    await checkbox.vm.$emit('update:value', true);
+
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')?.[0]).toStrictEqual([TRAEFIK]);
+  });
+
+  it('emits update:value with INGRESS_NGINX when ingress is enabled, traefik is NOT supported, and nginx IS supported', async() => {
+    const wrapper = createWrapper({ value: INGRESS_NONE, traefikSupported: false });
+    const checkbox = wrapper.findComponent({ name: 'Checkbox' });
+
+    await checkbox.vm.$emit('update:value', true);
+
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')?.[0]).toStrictEqual([INGRESS_NGINX]);
+  });
+
+  it('selectIngress emits [INGRESS_NGINX, TRAEFIK] string value when INGRESS_DUAL is selected and previous value was ingress-nginx', () => {
+    const wrapper = createWrapper({ value: INGRESS_NGINX, originalIngressController: INGRESS_NGINX });
+    const ingressCards = wrapper.findComponent({ name: 'IngressCards' });
+
+    ingressCards.vm.$emit('select', INGRESS_DUAL);
+
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')?.[0]).toStrictEqual([[INGRESS_NGINX, TRAEFIK]]);
+  });
+
+  it('selectIngress emits [TRAEFIK, INGRESS_NGINX] string value when INGRESS_DUAL is selected and previous value was traefik', () => {
+    const wrapper = createWrapper({ value: TRAEFIK, originalIngressController: TRAEFIK });
+    const ingressCards = wrapper.findComponent({ name: 'IngressCards' });
+
+    ingressCards.vm.$emit('select', INGRESS_DUAL);
+
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')?.[0]).toStrictEqual([[TRAEFIK, INGRESS_NGINX]]);
+  });
+
+  it('selectIngress emits [TRAEFIK, INGRESS_NGINX] string value when INGRESS_DUAL is selected and  value went traefik -> nginx -> dual', () => {
+    const wrapper = createWrapper({ value: TRAEFIK, originalIngressController: TRAEFIK });
+    const ingressCards = wrapper.findComponent({ name: 'IngressCards' });
+
+    ingressCards.vm.$emit('select', INGRESS_NGINX);
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')?.[0]).toStrictEqual([INGRESS_NGINX]);
+
+    ingressCards.vm.$emit('select', INGRESS_DUAL);
+
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')?.[1]).toStrictEqual([[TRAEFIK, INGRESS_NGINX]]);
+  });
+
+  it('selectIngress emits string value when a single ingress is selected', () => {
+    const wrapper = createWrapper({ value: TRAEFIK });
+    const ingressCards = wrapper.findComponent({ name: 'IngressCards' });
+
+    ingressCards.vm.$emit('select', INGRESS_NGINX);
+
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')?.[0]).toStrictEqual([INGRESS_NGINX]);
+  });
+
+  it('renders IngressConfiguration when versionInfo contains chart values', () => {
+    const wrapper = createWrapper({ value: TRAEFIK });
+    const config = wrapper.findComponent({ name: 'IngressConfiguration' });
+
+    expect(config.exists()).toBe(true);
+  });
+
+  it('toggles advanced configuration visibility and renders YamlEditor', async() => {
+    const wrapper = createWrapper({ value: TRAEFIK });
+
+    expect(wrapper.findComponent({ name: 'YamlEditor' }).exists()).toBe(false);
+
+    const advancedButton = wrapper.find('.advanced-toggle');
+
+    await advancedButton.trigger('click');
+
+    const yamlEditor = wrapper.find('[data-testid="traefik-yaml-editor"]');
+
+    expect(yamlEditor.exists()).toBe(true);
+  });
+});