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

package/components/formatter/__tests__/KubeconfigClusters.test.ts

@@ -0,0 +1,125 @@
+import { mount, RouterLinkStub } from '@vue/test-utils';
+import KubeconfigClusters from '@shell/components/formatter/KubeconfigClusters.vue';
+
+describe('component: KubeconfigClusters', () => {
+  const MAX_DISPLAY = 25;
+
+  const createCluster = (label: string, hasLocation = true) => ({
+    label,
+    location: hasLocation ? { name: 'cluster-detail', params: { cluster: label } } : null
+  });
+
+  const createClusters = (count: number, hasLocation = true) => {
+    return Array.from({ length: count }, (_, i) => createCluster(`cluster-${ i + 1 }`, hasLocation));
+  };
+
+  const defaultMocks = { t: (key: string, args: Record<string, unknown>) => `+ ${ args.remainingCount } more` };
+
+  const mountComponent = (clusters: unknown[] = [], mocks = defaultMocks) => {
+    return mount(KubeconfigClusters, {
+      props:  { row: { id: 'test-row', sortedReferencedClusters: clusters } },
+      global: {
+        mocks,
+        stubs: { 'router-link': RouterLinkStub }
+      }
+    });
+  };
+
+  describe('displaying clusters', () => {
+    it('should display a dash when there are no clusters', () => {
+      const wrapper = mountComponent([]);
+      const emptySpan = wrapper.find('.text-muted');
+
+      expect(emptySpan.text()).toBe('—');
+    });
+
+    it('should display cluster labels with router-links when clusters have locations', () => {
+      const clusters = [createCluster('local'), createCluster('downstream')];
+      const wrapper = mountComponent(clusters);
+      const links = wrapper.findAllComponents(RouterLinkStub);
+
+      expect(links).toHaveLength(2);
+      expect(links[0].text()).toBe('local');
+      expect(links[1].text()).toBe('downstream');
+    });
+
+    it('should display cluster labels as text-muted spans when clusters have no location', () => {
+      const clusters = [createCluster('deleted-cluster', false)];
+      const wrapper = mountComponent(clusters);
+      const mutedSpan = wrapper.find('.text-muted');
+
+      expect(mutedSpan.text()).toBe('deleted-cluster');
+      expect(wrapper.findComponent(RouterLinkStub).exists()).toBe(false);
+    });
+
+    it('should separate clusters with commas', () => {
+      const clusters = [createCluster('cluster-1'), createCluster('cluster-2')];
+      const wrapper = mountComponent(clusters);
+
+      expect(wrapper.text()).toContain(',');
+    });
+  });
+
+  describe('max display limit', () => {
+    it('should display all clusters when count is at or below the limit', () => {
+      const clusters = createClusters(MAX_DISPLAY);
+      const wrapper = mountComponent(clusters);
+      const links = wrapper.findAllComponents(RouterLinkStub);
+
+      expect(links).toHaveLength(MAX_DISPLAY);
+      expect(wrapper.text()).not.toContain('more');
+    });
+
+    it('should limit displayed clusters to MAX_DISPLAY', () => {
+      const clusters = createClusters(MAX_DISPLAY + 10);
+      const wrapper = mountComponent(clusters);
+      const links = wrapper.findAllComponents(RouterLinkStub);
+
+      expect(links).toHaveLength(MAX_DISPLAY);
+    });
+
+    it('should show remaining count when clusters exceed the limit', () => {
+      const totalClusters = MAX_DISPLAY + 5;
+      const clusters = createClusters(totalClusters);
+      const wrapper = mountComponent(clusters);
+
+      expect(wrapper.text()).toContain('+ 5 more');
+    });
+
+    it('should show correct remaining count for large cluster lists', () => {
+      const totalClusters = MAX_DISPLAY + 100;
+      const clusters = createClusters(totalClusters);
+      const wrapper = mountComponent(clusters);
+
+      expect(wrapper.text()).toContain('+ 100 more');
+    });
+  });
+
+  describe('computed properties', () => {
+    it('should return empty array for allClusters when row has no sortedReferencedClusters', () => {
+      const wrapper = mount(KubeconfigClusters, {
+        props:  { row: { id: 'test-row' } },
+        global: {
+          mocks: defaultMocks,
+          stubs: { 'router-link': RouterLinkStub }
+        }
+      });
+
+      expect(wrapper.vm.allClusters).toStrictEqual([]);
+    });
+
+    it('should calculate remainingCount as 0 when clusters are at or below limit', () => {
+      const clusters = createClusters(MAX_DISPLAY);
+      const wrapper = mountComponent(clusters);
+
+      expect(wrapper.vm.remainingCount).toBe(0);
+    });
+
+    it('should calculate correct remainingCount when clusters exceed limit', () => {
+      const clusters = createClusters(MAX_DISPLAY + 15);
+      const wrapper = mountComponent(clusters);
+
+      expect(wrapper.vm.remainingCount).toBe(15);
+    });
+  });
+});

