@rancher/shell 3.0.12-rc.1 → 3.0.12-rc.2

package/core/plugin-products-base.ts

@@ -2,7 +2,7 @@ import { IExtension } from '@shell/core/types';
 import {
   ProductChild, ProductMetadata,
   ConfigureTypeConfiguration, VirtualTypeConfiguration,
-  ProductChildCustomPage
+  ProductChildCustomPage, VueRouteComponent, OverviewPageRoutingMetadata
 } from '@shell/core/plugin-types';
 import EmptyProductPage from '@shell/components/EmptyProductPage.vue';
 import pluginProductsHelpers from '@shell/core/plugin-products-helpers';
@@ -25,6 +25,8 @@ export abstract class BasePluginProduct {
 
   protected addedResourceRoutes = false;
 
+  protected registeredPageNames: Set<string> = new Set();
+
   protected DSLMethods: any;
 
   protected config: ProductChild[];
@@ -68,6 +70,13 @@ export abstract class BasePluginProduct {
     }
   }
 
+  /**
+   * Generates data for group overview page routing
+   */
+  protected generateMetadataForGroupOverviewPageRouting(name: string, component: VueRouteComponent): OverviewPageRoutingMetadata {
+    return { name, component };
+  }
+
   /**
    * This is where we register the product and its children via the DSL
    */