package/components/nav/TopLevelMenu.helper.ts

@@ -1,5 +1,6 @@
-import { CAPI, MANAGEMENT } from '@shell/config/types';
+import { CAPI, MANAGEMENT, SAVED_COUNTS } from '@shell/config/types';
 import { STORE } from '@shell/store/store-types';
+import { ActionFindPageArgs } from '@shell/types/store/dashboard-store.types';
 import { PaginationParam, PaginationParamFilter, PaginationSort } from '@shell/types/store/pagination.types';
 import { VuexStore } from '@shell/types/store/vuex';
 import { filterHiddenLocalCluster, filterOnlyKubernetesClusters, paginationFilterClusters } from '@shell/utils/cluster';
@@ -100,6 +101,8 @@ export interface TopLevelMenuHelper {
    * Cleanup on destroy of TopLevelMenu
    */
   destroy: () => Promise<void>;
+
+  updateCount: (count: number) => Promise<void>;
 }
 
 export abstract class BaseTopLevelMenuHelper {
@@ -172,6 +175,8 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
   private clustersOthersWrapper: PaginationWrapper<any>;
   private provClusterWrapper: PaginationWrapper<any>;
 
+  private clusterCount = 0;
+
   constructor({ $store }: {
       $store: VuexStore,
   }) {
@@ -216,7 +221,7 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
           context: 'side-bar',
         }
       },
-      formatResponse: { classify: true }
+      formatResponse: { classify: true },
     });
     // Fetch all prov clusters for the mgmt clusters we have
     this.provClusterWrapper = new PaginationWrapper({
@@ -400,6 +405,47 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
       .then((r) => r.data);
   }
 
+  /**
+   * Update the cluster count used when showing lists of home page + resource menu cluster count
+   *
+   * This is a convenient place to make the request
+   */
+  public async updateCount(count: number) {
+    if (count === this.clusterCount) {
+      return;
+    }
+
+    this.clusterCount = count;
+
+    try {
+      const commonClusterFilters = paginationFilterClusters({ getters: this.$store.getters });
+
+      if (commonClusterFilters.length === 0) {
+        // We're not filtering out harvester clusters or local cluster, so no need to tweak the saved count for clusters
+        return;
+      }
+
+      const args:ActionFindPageArgs = {
+        pagination: {
+          filters:              commonClusterFilters,
+          page:                 1,
+          pageSize:             1,
+          sort:                 [],
+          projectsOrNamespaces: [],
+        },
+        transient:   true,
+        saveCountAs: SAVED_COUNTS.K8S_CLUSTERS
+      };
+
+      await this.$store.dispatch('management/findPage', {
+        type: MANAGEMENT.CLUSTER,
+        opt:  args
+      });
+    } catch (err) {
+      console.warn('Unable to set saved count for clusters', err); // eslint-disable-line no-console
+    }
+  }
+
   /**
    * Find all provisioning clusters associated with the displayed mgmt clusters
    */
@@ -595,6 +641,8 @@ export class TopLevelMenuHelperLegacy extends BaseTopLevelMenuHelper implements
 
     return sorted;
   }