@@ -198,16 +207,12 @@ export abstract class BasePluginProduct {
               defaultRoute = pluginProductsHelpers.generateVirtualTypeRoute(this.name, entryChild, { omitPath: true, extendProduct: !this.isNewProduct });
             }
           } else {
-            // Group with component - route to the group page itself
-            defaultRoute = pluginProductsHelpers.generateVirtualTypeRoute(this.name, undefined, {
-              omitPath: true, component: firstConfig.component, extendProduct: !this.isNewProduct
-            });
+            // Group with component - route to the group overview page (which will render the group's component and side-menu)
+            defaultRoute = pluginProductsHelpers.generateVirtualTypeRoute(this.name, this.generateMetadataForGroupOverviewPageRouting(firstConfig.name, firstConfig.component), { omitPath: true, extendProduct: !this.isNewProduct });
           }
         } else if (firstConfig.component) {
           // Group with component but no children - route to the group page itself
-          defaultRoute = pluginProductsHelpers.generateVirtualTypeRoute(this.name, undefined, {
-            omitPath: true, component: firstConfig.component, extendProduct: !this.isNewProduct
-          });
+          defaultRoute = pluginProductsHelpers.generateVirtualTypeRoute(this.name, this.generateMetadataForGroupOverviewPageRouting(firstConfig.name, firstConfig.component), { omitPath: true, extendProduct: !this.isNewProduct });
         }
       } else if (isProductChildWithType(firstConfig)) {
         // Simple configureType page (resource page)
@@ -248,6 +253,13 @@ export abstract class BasePluginProduct {
       const name = `${ parentName }-${ item.name }`;
       const finalName = groupNaming ? `${ parentName }-${ groupNaming }-${ item.name }` : name;
 
+      // Check for duplicate page names within the same product
+      if (this.registeredPageNames.has(finalName)) {
+        this.surfaceError(`Duplicate page name "${ item.name }" - each page must have a unique name within a product`);
+      }
+
+      this.registeredPageNames.add(finalName);
+
       const virtualTypeConfig: VirtualTypeConfiguration = {
         label:      item.label,
         labelKey:   item.labelKey,
@@ -261,7 +273,8 @@ export abstract class BasePluginProduct {
       if (isProductChildGroup(item)) {
         virtualTypeConfig.exact = true;
         virtualTypeConfig.overview = true;
-        virtualTypeConfig.route = pluginProductsHelpers.generateVirtualTypeRoute(parentName, undefined, { extendProduct: !this.isNewProduct });
+        // Pass group metadata as pageChild so the route gets a unique path segment (e.g. /product/c/:cluster/groupName)
+        virtualTypeConfig.route = pluginProductsHelpers.generateVirtualTypeRoute(parentName, this.generateMetadataForGroupOverviewPageRouting(item.name, item.component as ProductChildCustomPage['component']), { extendProduct: !this.isNewProduct });
       } else {
         virtualTypeConfig.route = pluginProductsHelpers.generateVirtualTypeRoute(parentName, item, { extendProduct: !this.isNewProduct });
       }
@@ -270,6 +283,14 @@ export abstract class BasePluginProduct {
     } else if (isProductChildWithType(item)) {
       // Page with a "type" specified maps to a configureType
       const typeValue = item.type;
+
+      // Check for duplicate resource type within the same product
+      if (this.registeredPageNames.has(typeValue)) {
+        this.surfaceError(`Duplicate resource type "${ typeValue }" - each resource type must be unique within a product`);
+      }
+
+      this.registeredPageNames.add(typeValue);
+
       const route = pluginProductsHelpers.generateConfigureTypeRoute(parentName, item, { extendProduct: !this.isNewProduct });
 
       const configureTypeConfig: ConfigureTypeConfiguration = {
@@ -300,10 +321,6 @@ export abstract class BasePluginProduct {
           this.surfaceError('Group items cannot have a "type" property - only custom pages can have groups.');
         }
 
-        if (child.component && !this.isNewProduct) {
-          this.surfaceError('When extending an existing product, group parent items cannot have a component because of route matching conflicts.');
-        }
-
         let route;
 
         if (!child.component) {
@@ -316,7 +333,7 @@ export abstract class BasePluginProduct {
 
           route = pluginProductsHelpers.generateVirtualTypeRoute(parentName, pageForRoute, { extendProduct: !this.isNewProduct });
         } else {
-          route = pluginProductsHelpers.generateVirtualTypeRoute(parentName, undefined, { component: child.component, extendProduct: !this.isNewProduct });
+          route = pluginProductsHelpers.generateVirtualTypeRoute(parentName, this.generateMetadataForGroupOverviewPageRouting(child.name, child.component), { component: child.component, extendProduct: !this.isNewProduct });
         }
 
         // add the route for the group page/parent

package/core/plugin-products-helpers.ts

@@ -1,6 +1,7 @@
 import {
   RouteRecordRawWithParams, ProductChildGroup, ProductChild,
-  ProductChildCustomPage, ProductChildResourcePage, ProductRegistrationRouteGenerationOptions
+  ProductChildCustomPage, ProductChildResourcePage, ProductRegistrationRouteGenerationOptions,
+  OverviewPageRoutingMetadata
 } from '@shell/core/plugin-types';
 import { BLANK_CLUSTER } from '@shell/store/store-types';
 
@@ -62,7 +63,7 @@ class PluginProductsHelpers {
   }
 
   // VIRTUAL TYPE ROUTES
-  generateVirtualTypeRoute(parentName: string, pageChild: ProductChildCustomPage | undefined, options: ProductRegistrationRouteGenerationOptions = {}): RouteRecordRawWithParams {
+  generateVirtualTypeRoute(parentName: string, pageChild: ProductChildCustomPage | OverviewPageRoutingMetadata | undefined, options: ProductRegistrationRouteGenerationOptions = {}): RouteRecordRawWithParams {
     if (options.extendProduct) {
       return this.generateVirtualTypeRouteForExistingProduct(parentName, pageChild, options);
     } else {
@@ -71,7 +72,7 @@ class PluginProductsHelpers {
   }
 
   // VIRTUAL TYPE ROUTES - CLUSTER LEVEL EXTENSION
-  private generateVirtualTypeRouteForExistingProduct(parentName: string, pageChild: ProductChildCustomPage | undefined, options: ProductRegistrationRouteGenerationOptions = {}): RouteRecordRawWithParams {
+  private generateVirtualTypeRouteForExistingProduct(parentName: string, pageChild: ProductChildCustomPage | OverviewPageRoutingMetadata | undefined, options: ProductRegistrationRouteGenerationOptions = {}): RouteRecordRawWithParams {
     const { component, omitPath } = options;
     const name = pageChild ? `c-cluster-${ parentName }-${ pageChild.name }` : `c-cluster-${ parentName }`;
     const path = pageChild ? `c/:cluster/${ parentName }/${ pageChild.name }` : `c/:cluster/${ parentName }`;
@@ -95,7 +96,7 @@ class PluginProductsHelpers {
   }
 
   // VIRTUAL TYPE ROUTES - TOP LEVEL EXTENSION
-  private generateVirtualTypeRouteForNewProduct(parentName: string, pageChild: ProductChildCustomPage | undefined, options: ProductRegistrationRouteGenerationOptions = {}): RouteRecordRawWithParams {
+  private generateVirtualTypeRouteForNewProduct(parentName: string, pageChild: ProductChildCustomPage | OverviewPageRoutingMetadata | undefined, options: ProductRegistrationRouteGenerationOptions = {}): RouteRecordRawWithParams {
     const { component, omitPath } = options;
     const name = pageChild ? `${ parentName }-c-cluster-${ pageChild.name }` : `${ parentName }-c-cluster`;
     const path = pageChild ? `${ parentName }/c/:cluster/${ pageChild.name }` : `${ parentName }/c/:cluster`;

package/core/plugin-types.ts

@@ -150,12 +150,27 @@ export type ConfigureTypeConfiguration = {
   //     ]
 }
 
+/**
+ * Represents a Vue component or an async function that resolves to a Vue component, used for route components in product configuration
+ */
+export type VueRouteComponent = RouteComponent | Async<RouteComponent>;
+
+/**
+ * Metadata for route generation to a product overview page
+ */
+export type OverviewPageRoutingMetadata = {
+  /** Name of the overview page */
+  name: string;
+  /** Component to render for the overview page */
+  component: VueRouteComponent;
+}
+
 /**
  * Represents a custom page with a component
  */
 export type ProductChildCustomPage = ProductChildMetadata & {
   /** Component to render for this custom page */
-  component: RouteComponent | Async<RouteComponent>;
+  component: VueRouteComponent;
   /** Optional configuration for the page */
   config?: VirtualTypeConfiguration;
 };
@@ -189,7 +204,7 @@ export type ProductChild = ProductChildGroup | ProductChildPage; // eslint-disab
  * Represents a group of child pages in a product configuration
  */
 export type ProductChildGroup = ProductChildMetadata & {
-  component?: RouteComponent | Async<RouteComponent>;
+  component?: VueRouteComponent;
   children: ProductChild[];
   /** Default child to navigate to */
   default?: string;
@@ -218,5 +233,5 @@ export type ProductMetadata = Omit<ProductOptions, 'name' | 'label' | 'labelKey'
  */
 export type ProductSinglePage = ProductMetadata & {
   /** Component to render for this product (single page product) */
-  component: RouteComponent | Async<RouteComponent>;
+  component: VueRouteComponent;
 };

package/core/types.ts

@@ -5,7 +5,7 @@ import { PaginationSettingsStores } from '@shell/types/resources/settings';
 import type {
   ProductMetadata, ProductSinglePage,
   StandardProductName, RouteRecordRawWithParams, ProductChildGroup,
-  ProductChildPage
+  ProductChildPage, ProductChild
 } from './plugin-types';
 
 // Cluster Provisioning types
@@ -665,6 +665,7 @@ export interface IExtension {
    */
   addProduct(product: ProductMetadata, config: ProductChildGroup[]): void;
   addProduct(product: ProductMetadata, config: ProductChildPage[]): void;
+  addProduct(product: ProductMetadata, config: ProductChild[]): void;
 
   /**
    * Add a product to the sidebar, without children (no side menu, single page only)
@@ -695,6 +696,7 @@ export interface IExtension {
    */
   extendProduct(product: StandardProductName | string, config: ProductChildGroup[]): void;
   extendProduct(product: StandardProductName | string, config: ProductChildPage[]): void;
+  extendProduct(product: StandardProductName | string, config: ProductChild[]): void;
 
   /**
    * Add a locale to the i18n store

package/detail/__tests__/management.cattle.io.fleetworkspace.test.ts

@@ -0,0 +1,128 @@
+import { shallowMount } from '@vue/test-utils';
+import DetailWorkspace from '@shell/detail/management.cattle.io.fleetworkspace.vue';
+import { FLEET } from '@shell/config/types';
+import { NAME as FLEET_NAME } from '@shell/config/product/fleet';
+import { BLANK_CLUSTER } from '@shell/store/store-types.js';
+
+describe('component: DetailWorkspace', () => {
+  const mockValue = {
+    id:     'fleet-default',
+    counts: {
+      gitRepos:      3,
+      helmOps:       2,
+      clusters:      5,
+      cluster:       5,
+      clusterGroup:  1,
+      clusterGroups: 1,
+    },
+  };
+
+  const mockRouter = { push: jest.fn() };
+
+  const defaultStore = {
+    commit:   jest.fn(),
+    dispatch: jest.fn(),
+    getters:  {
+      'i18n/t':       (key: string) => key,
+      'i18n/exists':  () => true,
+      currentProduct: { name: FLEET_NAME },
+    },
+  };
+
+  const createWrapper = (props = {}) => {
+    return shallowMount(DetailWorkspace, {
+      props:  { value: mockValue, ...props },
+      global: {
+        mocks: {
+          $store:  defaultStore,
+          $route:  { params: {} },
+          $router: mockRouter,
+        },
+        stubs: {
+          CountBox:     { template: '<div />', props: ['clickable', 'count', 'name', 'primaryColorVar'] },
+          ResourceTabs: { template: '<div />' },
+        },
+      },
+    });
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('applicationRoute', () => {
+    it('should return the fleet application route', () => {
+      const wrapper = createWrapper();
+
+      expect(wrapper.vm.applicationRoute).toStrictEqual({
+        name:   'c-cluster-fleet-application',
+        params: { cluster: BLANK_CLUSTER },
+      });
+    });
+  });
+
+  describe('clustersRoute', () => {
+    it('should return the fleet clusters list route', () => {
+      const wrapper = createWrapper();
+
+      expect(wrapper.vm.clustersRoute).toStrictEqual({
+        name:   'c-cluster-product-resource',
+        params: {
+          cluster:  BLANK_CLUSTER,
+          product:  FLEET_NAME,
+          resource: FLEET.CLUSTER,
+        },
+      });
+    });
+  });
+
+  describe('clusterGroupsRoute', () => {
+    it('should return the fleet cluster groups list route', () => {
+      const wrapper = createWrapper();
+
+      expect(wrapper.vm.clusterGroupsRoute).toStrictEqual({
+        name:   'c-cluster-product-resource',
+        params: {
+          cluster:  BLANK_CLUSTER,
+          product:  FLEET_NAME,
+          resource: FLEET.CLUSTER_GROUP,
+        },
+      });
+    });
+  });
+
+  describe('setWorkspaceAndNavigate', () => {
+    it('should commit updateWorkspace with the workspace id', () => {
+      const wrapper = createWrapper();
+      const route = wrapper.vm.applicationRoute;
+
+      wrapper.vm.setWorkspaceAndNavigate(route);
+
+      expect(defaultStore.commit).toHaveBeenCalledWith('updateWorkspace', {
+        value:   'fleet-default',
+        getters: defaultStore.getters,
+      });
+    });
+
+    it('should dispatch prefs/set with the workspace id', () => {
+      const wrapper = createWrapper();
+      const route = wrapper.vm.applicationRoute;
+
+      wrapper.vm.setWorkspaceAndNavigate(route);
+
+      expect(defaultStore.dispatch).toHaveBeenCalledWith('prefs/set', {
+        key:   expect.any(String),
+        value: 'fleet-default',
+      });
+    });
+
+    it('should navigate to the given route', () => {
+      const wrapper = createWrapper();
+      const route = wrapper.vm.clustersRoute;
+
+      wrapper.vm.setWorkspaceAndNavigate(route);
+
+      expect(mockRouter.push).toHaveBeenCalledWith(route);
+    });
+  });
+});

package/detail/management.cattle.io.fleetworkspace.vue

@@ -4,6 +4,8 @@ import ResourceTabs from '@shell/components/form/ResourceTabs';
 import { SCOPE_NAMESPACE, SCOPE_CLUSTER } from '@shell/components/RoleBindings.vue';
 import { NAME as FLEET_NAME } from '@shell/config/product/fleet';
 import { FLEET } from '@shell/config/types';
+import { BLANK_CLUSTER } from '@shell/store/store-types.js';
+import { WORKSPACE } from '@shell/store/prefs';
 
 export default {
   name: 'DetailWorkspace',
@@ -34,6 +36,35 @@ export default {
       return this.t(`typeLabel."${ FLEET.HELM_OP }"`, { count: this.value.counts.helmOps });
     },
 
+    applicationRoute() {
+      return {
+        name:   'c-cluster-fleet-application',
+        params: { cluster: BLANK_CLUSTER }
+      };
+    },
+
+    clustersRoute() {
+      return {
+        name:   'c-cluster-product-resource',
+        params: {
+          cluster:  BLANK_CLUSTER,
+          product:  FLEET_NAME,
+          resource: FLEET.CLUSTER,
+        }
+      };
+    },
+
+    clusterGroupsRoute() {
+      return {
+        name:   'c-cluster-product-resource',
+        params: {
+          cluster:  BLANK_CLUSTER,
+          product:  FLEET_NAME,
+          resource: FLEET.CLUSTER_GROUP,
+        }
+      };
+    },
+
     SCOPE_NAMESPACE() {
       return SCOPE_NAMESPACE;
     },
@@ -46,6 +77,16 @@ export default {
       return FLEET_NAME;
     }
   },
+
+  methods: {
+    setWorkspaceAndNavigate(route) {
+      const workspaceId = this.value.id;
+
+      this.$store.commit('updateWorkspace', { value: workspaceId, getters: this.$store.getters });
+      this.$store.dispatch('prefs/set', { key: WORKSPACE, value: workspaceId });
+      this.$router.push(route);
+    }
+  }
 };
 </script>
 
@@ -58,6 +99,8 @@ export default {
             :count="value.counts.gitRepos"
             :name="gitRepoLabel"
             :primary-color-var="'--sizzle-3'"
+            :clickable="true"
+            @click="setWorkspaceAndNavigate(applicationRoute)"
           />
         </div>
         <div class="col span-3">
@@ -65,6 +108,8 @@ export default {
             :count="value.counts.helmOps"
             :name="helmOpsLabel"
             :primary-color-var="'--sizzle-3'"
+            :clickable="true"
+            @click="setWorkspaceAndNavigate(applicationRoute)"
           />
         </div>
         <div class="col span-3">
@@ -72,6 +117,8 @@ export default {
             :count="value.counts.clusters"
             :name="clustersLabel"
             :primary-color-var="'--sizzle-1'"
+            :clickable="true"
+            @click="setWorkspaceAndNavigate(clustersRoute)"
           />
         </div>
         <div class="col span-3">
@@ -79,6 +126,8 @@ export default {
             :count="value.counts.clusterGroups"
             :name="clusterGroupsLabel"
             :primary-color-var="'--sizzle-2'"
+            :clickable="true"
+            @click="setWorkspaceAndNavigate(clusterGroupsRoute)"
           />
         </div>
       </div>

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'
         }
       };
     },