+
+  public async updateCount(count: number) {}
 }
 
 /**

package/components/nav/TopLevelMenu.vue

@@ -270,6 +270,12 @@ export default {
       const value = hideLocalSetting.value || hideLocalSetting.default || 'false';
 
       return value === 'true';
+    },
+
+    clusterCountsFromCounts() {
+      const counts = this.$store.getters[`management/all`](COUNT)?.[0]?.counts || {};
+
+      return counts[CAPI.RANCHER_CLUSTER]?.summary.count;
     }
   },
 
@@ -331,7 +337,15 @@ export default {
 
     hideLocalCluster() {
       this.updateClusters(this.pinnedIds, 'slow');
+    },
+
+    clusterCountsFromCounts: {
+      async handler(neu, old) {
+        await this.helper.updateCount(neu);
+      },
+      immediate: true,
     }
+
   },
 
   mounted() {

package/components/nav/Type.vue

@@ -58,6 +58,11 @@ export default {
       }
 
       const inStore = this.$store.getters['currentStore'](this.type.name);
+      const typeOptions = this.$store.getters[`type-map/optionsFor`](this.type.name);
+
+      if (typeOptions?.custom?.countGetter && typeof typeOptions.custom?.countGetter === 'function') {
+        return typeOptions.custom.countGetter(this.$store.getters);
+      }
 
       return this.$store.getters[`${ inStore }/count`]({ name: this.type.name });
     },

package/components/nav/__tests__/TopLevelMenu.test.ts

@@ -595,7 +595,7 @@ describe('topLevelMenu', () => {
       jest.spyOn(sideNavService, 'init').mockImplementation(() => {});
       const updateSpy = jest.fn();
       const mockHelper = {
-        update: updateSpy, clustersPinned: [], clustersOthers: []
+        update: updateSpy, clustersPinned: [], clustersOthers: [], updateCount: () => {}
       };
 
       jest.spyOn(sideNavService, 'helper', 'get').mockReturnValue(mockHelper as any);
@@ -624,7 +624,7 @@ describe('topLevelMenu', () => {
       jest.spyOn(sideNavService, 'init').mockImplementation(() => {});
       const updateSpy = jest.fn();
       const mockHelper = {
-        update: updateSpy, clustersPinned: [], clustersOthers: []
+        update: updateSpy, clustersPinned: [], clustersOthers: [], updateCount: () => {}
       };
 
       jest.spyOn(sideNavService, 'helper', 'get').mockReturnValue(mockHelper as any);
@@ -653,7 +653,7 @@ describe('topLevelMenu', () => {
       jest.spyOn(sideNavService, 'init').mockImplementation(() => {});
       const updateSpy = jest.fn();
       const mockHelper = {
-        update: updateSpy, clustersPinned: [], clustersOthers: []
+        update: updateSpy, clustersPinned: [], clustersOthers: [], updateCount: () => {}
       };
 
       jest.spyOn(sideNavService, 'helper', 'get').mockReturnValue(mockHelper as any);

package/components/nav/__tests__/Type.test.ts

@@ -21,8 +21,9 @@ describe('component: Type', () => {
     const defaultCount = 1;
     const storeMock = {
       getters: {
-        currentStore:    () => 'cluster',
-        'cluster/count': () => defaultCount,
+        currentStore:          () => 'cluster',
+        'cluster/count':       () => defaultCount,
+        'type-map/optionsFor': () => {},
       }
     };
     const routerMock = {
@@ -449,8 +450,9 @@ describe('component: Type', () => {
 
               $store: {
                 getters: {
-                  currentStore:    () => 'cluster',
-                  'cluster/count': () => null,
+                  currentStore:          () => 'cluster',
+                  'cluster/count':       () => null,
+                  'type-map/optionsFor': () => {},
                 }
               },
               $router: routerMock,

package/config/product/explorer.js

@@ -3,7 +3,7 @@ import {
   CONFIG_MAP,
   EVENT,
   NODE, SECRET, INGRESS,
-  WORKLOAD, WORKLOAD_TYPES, SERVICE, HPA, NETWORK_POLICY, PV, PVC, STORAGE_CLASS, POD, POD_DISRUPTION_BUDGET, LIMIT_RANGE, RESOURCE_QUOTA,
+  WORKLOAD, WORKLOAD_TYPES, SERVICE, HPA, NETWORK_POLICY, PV, PVC, STORAGE_CLASS, POD, POD_DISRUPTION_BUDGET, LIMIT_RANGE, RESOURCE_QUOTA, AUDIT_POLICY,
   MANAGEMENT,
   NAMESPACE,
   NORMAN,
@@ -83,6 +83,7 @@ export function init(store) {
     NETWORK_POLICY,
     POD_DISRUPTION_BUDGET,
     RESOURCE_QUOTA,
+    AUDIT_POLICY,
   ], 'policy');
 
   basicType([
@@ -118,6 +119,7 @@ export function init(store) {
   weightGroup('storage', 95, true);
   weightGroup('policy', 94, true);
   weightType(POD, -1, true);
+  weightType(AUDIT_POLICY, -1, true);
 
   // here is where we define the usage of the WORKLOAD custom list view for
   // all the workload types (ex: deployments, cron jobs, daemonsets, etc)
@@ -152,6 +154,7 @@ export function init(store) {
   mapGroup('autoscaling', 'Autoscaling');
   mapGroup('policy', 'Policy');
   mapGroup('networking.k8s.io', 'Networking');
+  mapGroup('auditlog.cattle.io', 'Policy');
   mapGroup(/^(.+\.)?api(server)?.*\.k8s\.io$/, 'API');
   mapGroup('rbac.authorization.k8s.io', 'RBAC');
   mapGroup('admissionregistration.k8s.io', 'admission');
@@ -181,7 +184,6 @@ export function init(store) {
 
   const dePaginateBindings = configureConditionalDepaginate({ maxResourceCount: 5000 });
   const dePaginateNormanBindings = configureConditionalDepaginate({ maxResourceCount: 5000, isNorman: true });
-  const dePaginateNormanUsers = configureConditionalDepaginate({ maxResourceCount: 5000, isNorman: true });
 
   configureType(NODE, { isCreatable: false, isEditable: true });
   configureType(WORKLOAD_TYPES.JOB, { isEditable: false, match: WORKLOAD_TYPES.JOB });
@@ -190,7 +192,6 @@ export function init(store) {
   configureType(MANAGEMENT.PROJECT, { displayName: store.getters['i18n/t']('namespace.project.label') });
   configureType(NORMAN.CLUSTER_ROLE_TEMPLATE_BINDING, { depaginate: dePaginateNormanBindings });
   configureType(NORMAN.PROJECT_ROLE_TEMPLATE_BINDING, { depaginate: dePaginateNormanBindings });
-  configureType(NORMAN.USER, { depaginate: dePaginateNormanUsers });
   configureType(SNAPSHOT, { depaginate: true });
 
   configureType(SECRET, { showListMasthead: false });

package/config/product/manager.js

@@ -2,16 +2,21 @@ import { AGE, NAME as NAME_COL, STATE } from '@shell/config/table-headers';
 import {
   CAPI,
   CATALOG,
+  EXT,
+  COUNT,
   NORMAN,
   HCI,
   MANAGEMENT,
   SNAPSHOT,
   VIRTUAL_TYPES,
-  HOSTED_PROVIDER
+  HOSTED_PROVIDER,
+  SAVED_COUNTS
 } from '@shell/config/types';
 import { MULTI_CLUSTER } from '@shell/store/features';
 import { DSL } from '@shell/store/type-map';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
+import { markRaw } from 'vue';
+
 export const NAME = 'manager';
 
 export function init(store) {
@@ -125,14 +130,17 @@ export function init(store) {
   weightType(CAPI.MACHINE_DEPLOYMENT, 4, true);
   weightType(CAPI.MACHINE_SET, 3, true);
   weightType(CAPI.MACHINE, 2, true);
-  weightType(CATALOG.CLUSTER_REPO, 1, true);
+  configureType(EXT.KUBECONFIG, { canYaml: false });
+  weightType(EXT.KUBECONFIG, 1, true);
+  weightType(CATALOG.CLUSTER_REPO, 0, true);
   weightType(MANAGEMENT.PSA, 5, true);
-  weightType(VIRTUAL_TYPES.JWT_AUTHENTICATION, 0, true);
+  weightType(VIRTUAL_TYPES.JWT_AUTHENTICATION, -1, true);
 
   basicType([
     CAPI.MACHINE_DEPLOYMENT,
     CAPI.MACHINE_SET,
     CAPI.MACHINE,
+    EXT.KUBECONFIG,
     CATALOG.CLUSTER_REPO,
     MANAGEMENT.PSA,
     VIRTUAL_TYPES.JWT_AUTHENTICATION
@@ -192,4 +200,40 @@ export function init(store) {
     MACHINE_SUMMARY,
     AGE
   ]);
+
+  headers(EXT.KUBECONFIG, [
+    STATE,
+    {
+      name:      'clusters',
+      labelKey:  'tableHeaders.clusters',
+      value:     'spec.clusters',
+      sort:      ['referencedClustersSortable'],
+      search:    ['referencedClustersSortable'],
+      formatter: 'KubeconfigClusters',
+    },
+    {
+      name:          'ttl',
+      labelKey:      'tableHeaders.ttl',
+      value:         'expiresAt',
+      formatter:     'LiveDate',
+      formatterOpts: { isCountdown: true },
+    },
+    {
+      ...AGE,
+      defaultSort: true,
+    },
+  ]);
+
+  // Configure custom count getter for cluster count (so we don't include Harvester clusters)
+  configureType(CAPI.RANCHER_CLUSTER, {
+    custom: {
+      countGetter: markRaw((getters) => {
+        const savedClusterCount = getters['management/getSavedCount'](SAVED_COUNTS.K8S_CLUSTERS);
+        const counts = getters[`management/all`](COUNT)?.[0]?.counts || {};
+        const clusterCount = counts[CAPI.RANCHER_CLUSTER]?.summary.count;
+
+        return savedClusterCount || clusterCount;
+      })
+    }
+  });
 }

package/config/router/navigation-guards/authentication.js

@@ -28,16 +28,16 @@ export function install(router, context) {
 }
 
 /**
- * Generate an object that includes both the v3User and the me data
- * @param {*} v3User V3 user information
+ * Generate an object that includes both the user and the me data
+ * @param {*} user User information
  * @param {*} me Me user data
  * @returns User info to be passed to `isLoggedIn`
  */
-function getUserObject(v3User, me) {
+function getUserObject(user, me) {
   return {
     id: me.id,
     me,
-    v3User,
+    user,
   };
 }
 
@@ -59,10 +59,9 @@ export async function authenticate(to, from, next, { store }) {
   if ( store.getters['auth/enabled'] !== false && !store.getters['auth/loggedIn'] ) {
     // `await` so we have one successfully request whilst possibly logged in (ensures fromHeader is populated from `x-api-cattle-auth`)
     await store.dispatch('auth/getUser');
+    const user = store.getters['auth/user'] || {};
 
-    const v3User = store.getters['auth/v3User'] || {};
-
-    if (v3User?.mustChangePassword) {
+    if (user?.mustChangePassword) {
       return next({ name: 'auth-setup' });
     }
 
@@ -75,7 +74,7 @@ export async function authenticate(to, from, next, { store }) {
     } else if ( fromHeader === 'true' ) {
       const me = await findMe(store);
 
-      await isLoggedIn(store, getUserObject(v3User, me));
+      await isLoggedIn(store, getUserObject(user, me));
       handleOidcRedirectToCallbackUrl();
     } else if ( fromHeader === 'false' ) {
       notLoggedIn(store, next, to);
@@ -86,7 +85,7 @@ export async function authenticate(to, from, next, { store }) {
       try {
         const me = await findMe(store);
 
-        await isLoggedIn(store, getUserObject(v3User, me));
+        await isLoggedIn(store, getUserObject(user, me));
         handleOidcRedirectToCallbackUrl();
       } catch (e) {
         const status = e?._status;

package/config/router/routes.js

@@ -514,7 +514,10 @@ export default [
         name:      'c-cluster-product-resource-id',
         meta:      { asyncSetup: true }
       }, {
-        path:      `/c/:cluster/:product/${ VIRTUAL_TYPES.PROJECT_SECRETS }/:namespace/:id`,
+        // Used this regex syntax in order to strict match the 'projectsecret' path segment
+        // while simultaneously capturing it as the 'resource' parameter.
+        // This is required because the Side Navigation relies on route.params.resource to determine which menu item to highlight.
+        path:      `/c/:cluster/:product/:resource(${ VIRTUAL_TYPES.PROJECT_SECRETS })/:namespace/:id`,
         component: () => interopDefault(import(`@shell/pages/c/_cluster/explorer/${ VIRTUAL_TYPES.PROJECT_SECRETS }.vue`)),
         name:      `c-cluster-product-${ VIRTUAL_TYPES.PROJECT_SECRETS }-namespace-id`,
       }, {

package/config/types.js

@@ -61,6 +61,7 @@ export const POD_DISRUPTION_BUDGET = 'policy.poddisruptionbudget';
 export const PV = 'persistentvolume';
 export const PVC = 'persistentvolumeclaim';
 export const RESOURCE_QUOTA = 'resourcequota';
+export const AUDIT_POLICY = 'auditlog.cattle.io.auditpolicy';
 export const SCHEMA = 'schema';
 export const SERVICE = 'service';
 export const SECRET = 'secret';
@@ -263,8 +264,11 @@ export const BRAND = {
 };
 
 export const EXT = {
-  USER_ACTIVITY: 'ext.cattle.io.useractivity',
-  KUBECONFIG:    'ext.cattle.io.kubeconfig',
+  USER_ACTIVITY:                     'ext.cattle.io.useractivity',
+  SELFUSER:                          'ext.cattle.io.selfuser',
+  GROUP_MEMBERSHIP_REFRESH_REQUESTS: 'ext.cattle.io.groupmembershiprefreshrequest',
+  PASSWORD_CHANGE_REQUESTS:          'ext.cattle.io.passwordchangerequest',
+  KUBECONFIG:                        'ext.cattle.io.kubeconfig',
 };
 
 export const CAPI = {
@@ -409,3 +413,7 @@ export const DEPRECATED = 'Deprecated';
 export const EXPERIMENTAL = 'Experimental';
 export const AUTOSCALER_CONFIG_MAP_ID = 'kube-system/cluster-autoscaler-status';
 export const HOSTED_PROVIDER = 'hostedprovider';
+
+// Named saved counts
+
+export const SAVED_COUNTS = { K8S_CLUSTERS: 'k8sClusters' };

package/detail/auditlog.cattle.io.auditpolicy.vue

@@ -0,0 +1,19 @@
+<script lang="ts">
+// Shared AuditPolicy interface for all audit log policy components
+import CreateEditView from '@shell/mixins/create-edit-view';
+import ResourceTabs from '@shell/components/form/ResourceTabs/index.vue';
+
+export default {
+  name:       'DetailAuditPolicy',
+  components: { ResourceTabs },
+  mixins:     [CreateEditView],
+};
+</script>
+
+<template>
+  <Loading v-if="$fetchState.pending" />
+  <ResourceTabs
+    :mode="mode"
+    :value="value"
+  />
+</template>

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

@@ -3,7 +3,7 @@ import CreateEditView from '@shell/mixins/create-edit-view';
 import Tab from '@shell/components/Tabbed/Tab';
 import ResourceTabs from '@shell/components/form/ResourceTabs';
 import SortableTable from '@shell/components/SortableTable';
-import { MANAGEMENT, NORMAN } from '@shell/config/types';
+import { MANAGEMENT } from '@shell/config/types';
 import Loading from '@shell/components/Loading';
 import { NAME } from '@shell/config/table-headers';
 
@@ -31,7 +31,6 @@ export default {
     if (this.canSeeRoleTemplates) {
       // Upfront fetch, avoid async computes
       await Promise.all([
-        await this.$store.dispatch('rancher/find', { type: NORMAN.USER, id: this.value.id }),
         await this.$store.dispatch('management/findAll', { type: MANAGEMENT.ROLE_TEMPLATE }),
         await this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER_ROLE_TEMPLATE_BINDING }),
         await this.$store.dispatch('management/findAll', { type: MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING })

package/detail/node.vue

@@ -196,7 +196,6 @@ export default {
     v-else
     class="node"
   >
-    <div class="spacer" />
     <div class="alerts">
       <Alert
         class="mr-10"

package/detail/provisioning.cattle.io.cluster.vue

@@ -364,7 +364,8 @@ export default {
         const machineFullName = machineNameFn(this.value.name, mp.name);
 
         const machines = this.value.machines.filter((machine) => {
-          const isElementalCluster = machine.spec?.infrastructureRef?.apiVersion.startsWith('elemental.cattle.io');
+          // elemental machines use an older version of CAPI CRDs that use apiVersion instead of apiGroup
+          const isElementalCluster = (machine.spec?.infrastructureRef?.apiGroup || machine.spec?.infrastructureRef?.apiVersion).startsWith('elemental.cattle.io');
           const machinePoolInfName = machine.spec?.infrastructureRef?.name;
 
           if (isElementalCluster) {

package/dialog/ChangePasswordDialog.vue

@@ -9,6 +9,13 @@ export default {
   components: {
     Card, AsyncButton, ChangePassword
   },
+  props: {
+    user: {
+      type:     Object,
+      default:  () => null,
+      required: true
+    }
+  },
   data() {
     return { valid: false, password: '' };
   },
@@ -45,6 +52,7 @@ export default {
       <form @submit.prevent>
         <ChangePassword
           ref="changePassword"
+          :user="user"
           @valid="valid = $event"
         />
       </form>

package/dialog/GenericPrompt.vue

@@ -38,9 +38,24 @@ export default {
       type:    Function,
       default: () => { }
     },
+    actionColor: {
+      type:    String,
+      default: 'role-primary',
+    },
+    errors: {
+      type:    Array,
+      default: () => []
+    }
   },
+
   data() {
-    return { errors: [] };
+    return { applyErrors: [] };
+  },
+
+  computed: {
+    allErrors() {
+      return [...this.errors, ...this.applyErrors];
+    }
   },
 
   methods: {
@@ -51,13 +66,14 @@ export default {
     },
 
     async apply(buttonDone) {
+      this.applyErrors = [];
       try {
         await this.applyAction(buttonDone);
         this.confirm(true);
         this.$emit('close');
       } catch (err) {
         console.error(err); // eslint-disable-line
-        this.errors = exceptionToErrorsArray(err);
+        this.applyErrors = exceptionToErrorsArray(err);
         buttonDone(false);
       }
     }
@@ -92,7 +108,7 @@ export default {
     <template #actions>
       <div class="bottom">
         <Banner
-          v-for="(err, i) in errors"
+          v-for="(err, i) in allErrors"
           :key="i"
           color="error"
           :label="err"
@@ -107,6 +123,7 @@ export default {
 
           <AsyncButton
             :mode="applyMode"
+            :action-color="actionColor"
             @click="apply"
           />
         </div>