From 25c0c702c23799c4902f72278b84f177e3660dc7 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 6 Aug 2024 14:15:46 +0100
Subject: [PATCH 01/76] cluster list now uses resource table

---
 shell/components/SortableTable/index.vue | 10 ++++----
 shell/pages/home.vue                     | 30 ++++++++++++++++++------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/shell/components/SortableTable/index.vue b/shell/components/SortableTable/index.vue
index ce2bc64dad4..07137544fb9 100644
--- a/shell/components/SortableTable/index.vue
+++ b/shell/components/SortableTable/index.vue
@@ -545,9 +545,9 @@ export default {
     showHeaderRow() {
       return this.search ||
         this.tableActions ||
-        this.$slots['header-left']?.length ||
-        this.$slots['header-middle']?.length ||
-        this.$slots['header-right']?.length;
+        this.$scopedSlots['header-left'] ||
+        this.$scopedSlots['header-middle'] ||
+        this.$scopedSlots['header-right'];
     },
 
     columns() {
@@ -1084,14 +1084,14 @@ export default {
           </slot>
         </div>
         <div
-          v-if="!hasAdvancedFiltering && ($slots['header-middle'] && $slots['header-middle'].length)"
+          v-if="!hasAdvancedFiltering && $scopedSlots['header-middle']"
           class="middle"
         >
           <slot name="header-middle" />
         </div>
 
         <div
-          v-if="search || hasAdvancedFiltering || isTooManyItemsToAutoUpdate || ($slots['header-right'] && $slots['header-right'].length)"
+          v-if="search || hasAdvancedFiltering || isTooManyItemsToAutoUpdate || $scopedSlots['header-right']"
           class="search row"
           data-testid="search-box-filter-row"
         >
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index 4a1b03bd914..48229cf3da6 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -3,12 +3,12 @@ import { mapPref, AFTER_LOGIN_ROUTE, READ_WHATS_NEW, HIDE_HOME_PAGE_CARDS } from
 import { Banner } from '@components/Banner';
 import BannerGraphic from '@shell/components/BannerGraphic';
 import IndentedPanel from '@shell/components/IndentedPanel';
-import SortableTable from '@shell/components/SortableTable';
+import ResourceTable from '@shell/components/ResourceTable.vue';
 import { BadgeState } from '@components/BadgeState';
 import CommunityLinks from '@shell/components/CommunityLinks';
 import SingleClusterInfo from '@shell/components/SingleClusterInfo';
 import { mapGetters, mapState } from 'vuex';
-import { MANAGEMENT, CAPI } from '@shell/config/types';
+import { MANAGEMENT, CAPI, SCHEMA } from '@shell/config/types';
 import { NAME as MANAGER } from '@shell/config/product/manager';
 import { STATE } from '@shell/config/table-headers';
 import { MODE, _IMPORT } from '@shell/config/query-params';
@@ -30,7 +30,7 @@ export default {
     Banner,
     BannerGraphic,
     IndentedPanel,
-    SortableTable,
+    ResourceTable,
     BadgeState,
     CommunityLinks,
     SingleClusterInfo,
@@ -40,7 +40,8 @@ export default {
   mixins: [PageHeaderActions],
 
   fetch() {
-    if ( this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER) ) {
+    this.provClusterSchema = this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER);
+    if ( this.provClusterSchema ) {
       this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER });
     }
 
@@ -82,7 +83,10 @@ export default {
     ];
 
     return {
-      HIDE_HOME_PAGE_CARDS, fullVersion, pageActions, vendor: getVendor(),
+      HIDE_HOME_PAGE_CARDS,
+      fullVersion,
+      pageActions,
+      vendor: getVendor(),
     };
   },
 
@@ -208,6 +212,13 @@ export default {
 
     kubeClusters() {
       return filterHiddenLocalCluster(filterOnlyKubernetesClusters(this.provClusters || [], this.$store), this.$store);
+    },
+
+    nonStandardNamespaces() {
+      // Show the namespace grouping option if there's clusters with namespaces other than 'fleet-default' or 'fleet-local'
+      // This will be used when there's clusters from extension based provisioners
+      // We should re-visit this for scaling reasons
+      return this.kubeClusters.some((c) => c.metadata.namespace !== 'fleet-local' && c.metadata.namespace !== 'fleet-default');
     }
   },
 
@@ -296,6 +307,7 @@ export default {
 };
 
 </script>
+
 <template>
   <div
     v-if="managementReady"
@@ -366,13 +378,15 @@ export default {
               v-if="mcm"
               class="col span-12"
             >
-              <SortableTable
+              <ResourceTable
+                :schema="provClusterSchema"
                 :table-actions="false"
                 :row-actions="false"
                 key-field="id"
                 :rows="kubeClusters"
                 :headers="clusterHeaders"
                 :loading="!kubeClusters"
+                :namespaced="nonStandardNamespaces"
               >
                 <template #header-left>
                   <div class="row table-heading">
@@ -483,7 +497,7 @@ export default {
                     {{ t('landing.clusters.explore') }}
                   </button>
                 </template> -->
-              </SortableTable>
+              </ResourceTable>
             </div>
             <div
               v-else
@@ -498,6 +512,7 @@ export default {
     </IndentedPanel>
   </div>
 </template>
+
 <style lang='scss' scoped>
   .home-panels {
     display: flex;
@@ -587,6 +602,7 @@ export default {
     }
   }
 </style>
+
 <style lang="scss">
 .home-page {
   .search {

From eda38cf84eaa8f9febdd20f298ac952571706d89 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 6 Aug 2024 15:50:50 +0100
Subject: [PATCH 02/76] New PaginatedResourceTable

---
 shell/components/PaginatedResourceTable.vue   | 57 +++++++++++++++++++
 .../components/form/ResourceLabeledSelect.vue |  2 +-
 shell/pages/home.vue                          | 15 +++--
 shell/utils/cluster.js                        | 35 +++++++++++-
 4 files changed, 101 insertions(+), 8 deletions(-)
 create mode 100644 shell/components/PaginatedResourceTable.vue

diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
new file mode 100644
index 00000000000..de9064f2ac7
--- /dev/null
+++ b/shell/components/PaginatedResourceTable.vue
@@ -0,0 +1,57 @@
+<script lang="ts">
+import { defineComponent } from 'vue';
+import ResourceFetch from '@shell/mixins/resource-fetch';
+import ResourceTable from '@shell/components/ResourceTable.vue';
+
+/**
+ * Wraps ResourceTable with the plumbing required to handle Server-Side Pagination (mainly mixins)
+ *
+ * This can be used in places outside of standard List pages (list nodes, generic list, etc) where paginated lists are required (for example home page)
+ *
+ */
+export default defineComponent({
+  name: 'PaginatedResourceTable',
+
+  components: { ResourceTable },
+
+  mixins: [ResourceFetch],
+
+  props: {
+    schema: {
+      type:    Object,
+      default: null,
+    },
+  }
+});
+
+</script>
+
+<template>
+  <!-- :schema="provClusterSchema"
+    :table-actions="false"
+    :row-actions="false"
+    key-field="id"
+    :rows="kubeClusters"
+    :headers="clusterHeaders"
+    :loading="!kubeClusters"
+    :namespaced="nonStandardNamespaces" -->
+  <ResourceTable
+    :schema="schema"
+    v-bind="$attrs"
+    :external-pagination-enabled="canPaginate"
+    :external-pagination-result="paginationResult"
+    :request-filters="paginationRequestFilters"
+    @pagination-changed="paginationChanged"
+  >
+    <!-- Pass down templates provided by the caller -->
+    <template
+      v-for="(_, slot) of $scopedSlots"
+      v-slot:[slot]="scope"
+    >
+      <slot
+        :name="slot"
+        v-bind="scope"
+      />
+    </template>
+  </ResourceTable>
+</template>
diff --git a/shell/components/form/ResourceLabeledSelect.vue b/shell/components/form/ResourceLabeledSelect.vue
index d2fd1b8ca89..79ef811a4a5 100644
--- a/shell/components/form/ResourceLabeledSelect.vue
+++ b/shell/components/form/ResourceLabeledSelect.vue
@@ -52,7 +52,7 @@ export enum RESOURCE_LABEL_SELECT_MODE {
 }
 
 /**
- * Convience wrapper around the LabelSelect component to support pagination
+ * Convenance wrapper around the LabelSelect component to support pagination
  *
  * Handles
  *
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index 48229cf3da6..00f98241d8a 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -3,7 +3,7 @@ import { mapPref, AFTER_LOGIN_ROUTE, READ_WHATS_NEW, HIDE_HOME_PAGE_CARDS } from
 import { Banner } from '@components/Banner';
 import BannerGraphic from '@shell/components/BannerGraphic';
 import IndentedPanel from '@shell/components/IndentedPanel';
-import ResourceTable from '@shell/components/ResourceTable.vue';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
 import { BadgeState } from '@components/BadgeState';
 import CommunityLinks from '@shell/components/CommunityLinks';
 import SingleClusterInfo from '@shell/components/SingleClusterInfo';
@@ -18,7 +18,7 @@ import PageHeaderActions from '@shell/mixins/page-actions';
 import { getVendor } from '@shell/config/private-label';
 import { mapFeature, MULTI_CLUSTER } from '@shell/store/features';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
-import { filterOnlyKubernetesClusters, filterHiddenLocalCluster } from '@shell/utils/cluster';
+import { filterOnlyKubernetesClusters, filterHiddenLocalCluster, paginationFilterOnlyKubeClusters } from '@shell/utils/cluster';
 import TabTitle from '@shell/components/TabTitle';
 
 import { RESET_CARDS_ACTION, SET_LOGIN_ACTION } from '@shell/config/page-actions';
@@ -30,7 +30,7 @@ export default {
     Banner,
     BannerGraphic,
     IndentedPanel,
-    ResourceTable,
+    PaginatedResourceTable,
     BadgeState,
     CommunityLinks,
     SingleClusterInfo,
@@ -87,6 +87,9 @@ export default {
       fullVersion,
       pageActions,
       vendor: getVendor(),
+
+      // resource:                 CAPI.RANCHER_CLUSTER,
+      // paginationRequestFilters: paginationFilterOnlyKubeClusters(this.$store)
     };
   },
 
@@ -378,7 +381,7 @@ export default {
               v-if="mcm"
               class="col span-12"
             >
-              <ResourceTable
+              <PaginatedResourceTable
                 :schema="provClusterSchema"
                 :table-actions="false"
                 :row-actions="false"
@@ -386,7 +389,7 @@ export default {
                 :rows="kubeClusters"
                 :headers="clusterHeaders"
                 :loading="!kubeClusters"
-                :namespaced="nonStandardNamespaces"
+                :namespaced="false"
               >
                 <template #header-left>
                   <div class="row table-heading">
@@ -497,7 +500,7 @@ export default {
                     {{ t('landing.clusters.explore') }}
                   </button>
                 </template> -->
-              </ResourceTable>
+              </PaginatedResourceTable>
             </div>
             <div
               v-else
diff --git a/shell/utils/cluster.js b/shell/utils/cluster.js
index e7657e1fe13..80fffd4427a 100644
--- a/shell/utils/cluster.js
+++ b/shell/utils/cluster.js
@@ -2,8 +2,41 @@ import semver from 'semver';
 import { CAPI } from '@shell/config/labels-annotations';
 import { MANAGEMENT, VIRTUAL_HARVESTER_PROVIDER } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
+import { PaginationFilterField, PaginationParamFilter } from 'types/store/pagination.types';
 
-// Filter out any clusters that are not Kubernetes Clusters
+/**
+ * TODO: RC
+ *
+ * @export
+ * @param {*} store
+ * @returns PaginationParamFilter | null
+ */
+export function paginationFilterOnlyKubeClusters(store) {
+  const openHarvesterContainerWorkload = store.getters['features/get']('harvester-baremetal-container-workload');
+
+  if (!openHarvesterContainerWorkload) {
+    return null;
+  }
+
+  return PaginationParamFilter.createMultipleFields([
+    new PaginationFilterField({
+      field:  `metadata.labels."${ CAPI.PROVIDER }"`, // TODO: RC
+      equals: false,
+      value:  VIRTUAL_HARVESTER_PROVIDER,
+      exact:  true
+    }),
+    new PaginationFilterField({
+      field:  `status.provider`, // TODO: RC
+      equals: false,
+      value:  VIRTUAL_HARVESTER_PROVIDER,
+      exact:  true
+    }),
+  ]);
+}
+
+/**
+ * Filter out any clusters that are not Kubernetes Clusters
+ **/
 export function filterOnlyKubernetesClusters(mgmtClusters, store) {
   const openHarvesterContainerWorkload = store.getters['features/get']('harvester-baremetal-container-workload');
 

From 8e120d0d32351189007367b64b65f42a333e0844 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 8 Aug 2024 16:58:53 +0100
Subject: [PATCH 03/76] WIP

---
 shell/components/PaginatedResourceTable.vue   | 126 +++++--
 shell/components/SortableTable/index.vue      |  14 +-
 shell/config/product/explorer.js              |   2 +
 shell/config/settings.ts                      |  12 +-
 shell/list/node.vue                           |  13 +-
 shell/mixins/resource-fetch-api-pagination.js |  16 +-
 shell/mixins/resource-fetch.js                |  18 +-
 shell/pages/home.vue                          | 356 ++++++++++++------
 shell/plugins/steve/steve-pagination-utils.ts |  17 +
 shell/utils/cluster.js                        |   4 +-
 10 files changed, 415 insertions(+), 163 deletions(-)

diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
index de9064f2ac7..afdd61f2313 100644
--- a/shell/components/PaginatedResourceTable.vue
+++ b/shell/components/PaginatedResourceTable.vue
@@ -3,10 +3,20 @@ import { defineComponent } from 'vue';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import ResourceTable from '@shell/components/ResourceTable.vue';
 
+export type FetchSecondaryResourcesOpts = { }
+export type FetchSecondaryResources = (opts: FetchSecondaryResourcesOpts) => Promise<any>
+
+export type FetchPageSecondaryResourcesOpts = { canPaginate: boolean, force: boolean, page: any[] }
+export type FetchPageSecondaryResources = (opts: FetchPageSecondaryResourcesOpts) => Promise<any>
+
 /**
- * Wraps ResourceTable with the plumbing required to handle Server-Side Pagination (mainly mixins)
+ * This is meant to enable ResourceList like capabilities outside of List pages / components
+ *
+ * Specifically
+ * - Resource Fetch features, including server-side pagination
+ * - Some plumbing
  *
- * This can be used in places outside of standard List pages (list nodes, generic list, etc) where paginated lists are required (for example home page)
+ * This avoids polluting the owning component with mixins
  *
  */
 export default defineComponent({
@@ -18,40 +28,98 @@ export default defineComponent({
 
   props: {
     schema: {
-      type:    Object,
+      type:     Object,
+      required: true,
+    },
+
+    headers: {
+      type:    Array,
+      default: null,
+    },
+
+    paginationHeaders: {
+      type:    Array,
+      default: null,
+    },
+
+    namespaced: {
+      type:    Boolean,
+      default: null, // Automatic from schema
+    },
+
+    /**
+     * Information may be required from resources other than the primary one shown per row
+     *
+     * This will fetch them ALL and will be run in a non-server-side pagination world
+     */
+    fetchSecondaryResources: {
+      type:    Function,
       default: null,
     },
+
+    /**
+     * Information may be required from resources other than the primary one shown per row
+     *
+     * This will fetch only those relevent to the current page using server-side pagination based filters
+     *
+     * called from shell/mixins/resource-fetch-api-pagination.js
+     */
+    fetchPageSecondaryResources: {
+      type:    Function,
+      default: null,
+    }
+  },
+
+  data() {
+    return { resource: this.schema.id };
+  },
+
+  async fetch() {
+    await this.$fetchType(this.resource, [], this.inStore);
+
+    if (this.canPaginate && this.fetchSecondaryResources) {
+      await this.fetchSecondaryResources({ });
+    }
+  },
+
+  computed: {
+    safeHeaders() {
+      const customHeaders = this.canPaginate ? this.paginationHeaders : this.headers;
+
+      return customHeaders || this.$store.getters['type-map/headersFor'](this.schema, this.canPaginate);
+    }
   }
 });
 
 </script>
 
 <template>
-  <!-- :schema="provClusterSchema"
-    :table-actions="false"
-    :row-actions="false"
-    key-field="id"
-    :rows="kubeClusters"
-    :headers="clusterHeaders"
-    :loading="!kubeClusters"
-    :namespaced="nonStandardNamespaces" -->
-  <ResourceTable
-    :schema="schema"
-    v-bind="$attrs"
-    :external-pagination-enabled="canPaginate"
-    :external-pagination-result="paginationResult"
-    :request-filters="paginationRequestFilters"
-    @pagination-changed="paginationChanged"
-  >
-    <!-- Pass down templates provided by the caller -->
-    <template
-      v-for="(_, slot) of $scopedSlots"
-      v-slot:[slot]="scope"
+  <div>
+    <ResourceTable
+      v-bind="$attrs"
+      :schema="schema"
+      :rows="rows"
+      :alt-loading="canPaginate"
+      :loading="loading"
+
+      :headers="safeHeaders"
+      :namespaced="namespaced"
+
+      :external-pagination-enabled="canPaginate"
+      :external-pagination-result="paginationResult"
+      @pagination-changed="paginationChanged"
+      v-on="$listeners"
     >
-      <slot
-        :name="slot"
-        v-bind="scope"
-      />
-    </template>
-  </ResourceTable>
+      <!-- Pass down templates provided by the caller -->
+      <template
+        v-for="(_, slot) of $scopedSlots"
+        v-slot:[slot]="scope"
+      >
+        <slot
+          :name="slot"
+          v-bind="scope"
+        />
+      </template>
+    </ResourceTable>
+  </div>
 </template>
diff --git a/shell/components/SortableTable/index.vue b/shell/components/SortableTable/index.vue
index 07137544fb9..f71c2941606 100644
--- a/shell/components/SortableTable/index.vue
+++ b/shell/components/SortableTable/index.vue
@@ -335,7 +335,13 @@ export default {
     externalPaginationResult: {
       type:    Object,
       default: null
+    },
+
+    manualRefreshButtonSize: {
+      type:    String,
+      default: ''
     }
+
   },
 
   data() {
@@ -1116,6 +1122,7 @@ export default {
             v-if="isTooManyItemsToAutoUpdate"
             class="manual-refresh"
             mode="manual-refresh"
+            :size="manualRefreshButtonSize"
             :current-phase="refreshButtonPhase"
             @click="debouncedRefreshTableData"
           />
@@ -1541,9 +1548,10 @@ export default {
     pointer-events: none;
   }
 
-  .manual-refresh {
-    height: 40px;
-  }
+  // TODO: RC TEST with <ResourceList :has-advanced-filtering="true" />
+  // .manual-refresh {
+  //   height: 40px;
+  // }
   .advanced-filter-group {
     position: relative;
     margin-left: 10px;
diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index 1652473a120..4ff4af1157b 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -9,6 +9,7 @@ import {
   NORMAN,
   SNAPSHOT,
   VIRTUAL_TYPES,
+  CAPI,
 } from '@shell/config/types';
 
 import {
@@ -60,6 +61,7 @@ export function init(store) {
       [MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING]: 'management',
       [NORMAN.CLUSTER_ROLE_TEMPLATE_BINDING]:     'rancher',
       [NORMAN.PROJECT_ROLE_TEMPLATE_BINDING]:     'rancher',
+      [CAPI.RANCHER_CLUSTER]:                     'management',
     }
   });
 
diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index b23facdd760..57ff6150ead 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -1,6 +1,7 @@
 // Settings
 import { GC_DEFAULTS, GC_PREFERENCES } from '@shell/utils/gc/gc-types';
 import { PaginationSettings } from '@shell/types/resources/settings';
+import { CAPI } from 'config/types';
 
 interface GlobalSettingRuleset {
   name: string,
@@ -253,8 +254,17 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
             generic: true,
           }
         }
+      },
+      // TODO: RC enable for cluster management??
+      management: {
+        resources: {
+          enableAll:  false,
+          enableSome: {
+            enabled: [CAPI.RANCHER_CLUSTER],
+            generic: false,
+          }
+        }
       }
     }
   }
-
 };
diff --git a/shell/list/node.vue b/shell/list/node.vue
index 6349996aa97..6e9be3063e2 100644
--- a/shell/list/node.vue
+++ b/shell/list/node.vue
@@ -21,6 +21,7 @@ import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import { mapGetters } from 'vuex';
+import { FetchPageSecondaryResourcesOpts } from 'components/PaginatedResourceTable.vue';
 
 export default defineComponent({
   name:       'ListNode',
@@ -36,10 +37,12 @@ export default defineComponent({
       type:     String,
       required: true,
     },
+
     schema: {
       type:     Object,
       required: true,
     },
+
     useQueryParamsForSimpleFiltering: {
       type:    Boolean,
       default: false
@@ -209,8 +212,8 @@ export default defineComponent({
      *
      * So when we have a page.... use those entries as filters when fetching the other resources
      */
-    async fetchPageSecondaryResources(force = false) {
-      if (!this.rows?.length) {
+    async fetchPageSecondaryResources({ canPaginate, force, page }: FetchPageSecondaryResourcesOpts) {
+      if (!page?.length) {
         return;
       }
 
@@ -220,7 +223,7 @@ export default defineComponent({
         const opt: ActionFindPageArgs = {
           force,
           pagination: new FilterArgs({
-            filters: PaginationParamFilter.createMultipleFields(this.rows.map((r: any) => new PaginationFilterField({
+            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
               field: 'status.nodeName',
               value: r.id
             }))),
@@ -242,7 +245,7 @@ export default defineComponent({
             namespaced: namespace,
             pagination: new FilterArgs({
               filters: PaginationParamFilter.createMultipleFields(
-                this.rows.reduce((res: PaginationFilterField[], r: any ) => {
+                page.reduce((res: PaginationFilterField[], r: any ) => {
                   const name = r.metadata?.annotations?.[CAPI_ANNOTATIONS.MACHINE_NAME];
 
                   if (name) {
@@ -268,7 +271,7 @@ export default defineComponent({
           force,
           pagination: new FilterArgs({
             filters: PaginationParamFilter.createMultipleFields(
-              this.rows.map((r: any) => new PaginationFilterField({
+              page.map((r: any) => new PaginationFilterField({
                 field: 'spec.nodeName',
                 value: r.id,
               }))
diff --git a/shell/mixins/resource-fetch-api-pagination.js b/shell/mixins/resource-fetch-api-pagination.js
index 80a2ec562d4..3d9ae7b4f35 100644
--- a/shell/mixins/resource-fetch-api-pagination.js
+++ b/shell/mixins/resource-fetch-api-pagination.js
@@ -68,7 +68,9 @@ export default {
     },
 
     namespaceFilterChanged(neu) {
-      if (!this.canPaginate || !this.schema?.attributes?.namespaced) {
+      if (!this.canPaginate || !this.schema?.attributes?.namespaced || !this.namespaced) {
+        this.debouncedSetPagination({ ...this.pPagination }); // TODO: RC remove?
+
         return;
       }
 
@@ -166,7 +168,7 @@ export default {
         return;
       }
 
-      return this.resource && this.$store.getters[`${ this.currentProduct?.inStore }/paginationEnabled`]?.(this.resource.id || this.resource);
+      return this.resource && this.$store.getters[`${ this.inStore }/paginationEnabled`]?.(this.resource.id || this.resource);
     },
 
     paginationResult() {
@@ -182,7 +184,7 @@ export default {
         return;
       }
 
-      return this.$store.getters[`${ this.currentProduct?.inStore }/havePage`](this.resource);
+      return this.$store.getters[`${ this.inStore }/havePage`](this.resource);
     },
 
     /**
@@ -197,6 +199,10 @@ export default {
       */
     showDynamicRancherNamespaces() {
       return this.$store.getters['prefs/get'](ALL_NAMESPACES);
+    },
+
+    inStore() {
+      return this.$store.getters['currentStore'](this.resource) || this.currentProduct?.inStore;
     }
   },
 
@@ -298,7 +304,9 @@ export default {
         return;
       }
 
-      await this.fetchPageSecondaryResources();
+      await this.fetchPageSecondaryResources({
+        canPaginate: this.canPaginate, force: false, page: this.rows
+      });
     }
   },
 };
diff --git a/shell/mixins/resource-fetch.js b/shell/mixins/resource-fetch.js
index 848b4f6b28c..61e2a4909f4 100644
--- a/shell/mixins/resource-fetch.js
+++ b/shell/mixins/resource-fetch.js
@@ -59,13 +59,25 @@ export default {
     }
   },
 
+  props: {
+    /**
+     * Add additional filtering to the rows
+     */
+    filterRows: {
+      type:    Function,
+      default: null,
+    },
+  },
+
   computed: {
     ...mapGetters({ refreshFlag: 'resource-fetch/refreshFlag' }),
     rows() {
       const currResource = this.fetchedResourceType.find((item) => item.type === this.resource);
 
       if (currResource) {
-        return this.$store.getters[`${ currResource.currStore }/all`](this.resource);
+        const rows = this.$store.getters[`${ currResource.currStore }/all`](this.resource);
+
+        return this.filterRows ? this.filterRows(rows) : rows;
       } else {
         return [];
       }
@@ -85,7 +97,9 @@ export default {
       if (this.init && neu) {
         await this.$fetch();
         if (this.canPaginate && this.fetchPageSecondaryResources) {
-          this.fetchPageSecondaryResources(true);
+          this.fetchPageSecondaryResources({
+            canPaginate: this.canPaginate, force: true, page: this.rows
+          });
         }
       }
     }
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index 00f98241d8a..9587344daaa 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -1,14 +1,15 @@
-<script>
+<script lang="ts">
+import { defineComponent } from 'vue';
 import { mapPref, AFTER_LOGIN_ROUTE, READ_WHATS_NEW, HIDE_HOME_PAGE_CARDS } from '@shell/store/prefs';
 import { Banner } from '@components/Banner';
 import BannerGraphic from '@shell/components/BannerGraphic';
 import IndentedPanel from '@shell/components/IndentedPanel';
-import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
+import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts, FetchSecondaryResourcesOpts } from '@shell/components/PaginatedResourceTable.vue';
 import { BadgeState } from '@components/BadgeState';
 import CommunityLinks from '@shell/components/CommunityLinks';
 import SingleClusterInfo from '@shell/components/SingleClusterInfo';
 import { mapGetters, mapState } from 'vuex';
-import { MANAGEMENT, CAPI, SCHEMA } from '@shell/config/types';
+import { MANAGEMENT, CAPI } from '@shell/config/types';
 import { NAME as MANAGER } from '@shell/config/product/manager';
 import { STATE } from '@shell/config/table-headers';
 import { MODE, _IMPORT } from '@shell/config/query-params';
@@ -20,10 +21,14 @@ import { mapFeature, MULTI_CLUSTER } from '@shell/store/features';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 import { filterOnlyKubernetesClusters, filterHiddenLocalCluster, paginationFilterOnlyKubeClusters } from '@shell/utils/cluster';
 import TabTitle from '@shell/components/TabTitle';
+import { ActionFindPageArgs } from '@shell/types/store/dashboard-store.types';
 
 import { RESET_CARDS_ACTION, SET_LOGIN_ACTION } from '@shell/config/page-actions';
+import { STEVE_NAME_COL, STEVE_STATE_COL } from 'config/pagination-table-headers';
+import { PaginationParamFilter, FilterArgs, PaginationFilterField } from 'types/store/pagination.types';
+import ProvCluster from 'models/provisioning.cattle.io.cluster';
 
-export default {
+export default defineComponent({
   name:       'Home',
   layout:     'home',
   components: {
@@ -39,106 +44,53 @@ export default {
 
   mixins: [PageHeaderActions],
 
-  fetch() {
-    this.provClusterSchema = this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER);
-    if ( this.provClusterSchema ) {
-      this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER });
-    }
-
-    if ( this.$store.getters['management/schemaFor'](MANAGEMENT.CLUSTER) ) {
-      this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER });
-    }
-
-    if ( this.$store.getters['management/canList'](CAPI.MACHINE) ) {
-      this.$store.dispatch('management/findAll', { type: CAPI.MACHINE });
-    }
-
-    if ( this.$store.getters['management/canList'](MANAGEMENT.NODE) ) {
-      this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE });
-    }
-
-    // We need to fetch node pools and node templates in order to correctly show the provider for RKE1 clusters
-    if ( this.$store.getters['management/canList'](MANAGEMENT.NODE_POOL) ) {
-      this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_POOL });
-    }
-
-    if ( this.$store.getters['management/canList'](MANAGEMENT.NODE_TEMPLATE) ) {
-      this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_TEMPLATE });
-    }
-  },
-
   data() {
-    const fullVersion = getVersionInfo(this.$store).fullVersion;
-    // Page actions don't change on the Home Page
-    const pageActions = [
-      {
-        labelKey: 'nav.header.setLoginPage',
-        action:   SET_LOGIN_ACTION
-      },
-      { separator: true },
-      {
-        labelKey: 'nav.header.restoreCards',
-        action:   RESET_CARDS_ACTION
-      },
-    ];
-
     return {
       HIDE_HOME_PAGE_CARDS,
-      fullVersion,
-      pageActions,
+      fullVersion: getVersionInfo(this.$store).fullVersion,
+      // Page actions don't change on the Home Page
+      pageActions: [
+        {
+          labelKey: 'nav.header.setLoginPage',
+          action:   SET_LOGIN_ACTION
+        },
+        { separator: true },
+        {
+          labelKey: 'nav.header.restoreCards',
+          action:   RESET_CARDS_ACTION
+        },
+      ],
       vendor: getVendor(),
 
-      // resource:                 CAPI.RANCHER_CLUSTER,
-      // paginationRequestFilters: paginationFilterOnlyKubeClusters(this.$store)
-    };
-  },
-
-  computed: {
-    ...mapState(['managementReady']),
-    ...mapGetters(['currentCluster', 'defaultClusterId', 'releaseNotesUrl']),
-    mcm: mapFeature(MULTI_CLUSTER),
-
-    provClusters() {
-      return this.$store.getters['management/all'](CAPI.RANCHER_CLUSTER);
-    },
-
-    // User can go to Cluster Management if they can see the cluster schema
-    canManageClusters() {
-      const schema = this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER);
-
-      return !!schema;
-    },
+      paginationRequestFilters: paginationFilterOnlyKubeClusters(this.$store),
 
-    canCreateCluster() {
-      const schema = this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER);
+      provClusterSchema: this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER),
 
-      return !!schema?.collectionMethods.find((x) => x.toLowerCase() === 'post');
-    },
+      canViewMgmtClusters:  !!this.$store.getters['management/schemaFor'](MANAGEMENT.CLUSTER),
+      canViewMachine:       !!this.$store.getters['management/canList'](CAPI.MACHINE),
+      canViewMgmtNodes:     !!this.$store.getters['management/canList'](MANAGEMENT.NODE),
+      canViewMgmtPools:     !!this.$store.getters['management/canList'](MANAGEMENT.NODE_POOL),
+      canViewMgmtTemplates: !!this.$store.getters['management/canList'](MANAGEMENT.NODE_TEMPLATE),
 
-    manageLocation() {
-      return {
+      manageLocation: {
         name:   'c-cluster-product-resource',
         params: {
           product:  MANAGER,
           cluster:  BLANK_CLUSTER,
           resource: CAPI.RANCHER_CLUSTER
         },
-      };
-    },
+      },
 
-    createLocation() {
-      return {
+      createLocation: {
         name:   'c-cluster-product-resource-create',
         params: {
           product:  MANAGER,
           cluster:  BLANK_CLUSTER,
           resource: CAPI.RANCHER_CLUSTER
         },
-      };
-    },
+      },
 
-    importLocation() {
-      return {
+      importLocation: {
         name:   'c-cluster-product-resource-create',
         params: {
           product:  MANAGER,
@@ -146,22 +98,9 @@ export default {
           resource: CAPI.RANCHER_CLUSTER
         },
         query: { [MODE]: _IMPORT }
-      };
-    },
-
-    afterLoginRoute: mapPref(AFTER_LOGIN_ROUTE),
-    homePageCards:   mapPref(HIDE_HOME_PAGE_CARDS),
-
-    readWhatsNewAlready() {
-      return readReleaseNotes(this.$store);
-    },
-
-    showSetLoginBanner() {
-      return this.homePageCards?.setLoginPage;
-    },
+      },
 
-    clusterHeaders() {
-      return [
+      headers: [
         STATE,
         {
           name:          'name',
@@ -169,7 +108,7 @@ export default {
           value:         'nameDisplay',
           sort:          ['nameSort'],
           canBeVariable: true,
-          getValue:      (row) => row.mgmt?.nameDisplay
+          getValue:      (row: ProvCluster) => row.mgmt?.nameDisplay
         },
         {
           label:     this.t('landing.clusters.provider'),
@@ -210,19 +149,77 @@ export default {
         //   name:  'explorer',
         //   label:  this.t('landing.clusters.explorer')
         // }
-      ];
+      ],
+
+      paginationHeaders: [
+        STEVE_STATE_COL,
+        {
+          ...STEVE_NAME_COL,
+          canBeVariable: true,
+          // value:         'nameDisplay',// TODO: RC
+          // sort:          ['nameSort'],// TODO: RC
+          getValue:      (row: ProvCluster) => row.mgmt?.nameDisplay // TODO: RC
+        },
+        {
+          label:     this.t('landing.clusters.provider'),
+          subLabel:  this.t('landing.clusters.distro'),
+          value:     'mgmt.status.provider',
+          name:      'Provider',
+          sort:      false,
+          search:    false,
+          formatter: 'ClusterProvider'
+        },
+        {
+          label:    this.t('landing.clusters.kubernetesVersion'),
+          subLabel: this.t('landing.clusters.architecture'),
+          name:     'kubernetesVersion',
+        },
+        {
+          label:  this.t('tableHeaders.cpu'),
+          value:  '',
+          name:   'cpu',
+          sort:   ['status.allocatable.cpu'],
+          search: false,
+        },
+        {
+          label:  this.t('tableHeaders.memory'),
+          value:  '',
+          name:   'memory',
+          sort:   ['status.allocatable.memory'],
+          search: false,
+        },
+        {
+          label:        this.t('tableHeaders.pods'),
+          name:         'pods',
+          value:        '',
+          sort:         ['status.allocatable.pods'],
+          search:       false,
+          formatter:    'PodsUsage',
+          delayLoading: true
+        },
+      ],
+    };
+  },
+
+  computed: {
+    ...mapState(['managementReady']),
+    ...mapGetters(['currentCluster', 'defaultClusterId', 'releaseNotesUrl']),
+    mcm: mapFeature(MULTI_CLUSTER),
+
+    canCreateCluster() {
+      return !!this.provClusterSchema?.collectionMethods.find((x: string) => x.toLowerCase() === 'post');
     },
 
-    kubeClusters() {
-      return filterHiddenLocalCluster(filterOnlyKubernetesClusters(this.provClusters || [], this.$store), this.$store);
+    afterLoginRoute: mapPref(AFTER_LOGIN_ROUTE),
+    homePageCards:   mapPref(HIDE_HOME_PAGE_CARDS),
+
+    readWhatsNewAlready() {
+      return readReleaseNotes(this.$store);
     },
 
-    nonStandardNamespaces() {
-      // Show the namespace grouping option if there's clusters with namespaces other than 'fleet-default' or 'fleet-local'
-      // This will be used when there's clusters from extension based provisioners
-      // We should re-visit this for scaling reasons
-      return this.kubeClusters.some((c) => c.metadata.namespace !== 'fleet-local' && c.metadata.namespace !== 'fleet-default');
-    }
+    showSetLoginBanner() {
+      return this.homePageCards?.setLoginPage;
+    },
   },
 
   async created() {
@@ -240,11 +237,127 @@ export default {
   },
 
   methods: {
+    fetchSecondaryResources(opts: FetchSecondaryResourcesOpts) {
+      if ( this.canViewMgmtClusters ) {
+        this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER });
+      }
+
+      if ( this.canViewMachine ) {
+        this.$store.dispatch('management/findAll', { type: CAPI.MACHINE });
+      }
+
+      if ( this.canViewMgmtNodes ) {
+        this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE });
+      }
+
+      // We need to fetch node pools and node templates in order to correctly show the provider for RKE1 clusters
+      if ( this.canViewMgmtPools ) {
+        this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_POOL });
+      }
+
+      if ( this.canViewMgmtTemplates ) {
+        this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_TEMPLATE });
+      }
+    },
+
+    async fetchPageSecondaryResources({ canPaginate, force, page }: FetchPageSecondaryResourcesOpts) {
+      console.warn('home', 'fetchPageSecondaryResources', {
+        canPaginate, force, page
+      });
+
+      if (!canPaginate || !page?.length) {
+        return;
+      }
+
+      if ( this.canViewMgmtClusters ) {
+        const opt: ActionFindPageArgs = {
+          force,
+          pagination: new FilterArgs({}),
+          // TODO: RC API blocked on missing id
+          // pagination: new FilterArgs({
+          //   filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
+          //     field: 'id',
+          //     value: r.status?.clusterName // TODO: handle empty status
+          //   }))),
+          // })
+        };
+
+        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.CLUSTER, opt });
+      }
+
+      if ( this.canViewMgmtClusters ) {
+        const opt: ActionFindPageArgs = {
+          force,
+          pagination: new FilterArgs({}),
+          // TODO: RC API blocked on missing spec.clusterName
+          // pagination: new FilterArgs({
+          //   filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
+          //     field: 'spec.clusterName',// TODO: handle empty spec
+          //     value: r.metadata.name
+          //   }))),
+          // })
+        };
+
+        this.$store.dispatch(`management/findPage`, { type: CAPI.MACHINE, opt });
+      }
+
+      if ( this.canViewMgmtNodes ) {
+        const opt: ActionFindPageArgs = {
+          force,
+          pagination: new FilterArgs({}),
+          // TODO: RC API blocked on missing id
+          // pagination: new FilterArgs({
+          //   filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
+          //     field: 'id',
+          //     value: r.mgmtClusterId (partial)
+          //   }))),
+          // })
+        };
+
+        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE, opt });
+      }
+
+      // We need to fetch node pools and node templates in order to correctly show the provider for RKE1 clusters
+      if ( this.canViewMgmtPools && this.canViewMgmtTemplates) {
+        const poolOpt: ActionFindPageArgs = {
+          force,
+          pagination: new FilterArgs({}),
+          // TODO: RC API blocked on missing spec.clusterName
+          // pagination: new FilterArgs({
+          //   filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
+          //     field: 'spec.clusterName',
+          //     value: r.status?.clusterName// TODO: handle empty spec
+          //   }))),
+          // })
+        };
+
+        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE_POOL, opt: poolOpt });
+
+        const templateOpt: ActionFindPageArgs = {
+          force,
+          pagination: new FilterArgs({}),
+          // TODO: RC API blocked on missing spec.clusterName
+          // pagination: new FilterArgs({
+          //   filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
+          //     field: 'spec.clusterName',
+          //     value: r.status?.clusterName// TODO: handle empty spec
+          //   }))),
+          // })
+        };
+
+        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE_TEMPLATE, opt: templateOpt });
+      }
+    },
+
+    filterRows(rows: ProvCluster[] = []) {
+      return filterHiddenLocalCluster(filterOnlyKubernetesClusters(rows, this.$store), this.$store);
+    },
+
     /**
      * Define actions for each navigation link
      * @param {*} action
      */
-    handlePageAction(action) {
+    handlePageAction(action: any) {
       switch (action.action) {
       case RESET_CARDS_ACTION:
         this.resetCards();
@@ -258,21 +371,22 @@ export default {
       }
     },
 
-    cpuUsed(cluster) {
+    cpuUsed(cluster: any) {
       return parseSi(cluster.status.requested?.cpu);
     },
 
-    cpuAllocatable(cluster) {
+    cpuAllocatable(cluster: any) {
       return parseSi(cluster.status.allocatable?.cpu);
     },
-    memoryAllocatable(cluster) {
+
+    memoryAllocatable(cluster: any) {
       const parsedAllocatable = (parseSi(cluster.status.allocatable?.memory) || 0).toString();
       const format = createMemoryFormat(parsedAllocatable);
 
       return formatSi(parsedAllocatable, format);
     },
 
-    memoryReserved(cluster) {
+    memoryReserved(cluster: any) {
       const memValues = createMemoryValues(cluster?.status?.allocatable?.memory, cluster?.status?.requested?.memory);
 
       return `${ memValues.useful }/${ memValues.total } ${ memValues.units }`;
@@ -307,7 +421,7 @@ export default {
       }
     }
   }
-};
+});
 
 </script>
 
@@ -381,21 +495,27 @@ export default {
               v-if="mcm"
               class="col span-12"
             >
+              <!-- // TODO: RC check loading indicator when pagination off -->
               <PaginatedResourceTable
                 :schema="provClusterSchema"
                 :table-actions="false"
                 :row-actions="false"
                 key-field="id"
-                :rows="kubeClusters"
-                :headers="clusterHeaders"
-                :loading="!kubeClusters"
+                :headers="headers"
+                :pagination-headers="paginationHeaders"
+
                 :namespaced="false"
+                :request-filters="paginationRequestFilters"
+                manualRefreshButtonSize="sm"
+                :fetchSecondaryResources="fetchSecondaryResources"
+                :fetchPageSecondaryResources="fetchPageSecondaryResources"
               >
                 <template #header-left>
                   <div class="row table-heading">
                     <h2 class="mb-0">
                       {{ t('landing.clusters.title') }}
                     </h2>
+                    <!-- TODO: RC kubeClusters no longer exists.  -->
                     <BadgeState
                       v-if="kubeClusters"
                       :label="kubeClusters.length.toString()"
@@ -404,12 +524,12 @@ export default {
                   </div>
                 </template>
                 <template
-                  v-if="canCreateCluster || canManageClusters"
+                  v-if="canCreateCluster || !!provClusterSchema"
                   #header-middle
                 >
                   <div class="table-heading">
                     <router-link
-                      v-if="canManageClusters"
+                      v-if="!!provClusterSchema"
                       :to="manageLocation"
                       class="btn btn-sm role-secondary"
                       data-testid="cluster-management-manage-button"
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index 71a9226d981..106dc88474b 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -4,6 +4,7 @@ import { NAMESPACE_FILTER_ALL_SYSTEM, NAMESPACE_FILTER_ALL_USER, NAMESPACE_FILTE
 import Namespace from '@shell/models/namespace';
 import { uniq } from '@shell/utils/array';
 import {
+  CAPI,
   CONFIG_MAP, MANAGEMENT, NAMESPACE, NODE, POD
 } from '@shell/config/types';
 import { Schema } from 'plugins/steve/schema';
@@ -122,11 +123,27 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     [MANAGEMENT.NODE]: [
       { field: 'status.nodeName' },
     ],
+    [MANAGEMENT.NODE_POOL]: [
+      // { field: 'spec.clusterName' },  // Pending API support // TODO: RC
+    ],
+    [MANAGEMENT.NODE_TEMPLATE]: [
+      // { field: 'spec.clusterName' },  // Pending API support // TODO: RC
+    ],
     [CONFIG_MAP]: [
       { field: 'metadata.labels[harvesterhci.io/cloud-init-template]' }
     ],
     [NAMESPACE]: [
       { field: 'metadata.labels[field.cattle.io/projectId]' }
+    ],
+    [CAPI.MACHINE]: [
+      // { field: 'spec.clusterName' } // Pending API support // TODO: RC
+    ],
+    [CAPI.RANCHER_CLUSTER]: [
+      // { field: `metadata.labels."${ CAPI.PROVIDER }"` } // Pending API support // TODO: RC
+      // { field: `status.provider` } // Pending API support // TODO: RC
+      // { field: 'status.allocatable.cpu' } // Pending API support // TODO: RC
+      // { field: 'status.allocatable.memory' } // Pending API support // TODO: RC
+      // { field: 'status.allocatable.pods' } // Pending API support // TODO: RC
     ]
   }
 
diff --git a/shell/utils/cluster.js b/shell/utils/cluster.js
index 80fffd4427a..5cd3ced137c 100644
--- a/shell/utils/cluster.js
+++ b/shell/utils/cluster.js
@@ -5,7 +5,7 @@ import { SETTING } from '@shell/config/settings';
 import { PaginationFilterField, PaginationParamFilter } from 'types/store/pagination.types';
 
 /**
- * TODO: RC
+ * The vai backed api's `filter` equivalent of `filterOnlyKubernetesClusters`
  *
  * @export
  * @param {*} store
@@ -18,6 +18,8 @@ export function paginationFilterOnlyKubeClusters(store) {
     return null;
   }
 
+  // TODO: RC TEST
+
   return PaginationParamFilter.createMultipleFields([
     new PaginationFilterField({
       field:  `metadata.labels."${ CAPI.PROVIDER }"`, // TODO: RC

From 203cdfdc9b03dd68bcee6ab047cf022b93e7dcb8 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 12 Aug 2024 15:02:09 +0100
Subject: [PATCH 04/76] add context to pag setting

---
 shell/config/settings.ts                      |  3 +--
 shell/mixins/resource-fetch-api-pagination.js | 17 ++++++++++++++++-
 shell/pages/home.vue                          |  1 +
 shell/plugins/dashboard-store/getters.js      |  7 +++++--
 shell/types/resources/settings.d.ts           |  2 +-
 shell/utils/pagination-utils.ts               | 17 ++++++++++++++++-
 6 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index 57ff6150ead..d4ba9efd0be 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -255,12 +255,11 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
           }
         }
       },
-      // TODO: RC enable for cluster management??
       management: {
         resources: {
           enableAll:  false,
           enableSome: {
-            enabled: [CAPI.RANCHER_CLUSTER],
+            enabled: [{ resource: CAPI.RANCHER_CLUSTER, context: ['home'] }],
             generic: false,
           }
         }
diff --git a/shell/mixins/resource-fetch-api-pagination.js b/shell/mixins/resource-fetch-api-pagination.js
index 3d9ae7b4f35..09ea882881d 100644
--- a/shell/mixins/resource-fetch-api-pagination.js
+++ b/shell/mixins/resource-fetch-api-pagination.js
@@ -13,6 +13,16 @@ import stevePaginationUtils from '@shell/plugins/steve/steve-pagination-utils';
  */
 export default {
 
+  props: {
+    /**
+     * Where in the ui this mixin is used. For instance the home page cluster list would be `home`
+     */
+    context: {
+      type:    String,
+      default: null,
+    },
+  },
+
   data() {
     return {
       forceUpdateLiveAndDelayed: 0,
@@ -168,7 +178,12 @@ export default {
         return;
       }
 
-      return this.resource && this.$store.getters[`${ this.inStore }/paginationEnabled`]?.(this.resource.id || this.resource);
+      const args = {
+        id:      this.resource.id || this.resource,
+        context: this.context,
+      };
+
+      return this.resource && this.$store.getters[`${ this.inStore }/paginationEnabled`]?.(args);
     },
 
     paginationResult() {
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index 9587344daaa..f15d8588159 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -503,6 +503,7 @@ export default defineComponent({
                 key-field="id"
                 :headers="headers"
                 :pagination-headers="paginationHeaders"
+                context="home"
 
                 :namespaced="false"
                 :request-filters="paginationRequestFilters"
diff --git a/shell/plugins/dashboard-store/getters.js b/shell/plugins/dashboard-store/getters.js
index d664941540b..db764a3b0e5 100644
--- a/shell/plugins/dashboard-store/getters.js
+++ b/shell/plugins/dashboard-store/getters.js
@@ -445,9 +445,12 @@ export default {
     return undefined;
   },
 
-  paginationEnabled: (state, getters, rootState, rootGetters) => (type = null) => {
+  paginationEnabled: (state, getters, rootState, rootGetters) => (args) => {
+    const id = typeof args === 'object' ? args.id : args;
+    const context = typeof args === 'object' ? args.context : undefined;
+
     const store = state.config.namespace;
-    const resource = type ? { id: type } : null;
+    const resource = id || context ? { id, context } : null;
 
     return paginationUtils.isEnabled({ rootGetters }, { store, resource });
   }
diff --git a/shell/types/resources/settings.d.ts b/shell/types/resources/settings.d.ts
index 800467f0c96..7259b1097c0 100644
--- a/shell/types/resources/settings.d.ts
+++ b/shell/types/resources/settings.d.ts
@@ -20,7 +20,7 @@ export interface PaginationSettings {
           /**
            * Specific resource type to enable
            */
-          enabled: string[],
+          enabled: (string | { resource: string, context: string[]})[],
           /**
            * There's no hardcoded headers or custom list for the resource type, headers will be generated from schema attributes.columns
            */
diff --git a/shell/utils/pagination-utils.ts b/shell/utils/pagination-utils.ts
index 44fc155c1a2..465d47e552a 100644
--- a/shell/utils/pagination-utils.ts
+++ b/shell/utils/pagination-utils.ts
@@ -44,6 +44,7 @@ class PaginationUtils {
     store: string,
     resource?: {
       id: string,
+      context?: string,
     }
   }) {
     // Cache must be enabled to support pagination api
@@ -95,7 +96,21 @@ class PaginationUtils {
       return true;
     }
 
-    if (storeSettings.resources.enableSome.enabled.includes(enabledFor.resource.id)) {
+    if (storeSettings.resources.enableSome.enabled.find((setting) => {
+      if (typeof setting === 'string') {
+        return setting === enabledFor.resource?.id;
+      }
+
+      if (setting.resource === enabledFor.resource?.id) {
+        if (!!setting.context) {
+          return enabledFor.resource?.context ? setting.context.includes(enabledFor.resource.context) : false;
+        }
+
+        return true;
+      }
+
+      return false;
+    })) {
       return true;
     }
 

From a0a6883a7b8673a0938c12327519df7fcd50f41f Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 12 Aug 2024 15:53:07 +0100
Subject: [PATCH 05/76] tidying up

---
 shell/components/PaginatedResourceTable.vue   |  3 ++-
 shell/components/SortableTable/index.vue      |  6 +----
 shell/mixins/resource-fetch-api-pagination.js |  4 +--
 shell/mixins/resource-fetch.js                |  2 +-
 shell/pages/home.vue                          | 25 +++++++++++--------
 shell/utils/cluster.js                        |  6 ++---
 6 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
index afdd61f2313..4f493b93b8f 100644
--- a/shell/components/PaginatedResourceTable.vue
+++ b/shell/components/PaginatedResourceTable.vue
@@ -2,11 +2,12 @@
 import { defineComponent } from 'vue';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import ResourceTable from '@shell/components/ResourceTable.vue';
+import { StorePaginationResult } from 'types/store/pagination.types';
 
 export type FetchSecondaryResourcesOpts = { }
 export type FetchSecondaryResources = (opts: FetchSecondaryResourcesOpts) => Promise<any>
 
-export type FetchPageSecondaryResourcesOpts = { canPaginate: boolean, force: boolean, page: any[] }
+export type FetchPageSecondaryResourcesOpts = { canPaginate: boolean, force: boolean, page: any[], pagResult: StorePaginationResult }
 export type FetchPageSecondaryResources = (opts: FetchPageSecondaryResourcesOpts) => Promise<any>
 
 /**
diff --git a/shell/components/SortableTable/index.vue b/shell/components/SortableTable/index.vue
index f71c2941606..f2e983adb4e 100644
--- a/shell/components/SortableTable/index.vue
+++ b/shell/components/SortableTable/index.vue
@@ -1547,11 +1547,7 @@ export default {
     opacity: 0.5;
     pointer-events: none;
   }
-
-  // TODO: RC TEST with <ResourceList :has-advanced-filtering="true" />
-  // .manual-refresh {
-  //   height: 40px;
-  // }
+  // TODO: RC ISSUE describe
   .advanced-filter-group {
     position: relative;
     margin-left: 10px;
diff --git a/shell/mixins/resource-fetch-api-pagination.js b/shell/mixins/resource-fetch-api-pagination.js
index 09ea882881d..e73e9b18640 100644
--- a/shell/mixins/resource-fetch-api-pagination.js
+++ b/shell/mixins/resource-fetch-api-pagination.js
@@ -79,8 +79,6 @@ export default {
 
     namespaceFilterChanged(neu) {
       if (!this.canPaginate || !this.schema?.attributes?.namespaced || !this.namespaced) {
-        this.debouncedSetPagination({ ...this.pPagination }); // TODO: RC remove?
-
         return;
       }
 
@@ -320,7 +318,7 @@ export default {
       }
 
       await this.fetchPageSecondaryResources({
-        canPaginate: this.canPaginate, force: false, page: this.rows
+        canPaginate: this.canPaginate, force: false, page: this.rows, pagResult: this.paginationResult
       });
     }
   },
diff --git a/shell/mixins/resource-fetch.js b/shell/mixins/resource-fetch.js
index 61e2a4909f4..c30e6418644 100644
--- a/shell/mixins/resource-fetch.js
+++ b/shell/mixins/resource-fetch.js
@@ -98,7 +98,7 @@ export default {
         await this.$fetch();
         if (this.canPaginate && this.fetchPageSecondaryResources) {
           this.fetchPageSecondaryResources({
-            canPaginate: this.canPaginate, force: true, page: this.rows
+            canPaginate: this.canPaginate, force: true, page: this.rows, pagResult: this.paginationResult
           });
         }
       }
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index f15d8588159..9b256a1e770 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -156,9 +156,8 @@ export default defineComponent({
         {
           ...STEVE_NAME_COL,
           canBeVariable: true,
-          // value:         'nameDisplay',// TODO: RC
-          // sort:          ['nameSort'],// TODO: RC
-          getValue:      (row: ProvCluster) => row.mgmt?.nameDisplay // TODO: RC
+          // TODO: RC ISSUE describe. search sort on prov meta namespace
+          getValue:      (row: ProvCluster) => row.mgmt?.nameDisplay
         },
         {
           label:     this.t('landing.clusters.provider'),
@@ -167,6 +166,7 @@ export default defineComponent({
           name:      'Provider',
           sort:      false,
           search:    false,
+          // TODO: RC ISSUE describe. search sort on prov meta namespace
           formatter: 'ClusterProvider'
         },
         {
@@ -198,6 +198,8 @@ export default defineComponent({
           delayLoading: true
         },
       ],
+
+      clusterCount: 0,
     };
   },
 
@@ -260,15 +262,17 @@ export default defineComponent({
       }
     },
 
-    async fetchPageSecondaryResources({ canPaginate, force, page }: FetchPageSecondaryResourcesOpts) {
-      console.warn('home', 'fetchPageSecondaryResources', {
-        canPaginate, force, page
-      });
-
+    async fetchPageSecondaryResources({
+      canPaginate, force, page, pagResult
+    }: FetchPageSecondaryResourcesOpts) {
       if (!canPaginate || !page?.length) {
+        this.clusterCount = 0;
+
         return;
       }
 
+      this.clusterCount = pagResult.count;
+
       if ( this.canViewMgmtClusters ) {
         const opt: ActionFindPageArgs = {
           force,
@@ -516,10 +520,9 @@ export default defineComponent({
                     <h2 class="mb-0">
                       {{ t('landing.clusters.title') }}
                     </h2>
-                    <!-- TODO: RC kubeClusters no longer exists.  -->
                     <BadgeState
-                      v-if="kubeClusters"
-                      :label="kubeClusters.length.toString()"
+                      v-if="clusterCount"
+                      :label="clusterCount"
                       color="role-tertiary ml-20 mr-20"
                     />
                   </div>
diff --git a/shell/utils/cluster.js b/shell/utils/cluster.js
index 5cd3ced137c..94e9e074776 100644
--- a/shell/utils/cluster.js
+++ b/shell/utils/cluster.js
@@ -18,17 +18,17 @@ export function paginationFilterOnlyKubeClusters(store) {
     return null;
   }
 
-  // TODO: RC TEST
+  // TODO: RC ISSUE describe
 
   return PaginationParamFilter.createMultipleFields([
     new PaginationFilterField({
-      field:  `metadata.labels."${ CAPI.PROVIDER }"`, // TODO: RC
+      field:  `metadata.labels."${ CAPI.PROVIDER }"`, // TODO: API blocked on missing label
       equals: false,
       value:  VIRTUAL_HARVESTER_PROVIDER,
       exact:  true
     }),
     new PaginationFilterField({
-      field:  `status.provider`, // TODO: RC
+      field:  `status.provider`, // TODO: API blocked on missing label
       equals: false,
       value:  VIRTUAL_HARVESTER_PROVIDER,
       exact:  true

From 8b03d567f00417a5a8e67240da114fa67792b044 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 20 Aug 2024 14:38:10 +0100
Subject: [PATCH 06/76] Add server-side pagination to cluster explorer events
 and general events list

---
 shell/components/ResourceList/index.vue       |  6 +-
 shell/components/SortableTable/index.vue      |  3 +-
 shell/config/pagination-table-headers.js      |  9 ++-
 shell/config/product/explorer.js              | 34 ++++++++-
 shell/config/settings.ts                      |  6 +-
 shell/mixins/resource-fetch-api-pagination.js |  9 ++-
 .../pages/c/_cluster/explorer/EventsTable.vue | 75 +++++++++++++++----
 shell/pages/c/_cluster/explorer/index.vue     | 17 +----
 .../pages/c/_cluster/settings/performance.vue | 14 ++++
 shell/plugins/steve/steve-pagination-utils.ts |  8 +-
 shell/store/type-map.utils.ts                 | 15 +++-
 11 files changed, 148 insertions(+), 48 deletions(-)

diff --git a/shell/components/ResourceList/index.vue b/shell/components/ResourceList/index.vue
index a8a95d49b6c..74f6618c98e 100644
--- a/shell/components/ResourceList/index.vue
+++ b/shell/components/ResourceList/index.vue
@@ -89,13 +89,13 @@ export default {
 
     const hasListComponent = getters['type-map/hasCustomList'](resource);
 
-    const inStore = getters['currentStore'](resource);
-    const schema = getters[`${ inStore }/schemaFor`](resource);
+    const derpinStore = getters['currentStore'](resource); // TODO: RC fix in parent commit (dupe inStore props)
+    const schema = getters[`${ derpinStore }/schemaFor`](resource);
 
     const showMasthead = getters[`type-map/optionsFor`](resource).showListMasthead;
 
     return {
-      inStore,
+      // inStore,
       schema,
       hasListComponent,
       showMasthead:                     showMasthead === undefined ? true : showMasthead,
diff --git a/shell/components/SortableTable/index.vue b/shell/components/SortableTable/index.vue
index f2e983adb4e..2ac638ee12f 100644
--- a/shell/components/SortableTable/index.vue
+++ b/shell/components/SortableTable/index.vue
@@ -553,7 +553,8 @@ export default {
         this.tableActions ||
         this.$scopedSlots['header-left'] ||
         this.$scopedSlots['header-middle'] ||
-        this.$scopedSlots['header-right'];
+        this.$scopedSlots['header-right'] ||
+        this.isTooManyItemsToAutoUpdate;
     },
 
     columns() {
diff --git a/shell/config/pagination-table-headers.js b/shell/config/pagination-table-headers.js
index eabcb5891ee..0455de14597 100644
--- a/shell/config/pagination-table-headers.js
+++ b/shell/config/pagination-table-headers.js
@@ -1,4 +1,6 @@
-import { STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE } from '@shell/config/table-headers';
+import {
+  STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE, OBJECT
+} from '@shell/config/table-headers';
 
 // This file contains table headers
 // These table headers are used for server side pagination
@@ -44,6 +46,11 @@ export const STEVE_NAMESPACE_COL = {
   search: 'metadata.namespace',
 };
 
+export const STEVE_EVENT_OBJECT = {
+  ...OBJECT,
+  sort: 'involvedObject.kind',
+};
+
 export const STEVE_LIST_GROUPS = [{
   tooltipKey: 'resourceTable.groupBy.none',
   icon:       'icon-list-flat',
diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index 4ff4af1157b..911c748e500 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -25,7 +25,7 @@ import {
 
 import { DSL } from '@shell/store/type-map';
 import {
-  STEVE_AGE_COL, STEVE_LIST_GROUPS, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL
+  STEVE_AGE_COL, STEVE_EVENT_OBJECT, STEVE_LIST_GROUPS, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL
 } from '@shell/config/pagination-table-headers';
 
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
@@ -182,7 +182,7 @@ export function init(store) {
   configureType(SNAPSHOT, { depaginate: true });
   configureType(NORMAN.ETCD_BACKUP, { depaginate: true });
 
-  configureType(EVENT, { limit: 500 });
+  // configureType(EVENT, { limit: 500 }); // TODO: RC search for where EVENT is requested
   weightType(EVENT, -1, true);
 
   configureType(POD, {
@@ -256,7 +256,35 @@ export function init(store) {
 
   headers(INGRESS, [STATE, NAME_COL, NAMESPACE_COL, INGRESS_TARGET, INGRESS_DEFAULT_BACKEND, INGRESS_CLASS, AGE]);
   headers(SERVICE, [STATE, NAME_COL, NAMESPACE_COL, TARGET_PORT, SELECTOR, SPEC_TYPE, AGE]);
-  headers(EVENT, [STATE, { ...LAST_SEEN_TIME, defaultSort: true }, EVENT_TYPE, REASON, OBJECT, 'Subobject', 'Source', MESSAGE, 'First Seen', 'Count', NAME_COL, NAMESPACE_COL]);
+
+  const eventLastSeenTime = {
+    ...LAST_SEEN_TIME,
+    defaultSort: true,
+  };
+
+  headers(EVENT,
+    [STATE, eventLastSeenTime, EVENT_TYPE, REASON, OBJECT, 'Subobject', 'Source', MESSAGE, 'First Seen', 'Count', NAME_COL, NAMESPACE_COL],
+    [
+      STEVE_STATE_COL, {
+        ...eventLastSeenTime,
+        value: 'metadata.fields.0',
+        sort:  'metadata.fields.0',
+      }, {
+        ...EVENT_TYPE,
+        value: '_type',
+        sort:  '_type', // TODO: RC API request
+      },
+      REASON,
+      STEVE_EVENT_OBJECT,
+      'Subobject',
+      'Source',
+      MESSAGE,
+      'First Seen',
+      'Count',
+      STEVE_NAME_COL,
+      STEVE_NAMESPACE_COL,
+    ]
+  );
   headers(HPA, [STATE, NAME_COL, HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA, AGE]);
   headers(WORKLOAD, [STATE, NAME_COL, NAMESPACE_COL, TYPE, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
   headers(WORKLOAD_TYPES.DEPLOYMENT, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Up-to-date', 'Available', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index d4ba9efd0be..249f883a539 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -1,7 +1,7 @@
 // Settings
 import { GC_DEFAULTS, GC_PREFERENCES } from '@shell/utils/gc/gc-types';
 import { PaginationSettings } from '@shell/types/resources/settings';
-import { CAPI } from 'config/types';
+import { CAPI, EVENT, SCHEMA, NAMESPACE } from '@shell/config/types';
 
 interface GlobalSettingRuleset {
   name: string,
@@ -250,8 +250,8 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
         resources: {
           enableAll:  false,
           enableSome: {
-            enabled: ['configmap', 'secret', 'pod', 'node'],
-            generic: true,
+            enabled: ['configmap', 'secret', 'pod', 'node', EVENT],
+            generic: false,
           }
         }
       },
diff --git a/shell/mixins/resource-fetch-api-pagination.js b/shell/mixins/resource-fetch-api-pagination.js
index e73e9b18640..561cb94196b 100644
--- a/shell/mixins/resource-fetch-api-pagination.js
+++ b/shell/mixins/resource-fetch-api-pagination.js
@@ -317,9 +317,12 @@ export default {
         return;
       }
 
-      await this.fetchPageSecondaryResources({
-        canPaginate: this.canPaginate, force: false, page: this.rows, pagResult: this.paginationResult
-      });
+      // TODO: RC fix in parent commit (make calls to fetchPageX null safe)
+      if (this.fetchPageSecondaryResources) {
+        await this.fetchPageSecondaryResources({
+          canPaginate: this.canPaginate, force: false, page: this.rows, pagResult: this.paginationResult
+        });
+      }
     }
   },
 };
diff --git a/shell/pages/c/_cluster/explorer/EventsTable.vue b/shell/pages/c/_cluster/explorer/EventsTable.vue
index 63cbece717b..98dc0f539ad 100644
--- a/shell/pages/c/_cluster/explorer/EventsTable.vue
+++ b/shell/pages/c/_cluster/explorer/EventsTable.vue
@@ -1,16 +1,14 @@
 <script>
 
-import SortableTable from '@shell/components/SortableTable';
 import { MESSAGE, NAME, OBJECT, REASON } from '@shell/config/table-headers';
 import { EVENT } from '@shell/config/types';
-import { fetchClusterResources } from './explorer-utils';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
+import { STEVE_EVENT_OBJECT, STEVE_NAME_COL } from '@shell/config/pagination-table-headers';
+import { headerFromSchemaColString } from '@shell/store/type-map.utils';
+import { NAME as EXPLORER } from '@shell/config/product/explorer';
 
 export default {
-  components: { SortableTable },
-
-  async fetch() {
-    this.events = await fetchClusterResources(this.$store, EVENT);
-  },
+  components: { PaginatedResourceTable },
 
   data() {
     const reason = {
@@ -23,8 +21,7 @@ export default {
       reason,
       OBJECT,
       MESSAGE,
-      NAME,
-      {
+      NAME, {
         name:        'date',
         label:       'Date',
         labelKey:    'clusterIndexPage.sections.events.date.label',
@@ -36,9 +33,36 @@ export default {
       },
     ];
 
+    const schema = this.$store.getters['cluster/schemaFor'](EVENT);
+
+    const paginationHeaders = [
+      reason,
+      STEVE_EVENT_OBJECT,
+      MESSAGE,
+      {
+        ...STEVE_NAME_COL,
+        defaultSort: false,
+      },
+      headerFromSchemaColString('First Seen', schema, this.$store.getters, true),
+      {
+        ...headerFromSchemaColString('Last Seen', schema, this.$store.getters, true),
+        defaultSort: true,
+      },
+      headerFromSchemaColString('Count', schema, this.$store.getters, true),
+    ];
+
     return {
-      events: [],
+      schema,
+      events:        [],
       eventHeaders,
+      paginationHeaders,
+      allEventsLink: {
+        name:   'c-cluster-product-resource',
+        params: {
+          product:  EXPLORER,
+          resource: EVENT,
+        }
+      }
     };
   },
 
@@ -63,16 +87,35 @@ export default {
 </script>
 
 <template>
-  <SortableTable
-    :loading="$fetchState.pending"
-    :rows="events"
+  <!-- TODO: RC test paging (create events) -->
+  <!-- TODO: RC test no-vai again -->
+  <PaginatedResourceTable
+    :schema="schema"
     :headers="eventHeaders"
+    :pagination-headers="paginationHeaders"
+
     key-field="id"
     :search="false"
     :table-actions="false"
     :row-actions="false"
-    :paging="true"
+    :groupable="false"
     :rows-per-page="10"
-    default-sort-by="date"
-  />
+  >
+    <template slot="header-right">
+      <router-link
+        :to="allEventsLink"
+        class="events-link"
+      >
+        <span>{{ t('glance.eventsTable') }}</span>
+      </router-link>
+    </template>
+  </PaginatedResourceTable>
 </template>
+
+<style lang="scss" scoped>
+.events-link {
+  align-self: center;
+  padding-right: 20px;
+  min-width: 200px;
+}
+</style>
diff --git a/shell/pages/c/_cluster/explorer/index.vue b/shell/pages/c/_cluster/explorer/index.vue
index 2c1c15ab6f8..3c9886e399f 100644
--- a/shell/pages/c/_cluster/explorer/index.vue
+++ b/shell/pages/c/_cluster/explorer/index.vue
@@ -459,16 +459,6 @@ export default {
       return !!this.currentCluster?.spec?.description;
     },
 
-    allEventsLink() {
-      return {
-        name:   'c-cluster-product-resource',
-        params: {
-          product:  EXPLORER,
-          resource: EVENT,
-        }
-      };
-    },
-
     allSecretsLink() {
       return {
         name:   'c-cluster-product-resource',
@@ -723,11 +713,6 @@ export default {
           :label="t('clusterIndexPage.sections.events.label')"
           :weight="2"
         >
-          <span class="events-table-link">
-            <router-link :to="allEventsLink">
-              <span>{{ t('glance.eventsTable') }}</span>
-            </router-link>
-          </span>
           <EventsTable />
         </Tab>
         <Tab
@@ -888,7 +873,7 @@ export default {
   }
 }
 
-.events-table-link, .cert-table-link {
+.cert-table-link {
   display: flex;
   justify-content: flex-end;
   margin-bottom: 20px;
diff --git a/shell/pages/c/_cluster/settings/performance.vue b/shell/pages/c/_cluster/settings/performance.vue
index ffeee8cf99f..512d297966d 100644
--- a/shell/pages/c/_cluster/settings/performance.vue
+++ b/shell/pages/c/_cluster/settings/performance.vue
@@ -5,6 +5,7 @@ import AsyncButton from '@shell/components/AsyncButton';
 import { Banner } from '@components/Banner';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import { MANAGEMENT } from '@shell/config/types';
+import Vue from 'vue';
 import { DEFAULT_PERF_SETTING, SETTING } from '@shell/config/settings';
 import { _EDIT, _VIEW } from '@shell/config/query-params';
 import UnitInput from '@shell/components/form/UnitInput';
@@ -185,6 +186,11 @@ export default {
           body:  this.t(`performance.${ l10n[property] }.incompatibleDescription`, {}, true),
         },
       });
+    },
+
+    setDefaults() {
+      Vue.set(this, 'value', { ...DEFAULT_PERF_SETTING });
+      console.warn(this.value, DEFAULT_PERF_SETTING);
     }
   },
 };
@@ -196,6 +202,14 @@ export default {
     <h1 class="mb-20">
       {{ t('performance.label') }}
     </h1>
+    <button
+      class="btn btn-sm role-primary"
+      style="width: fit-content;"
+      @click.prevent="setDefaults()"
+    >
+      <!-- TODO: RC tidy  -->
+      Populate with Defaults
+    </button>
     <div>
       <div class="ui-perf-setting">
         <!-- Server Side Pagination -->
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index 106dc88474b..356b85e3f7e 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -5,7 +5,7 @@ import Namespace from '@shell/models/namespace';
 import { uniq } from '@shell/utils/array';
 import {
   CAPI,
-  CONFIG_MAP, MANAGEMENT, NAMESPACE, NODE, POD
+  CONFIG_MAP, EVENT, MANAGEMENT, NAMESPACE, NODE, POD
 } from '@shell/config/types';
 import { Schema } from 'plugins/steve/schema';
 
@@ -144,6 +144,12 @@ class StevePaginationUtils extends NamespaceProjectFilters {
       // { field: 'status.allocatable.cpu' } // Pending API support // TODO: RC
       // { field: 'status.allocatable.memory' } // Pending API support // TODO: RC
       // { field: 'status.allocatable.pods' } // Pending API support // TODO: RC
+    ],
+    [EVENT]: [
+      // { field: '_type' }, // Pending API support // TODO: RC
+      // { field: 'reason' }, // Pending API support // TODO: RC
+      // { field: 'involvedObject.kind' }, // Pending API support // TODO: RC
+      // { field: 'message' }, // Pending API support // TODO: RC
     ]
   }
 
diff --git a/shell/store/type-map.utils.ts b/shell/store/type-map.utils.ts
index 50529877368..74343e0c859 100644
--- a/shell/store/type-map.utils.ts
+++ b/shell/store/type-map.utils.ts
@@ -1,4 +1,4 @@
-import { SchemaAttribute, SchemaAttributeColumn } from '@shell/plugins/steve/schema';
+import { Schema, SchemaAttribute, SchemaAttributeColumn } from '@shell/plugins/steve/schema';
 import { TableColumn } from '@shell/types/store/type-map';
 import { VuexStoreGetters } from '@shell/types/store/vuex';
 import { findBy, insertAt, removeObject } from '@shell/utils/array';
@@ -119,6 +119,19 @@ export function createHeaders(
   return out;
 }
 
+/**
+ * Given a schema's attribute.column value create a header
+ */
+export function headerFromSchemaColString(colName: string, schema: Schema, rootGetters: VuexStoreGetters, pagination: boolean, ageColumn: TableColumn): TableColumn {
+  const col = schema.attributes.columns.find((c) => c.name === colName);
+
+  if (!col) {
+    throw new Error(`Unable to find column '${ colName }' in schema '${ schema.id }'`);
+  }
+
+  return headerFromSchemaCol(col, rootGetters, pagination, ageColumn);
+}
+
 /**
  * Given a schema's attribute.column value create a header
  */

From dcd69ed7f124c1c6e0ef36e8db71a7d6d943adeb Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 23 Aug 2024 13:51:01 +0100
Subject: [PATCH 07/76] Servier-side pagination for catalog apps, cluster repo
 and operation

---
 shell/config/product/apps.js                  | 95 +++++++++++++------
 shell/config/settings.ts                      |  6 +-
 shell/list/catalog.cattle.io.app.vue          | 15 +--
 shell/list/catalog.cattle.io.clusterrepo.vue  | 66 ++++++++++---
 shell/mixins/resource-fetch.js                | 19 +++-
 .../pages/c/_cluster/settings/performance.vue |  5 +-
 shell/pages/home.vue                          |  2 +-
 shell/plugins/steve/steve-pagination-utils.ts | 11 +++
 8 files changed, 157 insertions(+), 62 deletions(-)

diff --git a/shell/config/product/apps.js b/shell/config/product/apps.js
index 5aa56a13650..81e383b73e0 100644
--- a/shell/config/product/apps.js
+++ b/shell/config/product/apps.js
@@ -10,6 +10,7 @@ import {
 
 import { CATALOG } from '@shell/config/types';
 import { DSL } from '@shell/store/type-map';
+import { STEVE_AGE_COL, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL } from 'config/pagination-table-headers';
 
 export const NAME = 'apps';
 
@@ -75,41 +76,75 @@ export function init(store) {
     dashIfEmpty: true,
   };
 
-  headers(CATALOG.APP, [STATE, NAME_COL, NAMESPACE, CHART, CHART_UPGRADE, APP_SUMMARY, AGE]);
+  headers(CATALOG.APP,
+    [STATE, NAME_COL, NAMESPACE, CHART, CHART_UPGRADE, APP_SUMMARY, AGE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, {
+      ...CHART,
+      sort:   false, // 'spec.chart.metadata.name' // TODO: RC works at moment, won't soon?
+      search: false,
+    }, {
+      ...CHART_UPGRADE,
+      sort:   false,
+      search: false,
+    },
+    APP_SUMMARY,
+    STEVE_AGE_COL]
+  );
   headers(CATALOG.REPO, [STATE, NAME_COL, NAMESPACE, repoType, repoUrl, repoBranch, AGE]);
-  headers(CATALOG.CLUSTER_REPO, [STATE, NAME_COL, repoType, repoUrl, repoBranch, AGE]);
+  headers(CATALOG.CLUSTER_REPO,
+    [STATE, NAME_COL, repoType, repoUrl, repoBranch, AGE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, {
+      ...repoType,
+      // spec.gitRepo 'git || spec.url oci | http || ?
+      sort:   ['spec.gitRepo'],
+      search: false,
+    }, {
+      ...repoUrl,
+      // urlDisplay --> status.url || spec.gitRepo || spec.url
+      sort:   false,
+      search: false,
+    },
+    repoBranch]
+  );
+
+  const opAction = {
+    name:     'action',
+    label:    'Action',
+    sort:     'status.action',
+    value:    'status.action',
+    labelKey: 'catalog.operation.tableHeaders.action',
+  };
+  const opReleaseNs = {
+    name:     'releaseNamespace',
+    label:    'Tgt Namespace',
+    sort:     'status.namespace',
+    value:    'status.namespace',
+    labelKey: 'catalog.operation.tableHeaders.releaseNamespace',
+  };
+  const opReleaseName = {
+    name:     'releaseName',
+    label:    'Tgt Release',
+    sort:     'status.releaseName',
+    value:    'status.releaseName',
+    labelKey: 'catalog.operation.tableHeaders.releaseName',
+  };
+
   headers(CATALOG.OPERATION, [
     STATE,
     NAME_COL,
     NAMESPACE,
-    {
-      name:     'action',
-      label:    'Action',
-      sort:     'status.action',
-      value:    'status.action',
-      labelKey: 'catalog.operation.tableHeaders.action',
-    },
-    {
-      name:     'releaseNamespace',
-      label:    'Tgt Namespace',
-      sort:     'status.namespace',
-      value:    'status.namespace',
-      labelKey: 'catalog.operation.tableHeaders.releaseNamespace',
-    },
-    {
-      name:     'releaseName',
-      label:    'Tgt Release',
-      sort:     'status.releaseName',
-      value:    'status.releaseName',
-      labelKey: 'catalog.operation.tableHeaders.releaseName',
-    },
+    opAction,
+    opReleaseNs,
+    opReleaseName,
     AGE
+  ],
+  [
+    STEVE_STATE_COL,
+    STEVE_NAME_COL,
+    STEVE_NAMESPACE_COL,
+    opAction,
+    opReleaseNs,
+    opReleaseName,
+    STEVE_AGE_COL
   ]);
 }
-
-//   name:      'cpu',
-//   labelKey:  'tableHeaders.cpu',
-//   sort:      'cpu',
-//   value:     'cpuUsagePercentage',
-//   formatter: 'PercentageBar'
-// };
diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index 249f883a539..3622420bfa7 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -1,7 +1,9 @@
 // Settings
 import { GC_DEFAULTS, GC_PREFERENCES } from '@shell/utils/gc/gc-types';
 import { PaginationSettings } from '@shell/types/resources/settings';
-import { CAPI, EVENT, SCHEMA, NAMESPACE } from '@shell/config/types';
+import {
+  CAPI, EVENT, SCHEMA, NAMESPACE, CATALOG
+} from '@shell/config/types';
 
 interface GlobalSettingRuleset {
   name: string,
@@ -250,7 +252,7 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
         resources: {
           enableAll:  false,
           enableSome: {
-            enabled: ['configmap', 'secret', 'pod', 'node', EVENT],
+            enabled: ['configmap', 'secret', 'pod', 'node', EVENT, CATALOG.APP, CATALOG.CLUSTER_REPO, CATALOG.OPERATION],
             generic: false,
           }
         }
diff --git a/shell/list/catalog.cattle.io.app.vue b/shell/list/catalog.cattle.io.app.vue
index 7f9fcdbb9c6..17c45dab573 100644
--- a/shell/list/catalog.cattle.io.app.vue
+++ b/shell/list/catalog.cattle.io.app.vue
@@ -1,11 +1,9 @@
 <script>
-import ResourceTable from '@shell/components/ResourceTable';
-import ResourceFetch from '@shell/mixins/resource-fetch';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
 
 export default {
   name:       'ListApps',
-  components: { ResourceTable },
-  mixins:     [ResourceFetch],
+  components: { PaginatedResourceTable },
 
   props: {
     resource: {
@@ -25,20 +23,15 @@ export default {
 
   async fetch() {
     await this.$store.dispatch('catalog/load');
-
-    await this.$fetchType(this.resource);
   },
 };
 </script>
 
 <template>
-  <ResourceTable
+  <PaginatedResourceTable
     class="apps"
     :schema="schema"
-    :rows="rows"
-    :loading="loading"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-    :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
     data-testid="installed-app-catalog-list"
   >
     <template #cell:upgrade="{row}">
@@ -56,7 +49,7 @@ export default {
         class="text-muted"
       />
     </template>
-  </ResourceTable>
+  </PaginatedResourceTable>
 </template>
 
 <style scoped>
diff --git a/shell/list/catalog.cattle.io.clusterrepo.vue b/shell/list/catalog.cattle.io.clusterrepo.vue
index 343ac972fb2..dce3fd0e5f6 100644
--- a/shell/list/catalog.cattle.io.clusterrepo.vue
+++ b/shell/list/catalog.cattle.io.clusterrepo.vue
@@ -1,11 +1,16 @@
-<script>
-import ResourceTable from '@shell/components/ResourceTable';
+<script lang="ts">
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
+import ClusterRepo from '@shell/models/catalog.cattle.io.clusterrepo';
+import { PaginationArgs, PaginationParamFilter } from '@shell/types/store/pagination.types';
+import { defineComponent } from 'vue';
 
-export default {
-  name:       'ListClusterReposApps',
-  components: { ResourceTable },
-  props:      {
+export default defineComponent({
+  name: 'ListClusterReposApps',
+
+  components: { PaginatedResourceTable },
+
+  props: {
     resource: {
       type:     String,
       required: true,
@@ -28,20 +33,55 @@ export default {
     }
   },
 
-  computed: {
-    filterHideRows() {
-      return this.rows.filter((repo) => !(repo?.metadata?.annotations?.[CATALOG_ANNOTATIONS.HIDDEN_REPO] === 'true'));
+  methods: {
+    filterRowsLocal(rows: ClusterRepo[]) {
+      // TODO: RC Test
+      return rows.filter((repo) => !(repo?.metadata?.annotations?.[CATALOG_ANNOTATIONS.HIDDEN_REPO] === 'true'));
+    },
+
+    filterRowsApi(pagination: PaginationArgs): PaginationArgs {
+      // TODO: RC Test once API updated
+      if (!pagination.filters) {
+        pagination.filters = [];
+      }
+
+      const field = `metadata.annotations."${ CATALOG_ANNOTATIONS.HIDDEN_REPO }"`;
+      const required = PaginationParamFilter.createSingleField({
+        field,
+        exact:  true,
+        value:  'true',
+        equals: true
+      });
+      let existing: PaginationParamFilter | null = null;
+
+      for (let i = 0; i < pagination.filters.length; i++) {
+        const filter = pagination.filters[i];
+
+        if (!!filter.fields.find((f) => f.field === field)) {
+          existing = filter;
+          break;
+        }
+      }
+
+      if (!!existing) {
+        Object.assign(existing, required);
+      } else {
+        pagination.filters.push(required);
+      }
+
+      return pagination;
     }
   }
-};
+
+});
 </script>
 
 <template>
   <div>
-    <ResourceTable
+    <PaginatedResourceTable
       :schema="schema"
-      :rows="filterHideRows"
-      :loading="loading"
+      :local-filter="filterRowsLocal"
+      :api-filter="filterRowsApi"
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
       data-testid="app-cluster-repo-list"
     />
diff --git a/shell/mixins/resource-fetch.js b/shell/mixins/resource-fetch.js
index c30e6418644..1728e0cd1de 100644
--- a/shell/mixins/resource-fetch.js
+++ b/shell/mixins/resource-fetch.js
@@ -62,11 +62,22 @@ export default {
   props: {
     /**
      * Add additional filtering to the rows
+     *
+     * Should only be used when we have all results, otherwise we're filtering a page...
      */
-    filterRows: {
+    localFilter: {
       type:    Function,
       default: null,
     },
+
+    /**
+     * Add additional filtering to the pagination api request
+     */
+    apiFilter: {
+      type:    Function,
+      default: null,
+    },
+
   },
 
   computed: {
@@ -77,7 +88,7 @@ export default {
       if (currResource) {
         const rows = this.$store.getters[`${ currResource.currStore }/all`](this.resource);
 
-        return this.filterRows ? this.filterRows(rows) : rows;
+        return this.localFilter ? this.localFilter(rows) : rows;
       } else {
         return [];
       }
@@ -153,6 +164,10 @@ export default {
           force:            this.paginating !== null // Fix for manual refresh (before ripped out).
         };
 
+        if (this.apiFilter) {
+          opt.paginating = this.apiFilter(opt.pagination);
+        }
+
         Vue.set(this, 'paginating', true);
 
         const that = this;
diff --git a/shell/pages/c/_cluster/settings/performance.vue b/shell/pages/c/_cluster/settings/performance.vue
index 512d297966d..07e154de445 100644
--- a/shell/pages/c/_cluster/settings/performance.vue
+++ b/shell/pages/c/_cluster/settings/performance.vue
@@ -104,14 +104,14 @@ export default {
           resources.push(this.t('performance.serverPagination.resources.all'));
         } else {
           settings.resources.enableSome.enabled.forEach((resource) => {
-            resources.push(resource);
+            resources.push(!!resource.length ? resource : `${ resource.resource } (${ resource.context })`);
           });
           if (settings.resources.enableSome.generic) {
             resources.push(this.t('performance.serverPagination.resources.generic', {}, true));
           }
         }
 
-        storeResources.push(`${ store }: ${ resources.join(', ') }`);
+        storeResources.push(`Store Name: ${ store }, Resources ${ resources.join(', ') }`);
       });
 
       return storeResources.join('. ');
@@ -190,7 +190,6 @@ export default {
 
     setDefaults() {
       Vue.set(this, 'value', { ...DEFAULT_PERF_SETTING });
-      console.warn(this.value, DEFAULT_PERF_SETTING);
     }
   },
 };
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index 9b256a1e770..98ffc33377d 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -353,7 +353,7 @@ export default defineComponent({
       }
     },
 
-    filterRows(rows: ProvCluster[] = []) {
+    filterRows(rows: ProvCluster[] = []) { // TODO: RC shouldn't this be passed in??
       return filterHiddenLocalCluster(filterOnlyKubernetesClusters(rows, this.$store), this.$store);
     },
 
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index 356b85e3f7e..a35e4c13ea3 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -5,6 +5,7 @@ import Namespace from '@shell/models/namespace';
 import { uniq } from '@shell/utils/array';
 import {
   CAPI,
+  CATALOG,
   CONFIG_MAP, EVENT, MANAGEMENT, NAMESPACE, NODE, POD
 } from '@shell/config/types';
 import { Schema } from 'plugins/steve/schema';
@@ -150,6 +151,16 @@ class StevePaginationUtils extends NamespaceProjectFilters {
       // { field: 'reason' }, // Pending API support // TODO: RC
       // { field: 'involvedObject.kind' }, // Pending API support // TODO: RC
       // { field: 'message' }, // Pending API support // TODO: RC
+    ],
+    [CATALOG.CLUSTER_REPO]: [
+      // { field: 'spec.gitRepo' }, // Pending API support // TODO: RC
+      // { field: 'spec.gitBranch' }, // Pending API support // TODO: RC
+      // { field: `metadata.annotations.\"clusterrepo.cattle.io/hidden\"` } // Pending API support // TODO: RC
+    ],
+    [CATALOG.OPERATION]: [
+      // { field: 'status.action' }, // Pending API support // TODO: RC
+      // { field: 'status.namespace' }, // Pending API support // TODO: RC
+      // { field: 'status.releaseName' }, // Pending API support // TODO: RC
     ]
   }
 

From 34e173bf68f9525d5d63284481f30d71ba5e4240 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 23 Aug 2024 14:46:17 +0100
Subject: [PATCH 08/76] Servier-side pagination for Service --> HPA, inmgress,
 services

---
 shell/config/product/explorer.js              | 63 ++++++++++++++++++-
 shell/config/settings.ts                      |  9 ++-
 shell/list/networking.k8s.io.ingress.vue      | 25 +++++---
 shell/list/service.vue                        | 36 +++++------
 shell/mixins/resource-fetch-api-pagination.js |  4 ++
 5 files changed, 101 insertions(+), 36 deletions(-)

diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index 911c748e500..712515ddb43 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -254,8 +254,55 @@ export function init(store) {
     STEVE_AGE_COL
   ]);
 
-  headers(INGRESS, [STATE, NAME_COL, NAMESPACE_COL, INGRESS_TARGET, INGRESS_DEFAULT_BACKEND, INGRESS_CLASS, AGE]);
-  headers(SERVICE, [STATE, NAME_COL, NAMESPACE_COL, TARGET_PORT, SELECTOR, SPEC_TYPE, AGE]);
+  headers(INGRESS,
+    [STATE, NAME_COL, NAMESPACE_COL, INGRESS_TARGET, INGRESS_DEFAULT_BACKEND, INGRESS_CLASS, AGE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAMESPACE_COL,
+      STEVE_NAMESPACE_COL,
+      {
+        ...INGRESS_TARGET,
+        sort:   'spec.rules[0].host', // TODO: RC is this from fields? if not add to index list
+        search: 'spec.rules', // TODO: RC test
+      },
+      {
+        ...INGRESS_DEFAULT_BACKEND,
+        sort:   false,
+        search: false,
+      },
+      {
+        ...INGRESS_CLASS,
+        sort:   'spec.ingressClassName',
+        search: 'spec.ingressClassName', // TODO: RC is this from fields? if not add to index list
+      },
+      STEVE_AGE_COL
+    ]
+  );
+  // TODO: RC test  HPA, ingress and service list
+  headers(SERVICE,
+    [STATE, NAME_COL, NAMESPACE_COL, TARGET_PORT, SELECTOR, SPEC_TYPE, AGE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAMESPACE_COL,
+      STEVE_NAMESPACE_COL,
+      {
+        ...TARGET_PORT,
+        sort:   'spec.targetPort', /// / TODO: RC is this from fields? if not add to index list
+        search: 'spec.targetPort', // TODO: RC is this from fields? if not add to index list
+      },
+      {
+        ...SELECTOR,
+        sort:   'spec.selector', /// / TODO: RC is this from fields? if not add to index list
+        search: 'spec.selector', // TODO: RC is this from fields? if not add to index list
+      },
+      {
+        ...SPEC_TYPE,
+        sort:   'spec.type', // TODO: RC is this from fields? if not add to index list
+        search: 'spec.type', // TODO: RC is this from fields? if not add to index list
+      },
+      STEVE_AGE_COL
+    ]
+  );
 
   const eventLastSeenTime = {
     ...LAST_SEEN_TIME,
@@ -285,7 +332,17 @@ export function init(store) {
       STEVE_NAMESPACE_COL,
     ]
   );
-  headers(HPA, [STATE, NAME_COL, HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA, AGE]);
+  headers(HPA,
+    [STATE, NAME_COL, HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA, AGE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAME_COL,
+      HPA_REFERENCE, // spec.scaleTargetRef.name TODO: RC is this from fields? if not add to index list
+      MIN_REPLICA, // spec.minReplicas TODO: RC is this from fields? if not add to index list
+      MAX_REPLICA, // spec.maxReplicas TODO: RC is this from fields? if not add to index list
+      CURRENT_REPLICA, // spec.currentReplicas TODO: RC is this from fields? if not add to index list
+    ]
+  );
   headers(WORKLOAD, [STATE, NAME_COL, NAMESPACE_COL, TYPE, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
   headers(WORKLOAD_TYPES.DEPLOYMENT, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Up-to-date', 'Available', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
   headers(WORKLOAD_TYPES.DAEMON_SET, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index 3622420bfa7..55bc8f53fbc 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -2,7 +2,10 @@
 import { GC_DEFAULTS, GC_PREFERENCES } from '@shell/utils/gc/gc-types';
 import { PaginationSettings } from '@shell/types/resources/settings';
 import {
-  CAPI, EVENT, SCHEMA, NAMESPACE, CATALOG
+  CAPI, EVENT, SCHEMA, NAMESPACE, CATALOG,
+  HPA,
+  INGRESS,
+  SERVICE
 } from '@shell/config/types';
 
 interface GlobalSettingRuleset {
@@ -252,8 +255,8 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
         resources: {
           enableAll:  false,
           enableSome: {
-            enabled: ['configmap', 'secret', 'pod', 'node', EVENT, CATALOG.APP, CATALOG.CLUSTER_REPO, CATALOG.OPERATION],
-            generic: false,
+            enabled: ['configmap', 'secret', 'pod', 'node', EVENT, CATALOG.APP, CATALOG.CLUSTER_REPO, CATALOG.OPERATION, HPA, INGRESS, SERVICE],
+            generic: true,
           }
         }
       },
diff --git a/shell/list/networking.k8s.io.ingress.vue b/shell/list/networking.k8s.io.ingress.vue
index beb13bb7e3c..c82095e19d7 100644
--- a/shell/list/networking.k8s.io.ingress.vue
+++ b/shell/list/networking.k8s.io.ingress.vue
@@ -1,9 +1,8 @@
 <script>
-import ResourceTable from '@shell/components/ResourceTable';
-import ResourceFetch from '@shell/mixins/resource-fetch';
+import PaginationResourceTable from '@shell/components/PaginatedResourceTable';
+
 export default {
-  components: { ResourceTable },
-  mixins:     [ResourceFetch],
+  components: { PaginationResourceTable },
   props:      {
     resource: {
       type:     String,
@@ -18,19 +17,25 @@ export default {
       default: false
     }
   },
-  async fetch() {
-    // pathExistsInSchema requires schema networking.k8s.io.ingress to have resources fields via schema definition but none were found. has the schema 'fetchResourceFields' been called?
-    await Promise.all([this.schema.fetchResourceFields(), this.$fetchType(this.resource)]);
+
+  methods: {
+    /**
+     * opts: FetchSecondaryResourcesOpts
+     */
+    async fetchSecondaryResources(opts) {
+      // pathExistsInSchema requires schema networking.k8s.io.ingress to have resources fields via schema definition but none were found. has the schema 'fetchResourceFields' been called?
+      await this.schema.fetchResourceFields();
+    }
   }
 };
 </script>
 
 <template>
-  <ResourceTable
+  <PaginationResourceTable
     :schema="schema"
-    :rows="rows"
-    :loading="loading"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
     :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
+
+    :fetchSecondaryResources="fetchSecondaryResources"
   />
 </template>
diff --git a/shell/list/service.vue b/shell/list/service.vue
index 6e4de4eaffc..8340d5695ea 100644
--- a/shell/list/service.vue
+++ b/shell/list/service.vue
@@ -1,12 +1,10 @@
 <script>
-import ResourceTable from '@shell/components/ResourceTable';
+import PaginationResourceTable from '@shell/components/PaginatedResourceTable';
 import { NODE } from '@shell/config/types';
-import ResourceFetch from '@shell/mixins/resource-fetch';
 
 export default {
   name:       'ListService',
-  components: { ResourceTable },
-  mixins:     [ResourceFetch],
+  components: { PaginationResourceTable },
   props:      {
     resource: {
       type:     String,
@@ -24,30 +22,28 @@ export default {
     }
   },
 
-  // fetch nodes before loading this page, as they may be referenced in the Target table column
-  async fetch() {
-    const store = this.$store;
-    const inStore = store.getters['currentStore']();
-
-    this.$initializeFetchData(this.resource);
-
-    if (store.getters[`${ inStore }/schemaFor`](NODE)) {
-      this.$fetchType(NODE);
+  methods: {
+    /**
+     * opts: FetchSecondaryResourcesOpts
+     */
+    async fetchSecondaryResources(opts) {
+      const inStore = this.$store.getters['currentStore']();
+
+      if (this.$store.getters[`${ inStore }/schemaFor`](NODE)) {
+        // fetch nodes before loading this page, as they may be referenced in the Target table column
+        await this.$store.dispatch(`${ inStore }/findAll`, { type: NODE });
+      }
     }
-
-    await this.$fetchType(this.resource);
   }
 };
 </script>
 
 <template>
-  <ResourceTable
+  <PaginationResourceTable
     :schema="schema"
-    :rows="rows"
-    :headers="$attrs.headers"
-    :group-by="$attrs.groupBy"
-    :loading="loading"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
     :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
+
+    :fetchSecondaryResources="fetchSecondaryResources"
   />
 </template>
diff --git a/shell/mixins/resource-fetch-api-pagination.js b/shell/mixins/resource-fetch-api-pagination.js
index 561cb94196b..7993c090f89 100644
--- a/shell/mixins/resource-fetch-api-pagination.js
+++ b/shell/mixins/resource-fetch-api-pagination.js
@@ -176,6 +176,10 @@ export default {
         return;
       }
 
+      if (!this.resource) {
+        return false;
+      }
+
       const args = {
         id:      this.resource.id || this.resource,
         context: this.context,

From 8e0fabc8edd85750bc167427e9d1c8c125a0964a Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 14 Nov 2024 15:57:48 +0000
Subject: [PATCH 09/76] Server-side pagination for home page clusters list and
 side bar clusters

- Functional Changes
  - SSP now works after vue3 bump
  - Home Page Clusters list now uses server-side pagination
  - Side Bar clusters list now uses server-side pagination
  - Wire in now supported sorting / filtering by id and name used for table columns
  - Allow pagination to be enabled given a specific context
  - Call findPage without persisting to store

- New Pagination Tools
  - PaginatedResourceTable - Convenience Component, wraps ResourceTable with pagination specific props
  - PaginationWrapper - Convenience class to handle requests for resources and updates to them (avoiding store)

- Regressions
  - Side Nav menu ready state was `mgmtCluster.isReady && !pCluster?.hasError`, now ???
---
 shell/components/PaginatedResourceTable.vue   | 125 ++++
 shell/components/SortableTable/index.vue      |  20 +-
 .../components/form/ResourceLabeledSelect.vue |   4 +-
 shell/components/nav/TopLevelMenu.helper.ts   | 539 ++++++++++++++++++
 shell/components/nav/TopLevelMenu.vue         | 257 ++++-----
 shell/config/pagination-table-headers.js      |   8 +-
 shell/config/product/explorer.js              |   2 +
 shell/config/settings.ts                      |  14 +-
 shell/list/node.vue                           |  13 +-
 shell/mixins/resource-fetch-api-pagination.js |  29 +-
 shell/mixins/resource-fetch.js                |  29 +-
 shell/pages/home.vue                          | 366 ++++++++----
 shell/plugins/dashboard-store/actions.js      |  43 +-
 shell/plugins/dashboard-store/getters.js      |   7 +-
 shell/plugins/steve/steve-pagination-utils.ts |  28 +-
 shell/types/resources/settings.d.ts           |   2 +-
 shell/types/store/pagination.types.ts         |  13 +
 shell/types/store/vuex.d.ts                   |   8 +
 shell/utils/cluster.js                        |  81 ++-
 shell/utils/pagination-utils.ts               |  25 +-
 shell/utils/pagination-wrapper.ts             |  57 ++
 21 files changed, 1337 insertions(+), 333 deletions(-)
 create mode 100644 shell/components/PaginatedResourceTable.vue
 create mode 100644 shell/components/nav/TopLevelMenu.helper.ts
 create mode 100644 shell/utils/pagination-wrapper.ts

diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
new file mode 100644
index 00000000000..b296cd7bcec
--- /dev/null
+++ b/shell/components/PaginatedResourceTable.vue
@@ -0,0 +1,125 @@
+<script lang="ts">
+import { defineComponent } from 'vue';
+import ResourceFetch from '@shell/mixins/resource-fetch';
+import ResourceTable from '@shell/components/ResourceTable.vue';
+import { StorePaginationResult } from 'types/store/pagination.types';
+
+export type FetchSecondaryResourcesOpts = { }
+export type FetchSecondaryResources = (opts: FetchSecondaryResourcesOpts) => Promise<any>
+
+export type FetchPageSecondaryResourcesOpts = { canPaginate: boolean, force: boolean, page: any[], pagResult: StorePaginationResult }
+export type FetchPageSecondaryResources = (opts: FetchPageSecondaryResourcesOpts) => Promise<any>
+
+/**
+ * This is meant to enable ResourceList like capabilities outside of List pages / components
+ *
+ * Specifically
+ * - Resource Fetch features, including server-side pagination
+ * - Some plumbing
+ *
+ * This avoids polluting the owning component with mixins
+ *
+ */
+export default defineComponent({
+  name: 'PaginatedResourceTable',
+
+  components: { ResourceTable },
+
+  mixins: [ResourceFetch],
+
+  props: {
+    schema: {
+      type:     Object,
+      required: true,
+    },
+
+    headers: {
+      type:    Array,
+      default: null,
+    },
+
+    paginationHeaders: {
+      type:    Array,
+      default: null,
+    },
+
+    namespaced: {
+      type:    Boolean,
+      default: null, // Automatic from schema
+    },
+
+    /**
+     * Information may be required from resources other than the primary one shown per row
+     *
+     * This will fetch them ALL and will be run in a non-server-side pagination world
+     */
+    fetchSecondaryResources: {
+      type:    Function,
+      default: null,
+    },
+
+    /**
+     * Information may be required from resources other than the primary one shown per row
+     *
+     * This will fetch only those relevent to the current page using server-side pagination based filters
+     *
+     * called from shell/mixins/resource-fetch-api-pagination.js
+     */
+    fetchPageSecondaryResources: {
+      type:    Function,
+      default: null,
+    }
+  },
+
+  data() {
+    return { resource: this.schema.id };
+  },
+
+  async fetch() {
+    await this.$fetchType(this.resource, [], this.inStore);
+
+    if (this.canPaginate && this.fetchSecondaryResources) {
+      await this.fetchSecondaryResources({ });
+    }
+  },
+
+  computed: {
+    safeHeaders() {
+      const customHeaders = this.canPaginate ? this.paginationHeaders : this.headers;
+
+      return customHeaders || this.$store.getters['type-map/headersFor'](this.schema, this.canPaginate);
+    }
+  }
+});
+
+</script>
+
+<template>
+  <div>
+    <ResourceTable
+      v-bind="$attrs"
+      :schema="schema"
+      :rows="rows"
+      :alt-loading="canPaginate"
+      :loading="loading"
+
+      :headers="safeHeaders"
+      :namespaced="namespaced"
+
+      :external-pagination-enabled="canPaginate"
+      :external-pagination-result="paginationResult"
+      @pagination-changed="paginationChanged"
+    >
+      <!-- Pass down templates provided by the caller -->
+      <template
+        v-for="(_, slot) of $slots"
+        v-slot:[slot]="scope"
+      >
+        <slot
+          :name="slot"
+          v-bind="scope"
+        />
+      </template>
+    </ResourceTable>
+  </div>
+</template>
diff --git a/shell/components/SortableTable/index.vue b/shell/components/SortableTable/index.vue
index 5bf3f6dfccd..5a06aa7676b 100644
--- a/shell/components/SortableTable/index.vue
+++ b/shell/components/SortableTable/index.vue
@@ -361,7 +361,13 @@ export default {
     externalPaginationResult: {
       type:    Object,
       default: null
+    },
+
+    manualRefreshButtonSize: {
+      type:    String,
+      default: ''
     }
+
   },
 
   data() {
@@ -571,9 +577,9 @@ export default {
     showHeaderRow() {
       return this.search ||
         this.tableActions ||
-        this.$slots['header-left']?.() ||
-        this.$slots['header-middle']?.() ||
-        this.$slots['header-right']?.();
+        this.$slots['header-left'] ||
+        this.$slots['header-middle'] ||
+        this.$slots['header-right'];
     },
 
     columns() {
@@ -1109,6 +1115,7 @@ export default {
             </template>
           </slot>
         </div>
+        <!-- v-if="!hasAdvancedFiltering && $slots['header-middle']" TODO: RC -->
         <div
           v-if="!hasAdvancedFiltering && $slots['header-middle']"
           class="middle"
@@ -1116,6 +1123,7 @@ export default {
           <slot name="header-middle" />
         </div>
 
+        <!-- v-if="search || hasAdvancedFiltering || isTooManyItemsToAutoUpdate || $slots['header-right']" TODO: RC -->
         <div
           v-if="search || hasAdvancedFiltering || isTooManyItemsToAutoUpdate || $slots['header-right']"
           class="search row"
@@ -1140,8 +1148,8 @@ export default {
           <slot name="header-right" />
           <AsyncButton
             v-if="isTooManyItemsToAutoUpdate"
-            class="manual-refresh"
             mode="manual-refresh"
+            :size="manualRefreshButtonSize"
             :current-phase="refreshButtonPhase"
             @click="debouncedRefreshTableData"
           />
@@ -1568,10 +1576,6 @@ export default {
     opacity: 0.5;
     pointer-events: none;
   }
-
-  .manual-refresh {
-    height: 40px;
-  }
   .advanced-filter-group {
     position: relative;
     margin-left: 10px;
diff --git a/shell/components/form/ResourceLabeledSelect.vue b/shell/components/form/ResourceLabeledSelect.vue
index a4cbc64fabe..dd9e0e16e42 100644
--- a/shell/components/form/ResourceLabeledSelect.vue
+++ b/shell/components/form/ResourceLabeledSelect.vue
@@ -52,14 +52,14 @@ export enum RESOURCE_LABEL_SELECT_MODE {
 }
 
 /**
- * Convience wrapper around the LabelSelect component to support pagination
+ * Convenience  wrapper around the LabelSelect component to support pagination
  *
  * Handles
  *
  * 1) Conditionally enabling the pagination feature given system settings
  * 2) Helper function to fetch the pagination result
  *
- * A number of ways can be provided to override the convienences (see props)
+ * A number of ways can be provided to override the conveniences (see props)
  */
 export default defineComponent({
   name: 'ResourceLabeledSelect',
diff --git a/shell/components/nav/TopLevelMenu.helper.ts b/shell/components/nav/TopLevelMenu.helper.ts
new file mode 100644
index 00000000000..5eac716c160
--- /dev/null
+++ b/shell/components/nav/TopLevelMenu.helper.ts
@@ -0,0 +1,539 @@
+import { CAPI, MANAGEMENT } from 'config/types';
+import { PaginationParam, PaginationParamFilter, PaginationSort } from 'types/store/pagination.types';
+import { VuexStore } from 'types/store/vuex';
+import { filterHiddenLocalCluster, filterOnlyKubernetesClusters, paginationFilterClusters } from 'utils/cluster';
+import devConsole from 'utils/dev-console';
+import PaginationWrapper from 'utils/pagination-wrapper';
+import { allHash } from 'utils/promise';
+import { sortBy } from 'utils/sort';
+import { LocationAsRelativeRaw } from 'vue-router';
+
+interface TopLevelMenuCluster {
+  id: string,
+  label: string,
+  ready: boolean
+  providerNavLogo: string,
+  badge: string,
+  isLocal: boolean,
+  pinned: boolean,
+  description: string,
+  pin: () => void,
+  unpin: () => void,
+  clusterRoute: LocationAsRelativeRaw,
+}
+
+interface UpdateArgs {
+  searchTerm: string,
+  pinnedIds: string[],
+  unPinnedMax?: number,
+}
+
+type MgmtCluster = {
+  [key: string]: any
+}
+
+type ProvCluster = {
+  [key: string]: any
+}
+/**
+ * Order
+ * 1. Specific Local Cluster
+ * 2. Ready
+ * 3. Name
+ */
+const DEFAULT_SORT: Array<PaginationSort> = [
+  // Put local cluster at top of list - https://github.com/rancher/dashboard/issues/10975
+  // {
+  //   asc:   true,
+  //   field: 'spec.internal', // Pending API support https://github.com/rancher/rancher/issues/48011
+  // },
+  // {
+  //   asc:   true,
+  //   field: 'status.conditions[0].status' // Pending API changes https://github.com/rancher/rancher/issues/48092
+  // },
+  // {
+  //   asc:   true,
+  //   field: 'spec.displayName' // Pending API support https://github.com/rancher/rancher/issues/48011
+  // },
+];
+
+export interface TopLevelMenuHelper {
+  /**
+  * Filter mgmt clusters by
+  * 1. If harvester or not (filterOnlyKubernetesClusters)
+  * 2. If local or not (filterHiddenLocalCluster)
+  * 3. Is pinned
+  *
+  * Sort By
+  * 1. is local cluster (appears at top)
+  * 2. ready
+  * 3. name
+  */
+  clustersPinned: Array<TopLevelMenuCluster>;
+
+  /**
+  * Filter mgmt clusters by
+  * 1. If harvester or not (filterOnlyKubernetesClusters)
+  * 2. If local or not (filterHiddenLocalCluster)
+  * 3.
+  * a) if search term, filter on it
+  * b) if no search term, filter on pinned
+  *
+  * Sort By
+  * 1. is local cluster (appears at top)
+  * 2. ready
+  * 3. name
+  */
+  clustersOthers: Array<TopLevelMenuCluster>;
+
+  update: (args: UpdateArgs) => Promise<void>
+}
+
+export abstract class BaseTopLevelMenuHelper {
+  protected $store: VuexStore;
+
+  /**
+  * Filter mgmt clusters by
+  * 1. If harvester or not (filterOnlyKubernetesClusters)
+  * 2. If local or not (filterHiddenLocalCluster)
+  * 3. Is pinned
+  *
+  * Sort By
+  * 1. is local cluster (appears at top)
+  * 2. ready
+  * 3. name
+  */
+  public clustersPinned: Array<TopLevelMenuCluster> = [];
+
+  /**
+  * Filter mgmt clusters by
+  * 1. If harvester or not (filterOnlyKubernetesClusters)
+  * 2. If local or not (filterHiddenLocalCluster)
+  * 3.
+  * a) if search term, filter on it
+  * b) if no search term, filter on pinned
+  *
+  * Sort By
+  * 1. is local cluster (appears at top)
+  * 2. ready
+  * 3. name
+  */
+  public clustersOthers: Array<TopLevelMenuCluster> = [];
+
+  constructor({ $store }: {
+    $store: VuexStore,
+}) {
+    this.$store = $store;
+  }
+
+  protected convertToCluster(mgmtCluster: MgmtCluster, provCluster: ProvCluster): TopLevelMenuCluster {
+    return {
+      id:              mgmtCluster.id,
+      label:           mgmtCluster.nameDisplay,
+      ready:           mgmtCluster.isReady, // && !provCluster?.hasError,
+      providerNavLogo: mgmtCluster.providerMenuLogo,
+      badge:           mgmtCluster.badge,
+      isLocal:         mgmtCluster.isLocal,
+      pinned:          mgmtCluster.pinned,
+      description:     provCluster?.description || mgmtCluster.description,
+      pin:             () => mgmtCluster.pin(),
+      unpin:           () => mgmtCluster.unpin(),
+      clusterRoute:    { name: 'c-cluster-explorer', params: { cluster: mgmtCluster.id } }
+    };
+  }
+}
+
+export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper implements TopLevelMenuHelper {
+  private args?: UpdateArgs;
+
+  private clustersPinnedWrapper: PaginationWrapper;
+  private clustersOthersWrapper: PaginationWrapper;
+  private provClusterWrapper: PaginationWrapper;
+
+  private commonClusterFilters: PaginationParam[];
+
+  /**
+   *
+   */
+  constructor({ $store }: {
+      $store: VuexStore,
+  }) {
+    devConsole.warn('TLM.helper', 'TopLevelMenuHelperPagination');
+
+    super({ $store });
+
+    this.commonClusterFilters = paginationFilterClusters({ getters: this.$store.getters });
+
+    this.clustersPinnedWrapper = new PaginationWrapper({
+      $store,
+      onUpdate: () => {
+        // TODO: RC trigger on websocket update (only need 1 trigger for this cluster type)
+        if (this.args) {
+          this.update(this.args);
+        }
+      },
+      enabledFor: {
+        store:    'management',
+        resource: {
+          id:      MANAGEMENT.CLUSTER,
+          context: 'side-bar',
+        }
+      }
+    });
+    this.clustersOthersWrapper = new PaginationWrapper({
+      $store,
+      onUpdate: (res) => {
+        // TODO: RC trigger on websocket update (only need 1 trigger for this cluster type)
+        if (this.args) {
+          this.update(this.args);
+        }
+      },
+      enabledFor: {
+        store:    'management',
+        resource: {
+          id:      MANAGEMENT.CLUSTER,
+          context: 'side-bar',
+        }
+      }
+    });
+    this.provClusterWrapper = new PaginationWrapper({
+      $store,
+      onUpdate: (res) => {
+        // TODO: RC trigger on websocket update
+        if (this.args) {
+          this.update(this.args);
+        }
+      },
+      enabledFor: {
+        store:    'management',
+        resource: {
+          id:      CAPI.RANCHER_CLUSTER,
+          context: 'side-bar',
+        }
+      }
+    });
+  }
+
+  // ---------- requests ----------
+  async update(args: UpdateArgs) {
+    this.args = args;
+    const promises = {
+      pinned:    this.updatePinned(args),
+      notPinned: this.updateOthers(args)
+    };
+
+    const res: {
+      pinned: MgmtCluster[],
+      notPinned: MgmtCluster[]
+    } = await allHash(promises) as any;
+    const provClusters = await this.updateProvCluster(res.notPinned, res.pinned);
+    const provClustersByMgmtId = provClusters.reduce((res: { [mgmtId: string]: ProvCluster}, provCluster: ProvCluster) => {
+      if (provCluster.mgmtClusterId) {
+        res[provCluster.mgmtClusterId] = provCluster;
+      }
+
+      return res;
+    }, {} as { [mgmtId: string]: ProvCluster});
+
+    const _clustersNotPinned = res.notPinned
+      .filter((mgmtCluster) => !!provClustersByMgmtId[mgmtCluster.id])
+      .map((mgmtCluster) => this.convertToCluster(mgmtCluster, provClustersByMgmtId[mgmtCluster.id]));
+    const _clustersPinned = res.pinned
+      .filter((mgmtCluster) => !!provClustersByMgmtId[mgmtCluster.id])
+      .map((mgmtCluster) => this.convertToCluster(mgmtCluster, provClustersByMgmtId[mgmtCluster.id]));
+
+    this.clustersPinned.length = 0;
+    this.clustersOthers.length = 0;
+
+    this.clustersPinned.push(..._clustersPinned);
+    this.clustersOthers.push(..._clustersNotPinned);
+  }
+
+  private constructParams({
+    pinnedIds,
+    searchTerm,
+    includeLocal,
+    includeSearchTerm,
+    includePinned,
+    excludePinned,
+  }: {
+    pinnedIds?: string[],
+    searchTerm?: string,
+    includeLocal?: boolean,
+    includeSearchTerm?: boolean,
+    includePinned?: boolean,
+    excludePinned?: boolean,
+  }): PaginationParam[] {
+    const filters: PaginationParam[] = [...this.commonClusterFilters];
+
+    if (pinnedIds) {
+      if (includePinned) {
+        // cluster id is 1 OR 2 OR 3 OR 4...
+        filters.push(PaginationParamFilter.createMultipleFields(
+          pinnedIds.map((id) => ({
+            field: 'id', value: id, equals: true, exact: true
+          }))
+        ));
+      }
+
+      if (excludePinned) {
+        // cluster id is NOT 1 AND NOT 2 OR 3 OR 4...
+        filters.push(...pinnedIds.map((id) => PaginationParamFilter.createSingleField({
+          field: 'id', equals: false, value: id
+        })));
+      }
+    }
+
+    if (searchTerm && includeSearchTerm) {
+      // Pending API support https://github.com/rancher/rancher/issues/48011
+      // filters.push(PaginationParamFilter.createSingleField({
+      //   field: 'spec.displayName', exact: false, value: searchTerm
+      // }));
+    }
+
+    if (includeLocal) {
+      filters.push(PaginationParamFilter.createSingleField({ field: 'id', value: 'local' }));
+    }
+
+    return filters;
+  }
+
+  /**
+   * See `clustersPinned` description for details
+   */
+  private async updatePinned(args: UpdateArgs): Promise<MgmtCluster[]> {
+    return this.clustersPinnedWrapper.request({
+      pagination: {
+        filters: this.constructParams({
+          pinnedIds:     args.pinnedIds,
+          includePinned: true,
+        }),
+        page:                 1,
+        sort:                 DEFAULT_SORT,
+        projectsOrNamespaces: []
+      },
+      classify: true,
+    }).then((r) => r.data);
+  }
+
+  /**
+   * See `clustersOthers` description for details
+   */
+  private async updateOthers(args: UpdateArgs): Promise<MgmtCluster[]> {
+    return this.clustersOthersWrapper.request({
+      pagination: {
+        filters: this.constructParams({
+          searchTerm:        args.searchTerm,
+          includeSearchTerm: !!args.searchTerm,
+          pinnedIds:         args.pinnedIds,
+          excludePinned:     !args.searchTerm,
+        }),
+        page:                 1,
+        pageSize:             args.unPinnedMax,
+        sort:                 DEFAULT_SORT,
+        projectsOrNamespaces: []
+      },
+      classify: true,
+    }).then((r) => r.data);
+  }
+
+  /**
+   * Find all provisioning clusters associated with the displayed mgmt clusters
+   */
+  private async updateProvCluster(notPinned: MgmtCluster[], pinned: MgmtCluster[]): Promise<ProvCluster[]> {
+    return this.provClusterWrapper.request({
+      pagination: {
+
+        filters: [
+          PaginationParamFilter.createMultipleFields(
+            [...notPinned, ...pinned]
+              .map((mgmtCluster) => ({
+                // Pending API support https://github.com/rancher/rancher/issues/48011
+                // field: 'status.clusterName', value: mgmtCluster.id, equals: true, exact: true
+                field: 'metadata.name', value: 'local', equals: true, exact: true
+              }))
+          )
+        ],
+
+        page:                 1,
+        sort:                 [],
+        projectsOrNamespaces: []
+      },
+      classify: true,
+    }).then((r) => r.data);
+  }
+}
+
+export class TopLevelMenuHelperLegacy extends BaseTopLevelMenuHelper implements TopLevelMenuHelper {
+  private hasProvCluster: boolean;
+
+  constructor({ $store }: {
+    $store: VuexStore,
+  }) {
+    devConsole.warn('TLM.helper', 'TopLevelMenuHelperLegacy');
+    super({ $store });
+
+    this.hasProvCluster = this.$store.getters[`management/schemaFor`](CAPI.RANCHER_CLUSTER);
+
+    if (this.hasProvCluster) {
+      $store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER });
+    }
+  }
+
+  async update(args: UpdateArgs) {
+    devConsole.warn('TLM.helper', 'TopLevelMenuHelperLegacy', 'update');
+    const clusters = this.updateClusters();
+    const _clustersNotPinned = this.clustersFiltered(clusters, args);
+    const _clustersPinned = this.pinFiltered(clusters, args);
+
+    devConsole.warn('TLM.helper', 'TopLevelMenuHelperLegacy', 'update', 'res', _clustersPinned, _clustersNotPinned);
+
+    this.clustersPinned.length = 0;
+    this.clustersOthers.length = 0;
+
+    this.clustersPinned.push(..._clustersPinned);
+    this.clustersOthers.push(..._clustersNotPinned);
+  }
+
+  /**
+   * Filter mgmt clusters by
+   * 1. Harvester type 1 (filterOnlyKubernetesClusters)
+   * 2. Harvester type 2 (filterHiddenLocalCluster)
+   * 3. There's a matching prov cluster
+   *
+   * Convert remaining clusters to special format
+   */
+  private updateClusters(): TopLevelMenuCluster[] {
+    devConsole.warn('');
+    if (!this.hasProvCluster) {
+      // We're filtering out mgmt clusters without prov clusters, so if the user can't see any prov clusters at all
+      // exit early
+      return [];
+    }
+
+    const all = this.$store.getters['management/all'](MANAGEMENT.CLUSTER);
+    const mgmtClusters = filterHiddenLocalCluster(filterOnlyKubernetesClusters(all, this.$store), this.$store);
+    const provClusters = this.$store.getters['management/all'](CAPI.RANCHER_CLUSTER);
+    const provClustersByMgmtId = provClusters.reduce((res: any, provCluster: ProvCluster) => {
+      if (provCluster.mgmt?.id) {
+        res[provCluster.mgmt.id] = provCluster;
+      }
+
+      return res;
+    }, {});
+
+    return (mgmtClusters || []).reduce((res: any, mgmtCluster: MgmtCluster) => {
+      // Filter to only show mgmt clusters that exist for the available provisioning clusters
+      // Addresses issue where a mgmt cluster can take some time to get cleaned up after the corresponding
+      // provisioning cluster has been deleted
+      if (!provClustersByMgmtId[mgmtCluster.id]) {
+        return res;
+      }
+
+      res.push(this.convertToCluster(mgmtCluster, provClustersByMgmtId[mgmtCluster.id]));
+
+      return res;
+    }, []);
+  }
+
+  /**
+   * Filter clusters by
+   * 1. Not pinned
+   * 2. Includes search term
+   *
+   * Sort remaining clusters
+   *
+   * Reduce number of clusters if too many too show
+   *
+   * Important! This is used to show unpinned clusters OR results of search
+   */
+  private clustersFiltered(clusters: TopLevelMenuCluster[], args: UpdateArgs): TopLevelMenuCluster[] {
+    const clusterFilter = args.searchTerm;
+    const maxClustersToShow = args.unPinnedMax || 10;
+
+    const search = (clusterFilter || '').toLowerCase();
+    let localCluster: MgmtCluster | null = null;
+
+    const filtered = clusters.filter((c) => {
+      // If we're searching we don't care if pinned or not
+      if (search) {
+        if (!c.label?.toLowerCase().includes(search)) {
+          return false;
+        }
+      } else if (c.pinned) {
+        // Not searching, not pinned, don't care
+        return false;
+      }
+
+      if (!localCluster && c.id === 'local') {
+        // Local cluster is a special case, we're inserting it at top so don't include in the middle
+        localCluster = c;
+
+        return false;
+      }
+
+      return true;
+    });
+
+    const sorted = sortBy(filtered, ['ready:desc', 'label']);
+
+    // put local cluster on top of list always - https://github.com/rancher/dashboard/issues/10975
+    if (localCluster) {
+      sorted.unshift(localCluster);
+    }
+
+    if (search) {
+      // this.showPinClusters = false;
+      // this.searchActive = !sorted.length > 0;
+
+      return sorted;
+    }
+    // this.showPinClusters = true;
+    // this.searchActive = false;
+
+    if (sorted.length >= maxClustersToShow) {
+      return sorted.slice(0, maxClustersToShow);
+    }
+
+    return sorted;
+  }
+
+  /**
+   * Filter clusters by
+   * 1. Not pinned
+   * 2. Includes search term
+   *
+   * Sort remaining clusters
+   *
+   * Reduce number of clusters if too many too show
+   *
+   * Important! This is hidden if there's a filter (user searching)
+   */
+  private pinFiltered(clusters: TopLevelMenuCluster[], args: UpdateArgs): TopLevelMenuCluster[] {
+    let localCluster = null;
+    const filtered = clusters.filter((c) => {
+      if (!c.pinned) {
+        // We only care about pinned clusters
+        return false;
+      }
+
+      if (c.id === 'local') {
+        // Special case, we're going to add this at the start so filter out
+        localCluster = c;
+
+        return false;
+      }
+
+      return true;
+    });
+
+    const sorted = sortBy(filtered, ['ready:desc', 'label']);
+
+    // put local cluster on top of list always - https://github.com/rancher/dashboard/issues/10975
+    if (localCluster) {
+      sorted.unshift(localCluster);
+    }
+
+    return sorted;
+  }
+}
diff --git a/shell/components/nav/TopLevelMenu.vue b/shell/components/nav/TopLevelMenu.vue
index 04d689f11f2..32fa407a6ec 100644
--- a/shell/components/nav/TopLevelMenu.vue
+++ b/shell/components/nav/TopLevelMenu.vue
@@ -4,18 +4,24 @@ import ClusterIconMenu from '@shell/components/ClusterIconMenu';
 import IconOrSvg from '../IconOrSvg';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 import { mapGetters } from 'vuex';
-import { CAPI, MANAGEMENT } from '@shell/config/types';
-import { MENU_MAX_CLUSTERS } from '@shell/store/prefs';
+import { CAPI, COUNT, MANAGEMENT } from '@shell/config/types';
+import { MENU_MAX_CLUSTERS, PINNED_CLUSTERS } from '@shell/store/prefs';
 import { sortBy } from '@shell/utils/sort';
 import { ucFirst } from '@shell/utils/string';
 import { KEY } from '@shell/utils/platform';
 import { getVersionInfo } from '@shell/utils/version';
 import { SETTING } from '@shell/config/settings';
-import { filterOnlyKubernetesClusters, filterHiddenLocalCluster } from '@shell/utils/cluster';
 import { getProductFromRoute } from '@shell/utils/router';
 import { isRancherPrime } from '@shell/config/version';
 import Pinned from '@shell/components/nav/Pinned';
 import { getGlobalBannerFontSizes } from '@shell/utils/banners';
+import { TopLevelMenuHelperPagination, TopLevelMenuHelperLegacy } from 'components/nav/TopLevelMenu.helper';
+import devConsole from 'utils/dev-console';
+import { debounce } from 'lodash';
+
+// TODO: RC wire in socket updates to pagination wrapper
+// TODO: RC test search properly
+// TODO: RC loading indicators?
 
 export default {
   components: {
@@ -29,6 +35,19 @@ export default {
     const { displayVersion, fullVersion } = getVersionInfo(this.$store);
     const hasProvCluster = this.$store.getters[`management/schemaFor`](CAPI.RANCHER_CLUSTER);
 
+    const canPagination = this.$store.getters[`management/paginationEnabled`]({
+      id:      MANAGEMENT.CLUSTER,
+      context: 'side-bar',
+    }) && this.$store.getters[`management/paginationEnabled`]({
+      id:      CAPI.RANCHER_CLUSTER,
+      context: 'side-bar',
+    });
+    const helper = canPagination ? new TopLevelMenuHelperPagination({ $store: this.$store }) : new TopLevelMenuHelperLegacy({ $store: this.$store });
+    const provClusters = !canPagination && hasProvCluster ? this.$store.getters[`management/all`](CAPI.RANCHER_CLUSTER) : [];
+    const mgmtClusters = !canPagination ? this.$store.getters[`management/all`](MANAGEMENT.CLUSTER) : [];
+
+    devConsole.warn(provClusters, mgmtClusters);
+
     return {
       shown:             false,
       displayVersion,
@@ -37,27 +56,25 @@ export default {
       hasProvCluster,
       maxClustersToShow: MENU_MAX_CLUSTERS,
       emptyCluster:      BLANK_CLUSTER,
-      showPinClusters:   false,
-      searchActive:      false,
       routeCombo:        false,
-    };
-  },
 
-  fetch() {
-    if (this.hasProvCluster) {
-      this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER });
-    }
+      canPagination,
+      helper,
+      debouncedHelperUpdate: debounce((...args) => this.helper.update(...args), 200),
+      provClusters,
+      mgmtClusters,
+    };
   },
 
   computed: {
     ...mapGetters(['clusterId']),
     ...mapGetters(['clusterReady', 'isRancher', 'currentCluster', 'currentProduct', 'isRancherInHarvester']),
     ...mapGetters({ features: 'features/get' }),
-    value: {
-      get() {
-        return this.$store.getters['productId'];
-      },
+
+    pinnedIds() {
+      return this.$store.getters['prefs/get'](PINNED_CLUSTERS);
     },
+
     sideMenuStyle() {
       const globalBannerSettings = getGlobalBannerFontSizes(this.$store);
 
@@ -68,161 +85,47 @@ export default {
     },
 
     showClusterSearch() {
-      return this.clusters.length > this.maxClustersToShow;
+      return this.allClustersCount > this.maxClustersToShow;
     },
 
-    /**
-     * Filter mgmt clusters by
-     * 1. Harvester type 1 (filterOnlyKubernetesClusters)
-     * 2. Harvester type 2 (filterHiddenLocalCluster)
-     * 3. There's a matching prov cluster
-     *
-     * Convert remaining clusters to special format
-     */
-    clusters() {
-      if (!this.hasProvCluster) {
-        // We're filtering out mgmt clusters without prov clusters, so if the user can't see any prov clusters at all
-        // exit early
-        return [];
-      }
+    allClustersCount() {
+      const counts = this.$store.getters[`management/all`](COUNT)?.[0]?.counts || {};
+      const count = counts[MANAGEMENT.CLUSTER] || {};
 
-      const all = this.$store.getters['management/all'](MANAGEMENT.CLUSTER);
-      const mgmtClusters = filterHiddenLocalCluster(filterOnlyKubernetesClusters(all, this.$store), this.$store);
-      const provClusters = this.$store.getters['management/all'](CAPI.RANCHER_CLUSTER);
-      const provClustersByMgmtId = provClusters.reduce((res, provCluster) => {
-        if (provCluster.mgmt?.id) {
-          res[provCluster.mgmt.id] = provCluster;
-        }
-
-        return res;
-      }, {});
+      return count?.summary.count;
+    },
 
-      return (mgmtClusters || []).reduce((res, mgmtCluster) => {
-        // Filter to only show mgmt clusters that exist for the available provisioning clusters
-        // Addresses issue where a mgmt cluster can take some time to get cleaned up after the corresponding
-        // provisioning cluster has been deleted
-        if (!provClustersByMgmtId[mgmtCluster.id]) {
-          return res;
-        }
+    // New
+    search() {
+      return (this.clusterFilter || '').toLowerCase();
+    },
 
-        const pCluster = provClustersByMgmtId[mgmtCluster.id];
-
-        res.push({
-          id:              mgmtCluster.id,
-          label:           mgmtCluster.nameDisplay,
-          ready:           mgmtCluster.isReady && !pCluster?.hasError,
-          osLogo:          mgmtCluster.providerOsLogo,
-          providerNavLogo: mgmtCluster.providerMenuLogo,
-          badge:           mgmtCluster.badge,
-          isLocal:         mgmtCluster.isLocal,
-          isHarvester:     mgmtCluster.isHarvester,
-          pinned:          mgmtCluster.pinned,
-          description:     pCluster?.description || mgmtCluster.description,
-          pin:             () => mgmtCluster.pin(),
-          unpin:           () => mgmtCluster.unpin(),
-          clusterRoute:    { name: 'c-cluster-explorer', params: { cluster: mgmtCluster.id } }
-        });
+    // New
+    showPinClusters() {
+      return !this.search;
+    },
 
-        return res;
-      }, []);
+    // New
+    searchActive() {
+      return !!this.search;
     },
 
     /**
-     * Filter clusters by
-     * 1. Not pinned
-     * 2. Includes search term
-     *
-     * Sort remaining clusters
+     * Only Clusters that are pinned
      *
-     * Reduce number of clusters if too many too show
-     *
-     * Important! This is used to show unpinned clusters OR results of search
+     * (see description of helper.clustersPinned for more details)
      */
-    clustersFiltered() {
-      const search = (this.clusterFilter || '').toLowerCase();
-      let localCluster = null;
-
-      const filtered = this.clusters.filter((c) => {
-        // If we're searching we don't care if pinned or not
-        if (search) {
-          if (!c.label?.toLowerCase().includes(search)) {
-            return false;
-          }
-        } else if (c.pinned) {
-          // Not searching, not pinned, don't care
-          return false;
-        }
-
-        if (!localCluster && c.id === 'local') {
-          // Local cluster is a special case, we're inserting it at top so don't include in the middle
-          localCluster = c;
-
-          return false;
-        }
-
-        return true;
-      });
-
-      const sorted = sortBy(filtered, ['ready:desc', 'label']);
-
-      // put local cluster on top of list always - https://github.com/rancher/dashboard/issues/10975
-      if (localCluster) {
-        sorted.unshift(localCluster);
-      }
-
-      if (search) {
-        this.showPinClusters = false;
-        this.searchActive = !sorted.length > 0;
-
-        return sorted;
-      }
-      this.showPinClusters = true;
-      this.searchActive = false;
-
-      if (sorted.length >= this.maxClustersToShow) {
-        return sorted.slice(0, this.maxClustersToShow);
-      }
-
-      return sorted;
+    pinFiltered() {
+      return this.hasProvCluster ? this.helper.clustersPinned : [];
     },
 
     /**
-     * Filter clusters by
-     * 1. Not pinned
-     * 2. Includes search term
-     *
-     * Sort remaining clusters
+     * Used to shown unpinned clusters OR results of text search
      *
-     * Reduce number of clusters if too many too show
-     *
-     * Important! This is hidden if there's a filter (user searching)
+     * (see description of helper.clustersOthers for more details)
      */
-    pinFiltered() {
-      let localCluster = null;
-      const filtered = this.clusters.filter((c) => {
-        if (!c.pinned) {
-          // We only care about pinned clusters
-          return false;
-        }
-
-        if (c.id === 'local') {
-          // Special case, we're going to add this at the start so filter out
-          localCluster = c;
-
-          return false;
-        }
-
-        return true;
-      });
-
-      const sorted = sortBy(filtered, ['ready:desc', 'label']);
-
-      // put local cluster on top of list always - https://github.com/rancher/dashboard/issues/10975
-      if (localCluster) {
-        sorted.unshift(localCluster);
-      }
-
-      return sorted;
+    clustersFiltered() {
+      return this.hasProvCluster ? this.helper.clustersOthers : [];
     },
 
     pinnedClustersHeight() {
@@ -232,7 +135,7 @@ export default {
       return `min-height: ${ height }px`;
     },
     clusterFilterCount() {
-      return this.clusterFilter ? this.clustersFiltered.length : this.clusters.length;
+      return this.clusterFilter ? this.clustersFiltered.length : this.allClustersCount;
     },
 
     multiClusterApps() {
@@ -363,7 +266,35 @@ export default {
   watch: {
     $route() {
       this.shown = false;
-    }
+    },
+
+    pinnedIds: {
+      immediate: true,
+      handler(ids) {
+        this.updateClusters(ids);
+      }
+    },
+
+    search() {
+      this.updateClusters(this.pinnedIds);
+    },
+
+    provClusters: {
+      handler() {
+        // Shouldn't get here if SSP
+        this.updateClusters(this.pinnedIds);
+      },
+      deep: true
+    },
+
+    mgmtClusters: {
+      handler() {
+        // Shouldn't get here if SSP
+        this.updateClusters(this.pinnedIds);
+      },
+      deep: true
+    },
+
   },
 
   mounted() {
@@ -490,9 +421,18 @@ export default {
         popperClass
       };
     },
+
+    updateClusters(pinnedIds) {
+      this.debouncedHelperUpdate({
+        pinnedIds,
+        searchTerm:  this.search,
+        unPinnedMax: this.maxClustersToShow
+      });
+    }
   }
 };
 </script>
+
 <template>
   <div>
     <!-- Overlay -->
@@ -632,7 +572,8 @@ export default {
           </template>
 
           <!-- Cluster menu -->
-          <template v-if="clusters && !!clusters.length">
+          <!-- <template v-if="clusters && !!clusters.length"> -->
+          <template v-if="!!allClustersCount">
             <div
               ref="clusterList"
               class="clusters"
@@ -800,7 +741,7 @@ export default {
 
             <!-- See all clusters -->
             <router-link
-              v-if="clusters.length > maxClustersToShow"
+              v-if="allClustersCount > maxClustersToShow"
               class="clusters-all"
               :to="{name: 'c-cluster-product-resource', params: {
                 cluster: emptyCluster,
diff --git a/shell/config/pagination-table-headers.js b/shell/config/pagination-table-headers.js
index eabcb5891ee..53d524ab034 100644
--- a/shell/config/pagination-table-headers.js
+++ b/shell/config/pagination-table-headers.js
@@ -17,8 +17,8 @@ export const STEVE_ID_COL = {
   name:     'steve-id',
   labelKey: 'tableHeaders.id',
   value:    'id',
-  sort:     false, // sort:     ['id'], // Pending API support
-  search:   false, // search:   'id', // Pending API support
+  sort:     ['id'],
+  search:   'id',
 };
 
 export const STEVE_STATE_COL = {
@@ -26,8 +26,8 @@ export const STEVE_STATE_COL = {
   // Note, we're show the 'state' as per model, not the 'metadata.state.name' that's available in the model to remotely sort/filter
   // Need to investigate whether we should 'dumb down' the state we show to the native one (tracked via https://github.com/rancher/dashboard/issues/8527)
   // This means we'll show something different to what we sort and filter on.
-  sort:   false, // ['metadata.state.name'], // Pending API support
-  search: false, // 'metadata.state.name', // Pending API support
+  sort:   ['metadata.state.name'],
+  search: 'metadata.state.name',
 };
 
 export const STEVE_AGE_COL = {
diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index 1652473a120..4ff4af1157b 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -9,6 +9,7 @@ import {
   NORMAN,
   SNAPSHOT,
   VIRTUAL_TYPES,
+  CAPI,
 } from '@shell/config/types';
 
 import {
@@ -60,6 +61,7 @@ export function init(store) {
       [MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING]: 'management',
       [NORMAN.CLUSTER_ROLE_TEMPLATE_BINDING]:     'rancher',
       [NORMAN.PROJECT_ROLE_TEMPLATE_BINDING]:     'rancher',
+      [CAPI.RANCHER_CLUSTER]:                     'management',
     }
   });
 
diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index a25bdb1eb72..eabfb74a3f8 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -1,6 +1,7 @@
 // Settings
 import { GC_DEFAULTS, GC_PREFERENCES } from '@shell/utils/gc/gc-types';
 import { PaginationSettings } from '@shell/types/resources/settings';
+import { CAPI, MANAGEMENT } from '@shell/config/types';
 
 interface GlobalSettingRuleset {
   name: string,
@@ -258,8 +259,19 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
             generic: true,
           }
         }
+      },
+      management: {
+        resources: {
+          enableAll:  false,
+          enableSome: {
+            enabled: [
+              { resource: CAPI.RANCHER_CLUSTER, context: ['home', 'side-bar'] },
+              { resource: MANAGEMENT.CLUSTER, context: ['side-bar'] },
+            ],
+            generic: false,
+          }
+        }
       }
     }
   }
-
 };
diff --git a/shell/list/node.vue b/shell/list/node.vue
index 11e89bba2b3..0c0595320b3 100644
--- a/shell/list/node.vue
+++ b/shell/list/node.vue
@@ -21,6 +21,7 @@ import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import { mapGetters } from 'vuex';
+import { FetchPageSecondaryResourcesOpts } from 'components/PaginatedResourceTable.vue';
 
 export default defineComponent({
   name:       'ListNode',
@@ -36,10 +37,12 @@ export default defineComponent({
       type:     String,
       required: true,
     },
+
     schema: {
       type:     Object,
       required: true,
     },
+
     useQueryParamsForSimpleFiltering: {
       type:    Boolean,
       default: false
@@ -209,8 +212,8 @@ export default defineComponent({
      *
      * So when we have a page.... use those entries as filters when fetching the other resources
      */
-    async fetchPageSecondaryResources(force = false) {
-      if (!this.rows?.length) {
+    async fetchPageSecondaryResources({ canPaginate, force, page }: FetchPageSecondaryResourcesOpts) {
+      if (!page?.length) {
         return;
       }
 
@@ -220,7 +223,7 @@ export default defineComponent({
         const opt: ActionFindPageArgs = {
           force,
           pagination: new FilterArgs({
-            filters: PaginationParamFilter.createMultipleFields(this.rows.map((r: any) => new PaginationFilterField({
+            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
               field: 'status.nodeName',
               value: r.id
             }))),
@@ -242,7 +245,7 @@ export default defineComponent({
             namespaced: namespace,
             pagination: new FilterArgs({
               filters: PaginationParamFilter.createMultipleFields(
-                this.rows.reduce((res: PaginationFilterField[], r: any ) => {
+                page.reduce((res: PaginationFilterField[], r: any ) => {
                   const name = r.metadata?.annotations?.[CAPI_ANNOTATIONS.MACHINE_NAME];
 
                   if (name) {
@@ -268,7 +271,7 @@ export default defineComponent({
           force,
           pagination: new FilterArgs({
             filters: PaginationParamFilter.createMultipleFields(
-              this.rows.map((r: any) => new PaginationFilterField({
+              page.map((r: any) => new PaginationFilterField({
                 field: 'spec.nodeName',
                 value: r.id,
               }))
diff --git a/shell/mixins/resource-fetch-api-pagination.js b/shell/mixins/resource-fetch-api-pagination.js
index 80a2ec562d4..e73e9b18640 100644
--- a/shell/mixins/resource-fetch-api-pagination.js
+++ b/shell/mixins/resource-fetch-api-pagination.js
@@ -13,6 +13,16 @@ import stevePaginationUtils from '@shell/plugins/steve/steve-pagination-utils';
  */
 export default {
 
+  props: {
+    /**
+     * Where in the ui this mixin is used. For instance the home page cluster list would be `home`
+     */
+    context: {
+      type:    String,
+      default: null,
+    },
+  },
+
   data() {
     return {
       forceUpdateLiveAndDelayed: 0,
@@ -68,7 +78,7 @@ export default {
     },
 
     namespaceFilterChanged(neu) {
-      if (!this.canPaginate || !this.schema?.attributes?.namespaced) {
+      if (!this.canPaginate || !this.schema?.attributes?.namespaced || !this.namespaced) {
         return;
       }
 
@@ -166,7 +176,12 @@ export default {
         return;
       }
 
-      return this.resource && this.$store.getters[`${ this.currentProduct?.inStore }/paginationEnabled`]?.(this.resource.id || this.resource);
+      const args = {
+        id:      this.resource.id || this.resource,
+        context: this.context,
+      };
+
+      return this.resource && this.$store.getters[`${ this.inStore }/paginationEnabled`]?.(args);
     },
 
     paginationResult() {
@@ -182,7 +197,7 @@ export default {
         return;
       }
 
-      return this.$store.getters[`${ this.currentProduct?.inStore }/havePage`](this.resource);
+      return this.$store.getters[`${ this.inStore }/havePage`](this.resource);
     },
 
     /**
@@ -197,6 +212,10 @@ export default {
       */
     showDynamicRancherNamespaces() {
       return this.$store.getters['prefs/get'](ALL_NAMESPACES);
+    },
+
+    inStore() {
+      return this.$store.getters['currentStore'](this.resource) || this.currentProduct?.inStore;
     }
   },
 
@@ -298,7 +317,9 @@ export default {
         return;
       }
 
-      await this.fetchPageSecondaryResources();
+      await this.fetchPageSecondaryResources({
+        canPaginate: this.canPaginate, force: false, page: this.rows, pagResult: this.paginationResult
+      });
     }
   },
 };
diff --git a/shell/mixins/resource-fetch.js b/shell/mixins/resource-fetch.js
index 60f1770e6c7..171bb0a4fbd 100644
--- a/shell/mixins/resource-fetch.js
+++ b/shell/mixins/resource-fetch.js
@@ -60,16 +60,37 @@ export default {
     }
   },
 
+  props: {
+    /**
+     * Add additional filtering to the rows
+     */
+    filterRows: {
+      type:    Function,
+      default: null,
+    },
+  },
+
   computed: {
     ...mapGetters({ refreshFlag: 'resource-fetch/refreshFlag' }),
     rows() {
       const currResource = this.fetchedResourceType.find((item) => item.type === this.resource);
 
       if (currResource) {
-        return this.$store.getters[`${ currResource.currStore }/all`](this.resource);
-      } else {
+        const rows = this.$store.getters[`${ currResource.currStore }/all`](this.resource);
+
+        if (this.canPaginate) {
+          if (this.havePaginated) {
+            return rows;
+          }
+        } else {
+          return rows;
+        }
+
+        // return this.filterRows ? this.filterRows(rows) : rows;
         return [];
       }
+
+      return [];
     },
     loading() {
       if (this.canPaginate) {
@@ -86,7 +107,9 @@ export default {
       if (this.init && neu) {
         await this.$fetch();
         if (this.canPaginate && this.fetchPageSecondaryResources) {
-          this.fetchPageSecondaryResources(true);
+          this.fetchPageSecondaryResources({
+            canPaginate: this.canPaginate, force: true, page: this.rows, pagResult: this.paginationResult
+          });
         }
       }
     }
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index 03f57cd2b1f..a5c34fd1c84 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -1,9 +1,10 @@
-<script>
+<script lang="ts">
+import { defineComponent } from 'vue';
 import { mapPref, AFTER_LOGIN_ROUTE, READ_WHATS_NEW, HIDE_HOME_PAGE_CARDS } from '@shell/store/prefs';
 import { Banner } from '@components/Banner';
 import BannerGraphic from '@shell/components/BannerGraphic';
 import IndentedPanel from '@shell/components/IndentedPanel';
-import SortableTable from '@shell/components/SortableTable';
+import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts, FetchSecondaryResourcesOpts } from '@shell/components/PaginatedResourceTable.vue';
 import { BadgeState } from '@components/BadgeState';
 import CommunityLinks from '@shell/components/CommunityLinks';
 import SingleClusterInfo from '@shell/components/SingleClusterInfo';
@@ -18,19 +19,24 @@ import PageHeaderActions from '@shell/mixins/page-actions';
 import { getVendor } from '@shell/config/private-label';
 import { mapFeature, MULTI_CLUSTER } from '@shell/store/features';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
-import { filterOnlyKubernetesClusters, filterHiddenLocalCluster } from '@shell/utils/cluster';
-import TabTitle from '@shell/components/TabTitle';
+import { paginationFilterClusters } from '@shell/utils/cluster';
+import TabTitle from '@shell/components/TabTitle.vue';
+import { ActionFindPageArgs } from '@shell/types/store/dashboard-store.types';
 
 import { RESET_CARDS_ACTION, SET_LOGIN_ACTION } from '@shell/config/page-actions';
+import { STEVE_NAME_COL, STEVE_STATE_COL } from 'config/pagination-table-headers';
+import { PaginationParamFilter, FilterArgs, PaginationFilterField } from 'types/store/pagination.types';
+import devConsole from 'utils/dev-console';
+import ProvCluster from 'models/provisioning.cattle.io.cluster';
 
-export default {
+export default defineComponent({
   name:       'Home',
   layout:     'home',
   components: {
     Banner,
     BannerGraphic,
     IndentedPanel,
-    SortableTable,
+    PaginatedResourceTable,
     BadgeState,
     CommunityLinks,
     SingleClusterInfo,
@@ -39,102 +45,55 @@ export default {
 
   mixins: [PageHeaderActions],
 
-  fetch() {
-    if ( this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER) ) {
-      this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER });
-    }
-
-    if ( this.$store.getters['management/schemaFor'](MANAGEMENT.CLUSTER) ) {
-      this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER });
-    }
-
-    if ( this.$store.getters['management/canList'](CAPI.MACHINE) ) {
-      this.$store.dispatch('management/findAll', { type: CAPI.MACHINE });
-    }
-
-    if ( this.$store.getters['management/canList'](MANAGEMENT.NODE) ) {
-      this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE });
-    }
-
-    // We need to fetch node pools and node templates in order to correctly show the provider for RKE1 clusters
-    if ( this.$store.getters['management/canList'](MANAGEMENT.NODE_POOL) ) {
-      this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_POOL });
-    }
-
-    if ( this.$store.getters['management/canList'](MANAGEMENT.NODE_TEMPLATE) ) {
-      this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_TEMPLATE });
-    }
-  },
-
   data() {
-    const fullVersion = getVersionInfo(this.$store).fullVersion;
-    // Page actions don't change on the Home Page
-    const pageActions = [
-      {
-        labelKey: 'nav.header.setLoginPage',
-        action:   SET_LOGIN_ACTION
-      },
-      { separator: true },
-      {
-        labelKey: 'nav.header.restoreCards',
-        action:   RESET_CARDS_ACTION
-      },
-    ];
+    const paginationRequestFilters = paginationFilterClusters(this.$store);
 
     return {
       HIDE_HOME_PAGE_CARDS,
-      fullVersion,
-      pageActions,
+      fullVersion: getVersionInfo(this.$store).fullVersion,
+      // Page actions don't change on the Home Page
+      pageActions: [
+        {
+          labelKey: 'nav.header.setLoginPage',
+          action:   SET_LOGIN_ACTION
+        },
+        { separator: true },
+        {
+          labelKey: 'nav.header.restoreCards',
+          action:   RESET_CARDS_ACTION
+        },
+      ],
       vendor: getVendor(),
-    };
-  },
-
-  computed: {
-    ...mapState(['managementReady']),
-    ...mapGetters(['currentCluster', 'defaultClusterId', 'releaseNotesUrl']),
-    mcm: mapFeature(MULTI_CLUSTER),
-
-    provClusters() {
-      return this.$store.getters['management/all'](CAPI.RANCHER_CLUSTER);
-    },
 
-    // User can go to Cluster Management if they can see the cluster schema
-    canManageClusters() {
-      const schema = this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER);
+      paginationRequestFilters,
 
-      return !!schema;
-    },
-
-    canCreateCluster() {
-      const schema = this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER);
+      provClusterSchema: this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER),
 
-      return !!schema?.collectionMethods.find((x) => x.toLowerCase() === 'post');
-    },
+      canViewMgmtClusters:  !!this.$store.getters['management/schemaFor'](MANAGEMENT.CLUSTER),
+      canViewMachine:       !!this.$store.getters['management/canList'](CAPI.MACHINE),
+      canViewMgmtNodes:     !!this.$store.getters['management/canList'](MANAGEMENT.NODE),
+      canViewMgmtPools:     !!this.$store.getters['management/canList'](MANAGEMENT.NODE_POOL),
+      canViewMgmtTemplates: !!this.$store.getters['management/canList'](MANAGEMENT.NODE_TEMPLATE),
 
-    manageLocation() {
-      return {
+      manageLocation: {
         name:   'c-cluster-product-resource',
         params: {
           product:  MANAGER,
           cluster:  BLANK_CLUSTER,
           resource: CAPI.RANCHER_CLUSTER
         },
-      };
-    },
+      },
 
-    createLocation() {
-      return {
+      createLocation: {
         name:   'c-cluster-product-resource-create',
         params: {
           product:  MANAGER,
           cluster:  BLANK_CLUSTER,
           resource: CAPI.RANCHER_CLUSTER
         },
-      };
-    },
+      },
 
-    importLocation() {
-      return {
+      importLocation: {
         name:   'c-cluster-product-resource-create',
         params: {
           product:  MANAGER,
@@ -142,22 +101,9 @@ export default {
           resource: CAPI.RANCHER_CLUSTER
         },
         query: { [MODE]: _IMPORT }
-      };
-    },
-
-    afterLoginRoute: mapPref(AFTER_LOGIN_ROUTE),
-    homePageCards:   mapPref(HIDE_HOME_PAGE_CARDS),
-
-    readWhatsNewAlready() {
-      return readReleaseNotes(this.$store);
-    },
-
-    showSetLoginBanner() {
-      return this.homePageCards?.setLoginPage;
-    },
+      },
 
-    clusterHeaders() {
-      return [
+      headers: [
         STATE,
         {
           name:          'name',
@@ -165,7 +111,7 @@ export default {
           value:         'nameDisplay',
           sort:          ['nameSort'],
           canBeVariable: true,
-          getValue:      (row) => row.mgmt?.nameDisplay
+          getValue:      (row: ProvCluster) => row.mgmt?.nameDisplay
         },
         {
           label:     this.t('landing.clusters.provider'),
@@ -206,12 +152,81 @@ export default {
         //   name:  'explorer',
         //   label:  this.t('landing.clusters.explorer')
         // }
-      ];
+      ],
+
+      paginationHeaders: [
+        STEVE_STATE_COL,
+        {
+          ...STEVE_NAME_COL,
+          canBeVariable: true,
+          // TODO: RC ISSUE describe. search sort on prov meta namespace
+          // getValue:      (row: ProvCluster) => row.mgmt?.nameDisplay || row.metadata?.name
+          getValue:      (row: ProvCluster) => row.metadata?.name
+        },
+        {
+          label:     this.t('landing.clusters.provider'),
+          subLabel:  this.t('landing.clusters.distro'),
+          value:     'mgmt.status.provider',
+          name:      'Provider',
+          sort:      false,
+          search:    false,
+          formatter: 'ClusterProvider'
+        },
+        {
+          label:    this.t('landing.clusters.kubernetesVersion'),
+          subLabel: this.t('landing.clusters.architecture'),
+          name:     'kubernetesVersion',
+          sort:     false,
+          search:   false,
+        },
+        {
+          label:  this.t('tableHeaders.cpu'),
+          value:  '',
+          name:   'cpu',
+          sort:   ['status.allocatable.cpu'],
+          search: false,
+        },
+        {
+          label:  this.t('tableHeaders.memory'),
+          value:  '',
+          name:   'memory',
+          sort:   ['status.allocatable.memory'],
+          search: false,
+        },
+        {
+          label:        this.t('tableHeaders.pods'),
+          name:         'pods',
+          value:        '',
+          sort:         ['status.allocatable.pods'],
+          search:       false,
+          formatter:    'PodsUsage',
+          delayLoading: true
+        },
+      ],
+
+      clusterCount: 0,
+    };
+  },
+
+  computed: {
+    ...mapState(['managementReady']),
+    ...mapGetters(['currentCluster', 'defaultClusterId', 'releaseNotesUrl']),
+    mcm: mapFeature(MULTI_CLUSTER),
+
+    canCreateCluster() {
+      return !!this.provClusterSchema?.collectionMethods.find((x: string) => x.toLowerCase() === 'post');
     },
 
-    kubeClusters() {
-      return filterHiddenLocalCluster(filterOnlyKubernetesClusters(this.provClusters || [], this.$store), this.$store);
-    }
+    afterLoginRoute: mapPref(AFTER_LOGIN_ROUTE),
+    homePageCards:   mapPref(HIDE_HOME_PAGE_CARDS),
+
+    readWhatsNewAlready() {
+      return readReleaseNotes(this.$store);
+    },
+
+    showSetLoginBanner() {
+      return this.homePageCards?.setLoginPage;
+    },
   },
 
   async created() {
@@ -229,11 +244,121 @@ export default {
   },
 
   methods: {
+    fetchSecondaryResources(opts: FetchSecondaryResourcesOpts) {
+      // TODO: RC TEST with pagination off and on
+      if ( this.canViewMgmtClusters ) {
+        this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER });
+      }
+
+      if ( this.canViewMachine ) {
+        this.$store.dispatch('management/findAll', { type: CAPI.MACHINE });
+      }
+
+      if ( this.canViewMgmtNodes ) {
+        this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE });
+      }
+
+      // We need to fetch node pools and node templates in order to correctly show the provider for RKE1 clusters
+      if ( this.canViewMgmtPools ) {
+        this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_POOL });
+      }
+
+      if ( this.canViewMgmtTemplates ) {
+        this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_TEMPLATE });
+      }
+    },
+
+    async fetchPageSecondaryResources({
+      canPaginate, force, page, pagResult
+    }: FetchPageSecondaryResourcesOpts) {
+      if (!canPaginate || !page?.length) {
+        this.clusterCount = 0;
+
+        return;
+      }
+
+      this.clusterCount = pagResult.count;
+
+      if ( this.canViewMgmtClusters ) {
+        const opt: ActionFindPageArgs = {
+          force,
+          pagination: new FilterArgs({
+            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
+              field: 'id',
+              value: r.mgmtClusterId
+            }))),
+          })
+        };
+
+        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.CLUSTER, opt });
+      }
+
+      if ( this.canViewMachine ) {
+        const opt: ActionFindPageArgs = {
+          force,
+          // TODO: RC Validate
+          pagination: new FilterArgs({
+            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
+              field: 'spec.clusterName',
+              value: r.metadata.name
+            }))),
+          })
+        };
+
+        this.$store.dispatch(`management/findPage`, { type: CAPI.MACHINE, opt });
+      }
+
+      if ( this.canViewMgmtNodes ) {
+        const opt: ActionFindPageArgs = {
+          force,
+          // TODO: RC Validate
+          pagination: new FilterArgs({
+            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
+              field: 'id',
+              value: r.mgmtClusterId
+            }))),
+          })
+        };
+
+        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE, opt });
+      }
+
+      // We need to fetch node pools and node templates in order to correctly show the provider for RKE1 clusters
+      if ( this.canViewMgmtPools && this.canViewMgmtTemplates) {
+        const poolOpt: ActionFindPageArgs = {
+          force,
+          // TODO: RC Validate
+          pagination: new FilterArgs({
+            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
+              field: 'spec.clusterName',
+              value: r.status?.clusterName// TODO: handle empty spec
+            }))),
+          })
+        };
+
+        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE_POOL, opt: poolOpt });
+
+        const templateOpt: ActionFindPageArgs = {
+          force,
+          // pagination: new FilterArgs({}),
+          // TODO: RC Validate
+          pagination: new FilterArgs({
+            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
+              field: 'spec.clusterName',
+              value: r.status?.clusterName// TODO: handle empty spec
+            }))),
+          })
+        };
+
+        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE_TEMPLATE, opt: templateOpt });
+      }
+    },
+
     /**
      * Define actions for each navigation link
      * @param {*} action
      */
-    handlePageAction(action) {
+    handlePageAction(action: any) {
       switch (action.action) {
       case RESET_CARDS_ACTION:
         this.resetCards();
@@ -247,21 +372,22 @@ export default {
       }
     },
 
-    cpuUsed(cluster) {
+    cpuUsed(cluster: any) {
       return parseSi(cluster.status.requested?.cpu);
     },
 
-    cpuAllocatable(cluster) {
+    cpuAllocatable(cluster: any) {
       return parseSi(cluster.status.allocatable?.cpu);
     },
-    memoryAllocatable(cluster) {
+
+    memoryAllocatable(cluster: any) {
       const parsedAllocatable = (parseSi(cluster.status.allocatable?.memory) || 0).toString();
       const format = createMemoryFormat(parsedAllocatable);
 
       return formatSi(parsedAllocatable, format);
     },
 
-    memoryReserved(cluster) {
+    memoryReserved(cluster: any) {
       const memValues = createMemoryValues(cluster?.status?.allocatable?.memory, cluster?.status?.requested?.memory);
 
       return `${ memValues.useful }/${ memValues.total } ${ memValues.units }`;
@@ -296,9 +422,10 @@ export default {
       }
     }
   }
-};
+});
 
 </script>
+
 <template>
   <div
     v-if="managementReady"
@@ -369,14 +496,21 @@ export default {
               v-if="mcm"
               class="col span-12"
             >
-              <SortableTable
+              <!-- // TODO: RC check loading indicator when pagination off -->
+              <PaginatedResourceTable
+                :schema="provClusterSchema"
                 :table-actions="false"
                 :row-actions="false"
                 key-field="id"
-                :rows="kubeClusters"
-                :headers="clusterHeaders"
-                :loading="!kubeClusters"
-                :paging="true"
+                :headers="headers"
+                :pagination-headers="paginationHeaders"
+                context="home"
+
+                :namespaced="false"
+                :request-filters="paginationRequestFilters"
+                manualRefreshButtonSize="sm"
+                :fetchSecondaryResources="fetchSecondaryResources"
+                :fetchPageSecondaryResources="fetchPageSecondaryResources"
               >
                 <template #header-left>
                   <div class="row table-heading">
@@ -384,19 +518,19 @@ export default {
                       {{ t('landing.clusters.title') }}
                     </h2>
                     <BadgeState
-                      v-if="kubeClusters"
-                      :label="kubeClusters.length.toString()"
+                      v-if="clusterCount"
+                      :label="clusterCount.toString()"
                       color="role-tertiary ml-20 mr-20"
                     />
                   </div>
                 </template>
                 <template
-                  v-if="canCreateCluster || canManageClusters"
+                  v-if="canCreateCluster || !!provClusterSchema"
                   #header-middle
                 >
                   <div class="table-heading">
                     <router-link
-                      v-if="canManageClusters"
+                      v-if="!!provClusterSchema"
                       :to="manageLocation"
                       class="btn btn-sm role-secondary"
                       data-testid="cluster-management-manage-button"
@@ -487,7 +621,7 @@ export default {
                     {{ t('landing.clusters.explore') }}
                   </button>
                 </template> -->
-              </SortableTable>
+              </PaginatedResourceTable>
             </div>
             <div
               v-else
@@ -502,6 +636,7 @@ export default {
     </IndentedPanel>
   </div>
 </template>
+
 <style lang='scss' scoped>
   .home-panels {
     display: flex;
@@ -591,6 +726,7 @@ export default {
     }
   }
 </style>
+
 <style lang="scss">
 .home-page {
   .search {
diff --git a/shell/plugins/dashboard-store/actions.js b/shell/plugins/dashboard-store/actions.js
index ab063bed970..35514a91750 100644
--- a/shell/plugins/dashboard-store/actions.js
+++ b/shell/plugins/dashboard-store/actions.js
@@ -384,7 +384,7 @@ export default {
     }
 
     // No need to request the resources if we have them already
-    if (!opt.force && getters['havePaginatedPage'](type, opt)) {
+    if (!opt.transient && !opt.force && getters['havePaginatedPage'](type, opt)) {
       return findAllGetter(getters, type, opt);
     }
 
@@ -408,24 +408,26 @@ export default {
       return Promise.reject(e);
     }
 
-    commit('loadPage', {
-      ctx,
-      type,
-      data:       out.data,
-      pagination: opt.pagination ? {
-        request: {
-          namespace:  opt.namespaced,
-          pagination: opt.pagination
-        },
-        result: {
-          count:     out.count,
-          pages:     out.pages || Math.ceil(out.count / (opt.pagination.pageSize || Number.MAX_SAFE_INTEGER)),
-          timestamp: new Date().getTime()
-        }
-      } : undefined,
-    });
+    const pagination = opt.pagination ? {
+      request: {
+        namespace:  opt.namespaced,
+        pagination: opt.pagination
+      },
+      result: {
+        count:     out.count,
+        pages:     out.pages || Math.ceil(out.count / (opt.pagination.pageSize || Number.MAX_SAFE_INTEGER)),
+        timestamp: new Date().getTime()
+      }
+    } : undefined;
 
-    const all = findAllGetter(getters, type, opt);
+    if (!opt.transient) {
+      commit('loadPage', {
+        ctx,
+        type,
+        data: out.data,
+        pagination,
+      });
+    }
 
     if (opt.hasManualRefresh) {
       dispatch('resource-fetch/updateManualRefreshIsLoading', false, { root: true });
@@ -433,7 +435,10 @@ export default {
 
     garbageCollect.gcUpdateLastAccessed(ctx, type);
 
-    return all;
+    return opt.transient ? {
+      data: out.data,
+      pagination
+    } : findAllGetter(getters, type, opt);
   },
 
   async findMatching(ctx, {
diff --git a/shell/plugins/dashboard-store/getters.js b/shell/plugins/dashboard-store/getters.js
index d664941540b..db764a3b0e5 100644
--- a/shell/plugins/dashboard-store/getters.js
+++ b/shell/plugins/dashboard-store/getters.js
@@ -445,9 +445,12 @@ export default {
     return undefined;
   },
 
-  paginationEnabled: (state, getters, rootState, rootGetters) => (type = null) => {
+  paginationEnabled: (state, getters, rootState, rootGetters) => (args) => {
+    const id = typeof args === 'object' ? args.id : args;
+    const context = typeof args === 'object' ? args.context : undefined;
+
     const store = state.config.namespace;
-    const resource = type ? { id: type } : null;
+    const resource = id || context ? { id, context } : null;
 
     return paginationUtils.isEnabled({ rootGetters }, { store, resource });
   }
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index 525faa9fb74..0f8f1cf79fe 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -4,8 +4,10 @@ import { NAMESPACE_FILTER_ALL_SYSTEM, NAMESPACE_FILTER_ALL_USER, NAMESPACE_FILTE
 import Namespace from '@shell/models/namespace';
 import { uniq } from '@shell/utils/array';
 import {
+  CAPI,
   CONFIG_MAP, MANAGEMENT, NAMESPACE, NODE, POD
 } from '@shell/config/types';
+import { CAPI as CAPI_LABELS } from '@shell/config/labels-annotations';
 import { Schema } from '@shell/plugins/steve/schema';
 
 class NamespaceProjectFilters {
@@ -107,8 +109,8 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     '': [// all types
       { field: 'metadata.name' },
       { field: 'metadata.namespace' },
-      // { field: 'id' }, // Pending API support
-      // { field: 'metadata.state.name' }, // Pending API support
+      { field: 'id' },
+      { field: 'metadata.state.name' },
       { field: 'metadata.creationTimestamp' },
     ],
     [NODE]: [
@@ -122,11 +124,33 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     [MANAGEMENT.NODE]: [
       { field: 'status.nodeName' },
     ],
+    [MANAGEMENT.NODE_POOL]: [
+      { field: 'spec.clusterName' }, // TODO: RC TEST
+    ],
+    [MANAGEMENT.NODE_TEMPLATE]: [
+      { field: 'spec.clusterName' }, // TODO: RC TEST
+    ],
+    [MANAGEMENT.CLUSTER]: [
+      // { field: 'spec.internal' }, // Pending API support https://github.com/rancher/rancher/issues/48011
+      // { field: 'spec.displayName' }, // Pending API support https://github.com/rancher/rancher/issues/48011
+    ],
     [CONFIG_MAP]: [
       { field: 'metadata.labels[harvesterhci.io/cloud-init-template]' }
     ],
     [NAMESPACE]: [
       { field: 'metadata.labels[field.cattle.io/projectId]' }
+    ],
+    [CAPI.MACHINE]: [
+      { field: 'spec.clusterName' } // TODO: RC TEST
+    ],
+    [CAPI.RANCHER_CLUSTER]: [
+      { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` }, // TODO: RC TEST
+      { field: `status.provider` }, // TODO: RC TEST
+      { field: 'status.allocatable.cpu' }, // TODO: RC TEST
+      { field: 'status.allocatable.memory' }, // TODO: RC TEST
+      { field: 'status.allocatable.pods' }, // TODO: RC TEST
+
+      // { field: 'status.clusterName' }, // Pending API support https://github.com/rancher/rancher/issues/48011
     ]
   }
 
diff --git a/shell/types/resources/settings.d.ts b/shell/types/resources/settings.d.ts
index 800467f0c96..7259b1097c0 100644
--- a/shell/types/resources/settings.d.ts
+++ b/shell/types/resources/settings.d.ts
@@ -20,7 +20,7 @@ export interface PaginationSettings {
           /**
            * Specific resource type to enable
            */
-          enabled: string[],
+          enabled: (string | { resource: string, context: string[]})[],
           /**
            * There's no hardcoded headers or custom list for the resource type, headers will be generated from schema attributes.columns
            */
diff --git a/shell/types/store/pagination.types.ts b/shell/types/store/pagination.types.ts
index 716c7c3d9ff..356cbe4b4b7 100644
--- a/shell/types/store/pagination.types.ts
+++ b/shell/types/store/pagination.types.ts
@@ -455,3 +455,16 @@ export interface StorePagination {
    */
   result: StorePaginationResult
 }
+
+/**
+ * The resource and context that the pagination request will be used
+ *
+ * Used to determine if the request is supported
+*/
+export interface PaginationResourceContext {
+  store: string,
+  resource?: {
+    id: string,
+    context?: string,
+  }
+}
diff --git a/shell/types/store/vuex.d.ts b/shell/types/store/vuex.d.ts
index afcea5579ce..4d0fe8a47d8 100644
--- a/shell/types/store/vuex.d.ts
+++ b/shell/types/store/vuex.d.ts
@@ -7,3 +7,11 @@
 export interface VuexStoreGetters {
   [name:string]: Function
 }
+
+export interface VuexStore {
+  getters: VuexStoreGetters,
+  dispatch: any,
+
+  // When we have exact properties above we can remove below
+  [name:string]: any
+}
diff --git a/shell/utils/cluster.js b/shell/utils/cluster.js
index 8379497d14b..df502bbeb74 100644
--- a/shell/utils/cluster.js
+++ b/shell/utils/cluster.js
@@ -3,8 +3,87 @@ import { camelToTitle } from '@shell/utils/string';
 import { CAPI } from '@shell/config/labels-annotations';
 import { MANAGEMENT, VIRTUAL_HARVESTER_PROVIDER } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
+import { PaginationFilterField, PaginationParamFilter } from 'types/store/pagination.types';
 
-// Filter out any clusters that are not Kubernetes Clusters
+/**
+ * Combination of paginationFilterHiddenLocalCluster and paginationFilterOnlyKubernetesClusters
+ *
+ * @param {*} store
+ * @returns PaginationParam[]
+ */
+export function paginationFilterClusters(store) {
+  // TODO: RC TEST both facets
+  const paginationRequestFilters = [];
+  const pFilterOnlyKubernetesClusters = paginationFilterOnlyKubernetesClusters(store);
+  const pFilterHiddenLocalCluster = paginationFilterHiddenLocalCluster(store);
+
+  if (pFilterOnlyKubernetesClusters) {
+    paginationRequestFilters.push(pFilterOnlyKubernetesClusters);
+  }
+  if (pFilterHiddenLocalCluster) {
+    paginationRequestFilters.push(pFilterHiddenLocalCluster);
+  }
+
+  return paginationRequestFilters;
+}
+
+/**
+ * The vai backed api's `filter` equivalent of `filterHiddenLocalCluster`
+ *
+ * @export
+ * @param {*} store
+ * @returns PaginationParam | null
+ */
+export function paginationFilterHiddenLocalCluster(store) {
+  const hideLocalSetting = store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.HIDE_LOCAL_CLUSTER) || {};
+  const value = hideLocalSetting.value || hideLocalSetting.default || 'false';
+  const hideLocal = value === 'true';
+
+  if (!hideLocal) {
+    return null;
+  }
+
+  return PaginationParamFilter.createMultipleFields([
+    new PaginationFilterField({
+      field: `spec.internal`, // Pending API support https://github.com/rancher/rancher/issues/48011
+      value: false,
+    }),
+  ]);
+}
+
+/**
+ * The vai backed api's `filter` equivalent of `filterOnlyKubernetesClusters`
+ *
+ * @export
+ * @param {*} store
+ * @returns PaginationParam | null
+ */
+export function paginationFilterOnlyKubernetesClusters(store) {
+  const openHarvesterContainerWorkload = store.getters['features/get']('harvester-baremetal-container-workload');
+
+  if (!openHarvesterContainerWorkload) {
+    return null;
+  }
+
+  return PaginationParamFilter.createMultipleFields([
+    new PaginationFilterField({
+      field:  `metadata.labels."${ CAPI.PROVIDER }"`, // TODO: TEST
+      equals: false,
+      value:  VIRTUAL_HARVESTER_PROVIDER,
+      exact:  true
+    }),
+    new PaginationFilterField({
+      field:  `status.provider`, // TODO: TEST
+      equals: false,
+      value:  VIRTUAL_HARVESTER_PROVIDER,
+      exact:  true
+    }),
+  ]);
+}
+
+/**
+ * Filter out any clusters that are not Kubernetes Clusters
+ **/
 export function filterOnlyKubernetesClusters(mgmtClusters, store) {
   const openHarvesterContainerWorkload = store.getters['features/get']('harvester-baremetal-container-workload');
 
diff --git a/shell/utils/pagination-utils.ts b/shell/utils/pagination-utils.ts
index 44fc155c1a2..db40dc104a3 100644
--- a/shell/utils/pagination-utils.ts
+++ b/shell/utils/pagination-utils.ts
@@ -9,7 +9,7 @@ import {
   NAMESPACE_FILTER_NS_FULL_PREFIX,
   NAMESPACE_FILTER_P_FULL_PREFIX,
 } from '@shell/utils/namespace-filter';
-import { PaginationArgs, PaginationParam, PaginationSort } from '@shell/types/store/pagination.types';
+import { PaginationArgs, PaginationResourceContext, PaginationParam, PaginationSort } from '@shell/types/store/pagination.types';
 import { sameArrayObjects } from '@shell/utils/array';
 import { isEqual } from '@shell/utils/object';
 import { STEVE_CACHE } from '@shell/store/features';
@@ -40,12 +40,7 @@ class PaginationUtils {
   /**
    * Is pagination enabled at a global level or for a specific resource
    */
-  isEnabled({ rootGetters }: any, enabledFor: {
-    store: string,
-    resource?: {
-      id: string,
-    }
-  }) {
+  isEnabled({ rootGetters }: any, enabledFor: PaginationResourceContext) {
     // Cache must be enabled to support pagination api
     if (!this.isSteveCacheEnabled({ rootGetters })) {
       return false;
@@ -95,7 +90,21 @@ class PaginationUtils {
       return true;
     }
 
-    if (storeSettings.resources.enableSome.enabled.includes(enabledFor.resource.id)) {
+    if (storeSettings.resources.enableSome.enabled.find((setting) => {
+      if (typeof setting === 'string') {
+        return setting === enabledFor.resource?.id;
+      }
+
+      if (setting.resource === enabledFor.resource?.id) {
+        if (!!setting.context) {
+          return enabledFor.resource?.context ? setting.context.includes(enabledFor.resource.context) : false;
+        }
+
+        return true;
+      }
+
+      return false;
+    })) {
       return true;
     }
 
diff --git a/shell/utils/pagination-wrapper.ts b/shell/utils/pagination-wrapper.ts
new file mode 100644
index 00000000000..771d61d69c6
--- /dev/null
+++ b/shell/utils/pagination-wrapper.ts
@@ -0,0 +1,57 @@
+import paginationUtils from '@shell/utils/pagination-utils';
+import { PaginationArgs, PaginationResourceContext, StorePagination } from 'types/store/pagination.types';
+import { VuexStore } from 'types/store/vuex';
+
+interface Result<T> {
+  data: Array<T>
+  pagination: StorePagination
+}
+
+class PaginationWrapper<T = any> {
+    private $store: VuexStore;
+    private enabledFor: PaginationResourceContext;
+    private onUpdate: (out: Result<T>) => void; // TODO: RC wire in to web socket (when new socket stuff is available)
+
+    public isEnabled: boolean;
+
+    constructor({
+      $store,
+      enabledFor,
+      onUpdate,
+    }: {
+        $store: VuexStore,
+        onUpdate: (res: Result<T>) => void,
+        enabledFor: PaginationResourceContext,
+    }) {
+      this.$store = $store;
+      this.isEnabled = paginationUtils.isEnabled({ rootGetters: $store.getters }, enabledFor);
+      this.enabledFor = enabledFor;
+      this.onUpdate = onUpdate;
+    }
+
+    async request(args: {
+        pagination: PaginationArgs,
+        classify?: boolean,
+    }): Promise<Result<T>> {
+      if (!this.isEnabled) {
+        throw new Error(`Wrapper for type '${ this.enabledFor.store }/${ this.enabledFor.resource?.id }' in context '${ this.enabledFor.resource?.context }' not supported`);
+      }
+      const { pagination, classify: doClassify } = args;
+      const opt = {
+        transient: true,
+        pagination
+      };
+
+      const out: Result<T> = await this.$store.dispatch(`${ this.enabledFor.store }/findPage`, { opt, type: this.enabledFor.resource?.id });
+
+      if (doClassify) {
+        for (let i = 0; i < out.data.length; i++) {
+          out.data[i] = await this.$store.dispatch(`${ this.enabledFor.store }/create`, out.data[i]);
+        }
+      }
+
+      return out;
+    }
+}
+
+export default PaginationWrapper;

From 6bfc45d97806c3309e56de943c9a452ff6cdd38b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 14 Nov 2024 17:05:34 +0000
Subject: [PATCH 10/76] fixes after merge. apply PagResTable to node list, vue3
 fixes

---
 shell/components/PaginatedResourceTable.vue   |   2 +-
 shell/components/SortableTable/index.vue      |   4 +-
 shell/list/node.vue                           | 130 ++++++++++--------
 .../pages/c/_cluster/settings/performance.vue |   2 +-
 4 files changed, 75 insertions(+), 63 deletions(-)

diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
index b296cd7bcec..6496ffd64f8 100644
--- a/shell/components/PaginatedResourceTable.vue
+++ b/shell/components/PaginatedResourceTable.vue
@@ -78,7 +78,7 @@ export default defineComponent({
   async fetch() {
     await this.$fetchType(this.resource, [], this.inStore);
 
-    if (this.canPaginate && this.fetchSecondaryResources) {
+    if (!this.canPaginate && this.fetchSecondaryResources) {
       await this.fetchSecondaryResources({ });
     }
   },
diff --git a/shell/components/SortableTable/index.vue b/shell/components/SortableTable/index.vue
index bb22f1d2683..6449ff9819f 100644
--- a/shell/components/SortableTable/index.vue
+++ b/shell/components/SortableTable/index.vue
@@ -23,6 +23,7 @@ import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { getParent } from '@shell/utils/dom';
 import { FORMATTERS } from '@shell/components/SortableTable/sortable-config';
 import ButtonMultiAction from '@shell/components/ButtonMultiAction.vue';
+import devConsole from 'utils/dev-console';
 
 // Uncomment for table performance debugging
 // import tableDebug from './debug';
@@ -496,6 +497,7 @@ export default {
 
     loading: {
       handler(neu, old) {
+        devConsole.warn('SS', 'watch', 'loading', neu, old);
         // Always ensure the Refresh button phase aligns with loading state (to ensure external phase changes which can then reset the internal phase changed by click)
         this.refreshButtonPhase = neu ? ASYNC_BUTTON_STATES.WAITING : ASYNC_BUTTON_STATES.ACTION;
 
@@ -504,7 +506,7 @@ export default {
           if (neu) {
             this._altLoadingDelayTimer = setTimeout(() => {
               this.isLoading = true;
-            }, 200); // this should be higher than the targetted quick response
+            }, 200); // this should be higher than the targeted quick response
           } else {
             clearTimeout(this._altLoadingDelayTimer);
             this.isLoading = false;
diff --git a/shell/list/node.vue b/shell/list/node.vue
index 0c0595320b3..0587a5d754a 100644
--- a/shell/list/node.vue
+++ b/shell/list/node.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import ResourceTable from '@shell/components/ResourceTable.vue';
+import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts } from '@shell/components/PaginatedResourceTable.vue';
 import Tag from '@shell/components/Tag.vue';
 import { Banner } from '@components/Banner';
 import { PODS } from '@shell/config/table-headers';
@@ -21,16 +21,18 @@ import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import { mapGetters } from 'vuex';
-import { FetchPageSecondaryResourcesOpts } from 'components/PaginatedResourceTable.vue';
+import devConsole from 'utils/dev-console';
 
 export default defineComponent({
-  name:       'ListNode',
+  name: 'ListNode',
+
   components: {
-    ResourceTable,
+    PaginatedResourceTable,
     Tag,
     Banner
   },
-  mixins: [metricPoller, ResourceFetch],
+
+  mixins: [metricPoller],
 
   props: {
     resource: {
@@ -54,15 +56,6 @@ export default defineComponent({
     }
   },
 
-  async fetch() {
-    this.$initializeFetchData(this.resource);
-
-    await allHash({
-      kubeNodes: this.$fetchType(this.resource),
-      ...this.fetchSecondaryResources(),
-    });
-  },
-
   data() {
     return {
       // Pods required for `Pods` column's running pods metrics
@@ -91,38 +84,27 @@ export default defineComponent({
 
   computed: {
     ...mapGetters(['currentCluster']),
+
+    kubeNodes() {
+      // Note if server side pagination is used this is only the current page
+      return this.$store.getters[`cluster/all`](this.resource);
+    },
+
     hasWindowsNodes() {
       // Note if server side pagination is used this is only applicable to the current page
-      return (this.rows || []).some((node: any) => node.status.nodeInfo.operatingSystem === 'windows');
+      return (this.kubeNodes || []).some((node: any) => node.status.nodeInfo.operatingSystem === 'windows');
     },
 
     tableGroup: mapPref(GROUP_RESOURCES),
 
-    headers() {
-      // This is all about adding the pods column... if the user can see pods
+    canPaginate() {
+      const args = { id: this.resource?.id || this.resource };
 
-      if (this.canPaginate) {
-        const paginationHeaders = [...this.$store.getters['type-map/headersFor'](this.schema, true)];
-
-        if (paginationHeaders) {
-          if (this.canViewPods) {
-            paginationHeaders.splice(paginationHeaders.length - 1, 0, {
-              ...PODS,
-              breakpoint: COLUMN_BREAKPOINTS.DESKTOP,
-              sort:       false,
-              search:     false,
-              getValue:   (row: any) => row.podConsumedUsage
-            });
-          }
-
-          return paginationHeaders;
-        } else {
-          console.warn('Nodes list expects pagination headers but none found'); // eslint-disable-line no-console
-
-          return [];
-        }
-      }
+      return this.resource && this.$store.getters[`cluster/paginationEnabled`]?.(args);
+    },
 
+    headers() {
+      // This is all about adding the pods column... if the user can see pods
       const headers = [...this.$store.getters['type-map/headersFor'](this.schema, false)];
 
       if (this.canViewPods) {
@@ -135,6 +117,34 @@ export default defineComponent({
 
       return headers;
     },
+
+    paginationHeaders() {
+      // This is all about adding the pods column... if the user can see pods
+
+      if (!this.canPaginate) {
+        return [];
+      }
+
+      const paginationHeaders = [...this.$store.getters['type-map/headersFor'](this.schema, true)];
+
+      if (paginationHeaders) {
+        if (this.canViewPods) {
+          paginationHeaders.splice(paginationHeaders.length - 1, 0, {
+            ...PODS,
+            breakpoint: COLUMN_BREAKPOINTS.DESKTOP,
+            sort:       false,
+            search:     false,
+            getValue:   (row: any) => row.podConsumedUsage
+          });
+        }
+
+        return paginationHeaders;
+      } else {
+        console.warn('Nodes list expects pagination headers but none found'); // eslint-disable-line no-console
+
+        return [];
+      }
+    },
   },
 
   methods: {
@@ -144,7 +154,7 @@ export default defineComponent({
       }
 
       if (this.canPaginate) {
-        if (!this.rows.length) {
+        if (!this.kubeNodes.length) {
           return;
         }
 
@@ -152,7 +162,7 @@ export default defineComponent({
           force:      true,
           pagination: new FilterArgs({
             filters: new PaginationParamFilter({
-              fields: this.rows.map((r: any) => new PaginationFilterField({
+              fields: this.kubeNodes.map((r: any) => new PaginationFilterField({
                 field: 'metadata.name',
                 value: r.id
               }))
@@ -179,27 +189,25 @@ export default defineComponent({
     },
 
     fetchSecondaryResources(): { [key: string]: Promise<any>} {
-      if (this.canPaginate) {
-        return {};
-      }
+      devConsole.warn('node', 'methods', 'fetchSecondaryResources');
 
       const hash: { [key: string]: Promise<any>} = {};
 
       if (this.canViewMgmtNodes) {
-        hash.mgmtNodes = this.$fetchType(MANAGEMENT.NODE, [], 'management');
+        hash.mgmtNodes = this.$store.dispatch(`management/findAll`, { type: MANAGEMENT.NODE });
       }
 
       if (this.canViewNormanNodes) {
-        hash.normanNodes = this.$fetchType(NORMAN.NODE, [], 'rancher');
+        hash.normanNodes = this.$store.dispatch(`rancher/findAll`, { type: NORMAN.NODE });
       }
 
       if (this.canViewMachines) {
-        hash.machines = this.$fetchType(CAPI.MACHINE, [], 'management');
+        hash.machines = this.$store.dispatch(`management/findAll`, { type: CAPI.MACHINE });
       }
 
       if (this.canViewPods) {
         // No need to block on this
-        this.$fetchType(POD);
+        this.$store.dispatch(`cluster/findAll`, { type: POD });
       }
 
       return hash;
@@ -208,16 +216,23 @@ export default defineComponent({
     /**
      * Nodes columns need other resources in order to show data in some columns
      *
-     * In the paginated world we want to resrict the fetch of those resources to only the one's we need
+     * In the paginated world we want to restrict the fetch of those resources to only the one's we need
      *
      * So when we have a page.... use those entries as filters when fetching the other resources
      */
     async fetchPageSecondaryResources({ canPaginate, force, page }: FetchPageSecondaryResourcesOpts) {
+      devConsole.warn('node', 'methods', 'fetchPageSecondaryResources');
+
       if (!page?.length) {
         return;
       }
 
       if (this.canViewMgmtNodes && this.canViewNormanNodes) {
+        if (this.canViewNormanNodes) {
+          // Ideally we only fetch the nodes we need....
+          this.$store.dispatch(`rancher/findAll`, { type: NORMAN.NODE });
+        }
+
         // We only fetch mgmt node to get norman node. We only fetch node to get node actions
         // See https://github.com/rancher/dashboard/issues/10743
         const opt: ActionFindPageArgs = {
@@ -230,10 +245,7 @@ export default defineComponent({
           })
         };
 
-        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE, opt })
-          .then(() => {
-            this.$store.dispatch(`rancher/findAll`, { type: NORMAN.NODE, opt: { force } });
-          });
+        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE, opt });
       }
 
       if (this.canViewMachines) {
@@ -296,21 +308,19 @@ export default defineComponent({
       color="info"
       :label="t('cluster.custom.registrationCommand.windowsWarning')"
     />
-    <ResourceTable
+    <PaginatedResourceTable
       v-bind="$attrs"
       :schema="schema"
       :headers="headers"
-      :rows="rows"
+      :paginationHeaders="paginationHeaders"
       :sub-rows="true"
-      :loading="loading"
+      :fetchSecondaryResources="fetchSecondaryResources"
+      :fetchPageSecondaryResources="fetchPageSecondaryResources"
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-      :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
       data-testid="cluster-node-list"
-      :external-pagination-enabled="canPaginate"
-      :external-pagination-result="paginationResult"
-      @pagination-changed="paginationChanged"
     >
       <template #sub-row="{fullColspan, row, onRowMouseEnter, onRowMouseLeave}">
+        <!-- TODO: RC TEST -->
         <tr
           class="taints sub-row"
           :class="{'empty-taints': ! row.displayTaintsAndLabels}"
@@ -371,7 +381,7 @@ export default defineComponent({
           </td>
         </tr>
       </template>
-    </ResourceTable>
+    </PaginatedResourceTable>
   </div>
 </template>
 
diff --git a/shell/pages/c/_cluster/settings/performance.vue b/shell/pages/c/_cluster/settings/performance.vue
index c3120b55111..d0c5c6e8ca6 100644
--- a/shell/pages/c/_cluster/settings/performance.vue
+++ b/shell/pages/c/_cluster/settings/performance.vue
@@ -191,7 +191,7 @@ export default {
     },
 
     setDefaults() {
-      Vue.set(this, 'value', { ...DEFAULT_PERF_SETTING });
+      this.value = { ...DEFAULT_PERF_SETTING };
     }
   },
 };

From 1f61ce53cf581ecb92719f616f286f9f8a026914 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 15 Nov 2024 15:40:00 +0000
Subject: [PATCH 11/76] - Fix issue where list components containing
 PaginatedResourceTables would incorrectly fetch all resources anyway -
 convert reminaing storage lists

---
 shell/components/PaginatedResourceTable.vue   |  4 +-
 shell/components/ResourceList/index.vue       |  6 ++
 shell/config/product/explorer.js              | 40 +++++++++++-
 shell/config/settings.ts                      | 16 ++++-
 shell/config/table-headers.js                 | 15 +++--
 shell/list/node.vue                           |  2 -
 shell/list/persistentvolume.vue               | 62 +++++++++++++------
 shell/list/persistentvolumeclaim.vue          | 18 +-----
 shell/models/persistentvolume.js              |  4 +-
 shell/models/storage.k8s.io.storageclass.js   |  4 ++
 .../pages/c/_cluster/settings/performance.vue | 11 ++--
 shell/plugins/steve/steve-pagination-utils.ts | 17 ++++-
 12 files changed, 144 insertions(+), 55 deletions(-)

diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
index 6496ffd64f8..2096659c845 100644
--- a/shell/components/PaginatedResourceTable.vue
+++ b/shell/components/PaginatedResourceTable.vue
@@ -10,6 +10,8 @@ export type FetchSecondaryResources = (opts: FetchSecondaryResourcesOpts) => Pro
 export type FetchPageSecondaryResourcesOpts = { canPaginate: boolean, force: boolean, page: any[], pagResult: StorePaginationResult }
 export type FetchPageSecondaryResources = (opts: FetchPageSecondaryResourcesOpts) => Promise<any>
 
+export const PAGINATED_RESOURCE_TABLE_NAME = 'PaginatedResourceTable';
+
 /**
  * This is meant to enable ResourceList like capabilities outside of List pages / components
  *
@@ -21,7 +23,7 @@ export type FetchPageSecondaryResources = (opts: FetchPageSecondaryResourcesOpts
  *
  */
 export default defineComponent({
-  name: 'PaginatedResourceTable',
+  name: PAGINATED_RESOURCE_TABLE_NAME,
 
   components: { ResourceTable },
 
diff --git a/shell/components/ResourceList/index.vue b/shell/components/ResourceList/index.vue
index cfa4487ff1b..e75dfc921e2 100644
--- a/shell/components/ResourceList/index.vue
+++ b/shell/components/ResourceList/index.vue
@@ -9,6 +9,7 @@ import { ResourceListComponentName } from './resource-list.config';
 import { PanelLocation, ExtensionPoint } from '@shell/core/types';
 import ExtensionPanel from '@shell/components/ExtensionPanel';
 import { sameContents } from '@shell/utils/array';
+import { PAGINATED_RESOURCE_TABLE_NAME } from 'components/PaginatedResourceTable.vue';
 
 export default {
   name: ResourceListComponentName,
@@ -67,6 +68,11 @@ export default {
         this.loadResources = loadResources || [resource];
         this.loadIndeterminate = loadIndeterminate || false;
       }
+
+      // If the custom component contains the paginated resource table it'll control the fetching
+      if (component?.components?.[PAGINATED_RESOURCE_TABLE_NAME]) {
+        this.componentWillFetch = true;
+      }
     }
 
     if ( !this.componentWillFetch ) {
diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index 712515ddb43..a73678f28cc 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -31,6 +31,7 @@ import {
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 import { STEVE_CACHE } from '@shell/store/features';
 import { configureConditionalDepaginate } from '@shell/store/type-map.utils';
+import { STORAGE } from 'config/labels-annotations';
 
 export const NAME = 'explorer';
 
@@ -216,7 +217,26 @@ export function init(store) {
    */
   configureType(MANAGEMENT.PSA, { localOnly: true });
 
-  headers(PV, [STATE, NAME_COL, RECLAIM_POLICY, PERSISTENT_VOLUME_CLAIM, PERSISTENT_VOLUME_SOURCE, PV_REASON, AGE]);
+  headers(PV,
+    [STATE, NAME_COL, RECLAIM_POLICY, PERSISTENT_VOLUME_CLAIM, PERSISTENT_VOLUME_SOURCE, PV_REASON, AGE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAME_COL,
+      { ...RECLAIM_POLICY },
+      {
+        // TODO: RC Regression
+        ...PERSISTENT_VOLUME_CLAIM,
+        sort:   ['metadata.fields.5'], // TODO: RC should be spec.volumeName of PVC --> PV, this is PV --> PVC
+        search: ['metadata.fields.5'],
+      }, {
+        // TODO: RC Regression
+        ...PERSISTENT_VOLUME_SOURCE,
+        sort:   false,
+        search: false,
+      }, { ...PV_REASON },
+      STEVE_AGE_COL,
+    ]
+  );
 
   headers(CONFIG_MAP,
     [NAME_COL, NAMESPACE_COL, KEYS, AGE],
@@ -432,7 +452,23 @@ export function init(store) {
     ...DESCRIPTION,
     width: undefined
   }, AGE]);
-  headers(STORAGE_CLASS, [STATE, NAME_COL, STORAGE_CLASS_PROVISIONER, STORAGE_CLASS_DEFAULT, AGE]);
+  headers(STORAGE_CLASS,
+    [STATE, NAME_COL, STORAGE_CLASS_PROVISIONER, STORAGE_CLASS_DEFAULT, AGE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAME_COL,
+      {
+        ...STORAGE_CLASS_PROVISIONER,
+        sort:   ['provisioner'],
+        search: ['provisioner']
+      },
+      {
+        ...STORAGE_CLASS_DEFAULT,
+        sort: [`annotations."${ STORAGE.DEFAULT_STORAGE_CLASS }"`],
+      },
+      STEVE_AGE_COL
+    ]
+  );
 
   configureType(MANAGEMENT.CLUSTER_ROLE_TEMPLATE_BINDING, {
     listGroups: [
diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index 6c03c17a9c3..11b131c322f 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -2,7 +2,13 @@
 import { GC_DEFAULTS, GC_PREFERENCES } from '@shell/utils/gc/gc-types';
 import { PaginationSettings } from '@shell/types/resources/settings';
 import {
-  CAPI, MANAGEMENT, EVENT, CATALOG, HPA, INGRESS, SERVICE
+  CAPI, MANAGEMENT, EVENT, CATALOG, HPA, INGRESS, SERVICE,
+  CONFIG_MAP,
+  SECRET,
+  POD, NODE,
+  STORAGE_CLASS,
+  PVC,
+  PV
 } from '@shell/config/types';
 
 interface GlobalSettingRuleset {
@@ -257,7 +263,13 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
         resources: {
           enableAll:  false,
           enableSome: {
-            enabled: ['configmap', 'secret', 'pod', 'node', EVENT, CATALOG.APP, CATALOG.CLUSTER_REPO, CATALOG.OPERATION, HPA, INGRESS, SERVICE],
+            enabled: [
+              POD, NODE, EVENT,
+              CATALOG.APP, CATALOG.CLUSTER_REPO, CATALOG.OPERATION,
+              HPA, INGRESS, SERVICE,
+              PV, STORAGE_CLASS, CONFIG_MAP, PVC, SECRET
+            ],
+
             generic: true,
           }
         }
diff --git a/shell/config/table-headers.js b/shell/config/table-headers.js
index 3fdc317af85..c4378c8f429 100644
--- a/shell/config/table-headers.js
+++ b/shell/config/table-headers.js
@@ -1,6 +1,7 @@
-import { CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations';
+import { CATTLE_PUBLIC_ENDPOINTS, STORAGE } from '@shell/config/labels-annotations';
 import { NODE as NODE_TYPE } from '@shell/config/types';
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
+import devConsole from 'utils/dev-console';
 
 // Note: 'id' is always the last sort, so you don't have to specify it here.
 
@@ -82,7 +83,7 @@ export const EFFECT = {
 export const STORAGE_CLASS_PROVISIONER = {
   name:     'storage_class_provisioner',
   labelKey: 'tableHeaders.storage_class_provisioner',
-  value:    'provisionerDisplay',
+  value:    'provisionerListDisplay',
   sort:     ['provisioner'],
 };
 
@@ -94,6 +95,9 @@ export const STORAGE_CLASS_DEFAULT = {
   formatter: 'Checked',
 };
 
+/**
+ * spec.csi.driver OR spec[known driver type]
+ */
 export const PERSISTENT_VOLUME_SOURCE = {
   name:     'persistent_volume_source',
   labelKey: 'tableHeaders.persistentVolumeSource',
@@ -101,13 +105,16 @@ export const PERSISTENT_VOLUME_SOURCE = {
   sort:     ['provisioner'],
 };
 
+/**
+ * Link to the PVC associated with PV
+ */
 export const PERSISTENT_VOLUME_CLAIM = {
   name:          'persistent-volume-claim',
   labelKey:      'tableHeaders.persistentVolumeClaim',
-  sort:          ['nameSort'],
+  sort:          ['claimName'],
   value:         'claimName',
   formatter:     'LinkDetail',
-  formatterOpts: { reference: 'claim.detailLocation' },
+  formatterOpts: { reference: 'claim.detailLocation' }
 };
 
 export const OUTPUT = {
diff --git a/shell/list/node.vue b/shell/list/node.vue
index 0587a5d754a..e1dcb94f765 100644
--- a/shell/list/node.vue
+++ b/shell/list/node.vue
@@ -15,11 +15,9 @@ import {
   CAPI,
   MANAGEMENT, METRIC, NODE, NORMAN, POD
 } from '@shell/config/types';
-import { allHash } from '@shell/utils/promise';
 import { GROUP_RESOURCES, mapPref } from '@shell/store/prefs';
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 
-import ResourceFetch from '@shell/mixins/resource-fetch';
 import { mapGetters } from 'vuex';
 import devConsole from 'utils/dev-console';
 
diff --git a/shell/list/persistentvolume.vue b/shell/list/persistentvolume.vue
index 3bb6c697bb9..c126e4c5897 100644
--- a/shell/list/persistentvolume.vue
+++ b/shell/list/persistentvolume.vue
@@ -1,13 +1,16 @@
-<script>
-import ResourceTable from '@shell/components/ResourceTable';
+<script lang="ts">
+import { defineComponent } from 'vue';
+import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts } from '@shell/components/PaginatedResourceTable.vue';
 import { PVC } from '@shell/config/types';
-import ResourceFetch from '@shell/mixins/resource-fetch';
+import { ActionFindPageArgs } from '@shell/types/store/dashboard-store.types';
+import { FilterArgs, PaginationFilterField, PaginationParamFilter } from '@shell/types/store/pagination.types';
 
-export default {
-  name:       'ListPersistentVolume',
-  components: { ResourceTable },
-  mixins:     [ResourceFetch],
-  props:      {
+export default defineComponent({
+  name: 'ListPersistentVolume',
+
+  components: { PaginatedResourceTable },
+
+  props: {
     resource: {
       type:     String,
       required: true,
@@ -24,23 +27,44 @@ export default {
     }
   },
 
-  async fetch() {
-    this.$initializeFetchData(this.resource);
+  methods: {
+    fetchSecondaryResources(): { [key: string]: Promise<any>} {
+      return { pvc: this.$store.dispatch(`cluster/findAll`, { type: PVC }) };
+    },
+
+    /**
+     * PV columns need other resources in order to show data in some columns
+     *
+     * So when we have a page.... use those entries as filters when fetching the other resources
+     */
+    async fetchPageSecondaryResources({ canPaginate, force, page }: FetchPageSecondaryResourcesOpts) {
+      if (!page?.length) {
+        return;
+      }
+
+      const opt: ActionFindPageArgs = {
+        force,
+        pagination: new FilterArgs({
+          filters: [],
+          // Pending API support https://github.com/rancher/rancher/issues/48103
+          // filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
+          //   field: 'spec.volumeName', // TODO: RC id??
+          //   value: r.metadata.name
+          // }))),
+        })
+      };
 
-    this.$fetchType(PVC);
-    await this.$fetchType(this.resource);
+      return this.$store.dispatch(`cluster/findPage`, { type: PVC, opt });
+    },
   }
-};
+});
 </script>
 
 <template>
-  <ResourceTable
+  <PaginatedResourceTable
     :schema="schema"
-    :rows="rows"
-    :headers="$attrs.headers"
-    :group-by="$attrs.groupBy"
-    :loading="loading"
+    :fetchSecondaryResources="fetchSecondaryResources"
+    :fetchPageSecondaryResources="fetchPageSecondaryResources"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-    :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
   />
 </template>
diff --git a/shell/list/persistentvolumeclaim.vue b/shell/list/persistentvolumeclaim.vue
index d6f872196f4..6491ee82236 100644
--- a/shell/list/persistentvolumeclaim.vue
+++ b/shell/list/persistentvolumeclaim.vue
@@ -1,12 +1,9 @@
 <script>
-import ResourceTable from '@shell/components/ResourceTable';
-import { STORAGE_CLASS } from '@shell/config/types';
-import ResourceFetch from '@shell/mixins/resource-fetch';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
 
 export default {
   name:       'ListPersistentVolumeClaim',
-  components: { ResourceTable },
-  mixins:     [ResourceFetch],
+  components: { PaginatedResourceTable },
   props:      {
     resource: {
       type:     String,
@@ -24,21 +21,12 @@ export default {
     }
   },
 
-  async fetch() {
-    this.$initializeFetchData(this.resource);
-
-    this.$fetchType(STORAGE_CLASS);
-    await this.$fetchType(this.resource);
-  }
 };
 </script>
 
 <template>
-  <ResourceTable
-    :loading="loading"
+  <PaginatedResourceTable
     :schema="schema"
-    :rows="rows"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-    :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
   />
 </template>
diff --git a/shell/models/persistentvolume.js b/shell/models/persistentvolume.js
index 0759ab73fa9..a4558c2e176 100644
--- a/shell/models/persistentvolume.js
+++ b/shell/models/persistentvolume.js
@@ -30,9 +30,7 @@ export default class PV extends SteveModel {
       return null;
     }
 
-    const allClaims = this.$rootGetters['cluster/all'](PVC);
-
-    return allClaims.find((claim) => claim.spec.volumeName === this.name);
+    return this.$getters['all'](PVC).find((claim) => claim.spec.volumeName === this.name);
   }
 
   get claimName() {
diff --git a/shell/models/storage.k8s.io.storageclass.js b/shell/models/storage.k8s.io.storageclass.js
index e78f2b4e4d0..fd05e536605 100644
--- a/shell/models/storage.k8s.io.storageclass.js
+++ b/shell/models/storage.k8s.io.storageclass.js
@@ -82,6 +82,10 @@ export const PROVISIONER_OPTIONS = [
 ];
 
 export default class extends SteveModel {
+  get provisionerListDisplay() {
+    return `${ this.provisioner } (${ this.provisionerDisplay })`;
+  }
+
   get provisionerDisplay() {
     const option = PROVISIONER_OPTIONS.find((o) => o.value === this.provisioner);
     const fallback = `${ this.provisioner } ${ this.t('persistentVolume.csi.suffix') }`;
diff --git a/shell/pages/c/_cluster/settings/performance.vue b/shell/pages/c/_cluster/settings/performance.vue
index d0c5c6e8ca6..0e9727869ca 100644
--- a/shell/pages/c/_cluster/settings/performance.vue
+++ b/shell/pages/c/_cluster/settings/performance.vue
@@ -111,10 +111,10 @@ export default {
           }
         }
 
-        storeResources.push(`Store Name: ${ store }, Resources ${ resources.join(', ') }`);
+        storeResources.push(`Resources in store '${ store }': ${ resources.join(', ') }`);
       });
 
-      return storeResources.join('. ');
+      return storeResources.join('<br><br>');
     }
   },
 
@@ -238,9 +238,10 @@ export default {
           <p :class="{ 'text-muted': !value.serverPagination.enabled }">
             {{ t('performance.serverPagination.applicable') }}
           </p>
-          <p :class="{ 'text-muted': !value.serverPagination.enabled }">
-            {{ steveCacheApplicableResources }}
-          </p>
+          <p
+            v-clean-html="steveCacheApplicableResources"
+            :class="{ 'text-muted': !value.serverPagination.enabled }"
+          />
         </div>
         <!-- Inactivity -->
         <div class="mt-20">
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index 3b8783cc16c..30d123fab1a 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -6,7 +6,9 @@ import { uniq } from '@shell/utils/array';
 import {
   CAPI,
   CATALOG,
-  CONFIG_MAP, MANAGEMENT, EVENT, MANAGEMENT, NAMESPACE, NODE, POD
+  CONFIG_MAP, MANAGEMENT, EVENT, NAMESPACE, NODE, POD, PVC,
+  PV,
+  STORAGE_CLASS
 } from '@shell/config/types';
 import { CAPI as CAPI_LABELS } from '@shell/config/labels-annotations';
 import { Schema } from '@shell/plugins/steve/schema';
@@ -173,9 +175,20 @@ class StevePaginationUtils extends NamespaceProjectFilters {
       { field: 'status.allocatable.cpu' }, // TODO: RC TEST
       { field: 'status.allocatable.memory' }, // TODO: RC TEST
       { field: 'status.allocatable.pods' }, // TODO: RC TEST
-
       // { field: 'status.clusterName' }, // Pending API support https://github.com/rancher/rancher/issues/48011
+    ],
+    [PVC]: [
+      // { field: 'spec.volumeName' }, // Pending API support https://github.com/rancher/rancher/issues/48103
+    ],
+    [PV]: [
+      // { field: 'status.reason' }, // Pending API support https://github.com/rancher/rancher/issues/48103
+      // { field: 'spec.persistentVolumeReclaimPolicy' }, // Pending API support https://github.com/rancher/rancher/issues/48103
+    ],
+    [STORAGE_CLASS]: [
+      // { field: 'provisioner' }, // Pending API support https://github.com/rancher/rancher/issues/48103
+      // { field: `annotations."${ STORAGE.DEFAULT_STORAGE_CLASS }"` }, // Pending API support https://github.com/rancher/rancher/issues/48103
     ]
+
   }
 
   private convertArrayPath(path: string): string {

From 16d1a0f34c0c748dcfd75ad827cf7dde623d60b4 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 15 Nov 2024 15:59:24 +0000
Subject: [PATCH 12/76] policy section

---
 shell/config/product/explorer.js |  3 +++
 shell/config/settings.ts         | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index a73678f28cc..f9c29d2ebac 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -82,6 +82,9 @@ export function init(store) {
     POD_DISRUPTION_BUDGET,
     RESOURCE_QUOTA,
   ], 'policy');
+
+  // TODO: RC bug two x namespace column
+  // TODO: RC bug refresh icon
   basicType([
     SERVICE,
     INGRESS,
diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index 11b131c322f..c657f08f25c 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -8,7 +8,11 @@ import {
   POD, NODE,
   STORAGE_CLASS,
   PVC,
-  PV
+  PV,
+  LIMIT_RANGE,
+  NETWORK_POLICY,
+  POD_DISRUPTION_BUDGET,
+  RESOURCE_QUOTA
 } from '@shell/config/types';
 
 interface GlobalSettingRuleset {
@@ -263,13 +267,17 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
         resources: {
           enableAll:  false,
           enableSome: {
+            // custom list or headers? not generic
             enabled: [
-              POD, NODE, EVENT,
+              NODE, EVENT,
+              POD,
               CATALOG.APP, CATALOG.CLUSTER_REPO, CATALOG.OPERATION,
               HPA, INGRESS, SERVICE,
-              PV, STORAGE_CLASS, CONFIG_MAP, PVC, SECRET
+              PV, CONFIG_MAP, PVC, SECRET,
             ],
-
+            // Currently covers more resources plus (at time of comment)
+            // STORAGE_CLASS
+            // LIMIT_RANGE, NETWORK_POLICY, POD_DISRUPTION_BUDGET, RESOURCE_QUOTA
             generic: true,
           }
         }

From 006debbda713e9459280736681729e587baafb61 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 15 Nov 2024 16:34:19 +0000
Subject: [PATCH 13/76] fix async button in manual refresh mode

---
 shell/components/AsyncButton.vue              | 11 +++++--
 shell/components/SortableTable/index.vue      |  3 --
 shell/config/product/explorer.js              | 32 +++++++++----------
 shell/plugins/steve/steve-pagination-utils.ts | 15 ++++++++-
 4 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/shell/components/AsyncButton.vue b/shell/components/AsyncButton.vue
index 3abbf570017..e80d265d89a 100644
--- a/shell/components/AsyncButton.vue
+++ b/shell/components/AsyncButton.vue
@@ -208,6 +208,10 @@ export default defineComponent({
       return this.disabled || this.phase === ASYNC_BUTTON_STATES.WAITING;
     },
 
+    isManualRefresh() {
+      return this.mode === 'manual-refresh';
+    },
+
     tooltip(): { content: string, hideOnTargetClick: boolean} | null {
       if ( this.labelAs === TOOLTIP ) {
         return {
@@ -283,11 +287,14 @@ export default defineComponent({
     :data-testid="componentTestid + '-async-button'"
     @click="clicked"
   >
-    <span v-if="mode === 'manual-refresh'">{{ t('action.refresh') }}</span>
+    <span
+      v-if="isManualRefresh"
+      :class="{'mr-10': displayIcon && size !== 'sm', 'mr-5': displayIcon && size === 'sm'}"
+    >{{ t('action.refresh') }}</span>
     <i
       v-if="displayIcon"
       v-clean-tooltip="tooltip"
-      :class="{icon: true, 'icon-lg': true, [displayIcon]: true}"
+      :class="{icon: true, 'icon-lg': true, [displayIcon]: true, 'mr-0': isManualRefresh}"
     />
     <span
       v-if="labelAs === 'text' && displayLabel"
diff --git a/shell/components/SortableTable/index.vue b/shell/components/SortableTable/index.vue
index 6449ff9819f..9dae2b9c4cf 100644
--- a/shell/components/SortableTable/index.vue
+++ b/shell/components/SortableTable/index.vue
@@ -1118,7 +1118,6 @@ export default {
             </template>
           </slot>
         </div>
-        <!-- v-if="!hasAdvancedFiltering && $slots['header-middle']" TODO: RC -->
         <div
           v-if="!hasAdvancedFiltering && $slots['header-middle']"
           class="middle"
@@ -1126,7 +1125,6 @@ export default {
           <slot name="header-middle" />
         </div>
 
-        <!-- v-if="search || hasAdvancedFiltering || isTooManyItemsToAutoUpdate || $slots['header-right']" TODO: RC -->
         <div
           v-if="search || hasAdvancedFiltering || isTooManyItemsToAutoUpdate || $slots['header-right']"
           class="search row"
@@ -1410,7 +1408,6 @@ export default {
                           :col="col.col"
                           v-bind="col.col.formatterOpts"
                           :row-key="row.key"
-                          :get-custom-detail-link="getCustomDetailLink"
                         />
                         <component
                           :is="col.component"
diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index f9c29d2ebac..91684f7b7a3 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -83,7 +83,6 @@ export function init(store) {
     RESOURCE_QUOTA,
   ], 'policy');
 
-  // TODO: RC bug two x namespace column
   // TODO: RC bug refresh icon
   basicType([
     SERVICE,
@@ -282,11 +281,10 @@ export function init(store) {
     [
       STEVE_STATE_COL,
       STEVE_NAMESPACE_COL,
-      STEVE_NAMESPACE_COL,
       {
         ...INGRESS_TARGET,
-        sort:   'spec.rules[0].host', // TODO: RC is this from fields? if not add to index list
-        search: 'spec.rules', // TODO: RC test
+        sort:   'spec.rules[0].host', // Pending API support https://github.com/rancher/rancher/issues/48103
+        search: 'spec.rules', // Pending API support https://github.com/rancher/rancher/issues/48103
       },
       {
         ...INGRESS_DEFAULT_BACKEND,
@@ -296,32 +294,31 @@ export function init(store) {
       {
         ...INGRESS_CLASS,
         sort:   'spec.ingressClassName',
-        search: 'spec.ingressClassName', // TODO: RC is this from fields? if not add to index list
+        search: 'spec.ingressClassName', // Pending API support https://github.com/rancher/rancher/issues/48103
       },
       STEVE_AGE_COL
     ]
   );
-  // TODO: RC test  HPA, ingress and service list
+
   headers(SERVICE,
     [STATE, NAME_COL, NAMESPACE_COL, TARGET_PORT, SELECTOR, SPEC_TYPE, AGE],
     [
       STEVE_STATE_COL,
       STEVE_NAMESPACE_COL,
-      STEVE_NAMESPACE_COL,
       {
         ...TARGET_PORT,
-        sort:   'spec.targetPort', /// / TODO: RC is this from fields? if not add to index list
-        search: 'spec.targetPort', // TODO: RC is this from fields? if not add to index list
+        sort:   'spec.targetPort', // Pending API support https://github.com/rancher/rancher/issues/48103
+        search: 'spec.targetPort', // Pending API support https://github.com/rancher/rancher/issues/48103
       },
       {
         ...SELECTOR,
-        sort:   'spec.selector', /// / TODO: RC is this from fields? if not add to index list
-        search: 'spec.selector', // TODO: RC is this from fields? if not add to index list
+        sort:   'spec.selector', // Pending API support https://github.com/rancher/rancher/issues/48103
+        search: 'spec.selector', // Pending API support https://github.com/rancher/rancher/issues/48103
       },
       {
         ...SPEC_TYPE,
-        sort:   'spec.type', // TODO: RC is this from fields? if not add to index list
-        search: 'spec.type', // TODO: RC is this from fields? if not add to index list
+        sort:   'spec.type', // Pending API support https://github.com/rancher/rancher/issues/48103
+        search: 'spec.type', // Pending API support https://github.com/rancher/rancher/issues/48103
       },
       STEVE_AGE_COL
     ]
@@ -360,10 +357,11 @@ export function init(store) {
     [
       STEVE_STATE_COL,
       STEVE_NAME_COL,
-      HPA_REFERENCE, // spec.scaleTargetRef.name TODO: RC is this from fields? if not add to index list
-      MIN_REPLICA, // spec.minReplicas TODO: RC is this from fields? if not add to index list
-      MAX_REPLICA, // spec.maxReplicas TODO: RC is this from fields? if not add to index list
-      CURRENT_REPLICA, // spec.currentReplicas TODO: RC is this from fields? if not add to index list
+      STEVE_NAMESPACE_COL,
+      HPA_REFERENCE, // Pending API support https://github.com/rancher/rancher/issues/48103
+      MIN_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48103
+      MAX_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48103
+      CURRENT_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48103
     ]
   );
   headers(WORKLOAD, [STATE, NAME_COL, NAMESPACE_COL, TYPE, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index 30d123fab1a..c189de81fba 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -8,7 +8,9 @@ import {
   CATALOG,
   CONFIG_MAP, MANAGEMENT, EVENT, NAMESPACE, NODE, POD, PVC,
   PV,
-  STORAGE_CLASS
+  STORAGE_CLASS,
+  SERVICE,
+  INGRESS
 } from '@shell/config/types';
 import { CAPI as CAPI_LABELS } from '@shell/config/labels-annotations';
 import { Schema } from '@shell/plugins/steve/schema';
@@ -103,6 +105,7 @@ class NamespaceProjectFilters {
  * Helper functions for steve pagination
  */
 class StevePaginationUtils extends NamespaceProjectFilters {
+  // TODO: RC how to extensions add to this list?!
   /**
    * Filtering with the vai cache supports specific fields
    * 1) Those listed here
@@ -177,6 +180,16 @@ class StevePaginationUtils extends NamespaceProjectFilters {
       { field: 'status.allocatable.pods' }, // TODO: RC TEST
       // { field: 'status.clusterName' }, // Pending API support https://github.com/rancher/rancher/issues/48011
     ],
+    [SERVICE]: [
+      // { field: 'spec.targetPort' }, // Pending API support https://github.com/rancher/rancher/issues/48103
+      // { field: 'spec.selector' }, // Pending API support https://github.com/rancher/rancher/issues/48103
+      // { field: 'spec.type' }, // Pending API support https://github.com/rancher/rancher/issues/48103
+    ],
+    [INGRESS]: [
+      // { field: 'spec.targetPort' }, // Pending API support https://github.com/rancher/rancher/issues/48103
+      // { field: 'spec.rules' }, // Pending API support https://github.com/rancher/rancher/issues/48103
+      // { field: 'spec.ingressClassName' }, // Pending API support https://github.com/rancher/rancher/issues/48103
+    ],
     [PVC]: [
       // { field: 'spec.volumeName' }, // Pending API support https://github.com/rancher/rancher/issues/48103
     ],

From 2454ad39c55646067ae09944f4856ab90b260cf8 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 15 Nov 2024 17:12:54 +0000
Subject: [PATCH 14/76] fgh

---
 shell/components/ResourceList/index.vue | 7 +++++++
 shell/config/product/explorer.js        | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/shell/components/ResourceList/index.vue b/shell/components/ResourceList/index.vue
index e75dfc921e2..e895d849261 100644
--- a/shell/components/ResourceList/index.vue
+++ b/shell/components/ResourceList/index.vue
@@ -272,6 +272,13 @@ export default {
         v-bind="$data"
       />
     </div>
+    <!-- TODO: RC throw exception in findX that are no longer supported.. or will all be supported with tweak? should they use findPage? -->
+    <!-- this.uiServices = await this.$store.dispatch('cluster/findMatching', {
+        type:     SERVICE,
+        selector: 'app=longhorn-ui'
+      }); -->
+    <!-- // TODO: RC BUG. Switching between lists can show the 'no rows to show' message before populating with existing rows. only happens for below and not custom? -->
+    <!-- ||{{ hasListComponent }}||{{ canPaginate }}|| TODO: track if canPaginate is first brielfy false. block on it being populated? -->
     <ResourceTable
       v-else
       :schema="schema"
diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index 91684f7b7a3..d0685c1d6c0 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -83,7 +83,6 @@ export function init(store) {
     RESOURCE_QUOTA,
   ], 'policy');
 
-  // TODO: RC bug refresh icon
   basicType([
     SERVICE,
     INGRESS,

From a94360e8c0a25c026c9c33111ec3539664159aef Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 2 Dec 2024 15:16:20 +0000
Subject: [PATCH 15/76] aaaaa

---
 shell/config/product/apps.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shell/config/product/apps.js b/shell/config/product/apps.js
index 81e383b73e0..8eed64803fd 100644
--- a/shell/config/product/apps.js
+++ b/shell/config/product/apps.js
@@ -95,12 +95,12 @@ export function init(store) {
     [STATE, NAME_COL, repoType, repoUrl, repoBranch, AGE],
     [STEVE_STATE_COL, STEVE_NAME_COL, {
       ...repoType,
-      // spec.gitRepo 'git || spec.url oci | http || ?
+      // spec.gitRepo 'git || spec.url oci | http || ? // TODO: RC
       sort:   ['spec.gitRepo'],
       search: false,
     }, {
       ...repoUrl,
-      // urlDisplay --> status.url || spec.gitRepo || spec.url
+      // urlDisplay --> status.url || spec.gitRepo || spec.url // TODO: RC
       sort:   false,
       search: false,
     },

From 419cc30fd1c319c76a32c6a2aaf5e80fa00eb573 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 14 Nov 2024 15:57:48 +0000
Subject: [PATCH 16/76] Server-side pagination for home page clusters list and
 side bar clusters

- Functional Changes
  - SSP now works after vue3 bump
  - Home Page Clusters list now uses server-side pagination
  - Side Bar clusters list now uses server-side pagination
  - Wire in now supported sorting / filtering by id and name used for table columns
  - Allow pagination to be enabled given a specific context
  - Call findPage without persisting to store

- New Pagination Tools
  - PaginatedResourceTable - Convenience Component, wraps ResourceTable with pagination specific props
  - PaginationWrapper - Convenience class to handle requests for resources and updates to them (avoiding store)

- Regressions
  - Side Nav menu ready state was `mgmtCluster.isReady && !pCluster?.hasError`, now ???
---
 shell/components/PaginatedResourceTable.vue   | 125 ++++
 shell/components/SortableTable/index.vue      |  20 +-
 .../components/form/ResourceLabeledSelect.vue |   4 +-
 shell/components/nav/TopLevelMenu.helper.ts   | 539 ++++++++++++++++++
 shell/components/nav/TopLevelMenu.vue         | 257 ++++-----
 shell/config/pagination-table-headers.js      |   8 +-
 shell/config/product/explorer.js              |   2 +
 shell/config/settings.ts                      |  14 +-
 shell/list/node.vue                           |  13 +-
 shell/mixins/resource-fetch-api-pagination.js |  29 +-
 shell/mixins/resource-fetch.js                |  29 +-
 shell/pages/home.vue                          | 366 ++++++++----
 shell/plugins/dashboard-store/actions.js      |  43 +-
 shell/plugins/dashboard-store/getters.js      |   7 +-
 shell/plugins/steve/steve-pagination-utils.ts |  28 +-
 shell/types/resources/settings.d.ts           |   2 +-
 shell/types/store/pagination.types.ts         |  13 +
 shell/types/store/vuex.d.ts                   |   8 +
 shell/utils/cluster.js                        |  81 ++-
 shell/utils/pagination-utils.ts               |  25 +-
 shell/utils/pagination-wrapper.ts             |  57 ++
 21 files changed, 1337 insertions(+), 333 deletions(-)
 create mode 100644 shell/components/PaginatedResourceTable.vue
 create mode 100644 shell/components/nav/TopLevelMenu.helper.ts
 create mode 100644 shell/utils/pagination-wrapper.ts

diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
new file mode 100644
index 00000000000..b296cd7bcec
--- /dev/null
+++ b/shell/components/PaginatedResourceTable.vue
@@ -0,0 +1,125 @@
+<script lang="ts">
+import { defineComponent } from 'vue';
+import ResourceFetch from '@shell/mixins/resource-fetch';
+import ResourceTable from '@shell/components/ResourceTable.vue';
+import { StorePaginationResult } from 'types/store/pagination.types';
+
+export type FetchSecondaryResourcesOpts = { }
+export type FetchSecondaryResources = (opts: FetchSecondaryResourcesOpts) => Promise<any>
+
+export type FetchPageSecondaryResourcesOpts = { canPaginate: boolean, force: boolean, page: any[], pagResult: StorePaginationResult }
+export type FetchPageSecondaryResources = (opts: FetchPageSecondaryResourcesOpts) => Promise<any>
+
+/**
+ * This is meant to enable ResourceList like capabilities outside of List pages / components
+ *
+ * Specifically
+ * - Resource Fetch features, including server-side pagination
+ * - Some plumbing
+ *
+ * This avoids polluting the owning component with mixins
+ *
+ */
+export default defineComponent({
+  name: 'PaginatedResourceTable',
+
+  components: { ResourceTable },
+
+  mixins: [ResourceFetch],
+
+  props: {
+    schema: {
+      type:     Object,
+      required: true,
+    },
+
+    headers: {
+      type:    Array,
+      default: null,
+    },
+
+    paginationHeaders: {
+      type:    Array,
+      default: null,
+    },
+
+    namespaced: {
+      type:    Boolean,
+      default: null, // Automatic from schema
+    },
+
+    /**
+     * Information may be required from resources other than the primary one shown per row
+     *
+     * This will fetch them ALL and will be run in a non-server-side pagination world
+     */
+    fetchSecondaryResources: {
+      type:    Function,
+      default: null,
+    },
+
+    /**
+     * Information may be required from resources other than the primary one shown per row
+     *
+     * This will fetch only those relevent to the current page using server-side pagination based filters
+     *
+     * called from shell/mixins/resource-fetch-api-pagination.js
+     */
+    fetchPageSecondaryResources: {
+      type:    Function,
+      default: null,
+    }
+  },
+
+  data() {
+    return { resource: this.schema.id };
+  },
+
+  async fetch() {
+    await this.$fetchType(this.resource, [], this.inStore);
+
+    if (this.canPaginate && this.fetchSecondaryResources) {
+      await this.fetchSecondaryResources({ });
+    }
+  },
+
+  computed: {
+    safeHeaders() {
+      const customHeaders = this.canPaginate ? this.paginationHeaders : this.headers;
+
+      return customHeaders || this.$store.getters['type-map/headersFor'](this.schema, this.canPaginate);
+    }
+  }
+});
+
+</script>
+
+<template>
+  <div>
+    <ResourceTable
+      v-bind="$attrs"
+      :schema="schema"
+      :rows="rows"
+      :alt-loading="canPaginate"
+      :loading="loading"
+
+      :headers="safeHeaders"
+      :namespaced="namespaced"
+
+      :external-pagination-enabled="canPaginate"
+      :external-pagination-result="paginationResult"
+      @pagination-changed="paginationChanged"
+    >
+      <!-- Pass down templates provided by the caller -->
+      <template
+        v-for="(_, slot) of $slots"
+        v-slot:[slot]="scope"
+      >
+        <slot
+          :name="slot"
+          v-bind="scope"
+        />
+      </template>
+    </ResourceTable>
+  </div>
+</template>
diff --git a/shell/components/SortableTable/index.vue b/shell/components/SortableTable/index.vue
index 5bf3f6dfccd..5a06aa7676b 100644
--- a/shell/components/SortableTable/index.vue
+++ b/shell/components/SortableTable/index.vue
@@ -361,7 +361,13 @@ export default {
     externalPaginationResult: {
       type:    Object,
       default: null
+    },
+
+    manualRefreshButtonSize: {
+      type:    String,
+      default: ''
     }
+
   },
 
   data() {
@@ -571,9 +577,9 @@ export default {
     showHeaderRow() {
       return this.search ||
         this.tableActions ||
-        this.$slots['header-left']?.() ||
-        this.$slots['header-middle']?.() ||
-        this.$slots['header-right']?.();
+        this.$slots['header-left'] ||
+        this.$slots['header-middle'] ||
+        this.$slots['header-right'];
     },
 
     columns() {
@@ -1109,6 +1115,7 @@ export default {
             </template>
           </slot>
         </div>
+        <!-- v-if="!hasAdvancedFiltering && $slots['header-middle']" TODO: RC -->
         <div
           v-if="!hasAdvancedFiltering && $slots['header-middle']"
           class="middle"
@@ -1116,6 +1123,7 @@ export default {
           <slot name="header-middle" />
         </div>
 
+        <!-- v-if="search || hasAdvancedFiltering || isTooManyItemsToAutoUpdate || $slots['header-right']" TODO: RC -->
         <div
           v-if="search || hasAdvancedFiltering || isTooManyItemsToAutoUpdate || $slots['header-right']"
           class="search row"
@@ -1140,8 +1148,8 @@ export default {
           <slot name="header-right" />
           <AsyncButton
             v-if="isTooManyItemsToAutoUpdate"
-            class="manual-refresh"
             mode="manual-refresh"
+            :size="manualRefreshButtonSize"
             :current-phase="refreshButtonPhase"
             @click="debouncedRefreshTableData"
           />
@@ -1568,10 +1576,6 @@ export default {
     opacity: 0.5;
     pointer-events: none;
   }
-
-  .manual-refresh {
-    height: 40px;
-  }
   .advanced-filter-group {
     position: relative;
     margin-left: 10px;
diff --git a/shell/components/form/ResourceLabeledSelect.vue b/shell/components/form/ResourceLabeledSelect.vue
index a4cbc64fabe..dd9e0e16e42 100644
--- a/shell/components/form/ResourceLabeledSelect.vue
+++ b/shell/components/form/ResourceLabeledSelect.vue
@@ -52,14 +52,14 @@ export enum RESOURCE_LABEL_SELECT_MODE {
 }
 
 /**
- * Convience wrapper around the LabelSelect component to support pagination
+ * Convenience  wrapper around the LabelSelect component to support pagination
  *
  * Handles
  *
  * 1) Conditionally enabling the pagination feature given system settings
  * 2) Helper function to fetch the pagination result
  *
- * A number of ways can be provided to override the convienences (see props)
+ * A number of ways can be provided to override the conveniences (see props)
  */
 export default defineComponent({
   name: 'ResourceLabeledSelect',
diff --git a/shell/components/nav/TopLevelMenu.helper.ts b/shell/components/nav/TopLevelMenu.helper.ts
new file mode 100644
index 00000000000..5eac716c160
--- /dev/null
+++ b/shell/components/nav/TopLevelMenu.helper.ts
@@ -0,0 +1,539 @@
+import { CAPI, MANAGEMENT } from 'config/types';
+import { PaginationParam, PaginationParamFilter, PaginationSort } from 'types/store/pagination.types';
+import { VuexStore } from 'types/store/vuex';
+import { filterHiddenLocalCluster, filterOnlyKubernetesClusters, paginationFilterClusters } from 'utils/cluster';
+import devConsole from 'utils/dev-console';
+import PaginationWrapper from 'utils/pagination-wrapper';
+import { allHash } from 'utils/promise';
+import { sortBy } from 'utils/sort';
+import { LocationAsRelativeRaw } from 'vue-router';
+
+interface TopLevelMenuCluster {
+  id: string,
+  label: string,
+  ready: boolean
+  providerNavLogo: string,
+  badge: string,
+  isLocal: boolean,
+  pinned: boolean,
+  description: string,
+  pin: () => void,
+  unpin: () => void,
+  clusterRoute: LocationAsRelativeRaw,
+}
+
+interface UpdateArgs {
+  searchTerm: string,
+  pinnedIds: string[],
+  unPinnedMax?: number,
+}
+
+type MgmtCluster = {
+  [key: string]: any
+}
+
+type ProvCluster = {
+  [key: string]: any
+}
+/**
+ * Order
+ * 1. Specific Local Cluster
+ * 2. Ready
+ * 3. Name
+ */
+const DEFAULT_SORT: Array<PaginationSort> = [
+  // Put local cluster at top of list - https://github.com/rancher/dashboard/issues/10975
+  // {
+  //   asc:   true,
+  //   field: 'spec.internal', // Pending API support https://github.com/rancher/rancher/issues/48011
+  // },
+  // {
+  //   asc:   true,
+  //   field: 'status.conditions[0].status' // Pending API changes https://github.com/rancher/rancher/issues/48092
+  // },
+  // {
+  //   asc:   true,
+  //   field: 'spec.displayName' // Pending API support https://github.com/rancher/rancher/issues/48011
+  // },
+];
+
+export interface TopLevelMenuHelper {
+  /**
+  * Filter mgmt clusters by
+  * 1. If harvester or not (filterOnlyKubernetesClusters)
+  * 2. If local or not (filterHiddenLocalCluster)
+  * 3. Is pinned
+  *
+  * Sort By
+  * 1. is local cluster (appears at top)
+  * 2. ready
+  * 3. name
+  */
+  clustersPinned: Array<TopLevelMenuCluster>;
+
+  /**
+  * Filter mgmt clusters by
+  * 1. If harvester or not (filterOnlyKubernetesClusters)
+  * 2. If local or not (filterHiddenLocalCluster)
+  * 3.
+  * a) if search term, filter on it
+  * b) if no search term, filter on pinned
+  *
+  * Sort By
+  * 1. is local cluster (appears at top)
+  * 2. ready
+  * 3. name
+  */
+  clustersOthers: Array<TopLevelMenuCluster>;
+
+  update: (args: UpdateArgs) => Promise<void>
+}
+
+export abstract class BaseTopLevelMenuHelper {
+  protected $store: VuexStore;
+
+  /**
+  * Filter mgmt clusters by
+  * 1. If harvester or not (filterOnlyKubernetesClusters)
+  * 2. If local or not (filterHiddenLocalCluster)
+  * 3. Is pinned
+  *
+  * Sort By
+  * 1. is local cluster (appears at top)
+  * 2. ready
+  * 3. name
+  */
+  public clustersPinned: Array<TopLevelMenuCluster> = [];
+
+  /**
+  * Filter mgmt clusters by
+  * 1. If harvester or not (filterOnlyKubernetesClusters)
+  * 2. If local or not (filterHiddenLocalCluster)
+  * 3.
+  * a) if search term, filter on it
+  * b) if no search term, filter on pinned
+  *
+  * Sort By
+  * 1. is local cluster (appears at top)
+  * 2. ready
+  * 3. name
+  */
+  public clustersOthers: Array<TopLevelMenuCluster> = [];
+
+  constructor({ $store }: {
+    $store: VuexStore,
+}) {
+    this.$store = $store;
+  }
+
+  protected convertToCluster(mgmtCluster: MgmtCluster, provCluster: ProvCluster): TopLevelMenuCluster {
+    return {
+      id:              mgmtCluster.id,
+      label:           mgmtCluster.nameDisplay,
+      ready:           mgmtCluster.isReady, // && !provCluster?.hasError,
+      providerNavLogo: mgmtCluster.providerMenuLogo,
+      badge:           mgmtCluster.badge,
+      isLocal:         mgmtCluster.isLocal,
+      pinned:          mgmtCluster.pinned,
+      description:     provCluster?.description || mgmtCluster.description,
+      pin:             () => mgmtCluster.pin(),
+      unpin:           () => mgmtCluster.unpin(),
+      clusterRoute:    { name: 'c-cluster-explorer', params: { cluster: mgmtCluster.id } }
+    };
+  }
+}
+
+export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper implements TopLevelMenuHelper {
+  private args?: UpdateArgs;
+
+  private clustersPinnedWrapper: PaginationWrapper;
+  private clustersOthersWrapper: PaginationWrapper;
+  private provClusterWrapper: PaginationWrapper;
+
+  private commonClusterFilters: PaginationParam[];
+
+  /**
+   *
+   */
+  constructor({ $store }: {
+      $store: VuexStore,
+  }) {
+    devConsole.warn('TLM.helper', 'TopLevelMenuHelperPagination');
+
+    super({ $store });
+
+    this.commonClusterFilters = paginationFilterClusters({ getters: this.$store.getters });
+
+    this.clustersPinnedWrapper = new PaginationWrapper({
+      $store,
+      onUpdate: () => {
+        // TODO: RC trigger on websocket update (only need 1 trigger for this cluster type)
+        if (this.args) {
+          this.update(this.args);
+        }
+      },
+      enabledFor: {
+        store:    'management',
+        resource: {
+          id:      MANAGEMENT.CLUSTER,
+          context: 'side-bar',
+        }
+      }
+    });
+    this.clustersOthersWrapper = new PaginationWrapper({
+      $store,
+      onUpdate: (res) => {
+        // TODO: RC trigger on websocket update (only need 1 trigger for this cluster type)
+        if (this.args) {
+          this.update(this.args);
+        }
+      },
+      enabledFor: {
+        store:    'management',
+        resource: {
+          id:      MANAGEMENT.CLUSTER,
+          context: 'side-bar',
+        }
+      }
+    });
+    this.provClusterWrapper = new PaginationWrapper({
+      $store,
+      onUpdate: (res) => {
+        // TODO: RC trigger on websocket update
+        if (this.args) {
+          this.update(this.args);
+        }
+      },
+      enabledFor: {
+        store:    'management',
+        resource: {
+          id:      CAPI.RANCHER_CLUSTER,
+          context: 'side-bar',
+        }
+      }
+    });
+  }
+
+  // ---------- requests ----------
+  async update(args: UpdateArgs) {
+    this.args = args;
+    const promises = {
+      pinned:    this.updatePinned(args),
+      notPinned: this.updateOthers(args)
+    };
+
+    const res: {
+      pinned: MgmtCluster[],
+      notPinned: MgmtCluster[]
+    } = await allHash(promises) as any;
+    const provClusters = await this.updateProvCluster(res.notPinned, res.pinned);
+    const provClustersByMgmtId = provClusters.reduce((res: { [mgmtId: string]: ProvCluster}, provCluster: ProvCluster) => {
+      if (provCluster.mgmtClusterId) {
+        res[provCluster.mgmtClusterId] = provCluster;
+      }
+
+      return res;
+    }, {} as { [mgmtId: string]: ProvCluster});
+
+    const _clustersNotPinned = res.notPinned
+      .filter((mgmtCluster) => !!provClustersByMgmtId[mgmtCluster.id])
+      .map((mgmtCluster) => this.convertToCluster(mgmtCluster, provClustersByMgmtId[mgmtCluster.id]));
+    const _clustersPinned = res.pinned
+      .filter((mgmtCluster) => !!provClustersByMgmtId[mgmtCluster.id])
+      .map((mgmtCluster) => this.convertToCluster(mgmtCluster, provClustersByMgmtId[mgmtCluster.id]));
+
+    this.clustersPinned.length = 0;
+    this.clustersOthers.length = 0;
+
+    this.clustersPinned.push(..._clustersPinned);
+    this.clustersOthers.push(..._clustersNotPinned);
+  }
+
+  private constructParams({
+    pinnedIds,
+    searchTerm,
+    includeLocal,
+    includeSearchTerm,
+    includePinned,
+    excludePinned,
+  }: {
+    pinnedIds?: string[],
+    searchTerm?: string,
+    includeLocal?: boolean,
+    includeSearchTerm?: boolean,
+    includePinned?: boolean,
+    excludePinned?: boolean,
+  }): PaginationParam[] {
+    const filters: PaginationParam[] = [...this.commonClusterFilters];
+
+    if (pinnedIds) {
+      if (includePinned) {
+        // cluster id is 1 OR 2 OR 3 OR 4...
+        filters.push(PaginationParamFilter.createMultipleFields(
+          pinnedIds.map((id) => ({
+            field: 'id', value: id, equals: true, exact: true
+          }))
+        ));
+      }
+
+      if (excludePinned) {
+        // cluster id is NOT 1 AND NOT 2 OR 3 OR 4...
+        filters.push(...pinnedIds.map((id) => PaginationParamFilter.createSingleField({
+          field: 'id', equals: false, value: id
+        })));
+      }
+    }
+
+    if (searchTerm && includeSearchTerm) {
+      // Pending API support https://github.com/rancher/rancher/issues/48011
+      // filters.push(PaginationParamFilter.createSingleField({
+      //   field: 'spec.displayName', exact: false, value: searchTerm
+      // }));
+    }
+
+    if (includeLocal) {
+      filters.push(PaginationParamFilter.createSingleField({ field: 'id', value: 'local' }));
+    }
+
+    return filters;
+  }
+
+  /**
+   * See `clustersPinned` description for details
+   */
+  private async updatePinned(args: UpdateArgs): Promise<MgmtCluster[]> {
+    return this.clustersPinnedWrapper.request({
+      pagination: {
+        filters: this.constructParams({
+          pinnedIds:     args.pinnedIds,
+          includePinned: true,
+        }),
+        page:                 1,
+        sort:                 DEFAULT_SORT,
+        projectsOrNamespaces: []
+      },
+      classify: true,
+    }).then((r) => r.data);
+  }
+
+  /**
+   * See `clustersOthers` description for details
+   */
+  private async updateOthers(args: UpdateArgs): Promise<MgmtCluster[]> {
+    return this.clustersOthersWrapper.request({
+      pagination: {
+        filters: this.constructParams({
+          searchTerm:        args.searchTerm,
+          includeSearchTerm: !!args.searchTerm,
+          pinnedIds:         args.pinnedIds,
+          excludePinned:     !args.searchTerm,
+        }),
+        page:                 1,
+        pageSize:             args.unPinnedMax,
+        sort:                 DEFAULT_SORT,
+        projectsOrNamespaces: []
+      },
+      classify: true,
+    }).then((r) => r.data);
+  }
+
+  /**
+   * Find all provisioning clusters associated with the displayed mgmt clusters
+   */
+  private async updateProvCluster(notPinned: MgmtCluster[], pinned: MgmtCluster[]): Promise<ProvCluster[]> {
+    return this.provClusterWrapper.request({
+      pagination: {
+
+        filters: [
+          PaginationParamFilter.createMultipleFields(
+            [...notPinned, ...pinned]
+              .map((mgmtCluster) => ({
+                // Pending API support https://github.com/rancher/rancher/issues/48011
+                // field: 'status.clusterName', value: mgmtCluster.id, equals: true, exact: true
+                field: 'metadata.name', value: 'local', equals: true, exact: true
+              }))
+          )
+        ],
+
+        page:                 1,
+        sort:                 [],
+        projectsOrNamespaces: []
+      },
+      classify: true,
+    }).then((r) => r.data);
+  }
+}
+
+export class TopLevelMenuHelperLegacy extends BaseTopLevelMenuHelper implements TopLevelMenuHelper {
+  private hasProvCluster: boolean;
+
+  constructor({ $store }: {
+    $store: VuexStore,
+  }) {
+    devConsole.warn('TLM.helper', 'TopLevelMenuHelperLegacy');
+    super({ $store });
+
+    this.hasProvCluster = this.$store.getters[`management/schemaFor`](CAPI.RANCHER_CLUSTER);
+
+    if (this.hasProvCluster) {
+      $store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER });
+    }
+  }
+
+  async update(args: UpdateArgs) {
+    devConsole.warn('TLM.helper', 'TopLevelMenuHelperLegacy', 'update');
+    const clusters = this.updateClusters();
+    const _clustersNotPinned = this.clustersFiltered(clusters, args);
+    const _clustersPinned = this.pinFiltered(clusters, args);
+
+    devConsole.warn('TLM.helper', 'TopLevelMenuHelperLegacy', 'update', 'res', _clustersPinned, _clustersNotPinned);
+
+    this.clustersPinned.length = 0;
+    this.clustersOthers.length = 0;
+
+    this.clustersPinned.push(..._clustersPinned);
+    this.clustersOthers.push(..._clustersNotPinned);
+  }
+
+  /**
+   * Filter mgmt clusters by
+   * 1. Harvester type 1 (filterOnlyKubernetesClusters)
+   * 2. Harvester type 2 (filterHiddenLocalCluster)
+   * 3. There's a matching prov cluster
+   *
+   * Convert remaining clusters to special format
+   */
+  private updateClusters(): TopLevelMenuCluster[] {
+    devConsole.warn('');
+    if (!this.hasProvCluster) {
+      // We're filtering out mgmt clusters without prov clusters, so if the user can't see any prov clusters at all
+      // exit early
+      return [];
+    }
+
+    const all = this.$store.getters['management/all'](MANAGEMENT.CLUSTER);
+    const mgmtClusters = filterHiddenLocalCluster(filterOnlyKubernetesClusters(all, this.$store), this.$store);
+    const provClusters = this.$store.getters['management/all'](CAPI.RANCHER_CLUSTER);
+    const provClustersByMgmtId = provClusters.reduce((res: any, provCluster: ProvCluster) => {
+      if (provCluster.mgmt?.id) {
+        res[provCluster.mgmt.id] = provCluster;
+      }
+
+      return res;
+    }, {});
+
+    return (mgmtClusters || []).reduce((res: any, mgmtCluster: MgmtCluster) => {
+      // Filter to only show mgmt clusters that exist for the available provisioning clusters
+      // Addresses issue where a mgmt cluster can take some time to get cleaned up after the corresponding
+      // provisioning cluster has been deleted
+      if (!provClustersByMgmtId[mgmtCluster.id]) {
+        return res;
+      }
+
+      res.push(this.convertToCluster(mgmtCluster, provClustersByMgmtId[mgmtCluster.id]));
+
+      return res;
+    }, []);
+  }
+
+  /**
+   * Filter clusters by
+   * 1. Not pinned
+   * 2. Includes search term
+   *
+   * Sort remaining clusters
+   *
+   * Reduce number of clusters if too many too show
+   *
+   * Important! This is used to show unpinned clusters OR results of search
+   */
+  private clustersFiltered(clusters: TopLevelMenuCluster[], args: UpdateArgs): TopLevelMenuCluster[] {
+    const clusterFilter = args.searchTerm;
+    const maxClustersToShow = args.unPinnedMax || 10;
+
+    const search = (clusterFilter || '').toLowerCase();
+    let localCluster: MgmtCluster | null = null;
+
+    const filtered = clusters.filter((c) => {
+      // If we're searching we don't care if pinned or not
+      if (search) {
+        if (!c.label?.toLowerCase().includes(search)) {
+          return false;
+        }
+      } else if (c.pinned) {
+        // Not searching, not pinned, don't care
+        return false;
+      }
+
+      if (!localCluster && c.id === 'local') {
+        // Local cluster is a special case, we're inserting it at top so don't include in the middle
+        localCluster = c;
+
+        return false;
+      }
+
+      return true;
+    });
+
+    const sorted = sortBy(filtered, ['ready:desc', 'label']);
+
+    // put local cluster on top of list always - https://github.com/rancher/dashboard/issues/10975
+    if (localCluster) {
+      sorted.unshift(localCluster);
+    }
+
+    if (search) {
+      // this.showPinClusters = false;
+      // this.searchActive = !sorted.length > 0;
+
+      return sorted;
+    }
+    // this.showPinClusters = true;
+    // this.searchActive = false;
+
+    if (sorted.length >= maxClustersToShow) {
+      return sorted.slice(0, maxClustersToShow);
+    }
+
+    return sorted;
+  }
+
+  /**
+   * Filter clusters by
+   * 1. Not pinned
+   * 2. Includes search term
+   *
+   * Sort remaining clusters
+   *
+   * Reduce number of clusters if too many too show
+   *
+   * Important! This is hidden if there's a filter (user searching)
+   */
+  private pinFiltered(clusters: TopLevelMenuCluster[], args: UpdateArgs): TopLevelMenuCluster[] {
+    let localCluster = null;
+    const filtered = clusters.filter((c) => {
+      if (!c.pinned) {
+        // We only care about pinned clusters
+        return false;
+      }
+
+      if (c.id === 'local') {
+        // Special case, we're going to add this at the start so filter out
+        localCluster = c;
+
+        return false;
+      }
+
+      return true;
+    });
+
+    const sorted = sortBy(filtered, ['ready:desc', 'label']);
+
+    // put local cluster on top of list always - https://github.com/rancher/dashboard/issues/10975
+    if (localCluster) {
+      sorted.unshift(localCluster);
+    }
+
+    return sorted;
+  }
+}
diff --git a/shell/components/nav/TopLevelMenu.vue b/shell/components/nav/TopLevelMenu.vue
index 0639fc663cf..1d655d24109 100644
--- a/shell/components/nav/TopLevelMenu.vue
+++ b/shell/components/nav/TopLevelMenu.vue
@@ -4,18 +4,24 @@ import ClusterIconMenu from '@shell/components/ClusterIconMenu';
 import IconOrSvg from '../IconOrSvg';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 import { mapGetters } from 'vuex';
-import { CAPI, MANAGEMENT } from '@shell/config/types';
-import { MENU_MAX_CLUSTERS } from '@shell/store/prefs';
+import { CAPI, COUNT, MANAGEMENT } from '@shell/config/types';
+import { MENU_MAX_CLUSTERS, PINNED_CLUSTERS } from '@shell/store/prefs';
 import { sortBy } from '@shell/utils/sort';
 import { ucFirst } from '@shell/utils/string';
 import { KEY } from '@shell/utils/platform';
 import { getVersionInfo } from '@shell/utils/version';
 import { SETTING } from '@shell/config/settings';
-import { filterOnlyKubernetesClusters, filterHiddenLocalCluster } from '@shell/utils/cluster';
 import { getProductFromRoute } from '@shell/utils/router';
 import { isRancherPrime } from '@shell/config/version';
 import Pinned from '@shell/components/nav/Pinned';
 import { getGlobalBannerFontSizes } from '@shell/utils/banners';
+import { TopLevelMenuHelperPagination, TopLevelMenuHelperLegacy } from 'components/nav/TopLevelMenu.helper';
+import devConsole from 'utils/dev-console';
+import { debounce } from 'lodash';
+
+// TODO: RC wire in socket updates to pagination wrapper
+// TODO: RC test search properly
+// TODO: RC loading indicators?
 
 export default {
   components: {
@@ -29,6 +35,19 @@ export default {
     const { displayVersion, fullVersion } = getVersionInfo(this.$store);
     const hasProvCluster = this.$store.getters[`management/schemaFor`](CAPI.RANCHER_CLUSTER);
 
+    const canPagination = this.$store.getters[`management/paginationEnabled`]({
+      id:      MANAGEMENT.CLUSTER,
+      context: 'side-bar',
+    }) && this.$store.getters[`management/paginationEnabled`]({
+      id:      CAPI.RANCHER_CLUSTER,
+      context: 'side-bar',
+    });
+    const helper = canPagination ? new TopLevelMenuHelperPagination({ $store: this.$store }) : new TopLevelMenuHelperLegacy({ $store: this.$store });
+    const provClusters = !canPagination && hasProvCluster ? this.$store.getters[`management/all`](CAPI.RANCHER_CLUSTER) : [];
+    const mgmtClusters = !canPagination ? this.$store.getters[`management/all`](MANAGEMENT.CLUSTER) : [];
+
+    devConsole.warn(provClusters, mgmtClusters);
+
     return {
       shown:             false,
       displayVersion,
@@ -37,27 +56,25 @@ export default {
       hasProvCluster,
       maxClustersToShow: MENU_MAX_CLUSTERS,
       emptyCluster:      BLANK_CLUSTER,
-      showPinClusters:   false,
-      searchActive:      false,
       routeCombo:        false,
-    };
-  },
 
-  fetch() {
-    if (this.hasProvCluster) {
-      this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER });
-    }
+      canPagination,
+      helper,
+      debouncedHelperUpdate: debounce((...args) => this.helper.update(...args), 200),
+      provClusters,
+      mgmtClusters,
+    };
   },
 
   computed: {
     ...mapGetters(['clusterId']),
     ...mapGetters(['clusterReady', 'isRancher', 'currentCluster', 'currentProduct', 'isRancherInHarvester']),
     ...mapGetters({ features: 'features/get' }),
-    value: {
-      get() {
-        return this.$store.getters['productId'];
-      },
+
+    pinnedIds() {
+      return this.$store.getters['prefs/get'](PINNED_CLUSTERS);
     },
+
     sideMenuStyle() {
       const globalBannerSettings = getGlobalBannerFontSizes(this.$store);
 
@@ -68,161 +85,47 @@ export default {
     },
 
     showClusterSearch() {
-      return this.clusters.length > this.maxClustersToShow;
+      return this.allClustersCount > this.maxClustersToShow;
     },
 
-    /**
-     * Filter mgmt clusters by
-     * 1. Harvester type 1 (filterOnlyKubernetesClusters)
-     * 2. Harvester type 2 (filterHiddenLocalCluster)
-     * 3. There's a matching prov cluster
-     *
-     * Convert remaining clusters to special format
-     */
-    clusters() {
-      if (!this.hasProvCluster) {
-        // We're filtering out mgmt clusters without prov clusters, so if the user can't see any prov clusters at all
-        // exit early
-        return [];
-      }
+    allClustersCount() {
+      const counts = this.$store.getters[`management/all`](COUNT)?.[0]?.counts || {};
+      const count = counts[MANAGEMENT.CLUSTER] || {};
 
-      const all = this.$store.getters['management/all'](MANAGEMENT.CLUSTER);
-      const mgmtClusters = filterHiddenLocalCluster(filterOnlyKubernetesClusters(all, this.$store), this.$store);
-      const provClusters = this.$store.getters['management/all'](CAPI.RANCHER_CLUSTER);
-      const provClustersByMgmtId = provClusters.reduce((res, provCluster) => {
-        if (provCluster.mgmt?.id) {
-          res[provCluster.mgmt.id] = provCluster;
-        }
-
-        return res;
-      }, {});
+      return count?.summary.count;
+    },
 
-      return (mgmtClusters || []).reduce((res, mgmtCluster) => {
-        // Filter to only show mgmt clusters that exist for the available provisioning clusters
-        // Addresses issue where a mgmt cluster can take some time to get cleaned up after the corresponding
-        // provisioning cluster has been deleted
-        if (!provClustersByMgmtId[mgmtCluster.id]) {
-          return res;
-        }
+    // New
+    search() {
+      return (this.clusterFilter || '').toLowerCase();
+    },
 
-        const pCluster = provClustersByMgmtId[mgmtCluster.id];
-
-        res.push({
-          id:              mgmtCluster.id,
-          label:           mgmtCluster.nameDisplay,
-          ready:           mgmtCluster.isReady && !pCluster?.hasError,
-          osLogo:          mgmtCluster.providerOsLogo,
-          providerNavLogo: mgmtCluster.providerMenuLogo,
-          badge:           mgmtCluster.badge,
-          isLocal:         mgmtCluster.isLocal,
-          isHarvester:     mgmtCluster.isHarvester,
-          pinned:          mgmtCluster.pinned,
-          description:     pCluster?.description || mgmtCluster.description,
-          pin:             () => mgmtCluster.pin(),
-          unpin:           () => mgmtCluster.unpin(),
-          clusterRoute:    { name: 'c-cluster-explorer', params: { cluster: mgmtCluster.id } }
-        });
+    // New
+    showPinClusters() {
+      return !this.search;
+    },
 
-        return res;
-      }, []);
+    // New
+    searchActive() {
+      return !!this.search;
     },
 
     /**
-     * Filter clusters by
-     * 1. Not pinned
-     * 2. Includes search term
-     *
-     * Sort remaining clusters
+     * Only Clusters that are pinned
      *
-     * Reduce number of clusters if too many too show
-     *
-     * Important! This is used to show unpinned clusters OR results of search
+     * (see description of helper.clustersPinned for more details)
      */
-    clustersFiltered() {
-      const search = (this.clusterFilter || '').toLowerCase();
-      let localCluster = null;
-
-      const filtered = this.clusters.filter((c) => {
-        // If we're searching we don't care if pinned or not
-        if (search) {
-          if (!c.label?.toLowerCase().includes(search)) {
-            return false;
-          }
-        } else if (c.pinned) {
-          // Not searching, not pinned, don't care
-          return false;
-        }
-
-        if (!localCluster && c.id === 'local') {
-          // Local cluster is a special case, we're inserting it at top so don't include in the middle
-          localCluster = c;
-
-          return false;
-        }
-
-        return true;
-      });
-
-      const sorted = sortBy(filtered, ['ready:desc', 'label']);
-
-      // put local cluster on top of list always - https://github.com/rancher/dashboard/issues/10975
-      if (localCluster) {
-        sorted.unshift(localCluster);
-      }
-
-      if (search) {
-        this.showPinClusters = false;
-        this.searchActive = !sorted.length > 0;
-
-        return sorted;
-      }
-      this.showPinClusters = true;
-      this.searchActive = false;
-
-      if (sorted.length >= this.maxClustersToShow) {
-        return sorted.slice(0, this.maxClustersToShow);
-      }
-
-      return sorted;
+    pinFiltered() {
+      return this.hasProvCluster ? this.helper.clustersPinned : [];
     },
 
     /**
-     * Filter clusters by
-     * 1. Not pinned
-     * 2. Includes search term
-     *
-     * Sort remaining clusters
+     * Used to shown unpinned clusters OR results of text search
      *
-     * Reduce number of clusters if too many too show
-     *
-     * Important! This is hidden if there's a filter (user searching)
+     * (see description of helper.clustersOthers for more details)
      */
-    pinFiltered() {
-      let localCluster = null;
-      const filtered = this.clusters.filter((c) => {
-        if (!c.pinned) {
-          // We only care about pinned clusters
-          return false;
-        }
-
-        if (c.id === 'local') {
-          // Special case, we're going to add this at the start so filter out
-          localCluster = c;
-
-          return false;
-        }
-
-        return true;
-      });
-
-      const sorted = sortBy(filtered, ['ready:desc', 'label']);
-
-      // put local cluster on top of list always - https://github.com/rancher/dashboard/issues/10975
-      if (localCluster) {
-        sorted.unshift(localCluster);
-      }
-
-      return sorted;
+    clustersFiltered() {
+      return this.hasProvCluster ? this.helper.clustersOthers : [];
     },
 
     pinnedClustersHeight() {
@@ -232,7 +135,7 @@ export default {
       return `min-height: ${ height }px`;
     },
     clusterFilterCount() {
-      return this.clusterFilter ? this.clustersFiltered.length : this.clusters.length;
+      return this.clusterFilter ? this.clustersFiltered.length : this.allClustersCount;
     },
 
     multiClusterApps() {
@@ -363,7 +266,35 @@ export default {
   watch: {
     $route() {
       this.shown = false;
-    }
+    },
+
+    pinnedIds: {
+      immediate: true,
+      handler(ids) {
+        this.updateClusters(ids);
+      }
+    },
+
+    search() {
+      this.updateClusters(this.pinnedIds);
+    },
+
+    provClusters: {
+      handler() {
+        // Shouldn't get here if SSP
+        this.updateClusters(this.pinnedIds);
+      },
+      deep: true
+    },
+
+    mgmtClusters: {
+      handler() {
+        // Shouldn't get here if SSP
+        this.updateClusters(this.pinnedIds);
+      },
+      deep: true
+    },
+
   },
 
   mounted() {
@@ -490,9 +421,18 @@ export default {
         popperClass
       };
     },
+
+    updateClusters(pinnedIds) {
+      this.debouncedHelperUpdate({
+        pinnedIds,
+        searchTerm:  this.search,
+        unPinnedMax: this.maxClustersToShow
+      });
+    }
   }
 };
 </script>
+
 <template>
   <div>
     <!-- Overlay -->
@@ -632,7 +572,8 @@ export default {
           </template>
 
           <!-- Cluster menu -->
-          <template v-if="clusters && !!clusters.length">
+          <!-- <template v-if="clusters && !!clusters.length"> -->
+          <template v-if="!!allClustersCount">
             <div
               ref="clusterList"
               class="clusters"
@@ -800,7 +741,7 @@ export default {
 
             <!-- See all clusters -->
             <router-link
-              v-if="clusters.length > maxClustersToShow"
+              v-if="allClustersCount > maxClustersToShow"
               class="clusters-all"
               :to="{name: 'c-cluster-product-resource', params: {
                 cluster: emptyCluster,
diff --git a/shell/config/pagination-table-headers.js b/shell/config/pagination-table-headers.js
index eabcb5891ee..53d524ab034 100644
--- a/shell/config/pagination-table-headers.js
+++ b/shell/config/pagination-table-headers.js
@@ -17,8 +17,8 @@ export const STEVE_ID_COL = {
   name:     'steve-id',
   labelKey: 'tableHeaders.id',
   value:    'id',
-  sort:     false, // sort:     ['id'], // Pending API support
-  search:   false, // search:   'id', // Pending API support
+  sort:     ['id'],
+  search:   'id',
 };
 
 export const STEVE_STATE_COL = {
@@ -26,8 +26,8 @@ export const STEVE_STATE_COL = {
   // Note, we're show the 'state' as per model, not the 'metadata.state.name' that's available in the model to remotely sort/filter
   // Need to investigate whether we should 'dumb down' the state we show to the native one (tracked via https://github.com/rancher/dashboard/issues/8527)
   // This means we'll show something different to what we sort and filter on.
-  sort:   false, // ['metadata.state.name'], // Pending API support
-  search: false, // 'metadata.state.name', // Pending API support
+  sort:   ['metadata.state.name'],
+  search: 'metadata.state.name',
 };
 
 export const STEVE_AGE_COL = {
diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index 1652473a120..4ff4af1157b 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -9,6 +9,7 @@ import {
   NORMAN,
   SNAPSHOT,
   VIRTUAL_TYPES,
+  CAPI,
 } from '@shell/config/types';
 
 import {
@@ -60,6 +61,7 @@ export function init(store) {
       [MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING]: 'management',
       [NORMAN.CLUSTER_ROLE_TEMPLATE_BINDING]:     'rancher',
       [NORMAN.PROJECT_ROLE_TEMPLATE_BINDING]:     'rancher',
+      [CAPI.RANCHER_CLUSTER]:                     'management',
     }
   });
 
diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index a25bdb1eb72..eabfb74a3f8 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -1,6 +1,7 @@
 // Settings
 import { GC_DEFAULTS, GC_PREFERENCES } from '@shell/utils/gc/gc-types';
 import { PaginationSettings } from '@shell/types/resources/settings';
+import { CAPI, MANAGEMENT } from '@shell/config/types';
 
 interface GlobalSettingRuleset {
   name: string,
@@ -258,8 +259,19 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
             generic: true,
           }
         }
+      },
+      management: {
+        resources: {
+          enableAll:  false,
+          enableSome: {
+            enabled: [
+              { resource: CAPI.RANCHER_CLUSTER, context: ['home', 'side-bar'] },
+              { resource: MANAGEMENT.CLUSTER, context: ['side-bar'] },
+            ],
+            generic: false,
+          }
+        }
       }
     }
   }
-
 };
diff --git a/shell/list/node.vue b/shell/list/node.vue
index 11e89bba2b3..0c0595320b3 100644
--- a/shell/list/node.vue
+++ b/shell/list/node.vue
@@ -21,6 +21,7 @@ import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import { mapGetters } from 'vuex';
+import { FetchPageSecondaryResourcesOpts } from 'components/PaginatedResourceTable.vue';
 
 export default defineComponent({
   name:       'ListNode',
@@ -36,10 +37,12 @@ export default defineComponent({
       type:     String,
       required: true,
     },
+
     schema: {
       type:     Object,
       required: true,
     },
+
     useQueryParamsForSimpleFiltering: {
       type:    Boolean,
       default: false
@@ -209,8 +212,8 @@ export default defineComponent({
      *
      * So when we have a page.... use those entries as filters when fetching the other resources
      */
-    async fetchPageSecondaryResources(force = false) {
-      if (!this.rows?.length) {
+    async fetchPageSecondaryResources({ canPaginate, force, page }: FetchPageSecondaryResourcesOpts) {
+      if (!page?.length) {
         return;
       }
 
@@ -220,7 +223,7 @@ export default defineComponent({
         const opt: ActionFindPageArgs = {
           force,
           pagination: new FilterArgs({
-            filters: PaginationParamFilter.createMultipleFields(this.rows.map((r: any) => new PaginationFilterField({
+            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
               field: 'status.nodeName',
               value: r.id
             }))),
@@ -242,7 +245,7 @@ export default defineComponent({
             namespaced: namespace,
             pagination: new FilterArgs({
               filters: PaginationParamFilter.createMultipleFields(
-                this.rows.reduce((res: PaginationFilterField[], r: any ) => {
+                page.reduce((res: PaginationFilterField[], r: any ) => {
                   const name = r.metadata?.annotations?.[CAPI_ANNOTATIONS.MACHINE_NAME];
 
                   if (name) {
@@ -268,7 +271,7 @@ export default defineComponent({
           force,
           pagination: new FilterArgs({
             filters: PaginationParamFilter.createMultipleFields(
-              this.rows.map((r: any) => new PaginationFilterField({
+              page.map((r: any) => new PaginationFilterField({
                 field: 'spec.nodeName',
                 value: r.id,
               }))
diff --git a/shell/mixins/resource-fetch-api-pagination.js b/shell/mixins/resource-fetch-api-pagination.js
index 80a2ec562d4..e73e9b18640 100644
--- a/shell/mixins/resource-fetch-api-pagination.js
+++ b/shell/mixins/resource-fetch-api-pagination.js
@@ -13,6 +13,16 @@ import stevePaginationUtils from '@shell/plugins/steve/steve-pagination-utils';
  */
 export default {
 
+  props: {
+    /**
+     * Where in the ui this mixin is used. For instance the home page cluster list would be `home`
+     */
+    context: {
+      type:    String,
+      default: null,
+    },
+  },
+
   data() {
     return {
       forceUpdateLiveAndDelayed: 0,
@@ -68,7 +78,7 @@ export default {
     },
 
     namespaceFilterChanged(neu) {
-      if (!this.canPaginate || !this.schema?.attributes?.namespaced) {
+      if (!this.canPaginate || !this.schema?.attributes?.namespaced || !this.namespaced) {
         return;
       }
 
@@ -166,7 +176,12 @@ export default {
         return;
       }
 
-      return this.resource && this.$store.getters[`${ this.currentProduct?.inStore }/paginationEnabled`]?.(this.resource.id || this.resource);
+      const args = {
+        id:      this.resource.id || this.resource,
+        context: this.context,
+      };
+
+      return this.resource && this.$store.getters[`${ this.inStore }/paginationEnabled`]?.(args);
     },
 
     paginationResult() {
@@ -182,7 +197,7 @@ export default {
         return;
       }
 
-      return this.$store.getters[`${ this.currentProduct?.inStore }/havePage`](this.resource);
+      return this.$store.getters[`${ this.inStore }/havePage`](this.resource);
     },
 
     /**
@@ -197,6 +212,10 @@ export default {
       */
     showDynamicRancherNamespaces() {
       return this.$store.getters['prefs/get'](ALL_NAMESPACES);
+    },
+
+    inStore() {
+      return this.$store.getters['currentStore'](this.resource) || this.currentProduct?.inStore;
     }
   },
 
@@ -298,7 +317,9 @@ export default {
         return;
       }
 
-      await this.fetchPageSecondaryResources();
+      await this.fetchPageSecondaryResources({
+        canPaginate: this.canPaginate, force: false, page: this.rows, pagResult: this.paginationResult
+      });
     }
   },
 };
diff --git a/shell/mixins/resource-fetch.js b/shell/mixins/resource-fetch.js
index 60f1770e6c7..171bb0a4fbd 100644
--- a/shell/mixins/resource-fetch.js
+++ b/shell/mixins/resource-fetch.js
@@ -60,16 +60,37 @@ export default {
     }
   },
 
+  props: {
+    /**
+     * Add additional filtering to the rows
+     */
+    filterRows: {
+      type:    Function,
+      default: null,
+    },
+  },
+
   computed: {
     ...mapGetters({ refreshFlag: 'resource-fetch/refreshFlag' }),
     rows() {
       const currResource = this.fetchedResourceType.find((item) => item.type === this.resource);
 
       if (currResource) {
-        return this.$store.getters[`${ currResource.currStore }/all`](this.resource);
-      } else {
+        const rows = this.$store.getters[`${ currResource.currStore }/all`](this.resource);
+
+        if (this.canPaginate) {
+          if (this.havePaginated) {
+            return rows;
+          }
+        } else {
+          return rows;
+        }
+
+        // return this.filterRows ? this.filterRows(rows) : rows;
         return [];
       }
+
+      return [];
     },
     loading() {
       if (this.canPaginate) {
@@ -86,7 +107,9 @@ export default {
       if (this.init && neu) {
         await this.$fetch();
         if (this.canPaginate && this.fetchPageSecondaryResources) {
-          this.fetchPageSecondaryResources(true);
+          this.fetchPageSecondaryResources({
+            canPaginate: this.canPaginate, force: true, page: this.rows, pagResult: this.paginationResult
+          });
         }
       }
     }
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index 03f57cd2b1f..a5c34fd1c84 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -1,9 +1,10 @@
-<script>
+<script lang="ts">
+import { defineComponent } from 'vue';
 import { mapPref, AFTER_LOGIN_ROUTE, READ_WHATS_NEW, HIDE_HOME_PAGE_CARDS } from '@shell/store/prefs';
 import { Banner } from '@components/Banner';
 import BannerGraphic from '@shell/components/BannerGraphic';
 import IndentedPanel from '@shell/components/IndentedPanel';
-import SortableTable from '@shell/components/SortableTable';
+import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts, FetchSecondaryResourcesOpts } from '@shell/components/PaginatedResourceTable.vue';
 import { BadgeState } from '@components/BadgeState';
 import CommunityLinks from '@shell/components/CommunityLinks';
 import SingleClusterInfo from '@shell/components/SingleClusterInfo';
@@ -18,19 +19,24 @@ import PageHeaderActions from '@shell/mixins/page-actions';
 import { getVendor } from '@shell/config/private-label';
 import { mapFeature, MULTI_CLUSTER } from '@shell/store/features';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
-import { filterOnlyKubernetesClusters, filterHiddenLocalCluster } from '@shell/utils/cluster';
-import TabTitle from '@shell/components/TabTitle';
+import { paginationFilterClusters } from '@shell/utils/cluster';
+import TabTitle from '@shell/components/TabTitle.vue';
+import { ActionFindPageArgs } from '@shell/types/store/dashboard-store.types';
 
 import { RESET_CARDS_ACTION, SET_LOGIN_ACTION } from '@shell/config/page-actions';
+import { STEVE_NAME_COL, STEVE_STATE_COL } from 'config/pagination-table-headers';
+import { PaginationParamFilter, FilterArgs, PaginationFilterField } from 'types/store/pagination.types';
+import devConsole from 'utils/dev-console';
+import ProvCluster from 'models/provisioning.cattle.io.cluster';
 
-export default {
+export default defineComponent({
   name:       'Home',
   layout:     'home',
   components: {
     Banner,
     BannerGraphic,
     IndentedPanel,
-    SortableTable,
+    PaginatedResourceTable,
     BadgeState,
     CommunityLinks,
     SingleClusterInfo,
@@ -39,102 +45,55 @@ export default {
 
   mixins: [PageHeaderActions],
 
-  fetch() {
-    if ( this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER) ) {
-      this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER });
-    }
-
-    if ( this.$store.getters['management/schemaFor'](MANAGEMENT.CLUSTER) ) {
-      this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER });
-    }
-
-    if ( this.$store.getters['management/canList'](CAPI.MACHINE) ) {
-      this.$store.dispatch('management/findAll', { type: CAPI.MACHINE });
-    }
-
-    if ( this.$store.getters['management/canList'](MANAGEMENT.NODE) ) {
-      this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE });
-    }
-
-    // We need to fetch node pools and node templates in order to correctly show the provider for RKE1 clusters
-    if ( this.$store.getters['management/canList'](MANAGEMENT.NODE_POOL) ) {
-      this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_POOL });
-    }
-
-    if ( this.$store.getters['management/canList'](MANAGEMENT.NODE_TEMPLATE) ) {
-      this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_TEMPLATE });
-    }
-  },
-
   data() {
-    const fullVersion = getVersionInfo(this.$store).fullVersion;
-    // Page actions don't change on the Home Page
-    const pageActions = [
-      {
-        labelKey: 'nav.header.setLoginPage',
-        action:   SET_LOGIN_ACTION
-      },
-      { separator: true },
-      {
-        labelKey: 'nav.header.restoreCards',
-        action:   RESET_CARDS_ACTION
-      },
-    ];
+    const paginationRequestFilters = paginationFilterClusters(this.$store);
 
     return {
       HIDE_HOME_PAGE_CARDS,
-      fullVersion,
-      pageActions,
+      fullVersion: getVersionInfo(this.$store).fullVersion,
+      // Page actions don't change on the Home Page
+      pageActions: [
+        {
+          labelKey: 'nav.header.setLoginPage',
+          action:   SET_LOGIN_ACTION
+        },
+        { separator: true },
+        {
+          labelKey: 'nav.header.restoreCards',
+          action:   RESET_CARDS_ACTION
+        },
+      ],
       vendor: getVendor(),
-    };
-  },
-
-  computed: {
-    ...mapState(['managementReady']),
-    ...mapGetters(['currentCluster', 'defaultClusterId', 'releaseNotesUrl']),
-    mcm: mapFeature(MULTI_CLUSTER),
-
-    provClusters() {
-      return this.$store.getters['management/all'](CAPI.RANCHER_CLUSTER);
-    },
 
-    // User can go to Cluster Management if they can see the cluster schema
-    canManageClusters() {
-      const schema = this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER);
+      paginationRequestFilters,
 
-      return !!schema;
-    },
-
-    canCreateCluster() {
-      const schema = this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER);
+      provClusterSchema: this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER),
 
-      return !!schema?.collectionMethods.find((x) => x.toLowerCase() === 'post');
-    },
+      canViewMgmtClusters:  !!this.$store.getters['management/schemaFor'](MANAGEMENT.CLUSTER),
+      canViewMachine:       !!this.$store.getters['management/canList'](CAPI.MACHINE),
+      canViewMgmtNodes:     !!this.$store.getters['management/canList'](MANAGEMENT.NODE),
+      canViewMgmtPools:     !!this.$store.getters['management/canList'](MANAGEMENT.NODE_POOL),
+      canViewMgmtTemplates: !!this.$store.getters['management/canList'](MANAGEMENT.NODE_TEMPLATE),
 
-    manageLocation() {
-      return {
+      manageLocation: {
         name:   'c-cluster-product-resource',
         params: {
           product:  MANAGER,
           cluster:  BLANK_CLUSTER,
           resource: CAPI.RANCHER_CLUSTER
         },
-      };
-    },
+      },
 
-    createLocation() {
-      return {
+      createLocation: {
         name:   'c-cluster-product-resource-create',
         params: {
           product:  MANAGER,
           cluster:  BLANK_CLUSTER,
           resource: CAPI.RANCHER_CLUSTER
         },
-      };
-    },
+      },
 
-    importLocation() {
-      return {
+      importLocation: {
         name:   'c-cluster-product-resource-create',
         params: {
           product:  MANAGER,
@@ -142,22 +101,9 @@ export default {
           resource: CAPI.RANCHER_CLUSTER
         },
         query: { [MODE]: _IMPORT }
-      };
-    },
-
-    afterLoginRoute: mapPref(AFTER_LOGIN_ROUTE),
-    homePageCards:   mapPref(HIDE_HOME_PAGE_CARDS),
-
-    readWhatsNewAlready() {
-      return readReleaseNotes(this.$store);
-    },
-
-    showSetLoginBanner() {
-      return this.homePageCards?.setLoginPage;
-    },
+      },
 
-    clusterHeaders() {
-      return [
+      headers: [
         STATE,
         {
           name:          'name',
@@ -165,7 +111,7 @@ export default {
           value:         'nameDisplay',
           sort:          ['nameSort'],
           canBeVariable: true,
-          getValue:      (row) => row.mgmt?.nameDisplay
+          getValue:      (row: ProvCluster) => row.mgmt?.nameDisplay
         },
         {
           label:     this.t('landing.clusters.provider'),
@@ -206,12 +152,81 @@ export default {
         //   name:  'explorer',
         //   label:  this.t('landing.clusters.explorer')
         // }
-      ];
+      ],
+
+      paginationHeaders: [
+        STEVE_STATE_COL,
+        {
+          ...STEVE_NAME_COL,
+          canBeVariable: true,
+          // TODO: RC ISSUE describe. search sort on prov meta namespace
+          // getValue:      (row: ProvCluster) => row.mgmt?.nameDisplay || row.metadata?.name
+          getValue:      (row: ProvCluster) => row.metadata?.name
+        },
+        {
+          label:     this.t('landing.clusters.provider'),
+          subLabel:  this.t('landing.clusters.distro'),
+          value:     'mgmt.status.provider',
+          name:      'Provider',
+          sort:      false,
+          search:    false,
+          formatter: 'ClusterProvider'
+        },
+        {
+          label:    this.t('landing.clusters.kubernetesVersion'),
+          subLabel: this.t('landing.clusters.architecture'),
+          name:     'kubernetesVersion',
+          sort:     false,
+          search:   false,
+        },
+        {
+          label:  this.t('tableHeaders.cpu'),
+          value:  '',
+          name:   'cpu',
+          sort:   ['status.allocatable.cpu'],
+          search: false,
+        },
+        {
+          label:  this.t('tableHeaders.memory'),
+          value:  '',
+          name:   'memory',
+          sort:   ['status.allocatable.memory'],
+          search: false,
+        },
+        {
+          label:        this.t('tableHeaders.pods'),
+          name:         'pods',
+          value:        '',
+          sort:         ['status.allocatable.pods'],
+          search:       false,
+          formatter:    'PodsUsage',
+          delayLoading: true
+        },
+      ],
+
+      clusterCount: 0,
+    };
+  },
+
+  computed: {
+    ...mapState(['managementReady']),
+    ...mapGetters(['currentCluster', 'defaultClusterId', 'releaseNotesUrl']),
+    mcm: mapFeature(MULTI_CLUSTER),
+
+    canCreateCluster() {
+      return !!this.provClusterSchema?.collectionMethods.find((x: string) => x.toLowerCase() === 'post');
     },
 
-    kubeClusters() {
-      return filterHiddenLocalCluster(filterOnlyKubernetesClusters(this.provClusters || [], this.$store), this.$store);
-    }
+    afterLoginRoute: mapPref(AFTER_LOGIN_ROUTE),
+    homePageCards:   mapPref(HIDE_HOME_PAGE_CARDS),
+
+    readWhatsNewAlready() {
+      return readReleaseNotes(this.$store);
+    },
+
+    showSetLoginBanner() {
+      return this.homePageCards?.setLoginPage;
+    },
   },
 
   async created() {
@@ -229,11 +244,121 @@ export default {
   },
 
   methods: {
+    fetchSecondaryResources(opts: FetchSecondaryResourcesOpts) {
+      // TODO: RC TEST with pagination off and on
+      if ( this.canViewMgmtClusters ) {
+        this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER });
+      }
+
+      if ( this.canViewMachine ) {
+        this.$store.dispatch('management/findAll', { type: CAPI.MACHINE });
+      }
+
+      if ( this.canViewMgmtNodes ) {
+        this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE });
+      }
+
+      // We need to fetch node pools and node templates in order to correctly show the provider for RKE1 clusters
+      if ( this.canViewMgmtPools ) {
+        this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_POOL });
+      }
+
+      if ( this.canViewMgmtTemplates ) {
+        this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_TEMPLATE });
+      }
+    },
+
+    async fetchPageSecondaryResources({
+      canPaginate, force, page, pagResult
+    }: FetchPageSecondaryResourcesOpts) {
+      if (!canPaginate || !page?.length) {
+        this.clusterCount = 0;
+
+        return;
+      }
+
+      this.clusterCount = pagResult.count;
+
+      if ( this.canViewMgmtClusters ) {
+        const opt: ActionFindPageArgs = {
+          force,
+          pagination: new FilterArgs({
+            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
+              field: 'id',
+              value: r.mgmtClusterId
+            }))),
+          })
+        };
+
+        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.CLUSTER, opt });
+      }
+
+      if ( this.canViewMachine ) {
+        const opt: ActionFindPageArgs = {
+          force,
+          // TODO: RC Validate
+          pagination: new FilterArgs({
+            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
+              field: 'spec.clusterName',
+              value: r.metadata.name
+            }))),
+          })
+        };
+
+        this.$store.dispatch(`management/findPage`, { type: CAPI.MACHINE, opt });
+      }
+
+      if ( this.canViewMgmtNodes ) {
+        const opt: ActionFindPageArgs = {
+          force,
+          // TODO: RC Validate
+          pagination: new FilterArgs({
+            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
+              field: 'id',
+              value: r.mgmtClusterId
+            }))),
+          })
+        };
+
+        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE, opt });
+      }
+
+      // We need to fetch node pools and node templates in order to correctly show the provider for RKE1 clusters
+      if ( this.canViewMgmtPools && this.canViewMgmtTemplates) {
+        const poolOpt: ActionFindPageArgs = {
+          force,
+          // TODO: RC Validate
+          pagination: new FilterArgs({
+            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
+              field: 'spec.clusterName',
+              value: r.status?.clusterName// TODO: handle empty spec
+            }))),
+          })
+        };
+
+        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE_POOL, opt: poolOpt });
+
+        const templateOpt: ActionFindPageArgs = {
+          force,
+          // pagination: new FilterArgs({}),
+          // TODO: RC Validate
+          pagination: new FilterArgs({
+            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
+              field: 'spec.clusterName',
+              value: r.status?.clusterName// TODO: handle empty spec
+            }))),
+          })
+        };
+
+        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE_TEMPLATE, opt: templateOpt });
+      }
+    },
+
     /**
      * Define actions for each navigation link
      * @param {*} action
      */
-    handlePageAction(action) {
+    handlePageAction(action: any) {
       switch (action.action) {
       case RESET_CARDS_ACTION:
         this.resetCards();
@@ -247,21 +372,22 @@ export default {
       }
     },
 
-    cpuUsed(cluster) {
+    cpuUsed(cluster: any) {
       return parseSi(cluster.status.requested?.cpu);
     },
 
-    cpuAllocatable(cluster) {
+    cpuAllocatable(cluster: any) {
       return parseSi(cluster.status.allocatable?.cpu);
     },
-    memoryAllocatable(cluster) {
+
+    memoryAllocatable(cluster: any) {
       const parsedAllocatable = (parseSi(cluster.status.allocatable?.memory) || 0).toString();
       const format = createMemoryFormat(parsedAllocatable);
 
       return formatSi(parsedAllocatable, format);
     },
 
-    memoryReserved(cluster) {
+    memoryReserved(cluster: any) {
       const memValues = createMemoryValues(cluster?.status?.allocatable?.memory, cluster?.status?.requested?.memory);
 
       return `${ memValues.useful }/${ memValues.total } ${ memValues.units }`;
@@ -296,9 +422,10 @@ export default {
       }
     }
   }
-};
+});
 
 </script>
+
 <template>
   <div
     v-if="managementReady"
@@ -369,14 +496,21 @@ export default {
               v-if="mcm"
               class="col span-12"
             >
-              <SortableTable
+              <!-- // TODO: RC check loading indicator when pagination off -->
+              <PaginatedResourceTable
+                :schema="provClusterSchema"
                 :table-actions="false"
                 :row-actions="false"
                 key-field="id"
-                :rows="kubeClusters"
-                :headers="clusterHeaders"
-                :loading="!kubeClusters"
-                :paging="true"
+                :headers="headers"
+                :pagination-headers="paginationHeaders"
+                context="home"
+
+                :namespaced="false"
+                :request-filters="paginationRequestFilters"
+                manualRefreshButtonSize="sm"
+                :fetchSecondaryResources="fetchSecondaryResources"
+                :fetchPageSecondaryResources="fetchPageSecondaryResources"
               >
                 <template #header-left>
                   <div class="row table-heading">
@@ -384,19 +518,19 @@ export default {
                       {{ t('landing.clusters.title') }}
                     </h2>
                     <BadgeState
-                      v-if="kubeClusters"
-                      :label="kubeClusters.length.toString()"
+                      v-if="clusterCount"
+                      :label="clusterCount.toString()"
                       color="role-tertiary ml-20 mr-20"
                     />
                   </div>
                 </template>
                 <template
-                  v-if="canCreateCluster || canManageClusters"
+                  v-if="canCreateCluster || !!provClusterSchema"
                   #header-middle
                 >
                   <div class="table-heading">
                     <router-link
-                      v-if="canManageClusters"
+                      v-if="!!provClusterSchema"
                       :to="manageLocation"
                       class="btn btn-sm role-secondary"
                       data-testid="cluster-management-manage-button"
@@ -487,7 +621,7 @@ export default {
                     {{ t('landing.clusters.explore') }}
                   </button>
                 </template> -->
-              </SortableTable>
+              </PaginatedResourceTable>
             </div>
             <div
               v-else
@@ -502,6 +636,7 @@ export default {
     </IndentedPanel>
   </div>
 </template>
+
 <style lang='scss' scoped>
   .home-panels {
     display: flex;
@@ -591,6 +726,7 @@ export default {
     }
   }
 </style>
+
 <style lang="scss">
 .home-page {
   .search {
diff --git a/shell/plugins/dashboard-store/actions.js b/shell/plugins/dashboard-store/actions.js
index ab063bed970..35514a91750 100644
--- a/shell/plugins/dashboard-store/actions.js
+++ b/shell/plugins/dashboard-store/actions.js
@@ -384,7 +384,7 @@ export default {
     }
 
     // No need to request the resources if we have them already
-    if (!opt.force && getters['havePaginatedPage'](type, opt)) {
+    if (!opt.transient && !opt.force && getters['havePaginatedPage'](type, opt)) {
       return findAllGetter(getters, type, opt);
     }
 
@@ -408,24 +408,26 @@ export default {
       return Promise.reject(e);
     }
 
-    commit('loadPage', {
-      ctx,
-      type,
-      data:       out.data,
-      pagination: opt.pagination ? {
-        request: {
-          namespace:  opt.namespaced,
-          pagination: opt.pagination
-        },
-        result: {
-          count:     out.count,
-          pages:     out.pages || Math.ceil(out.count / (opt.pagination.pageSize || Number.MAX_SAFE_INTEGER)),
-          timestamp: new Date().getTime()
-        }
-      } : undefined,
-    });
+    const pagination = opt.pagination ? {
+      request: {
+        namespace:  opt.namespaced,
+        pagination: opt.pagination
+      },
+      result: {
+        count:     out.count,
+        pages:     out.pages || Math.ceil(out.count / (opt.pagination.pageSize || Number.MAX_SAFE_INTEGER)),
+        timestamp: new Date().getTime()
+      }
+    } : undefined;
 
-    const all = findAllGetter(getters, type, opt);
+    if (!opt.transient) {
+      commit('loadPage', {
+        ctx,
+        type,
+        data: out.data,
+        pagination,
+      });
+    }
 
     if (opt.hasManualRefresh) {
       dispatch('resource-fetch/updateManualRefreshIsLoading', false, { root: true });
@@ -433,7 +435,10 @@ export default {
 
     garbageCollect.gcUpdateLastAccessed(ctx, type);
 
-    return all;
+    return opt.transient ? {
+      data: out.data,
+      pagination
+    } : findAllGetter(getters, type, opt);
   },
 
   async findMatching(ctx, {
diff --git a/shell/plugins/dashboard-store/getters.js b/shell/plugins/dashboard-store/getters.js
index d664941540b..db764a3b0e5 100644
--- a/shell/plugins/dashboard-store/getters.js
+++ b/shell/plugins/dashboard-store/getters.js
@@ -445,9 +445,12 @@ export default {
     return undefined;
   },
 
-  paginationEnabled: (state, getters, rootState, rootGetters) => (type = null) => {
+  paginationEnabled: (state, getters, rootState, rootGetters) => (args) => {
+    const id = typeof args === 'object' ? args.id : args;
+    const context = typeof args === 'object' ? args.context : undefined;
+
     const store = state.config.namespace;
-    const resource = type ? { id: type } : null;
+    const resource = id || context ? { id, context } : null;
 
     return paginationUtils.isEnabled({ rootGetters }, { store, resource });
   }
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index 525faa9fb74..0f8f1cf79fe 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -4,8 +4,10 @@ import { NAMESPACE_FILTER_ALL_SYSTEM, NAMESPACE_FILTER_ALL_USER, NAMESPACE_FILTE
 import Namespace from '@shell/models/namespace';
 import { uniq } from '@shell/utils/array';
 import {
+  CAPI,
   CONFIG_MAP, MANAGEMENT, NAMESPACE, NODE, POD
 } from '@shell/config/types';
+import { CAPI as CAPI_LABELS } from '@shell/config/labels-annotations';
 import { Schema } from '@shell/plugins/steve/schema';
 
 class NamespaceProjectFilters {
@@ -107,8 +109,8 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     '': [// all types
       { field: 'metadata.name' },
       { field: 'metadata.namespace' },
-      // { field: 'id' }, // Pending API support
-      // { field: 'metadata.state.name' }, // Pending API support
+      { field: 'id' },
+      { field: 'metadata.state.name' },
       { field: 'metadata.creationTimestamp' },
     ],
     [NODE]: [
@@ -122,11 +124,33 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     [MANAGEMENT.NODE]: [
       { field: 'status.nodeName' },
     ],
+    [MANAGEMENT.NODE_POOL]: [
+      { field: 'spec.clusterName' }, // TODO: RC TEST
+    ],
+    [MANAGEMENT.NODE_TEMPLATE]: [
+      { field: 'spec.clusterName' }, // TODO: RC TEST
+    ],
+    [MANAGEMENT.CLUSTER]: [
+      // { field: 'spec.internal' }, // Pending API support https://github.com/rancher/rancher/issues/48011
+      // { field: 'spec.displayName' }, // Pending API support https://github.com/rancher/rancher/issues/48011
+    ],
     [CONFIG_MAP]: [
       { field: 'metadata.labels[harvesterhci.io/cloud-init-template]' }
     ],
     [NAMESPACE]: [
       { field: 'metadata.labels[field.cattle.io/projectId]' }
+    ],
+    [CAPI.MACHINE]: [
+      { field: 'spec.clusterName' } // TODO: RC TEST
+    ],
+    [CAPI.RANCHER_CLUSTER]: [
+      { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` }, // TODO: RC TEST
+      { field: `status.provider` }, // TODO: RC TEST
+      { field: 'status.allocatable.cpu' }, // TODO: RC TEST
+      { field: 'status.allocatable.memory' }, // TODO: RC TEST
+      { field: 'status.allocatable.pods' }, // TODO: RC TEST
+
+      // { field: 'status.clusterName' }, // Pending API support https://github.com/rancher/rancher/issues/48011
     ]
   }
 
diff --git a/shell/types/resources/settings.d.ts b/shell/types/resources/settings.d.ts
index 800467f0c96..7259b1097c0 100644
--- a/shell/types/resources/settings.d.ts
+++ b/shell/types/resources/settings.d.ts
@@ -20,7 +20,7 @@ export interface PaginationSettings {
           /**
            * Specific resource type to enable
            */
-          enabled: string[],
+          enabled: (string | { resource: string, context: string[]})[],
           /**
            * There's no hardcoded headers or custom list for the resource type, headers will be generated from schema attributes.columns
            */
diff --git a/shell/types/store/pagination.types.ts b/shell/types/store/pagination.types.ts
index 716c7c3d9ff..356cbe4b4b7 100644
--- a/shell/types/store/pagination.types.ts
+++ b/shell/types/store/pagination.types.ts
@@ -455,3 +455,16 @@ export interface StorePagination {
    */
   result: StorePaginationResult
 }
+
+/**
+ * The resource and context that the pagination request will be used
+ *
+ * Used to determine if the request is supported
+*/
+export interface PaginationResourceContext {
+  store: string,
+  resource?: {
+    id: string,
+    context?: string,
+  }
+}
diff --git a/shell/types/store/vuex.d.ts b/shell/types/store/vuex.d.ts
index afcea5579ce..4d0fe8a47d8 100644
--- a/shell/types/store/vuex.d.ts
+++ b/shell/types/store/vuex.d.ts
@@ -7,3 +7,11 @@
 export interface VuexStoreGetters {
   [name:string]: Function
 }
+
+export interface VuexStore {
+  getters: VuexStoreGetters,
+  dispatch: any,
+
+  // When we have exact properties above we can remove below
+  [name:string]: any
+}
diff --git a/shell/utils/cluster.js b/shell/utils/cluster.js
index 8379497d14b..df502bbeb74 100644
--- a/shell/utils/cluster.js
+++ b/shell/utils/cluster.js
@@ -3,8 +3,87 @@ import { camelToTitle } from '@shell/utils/string';
 import { CAPI } from '@shell/config/labels-annotations';
 import { MANAGEMENT, VIRTUAL_HARVESTER_PROVIDER } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
+import { PaginationFilterField, PaginationParamFilter } from 'types/store/pagination.types';
 
-// Filter out any clusters that are not Kubernetes Clusters
+/**
+ * Combination of paginationFilterHiddenLocalCluster and paginationFilterOnlyKubernetesClusters
+ *
+ * @param {*} store
+ * @returns PaginationParam[]
+ */
+export function paginationFilterClusters(store) {
+  // TODO: RC TEST both facets
+  const paginationRequestFilters = [];
+  const pFilterOnlyKubernetesClusters = paginationFilterOnlyKubernetesClusters(store);
+  const pFilterHiddenLocalCluster = paginationFilterHiddenLocalCluster(store);
+
+  if (pFilterOnlyKubernetesClusters) {
+    paginationRequestFilters.push(pFilterOnlyKubernetesClusters);
+  }
+  if (pFilterHiddenLocalCluster) {
+    paginationRequestFilters.push(pFilterHiddenLocalCluster);
+  }
+
+  return paginationRequestFilters;
+}
+
+/**
+ * The vai backed api's `filter` equivalent of `filterHiddenLocalCluster`
+ *
+ * @export
+ * @param {*} store
+ * @returns PaginationParam | null
+ */
+export function paginationFilterHiddenLocalCluster(store) {
+  const hideLocalSetting = store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.HIDE_LOCAL_CLUSTER) || {};
+  const value = hideLocalSetting.value || hideLocalSetting.default || 'false';
+  const hideLocal = value === 'true';
+
+  if (!hideLocal) {
+    return null;
+  }
+
+  return PaginationParamFilter.createMultipleFields([
+    new PaginationFilterField({
+      field: `spec.internal`, // Pending API support https://github.com/rancher/rancher/issues/48011
+      value: false,
+    }),
+  ]);
+}
+
+/**
+ * The vai backed api's `filter` equivalent of `filterOnlyKubernetesClusters`
+ *
+ * @export
+ * @param {*} store
+ * @returns PaginationParam | null
+ */
+export function paginationFilterOnlyKubernetesClusters(store) {
+  const openHarvesterContainerWorkload = store.getters['features/get']('harvester-baremetal-container-workload');
+
+  if (!openHarvesterContainerWorkload) {
+    return null;
+  }
+
+  return PaginationParamFilter.createMultipleFields([
+    new PaginationFilterField({
+      field:  `metadata.labels."${ CAPI.PROVIDER }"`, // TODO: TEST
+      equals: false,
+      value:  VIRTUAL_HARVESTER_PROVIDER,
+      exact:  true
+    }),
+    new PaginationFilterField({
+      field:  `status.provider`, // TODO: TEST
+      equals: false,
+      value:  VIRTUAL_HARVESTER_PROVIDER,
+      exact:  true
+    }),
+  ]);
+}
+
+/**
+ * Filter out any clusters that are not Kubernetes Clusters
+ **/
 export function filterOnlyKubernetesClusters(mgmtClusters, store) {
   const openHarvesterContainerWorkload = store.getters['features/get']('harvester-baremetal-container-workload');
 
diff --git a/shell/utils/pagination-utils.ts b/shell/utils/pagination-utils.ts
index 44fc155c1a2..db40dc104a3 100644
--- a/shell/utils/pagination-utils.ts
+++ b/shell/utils/pagination-utils.ts
@@ -9,7 +9,7 @@ import {
   NAMESPACE_FILTER_NS_FULL_PREFIX,
   NAMESPACE_FILTER_P_FULL_PREFIX,
 } from '@shell/utils/namespace-filter';
-import { PaginationArgs, PaginationParam, PaginationSort } from '@shell/types/store/pagination.types';
+import { PaginationArgs, PaginationResourceContext, PaginationParam, PaginationSort } from '@shell/types/store/pagination.types';
 import { sameArrayObjects } from '@shell/utils/array';
 import { isEqual } from '@shell/utils/object';
 import { STEVE_CACHE } from '@shell/store/features';
@@ -40,12 +40,7 @@ class PaginationUtils {
   /**
    * Is pagination enabled at a global level or for a specific resource
    */
-  isEnabled({ rootGetters }: any, enabledFor: {
-    store: string,
-    resource?: {
-      id: string,
-    }
-  }) {
+  isEnabled({ rootGetters }: any, enabledFor: PaginationResourceContext) {
     // Cache must be enabled to support pagination api
     if (!this.isSteveCacheEnabled({ rootGetters })) {
       return false;
@@ -95,7 +90,21 @@ class PaginationUtils {
       return true;
     }
 
-    if (storeSettings.resources.enableSome.enabled.includes(enabledFor.resource.id)) {
+    if (storeSettings.resources.enableSome.enabled.find((setting) => {
+      if (typeof setting === 'string') {
+        return setting === enabledFor.resource?.id;
+      }
+
+      if (setting.resource === enabledFor.resource?.id) {
+        if (!!setting.context) {
+          return enabledFor.resource?.context ? setting.context.includes(enabledFor.resource.context) : false;
+        }
+
+        return true;
+      }
+
+      return false;
+    })) {
       return true;
     }
 
diff --git a/shell/utils/pagination-wrapper.ts b/shell/utils/pagination-wrapper.ts
new file mode 100644
index 00000000000..771d61d69c6
--- /dev/null
+++ b/shell/utils/pagination-wrapper.ts
@@ -0,0 +1,57 @@
+import paginationUtils from '@shell/utils/pagination-utils';
+import { PaginationArgs, PaginationResourceContext, StorePagination } from 'types/store/pagination.types';
+import { VuexStore } from 'types/store/vuex';
+
+interface Result<T> {
+  data: Array<T>
+  pagination: StorePagination
+}
+
+class PaginationWrapper<T = any> {
+    private $store: VuexStore;
+    private enabledFor: PaginationResourceContext;
+    private onUpdate: (out: Result<T>) => void; // TODO: RC wire in to web socket (when new socket stuff is available)
+
+    public isEnabled: boolean;
+
+    constructor({
+      $store,
+      enabledFor,
+      onUpdate,
+    }: {
+        $store: VuexStore,
+        onUpdate: (res: Result<T>) => void,
+        enabledFor: PaginationResourceContext,
+    }) {
+      this.$store = $store;
+      this.isEnabled = paginationUtils.isEnabled({ rootGetters: $store.getters }, enabledFor);
+      this.enabledFor = enabledFor;
+      this.onUpdate = onUpdate;
+    }
+
+    async request(args: {
+        pagination: PaginationArgs,
+        classify?: boolean,
+    }): Promise<Result<T>> {
+      if (!this.isEnabled) {
+        throw new Error(`Wrapper for type '${ this.enabledFor.store }/${ this.enabledFor.resource?.id }' in context '${ this.enabledFor.resource?.context }' not supported`);
+      }
+      const { pagination, classify: doClassify } = args;
+      const opt = {
+        transient: true,
+        pagination
+      };
+
+      const out: Result<T> = await this.$store.dispatch(`${ this.enabledFor.store }/findPage`, { opt, type: this.enabledFor.resource?.id });
+
+      if (doClassify) {
+        for (let i = 0; i < out.data.length; i++) {
+          out.data[i] = await this.$store.dispatch(`${ this.enabledFor.store }/create`, out.data[i]);
+        }
+      }
+
+      return out;
+    }
+}
+
+export default PaginationWrapper;

From f1858b6f02895ff77dbddebeb665a4fca932a6e9 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 2 Dec 2024 15:47:50 +0000
Subject: [PATCH 17/76] Iteration

Note - prov clusters is broken (only fetches local) due to blocking pr. breals
- notPinned list
---
 shell/components/AsyncButton.vue              |  1 +
 shell/components/PaginatedResourceTable.vue   |  8 ++--
 shell/components/SortableTable/index.vue      | 10 ++---
 shell/components/nav/TopLevelMenu.helper.ts   | 43 +++++++++++--------
 shell/components/nav/TopLevelMenu.vue         |  7 +--
 shell/pages/home.vue                          | 33 +++++++-------
 shell/plugins/steve/steve-pagination-utils.ts | 16 +++----
 shell/utils/cluster.js                        |  2 +-
 shell/utils/pagination-wrapper.ts             | 14 +++++-
 9 files changed, 74 insertions(+), 60 deletions(-)

diff --git a/shell/components/AsyncButton.vue b/shell/components/AsyncButton.vue
index 3abbf570017..f847dc07df8 100644
--- a/shell/components/AsyncButton.vue
+++ b/shell/components/AsyncButton.vue
@@ -288,6 +288,7 @@ export default defineComponent({
       v-if="displayIcon"
       v-clean-tooltip="tooltip"
       :class="{icon: true, 'icon-lg': true, [displayIcon]: true}"
+      class="ml-5 mr-0"
     />
     <span
       v-if="labelAs === 'text' && displayLabel"
diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
index b296cd7bcec..d820fe23666 100644
--- a/shell/components/PaginatedResourceTable.vue
+++ b/shell/components/PaginatedResourceTable.vue
@@ -4,7 +4,7 @@ import ResourceFetch from '@shell/mixins/resource-fetch';
 import ResourceTable from '@shell/components/ResourceTable.vue';
 import { StorePaginationResult } from 'types/store/pagination.types';
 
-export type FetchSecondaryResourcesOpts = { }
+export type FetchSecondaryResourcesOpts = { canPaginate: boolean }
 export type FetchSecondaryResources = (opts: FetchSecondaryResourcesOpts) => Promise<any>
 
 export type FetchPageSecondaryResourcesOpts = { canPaginate: boolean, force: boolean, page: any[], pagResult: StorePaginationResult }
@@ -61,7 +61,7 @@ export default defineComponent({
     /**
      * Information may be required from resources other than the primary one shown per row
      *
-     * This will fetch only those relevent to the current page using server-side pagination based filters
+     * This will fetch only those relevant to the current page using server-side pagination based filters
      *
      * called from shell/mixins/resource-fetch-api-pagination.js
      */
@@ -78,8 +78,8 @@ export default defineComponent({
   async fetch() {
     await this.$fetchType(this.resource, [], this.inStore);
 
-    if (this.canPaginate && this.fetchSecondaryResources) {
-      await this.fetchSecondaryResources({ });
+    if (this.fetchSecondaryResources) {
+      await this.fetchSecondaryResources({ canPaginate: this.canPaginate });
     }
   },
 
diff --git a/shell/components/SortableTable/index.vue b/shell/components/SortableTable/index.vue
index 5a06aa7676b..118e2ef2398 100644
--- a/shell/components/SortableTable/index.vue
+++ b/shell/components/SortableTable/index.vue
@@ -577,9 +577,9 @@ export default {
     showHeaderRow() {
       return this.search ||
         this.tableActions ||
-        this.$slots['header-left'] ||
-        this.$slots['header-middle'] ||
-        this.$slots['header-right'];
+        this.$slots['header-left']?.() ||
+        this.$slots['header-middle']?.() ||
+        this.$slots['header-right']?.();
     },
 
     columns() {
@@ -1115,7 +1115,6 @@ export default {
             </template>
           </slot>
         </div>
-        <!-- v-if="!hasAdvancedFiltering && $slots['header-middle']" TODO: RC -->
         <div
           v-if="!hasAdvancedFiltering && $slots['header-middle']"
           class="middle"
@@ -1123,7 +1122,6 @@ export default {
           <slot name="header-middle" />
         </div>
 
-        <!-- v-if="search || hasAdvancedFiltering || isTooManyItemsToAutoUpdate || $slots['header-right']" TODO: RC -->
         <div
           v-if="search || hasAdvancedFiltering || isTooManyItemsToAutoUpdate || $slots['header-right']"
           class="search row"
@@ -1676,7 +1674,7 @@ export default {
         margin-right: 10px;
         font-size: 11px;
       }
-     .cross {
+      .cross {
         font-size: 12px;
         font-weight: bold;
         cursor: pointer;
diff --git a/shell/components/nav/TopLevelMenu.helper.ts b/shell/components/nav/TopLevelMenu.helper.ts
index 5eac716c160..2389ec9e8b4 100644
--- a/shell/components/nav/TopLevelMenu.helper.ts
+++ b/shell/components/nav/TopLevelMenu.helper.ts
@@ -2,7 +2,6 @@ import { CAPI, MANAGEMENT } from 'config/types';
 import { PaginationParam, PaginationParamFilter, PaginationSort } from 'types/store/pagination.types';
 import { VuexStore } from 'types/store/vuex';
 import { filterHiddenLocalCluster, filterOnlyKubernetesClusters, paginationFilterClusters } from 'utils/cluster';
-import devConsole from 'utils/dev-console';
 import PaginationWrapper from 'utils/pagination-wrapper';
 import { allHash } from 'utils/promise';
 import { sortBy } from 'utils/sort';
@@ -35,14 +34,14 @@ type MgmtCluster = {
 type ProvCluster = {
   [key: string]: any
 }
+
 /**
  * Order
- * 1. Specific Local Cluster
- * 2. Ready
- * 3. Name
+ * 1. local cluster - https://github.com/rancher/dashboard/issues/10975
+ * 2. working clusters
+ * 3. name
  */
 const DEFAULT_SORT: Array<PaginationSort> = [
-  // Put local cluster at top of list - https://github.com/rancher/dashboard/issues/10975
   // {
   //   asc:   true,
   //   field: 'spec.internal', // Pending API support https://github.com/rancher/rancher/issues/48011
@@ -98,6 +97,8 @@ export abstract class BaseTopLevelMenuHelper {
   * 2. If local or not (filterHiddenLocalCluster)
   * 3. Is pinned
   *
+  * Why aren't we filtering these by search term? Because we don't show pinned when filtering on search term
+  *
   * Sort By
   * 1. is local cluster (appears at top)
   * 2. ready
@@ -143,6 +144,9 @@ export abstract class BaseTopLevelMenuHelper {
   }
 }
 
+/**
+ * Helper designed to supply paginated results for the top level menu cluster resources
+ */
 export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper implements TopLevelMenuHelper {
   private args?: UpdateArgs;
 
@@ -152,14 +156,9 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
 
   private commonClusterFilters: PaginationParam[];
 
-  /**
-   *
-   */
   constructor({ $store }: {
       $store: VuexStore,
   }) {
-    devConsole.warn('TLM.helper', 'TopLevelMenuHelperPagination');
-
     super({ $store });
 
     this.commonClusterFilters = paginationFilterClusters({ getters: this.$store.getters });
@@ -167,7 +166,8 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
     this.clustersPinnedWrapper = new PaginationWrapper({
       $store,
       onUpdate: () => {
-        // TODO: RC trigger on websocket update (only need 1 trigger for this cluster type)
+        // trigger on websocket update (only need 1 trigger for this cluster type)
+        // https://github.com/rancher/rancher/issues/40773 / https://github.com/rancher/dashboard/issues/12734
         if (this.args) {
           this.update(this.args);
         }
@@ -183,7 +183,8 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
     this.clustersOthersWrapper = new PaginationWrapper({
       $store,
       onUpdate: (res) => {
-        // TODO: RC trigger on websocket update (only need 1 trigger for this cluster type)
+        // trigger on websocket update (only need 1 trigger for this cluster type)
+        // https://github.com/rancher/rancher/issues/40773 / https://github.com/rancher/dashboard/issues/12734
         if (this.args) {
           this.update(this.args);
         }
@@ -199,7 +200,8 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
     this.provClusterWrapper = new PaginationWrapper({
       $store,
       onUpdate: (res) => {
-        // TODO: RC trigger on websocket update
+        // trigger on websocket update (only need 1 trigger for this cluster type)
+        // https://github.com/rancher/rancher/issues/40773 / https://github.com/rancher/dashboard/issues/12734
         if (this.args) {
           this.update(this.args);
         }
@@ -277,7 +279,7 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
       }
 
       if (excludePinned) {
-        // cluster id is NOT 1 AND NOT 2 OR 3 OR 4...
+        // cluster id is NOT 1 AND NOT 2 AND NOT 3 AND NOT 4...
         filters.push(...pinnedIds.map((id) => PaginationParamFilter.createSingleField({
           field: 'id', equals: false, value: id
         })));
@@ -302,6 +304,11 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
    * See `clustersPinned` description for details
    */
   private async updatePinned(args: UpdateArgs): Promise<MgmtCluster[]> {
+    if (args.pinnedIds?.length < 1) {
+      // Return early, otherwise we're fetching all clusters...
+      return Promise.resolve([]);
+    }
+
     return this.clustersPinnedWrapper.request({
       pagination: {
         filters: this.constructParams({
@@ -364,13 +371,15 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
   }
 }
 
+/**
+ * Helper designed to supply non-pagainted results for the top level menu cluster resources
+ */
 export class TopLevelMenuHelperLegacy extends BaseTopLevelMenuHelper implements TopLevelMenuHelper {
   private hasProvCluster: boolean;
 
   constructor({ $store }: {
     $store: VuexStore,
   }) {
-    devConsole.warn('TLM.helper', 'TopLevelMenuHelperLegacy');
     super({ $store });
 
     this.hasProvCluster = this.$store.getters[`management/schemaFor`](CAPI.RANCHER_CLUSTER);
@@ -381,13 +390,10 @@ export class TopLevelMenuHelperLegacy extends BaseTopLevelMenuHelper implements
   }
 
   async update(args: UpdateArgs) {
-    devConsole.warn('TLM.helper', 'TopLevelMenuHelperLegacy', 'update');
     const clusters = this.updateClusters();
     const _clustersNotPinned = this.clustersFiltered(clusters, args);
     const _clustersPinned = this.pinFiltered(clusters, args);
 
-    devConsole.warn('TLM.helper', 'TopLevelMenuHelperLegacy', 'update', 'res', _clustersPinned, _clustersNotPinned);
-
     this.clustersPinned.length = 0;
     this.clustersOthers.length = 0;
 
@@ -404,7 +410,6 @@ export class TopLevelMenuHelperLegacy extends BaseTopLevelMenuHelper implements
    * Convert remaining clusters to special format
    */
   private updateClusters(): TopLevelMenuCluster[] {
-    devConsole.warn('');
     if (!this.hasProvCluster) {
       // We're filtering out mgmt clusters without prov clusters, so if the user can't see any prov clusters at all
       // exit early
diff --git a/shell/components/nav/TopLevelMenu.vue b/shell/components/nav/TopLevelMenu.vue
index 1d655d24109..9d820bfbce6 100644
--- a/shell/components/nav/TopLevelMenu.vue
+++ b/shell/components/nav/TopLevelMenu.vue
@@ -16,12 +16,9 @@ import { isRancherPrime } from '@shell/config/version';
 import Pinned from '@shell/components/nav/Pinned';
 import { getGlobalBannerFontSizes } from '@shell/utils/banners';
 import { TopLevelMenuHelperPagination, TopLevelMenuHelperLegacy } from 'components/nav/TopLevelMenu.helper';
-import devConsole from 'utils/dev-console';
 import { debounce } from 'lodash';
 
-// TODO: RC wire in socket updates to pagination wrapper
-// TODO: RC test search properly
-// TODO: RC loading indicators?
+// TODO: RC (home page/side bar) test search properly
 
 export default {
   components: {
@@ -46,8 +43,6 @@ export default {
     const provClusters = !canPagination && hasProvCluster ? this.$store.getters[`management/all`](CAPI.RANCHER_CLUSTER) : [];
     const mgmtClusters = !canPagination ? this.$store.getters[`management/all`](MANAGEMENT.CLUSTER) : [];
 
-    devConsole.warn(provClusters, mgmtClusters);
-
     return {
       shown:             false,
       displayVersion,
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index a5c34fd1c84..06acfb849ee 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -26,7 +26,6 @@ import { ActionFindPageArgs } from '@shell/types/store/dashboard-store.types';
 import { RESET_CARDS_ACTION, SET_LOGIN_ACTION } from '@shell/config/page-actions';
 import { STEVE_NAME_COL, STEVE_STATE_COL } from 'config/pagination-table-headers';
 import { PaginationParamFilter, FilterArgs, PaginationFilterField } from 'types/store/pagination.types';
-import devConsole from 'utils/dev-console';
 import ProvCluster from 'models/provisioning.cattle.io.cluster';
 
 export default defineComponent({
@@ -131,14 +130,12 @@ export default defineComponent({
           value: '',
           name:  'cpu',
           sort:  ['status.allocatable.cpu', 'status.available.cpu']
-
         },
         {
           label: this.t('tableHeaders.memory'),
           value: '',
           name:  'memory',
           sort:  ['status.allocatable.memory', 'status.available.memory']
-
         },
         {
           label:        this.t('tableHeaders.pods'),
@@ -159,8 +156,6 @@ export default defineComponent({
         {
           ...STEVE_NAME_COL,
           canBeVariable: true,
-          // TODO: RC ISSUE describe. search sort on prov meta namespace
-          // getValue:      (row: ProvCluster) => row.mgmt?.nameDisplay || row.metadata?.name
           getValue:      (row: ProvCluster) => row.metadata?.name
         },
         {
@@ -244,8 +239,15 @@ export default defineComponent({
   },
 
   methods: {
-    fetchSecondaryResources(opts: FetchSecondaryResourcesOpts) {
-      // TODO: RC TEST with pagination off and on
+    /**
+     * Of type FetchSecondaryResources
+     */
+    fetchSecondaryResources(opts: FetchSecondaryResourcesOpts): Promise<any> {
+      if (opts.canPaginate) {
+        return Promise.resolve({});
+      }
+
+      // TODO: RC (home page/side bar) TEST with pagination off and on
       if ( this.canViewMgmtClusters ) {
         this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER });
       }
@@ -266,6 +268,8 @@ export default defineComponent({
       if ( this.canViewMgmtTemplates ) {
         this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_TEMPLATE });
       }
+
+      return Promise.resolve({});
     },
 
     async fetchPageSecondaryResources({
@@ -296,7 +300,7 @@ export default defineComponent({
       if ( this.canViewMachine ) {
         const opt: ActionFindPageArgs = {
           force,
-          // TODO: RC Validate
+          // TODO: RC (home page/side bar) Validate
           pagination: new FilterArgs({
             filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
               field: 'spec.clusterName',
@@ -305,17 +309,17 @@ export default defineComponent({
           })
         };
 
-        this.$store.dispatch(`management/findPage`, { type: CAPI.MACHINE, opt });
+        await this.$store.dispatch(`management/findPage`, { type: CAPI.MACHINE, opt });
       }
 
       if ( this.canViewMgmtNodes ) {
         const opt: ActionFindPageArgs = {
           force,
-          // TODO: RC Validate
           pagination: new FilterArgs({
             filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
               field: 'id',
-              value: r.mgmtClusterId
+              value: r.mgmtClusterId,
+              exact: false,
             }))),
           })
         };
@@ -327,7 +331,7 @@ export default defineComponent({
       if ( this.canViewMgmtPools && this.canViewMgmtTemplates) {
         const poolOpt: ActionFindPageArgs = {
           force,
-          // TODO: RC Validate
+          // TODO: RC (home page/side bar) Validate
           pagination: new FilterArgs({
             filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
               field: 'spec.clusterName',
@@ -340,8 +344,7 @@ export default defineComponent({
 
         const templateOpt: ActionFindPageArgs = {
           force,
-          // pagination: new FilterArgs({}),
-          // TODO: RC Validate
+          // TODO: RC (home page/side bar) Validate
           pagination: new FilterArgs({
             filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
               field: 'spec.clusterName',
@@ -496,7 +499,7 @@ export default defineComponent({
               v-if="mcm"
               class="col span-12"
             >
-              <!-- // TODO: RC check loading indicator when pagination off -->
+              <!-- // TODO: RC (home page/side bar) TEST with pagination off and on. check loading indicator when pagination off -->
               <PaginatedResourceTable
                 :schema="provClusterSchema"
                 :table-actions="false"
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index 0f8f1cf79fe..d0b5c06bcb7 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -125,10 +125,10 @@ class StevePaginationUtils extends NamespaceProjectFilters {
       { field: 'status.nodeName' },
     ],
     [MANAGEMENT.NODE_POOL]: [
-      { field: 'spec.clusterName' }, // TODO: RC TEST
+      { field: 'spec.clusterName' }, // TODO: RC (home page/side bar) TEST
     ],
     [MANAGEMENT.NODE_TEMPLATE]: [
-      { field: 'spec.clusterName' }, // TODO: RC TEST
+      { field: 'spec.clusterName' }, // TODO: RC (home page/side bar) TEST
     ],
     [MANAGEMENT.CLUSTER]: [
       // { field: 'spec.internal' }, // Pending API support https://github.com/rancher/rancher/issues/48011
@@ -141,14 +141,14 @@ class StevePaginationUtils extends NamespaceProjectFilters {
       { field: 'metadata.labels[field.cattle.io/projectId]' }
     ],
     [CAPI.MACHINE]: [
-      { field: 'spec.clusterName' } // TODO: RC TEST
+      { field: 'spec.clusterName' } // TODO: RC (home page/side bar) TEST
     ],
     [CAPI.RANCHER_CLUSTER]: [
-      { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` }, // TODO: RC TEST
-      { field: `status.provider` }, // TODO: RC TEST
-      { field: 'status.allocatable.cpu' }, // TODO: RC TEST
-      { field: 'status.allocatable.memory' }, // TODO: RC TEST
-      { field: 'status.allocatable.pods' }, // TODO: RC TEST
+      { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` }, // TODO: RC (home page/side bar) TEST
+      { field: `status.provider` }, // TODO: RC (home page/side bar) TEST
+      { field: 'status.allocatable.cpu' }, // TODO: RC (home page/side bar) TEST
+      { field: 'status.allocatable.memory' }, // TODO: RC (home page/side bar) TEST
+      { field: 'status.allocatable.pods' }, // TODO: RC (home page/side bar) TEST
 
       // { field: 'status.clusterName' }, // Pending API support https://github.com/rancher/rancher/issues/48011
     ]
diff --git a/shell/utils/cluster.js b/shell/utils/cluster.js
index df502bbeb74..bce89385747 100644
--- a/shell/utils/cluster.js
+++ b/shell/utils/cluster.js
@@ -12,7 +12,7 @@ import { PaginationFilterField, PaginationParamFilter } from 'types/store/pagina
  * @returns PaginationParam[]
  */
 export function paginationFilterClusters(store) {
-  // TODO: RC TEST both facets
+  // TODO: RC (home page/side bar) TEST both facets
   const paginationRequestFilters = [];
   const pFilterOnlyKubernetesClusters = paginationFilterOnlyKubernetesClusters(store);
   const pFilterHiddenLocalCluster = paginationFilterHiddenLocalCluster(store);
diff --git a/shell/utils/pagination-wrapper.ts b/shell/utils/pagination-wrapper.ts
index 771d61d69c6..f8b2144ca2e 100644
--- a/shell/utils/pagination-wrapper.ts
+++ b/shell/utils/pagination-wrapper.ts
@@ -7,10 +7,22 @@ interface Result<T> {
   pagination: StorePagination
 }
 
+/**
+ * This is a helper class that will assist in fetching a resource
+ * - Handle if the resource can be fetched by the new pagination api
+ * - Make a request to get a page (including classify)
+ * - Provide updates when the resource changes
+ *
+ * This is designed to work in places where we don't/can't store the resource in the store
+ * - There already exists a resource we don't want to overwrite
+ * - We're transient and want something nicer than just cluster/request
+ */
 class PaginationWrapper<T = any> {
     private $store: VuexStore;
     private enabledFor: PaginationResourceContext;
-    private onUpdate: (out: Result<T>) => void; // TODO: RC wire in to web socket (when new socket stuff is available)
+
+    // Blocked on https://github.com/rancher/rancher/issues/40773 / https://github.com/rancher/dashboard/issues/12734
+    private onUpdate: (out: Result<T>) => void;
 
     public isEnabled: boolean;
 

From 96b6b9abd7d0f97c4751a43c05e34df1c55afbdd Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 3 Dec 2024 10:14:56 +0000
Subject: [PATCH 18/76] Fix dupe inStore - remove from resource list, put in
 resource-fetch (used also by pag res table)

---
 shell/components/ResourceList/index.vue       |  2 --
 shell/mixins/resource-fetch-api-pagination.js |  4 ----
 shell/mixins/resource-fetch.js                | 11 ++++++++++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/shell/components/ResourceList/index.vue b/shell/components/ResourceList/index.vue
index 28e399da679..442143ada45 100644
--- a/shell/components/ResourceList/index.vue
+++ b/shell/components/ResourceList/index.vue
@@ -96,11 +96,9 @@ export default {
     const showMasthead = getters[`type-map/optionsFor`](resource).showListMasthead;
 
     return {
-      inStore,
       schema,
       hasListComponent,
       showMasthead:                     showMasthead === undefined ? true : showMasthead,
-      resource,
       extensionType:                    ExtensionPoint.PANEL,
       extensionLocation:                PanelLocation.RESOURCE_LIST,
       loadResources:                    [resource], // List of resources that will be loaded, this could be many (`Workloads`)
diff --git a/shell/mixins/resource-fetch-api-pagination.js b/shell/mixins/resource-fetch-api-pagination.js
index e73e9b18640..7e548c51f57 100644
--- a/shell/mixins/resource-fetch-api-pagination.js
+++ b/shell/mixins/resource-fetch-api-pagination.js
@@ -213,10 +213,6 @@ export default {
     showDynamicRancherNamespaces() {
       return this.$store.getters['prefs/get'](ALL_NAMESPACES);
     },
-
-    inStore() {
-      return this.$store.getters['currentStore'](this.resource) || this.currentProduct?.inStore;
-    }
   },
 
   watch: {
diff --git a/shell/mixins/resource-fetch.js b/shell/mixins/resource-fetch.js
index 171bb0a4fbd..44fe62718e9 100644
--- a/shell/mixins/resource-fetch.js
+++ b/shell/mixins/resource-fetch.js
@@ -31,11 +31,18 @@ export default {
       perfConfig = DEFAULT_PERF_SETTING;
     }
 
+    // Normally owner components supply `resource` and `inStore` as part of their data, however these are needed here before parent data runs
+    // So set up both here
+    const params = { ...this.$route.params };
+    const resource = params.resource || this.schema.id; // Resource can either be on a page showing single list, or a page of a resource showing a list of another resource
+    const inStore = this.$store.getters['currentStore'](resource);
+
     return {
+      inStore,
       perfConfig,
       init:                       false,
       multipleResources:          [],
-      loadResources:              [this.resource],
+      loadResources:              [resource],
       // manual refresh vars
       hasManualRefresh:           false,
       watch:                      true,
@@ -72,6 +79,7 @@ export default {
 
   computed: {
     ...mapGetters({ refreshFlag: 'resource-fetch/refreshFlag' }),
+
     rows() {
       const currResource = this.fetchedResourceType.find((item) => item.type === this.resource);
 
@@ -92,6 +100,7 @@ export default {
 
       return [];
     },
+
     loading() {
       if (this.canPaginate) {
         return this.paginating;

From 442d85c2c805d6fffd55fcbdb3fe2508b8e9ead8 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 3 Dec 2024 10:14:56 +0000
Subject: [PATCH 19/76] Fix dupe inStore - remove from resource list, put in
 resource-fetch (used also by pag res table)

---
 shell/components/ResourceList/index.vue       |  1 -
 shell/mixins/resource-fetch-api-pagination.js |  4 ----
 shell/mixins/resource-fetch.js                | 11 ++++++++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/shell/components/ResourceList/index.vue b/shell/components/ResourceList/index.vue
index 28e399da679..7d66ac23764 100644
--- a/shell/components/ResourceList/index.vue
+++ b/shell/components/ResourceList/index.vue
@@ -96,7 +96,6 @@ export default {
     const showMasthead = getters[`type-map/optionsFor`](resource).showListMasthead;
 
     return {
-      inStore,
       schema,
       hasListComponent,
       showMasthead:                     showMasthead === undefined ? true : showMasthead,
diff --git a/shell/mixins/resource-fetch-api-pagination.js b/shell/mixins/resource-fetch-api-pagination.js
index e73e9b18640..7e548c51f57 100644
--- a/shell/mixins/resource-fetch-api-pagination.js
+++ b/shell/mixins/resource-fetch-api-pagination.js
@@ -213,10 +213,6 @@ export default {
     showDynamicRancherNamespaces() {
       return this.$store.getters['prefs/get'](ALL_NAMESPACES);
     },
-
-    inStore() {
-      return this.$store.getters['currentStore'](this.resource) || this.currentProduct?.inStore;
-    }
   },
 
   watch: {
diff --git a/shell/mixins/resource-fetch.js b/shell/mixins/resource-fetch.js
index 171bb0a4fbd..44fe62718e9 100644
--- a/shell/mixins/resource-fetch.js
+++ b/shell/mixins/resource-fetch.js
@@ -31,11 +31,18 @@ export default {
       perfConfig = DEFAULT_PERF_SETTING;
     }
 
+    // Normally owner components supply `resource` and `inStore` as part of their data, however these are needed here before parent data runs
+    // So set up both here
+    const params = { ...this.$route.params };
+    const resource = params.resource || this.schema.id; // Resource can either be on a page showing single list, or a page of a resource showing a list of another resource
+    const inStore = this.$store.getters['currentStore'](resource);
+
     return {
+      inStore,
       perfConfig,
       init:                       false,
       multipleResources:          [],
-      loadResources:              [this.resource],
+      loadResources:              [resource],
       // manual refresh vars
       hasManualRefresh:           false,
       watch:                      true,
@@ -72,6 +79,7 @@ export default {
 
   computed: {
     ...mapGetters({ refreshFlag: 'resource-fetch/refreshFlag' }),
+
     rows() {
       const currResource = this.fetchedResourceType.find((item) => item.type === this.resource);
 
@@ -92,6 +100,7 @@ export default {
 
       return [];
     },
+
     loading() {
       if (this.canPaginate) {
         return this.paginating;

From cb18993b7a142b683d165f7932dbc1710fb33aba Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 4 Dec 2024 11:04:43 +0000
Subject: [PATCH 20/76] Two fixes - changes namespaces kicked of side nav
 cluster requests (thought pinnedIds changed) - fix generic lists re-fetching
 given ns filter changes (they don't have namespaced arg)

---
 shell/components/nav/TopLevelMenu.vue         |  9 +++++++--
 shell/mixins/resource-fetch-api-pagination.js | 17 +++++++++++++++--
 shell/mixins/resource-fetch.js                |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/shell/components/nav/TopLevelMenu.vue b/shell/components/nav/TopLevelMenu.vue
index 9d820bfbce6..20732186016 100644
--- a/shell/components/nav/TopLevelMenu.vue
+++ b/shell/components/nav/TopLevelMenu.vue
@@ -17,6 +17,7 @@ import Pinned from '@shell/components/nav/Pinned';
 import { getGlobalBannerFontSizes } from '@shell/utils/banners';
 import { TopLevelMenuHelperPagination, TopLevelMenuHelperLegacy } from 'components/nav/TopLevelMenu.helper';
 import { debounce } from 'lodash';
+import { sameContents } from '@shell/utils/array';
 
 // TODO: RC (home page/side bar) test search properly
 
@@ -265,8 +266,12 @@ export default {
 
     pinnedIds: {
       immediate: true,
-      handler(ids) {
-        this.updateClusters(ids);
+      handler(neu, old) {
+        if (sameContents(neu, old)) {
+          return;
+        }
+
+        this.updateClusters(neu);
       }
     },
 
diff --git a/shell/mixins/resource-fetch-api-pagination.js b/shell/mixins/resource-fetch-api-pagination.js
index 7e548c51f57..bd795f99fbe 100644
--- a/shell/mixins/resource-fetch-api-pagination.js
+++ b/shell/mixins/resource-fetch-api-pagination.js
@@ -78,7 +78,7 @@ export default {
     },
 
     namespaceFilterChanged(neu) {
-      if (!this.canPaginate || !this.schema?.attributes?.namespaced || !this.namespaced) {
+      if (!this.canPaginate || !this.isNamespaced) {
         return;
       }
 
@@ -176,6 +176,10 @@ export default {
         return;
       }
 
+      if (!this.resource) {
+        return false;
+      }
+
       const args = {
         id:      this.resource.id || this.resource,
         context: this.context,
@@ -213,6 +217,15 @@ export default {
     showDynamicRancherNamespaces() {
       return this.$store.getters['prefs/get'](ALL_NAMESPACES);
     },
+
+    isNamespaced() {
+      if (typeof this.namespaced !== 'undefined') {
+        // This is an override, but only if it's set
+        return !!this.namespaced;
+      }
+
+      return this.schema?.attributes?.namespaced;
+    }
   },
 
   watch: {
@@ -236,7 +249,7 @@ export default {
     namespaceFilters: {
       immediate: true,
       async handler(neu, old) {
-        if (!this.canPaginate || !this.schema?.attributes?.namespaced) {
+        if (!this.canPaginate || !this.isNamespaced) {
           return;
         }
 
diff --git a/shell/mixins/resource-fetch.js b/shell/mixins/resource-fetch.js
index 44fe62718e9..3b6ad16310d 100644
--- a/shell/mixins/resource-fetch.js
+++ b/shell/mixins/resource-fetch.js
@@ -34,7 +34,7 @@ export default {
     // Normally owner components supply `resource` and `inStore` as part of their data, however these are needed here before parent data runs
     // So set up both here
     const params = { ...this.$route.params };
-    const resource = params.resource || this.schema.id; // Resource can either be on a page showing single list, or a page of a resource showing a list of another resource
+    const resource = params.resource || this.schema?.id; // Resource can either be on a page showing single list, or a page of a resource showing a list of another resource
     const inStore = this.$store.getters['currentStore'](resource);
 
     return {

From 66f73dab5bae5fb65f36e5d22ca60a6bd2df16c0 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 4 Dec 2024 11:54:28 +0000
Subject: [PATCH 21/76] fixes / updates

---
 shell/assets/translations/en-us.yaml          |   1 +
 shell/components/PaginatedResourceTable.vue   |   1 +
 shell/components/ResourceList/index.vue       |  12 +-
 shell/components/SortableTable/index.vue      |   2 -
 shell/config/product/apps.js                  |  12 +-
 shell/config/product/explorer.js              |   6 +-
 shell/config/table-headers.js                 |   1 -
 shell/list/catalog.cattle.io.clusterrepo.vue  |  37 +++---
 shell/list/node.vue                           |   3 -
 shell/list/persistentvolume.vue               |   2 +-
 shell/mixins/resource-fetch-api-pagination.js |   9 +-
 shell/mixins/resource-fetch.js                |   2 +-
 .../pages/c/_cluster/explorer/EventsTable.vue |   5 +-
 .../pages/c/_cluster/settings/performance.vue |  22 ++--
 shell/pages/home.vue                          | 110 ------------------
 shell/plugins/steve/steve-pagination-utils.ts |  53 ++++-----
 16 files changed, 74 insertions(+), 204 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 9191cc65684..a8d81d1a8c4 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -7547,6 +7547,7 @@ performance:
     resources:
       generic: most resources in the cluster's 'More Resources' section
       all: All Resources
+    populateDefaults: Populate with latest pagination defaults
 banner:
   label: Fixed Banners
   settingName: Banners
diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
index a0b536e1b64..d25806812bb 100644
--- a/shell/components/PaginatedResourceTable.vue
+++ b/shell/components/PaginatedResourceTable.vue
@@ -116,6 +116,7 @@ export default defineComponent({
       <template
         v-for="(_, slot) of $slots"
         v-slot:[slot]="scope"
+        :key="slot"
       >
         <slot
           :name="slot"
diff --git a/shell/components/ResourceList/index.vue b/shell/components/ResourceList/index.vue
index b8117b13242..2de5ea37969 100644
--- a/shell/components/ResourceList/index.vue
+++ b/shell/components/ResourceList/index.vue
@@ -96,8 +96,8 @@ export default {
 
     const hasListComponent = getters['type-map/hasCustomList'](resource);
 
-    const derpinStore = getters['currentStore'](resource); // TODO: RC fix in parent commit (dupe inStore props)
-    const schema = getters[`${ derpinStore }/schemaFor`](resource);
+    const inStore = getters['currentStore'](resource);
+    const schema = getters[`${ inStore }/schemaFor`](resource);
 
     const showMasthead = getters[`type-map/optionsFor`](resource).showListMasthead;
 
@@ -105,6 +105,7 @@ export default {
       schema,
       hasListComponent,
       showMasthead:                     showMasthead === undefined ? true : showMasthead,
+      resource,
       extensionType:                    ExtensionPoint.PANEL,
       extensionLocation:                PanelLocation.RESOURCE_LIST,
       loadResources:                    [resource], // List of resources that will be loaded, this could be many (`Workloads`)
@@ -270,13 +271,6 @@ export default {
         v-bind="$data"
       />
     </div>
-    <!-- TODO: RC throw exception in findX that are no longer supported.. or will all be supported with tweak? should they use findPage? -->
-    <!-- this.uiServices = await this.$store.dispatch('cluster/findMatching', {
-        type:     SERVICE,
-        selector: 'app=longhorn-ui'
-      }); -->
-    <!-- // TODO: RC BUG. Switching between lists can show the 'no rows to show' message before populating with existing rows. only happens for below and not custom? -->
-    <!-- ||{{ hasListComponent }}||{{ canPaginate }}|| TODO: track if canPaginate is first brielfy false. block on it being populated? -->
     <ResourceTable
       v-else
       :schema="schema"
diff --git a/shell/components/SortableTable/index.vue b/shell/components/SortableTable/index.vue
index 0b025b2d3e2..af963c0f88e 100644
--- a/shell/components/SortableTable/index.vue
+++ b/shell/components/SortableTable/index.vue
@@ -23,7 +23,6 @@ import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { getParent } from '@shell/utils/dom';
 import { FORMATTERS } from '@shell/components/SortableTable/sortable-config';
 import ButtonMultiAction from '@shell/components/ButtonMultiAction.vue';
-import devConsole from 'utils/dev-console';
 
 // Uncomment for table performance debugging
 // import tableDebug from './debug';
@@ -497,7 +496,6 @@ export default {
 
     loading: {
       handler(neu, old) {
-        devConsole.warn('SS', 'watch', 'loading', neu, old);
         // Always ensure the Refresh button phase aligns with loading state (to ensure external phase changes which can then reset the internal phase changed by click)
         this.refreshButtonPhase = neu ? ASYNC_BUTTON_STATES.WAITING : ASYNC_BUTTON_STATES.ACTION;
 
diff --git a/shell/config/product/apps.js b/shell/config/product/apps.js
index 8eed64803fd..52ec2dd5919 100644
--- a/shell/config/product/apps.js
+++ b/shell/config/product/apps.js
@@ -80,10 +80,12 @@ export function init(store) {
     [STATE, NAME_COL, NAMESPACE, CHART, CHART_UPGRADE, APP_SUMMARY, AGE],
     [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, {
       ...CHART,
-      sort:   false, // 'spec.chart.metadata.name' // TODO: RC works at moment, won't soon?
-      search: false,
+      // TODO: RC REGRESSION
+      sort:   ['spec.chart.metadata.name'],
+      search: ['spec.chart.metadata.name'],
     }, {
       ...CHART_UPGRADE,
+      // TODO: RC REGRESSION
       sort:   false,
       search: false,
     },
@@ -95,12 +97,12 @@ export function init(store) {
     [STATE, NAME_COL, repoType, repoUrl, repoBranch, AGE],
     [STEVE_STATE_COL, STEVE_NAME_COL, {
       ...repoType,
-      // spec.gitRepo 'git || spec.url oci | http || ? // TODO: RC
-      sort:   ['spec.gitRepo'],
+      // TODO: RC REGRESSION Either 'git' (spec.gitRepo), 'oci' (spec.url && isOciType), 'http' (spec.url)
+      sort:   false,
       search: false,
     }, {
       ...repoUrl,
-      // urlDisplay --> status.url || spec.gitRepo || spec.url // TODO: RC
+      // TODO: RC REGRESSION Either status.url || spec.gitRepo || spec.url
       sort:   false,
       search: false,
     },
diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index d0685c1d6c0..5afa1de7560 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -184,7 +184,7 @@ export function init(store) {
   configureType(SNAPSHOT, { depaginate: true });
   configureType(NORMAN.ETCD_BACKUP, { depaginate: true });
 
-  // configureType(EVENT, { limit: 500 }); // TODO: RC search for where EVENT is requested
+  configureType(EVENT, { limit: 500 });
   weightType(EVENT, -1, true);
 
   configureType(POD, {
@@ -225,7 +225,7 @@ export function init(store) {
       STEVE_NAME_COL,
       { ...RECLAIM_POLICY },
       {
-        // TODO: RC Regression
+        // TODO: RC TEST once 48103
         ...PERSISTENT_VOLUME_CLAIM,
         sort:   ['metadata.fields.5'], // TODO: RC should be spec.volumeName of PVC --> PV, this is PV --> PVC
         search: ['metadata.fields.5'],
@@ -338,7 +338,7 @@ export function init(store) {
       }, {
         ...EVENT_TYPE,
         value: '_type',
-        sort:  '_type', // TODO: RC API request
+        sort:  '_type',
       },
       REASON,
       STEVE_EVENT_OBJECT,
diff --git a/shell/config/table-headers.js b/shell/config/table-headers.js
index c4378c8f429..708559aeec2 100644
--- a/shell/config/table-headers.js
+++ b/shell/config/table-headers.js
@@ -1,7 +1,6 @@
 import { CATTLE_PUBLIC_ENDPOINTS, STORAGE } from '@shell/config/labels-annotations';
 import { NODE as NODE_TYPE } from '@shell/config/types';
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
-import devConsole from 'utils/dev-console';
 
 // Note: 'id' is always the last sort, so you don't have to specify it here.
 
diff --git a/shell/list/catalog.cattle.io.clusterrepo.vue b/shell/list/catalog.cattle.io.clusterrepo.vue
index dce3fd0e5f6..c8c8ac32484 100644
--- a/shell/list/catalog.cattle.io.clusterrepo.vue
+++ b/shell/list/catalog.cattle.io.clusterrepo.vue
@@ -11,22 +11,10 @@ export default defineComponent({
   components: { PaginatedResourceTable },
 
   props: {
-    resource: {
-      type:     String,
-      required: true,
-    },
     schema: {
       type:     Object,
       required: true,
     },
-    rows: {
-      type:     Array,
-      required: true,
-    },
-    loading: {
-      type:     Boolean,
-      required: false,
-    },
     useQueryParamsForSimpleFiltering: {
       type:    Boolean,
       default: false
@@ -34,24 +22,24 @@ export default defineComponent({
   },
 
   methods: {
+    /**
+     * Filter out hidden repos from list of all repos
+     */
     filterRowsLocal(rows: ClusterRepo[]) {
-      // TODO: RC Test
+      // TODO: RC Test - no-vai
       return rows.filter((repo) => !(repo?.metadata?.annotations?.[CATALOG_ANNOTATIONS.HIDDEN_REPO] === 'true'));
     },
 
+    /**
+     * Filter out hidden repos via api
+     */
     filterRowsApi(pagination: PaginationArgs): PaginationArgs {
-      // TODO: RC Test once API updated
       if (!pagination.filters) {
         pagination.filters = [];
       }
 
-      const field = `metadata.annotations."${ CATALOG_ANNOTATIONS.HIDDEN_REPO }"`;
-      const required = PaginationParamFilter.createSingleField({
-        field,
-        exact:  true,
-        value:  'true',
-        equals: true
-      });
+      const field = `metadata.annotations[${ CATALOG_ANNOTATIONS.HIDDEN_REPO }]`;
+
       let existing: PaginationParamFilter | null = null;
 
       for (let i = 0; i < pagination.filters.length; i++) {
@@ -63,6 +51,13 @@ export default defineComponent({
         }
       }
 
+      const required = PaginationParamFilter.createSingleField({
+        field,
+        exact:  true,
+        value:  'true',
+        equals: false
+      });
+
       if (!!existing) {
         Object.assign(existing, required);
       } else {
diff --git a/shell/list/node.vue b/shell/list/node.vue
index 0de39ee7125..aa017ed294c 100644
--- a/shell/list/node.vue
+++ b/shell/list/node.vue
@@ -186,8 +186,6 @@ export default defineComponent({
     },
 
     fetchSecondaryResources(): { [key: string]: Promise<any>} {
-      devConsole.warn('node', 'methods', 'fetchSecondaryResources');
-
       const hash: { [key: string]: Promise<any>} = {};
 
       if (this.canViewMgmtNodes) {
@@ -315,7 +313,6 @@ export default defineComponent({
       data-testid="cluster-node-list"
     >
       <template #sub-row="{fullColspan, row, onRowMouseEnter, onRowMouseLeave}">
-        <!-- TODO: RC TEST -->
         <tr
           class="taints sub-row"
           :class="{'empty-taints': ! row.displayTaintsAndLabels}"
diff --git a/shell/list/persistentvolume.vue b/shell/list/persistentvolume.vue
index c126e4c5897..a6601112d46 100644
--- a/shell/list/persistentvolume.vue
+++ b/shell/list/persistentvolume.vue
@@ -48,7 +48,7 @@ export default defineComponent({
           filters: [],
           // Pending API support https://github.com/rancher/rancher/issues/48103
           // filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
-          //   field: 'spec.volumeName', // TODO: RC id??
+          //   field: 'spec.volumeName',
           //   value: r.metadata.name
           // }))),
         })
diff --git a/shell/mixins/resource-fetch-api-pagination.js b/shell/mixins/resource-fetch-api-pagination.js
index af7e30e7deb..bd795f99fbe 100644
--- a/shell/mixins/resource-fetch-api-pagination.js
+++ b/shell/mixins/resource-fetch-api-pagination.js
@@ -326,12 +326,9 @@ export default {
         return;
       }
 
-      // TODO: RC fix in parent commit (make calls to fetchPageX null safe)
-      if (this.fetchPageSecondaryResources) {
-        await this.fetchPageSecondaryResources({
-          canPaginate: this.canPaginate, force: false, page: this.rows, pagResult: this.paginationResult
-        });
-      }
+      await this.fetchPageSecondaryResources({
+        canPaginate: this.canPaginate, force: false, page: this.rows, pagResult: this.paginationResult
+      });
     }
   },
 };
diff --git a/shell/mixins/resource-fetch.js b/shell/mixins/resource-fetch.js
index 4659d98f659..18d10ba2ca6 100644
--- a/shell/mixins/resource-fetch.js
+++ b/shell/mixins/resource-fetch.js
@@ -102,7 +102,7 @@ export default {
             return rows;
           }
         } else {
-          return this.localFilter ? this.localFilter(rows) : rows; // TODO: RC test after merge
+          return this.localFilter ? this.localFilter(rows) : rows; // TODO: RC Test - no-vai
         }
 
         return [];
diff --git a/shell/pages/c/_cluster/explorer/EventsTable.vue b/shell/pages/c/_cluster/explorer/EventsTable.vue
index 0952e4cc22e..6027e8de27e 100644
--- a/shell/pages/c/_cluster/explorer/EventsTable.vue
+++ b/shell/pages/c/_cluster/explorer/EventsTable.vue
@@ -87,8 +87,7 @@ export default {
 </script>
 
 <template>
-  <!-- TODO: RC test paging (create events) -->
-  <!-- TODO: RC test no-vai again -->
+  <!-- TODO: RC TEST - no-vai -->
   <PaginatedResourceTable
     :schema="schema"
     :headers="eventHeaders"
@@ -101,7 +100,7 @@ export default {
     :groupable="false"
     :rows-per-page="10"
   >
-    <template slot="header-right">
+    <template v-slot:header-right>
       <router-link
         :to="allEventsLink"
         class="events-link"
diff --git a/shell/pages/c/_cluster/settings/performance.vue b/shell/pages/c/_cluster/settings/performance.vue
index 0e9727869ca..9452b8187cf 100644
--- a/shell/pages/c/_cluster/settings/performance.vue
+++ b/shell/pages/c/_cluster/settings/performance.vue
@@ -190,8 +190,11 @@ export default {
       });
     },
 
-    setDefaults() {
-      this.value = { ...DEFAULT_PERF_SETTING };
+    setPaginationDefaults() {
+      this.value = {
+        ...this.value,
+        serverPagination: { ...DEFAULT_PERF_SETTING.serverPagination }
+      };
     }
   },
 };
@@ -203,14 +206,6 @@ export default {
     <h1 class="mb-20">
       {{ t('performance.label') }}
     </h1>
-    <button
-      class="btn btn-sm role-primary"
-      style="width: fit-content;"
-      @click.prevent="setDefaults()"
-    >
-      <!-- TODO: RC tidy  -->
-      Populate with Defaults
-    </button>
     <div>
       <div class="ui-perf-setting">
         <!-- Server Side Pagination -->
@@ -242,6 +237,13 @@ export default {
             v-clean-html="steveCacheApplicableResources"
             :class="{ 'text-muted': !value.serverPagination.enabled }"
           />
+          <button
+            class="btn btn-sm role-primary"
+            style="width: fit-content;"
+            @click.prevent="setPaginationDefaults()"
+          >
+            {{ t('performance.serverPagination.populateDefaults') }}
+          </button>
         </div>
         <!-- Inactivity -->
         <div class="mt-20">
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index 69d314b58b7..06acfb849ee 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -239,116 +239,6 @@ export default defineComponent({
   },
 
   methods: {
-    fetchSecondaryResources(opts: FetchSecondaryResourcesOpts) {
-      // TODO: RC TEST with pagination off and on
-      if ( this.canViewMgmtClusters ) {
-        this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER });
-      }
-
-      if ( this.canViewMachine ) {
-        this.$store.dispatch('management/findAll', { type: CAPI.MACHINE });
-      }
-
-      if ( this.canViewMgmtNodes ) {
-        this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE });
-      }
-
-      // We need to fetch node pools and node templates in order to correctly show the provider for RKE1 clusters
-      if ( this.canViewMgmtPools ) {
-        this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_POOL });
-      }
-
-      if ( this.canViewMgmtTemplates ) {
-        this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_TEMPLATE });
-      }
-    },
-
-    async fetchPageSecondaryResources({
-      canPaginate, force, page, pagResult
-    }: FetchPageSecondaryResourcesOpts) {
-      if (!canPaginate || !page?.length) {
-        this.clusterCount = 0;
-
-        return;
-      }
-
-      this.clusterCount = pagResult.count;
-
-      if ( this.canViewMgmtClusters ) {
-        const opt: ActionFindPageArgs = {
-          force,
-          pagination: new FilterArgs({
-            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
-              field: 'id',
-              value: r.mgmtClusterId
-            }))),
-          })
-        };
-
-        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.CLUSTER, opt });
-      }
-
-      if ( this.canViewMachine ) {
-        const opt: ActionFindPageArgs = {
-          force,
-          // TODO: RC Validate
-          pagination: new FilterArgs({
-            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
-              field: 'spec.clusterName',
-              value: r.metadata.name
-            }))),
-          })
-        };
-
-        this.$store.dispatch(`management/findPage`, { type: CAPI.MACHINE, opt });
-      }
-
-      if ( this.canViewMgmtNodes ) {
-        const opt: ActionFindPageArgs = {
-          force,
-          // TODO: RC Validate
-          pagination: new FilterArgs({
-            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
-              field: 'id',
-              value: r.mgmtClusterId
-            }))),
-          })
-        };
-
-        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE, opt });
-      }
-
-      // We need to fetch node pools and node templates in order to correctly show the provider for RKE1 clusters
-      if ( this.canViewMgmtPools && this.canViewMgmtTemplates) {
-        const poolOpt: ActionFindPageArgs = {
-          force,
-          // TODO: RC Validate
-          pagination: new FilterArgs({
-            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
-              field: 'spec.clusterName',
-              value: r.status?.clusterName// TODO: handle empty spec
-            }))),
-          })
-        };
-
-        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE_POOL, opt: poolOpt });
-
-        const templateOpt: ActionFindPageArgs = {
-          force,
-          // pagination: new FilterArgs({}),
-          // TODO: RC Validate
-          pagination: new FilterArgs({
-            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
-              field: 'spec.clusterName',
-              value: r.status?.clusterName// TODO: handle empty spec
-            }))),
-          })
-        };
-
-        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE_TEMPLATE, opt: templateOpt });
-      }
-    },
-
     /**
      * Of type FetchSecondaryResources
      */
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index ec539ef4ba2..b0b4006c769 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -105,7 +105,6 @@ class NamespaceProjectFilters {
  * Helper functions for steve pagination
  */
 class StevePaginationUtils extends NamespaceProjectFilters {
-  // TODO: RC how to extensions add to this list?!
   /**
    * Filtering with the vai cache supports specific fields
    * 1) Those listed here
@@ -149,28 +148,21 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     [CAPI.MACHINE]: [
       { field: 'spec.clusterName' } // TODO: RC (home page/side bar) TEST
     ],
-    [CAPI.RANCHER_CLUSTER]: [
-      // { field: `metadata.labels."${ CAPI.PROVIDER }"` } // Pending API support // TODO: RC
-      // { field: `status.provider` } // Pending API support // TODO: RC
-      // { field: 'status.allocatable.cpu' } // Pending API support // TODO: RC
-      // { field: 'status.allocatable.memory' } // Pending API support // TODO: RC
-      // { field: 'status.allocatable.pods' } // Pending API support // TODO: RC
-    ],
     [EVENT]: [
-      // { field: '_type' }, // Pending API support // TODO: RC
-      // { field: 'reason' }, // Pending API support // TODO: RC
-      // { field: 'involvedObject.kind' }, // Pending API support // TODO: RC
-      // { field: 'message' }, // Pending API support // TODO: RC
+      { field: '_type' },
+      { field: 'reason' },
+      { field: 'involvedObject.kind' },
+      { field: 'message' },
     ],
     [CATALOG.CLUSTER_REPO]: [
-      // { field: 'spec.gitRepo' }, // Pending API support // TODO: RC
-      // { field: 'spec.gitBranch' }, // Pending API support // TODO: RC
-      // { field: `metadata.annotations.\"clusterrepo.cattle.io/hidden\"` } // Pending API support // TODO: RC
+      { field: 'spec.gitRepo' },
+      { field: 'spec.gitBranch' },
+      { field: `metadata.annotations[clusterrepo.cattle.io/hidden]` }
     ],
     [CATALOG.OPERATION]: [
-      // { field: 'status.action' }, // Pending API support // TODO: RC
-      // { field: 'status.namespace' }, // Pending API support // TODO: RC
-      // { field: 'status.releaseName' }, // Pending API support // TODO: RC
+      { field: 'status.action' },
+      { field: 'status.namespace' },
+      { field: 'status.releaseName' },
     ],
     [CAPI.RANCHER_CLUSTER]: [
       { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` }, // TODO: RC (home page/side bar) TEST
@@ -370,18 +362,21 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     state.checked.push(field);
 
     // First check in our hardcoded list of supported filters
-    if ([
-      StevePaginationUtils.VALID_FIELDS[''], // Global
-      StevePaginationUtils.VALID_FIELDS[schema.id], // Type specific
-    ].find((fields) => fields?.find((f) => {
-      if (f.startsWith) {
-        if (field.startsWith(f.field)) {
-          return true;
+    if (
+      process.env.NODE_ENV === 'dev' &&
+      [
+        StevePaginationUtils.VALID_FIELDS[''], // Global
+        StevePaginationUtils.VALID_FIELDS[schema.id], // Type specific
+      ].find((fields) => fields?.find((f) => {
+        if (f.startsWith) {
+          if (field.startsWith(f.field)) {
+            return true;
+          }
+        } else {
+          return field === f.field;
         }
-      } else {
-        return field === f.field;
-      }
-    }))) {
+      }))
+    ) {
       return;
     }
 

From a6810c18df7c99fa504a9b19d5af22a39b2c2f1a Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 4 Dec 2024 15:07:01 +0000
Subject: [PATCH 22/76] testing/tidying

---
 shell/config/settings.ts                        | 8 +++-----
 shell/list/catalog.cattle.io.clusterrepo.vue    | 1 -
 shell/mixins/resource-fetch.js                  | 2 +-
 shell/pages/c/_cluster/explorer/EventsTable.vue | 1 -
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index c657f08f25c..bfe10fa9f12 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -267,17 +267,15 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
         resources: {
           enableAll:  false,
           enableSome: {
-            // custom list or headers? not generic
+            // if a resource list is shown by a custom resource list component or has specific list headers then it's not generically shown
+            // and must be included here.
             enabled: [
               NODE, EVENT,
               POD,
               CATALOG.APP, CATALOG.CLUSTER_REPO, CATALOG.OPERATION,
               HPA, INGRESS, SERVICE,
-              PV, CONFIG_MAP, PVC, SECRET,
+              PV, CONFIG_MAP, STORAGE_CLASS, PVC, SECRET,
             ],
-            // Currently covers more resources plus (at time of comment)
-            // STORAGE_CLASS
-            // LIMIT_RANGE, NETWORK_POLICY, POD_DISRUPTION_BUDGET, RESOURCE_QUOTA
             generic: true,
           }
         }
diff --git a/shell/list/catalog.cattle.io.clusterrepo.vue b/shell/list/catalog.cattle.io.clusterrepo.vue
index c8c8ac32484..ba7d66b64a9 100644
--- a/shell/list/catalog.cattle.io.clusterrepo.vue
+++ b/shell/list/catalog.cattle.io.clusterrepo.vue
@@ -26,7 +26,6 @@ export default defineComponent({
      * Filter out hidden repos from list of all repos
      */
     filterRowsLocal(rows: ClusterRepo[]) {
-      // TODO: RC Test - no-vai
       return rows.filter((repo) => !(repo?.metadata?.annotations?.[CATALOG_ANNOTATIONS.HIDDEN_REPO] === 'true'));
     },
 
diff --git a/shell/mixins/resource-fetch.js b/shell/mixins/resource-fetch.js
index 18d10ba2ca6..f817bde7eea 100644
--- a/shell/mixins/resource-fetch.js
+++ b/shell/mixins/resource-fetch.js
@@ -102,7 +102,7 @@ export default {
             return rows;
           }
         } else {
-          return this.localFilter ? this.localFilter(rows) : rows; // TODO: RC Test - no-vai
+          return this.localFilter ? this.localFilter(rows) : rows;
         }
 
         return [];
diff --git a/shell/pages/c/_cluster/explorer/EventsTable.vue b/shell/pages/c/_cluster/explorer/EventsTable.vue
index 6027e8de27e..4afbbd4b716 100644
--- a/shell/pages/c/_cluster/explorer/EventsTable.vue
+++ b/shell/pages/c/_cluster/explorer/EventsTable.vue
@@ -87,7 +87,6 @@ export default {
 </script>
 
 <template>
-  <!-- TODO: RC TEST - no-vai -->
   <PaginatedResourceTable
     :schema="schema"
     :headers="eventHeaders"

From 6f5657363bd30a45bda5d1ef43a7b947d50f28bc Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 4 Dec 2024 19:04:48 +0000
Subject: [PATCH 23/76] WIP - Rest of workload lists

---
 shell/config/product/explorer.js              | 59 ++++++++++++-
 shell/config/settings.ts                      |  5 +-
 shell/list/networking.k8s.io.ingress.vue      |  6 +-
 shell/list/persistentvolume.vue               | 15 +++-
 shell/list/service.vue                        |  6 +-
 shell/list/workload.vue                       | 85 ++++++++-----------
 shell/plugins/steve/steve-pagination-utils.ts | 25 +++++-
 7 files changed, 137 insertions(+), 64 deletions(-)

diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index 5afa1de7560..ff85954adc7 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -31,7 +31,7 @@ import {
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 import { STEVE_CACHE } from '@shell/store/features';
 import { configureConditionalDepaginate } from '@shell/store/type-map.utils';
-import { STORAGE } from 'config/labels-annotations';
+import { CATTLE_PUBLIC_ENDPOINTS, STORAGE } from 'config/labels-annotations';
 
 export const NAME = 'explorer';
 
@@ -363,13 +363,64 @@ export function init(store) {
       CURRENT_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48103
     ]
   );
+
+  const STEVE_WORKLOAD_IMAGES = {
+    ...WORKLOAD_IMAGES,
+    sort:   false,
+    search: false,
+  };
+
+  const STEVE_WORKLOAD_ENDPOINTS = {
+    ...WORKLOAD_ENDPOINTS,
+    sort:   [`metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"`],
+    search: [`metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"`],
+  };
+
+  // TODO: RC test for regressions - incremental loading, manual refresh
+
   headers(WORKLOAD, [STATE, NAME_COL, NAMESPACE_COL, TYPE, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.DEPLOYMENT, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Up-to-date', 'Available', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.DAEMON_SET, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
+  headers(WORKLOAD_TYPES.DEPLOYMENT,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Up-to-date', 'Available', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAME_COL,
+      STEVE_NAMESPACE_COL,
+      STEVE_WORKLOAD_IMAGES,
+      STEVE_WORKLOAD_ENDPOINTS,
+      'Ready', 'Up-to-date', 'Available',
+      // POD_RESTARTS, // TODO: RC NO!
+      STEVE_AGE_COL,
+    ],
+  );
+  headers(WORKLOAD_TYPES.DAEMON_SET,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAME_COL,
+      STEVE_NAMESPACE_COL,
+      STEVE_WORKLOAD_IMAGES,
+      STEVE_WORKLOAD_ENDPOINTS,
+      'Ready', 'Current', 'Desired',
+      // POD_RESTARTS, // TODO: RC NO!
+      STEVE_AGE_COL,
+    ]
+  );
   headers(WORKLOAD_TYPES.REPLICA_SET, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
   headers(WORKLOAD_TYPES.STATEFUL_SET, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
   headers(WORKLOAD_TYPES.JOB, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Completions', DURATION, POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.CRON_JOB, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Schedule', 'Last Schedule', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
+  headers(WORKLOAD_TYPES.CRON_JOB,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Schedule', 'Last Schedule', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAME_COL,
+      STEVE_NAMESPACE_COL,
+      STEVE_WORKLOAD_IMAGES,
+      STEVE_WORKLOAD_ENDPOINTS,
+      'Schedule', 'Last Schedule',
+      // POD_RESTARTS, // TODO: RC NO!
+      STEVE_AGE_COL,
+    ]
+  );
   headers(WORKLOAD_TYPES.REPLICATION_CONTROLLER, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
 
   headers(POD,
diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index bfe10fa9f12..110dd75a5f9 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -12,7 +12,8 @@ import {
   LIMIT_RANGE,
   NETWORK_POLICY,
   POD_DISRUPTION_BUDGET,
-  RESOURCE_QUOTA
+  RESOURCE_QUOTA,
+  WORKLOAD_TYPES
 } from '@shell/config/types';
 
 interface GlobalSettingRuleset {
@@ -271,7 +272,7 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
             // and must be included here.
             enabled: [
               NODE, EVENT,
-              POD,
+              WORKLOAD_TYPES.CRON_JOB, WORKLOAD_TYPES.DAEMON_SET, WORKLOAD_TYPES.DEPLOYMENT, WORKLOAD_TYPES.JOB, WORKLOAD_TYPES.STATEFUL_SET, POD,
               CATALOG.APP, CATALOG.CLUSTER_REPO, CATALOG.OPERATION,
               HPA, INGRESS, SERVICE,
               PV, CONFIG_MAP, STORAGE_CLASS, PVC, SECRET,
diff --git a/shell/list/networking.k8s.io.ingress.vue b/shell/list/networking.k8s.io.ingress.vue
index c82095e19d7..ebc9a468334 100644
--- a/shell/list/networking.k8s.io.ingress.vue
+++ b/shell/list/networking.k8s.io.ingress.vue
@@ -1,8 +1,8 @@
 <script>
-import PaginationResourceTable from '@shell/components/PaginatedResourceTable';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
 
 export default {
-  components: { PaginationResourceTable },
+  components: { PaginatedResourceTable },
   props:      {
     resource: {
       type:     String,
@@ -31,7 +31,7 @@ export default {
 </script>
 
 <template>
-  <PaginationResourceTable
+  <PaginatedResourceTable
     :schema="schema"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
     :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
diff --git a/shell/list/persistentvolume.vue b/shell/list/persistentvolume.vue
index a6601112d46..bbbd2489b88 100644
--- a/shell/list/persistentvolume.vue
+++ b/shell/list/persistentvolume.vue
@@ -24,7 +24,17 @@ export default defineComponent({
     useQueryParamsForSimpleFiltering: {
       type:    Boolean,
       default: false
-    }
+    },
+
+    overflowX: {
+      type:    Boolean,
+      default: false
+    },
+
+    overflowY: {
+      type:    Boolean,
+      default: false
+    },
   },
 
   methods: {
@@ -66,5 +76,8 @@ export default defineComponent({
     :fetchSecondaryResources="fetchSecondaryResources"
     :fetchPageSecondaryResources="fetchPageSecondaryResources"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+
+    :overflow-x="overflowX"
+    :overflow-y="overflowY"
   />
 </template>
diff --git a/shell/list/service.vue b/shell/list/service.vue
index 8340d5695ea..4f8c86a81e1 100644
--- a/shell/list/service.vue
+++ b/shell/list/service.vue
@@ -1,10 +1,10 @@
 <script>
-import PaginationResourceTable from '@shell/components/PaginatedResourceTable';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
 import { NODE } from '@shell/config/types';
 
 export default {
   name:       'ListService',
-  components: { PaginationResourceTable },
+  components: { PaginatedResourceTable },
   props:      {
     resource: {
       type:     String,
@@ -39,7 +39,7 @@ export default {
 </script>
 
 <template>
-  <PaginationResourceTable
+  <PaginatedResourceTable
     :schema="schema"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
     :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
diff --git a/shell/list/workload.vue b/shell/list/workload.vue
index e8373b79e4b..b853d0dbdc3 100644
--- a/shell/list/workload.vue
+++ b/shell/list/workload.vue
@@ -5,8 +5,9 @@ import {
 } from '@shell/config/types';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import { WORKLOAD_HEALTH_SCALE } from '@shell/config/table-headers';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
 
-const schema = {
+const workloadSchema = {
   id:         'workload',
   type:       SCHEMA,
   attributes: {
@@ -26,7 +27,7 @@ const $loadingResources = ($route, $store) => {
     }
   });
 
-  const allTypes = $route.params.resource === schema.id;
+  const allTypes = $route.params.resource === workloadSchema.id;
 
   return {
     loadResources:     allTypes ? allowedResources : [$route.params.resource],
@@ -36,7 +37,7 @@ const $loadingResources = ($route, $store) => {
 
 export default {
   name:       'ListWorkload',
-  components: { ResourceTable },
+  components: { ResourceTable, PaginatedResourceTable },
   mixins:     [ResourceFetch],
 
   props: {
@@ -47,6 +48,11 @@ export default {
   },
 
   async fetch() {
+    if (this.paginationEnabled) {
+      // this.$fetchType(NODE); // TODO: RC
+      return;
+    }
+
     if (this.allTypes && this.loadResources.length) {
       this.$initializeFetchData(this.loadResources[0], this.loadResources);
     } else {
@@ -82,7 +88,15 @@ export default {
     // Ensure these are set on load (to determine if the NS filter is required) rather than too late on `fetch`
     const { loadResources, loadIndeterminate } = $loadingResources(this.$route, this.$store);
 
+    const { params:{ resource: type } } = this.$route;
+    const allTypes = this.$route.params.resource === workloadSchema.id;
+    const schema = type !== workloadSchema.id ? this.$store.getters['cluster/schemaFor'](type) : workloadSchema;
+    const paginationEnabled = !allTypes && this.$store.getters[`cluster/paginationEnabled`]?.({ id: type }); // TODO: RC test vai off workloads page
+
     return {
+      allTypes,
+      schema,
+      paginationEnabled,
       resources: [],
       loadResources,
       loadIndeterminate
@@ -90,24 +104,6 @@ export default {
   },
 
   computed: {
-    allTypes() {
-      return this.$route.params.resource === schema.id;
-    },
-
-    paginationEnabled() {
-      return !this.allTypes && this.$store.getters[`cluster/paginationEnabled`]();
-    },
-
-    schema() {
-      const { params:{ resource:type } } = this.$route;
-
-      if (type !== schema.id) {
-        return this.$store.getters['cluster/schemaFor'](type);
-      }
-
-      return schema;
-    },
-
     filteredRows() {
       const out = [];
 
@@ -127,14 +123,7 @@ export default {
     },
 
     headers() {
-      const headers = this.$store.getters['type-map/headersFor'](this.schema, false);
-
-      if (this.paginationEnabled) {
-        // See https://github.com/rancher/dashboard/issues/10417, health comes from selectors applied locally to all pods (bad)
-        return headers.filter((h) => h.name !== WORKLOAD_HEALTH_SCALE.name);
-      }
-
-      return headers;
+      return this.$store.getters['type-map/headersFor'](this.schema, false);
     }
   },
 
@@ -171,27 +160,27 @@ export default {
     }
   },
 
-  typeDisplay() {
-    const { params:{ resource:type } } = this.$route;
-    let paramSchema = schema;
-
-    if (type !== schema.id) {
-      paramSchema = this.$store.getters['cluster/schemaFor'](type);
-    }
-
-    return this.$store.getters['type-map/labelFor'](paramSchema, 99);
-  },
 };
 </script>
 
 <template>
-  <ResourceTable
-    :loading="$fetchState.pending"
-    :schema="schema"
-    :headers="headers"
-    :rows="filteredRows"
-    :overflow-y="true"
-    :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-    :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
-  />
+  <div>
+    <PaginatedResourceTable
+      v-if="paginationEnabled"
+      :schema="schema"
+      :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+    />
+    <!-- :fetchSecondaryResources="fetchSecondaryResources"
+    :fetchPageSecondaryResources="fetchPageSecondaryResources" -->
+    <ResourceTable
+      v-else
+      :loading="$fetchState.pending"
+      :schema="schema"
+      :headers="headers"
+      :rows="filteredRows"
+      :overflow-y="true"
+      :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+      :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
+    />
+  </div>
 </template>
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index b0b4006c769..1407ee65aad 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -10,9 +10,10 @@ import {
   PV,
   STORAGE_CLASS,
   SERVICE,
-  INGRESS
+  INGRESS,
+  WORKLOAD_TYPES
 } from '@shell/config/types';
-import { CAPI as CAPI_LABELS } from '@shell/config/labels-annotations';
+import { CAPI as CAPI_LABELS, CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations';
 import { Schema } from '@shell/plugins/steve/schema';
 
 class NamespaceProjectFilters {
@@ -192,7 +193,25 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     ],
     [STORAGE_CLASS]: [
       // { field: 'provisioner' }, // Pending API support https://github.com/rancher/rancher/issues/48103
-      // { field: `annotations."${ STORAGE.DEFAULT_STORAGE_CLASS }"` }, // Pending API support https://github.com/rancher/rancher/issues/48103
+      // { field: `metadata.annotations."${ STORAGE.DEFAULT_STORAGE_CLASS }"` }, // Pending API support https://github.com/rancher/rancher/issues/48103
+    ],
+    [CATALOG.APP]: [
+      // { field: 'spec.chart.metadata.name' }, // Pending API support https://github.com/rancher/rancher/issues/48256
+    ],
+    [WORKLOAD_TYPES.CRON_JOB]: [
+      // { field: `metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"` } // Pending API support https://github.com/rancher/rancher/issues/48256
+    ],
+    [WORKLOAD_TYPES.DAEMON_SET]: [
+      // { field: `metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"` } // Pending API support https://github.com/rancher/rancher/issues/48256
+    ],
+    [WORKLOAD_TYPES.DEPLOYMENT]: [
+      // { field: `metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"` } // Pending API support https://github.com/rancher/rancher/issues/48256
+    ],
+    [WORKLOAD_TYPES.JOB]: [
+      // { field: `metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"` } // Pending API support https://github.com/rancher/rancher/issues/48256
+    ],
+    [WORKLOAD_TYPES.STATEFUL_SET]: [
+      // { field: `metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"` } // Pending API support https://github.com/rancher/rancher/issues/48256
     ]
 
   }

From d626da27f894e377fd6fa31ee7c3a7a68f598d26 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 5 Dec 2024 13:28:14 +0000
Subject: [PATCH 24/76] finish off workloads

---
 shell/config/product/explorer.js | 81 +++++++++++++++-----------------
 shell/config/settings.ts         |  1 +
 2 files changed, 38 insertions(+), 44 deletions(-)

diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index ff85954adc7..ec04994f2d1 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -364,64 +364,54 @@ export function init(store) {
     ]
   );
 
-  const STEVE_WORKLOAD_IMAGES = {
-    ...WORKLOAD_IMAGES,
-    sort:   false,
-    search: false,
-  };
-
   const STEVE_WORKLOAD_ENDPOINTS = {
     ...WORKLOAD_ENDPOINTS,
     sort:   [`metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"`],
-    search: [`metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"`],
+    // search: [`metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"`], // TODO: RC
+    search: false, // TODO: RC
   };
 
-  // TODO: RC test for regressions - incremental loading, manual refresh
+  const createSteveWorkloadImageCol = (resourceFieldPos) => ({
+    ...WORKLOAD_IMAGES,
+    sort:   `metadata.fields.${ resourceFieldPos }`,
+    search: `metadata.fields.${ resourceFieldPos }`,
+  });
 
   headers(WORKLOAD, [STATE, NAME_COL, NAMESPACE_COL, TYPE, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
   headers(WORKLOAD_TYPES.DEPLOYMENT,
     [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Up-to-date', 'Available', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
-    [
-      STEVE_STATE_COL,
-      STEVE_NAME_COL,
-      STEVE_NAMESPACE_COL,
-      STEVE_WORKLOAD_IMAGES,
-      STEVE_WORKLOAD_ENDPOINTS,
-      'Ready', 'Up-to-date', 'Available',
-      // POD_RESTARTS, // TODO: RC NO!
-      STEVE_AGE_COL,
-    ],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(6), STEVE_WORKLOAD_ENDPOINTS, 'Ready', 'Up-to-date', 'Available', STEVE_AGE_COL],
   );
   headers(WORKLOAD_TYPES.DAEMON_SET,
     [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
-    [
-      STEVE_STATE_COL,
-      STEVE_NAME_COL,
-      STEVE_NAMESPACE_COL,
-      STEVE_WORKLOAD_IMAGES,
-      STEVE_WORKLOAD_ENDPOINTS,
-      'Ready', 'Current', 'Desired',
-      // POD_RESTARTS, // TODO: RC NO!
-      STEVE_AGE_COL,
-    ]
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(9), STEVE_WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', STEVE_AGE_COL]
+  );
+  headers(WORKLOAD_TYPES.REPLICA_SET,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(6), STEVE_WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', STEVE_AGE_COL],
+  );
+  headers(WORKLOAD_TYPES.STATEFUL_SET,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(4), STEVE_WORKLOAD_ENDPOINTS, 'Ready', STEVE_AGE_COL],
+  );
+  headers(WORKLOAD_TYPES.JOB,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Completions', DURATION, POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(6), STEVE_WORKLOAD_ENDPOINTS, 'Completions', {
+      ...DURATION,
+      value:     'metadata.fields.3',
+      sort:      false, // TODO: RC regression. Value is in units. Xs, Ym, Zh, etc
+      search:    'metadata.fields.3',
+      formatter: undefined, // Now that sort/search is remote we're not doing weird things with start time (see `duration` in model)
+    }, STEVE_AGE_COL],
   );
-  headers(WORKLOAD_TYPES.REPLICA_SET, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.STATEFUL_SET, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.JOB, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Completions', DURATION, POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
   headers(WORKLOAD_TYPES.CRON_JOB,
     [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Schedule', 'Last Schedule', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
-    [
-      STEVE_STATE_COL,
-      STEVE_NAME_COL,
-      STEVE_NAMESPACE_COL,
-      STEVE_WORKLOAD_IMAGES,
-      STEVE_WORKLOAD_ENDPOINTS,
-      'Schedule', 'Last Schedule',
-      // POD_RESTARTS, // TODO: RC NO!
-      STEVE_AGE_COL,
-    ]
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(8), STEVE_WORKLOAD_ENDPOINTS, 'Schedule', 'Last Schedule', STEVE_AGE_COL]
+  );
+  headers(WORKLOAD_TYPES.REPLICATION_CONTROLLER,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(6), STEVE_WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', STEVE_AGE_COL],
   );
-  headers(WORKLOAD_TYPES.REPLICATION_CONTROLLER, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
 
   headers(POD,
     [STATE, NAME_COL, NAMESPACE_COL, POD_IMAGES, 'Ready', 'Restarts', 'IP', NODE_COL, AGE],
@@ -437,7 +427,8 @@ export function init(store) {
         search: 'spec.nodeName'
       },
       STEVE_AGE_COL
-    ]);
+    ]
+  );
 
   headers(NODE,
     [
@@ -497,12 +488,14 @@ export function init(store) {
         search:     false,
       },
       STEVE_AGE_COL
-    ]);
+    ]
+  );
 
   headers(MANAGEMENT.PSA, [STATE, NAME_COL, {
     ...DESCRIPTION,
     width: undefined
   }, AGE]);
+
   headers(STORAGE_CLASS,
     [STATE, NAME_COL, STORAGE_CLASS_PROVISIONER, STORAGE_CLASS_DEFAULT, AGE],
     [
diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index 110dd75a5f9..e1acbdee741 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -276,6 +276,7 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
               CATALOG.APP, CATALOG.CLUSTER_REPO, CATALOG.OPERATION,
               HPA, INGRESS, SERVICE,
               PV, CONFIG_MAP, STORAGE_CLASS, PVC, SECRET,
+              WORKLOAD_TYPES.REPLICA_SET, WORKLOAD_TYPES.REPLICATION_CONTROLLER
             ],
             generic: true,
           }

From 850721b7e2fc18b9957ab6145f6263c37b4491a8 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 5 Dec 2024 14:34:59 +0000
Subject: [PATCH 25/76] tidying up

---
 shell/config/product/apps.js     |  4 ----
 shell/config/product/explorer.js | 14 ++++++--------
 shell/list/workload.vue          |  1 -
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/shell/config/product/apps.js b/shell/config/product/apps.js
index 52ec2dd5919..745ff433265 100644
--- a/shell/config/product/apps.js
+++ b/shell/config/product/apps.js
@@ -80,12 +80,10 @@ export function init(store) {
     [STATE, NAME_COL, NAMESPACE, CHART, CHART_UPGRADE, APP_SUMMARY, AGE],
     [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, {
       ...CHART,
-      // TODO: RC REGRESSION
       sort:   ['spec.chart.metadata.name'],
       search: ['spec.chart.metadata.name'],
     }, {
       ...CHART_UPGRADE,
-      // TODO: RC REGRESSION
       sort:   false,
       search: false,
     },
@@ -97,12 +95,10 @@ export function init(store) {
     [STATE, NAME_COL, repoType, repoUrl, repoBranch, AGE],
     [STEVE_STATE_COL, STEVE_NAME_COL, {
       ...repoType,
-      // TODO: RC REGRESSION Either 'git' (spec.gitRepo), 'oci' (spec.url && isOciType), 'http' (spec.url)
       sort:   false,
       search: false,
     }, {
       ...repoUrl,
-      // TODO: RC REGRESSION Either status.url || spec.gitRepo || spec.url
       sort:   false,
       search: false,
     },
diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index ec04994f2d1..eb3f636f341 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -223,18 +223,17 @@ export function init(store) {
     [
       STEVE_STATE_COL,
       STEVE_NAME_COL,
-      { ...RECLAIM_POLICY },
+      RECLAIM_POLICY,
       {
-        // TODO: RC TEST once 48103
         ...PERSISTENT_VOLUME_CLAIM,
-        sort:   ['metadata.fields.5'], // TODO: RC should be spec.volumeName of PVC --> PV, this is PV --> PVC
+        sort:   ['metadata.fields.5'],
         search: ['metadata.fields.5'],
       }, {
-        // TODO: RC Regression
         ...PERSISTENT_VOLUME_SOURCE,
         sort:   false,
         search: false,
-      }, { ...PV_REASON },
+      },
+      PV_REASON,
       STEVE_AGE_COL,
     ]
   );
@@ -367,8 +366,7 @@ export function init(store) {
   const STEVE_WORKLOAD_ENDPOINTS = {
     ...WORKLOAD_ENDPOINTS,
     sort:   [`metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"`],
-    // search: [`metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"`], // TODO: RC
-    search: false, // TODO: RC
+    search: [`metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"`], // Pending API support https://github.com/rancher/rancher/issues/48256
   };
 
   const createSteveWorkloadImageCol = (resourceFieldPos) => ({
@@ -399,7 +397,7 @@ export function init(store) {
     [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(6), STEVE_WORKLOAD_ENDPOINTS, 'Completions', {
       ...DURATION,
       value:     'metadata.fields.3',
-      sort:      false, // TODO: RC regression. Value is in units. Xs, Ym, Zh, etc
+      sort:      false,
       search:    'metadata.fields.3',
       formatter: undefined, // Now that sort/search is remote we're not doing weird things with start time (see `duration` in model)
     }, STEVE_AGE_COL],
diff --git a/shell/list/workload.vue b/shell/list/workload.vue
index b853d0dbdc3..4d21cd3664b 100644
--- a/shell/list/workload.vue
+++ b/shell/list/workload.vue
@@ -49,7 +49,6 @@ export default {
 
   async fetch() {
     if (this.paginationEnabled) {
-      // this.$fetchType(NODE); // TODO: RC
       return;
     }
 

From aa269e4a6e3829d24afe7c6ab97c1fcf534389e2 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 5 Dec 2024 14:44:48 +0000
Subject: [PATCH 26/76] fix non-generic list filtering by namespace

---
 shell/mixins/resource-fetch-api-pagination.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/mixins/resource-fetch-api-pagination.js b/shell/mixins/resource-fetch-api-pagination.js
index bd795f99fbe..e3a8999428e 100644
--- a/shell/mixins/resource-fetch-api-pagination.js
+++ b/shell/mixins/resource-fetch-api-pagination.js
@@ -219,7 +219,7 @@ export default {
     },
 
     isNamespaced() {
-      if (typeof this.namespaced !== 'undefined') {
+      if (this.namespaced !== null) { // null is the default value
         // This is an override, but only if it's set
         return !!this.namespaced;
       }

From 0cc6ba3320f2af1234fdd7c071df01b9c5a67720 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 5 Dec 2024 14:53:11 +0000
Subject: [PATCH 27/76] remove comment, backport fix

---
 shell/components/nav/TopLevelMenu.vue         | 1 -
 shell/mixins/resource-fetch-api-pagination.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/shell/components/nav/TopLevelMenu.vue b/shell/components/nav/TopLevelMenu.vue
index 20732186016..cde71d99306 100644
--- a/shell/components/nav/TopLevelMenu.vue
+++ b/shell/components/nav/TopLevelMenu.vue
@@ -572,7 +572,6 @@ export default {
           </template>
 
           <!-- Cluster menu -->
-          <!-- <template v-if="clusters && !!clusters.length"> -->
           <template v-if="!!allClustersCount">
             <div
               ref="clusterList"
diff --git a/shell/mixins/resource-fetch-api-pagination.js b/shell/mixins/resource-fetch-api-pagination.js
index bd795f99fbe..e3a8999428e 100644
--- a/shell/mixins/resource-fetch-api-pagination.js
+++ b/shell/mixins/resource-fetch-api-pagination.js
@@ -219,7 +219,7 @@ export default {
     },
 
     isNamespaced() {
-      if (typeof this.namespaced !== 'undefined') {
+      if (this.namespaced !== null) { // null is the default value
         // This is an override, but only if it's set
         return !!this.namespaced;
       }

From 559e33e7c5e68b9f10e664d5818c306fa8a40ca0 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 5 Dec 2024 16:44:13 +0000
Subject: [PATCH 28/76] test fixes

---
 .eslintrc.js                                  |   3 +-
 shell/components/PaginatedResourceTable.vue   |   2 +-
 shell/components/nav/TopLevelMenu.helper.ts   |  14 +-
 shell/components/nav/TopLevelMenu.vue         |  10 +-
 .../nav/__tests__/TopLevelMenu.test.ts        | 664 +++++++++---------
 shell/config/router/routes.js                 |   2 +-
 shell/pages/home.vue                          |   6 +-
 shell/utils/cluster.js                        |   2 +-
 shell/utils/pagination-wrapper.ts             |   4 +-
 9 files changed, 361 insertions(+), 346 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 0671773c3c2..4b3b98c4dca 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -59,7 +59,8 @@ module.exports = {
     '@typescript-eslint/no-var-requires':         'off',
     'vue/one-component-per-file':                 'off',
     'vue/no-deprecated-slot-attribute':           'off',
-    'vue/v-on-event-hyphenation':                 'off'
+    'vue/v-on-event-hyphenation':                 'off',
+    'jest/no-hooks':                              'off',
   },
   overrides: [
     {
diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
index d820fe23666..7f58832026a 100644
--- a/shell/components/PaginatedResourceTable.vue
+++ b/shell/components/PaginatedResourceTable.vue
@@ -2,7 +2,7 @@
 import { defineComponent } from 'vue';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import ResourceTable from '@shell/components/ResourceTable.vue';
-import { StorePaginationResult } from 'types/store/pagination.types';
+import { StorePaginationResult } from '@shell/types/store/pagination.types';
 
 export type FetchSecondaryResourcesOpts = { canPaginate: boolean }
 export type FetchSecondaryResources = (opts: FetchSecondaryResourcesOpts) => Promise<any>
diff --git a/shell/components/nav/TopLevelMenu.helper.ts b/shell/components/nav/TopLevelMenu.helper.ts
index 2389ec9e8b4..88a30a61ba5 100644
--- a/shell/components/nav/TopLevelMenu.helper.ts
+++ b/shell/components/nav/TopLevelMenu.helper.ts
@@ -1,10 +1,10 @@
-import { CAPI, MANAGEMENT } from 'config/types';
-import { PaginationParam, PaginationParamFilter, PaginationSort } from 'types/store/pagination.types';
-import { VuexStore } from 'types/store/vuex';
-import { filterHiddenLocalCluster, filterOnlyKubernetesClusters, paginationFilterClusters } from 'utils/cluster';
-import PaginationWrapper from 'utils/pagination-wrapper';
-import { allHash } from 'utils/promise';
-import { sortBy } from 'utils/sort';
+import { CAPI, MANAGEMENT } from '@shell/config/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';
+import PaginationWrapper from '@shell/utils/pagination-wrapper';
+import { allHash } from '@shell/utils/promise';
+import { sortBy } from '@shell/utils/sort';
 import { LocationAsRelativeRaw } from 'vue-router';
 
 interface TopLevelMenuCluster {
diff --git a/shell/components/nav/TopLevelMenu.vue b/shell/components/nav/TopLevelMenu.vue
index cde71d99306..b3333f5d234 100644
--- a/shell/components/nav/TopLevelMenu.vue
+++ b/shell/components/nav/TopLevelMenu.vue
@@ -15,7 +15,7 @@ import { getProductFromRoute } from '@shell/utils/router';
 import { isRancherPrime } from '@shell/config/version';
 import Pinned from '@shell/components/nav/Pinned';
 import { getGlobalBannerFontSizes } from '@shell/utils/banners';
-import { TopLevelMenuHelperPagination, TopLevelMenuHelperLegacy } from 'components/nav/TopLevelMenu.helper';
+import { TopLevelMenuHelperPagination, TopLevelMenuHelperLegacy } from '@shell/components/nav/TopLevelMenu.helper';
 import { debounce } from 'lodash';
 import { sameContents } from '@shell/utils/array';
 
@@ -284,7 +284,8 @@ export default {
         // Shouldn't get here if SSP
         this.updateClusters(this.pinnedIds);
       },
-      deep: true
+      deep:      true,
+      immediate: true,
     },
 
     mgmtClusters: {
@@ -292,7 +293,8 @@ export default {
         // Shouldn't get here if SSP
         this.updateClusters(this.pinnedIds);
       },
-      deep: true
+      deep:      true,
+      immediate: true,
     },
 
   },
@@ -730,7 +732,7 @@ export default {
 
               <!-- No clusters message -->
               <div
-                v-if="(clustersFiltered.length === 0 || pinFiltered.length === 0) && searchActive"
+                v-if="clustersFiltered.length === 0 && searchActive"
                 data-testid="top-level-menu-no-results"
                 class="none-matching"
               >
diff --git a/shell/components/nav/__tests__/TopLevelMenu.test.ts b/shell/components/nav/__tests__/TopLevelMenu.test.ts
index 90840400bb3..029ef96d26e 100644
--- a/shell/components/nav/__tests__/TopLevelMenu.test.ts
+++ b/shell/components/nav/__tests__/TopLevelMenu.test.ts
@@ -1,40 +1,85 @@
-import TopLevelMenu from '@shell/components/nav/TopLevelMenu';
+import TopLevelMenu from '@shell/components/nav/TopLevelMenu.vue';
 import { SETTING } from '@shell/config/settings';
 import { mount, Wrapper } from '@vue/test-utils';
+import { CAPI, COUNT, MANAGEMENT } from '@shell/config/types';
+import { PINNED_CLUSTERS } from '@shell/store/prefs';
+import { nextTick } from 'vue';
+
+/**
+ * `clusters` doubles up as both mgmt and prov clusters (don't shoot the messenger)
+ */
+const generateStore = (clusters: any[], settings = [{}]) => {
+  return {
+    getters: {
+      'management/byId':              jest.fn(),
+      'management/schemaFor':         () => ({}),
+      'management/paginationEnabled': () => false,
+      'i18n/t':                       jest.fn(),
+      'features/get':                 jest.fn(),
+      'prefs/theme':                  jest.fn(),
+      defaultClusterId:               jest.fn(),
+      clusterId:                      jest.fn(),
+      'type-map/activeProducts':      [],
+      'management/all':               (type: string) => {
+        switch (type) {
+        case CAPI.RANCHER_CLUSTER:
+          return clusters;
+        case MANAGEMENT.CLUSTER:
+          return clusters;
+        case COUNT:
+          return [{ counts: { [MANAGEMENT.CLUSTER]: { summary: { count: clusters.length } } } }];
+        case MANAGEMENT.SETTING:
+          return settings;
+        }
+      },
+      'prefs/get': (pref: string) => {
+        if (pref === PINNED_CLUSTERS) {
+          return [];
+        }
+      },
+    },
+    dispatch: (action: string, args: any) => {
+      if (action === 'management/findAll' && args.type === CAPI.RANCHER_CLUSTER) {
+        return clusters;
+      }
+    }
+  };
+};
 
-// DISCLAIMER: This should not be added here, although we have several store requests which are irrelevant
-const defaultStore = {
-  'management/byId':         jest.fn(),
-  'management/schemaFor':    () => ({}),
-  'i18n/t':                  jest.fn(),
-  'features/get':            jest.fn(),
-  'prefs/theme':             jest.fn(),
-  defaultClusterId:          jest.fn(),
-  clusterId:                 jest.fn(),
-  'type-map/activeProducts': [],
+const waitForIt = async() => {
+  jest.advanceTimersByTime(250); // Wait for debounced call to fetch updated cluster list
+  await nextTick(); // Wait for changes to cluster list to trigger changes
 };
 
 describe('topLevelMenu', () => {
-  it('should display clusters', () => {
+  beforeEach(() => {
+    jest.useFakeTimers();
+  });
+
+  afterEach(() => {
+    jest.runOnlyPendingTimers();
+    jest.useRealTimers();
+  });
+
+  it('should display clusters', async() => {
+    const clusters = [{
+      name: 'whatever',
+      id:   'an-id1',
+      mgmt: { id: 'an-id1' },
+    }];
     const wrapper: Wrapper<InstanceType<typeof TopLevelMenu>> = mount(TopLevelMenu, {
       global: {
         mocks: {
-          $store: {
-            getters: {
-              'management/all': () => [{
-                name: 'whatever',
-                id:   'an-id1',
-                mgmt: { id: 'an-id1' },
-              }],
-              ...defaultStore
-            },
-          },
+          $route: {},
+          $store: { ...generateStore(clusters) },
         },
 
         stubs: ['BrandImage', 'router-link'],
       },
     });
 
+    await waitForIt();
+
     const cluster = wrapper.find('[data-testid="top-level-menu-cluster-0"]');
 
     expect(cluster.exists()).toBe(true);
@@ -42,57 +87,49 @@ describe('topLevelMenu', () => {
 
   it('should show local cluster always on top of the list of clusters (unpinned and ready clusters)', async() => {
     const wrapper: Wrapper<InstanceType<typeof TopLevelMenu>> = mount(TopLevelMenu, {
-      data: () => {
-        return { hasProvCluster: true, showPinClusters: true };
-      },
-
       global: {
         mocks: {
+          $route: {},
           $store: {
-            getters: {
-              // these objs are doubling as a prov clusters
-              // from which the "description" field comes from
-              // This is triggered by the "hasProvCluster" above
-              // (check all "management/all" getters on the component code)
-              'management/all': () => [
-                {
-                  name:        'x32-cwf5-name',
-                  id:          'an-id1',
-                  mgmt:        { id: 'an-id1' },
-                  nameDisplay: 'c-cluster',
-                  isReady:     true
-                },
-                {
-                  name:        'x33-cwf5-name',
-                  id:          'an-id2',
-                  mgmt:        { id: 'an-id2' },
-                  nameDisplay: 'a-cluster',
-                  isReady:     true
-                },
-                {
-                  name:        'x34-cwf5-name',
-                  id:          'an-id3',
-                  mgmt:        { id: 'an-id3' },
-                  nameDisplay: 'b-cluster',
-                  isReady:     true
-                },
-                {
-                  name:        'local-name',
-                  id:          'local',
-                  mgmt:        { id: 'local' },
-                  nameDisplay: 'local',
-                  isReady:     true
-                },
-              ],
-              ...defaultStore
-            },
-          },
+            ...generateStore([
+              {
+                name:        'x32-cwf5-name',
+                id:          'an-id1',
+                mgmt:        { id: 'an-id1' },
+                nameDisplay: 'c-cluster',
+                isReady:     true
+              },
+              {
+                name:        'x33-cwf5-name',
+                id:          'an-id2',
+                mgmt:        { id: 'an-id2' },
+                nameDisplay: 'a-cluster',
+                isReady:     true
+              },
+              {
+                name:        'x34-cwf5-name',
+                id:          'an-id3',
+                mgmt:        { id: 'an-id3' },
+                nameDisplay: 'b-cluster',
+                isReady:     true
+              },
+              {
+                name:        'local-name',
+                id:          'local',
+                mgmt:        { id: 'local' },
+                nameDisplay: 'local',
+                isReady:     true
+              },
+            ])
+          }
         },
 
         stubs: ['BrandImage', 'router-link'],
       },
     });
 
+    await waitForIt();
+
     expect(wrapper.find('[data-testid="top-level-menu-cluster-0"] .cluster-name p').text()).toStrictEqual('local');
     expect(wrapper.find('[data-testid="top-level-menu-cluster-1"] .cluster-name p').text()).toStrictEqual('a-cluster');
     expect(wrapper.find('[data-testid="top-level-menu-cluster-2"] .cluster-name p').text()).toStrictEqual('b-cluster');
@@ -100,58 +137,50 @@ describe('topLevelMenu', () => {
   });
 
   it('should show local cluster always on top of the list of clusters (unpinned and mix ready/unready clusters)', async() => {
-    const wrapper: Wrapper<InstanceType<typeof TopLevelMenu>> = mount(TopLevelMenu, {
-      data: () => {
-        return { hasProvCluster: true, showPinClusters: true };
+    const clusters = [
+      {
+        name:        'x32-cwf5-name',
+        id:          'an-id1',
+        mgmt:        { id: 'an-id1' },
+        nameDisplay: 'c-cluster',
+        isReady:     true
+      },
+      {
+        name:        'x33-cwf5-name',
+        id:          'an-id2',
+        mgmt:        { id: 'an-id2' },
+        nameDisplay: 'a-cluster',
+        isReady:     false
       },
+      {
+        name:        'x34-cwf5-name',
+        id:          'an-id3',
+        mgmt:        { id: 'an-id3' },
+        nameDisplay: 'b-cluster',
+        isReady:     true
+      },
+      {
+        name:        'local-name',
+        id:          'local',
+        mgmt:        { id: 'local' },
+        nameDisplay: 'local',
+        isReady:     true,
+        isLocal:     true,
+      },
+    ];
 
+    const wrapper: Wrapper<InstanceType<typeof TopLevelMenu>> = mount(TopLevelMenu, {
       global: {
         mocks: {
-          $store: {
-            getters: {
-              // these objs are doubling as a prov clusters
-              // from which the "description" field comes from
-              // This is triggered by the "hasProvCluster" above
-              // (check all "management/all" getters on the component code)
-              'management/all': () => [
-                {
-                  name:        'x32-cwf5-name',
-                  id:          'an-id1',
-                  mgmt:        { id: 'an-id1' },
-                  nameDisplay: 'c-cluster',
-                  isReady:     true
-                },
-                {
-                  name:        'x33-cwf5-name',
-                  id:          'an-id2',
-                  mgmt:        { id: 'an-id2' },
-                  nameDisplay: 'a-cluster',
-                  isReady:     false
-                },
-                {
-                  name:        'x34-cwf5-name',
-                  id:          'an-id3',
-                  mgmt:        { id: 'an-id3' },
-                  nameDisplay: 'b-cluster',
-                  isReady:     true
-                },
-                {
-                  name:        'local-name',
-                  id:          'local',
-                  mgmt:        { id: 'local' },
-                  nameDisplay: 'local',
-                  isReady:     true
-                },
-              ],
-              ...defaultStore
-            },
-          },
+          $route: {},
+          $store: { ...generateStore(clusters) }
         },
-
         stubs: ['BrandImage', 'router-link'],
       },
     });
 
+    await waitForIt();
+
     expect(wrapper.find('[data-testid="top-level-menu-cluster-0"] .cluster-name p').text()).toStrictEqual('local');
     expect(wrapper.find('[data-testid="top-level-menu-cluster-1"] .cluster-name p').text()).toStrictEqual('b-cluster');
     expect(wrapper.find('[data-testid="top-level-menu-cluster-2"] .cluster-name p').text()).toStrictEqual('c-cluster');
@@ -160,61 +189,53 @@ describe('topLevelMenu', () => {
 
   it('should show local cluster always on top of the list of clusters (pinned and ready clusters)', async() => {
     const wrapper: Wrapper<InstanceType<typeof TopLevelMenu>> = mount(TopLevelMenu, {
-      data: () => {
-        return { hasProvCluster: true, showPinClusters: true };
-      },
-
       global: {
         mocks: {
+          $route: {},
           $store: {
-            getters: {
-              // these objs are doubling as a prov clusters
-              // from which the "description" field comes from
-              // This is triggered by the "hasProvCluster" above
-              // (check all "management/all" getters on the component code)
-              'management/all': () => [
-                {
-                  name:        'x32-cwf5-name',
-                  id:          'an-id1',
-                  mgmt:        { id: 'an-id1' },
-                  nameDisplay: 'c-cluster',
-                  isReady:     true,
-                  pinned:      true
-                },
-                {
-                  name:        'x33-cwf5-name',
-                  id:          'an-id2',
-                  mgmt:        { id: 'an-id2' },
-                  nameDisplay: 'a-cluster',
-                  isReady:     true,
-                  pinned:      true
-                },
-                {
-                  name:        'x34-cwf5-name',
-                  id:          'an-id3',
-                  mgmt:        { id: 'an-id3' },
-                  nameDisplay: 'b-cluster',
-                  isReady:     true,
-                  pinned:      true
-                },
-                {
-                  name:        'local-name',
-                  id:          'local',
-                  mgmt:        { id: 'local' },
-                  nameDisplay: 'local',
-                  isReady:     true,
-                  pinned:      true
-                },
-              ],
-              ...defaultStore
-            },
-          },
+            ...generateStore([
+              {
+                name:        'x32-cwf5-name',
+                id:          'an-id1',
+                mgmt:        { id: 'an-id1' },
+                nameDisplay: 'c-cluster',
+                isReady:     true,
+                pinned:      true
+              },
+              {
+                name:        'x33-cwf5-name',
+                id:          'an-id2',
+                mgmt:        { id: 'an-id2' },
+                nameDisplay: 'a-cluster',
+                isReady:     true,
+                pinned:      true
+              },
+              {
+                name:        'x34-cwf5-name',
+                id:          'an-id3',
+                mgmt:        { id: 'an-id3' },
+                nameDisplay: 'b-cluster',
+                isReady:     true,
+                pinned:      true
+              },
+              {
+                name:        'local-name',
+                id:          'local',
+                mgmt:        { id: 'local' },
+                nameDisplay: 'local',
+                isReady:     true,
+                pinned:      true
+              },
+            ])
+          }
         },
 
         stubs: ['BrandImage', 'router-link'],
       },
     });
 
+    await waitForIt();
+
     expect(wrapper.find('[data-testid="pinned-ready-cluster-0"] .cluster-name p').text()).toStrictEqual('local');
     expect(wrapper.find('[data-testid="pinned-ready-cluster-1"] .cluster-name p').text()).toStrictEqual('a-cluster');
     expect(wrapper.find('[data-testid="pinned-ready-cluster-2"] .cluster-name p').text()).toStrictEqual('b-cluster');
@@ -229,55 +250,51 @@ describe('topLevelMenu', () => {
 
       global: {
         mocks: {
+          $route: {},
           $store: {
-            getters: {
-              // these objs are doubling as a prov clusters
-              // from which the "description" field comes from
-              // This is triggered by the "hasProvCluster" above
-              // (check all "management/all" getters on the component code)
-              'management/all': () => [
-                {
-                  name:        'x32-cwf5-name',
-                  id:          'an-id1',
-                  mgmt:        { id: 'an-id1' },
-                  nameDisplay: 'c-cluster',
-                  isReady:     true,
-                  pinned:      true
-                },
-                {
-                  name:        'x33-cwf5-name',
-                  id:          'an-id2',
-                  mgmt:        { id: 'an-id2' },
-                  nameDisplay: 'a-cluster',
-                  isReady:     true,
-                  pinned:      true
-                },
-                {
-                  name:        'x34-cwf5-name',
-                  id:          'an-id3',
-                  mgmt:        { id: 'an-id3' },
-                  nameDisplay: 'b-cluster',
-                  isReady:     false,
-                  pinned:      true
-                },
-                {
-                  name:        'local-name',
-                  id:          'local',
-                  mgmt:        { id: 'local' },
-                  nameDisplay: 'local',
-                  isReady:     true,
-                  pinned:      true
-                },
-              ],
-              ...defaultStore
-            },
-          },
+            ...generateStore([
+              {
+                name:        'x32-cwf5-name',
+                id:          'an-id1',
+                mgmt:        { id: 'an-id1' },
+                nameDisplay: 'c-cluster',
+                isReady:     true,
+                pinned:      true
+              },
+              {
+                name:        'x33-cwf5-name',
+                id:          'an-id2',
+                mgmt:        { id: 'an-id2' },
+                nameDisplay: 'a-cluster',
+                isReady:     true,
+                pinned:      true
+              },
+              {
+                name:        'x34-cwf5-name',
+                id:          'an-id3',
+                mgmt:        { id: 'an-id3' },
+                nameDisplay: 'b-cluster',
+                isReady:     false,
+                pinned:      true
+              },
+              {
+                name:        'local-name',
+                id:          'local',
+                mgmt:        { id: 'local' },
+                nameDisplay: 'local',
+                isReady:     true,
+                pinned:      true
+              },
+            ])
+          }
         },
 
         stubs: ['BrandImage', 'router-link'],
       },
     });
 
+    await waitForIt();
+
     expect(wrapper.find('[data-testid="pinned-ready-cluster-0"] .cluster-name p').text()).toStrictEqual('local');
     expect(wrapper.find('[data-testid="pinned-ready-cluster-1"] .cluster-name p').text()).toStrictEqual('a-cluster');
     expect(wrapper.find('[data-testid="pinned-ready-cluster-2"] .cluster-name p').text()).toStrictEqual('c-cluster');
@@ -286,59 +303,48 @@ describe('topLevelMenu', () => {
 
   it('should show description if it is available on the prov cluster', async() => {
     const wrapper: Wrapper<InstanceType<typeof TopLevelMenu>> = mount(TopLevelMenu, {
-      data: () => {
-        return { hasProvCluster: true, showPinClusters: true };
-      },
-
       global: {
         mocks: {
+          $route: {},
           $store: {
-            getters: {
-              // these objs are doubling as a prov clusters
-              // from which the "description" field comes from
-              // This is triggered by the "hasProvCluster" above
-              // (check all "management/all" getters on the component code)
-              // https://github.com/rancher/dashboard/issues/10441
-              'management/all': () => [
-                // pinned ready cluster
-                {
-                  name:        'whatever',
-                  id:          'an-id1',
-                  mgmt:        { id: 'an-id1' },
-                  description: 'some-description1',
-                  nameDisplay: 'some-label',
-                  isReady:     true,
-                  pinned:      true
-                },
-                // pinned NOT ready cluster
-                {
-                  name:        'whatever',
-                  id:          'an-id2',
-                  mgmt:        { id: 'an-id2' },
-                  description: 'some-description2',
-                  nameDisplay: 'some-label',
-                  pinned:      true
-                },
-                // unpinned ready cluster
-                {
-                  name:        'whatever',
-                  id:          'an-id3',
-                  mgmt:        { id: 'an-id3' },
-                  description: 'some-description3',
-                  nameDisplay: 'some-label',
-                  isReady:     true
-                },
-                // unpinned NOT ready cluster
-                {
-                  name:        'whatever',
-                  id:          'an-id4',
-                  mgmt:        { id: 'an-id4' },
-                  description: 'some-description4',
-                  nameDisplay: 'some-label'
-                },
-              ],
-              ...defaultStore
-            },
+            ...generateStore([
+              // pinned ready cluster
+              {
+                name:        'whatever',
+                id:          'an-id1',
+                mgmt:        { id: 'an-id1' },
+                description: 'some-description1',
+                nameDisplay: 'some-label',
+                isReady:     true,
+                pinned:      true
+              },
+              // pinned NOT ready cluster
+              {
+                name:        'whatever',
+                id:          'an-id2',
+                mgmt:        { id: 'an-id2' },
+                description: 'some-description2',
+                nameDisplay: 'some-label',
+                pinned:      true
+              },
+              // unpinned ready cluster
+              {
+                name:        'whatever',
+                id:          'an-id3',
+                mgmt:        { id: 'an-id3' },
+                description: 'some-description3',
+                nameDisplay: 'some-label',
+                isReady:     true
+              },
+              // unpinned NOT ready cluster
+              {
+                name:        'whatever',
+                id:          'an-id4',
+                mgmt:        { id: 'an-id4' },
+                description: 'some-description4',
+                nameDisplay: 'some-label'
+              },
+            ])
           },
         },
 
@@ -346,6 +352,8 @@ describe('topLevelMenu', () => {
       },
     });
 
+    await waitForIt();
+
     const description1 = wrapper.find('[data-testid="pinned-menu-cluster-an-id1"] .description');
     const description2 = wrapper.find('[data-testid="pinned-menu-cluster-disabled-an-id2"] .description');
     const description3 = wrapper.find('[data-testid="menu-cluster-an-id3"] .description');
@@ -359,65 +367,57 @@ describe('topLevelMenu', () => {
 
   it('should show description if it is available on the mgmt cluster (relevant for RKE1/ember world)', async() => {
     const wrapper: Wrapper<InstanceType<typeof TopLevelMenu>> = mount(TopLevelMenu, {
-      data: () => {
-        return { hasProvCluster: true, showPinClusters: true };
-      },
-
       global: {
         mocks: {
+          $route: {},
           $store: {
-            getters: {
-              // "hasProvCluster" as false will make this getter
-              // a mgmt cluster only return, therefore covering the
-              // scenario where descriptions come from RKE1/ember world clusters
-              // https://github.com/rancher/dashboard/issues/10441
-              'management/all': () => [
-                // pinned ready cluster
-                {
-                  name:        'whatever',
-                  id:          'an-id1',
-                  mgmt:        { id: 'an-id1' },
-                  description: 'some-description1',
-                  nameDisplay: 'some-label',
-                  isReady:     true,
-                  pinned:      true
-                },
-                // pinned NOT ready cluster
-                {
-                  name:        'whatever',
-                  id:          'an-id2',
-                  mgmt:        { id: 'an-id2' },
-                  description: 'some-description2',
-                  nameDisplay: 'some-label',
-                  pinned:      true
-                },
-                // unpinned ready cluster
-                {
-                  name:        'whatever',
-                  id:          'an-id3',
-                  mgmt:        { id: 'an-id3' },
-                  description: 'some-description3',
-                  nameDisplay: 'some-label',
-                  isReady:     true
-                },
-                // unpinned NOT ready cluster
-                {
-                  name:        'whatever',
-                  id:          'an-id4',
-                  mgmt:        { id: 'an-id4' },
-                  description: 'some-description4',
-                  nameDisplay: 'some-label'
-                },
-              ],
-              ...defaultStore
-            },
-          },
+            ...generateStore([
+              // pinned ready cluster
+              {
+                name:        'whatever',
+                id:          'an-id1',
+                mgmt:        { id: 'an-id1' },
+                description: 'some-description1',
+                nameDisplay: 'some-label',
+                isReady:     true,
+                pinned:      true
+              },
+              // pinned NOT ready cluster
+              {
+                name:        'whatever',
+                id:          'an-id2',
+                mgmt:        { id: 'an-id2' },
+                description: 'some-description2',
+                nameDisplay: 'some-label',
+                pinned:      true
+              },
+              // unpinned ready cluster
+              {
+                name:        'whatever',
+                id:          'an-id3',
+                mgmt:        { id: 'an-id3' },
+                description: 'some-description3',
+                nameDisplay: 'some-label',
+                isReady:     true
+              },
+              // unpinned NOT ready cluster
+              {
+                name:        'whatever',
+                id:          'an-id4',
+                mgmt:        { id: 'an-id4' },
+                description: 'some-description4',
+                nameDisplay: 'some-label'
+              },
+            ]),
+          }
         },
 
         stubs: ['BrandImage', 'router-link'],
       },
     });
 
+    await waitForIt();
+
     const description1 = wrapper.find('[data-testid="pinned-menu-cluster-an-id1"] .description');
     const description2 = wrapper.find('[data-testid="pinned-menu-cluster-disabled-an-id2"] .description');
     const description3 = wrapper.find('[data-testid="menu-cluster-an-id3"] .description');
@@ -429,13 +429,15 @@ describe('topLevelMenu', () => {
     expect(description4.text()).toStrictEqual('some-description4');
   });
 
-  it('should not "crash" the component if the structure of banner settings is in an old format', () => {
+  it('should not "crash" the component if the structure of banner settings is in an old format', async() => {
     const wrapper: Wrapper<InstanceType<typeof TopLevelMenu>> = mount(TopLevelMenu, {
       global: {
         mocks: {
+          $route: {},
           $store: {
-            getters: {
-              'management/all': () => [{ name: 'whatever' },
+            ...generateStore(
+              [{ name: 'whatever' }],
+              [
                 // object based on https://github.com/rancher/dashboard/issues/10140#issuecomment-1883252402
                 {
                   id:    SETTING.BANNERS,
@@ -448,16 +450,18 @@ describe('topLevelMenu', () => {
                     showHeader: 'true',
                     showFooter: 'true'
                   })
-                }],
-              ...defaultStore
-            },
-          },
+                }
+              ]
+            ),
+          }
         },
 
         stubs: ['BrandImage', 'router-link'],
       },
     });
 
+    await waitForIt();
+
     expect(wrapper.vm.sideMenuStyle).toStrictEqual({
       marginBottom: '2em',
       marginTop:    '2em'
@@ -466,21 +470,21 @@ describe('topLevelMenu', () => {
 
   describe('searching a term', () => {
     describe('should displays a no results message if have clusters but', () => {
-      it('given no matching clusters', () => {
+      it('given no matching clusters', async() => {
         const wrapper: Wrapper<InstanceType<typeof TopLevelMenu>> = mount(TopLevelMenu, {
           data: () => ({ clusterFilter: 'whatever' }),
 
           global: {
             mocks: {
+              $route: {},
               $store: {
-                getters: {
-                  'management/all': () => [{
+                ...generateStore([
+                  {
                     id:          'an-id1',
                     mgmt:        { id: 'an-id1' },
                     nameDisplay: 'something else'
-                  }],
-                  ...defaultStore
-                },
+                  }
+                ])
               },
             },
 
@@ -488,27 +492,29 @@ describe('topLevelMenu', () => {
           },
         });
 
+        await waitForIt();
+
         const noResults = wrapper.find('[data-testid="top-level-menu-no-results"]');
 
         expect(noResults.exists()).toBe(true);
       });
 
-      it('given no matched pinned clusters', () => {
+      it('given no matched pinned clusters', async() => {
         const wrapper: Wrapper<InstanceType<typeof TopLevelMenu>> = mount(TopLevelMenu, {
           data: () => ({ clusterFilter: 'whatever' }),
 
           global: {
             mocks: {
+              $route: {},
               $store: {
-                getters: {
-                  'management/all': () => [{
+                ...generateStore([
+                  {
                     id:          'an-id1',
                     mgmt:        { id: 'an-id1' },
                     nameDisplay: 'something else',
                     pinned:      true
-                  }],
-                  ...defaultStore
-                },
+                  }
+                ])
               },
             },
 
@@ -516,6 +522,8 @@ describe('topLevelMenu', () => {
           },
         });
 
+        await waitForIt();
+
         const noResults = wrapper.find('[data-testid="top-level-menu-no-results"]');
 
         expect(noResults.exists()).toBe(true);
@@ -523,22 +531,22 @@ describe('topLevelMenu', () => {
     });
 
     describe('should not displays a no results message', () => {
-      it('given matching clusters', () => {
+      it('given matching clusters', async() => {
         const search = 'you found me';
         const wrapper: Wrapper<InstanceType<typeof TopLevelMenu>> = mount(TopLevelMenu, {
           data: () => ({ clusterFilter: search }),
 
           global: {
             mocks: {
+              $route: {},
               $store: {
-                getters: {
-                  'management/all': () => [{
+                ...generateStore([
+                  {
                     id:          'an-id1',
                     mgmt:        { id: 'an-id1' },
                     nameDisplay: search
-                  }],
-                  ...defaultStore
-                },
+                  }
+                ])
               },
             },
 
@@ -546,29 +554,31 @@ describe('topLevelMenu', () => {
           },
         });
 
+        await waitForIt();
+
         const noResults = wrapper.find('[data-testid="top-level-menu-no-results"]');
 
         expect(wrapper.vm.clustersFiltered).toHaveLength(1);
         expect(noResults.exists()).toBe(false);
       });
 
-      it('given clusters with status pinned', () => {
+      it('given clusters with status pinned', async() => {
         const search = 'you found me';
         const wrapper: Wrapper<InstanceType<typeof TopLevelMenu>> = mount(TopLevelMenu, {
           data: () => ({ clusterFilter: search }),
 
           global: {
             mocks: {
+              $route: {},
               $store: {
-                getters: {
-                  'management/all': () => [{
+                ...generateStore([
+                  {
                     nameDisplay: search,
                     pinned:      true,
                     id:          'an-id1',
                     mgmt:        { id: 'an-id1' },
-                  }],
-                  ...defaultStore
-                },
+                  }
+                ])
               },
             },
 
@@ -576,6 +586,8 @@ describe('topLevelMenu', () => {
           },
         });
 
+        await waitForIt();
+
         const noResults = wrapper.find('[data-testid="top-level-menu-no-results"]');
 
         expect(wrapper.vm.pinFiltered).toHaveLength(1);
diff --git a/shell/config/router/routes.js b/shell/config/router/routes.js
index 1a362788b4f..8cf25a1f369 100644
--- a/shell/config/router/routes.js
+++ b/shell/config/router/routes.js
@@ -5,7 +5,7 @@ import { CAPI, MANAGEMENT, BACKUP_RESTORE, CIS } from '@shell/config/types';
 import { NAME as AUTH } from '@shell/config/product/auth';
 
 // All these imports are related to the install-redirect.js navigation guard.
-import { installRedirectRouteMeta } from 'config/router/navigation-guards/install-redirect';
+import { installRedirectRouteMeta } from '@shell/config/router/navigation-guards/install-redirect';
 import { NAME as BACKUP_NAME, CHART_NAME as BACKUP_CHART_NAME } from '@shell/config/product/backup';
 import { NAME as CIS_NAME, CHART_NAME as CIS_CHART_NAME } from '@shell/config/product/cis';
 import { NAME as GATEKEEPER_NAME, CHART_NAME as GATEKEEPER_CHART_NAME } from '@shell/config/product/gatekeeper';
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index 06acfb849ee..8c3a8e5db60 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -24,9 +24,9 @@ import TabTitle from '@shell/components/TabTitle.vue';
 import { ActionFindPageArgs } from '@shell/types/store/dashboard-store.types';
 
 import { RESET_CARDS_ACTION, SET_LOGIN_ACTION } from '@shell/config/page-actions';
-import { STEVE_NAME_COL, STEVE_STATE_COL } from 'config/pagination-table-headers';
-import { PaginationParamFilter, FilterArgs, PaginationFilterField } from 'types/store/pagination.types';
-import ProvCluster from 'models/provisioning.cattle.io.cluster';
+import { STEVE_NAME_COL, STEVE_STATE_COL } from '@shell/config/pagination-table-headers';
+import { PaginationParamFilter, FilterArgs, PaginationFilterField } from '@shell/types/store/pagination.types';
+import ProvCluster from '@shell/models/provisioning.cattle.io.cluster';
 
 export default defineComponent({
   name:       'Home',
diff --git a/shell/utils/cluster.js b/shell/utils/cluster.js
index bce89385747..ba028e34aa9 100644
--- a/shell/utils/cluster.js
+++ b/shell/utils/cluster.js
@@ -3,7 +3,7 @@ import { camelToTitle } from '@shell/utils/string';
 import { CAPI } from '@shell/config/labels-annotations';
 import { MANAGEMENT, VIRTUAL_HARVESTER_PROVIDER } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
-import { PaginationFilterField, PaginationParamFilter } from 'types/store/pagination.types';
+import { PaginationFilterField, PaginationParamFilter } from '@shell/types/store/pagination.types';
 
 /**
  * Combination of paginationFilterHiddenLocalCluster and paginationFilterOnlyKubernetesClusters
diff --git a/shell/utils/pagination-wrapper.ts b/shell/utils/pagination-wrapper.ts
index f8b2144ca2e..c3412a51eef 100644
--- a/shell/utils/pagination-wrapper.ts
+++ b/shell/utils/pagination-wrapper.ts
@@ -1,6 +1,6 @@
 import paginationUtils from '@shell/utils/pagination-utils';
-import { PaginationArgs, PaginationResourceContext, StorePagination } from 'types/store/pagination.types';
-import { VuexStore } from 'types/store/vuex';
+import { PaginationArgs, PaginationResourceContext, StorePagination } from '@shell/types/store/pagination.types';
+import { VuexStore } from '@shell/types/store/vuex';
 
 interface Result<T> {
   data: Array<T>

From eb962042d84355f94076476fce7b6954ac56d908 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 5 Dec 2024 17:22:11 +0000
Subject: [PATCH 29/76] E2E: Ensure we wait for cluster entries to exist before
 clicking on them

---
 cypress/e2e/po/pages/chart-repositories.po.ts             | 3 +--
 cypress/e2e/po/pages/explorer/charts/charts.po.ts         | 3 +--
 cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts     | 3 +--
 cypress/e2e/po/pages/explorer/config-map.po.ts            | 3 +--
 .../po/pages/explorer/custom-resource-definitions.po.ts   | 3 +--
 .../po/pages/explorer/horizontal-pod-autoscalers.po.ts    | 3 +--
 cypress/e2e/po/pages/explorer/ingress.po.ts               | 3 +--
 cypress/e2e/po/pages/explorer/network-policy.po.ts        | 3 +--
 .../e2e/po/pages/explorer/persistent-volume-claims.po.ts  | 3 +--
 cypress/e2e/po/pages/explorer/persistent-volumes.po.ts    | 3 +--
 cypress/e2e/po/pages/explorer/services.po.ts              | 3 +--
 cypress/e2e/po/pages/explorer/storage-classes.po.ts       | 3 +--
 cypress/e2e/po/pages/explorer/workloads-pods.po.ts        | 3 +--
 cypress/e2e/po/side-bars/burger-side-menu.po.ts           | 8 +++++++-
 .../e2e/tests/navigation/side-nav/main-side-menu.spec.ts  | 3 +++
 .../tests/navigation/side-nav/product-side-nav.spec.ts    | 3 +--
 16 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/cypress/e2e/po/pages/chart-repositories.po.ts b/cypress/e2e/po/pages/chart-repositories.po.ts
index ba5c1fdb010..fac6bf3963e 100644
--- a/cypress/e2e/po/pages/chart-repositories.po.ts
+++ b/cypress/e2e/po/pages/chart-repositories.po.ts
@@ -28,8 +28,7 @@ export default class ChartRepositoriesPagePo extends PagePo {
       const burgerMenu = new BurgerMenuPo();
       const sideNav = new ProductNavPo();
 
-      BurgerMenuPo.toggle();
-      burgerMenu.clusterNotPinnedList().contains(clusterId).click();
+      burgerMenu.goToCluster(clusterId);
       sideNav.navToSideMenuGroupByLabel('Apps');
       sideNav.navToSideMenuEntryByLabel('Repositories');
     } else {
diff --git a/cypress/e2e/po/pages/explorer/charts/charts.po.ts b/cypress/e2e/po/pages/explorer/charts/charts.po.ts
index d09520aad30..615d10ef1b1 100644
--- a/cypress/e2e/po/pages/explorer/charts/charts.po.ts
+++ b/cypress/e2e/po/pages/explorer/charts/charts.po.ts
@@ -23,8 +23,7 @@ export class ChartsPage extends PagePo {
     const burgerMenu = new BurgerMenuPo();
     const sideNav = new ProductNavPo();
 
-    BurgerMenuPo.toggle();
-    burgerMenu.clusterNotPinnedList().contains(clusterId).click();
+    burgerMenu.goToCluster(clusterId);
     sideNav.navToSideMenuGroupByLabel('Apps');
   }
 
diff --git a/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts b/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
index 693a942152e..abb5f94d310 100644
--- a/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
+++ b/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
@@ -22,8 +22,7 @@ export default class ClusterDashboardPagePo extends PagePo {
   static navTo(clusterId = 'local') {
     const burgerMenu = new BurgerMenuPo();
 
-    BurgerMenuPo.toggle();
-    burgerMenu.clusterNotPinnedList().contains(clusterId).click();
+    burgerMenu.goToCluster(clusterId);
   }
 
   customizeAppearanceButton() {
diff --git a/cypress/e2e/po/pages/explorer/config-map.po.ts b/cypress/e2e/po/pages/explorer/config-map.po.ts
index 930f55e86cc..631797b0126 100644
--- a/cypress/e2e/po/pages/explorer/config-map.po.ts
+++ b/cypress/e2e/po/pages/explorer/config-map.po.ts
@@ -16,8 +16,7 @@ export class ConfigMapPagePo extends PagePo {
     const burgerMenu = new BurgerMenuPo();
     const sideNav = new ProductNavPo();
 
-    BurgerMenuPo.toggle();
-    burgerMenu.clusterNotPinnedList().contains(clusterId).click();
+    burgerMenu.goToCluster(clusterId);
     sideNav.navToSideMenuGroupByLabel('Storage');
     sideNav.navToSideMenuEntryByLabel('ConfigMaps');
   }
diff --git a/cypress/e2e/po/pages/explorer/custom-resource-definitions.po.ts b/cypress/e2e/po/pages/explorer/custom-resource-definitions.po.ts
index ab689fc0afe..4de4b4a5f82 100644
--- a/cypress/e2e/po/pages/explorer/custom-resource-definitions.po.ts
+++ b/cypress/e2e/po/pages/explorer/custom-resource-definitions.po.ts
@@ -22,8 +22,7 @@ export class CustomResourceDefinitionsPagePo extends PagePo {
     const burgerMenu = new BurgerMenuPo();
     const sideNav = new ProductNavPo();
 
-    BurgerMenuPo.toggle();
-    burgerMenu.clusterNotPinnedList().contains(clusterId).click();
+    burgerMenu.goToCluster(clusterId);
     sideNav.navToSideMenuGroupByLabel('More Resources');
     sideNav.navToSideMenuGroupByLabel('API');
     sideNav.navToSideMenuEntryByLabel('CustomResourceDefinitions');
diff --git a/cypress/e2e/po/pages/explorer/horizontal-pod-autoscalers.po.ts b/cypress/e2e/po/pages/explorer/horizontal-pod-autoscalers.po.ts
index 6d762443b67..1291e2e8250 100644
--- a/cypress/e2e/po/pages/explorer/horizontal-pod-autoscalers.po.ts
+++ b/cypress/e2e/po/pages/explorer/horizontal-pod-autoscalers.po.ts
@@ -20,8 +20,7 @@ export class HorizontalPodAutoscalersPagePo extends PagePo {
     const burgerMenu = new BurgerMenuPo();
     const sideNav = new ProductNavPo();
 
-    BurgerMenuPo.toggle();
-    burgerMenu.clusterNotPinnedList().contains(clusterId).click();
+    burgerMenu.goToCluster(clusterId);
     sideNav.navToSideMenuGroupByLabel('Service Discovery');
     sideNav.navToSideMenuEntryByLabel('HorizontalPodAutoscalers');
   }
diff --git a/cypress/e2e/po/pages/explorer/ingress.po.ts b/cypress/e2e/po/pages/explorer/ingress.po.ts
index ebccd71e6aa..807f5cf990f 100644
--- a/cypress/e2e/po/pages/explorer/ingress.po.ts
+++ b/cypress/e2e/po/pages/explorer/ingress.po.ts
@@ -21,8 +21,7 @@ export class IngressPagePo extends PagePo {
     const burgerMenu = new BurgerMenuPo();
     const sideNav = new ProductNavPo();
 
-    BurgerMenuPo.toggle();
-    burgerMenu.clusterNotPinnedList().contains(clusterId).click();
+    burgerMenu.goToCluster(clusterId);
     sideNav.navToSideMenuGroupByLabel('Service Discovery');
     sideNav.navToSideMenuEntryByLabel('Ingresses');
   }
diff --git a/cypress/e2e/po/pages/explorer/network-policy.po.ts b/cypress/e2e/po/pages/explorer/network-policy.po.ts
index 01d89a9be4f..35db7da0842 100644
--- a/cypress/e2e/po/pages/explorer/network-policy.po.ts
+++ b/cypress/e2e/po/pages/explorer/network-policy.po.ts
@@ -16,8 +16,7 @@ export class NetworkPolicyPagePo extends PagePo {
     const burgerMenu = new BurgerMenuPo();
     const sideNav = new ProductNavPo();
 
-    BurgerMenuPo.toggle();
-    burgerMenu.clusterNotPinnedList().contains(clusterId).click();
+    burgerMenu.goToCluster(clusterId);
     sideNav.navToSideMenuGroupByLabel('Policy');
     sideNav.navToSideMenuEntryByLabel('Network Policies');
   }
diff --git a/cypress/e2e/po/pages/explorer/persistent-volume-claims.po.ts b/cypress/e2e/po/pages/explorer/persistent-volume-claims.po.ts
index 7e26e458325..3bea96f7e15 100644
--- a/cypress/e2e/po/pages/explorer/persistent-volume-claims.po.ts
+++ b/cypress/e2e/po/pages/explorer/persistent-volume-claims.po.ts
@@ -20,8 +20,7 @@ export class PersistentVolumeClaimsPagePo extends PagePo {
     const burgerMenu = new BurgerMenuPo();
     const sideNav = new ProductNavPo();
 
-    BurgerMenuPo.toggle();
-    burgerMenu.clusterNotPinnedList().contains(clusterId).click();
+    burgerMenu.goToCluster(clusterId);
     sideNav.navToSideMenuGroupByLabel('Storage');
     sideNav.navToSideMenuEntryByLabel('PersistentVolumeClaims');
   }
diff --git a/cypress/e2e/po/pages/explorer/persistent-volumes.po.ts b/cypress/e2e/po/pages/explorer/persistent-volumes.po.ts
index ec10860bba3..1c43e264e5f 100644
--- a/cypress/e2e/po/pages/explorer/persistent-volumes.po.ts
+++ b/cypress/e2e/po/pages/explorer/persistent-volumes.po.ts
@@ -21,8 +21,7 @@ export class PersistentVolumesPagePo extends PagePo {
     const burgerMenu = new BurgerMenuPo();
     const sideNav = new ProductNavPo();
 
-    BurgerMenuPo.toggle();
-    burgerMenu.clusterNotPinnedList().contains(clusterId).click();
+    burgerMenu.goToCluster(clusterId);
     sideNav.navToSideMenuGroupByLabel('Storage');
     sideNav.navToSideMenuEntryByLabel('PersistentVolumes');
   }
diff --git a/cypress/e2e/po/pages/explorer/services.po.ts b/cypress/e2e/po/pages/explorer/services.po.ts
index 0aca6ad8a21..3081ddf41fc 100644
--- a/cypress/e2e/po/pages/explorer/services.po.ts
+++ b/cypress/e2e/po/pages/explorer/services.po.ts
@@ -21,8 +21,7 @@ export class ServicesPagePo extends PagePo {
     const burgerMenu = new BurgerMenuPo();
     const sideNav = new ProductNavPo();
 
-    BurgerMenuPo.toggle();
-    burgerMenu.clusterNotPinnedList().contains(clusterId).click();
+    burgerMenu.goToCluster(clusterId);
     sideNav.navToSideMenuGroupByLabel('Service Discovery');
     sideNav.navToSideMenuEntryByLabel('Ingresses');
   }
diff --git a/cypress/e2e/po/pages/explorer/storage-classes.po.ts b/cypress/e2e/po/pages/explorer/storage-classes.po.ts
index 4859841ac64..6ca1756341c 100644
--- a/cypress/e2e/po/pages/explorer/storage-classes.po.ts
+++ b/cypress/e2e/po/pages/explorer/storage-classes.po.ts
@@ -21,8 +21,7 @@ export class StorageClassesPagePo extends PagePo {
     const burgerMenu = new BurgerMenuPo();
     const sideNav = new ProductNavPo();
 
-    BurgerMenuPo.toggle();
-    burgerMenu.clusterNotPinnedList().contains(clusterId).click();
+    burgerMenu.goToCluster(clusterId);
     sideNav.navToSideMenuGroupByLabel('Storage');
     sideNav.navToSideMenuEntryByLabel('StorageClasses');
   }
diff --git a/cypress/e2e/po/pages/explorer/workloads-pods.po.ts b/cypress/e2e/po/pages/explorer/workloads-pods.po.ts
index 366d4f63f6d..61ccbd09843 100644
--- a/cypress/e2e/po/pages/explorer/workloads-pods.po.ts
+++ b/cypress/e2e/po/pages/explorer/workloads-pods.po.ts
@@ -22,8 +22,7 @@ export class WorkloadsPodsListPagePo extends PagePo {
     const burgerMenu = new BurgerMenuPo();
     const sideNav = new ProductNavPo();
 
-    BurgerMenuPo.toggle();
-    burgerMenu.clusterNotPinnedList().contains(clusterId).click();
+    burgerMenu.goToCluster(clusterId);
     sideNav.navToSideMenuGroupByLabel('Workloads');
     sideNav.navToSideMenuEntryByLabel('Pods');
   }
diff --git a/cypress/e2e/po/side-bars/burger-side-menu.po.ts b/cypress/e2e/po/side-bars/burger-side-menu.po.ts
index c9937b99391..fa0ae030d36 100644
--- a/cypress/e2e/po/side-bars/burger-side-menu.po.ts
+++ b/cypress/e2e/po/side-bars/burger-side-menu.po.ts
@@ -134,7 +134,13 @@ export default class BurgerMenuPo extends ComponentPo {
     return this.self().find('.body .cluster.selector.option');
   }
 
-  goToCluster(clusterId = 'local') {
+  goToCluster(clusterId = 'local', toggleOpen = true) {
+    if (toggleOpen) {
+      BurgerMenuPo.toggle();
+    }
+
+    this.self().find('.cluster-name').contains(clusterId).should('exist');
+
     return this.self().find('.cluster-name').contains(clusterId).click();
   }
 
diff --git a/cypress/e2e/tests/navigation/side-nav/main-side-menu.spec.ts b/cypress/e2e/tests/navigation/side-nav/main-side-menu.spec.ts
index a26e141ce04..aa9b27283f4 100644
--- a/cypress/e2e/tests/navigation/side-nav/main-side-menu.spec.ts
+++ b/cypress/e2e/tests/navigation/side-nav/main-side-menu.spec.ts
@@ -32,6 +32,9 @@ describe('Side Menu: main', () => {
       pagePoFake.navToClusterMenuEntry(fakeProvClusterId);
       sideNav.navToSideMenuEntryByLabel('Projects/Namespaces');
 
+      BurgerMenuPo.burgerMenuGetNavClusterbyLabel('local').should('exist');
+      BurgerMenuPo.burgerMenuGetNavClusterbyLabel(fakeProvClusterId).should('exist');
+
       // press key combo
       cy.get('body').focus().type('{alt}', { release: false });
 
diff --git a/cypress/e2e/tests/navigation/side-nav/product-side-nav.spec.ts b/cypress/e2e/tests/navigation/side-nav/product-side-nav.spec.ts
index 937ea0c0f42..9afbe19ad05 100644
--- a/cypress/e2e/tests/navigation/side-nav/product-side-nav.spec.ts
+++ b/cypress/e2e/tests/navigation/side-nav/product-side-nav.spec.ts
@@ -21,10 +21,9 @@ describe('Side navigation: Cluster ', { tags: ['@navigation', '@adminUser'] }, (
     cy.login();
 
     HomePagePo.goTo();
-    BurgerMenuPo.toggle();
     const burgerMenuPo = new BurgerMenuPo();
 
-    burgerMenuPo.goToCluster('local').click();
+    burgerMenuPo.goToCluster('local');
   });
 
   it('Can access to first navigation link on click', () => {

From 3907b29ca8adf97ab8f0b70e87d60672d434281b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 5 Dec 2024 18:18:21 +0000
Subject: [PATCH 30/76] backport fix for local/api filtering

---
 shell/mixins/resource-fetch.js | 21 ++++++++---
 shell/pages/home.vue           | 65 ++++++++++++++++++++++++++++------
 shell/utils/cluster.js         | 33 +++++++++++------
 3 files changed, 93 insertions(+), 26 deletions(-)

diff --git a/shell/mixins/resource-fetch.js b/shell/mixins/resource-fetch.js
index 3b6ad16310d..57ba466391f 100644
--- a/shell/mixins/resource-fetch.js
+++ b/shell/mixins/resource-fetch.js
@@ -70,8 +70,18 @@ export default {
   props: {
     /**
      * Add additional filtering to the rows
+     *
+     * Should only be used when we have all results, otherwise we're filtering a page which already has been filtered...
      */
-    filterRows: {
+    localFilter: {
+      type:    Function,
+      default: null,
+    },
+
+    /**
+     * Add additional filtering to the pagination api request
+     */
+    apiFilter: {
       type:    Function,
       default: null,
     },
@@ -91,11 +101,8 @@ export default {
             return rows;
           }
         } else {
-          return rows;
+          return this.localFilter ? this.localFilter(rows) : rows;
         }
-
-        // return this.filterRows ? this.filterRows(rows) : rows;
-        return [];
       }
 
       return [];
@@ -172,6 +179,10 @@ export default {
           force:            this.paginating !== null // Fix for manual refresh (before ripped out).
         };
 
+        if (this.apiFilter) {
+          opt.paginating = this.apiFilter(opt.pagination);
+        }
+
         this['paginating'] = true;
 
         const that = this;
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index 8c3a8e5db60..657157a46f5 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -2,12 +2,12 @@
 import { defineComponent } from 'vue';
 import { mapPref, AFTER_LOGIN_ROUTE, READ_WHATS_NEW, HIDE_HOME_PAGE_CARDS } from '@shell/store/prefs';
 import { Banner } from '@components/Banner';
-import BannerGraphic from '@shell/components/BannerGraphic';
-import IndentedPanel from '@shell/components/IndentedPanel';
+import BannerGraphic from '@shell/components/BannerGraphic.vue';
+import IndentedPanel from '@shell/components/IndentedPanel.vue';
 import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts, FetchSecondaryResourcesOpts } from '@shell/components/PaginatedResourceTable.vue';
 import { BadgeState } from '@components/BadgeState';
-import CommunityLinks from '@shell/components/CommunityLinks';
-import SingleClusterInfo from '@shell/components/SingleClusterInfo';
+import CommunityLinks from '@shell/components/CommunityLinks.vue';
+import SingleClusterInfo from '@shell/components/SingleClusterInfo.vue';
 import { mapGetters, mapState } from 'vuex';
 import { MANAGEMENT, CAPI } from '@shell/config/types';
 import { NAME as MANAGER } from '@shell/config/product/manager';
@@ -19,14 +19,16 @@ import PageHeaderActions from '@shell/mixins/page-actions';
 import { getVendor } from '@shell/config/private-label';
 import { mapFeature, MULTI_CLUSTER } from '@shell/store/features';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
-import { paginationFilterClusters } from '@shell/utils/cluster';
+import { filterHiddenLocalCluster, filterOnlyKubernetesClusters, paginationFilterClusters } from '@shell/utils/cluster';
 import TabTitle from '@shell/components/TabTitle.vue';
 import { ActionFindPageArgs } from '@shell/types/store/dashboard-store.types';
 
 import { RESET_CARDS_ACTION, SET_LOGIN_ACTION } from '@shell/config/page-actions';
 import { STEVE_NAME_COL, STEVE_STATE_COL } from '@shell/config/pagination-table-headers';
-import { PaginationParamFilter, FilterArgs, PaginationFilterField } from '@shell/types/store/pagination.types';
+import { PaginationParamFilter, FilterArgs, PaginationFilterField, PaginationArgs } from '@shell/types/store/pagination.types';
 import ProvCluster from '@shell/models/provisioning.cattle.io.cluster';
+import devConsole from 'utils/dev-console';
+import { sameContents } from 'utils/array';
 
 export default defineComponent({
   name:       'Home',
@@ -45,8 +47,6 @@ export default defineComponent({
   mixins: [PageHeaderActions],
 
   data() {
-    const paginationRequestFilters = paginationFilterClusters(this.$store);
-
     return {
       HIDE_HOME_PAGE_CARDS,
       fullVersion: getVersionInfo(this.$store).fullVersion,
@@ -64,8 +64,6 @@ export default defineComponent({
       ],
       vendor: getVendor(),
 
-      paginationRequestFilters,
-
       provClusterSchema: this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER),
 
       canViewMgmtClusters:  !!this.$store.getters['management/schemaFor'](MANAGEMENT.CLUSTER),
@@ -423,6 +421,48 @@ export default defineComponent({
       if (retry === 0 && res?.type === 'error' && res?.status === 500) {
         await this.closeSetLoginBanner(retry + 1);
       }
+    },
+
+    /**
+     * Filter out hidden clusters from list of all clusters
+     */
+    filterRowsLocal(rows: any[]) {
+      devConsole.warn('filterRowsLocal', rows, filterHiddenLocalCluster(filterOnlyKubernetesClusters(rows || [], this.$store), this.$store));
+
+      return filterHiddenLocalCluster(filterOnlyKubernetesClusters(rows || [], this.$store), this.$store);
+    },
+
+    /**
+     * Filter out hidden clusters via api
+     */
+    filterRowsApi(pagination: PaginationArgs): PaginationArgs {
+      if (!pagination.filters) {
+        pagination.filters = [];
+      }
+
+      // Pending API Support https://github.com/rancher/rancher/issues/48011
+      const existingFilters = pagination.filters;
+      const requiredFilters = paginationFilterClusters(this.$store, false);
+
+      for (let i = 0; i < requiredFilters.length; i++) {
+        const required = requiredFilters[i];
+
+        for (let j = 0; j < existingFilters.length; j++) {
+          const candidate = existingFilters[j];
+
+          if (
+            required.fields.length === candidate.fields.length &&
+            sameContents(required.fields.map((e) => e.field), candidate.fields.map((e) => e.field))
+          ) {
+            Object.assign(candidate, required);
+            break;
+          }
+        }
+
+        pagination.filters.push(required);
+      }
+
+      return pagination;
     }
   }
 });
@@ -500,6 +540,7 @@ export default defineComponent({
               class="col span-12"
             >
               <!-- // TODO: RC (home page/side bar) TEST with pagination off and on. check loading indicator when pagination off -->
+              <!-- TODO: RC namespaced: false now doesn't work -->
               <PaginatedResourceTable
                 :schema="provClusterSchema"
                 :table-actions="false"
@@ -509,8 +550,10 @@ export default defineComponent({
                 :pagination-headers="paginationHeaders"
                 context="home"
 
+                :local-filter="filterRowsLocal"
+                :api-filter="filterRowsApi"
+
                 :namespaced="false"
-                :request-filters="paginationRequestFilters"
                 manualRefreshButtonSize="sm"
                 :fetchSecondaryResources="fetchSecondaryResources"
                 :fetchPageSecondaryResources="fetchPageSecondaryResources"
diff --git a/shell/utils/cluster.js b/shell/utils/cluster.js
index ba028e34aa9..18b780d4be5 100644
--- a/shell/utils/cluster.js
+++ b/shell/utils/cluster.js
@@ -11,15 +11,19 @@ import { PaginationFilterField, PaginationParamFilter } from '@shell/types/store
  * @param {*} store
  * @returns PaginationParam[]
  */
-export function paginationFilterClusters(store) {
+export function paginationFilterClusters(store, filterMgmtCluster = true) {
   // TODO: RC (home page/side bar) TEST both facets
   const paginationRequestFilters = [];
-  const pFilterOnlyKubernetesClusters = paginationFilterOnlyKubernetesClusters(store);
-  const pFilterHiddenLocalCluster = paginationFilterHiddenLocalCluster(store);
 
-  if (pFilterOnlyKubernetesClusters) {
-    paginationRequestFilters.push(pFilterOnlyKubernetesClusters);
-  }
+  // Commenting out for the moment. This is broken for non-paginated world
+  // filterOnlyKubernetesClusters expects a mgmt cluster, however in the home page it's given a prov cluster
+  // note - filterHiddenLocalCluster works because it uses model isLocal which is on both cluster types
+  // const pFilterOnlyKubernetesClusters = paginationFilterOnlyKubernetesClusters(store);
+  // if (pFilterOnlyKubernetesClusters) {
+  //   paginationRequestFilters.push(pFilterOnlyKubernetesClusters);
+  // }
+  const pFilterHiddenLocalCluster = paginationFilterHiddenLocalCluster(store, filterMgmtCluster);
+
   if (pFilterHiddenLocalCluster) {
     paginationRequestFilters.push(pFilterHiddenLocalCluster);
   }
@@ -34,7 +38,7 @@ export function paginationFilterClusters(store) {
  * @param {*} store
  * @returns PaginationParam | null
  */
-export function paginationFilterHiddenLocalCluster(store) {
+export function paginationFilterHiddenLocalCluster(store, filterMgmtCluster = true) {
   const hideLocalSetting = store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.HIDE_LOCAL_CLUSTER) || {};
   const value = hideLocalSetting.value || hideLocalSetting.default || 'false';
   const hideLocal = value === 'true';
@@ -43,12 +47,21 @@ export function paginationFilterHiddenLocalCluster(store) {
     return null;
   }
 
-  return PaginationParamFilter.createMultipleFields([
+  const filter = filterMgmtCluster ? [
     new PaginationFilterField({
       field: `spec.internal`, // Pending API support https://github.com/rancher/rancher/issues/48011
       value: false,
-    }),
-  ]);
+    })
+  ] : [
+    new PaginationFilterField({
+      field:  `id`,
+      value:  'fleet-local/local',
+      exact:  true,
+      equals: false,
+    })
+  ];
+
+  return PaginationParamFilter.createMultipleFields(filter);
 }
 
 /**

From 545da460c6f045eb1d9df2ad488f79217035dd9a Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Fri, 6 Dec 2024 09:58:31 +0000
Subject: [PATCH 31/76] Remove debug code

---
 shell/pages/home.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index 657157a46f5..728dcbc25b4 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -27,7 +27,6 @@ import { RESET_CARDS_ACTION, SET_LOGIN_ACTION } from '@shell/config/page-actions
 import { STEVE_NAME_COL, STEVE_STATE_COL } from '@shell/config/pagination-table-headers';
 import { PaginationParamFilter, FilterArgs, PaginationFilterField, PaginationArgs } from '@shell/types/store/pagination.types';
 import ProvCluster from '@shell/models/provisioning.cattle.io.cluster';
-import devConsole from 'utils/dev-console';
 import { sameContents } from 'utils/array';
 
 export default defineComponent({
@@ -427,8 +426,6 @@ export default defineComponent({
      * Filter out hidden clusters from list of all clusters
      */
     filterRowsLocal(rows: any[]) {
-      devConsole.warn('filterRowsLocal', rows, filterHiddenLocalCluster(filterOnlyKubernetesClusters(rows || [], this.$store), this.$store));
-
       return filterHiddenLocalCluster(filterOnlyKubernetesClusters(rows || [], this.$store), this.$store);
     },
 

From 28135a19e7a2086d0518c032041714248629ef12 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 9 Dec 2024 11:18:11 +0000
Subject: [PATCH 32/76] Changes after review

---
 shell/components/PaginatedResourceTable.vue | 8 ++++++--
 shell/components/nav/TopLevelMenu.vue       | 1 +
 shell/plugins/dashboard-store/actions.js    | 4 ++--
 shell/types/store/dashboard-store.types.ts  | 4 ++++
 shell/utils/cluster.js                      | 4 ++--
 shell/utils/pagination-wrapper.ts           | 3 ++-
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
index 7f58832026a..c650000e25d 100644
--- a/shell/components/PaginatedResourceTable.vue
+++ b/shell/components/PaginatedResourceTable.vue
@@ -76,11 +76,15 @@ export default defineComponent({
   },
 
   async fetch() {
-    await this.$fetchType(this.resource, [], this.inStore);
+    const promises = [
+      this.$fetchType(this.resource, [], this.inStore),
+    ];
 
     if (this.fetchSecondaryResources) {
-      await this.fetchSecondaryResources({ canPaginate: this.canPaginate });
+      promises.push(this.fetchSecondaryResources({ canPaginate: this.canPaginate }));
     }
+
+    await Promise.all(promises);
   },
 
   computed: {
diff --git a/shell/components/nav/TopLevelMenu.vue b/shell/components/nav/TopLevelMenu.vue
index b3333f5d234..01293994997 100644
--- a/shell/components/nav/TopLevelMenu.vue
+++ b/shell/components/nav/TopLevelMenu.vue
@@ -259,6 +259,7 @@ export default {
     }
   },
 
+  // See https://github.com/rancher/dashboard/issues/12831 for outstanding performance related work
   watch: {
     $route() {
       this.shown = false;
diff --git a/shell/plugins/dashboard-store/actions.js b/shell/plugins/dashboard-store/actions.js
index 35514a91750..b71c0e2d35c 100644
--- a/shell/plugins/dashboard-store/actions.js
+++ b/shell/plugins/dashboard-store/actions.js
@@ -146,7 +146,7 @@ export default {
   /**
    *
    * @param {*} ctx
-   * @param { {type: string, opt: ActionFindPageArgs} } opt
+   * @param { {type: string, opt: ActionFindAllArgs} } opt
    */
   async findAll(ctx, { type, opt }) {
     const {
@@ -364,7 +364,7 @@ export default {
   /**
    *
    * @param {*} ctx
-   * @param { {type: string, opt: FindPageOpt} } opt
+   * @param { {type: string, opt: ActionFindPageArgs} } opt
    */
   async findPage(ctx, { type, opt }) {
     const { getters, commit, dispatch } = ctx;
diff --git a/shell/types/store/dashboard-store.types.ts b/shell/types/store/dashboard-store.types.ts
index f982eebda1d..9a0be4fbae3 100644
--- a/shell/types/store/dashboard-store.types.ts
+++ b/shell/types/store/dashboard-store.types.ts
@@ -38,5 +38,9 @@ export interface ActionFindPageArgs extends ActionCoreFindArgs {
    * The single namespace to filter by (used in url path, not part of pagination params)
    */
   namespaced?: string,
+  /**
+   * Result of request is transient and not persisted to store
+   */
+  transient?: boolean,
   hasManualRefresh?: boolean,
 }
diff --git a/shell/utils/cluster.js b/shell/utils/cluster.js
index 18b780d4be5..6a2bd46199e 100644
--- a/shell/utils/cluster.js
+++ b/shell/utils/cluster.js
@@ -80,13 +80,13 @@ export function paginationFilterOnlyKubernetesClusters(store) {
 
   return PaginationParamFilter.createMultipleFields([
     new PaginationFilterField({
-      field:  `metadata.labels."${ CAPI.PROVIDER }"`, // TODO: TEST
+      field:  `metadata.labels."${ CAPI.PROVIDER }"`, // TODO: RC (home page/side bar) TEST
       equals: false,
       value:  VIRTUAL_HARVESTER_PROVIDER,
       exact:  true
     }),
     new PaginationFilterField({
-      field:  `status.provider`, // TODO: TEST
+      field:  `status.provider`, // TODO: RC (home page/side bar) TEST
       equals: false,
       value:  VIRTUAL_HARVESTER_PROVIDER,
       exact:  true
diff --git a/shell/utils/pagination-wrapper.ts b/shell/utils/pagination-wrapper.ts
index c3412a51eef..42b7bc09ed5 100644
--- a/shell/utils/pagination-wrapper.ts
+++ b/shell/utils/pagination-wrapper.ts
@@ -1,6 +1,7 @@
 import paginationUtils from '@shell/utils/pagination-utils';
 import { PaginationArgs, PaginationResourceContext, StorePagination } from '@shell/types/store/pagination.types';
 import { VuexStore } from '@shell/types/store/vuex';
+import { ActionFindPageArgs } from '@shell/types/store/dashboard-store.types';
 
 interface Result<T> {
   data: Array<T>
@@ -49,7 +50,7 @@ class PaginationWrapper<T = any> {
         throw new Error(`Wrapper for type '${ this.enabledFor.store }/${ this.enabledFor.resource?.id }' in context '${ this.enabledFor.resource?.context }' not supported`);
       }
       const { pagination, classify: doClassify } = args;
-      const opt = {
+      const opt: ActionFindPageArgs = {
         transient: true,
         pagination
       };

From 8130cca9b02b79ce2a829ddb7e60a6d8a4bcea33 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 9 Dec 2024 11:56:06 +0000
Subject: [PATCH 33/76] e2e fixes / debugging

---
 .../po/pages/explorer/cluster-dashboard.po.ts |  4 +++
 .../dashboard/cluster-dashboard.spec.ts       | 18 +++++++++----
 .../pages/explorer2/workloads/pods.spec.ts    | 26 ++++++++++++++-----
 .../tests/pages/extensions/extensions.spec.ts | 13 +++++-----
 4 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts b/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
index abb5f94d310..3f1daaf5eaf 100644
--- a/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
+++ b/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
@@ -15,6 +15,10 @@ export default class ClusterDashboardPagePo extends PagePo {
     return super.goTo(ClusterDashboardPagePo.createPath(clusterId));
   }
 
+  urlPath(clusterId = 'local') {
+    return ClusterDashboardPagePo.createPath(clusterId);
+  }
+
   constructor(clusterId: string) {
     super(ClusterDashboardPagePo.createPath(clusterId));
   }
diff --git a/cypress/e2e/tests/pages/explorer/dashboard/cluster-dashboard.spec.ts b/cypress/e2e/tests/pages/explorer/dashboard/cluster-dashboard.spec.ts
index c1f9ef6a7e1..739bb22bffa 100644
--- a/cypress/e2e/tests/pages/explorer/dashboard/cluster-dashboard.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/dashboard/cluster-dashboard.spec.ts
@@ -9,7 +9,6 @@ import { NodesPagePo } from '@/cypress/e2e/po/pages/explorer/nodes.po';
 import { EventsPagePo } from '@/cypress/e2e/po/pages/explorer/events.po';
 import * as path from 'path';
 import { eventsNoDataset } from '@/cypress/e2e/blueprints/explorer/cluster/events';
-import HomePagePo from '@/cypress/e2e/po/pages/home.po';
 
 const configMapYaml = `apiVersion: v1
 kind: ConfigMap
@@ -258,12 +257,19 @@ describe('Cluster Dashboard', { testIsolation: 'off', tags: ['@explorer', '@admi
   });
 
   it('can view events table empty if no events', { tags: ['@vai', '@adminUser'] }, () => {
-    const events = new EventsPagePo('local');
-
-    HomePagePo.goTo();
+    cy.visit(clusterDashboard.urlPath(), {
+      onBeforeLoad(win) {
+        cy.stub(win.console, 'error').as('consoleError');
+        cy.stub(win.console, 'warn').as('consoleWarn');
+      },
+    });
 
     eventsNoDataset();
-    ClusterDashboardPagePo.navTo();
+    clusterDashboard.goTo();
+
+    cy.get('@consoleError').should('not.be.called'); // See error lot
+    cy.get('@consoleWarn').should('not.be.called'); // See warning log (there will be some....)
+
     cy.wait('@eventsNoData');
     clusterDashboard.waitForPage(undefined, 'cluster-events');
 
@@ -279,6 +285,8 @@ describe('Cluster Dashboard', { testIsolation: 'off', tags: ['@explorer', '@admi
 
     clusterDashboard.fullEventsLink().click();
     cy.wait('@eventsNoData');
+    const events = new EventsPagePo('local');
+
     events.waitForPage();
 
     events.eventslist().resourceTable().sortableTable().checkRowCount(true, 1);
diff --git a/cypress/e2e/tests/pages/explorer2/workloads/pods.spec.ts b/cypress/e2e/tests/pages/explorer2/workloads/pods.spec.ts
index 505038e8e81..77ddf167ef6 100644
--- a/cypress/e2e/tests/pages/explorer2/workloads/pods.spec.ts
+++ b/cypress/e2e/tests/pages/explorer2/workloads/pods.spec.ts
@@ -6,9 +6,15 @@ import PodPo from '@/cypress/e2e/po/components/workloads/pod.po';
 import HomePagePo from '@/cypress/e2e/po/pages/home.po';
 import { generatePodsDataSmall } from '@/cypress/e2e/blueprints/explorer/workloads/pods/pods-get';
 import SortableTablePo from '@/cypress/e2e/po/components/sortable-table.po';
+import { NamespaceFilterPo } from '@/cypress/e2e/po/components/namespace-filter.po';
+import ClusterDashboardPagePo from '@/cypress/e2e/po/pages/explorer/cluster-dashboard.po';
+
+const cluster = 'local';
 
 describe('Pods', { testIsolation: 'off', tags: ['@explorer2', '@adminUser'] }, () => {
-  const workloadsPodPage = new WorkloadsPodsListPagePo('local');
+  const workloadsPodPage = new WorkloadsPodsListPagePo(cluster);
+  const clusterDashboard = new ClusterDashboardPagePo(cluster);
+  const nsFilter = new NamespaceFilterPo();
 
   before(() => {
     cy.login();
@@ -55,13 +61,19 @@ describe('Pods', { testIsolation: 'off', tags: ['@explorer2', '@adminUser'] }, (
             uniquePod = resp.body.metadata.name;
           });
 
-          cy.tableRowsPerPageAndNamespaceFilter(10, 'local', 'none', `{\"local\":[\"ns://${ nsName1 }\",\"ns://${ nsName2 }\"]}`);
+          cy.tableRowsPerPageAndNamespaceFilter(10, cluster, 'none', `{\"local\":[\"ns://${ nsName1 }\",\"ns://${ nsName2 }\"]}`);
         });
       });
     });
 
     it('pagination is visible and user is able to navigate through pods data', () => {
-      WorkloadsPodsListPagePo.goTo('local');
+      // Confirm that the ns filter is set correctly before navigating to a page that will use it
+      clusterDashboard.goTo();
+      clusterDashboard.waitForPage();
+      nsFilter.selectedValues().contains(nsName1);
+      nsFilter.selectedValues().contains(nsName2);
+
+      WorkloadsPodsListPagePo.navTo();
       workloadsPodPage.waitForPage();
 
       // check pods count
@@ -178,7 +190,7 @@ describe('Pods', { testIsolation: 'off', tags: ['@explorer2', '@adminUser'] }, (
     });
 
     it('pagination is hidden', () => {
-      cy.tableRowsPerPageAndNamespaceFilter(10, 'local', 'none', '{"local":[]}');
+      cy.tableRowsPerPageAndNamespaceFilter(10, cluster, 'none', '{"local":[]}');
 
       // generate small set of pods data
       generatePodsDataSmall();
@@ -195,7 +207,7 @@ describe('Pods', { testIsolation: 'off', tags: ['@explorer2', '@adminUser'] }, (
 
     after('clean up', () => {
       // Ensure the default rows per page value is set after running the tests
-      cy.tableRowsPerPageAndNamespaceFilter(100, 'local', 'none', '{"local":["all://user"]}');
+      cy.tableRowsPerPageAndNamespaceFilter(100, cluster, 'none', '{"local":["all://user"]}');
 
       // delete namespace (this will also delete all pods in it)
       cy.deleteRancherResource('v1', 'namespaces', nsName1);
@@ -289,14 +301,14 @@ describe('Pods', { testIsolation: 'off', tags: ['@explorer2', '@adminUser'] }, (
   //   });
 
   //   it('dialog should open/close as expected', () => {
-  //     const podCreatePage = new WorkloadsPodsCreatePagePo('local');
+  //     const podCreatePage = new WorkloadsPodsCreatePagePo(cluster);
 
   //     podCreatePage.goTo();
 
   //     podCreatePage.createWithUI(podName, 'nginx', 'default');
 
   //     // Should be on the list view
-  //     const podsListPage = new WorkloadsPodsListPagePo('local');
+  //     const podsListPage = new WorkloadsPodsListPagePo(cluster);
 
   //     // Filter the list to just show the newly created pod
   //     podsListPage.list().resourceTable().sortableTable().filter(podName);
diff --git a/cypress/e2e/tests/pages/extensions/extensions.spec.ts b/cypress/e2e/tests/pages/extensions/extensions.spec.ts
index 21e089876fa..6b8c4e01a24 100644
--- a/cypress/e2e/tests/pages/extensions/extensions.spec.ts
+++ b/cypress/e2e/tests/pages/extensions/extensions.spec.ts
@@ -7,6 +7,7 @@ import UiPluginsPagePo from '@/cypress/e2e/po/pages/explorer/uiplugins.po';
 import { NamespaceFilterPo } from '@/cypress/e2e/po/components/namespace-filter.po';
 
 const namespaceFilter = new NamespaceFilterPo();
+const cluster = 'local';
 
 const DISABLED_CACHE_EXTENSION_NAME = 'large-extension';
 // const DISABLED_CACHE_EXTENSION_MENU_LABEL = 'Large-extension';
@@ -150,7 +151,7 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
     BurgerMenuPo.checkIfMenuItemLinkIsHighlighted('Extensions');
 
     // catching regression https://github.com/rancher/dashboard/issues/10576
-    BurgerMenuPo.checkIfClusterMenuLinkIsHighlighted('local', false);
+    BurgerMenuPo.checkIfClusterMenuLinkIsHighlighted(cluster, false);
 
     // go to "add rancher repositories"
     extensionsPo.extensionMenuToggle();
@@ -161,7 +162,7 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
     extensionsPo.addReposModal().should('not.exist');
 
     // go to repos list page
-    const appRepoList = new RepositoriesPagePo('local', 'apps');
+    const appRepoList = new RepositoriesPagePo(cluster, 'apps');
 
     appRepoList.goTo();
     appRepoList.waitForPage();
@@ -185,7 +186,7 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
       }
     });
 
-    const appRepoList = new RepositoriesPagePo('local', 'apps');
+    const appRepoList = new RepositoriesPagePo(cluster, 'apps');
 
     // Ensure that the banner should be shown (by confirming that a required repo isn't there)
     appRepoList.goTo();
@@ -344,7 +345,7 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
   });
 
   // ui-plugin-operator updated cache disabled threshold to 30mb as per https://github.com/rancher/rancher/pull/47565
-  it('An extension larger than 30mb, which will trigger chacheState disabled, should install and work fine', () => {
+  it('An extension larger than 30mb, which will trigger cacheState disabled, should install and work fine', () => {
     const extensionsPo = new ExtensionsPagePo();
 
     extensionsPo.goTo();
@@ -378,7 +379,7 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
     // cy.get('h1').should('have.text', DISABLED_CACHE_EXTENSION_TITLE);
 
     // check if cache state is disabled
-    const uiPluginsPo = new UiPluginsPagePo('local');
+    const uiPluginsPo = new UiPluginsPagePo(cluster);
 
     uiPluginsPo.goTo();
     uiPluginsPo.waitForPage();
@@ -460,7 +461,7 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
     extensionsPo.extensionDetailsTitle().should('contain', EXTENSION_NAME);
   });
 
-  it('Should uninstall unathenticated extensions', () => {
+  it('Should uninstall unauthenticated extensions', () => {
     // Because we logged out in the previous test this one will also have to use an uncached login
     cy.login(undefined, undefined, false);
     const extensionsPo = new ExtensionsPagePo();

From 7b89a85fea6178da0e387ffdc7b392e0fe8eafeb Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 9 Dec 2024 15:09:12 +0000
Subject: [PATCH 34/76] More e2e fixes

---
 .../e2e/po/components/namespace-filter.po.ts  |  5 +++
 .../po/pages/explorer/cluster-dashboard.po.ts | 36 ++++++++++++++++++-
 .../api/custom-resource-definitions.spec.ts   | 10 ++++--
 .../pages/explorer2/workloads/pods.spec.ts    |  9 +----
 4 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/cypress/e2e/po/components/namespace-filter.po.ts b/cypress/e2e/po/components/namespace-filter.po.ts
index cd9f5dfb67b..f56b8570d4a 100644
--- a/cypress/e2e/po/components/namespace-filter.po.ts
+++ b/cypress/e2e/po/components/namespace-filter.po.ts
@@ -1,4 +1,5 @@
 import ComponentPo from '@/cypress/e2e/po/components/component.po';
+
 export class NamespaceFilterPo extends ComponentPo {
   constructor() {
     super('[data-testid="namespaces-filter"]');
@@ -52,6 +53,10 @@ export class NamespaceFilterPo extends ComponentPo {
     return this.namespaceDropdown().find('[data-testid="namespaces-values"]');
   }
 
+  allSelected() {
+    return this.self().find('[data-testid="namespaces-values-none"]').should('exist');
+  }
+
   moreOptionsSelected() {
     return this.namespaceDropdown().find('.ns-more');
   }
diff --git a/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts b/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
index 3f1daaf5eaf..243bfc22994 100644
--- a/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
+++ b/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
@@ -4,7 +4,8 @@ import CustomBadgeDialogPo from '@/cypress/e2e/po/components/custom-badge-dialog
 import EventsListPo from '@/cypress/e2e/po/lists/events-list.po';
 import TabbedPo from '@/cypress/e2e/po/components/tabbed.po';
 import CertificatesPo from '@/cypress/e2e/po/components/certificates.po';
-import { HeaderPo } from '~/cypress/e2e/po/components/header.po';
+import { HeaderPo } from '@/cypress/e2e/po/components/header.po';
+import { NamespaceFilterPo } from '@/cypress/e2e/po/components/namespace-filter.po';
 
 export default class ClusterDashboardPagePo extends PagePo {
   private static createPath(clusterId: string) {
@@ -82,4 +83,37 @@ export default class ClusterDashboardPagePo extends PagePo {
   controllerManagerStatus() {
     return cy.get('[data-testid="k8s-service-controller-manager"]');
   }
+
+  /**
+   * Confirm that the ns filter is set correctly before navigating to a page that will use it
+   * 1. nav to cluster dashboard
+   * 2. check ns filter values
+   */
+  static goToAndConfirmNsValues(cluster: string, {
+    nsProject,
+    all
+  }: {
+    nsProject?: {
+      values: string[]
+    },
+    all?: {
+      is: boolean,
+    }
+  }) {
+    const instance = new ClusterDashboardPagePo(cluster);
+    const nsfilter = new NamespaceFilterPo();
+
+    instance.goTo(cluster);
+    instance.waitForPage();
+
+    if (nsProject) {
+      for (let i = 0; i < nsProject.values.length; i++) {
+        nsfilter.selectedValues().contains(nsProject.values[i]);
+      }
+    } else if (all) {
+      nsfilter.allSelected();
+    } else {
+      throw new Error('Bad Config');
+    }
+  }
 }
diff --git a/cypress/e2e/tests/pages/explorer/more-resources/api/custom-resource-definitions.spec.ts b/cypress/e2e/tests/pages/explorer/more-resources/api/custom-resource-definitions.spec.ts
index c3da910c863..a7f067c819a 100644
--- a/cypress/e2e/tests/pages/explorer/more-resources/api/custom-resource-definitions.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/more-resources/api/custom-resource-definitions.spec.ts
@@ -2,8 +2,10 @@ import { CustomResourceDefinitionsPagePo } from '@/cypress/e2e/po/pages/explorer
 import { generateCrdsDataSmall } from '@/cypress/e2e/blueprints/explorer/more-resources/api/custom-resource-definition-get';
 import * as jsyaml from 'js-yaml';
 import HomePagePo from '@/cypress/e2e/po/pages/home.po';
+import ClusterDashboardPagePo from '@/cypress/e2e/po/pages/explorer/cluster-dashboard.po';
 
-const crdsPage = new CustomResourceDefinitionsPagePo('local');
+const cluster = 'local';
+const crdsPage = new CustomResourceDefinitionsPagePo(cluster);
 const crdName = `e2etests.${ +new Date() }.example.com`;
 const crdGroup = `${ +new Date() }.example.com`;
 
@@ -14,11 +16,13 @@ describe('CustomResourceDefinitions', { testIsolation: 'off', tags: ['@explorer'
 
   describe('List', { tags: ['@vai', '@adminUser'] }, () => {
     before(() => {
-      cy.tableRowsPerPageAndNamespaceFilter(10, 'local', 'none', '{\"local\":[]}');
+      cy.tableRowsPerPageAndNamespaceFilter(10, cluster, 'none', '{\"local\":[]}');
     });
 
     it('can create a crd and see it in list view', () => {
-      crdsPage.goTo();
+      ClusterDashboardPagePo.goToAndConfirmNsValues(cluster, { all: { is: true } } );
+
+      CustomResourceDefinitionsPagePo.navTo();
       crdsPage.waitForPage();
       crdsPage.create();
 
diff --git a/cypress/e2e/tests/pages/explorer2/workloads/pods.spec.ts b/cypress/e2e/tests/pages/explorer2/workloads/pods.spec.ts
index 77ddf167ef6..348c9a1c072 100644
--- a/cypress/e2e/tests/pages/explorer2/workloads/pods.spec.ts
+++ b/cypress/e2e/tests/pages/explorer2/workloads/pods.spec.ts
@@ -6,15 +6,12 @@ import PodPo from '@/cypress/e2e/po/components/workloads/pod.po';
 import HomePagePo from '@/cypress/e2e/po/pages/home.po';
 import { generatePodsDataSmall } from '@/cypress/e2e/blueprints/explorer/workloads/pods/pods-get';
 import SortableTablePo from '@/cypress/e2e/po/components/sortable-table.po';
-import { NamespaceFilterPo } from '@/cypress/e2e/po/components/namespace-filter.po';
 import ClusterDashboardPagePo from '@/cypress/e2e/po/pages/explorer/cluster-dashboard.po';
 
 const cluster = 'local';
 
 describe('Pods', { testIsolation: 'off', tags: ['@explorer2', '@adminUser'] }, () => {
   const workloadsPodPage = new WorkloadsPodsListPagePo(cluster);
-  const clusterDashboard = new ClusterDashboardPagePo(cluster);
-  const nsFilter = new NamespaceFilterPo();
 
   before(() => {
     cy.login();
@@ -67,11 +64,7 @@ describe('Pods', { testIsolation: 'off', tags: ['@explorer2', '@adminUser'] }, (
     });
 
     it('pagination is visible and user is able to navigate through pods data', () => {
-      // Confirm that the ns filter is set correctly before navigating to a page that will use it
-      clusterDashboard.goTo();
-      clusterDashboard.waitForPage();
-      nsFilter.selectedValues().contains(nsName1);
-      nsFilter.selectedValues().contains(nsName2);
+      ClusterDashboardPagePo.goToAndConfirmNsValues(cluster, { nsProject: { values: [nsName1, nsName2] } });
 
       WorkloadsPodsListPagePo.navTo();
       workloadsPodPage.waitForPage();

From f16a1de9537e664cfd8aaf2071ef001b72e9c5de Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 9 Dec 2024 16:12:07 +0000
Subject: [PATCH 35/76] More e2e fixes

---
 .../e2e/po/pages/explorer/cluster-dashboard.po.ts    |  1 +
 cypress/e2e/po/pages/explorer/service-accounts.po.ts | 12 ++++++++++++
 .../tests/pages/explorer/dashboard/events.spec.ts    | 12 +++++++-----
 .../more-resources/core/service-accounts.spec.ts     | 10 +++++++---
 .../pages/explorer/service-discovery/ingress.spec.ts | 10 +++++++---
 5 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts b/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
index 243bfc22994..8027db195e2 100644
--- a/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
+++ b/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
@@ -105,6 +105,7 @@ export default class ClusterDashboardPagePo extends PagePo {
 
     instance.goTo(cluster);
     instance.waitForPage();
+    nsfilter.checkVisible();
 
     if (nsProject) {
       for (let i = 0; i < nsProject.values.length; i++) {
diff --git a/cypress/e2e/po/pages/explorer/service-accounts.po.ts b/cypress/e2e/po/pages/explorer/service-accounts.po.ts
index 2c174bda427..51dbe2f05d3 100644
--- a/cypress/e2e/po/pages/explorer/service-accounts.po.ts
+++ b/cypress/e2e/po/pages/explorer/service-accounts.po.ts
@@ -1,5 +1,7 @@
 import PagePo from '@/cypress/e2e/po/pages/page.po';
 import BaseResourceList from '@/cypress/e2e/po/lists/base-resource-list.po';
+import BurgerMenuPo from '@/cypress/e2e/po/side-bars/burger-side-menu.po';
+import ProductNavPo from '@/cypress/e2e/po/side-bars/product-side-nav.po';
 
 export class ServiceAccountsPagePo extends PagePo {
   private static createPath(clusterId: string) {
@@ -14,6 +16,16 @@ export class ServiceAccountsPagePo extends PagePo {
     return super.goTo(ServiceAccountsPagePo.createPath(clusterId));
   }
 
+  static navTo(clusterId = 'local') {
+    const burgerMenu = new BurgerMenuPo();
+    const sideNav = new ProductNavPo();
+
+    burgerMenu.goToCluster(clusterId);
+    sideNav.navToSideMenuGroupByLabel('More Resources');
+    sideNav.navToSideMenuGroupByLabel('Core');
+    sideNav.navToSideMenuEntryByLabel('ServiceAccount');
+  }
+
   constructor(clusterId = 'local') {
     super(ServiceAccountsPagePo.createPath(clusterId));
   }
diff --git a/cypress/e2e/tests/pages/explorer/dashboard/events.spec.ts b/cypress/e2e/tests/pages/explorer/dashboard/events.spec.ts
index cb3698c3568..e954f697b6b 100644
--- a/cypress/e2e/tests/pages/explorer/dashboard/events.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/dashboard/events.spec.ts
@@ -4,8 +4,9 @@ import { generateEventsDataSmall } from '@/cypress/e2e/blueprints/explorer/clust
 import LoadingPo from '@/cypress/e2e/po/components/loading.po';
 import SortableTablePo from '@/cypress/e2e/po/components/sortable-table.po';
 
-const clusterDashboard = new ClusterDashboardPagePo('local');
-const events = new EventsPagePo('local');
+const cluster = 'local';
+const clusterDashboard = new ClusterDashboardPagePo(cluster);
+const events = new EventsPagePo(cluster);
 
 describe('Events', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] }, () => {
   before(() => {
@@ -19,7 +20,7 @@ describe('Events', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] },
     let nsName2: string;
 
     before('set up', () => {
-      cy.updateNamespaceFilter('local', 'none', '{\"local\":[]}');
+      cy.updateNamespaceFilter(cluster, 'none', '{\"local\":[]}');
 
       cy.createE2EResourceName('ns1').then((ns1) => {
         nsName1 = ns1;
@@ -54,7 +55,8 @@ describe('Events', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] },
     });
 
     it('pagination is visible and user is able to navigate through events data', () => {
-      ClusterDashboardPagePo.goTo('local');
+      ClusterDashboardPagePo.goToAndConfirmNsValues(cluster, { nsProject: { values: [nsName1, nsName2] } });
+
       clusterDashboard.waitForPage(undefined, 'cluster-events');
       EventsPagePo.navTo();
       events.waitForPage();
@@ -199,7 +201,7 @@ describe('Events', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] },
     });
 
     after('clean up', () => {
-      cy.updateNamespaceFilter('local', 'none', '{"local":["all://user"]}');
+      cy.updateNamespaceFilter(cluster, 'none', '{"local":["all://user"]}');
 
       // delete namespace (this will also delete all pods in it)
       cy.deleteRancherResource('v1', 'namespaces', nsName1);
diff --git a/cypress/e2e/tests/pages/explorer/more-resources/core/service-accounts.spec.ts b/cypress/e2e/tests/pages/explorer/more-resources/core/service-accounts.spec.ts
index 95bc134c8a3..e0eb6689eac 100644
--- a/cypress/e2e/tests/pages/explorer/more-resources/core/service-accounts.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/more-resources/core/service-accounts.spec.ts
@@ -1,6 +1,8 @@
 import { ServiceAccountsPagePo } from '@/cypress/e2e/po/pages/explorer/service-accounts.po';
 import { generateServiceAccDataSmall, serviceAccNoData } from '@/cypress/e2e/blueprints/explorer/core/service-accounts-get';
+import ClusterDashboardPagePo from '@/cypress/e2e/po/pages/explorer/cluster-dashboard.po';
 
+const cluster = 'local';
 const serviceAccountsPagePo = new ServiceAccountsPagePo();
 
 describe('Service Accounts', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] }, () => {
@@ -10,12 +12,14 @@ describe('Service Accounts', { testIsolation: 'off', tags: ['@explorer', '@admin
 
   describe('List', { tags: ['@vai', '@adminUser'] }, () => {
     before('set up', () => {
-      cy.updateNamespaceFilter('local', 'none', '{\"local\":[]}');
+      cy.updateNamespaceFilter(cluster, 'none', '{\"local\":[]}');
     });
 
     it('validate services table in empty state', () => {
+      ClusterDashboardPagePo.goToAndConfirmNsValues(cluster, { all: { is: true } } );
+
       serviceAccNoData();
-      serviceAccountsPagePo.goTo();
+      ServiceAccountsPagePo.navTo();
       serviceAccountsPagePo.waitForPage();
       cy.wait('@serviceAccNoData');
 
@@ -80,7 +84,7 @@ describe('Service Accounts', { testIsolation: 'off', tags: ['@explorer', '@admin
     });
 
     after('clean up', () => {
-      cy.updateNamespaceFilter('local', 'none', '{"local":["all://user"]}');
+      cy.updateNamespaceFilter(cluster, 'none', '{"local":["all://user"]}');
     });
   });
 });
diff --git a/cypress/e2e/tests/pages/explorer/service-discovery/ingress.spec.ts b/cypress/e2e/tests/pages/explorer/service-discovery/ingress.spec.ts
index b14cb274387..8ad0ffe38ae 100644
--- a/cypress/e2e/tests/pages/explorer/service-discovery/ingress.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/service-discovery/ingress.spec.ts
@@ -1,6 +1,8 @@
 import { IngressPagePo } from '@/cypress/e2e/po/pages/explorer/ingress.po';
 import { generateIngressesDataSmall, ingressesNoData } from '@/cypress/e2e/blueprints/explorer/workloads/service-discovery/ingresses-get';
+import ClusterDashboardPagePo from '@/cypress/e2e/po/pages/explorer/cluster-dashboard.po';
 
+const cluster = 'local';
 const ingressPagePo = new IngressPagePo();
 
 describe('Ingresses', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] }, () => {
@@ -32,12 +34,14 @@ describe('Ingresses', { testIsolation: 'off', tags: ['@explorer', '@adminUser']
 
   describe('List', { tags: ['@vai', '@adminUser'] }, () => {
     before('set up', () => {
-      cy.updateNamespaceFilter('local', 'none', '{\"local\":[]}');
+      cy.updateNamespaceFilter(cluster, 'none', '{\"local\":[]}');
     });
 
     it('validate services table in empty state', () => {
+      ClusterDashboardPagePo.goToAndConfirmNsValues(cluster, { all: { is: true } });
+
       ingressesNoData();
-      ingressPagePo.goTo();
+      IngressPagePo.navTo();
       ingressPagePo.waitForPage();
       cy.wait('@ingressesNoData');
 
@@ -101,7 +105,7 @@ describe('Ingresses', { testIsolation: 'off', tags: ['@explorer', '@adminUser']
     });
 
     after('clean up', () => {
-      cy.updateNamespaceFilter('local', 'none', '{"local":["all://user"]}');
+      cy.updateNamespaceFilter(cluster, 'none', '{"local":["all://user"]}');
     });
   });
 });

From 3dd8839d25313c5ead1364a9a8540fc8724da6a3 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 9 Dec 2024 16:43:59 +0000
Subject: [PATCH 36/76] More e2e fixes

---
 cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts  |  2 +-
 cypress/e2e/po/pages/explorer/services.po.ts           |  2 +-
 .../e2e/tests/pages/explorer/dashboard/events.spec.ts  |  2 +-
 .../pages/explorer/service-discovery/services.spec.ts  | 10 +++++++---
 .../explorer2/storage/persistent-volume-claims.spec.ts |  6 +++++-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts b/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
index 8027db195e2..a3eb08d2215 100644
--- a/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
+++ b/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
@@ -103,7 +103,7 @@ export default class ClusterDashboardPagePo extends PagePo {
     const instance = new ClusterDashboardPagePo(cluster);
     const nsfilter = new NamespaceFilterPo();
 
-    instance.goTo(cluster);
+    instance.goTo();
     instance.waitForPage();
     nsfilter.checkVisible();
 
diff --git a/cypress/e2e/po/pages/explorer/services.po.ts b/cypress/e2e/po/pages/explorer/services.po.ts
index 3081ddf41fc..e9fbc44ae32 100644
--- a/cypress/e2e/po/pages/explorer/services.po.ts
+++ b/cypress/e2e/po/pages/explorer/services.po.ts
@@ -23,7 +23,7 @@ export class ServicesPagePo extends PagePo {
 
     burgerMenu.goToCluster(clusterId);
     sideNav.navToSideMenuGroupByLabel('Service Discovery');
-    sideNav.navToSideMenuEntryByLabel('Ingresses');
+    sideNav.navToSideMenuEntryByLabel('Service');
   }
 
   constructor(clusterId = 'local') {
diff --git a/cypress/e2e/tests/pages/explorer/dashboard/events.spec.ts b/cypress/e2e/tests/pages/explorer/dashboard/events.spec.ts
index e954f697b6b..913405b7712 100644
--- a/cypress/e2e/tests/pages/explorer/dashboard/events.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/dashboard/events.spec.ts
@@ -55,7 +55,7 @@ describe('Events', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] },
     });
 
     it('pagination is visible and user is able to navigate through events data', () => {
-      ClusterDashboardPagePo.goToAndConfirmNsValues(cluster, { nsProject: { values: [nsName1, nsName2] } });
+      ClusterDashboardPagePo.goToAndConfirmNsValues(cluster, { all: { is: true } });
 
       clusterDashboard.waitForPage(undefined, 'cluster-events');
       EventsPagePo.navTo();
diff --git a/cypress/e2e/tests/pages/explorer/service-discovery/services.spec.ts b/cypress/e2e/tests/pages/explorer/service-discovery/services.spec.ts
index 54ed377f6b9..4c340e1a0d4 100644
--- a/cypress/e2e/tests/pages/explorer/service-discovery/services.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/service-discovery/services.spec.ts
@@ -1,6 +1,8 @@
 import { ServicesPagePo } from '@/cypress/e2e/po/pages/explorer/services.po';
 import { generateServicesDataSmall, servicesNoData } from '@/cypress/e2e/blueprints/explorer/workloads/service-discovery/services-get';
+import ClusterDashboardPagePo from '@/cypress/e2e/po/pages/explorer/cluster-dashboard.po';
 
+const cluster = 'local';
 const servicesPagePo = new ServicesPagePo();
 
 describe('Services', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] }, () => {
@@ -10,12 +12,14 @@ describe('Services', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] }
 
   describe('List', { tags: ['@vai', '@adminUser'] }, () => {
     before('set up', () => {
-      cy.updateNamespaceFilter('local', 'none', '{\"local\":[]}');
+      cy.updateNamespaceFilter(cluster, 'none', '{\"local\":[]}');
     });
 
     it('validate services table in empty state', () => {
+      ClusterDashboardPagePo.goToAndConfirmNsValues(cluster, { all: { is: true } } );
+
       servicesNoData();
-      servicesPagePo.goTo();
+      ServicesPagePo.navTo();
       servicesPagePo.waitForPage();
       cy.wait('@servicesNoData');
 
@@ -86,7 +90,7 @@ describe('Services', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] }
     });
 
     after('clean up', () => {
-      cy.updateNamespaceFilter('local', 'none', '{"local":["all://user"]}');
+      cy.updateNamespaceFilter(cluster, 'none', '{"local":["all://user"]}');
     });
   });
 });
diff --git a/cypress/e2e/tests/pages/explorer2/storage/persistent-volume-claims.spec.ts b/cypress/e2e/tests/pages/explorer2/storage/persistent-volume-claims.spec.ts
index ebd5bde6af6..58aa0985600 100644
--- a/cypress/e2e/tests/pages/explorer2/storage/persistent-volume-claims.spec.ts
+++ b/cypress/e2e/tests/pages/explorer2/storage/persistent-volume-claims.spec.ts
@@ -1,6 +1,8 @@
 import { generatePersistentVolumeClaimsDataSmall, persistentVolumeClaimsNoData } from '@/cypress/e2e/blueprints/explorer/storage/persistent-volume-claims-get';
 import { PersistentVolumeClaimsPagePo } from '@/cypress/e2e/po/pages/explorer/persistent-volume-claims.po';
+import ClusterDashboardPagePo from '@/cypress/e2e/po/pages/explorer/cluster-dashboard.po';
 
+const cluster = 'local';
 const persistentVolumeClaimsPage = new PersistentVolumeClaimsPagePo();
 
 describe('PersistentVolumeClaims', { testIsolation: 'off', tags: ['@explorer2', '@adminUser'] }, () => {
@@ -14,10 +16,12 @@ describe('PersistentVolumeClaims', { testIsolation: 'off', tags: ['@explorer2',
     });
 
     it('validate persistent volume claims table in empty state', () => {
+      ClusterDashboardPagePo.goToAndConfirmNsValues(cluster, { all: { is: true } } );
+
       const tag = 'persistentvolumeclaimsNoData';
 
       persistentVolumeClaimsNoData(tag);
-      persistentVolumeClaimsPage.goTo();
+      PersistentVolumeClaimsPagePo.navTo();
       persistentVolumeClaimsPage.waitForPage();
       cy.wait(`@${ tag }`);
 

From f2c555f17ec3ceac1e14a28a86e052cff03fba0c Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 9 Dec 2024 17:19:12 +0000
Subject: [PATCH 37/76] Fix generic pages that filter on pagination

---
 shell/mixins/resource-fetch-api-pagination.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/shell/mixins/resource-fetch-api-pagination.js b/shell/mixins/resource-fetch-api-pagination.js
index e3a8999428e..5cc7b0640b5 100644
--- a/shell/mixins/resource-fetch-api-pagination.js
+++ b/shell/mixins/resource-fetch-api-pagination.js
@@ -14,6 +14,11 @@ import stevePaginationUtils from '@shell/plugins/steve/steve-pagination-utils';
 export default {
 
   props: {
+    namespaced: {
+      type:    Boolean,
+      default: null, // Automatic from schema
+    },
+
     /**
      * Where in the ui this mixin is used. For instance the home page cluster list would be `home`
      */

From d7fc78c2edeee2207f9826c0d2cf2909529e6599 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 10 Dec 2024 12:20:38 +0000
Subject: [PATCH 38/76] Attempt to fix flaky vai test

---
 cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts      | 7 +++++++
 .../more-resources/api/custom-resource-definitions.spec.ts | 1 +
 .../pages/explorer/service-discovery/services.spec.ts      | 1 +
 3 files changed, 9 insertions(+)

diff --git a/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts b/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
index a3eb08d2215..6eb0c38a2e5 100644
--- a/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
+++ b/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
@@ -117,4 +117,11 @@ export default class ClusterDashboardPagePo extends PagePo {
       throw new Error('Bad Config');
     }
   }
+
+  static goToAndWait(cluster: string) {
+    const instance = new ClusterDashboardPagePo(cluster);
+
+    instance.goTo();
+    instance.clusterActionsHeader().checkVisible();
+  }
 }
diff --git a/cypress/e2e/tests/pages/explorer/more-resources/api/custom-resource-definitions.spec.ts b/cypress/e2e/tests/pages/explorer/more-resources/api/custom-resource-definitions.spec.ts
index a7f067c819a..0c9c16e9189 100644
--- a/cypress/e2e/tests/pages/explorer/more-resources/api/custom-resource-definitions.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/more-resources/api/custom-resource-definitions.spec.ts
@@ -16,6 +16,7 @@ describe('CustomResourceDefinitions', { testIsolation: 'off', tags: ['@explorer'
 
   describe('List', { tags: ['@vai', '@adminUser'] }, () => {
     before(() => {
+      ClusterDashboardPagePo.goToAndWait(cluster); // Ensure we're at a solid state before messing with preferences (given login/load might change them)
       cy.tableRowsPerPageAndNamespaceFilter(10, cluster, 'none', '{\"local\":[]}');
     });
 
diff --git a/cypress/e2e/tests/pages/explorer/service-discovery/services.spec.ts b/cypress/e2e/tests/pages/explorer/service-discovery/services.spec.ts
index 4c340e1a0d4..43aa56c97e6 100644
--- a/cypress/e2e/tests/pages/explorer/service-discovery/services.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/service-discovery/services.spec.ts
@@ -12,6 +12,7 @@ describe('Services', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] }
 
   describe('List', { tags: ['@vai', '@adminUser'] }, () => {
     before('set up', () => {
+      ClusterDashboardPagePo.goToAndWait(cluster); // Ensure we're at a solid state before messing with preferences (given login/load might change them)
       cy.updateNamespaceFilter(cluster, 'none', '{\"local\":[]}');
     });
 

From c18fd7a1340b41b334d9da69969a5fcebc83ad54 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 10 Dec 2024 15:02:27 +0000
Subject: [PATCH 39/76] Fix after merge from master

---
 shell/components/PaginatedResourceTable.vue | 6 ++++++
 shell/components/ResourceTable.vue          | 7 ++++++-
 shell/pages/home.vue                        | 1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
index c650000e25d..1099a753984 100644
--- a/shell/components/PaginatedResourceTable.vue
+++ b/shell/components/PaginatedResourceTable.vue
@@ -43,6 +43,11 @@ export default defineComponent({
       default: null,
     },
 
+    groupable: {
+      type:    Boolean,
+      default: null, // Null: auto based on namespaced and type custom groupings
+    },
+
     namespaced: {
       type:    Boolean,
       default: null, // Automatic from schema
@@ -106,6 +111,7 @@ export default defineComponent({
       :rows="rows"
       :alt-loading="canPaginate"
       :loading="loading"
+      :groupable="groupable"
 
       :headers="safeHeaders"
       :namespaced="namespaced"
diff --git a/shell/components/ResourceTable.vue b/shell/components/ResourceTable.vue
index dbdb0b4fa3a..86b4add4526 100644
--- a/shell/components/ResourceTable.vue
+++ b/shell/components/ResourceTable.vue
@@ -429,12 +429,17 @@ export default {
     },
 
     computedGroupBy() {
+      // If we're not showing grouping options we shouldn't have a group by property
+      if (!this.showGrouping) {
+        return null;
+      }
+
       if ( this.groupBy ) {
         // This probably comes from the type-map config for the resource (see ResourceList)
         return this.groupBy;
       }
 
-      if ( this.group === 'namespace' && this.showGrouping ) {
+      if ( this.group === 'namespace' ) {
         // This switches to group rows by a key which is the label for the group (??)
         return 'groupByLabel';
       }
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index 728dcbc25b4..2f139b2a56a 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -551,6 +551,7 @@ export default defineComponent({
                 :api-filter="filterRowsApi"
 
                 :namespaced="false"
+                :groupable="false"
                 manualRefreshButtonSize="sm"
                 :fetchSecondaryResources="fetchSecondaryResources"
                 :fetchPageSecondaryResources="fetchPageSecondaryResources"

From 9d01007320952c7452d5bcf31abd68c66232bbfe Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 10 Dec 2024 16:12:36 +0000
Subject: [PATCH 40/76] Updates following new indexed files

---
 shell/components/nav/TopLevelMenu.helper.ts   | 27 +++++++---------
 shell/components/nav/TopLevelMenu.vue         | 31 +++++++++++++------
 shell/pages/home.vue                          | 25 ++++++++-------
 shell/plugins/steve/steve-pagination-utils.ts | 25 ++++++++-------
 shell/utils/cluster.js                        |  7 ++---
 5 files changed, 63 insertions(+), 52 deletions(-)

diff --git a/shell/components/nav/TopLevelMenu.helper.ts b/shell/components/nav/TopLevelMenu.helper.ts
index 88a30a61ba5..3d1c188e514 100644
--- a/shell/components/nav/TopLevelMenu.helper.ts
+++ b/shell/components/nav/TopLevelMenu.helper.ts
@@ -42,18 +42,18 @@ type ProvCluster = {
  * 3. name
  */
 const DEFAULT_SORT: Array<PaginationSort> = [
-  // {
-  //   asc:   true,
-  //   field: 'spec.internal', // Pending API support https://github.com/rancher/rancher/issues/48011
-  // },
+  {
+    asc:   false,
+    field: 'spec.internal',
+  },
   // {
   //   asc:   true,
   //   field: 'status.conditions[0].status' // Pending API changes https://github.com/rancher/rancher/issues/48092
   // },
-  // {
-  //   asc:   true,
-  //   field: 'spec.displayName' // Pending API support https://github.com/rancher/rancher/issues/48011
-  // },
+  {
+    asc:   true,
+    field: 'spec.displayName',
+  },
 ];
 
 export interface TopLevelMenuHelper {
@@ -287,10 +287,9 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
     }
 
     if (searchTerm && includeSearchTerm) {
-      // Pending API support https://github.com/rancher/rancher/issues/48011
-      // filters.push(PaginationParamFilter.createSingleField({
-      //   field: 'spec.displayName', exact: false, value: searchTerm
-      // }));
+      filters.push(PaginationParamFilter.createSingleField({
+        field: 'spec.displayName', exact: false, value: searchTerm
+      }));
     }
 
     if (includeLocal) {
@@ -355,9 +354,7 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
           PaginationParamFilter.createMultipleFields(
             [...notPinned, ...pinned]
               .map((mgmtCluster) => ({
-                // Pending API support https://github.com/rancher/rancher/issues/48011
-                // field: 'status.clusterName', value: mgmtCluster.id, equals: true, exact: true
-                field: 'metadata.name', value: 'local', equals: true, exact: true
+                field: 'status.clusterName', value: mgmtCluster.id, equals: true, exact: true
               }))
           )
         ],
diff --git a/shell/components/nav/TopLevelMenu.vue b/shell/components/nav/TopLevelMenu.vue
index 34f81029f69..69a54e1dfa9 100644
--- a/shell/components/nav/TopLevelMenu.vue
+++ b/shell/components/nav/TopLevelMenu.vue
@@ -19,8 +19,9 @@ import { TopLevelMenuHelperPagination, TopLevelMenuHelperLegacy } from '@shell/c
 import { debounce } from 'lodash';
 import { sameContents } from '@shell/utils/array';
 
-// TODO: RC (home page/side bar) test search properly
-
+// TODO: RC test with rke2 cluster
+// TODO: RC test vai off (home and side bar)
+// TODO: RC test permissions (user-base, standard-user)
 export default {
   components: {
     BrandImage,
@@ -56,7 +57,8 @@ export default {
 
       canPagination,
       helper,
-      debouncedHelperUpdate: debounce((...args) => this.helper.update(...args), 200),
+      debouncedHelperUpdateSlow: debounce((...args) => this.helper.update(...args), 750),
+      debouncedHelperUpdateQuick: debounce((...args) => this.helper.update(...args), 200),
       provClusters,
       mgmtClusters,
     };
@@ -272,18 +274,18 @@ export default {
           return;
         }
 
-        this.updateClusters(neu);
+        this.updateClusters(neu, 'quick');
       }
     },
 
     search() {
-      this.updateClusters(this.pinnedIds);
+      this.updateClusters(this.pinnedIds, 'slow');
     },
 
     provClusters: {
       handler() {
         // Shouldn't get here if SSP
-        this.updateClusters(this.pinnedIds);
+        this.updateClusters(this.pinnedIds, 'slow');
       },
       deep:      true,
       immediate: true,
@@ -292,7 +294,7 @@ export default {
     mgmtClusters: {
       handler() {
         // Shouldn't get here if SSP
-        this.updateClusters(this.pinnedIds);
+        this.updateClusters(this.pinnedIds, 'slow');
       },
       deep:      true,
       immediate: true,
@@ -425,12 +427,21 @@ export default {
       };
     },
 
-    updateClusters(pinnedIds) {
-      this.debouncedHelperUpdate({
+    updateClusters(pinnedIds, speed = 'slow' | 'quick') {
+      const args = {
         pinnedIds,
         searchTerm:  this.search,
         unPinnedMax: this.maxClustersToShow
-      });
+      }
+
+      switch (speed) {
+        case 'slow':
+          this.debouncedHelperUpdateSlow(args);
+          return;
+        case 'quick':
+          this.debouncedHelperUpdateQuick(args);
+          return;
+      }
     }
   }
 };
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index 2f139b2a56a..59d6f11855b 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -244,7 +244,6 @@ export default defineComponent({
         return Promise.resolve({});
       }
 
-      // TODO: RC (home page/side bar) TEST with pagination off and on
       if ( this.canViewMgmtClusters ) {
         this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER });
       }
@@ -297,7 +296,7 @@ export default defineComponent({
       if ( this.canViewMachine ) {
         const opt: ActionFindPageArgs = {
           force,
-          // TODO: RC (home page/side bar) Validate
+          // TODO: RC test with rke2 cluster
           pagination: new FilterArgs({
             filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
               field: 'spec.clusterName',
@@ -328,7 +327,7 @@ export default defineComponent({
       if ( this.canViewMgmtPools && this.canViewMgmtTemplates) {
         const poolOpt: ActionFindPageArgs = {
           force,
-          // TODO: RC (home page/side bar) Validate
+          // TODO: RC test with rke2 cluster
           pagination: new FilterArgs({
             filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
               field: 'spec.clusterName',
@@ -341,7 +340,7 @@ export default defineComponent({
 
         const templateOpt: ActionFindPageArgs = {
           force,
-          // TODO: RC (home page/side bar) Validate
+          // TODO: RC test with rke2 cluster
           pagination: new FilterArgs({
             filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
               field: 'spec.clusterName',
@@ -437,26 +436,29 @@ export default defineComponent({
         pagination.filters = [];
       }
 
-      // Pending API Support https://github.com/rancher/rancher/issues/48011
       const existingFilters = pagination.filters;
       const requiredFilters = paginationFilterClusters(this.$store, false);
 
       for (let i = 0; i < requiredFilters.length; i++) {
+        let found = false;
         const required = requiredFilters[i];
 
         for (let j = 0; j < existingFilters.length; j++) {
-          const candidate = existingFilters[j];
+          const existing = existingFilters[j];
 
           if (
-            required.fields.length === candidate.fields.length &&
-            sameContents(required.fields.map((e) => e.field), candidate.fields.map((e) => e.field))
+            required.fields.length === existing.fields.length &&
+            sameContents(required.fields.map((e) => e.field), existing.fields.map((e) => e.field))
           ) {
-            Object.assign(candidate, required);
+            Object.assign(existing, required);
+            found = true;
             break;
           }
         }
 
-        pagination.filters.push(required);
+        if (!found) {
+          pagination.filters.push(required);
+        }
       }
 
       return pagination;
@@ -536,8 +538,7 @@ export default defineComponent({
               v-if="mcm"
               class="col span-12"
             >
-              <!-- // TODO: RC (home page/side bar) TEST with pagination off and on. check loading indicator when pagination off -->
-              <!-- TODO: RC namespaced: false now doesn't work -->
+              <!-- // TODO: RC test vai off check loading indicator when pagination off -->
               <PaginatedResourceTable
                 :schema="provClusterSchema"
                 :table-actions="false"
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index d0b5c06bcb7..e580c271899 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -125,14 +125,17 @@ class StevePaginationUtils extends NamespaceProjectFilters {
       { field: 'status.nodeName' },
     ],
     [MANAGEMENT.NODE_POOL]: [
-      { field: 'spec.clusterName' }, // TODO: RC (home page/side bar) TEST
+      { field: 'spec.clusterName' },
     ],
     [MANAGEMENT.NODE_TEMPLATE]: [
-      { field: 'spec.clusterName' }, // TODO: RC (home page/side bar) TEST
+      { field: 'spec.clusterName' },
     ],
     [MANAGEMENT.CLUSTER]: [
-      // { field: 'spec.internal' }, // Pending API support https://github.com/rancher/rancher/issues/48011
-      // { field: 'spec.displayName' }, // Pending API support https://github.com/rancher/rancher/issues/48011
+      { field: 'spec.internal' },
+      { field: 'spec.displayName' },
+      // { field: `status.provider` }, // Pending API Support - https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` }, // Pending API Support - https://github.com/rancher/rancher/issues/48256
+
     ],
     [CONFIG_MAP]: [
       { field: 'metadata.labels[harvesterhci.io/cloud-init-template]' }
@@ -141,16 +144,16 @@ class StevePaginationUtils extends NamespaceProjectFilters {
       { field: 'metadata.labels[field.cattle.io/projectId]' }
     ],
     [CAPI.MACHINE]: [
-      { field: 'spec.clusterName' } // TODO: RC (home page/side bar) TEST
+      { field: 'spec.clusterName' }
     ],
     [CAPI.RANCHER_CLUSTER]: [
-      { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` }, // TODO: RC (home page/side bar) TEST
-      { field: `status.provider` }, // TODO: RC (home page/side bar) TEST
-      { field: 'status.allocatable.cpu' }, // TODO: RC (home page/side bar) TEST
-      { field: 'status.allocatable.memory' }, // TODO: RC (home page/side bar) TEST
-      { field: 'status.allocatable.pods' }, // TODO: RC (home page/side bar) TEST
+      { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` },
+      { field: `status.provider` },
+      { field: 'status.allocatable.cpu' }, // TODO: RC test with rke2 cluster
+      { field: 'status.allocatable.memory' }, // TODO: RC test with rke2 cluster
+      { field: 'status.allocatable.pods' }, // TODO: RC test with rke2 cluster
 
-      // { field: 'status.clusterName' }, // Pending API support https://github.com/rancher/rancher/issues/48011
+      { field: 'status.clusterName' },
     ]
   }
 
diff --git a/shell/utils/cluster.js b/shell/utils/cluster.js
index 6a2bd46199e..beaf7c1474d 100644
--- a/shell/utils/cluster.js
+++ b/shell/utils/cluster.js
@@ -12,7 +12,6 @@ import { PaginationFilterField, PaginationParamFilter } from '@shell/types/store
  * @returns PaginationParam[]
  */
 export function paginationFilterClusters(store, filterMgmtCluster = true) {
-  // TODO: RC (home page/side bar) TEST both facets
   const paginationRequestFilters = [];
 
   // Commenting out for the moment. This is broken for non-paginated world
@@ -49,7 +48,7 @@ export function paginationFilterHiddenLocalCluster(store, filterMgmtCluster = tr
 
   const filter = filterMgmtCluster ? [
     new PaginationFilterField({
-      field: `spec.internal`, // Pending API support https://github.com/rancher/rancher/issues/48011
+      field: `spec.internal`,
       value: false,
     })
   ] : [
@@ -80,13 +79,13 @@ export function paginationFilterOnlyKubernetesClusters(store) {
 
   return PaginationParamFilter.createMultipleFields([
     new PaginationFilterField({
-      field:  `metadata.labels."${ CAPI.PROVIDER }"`, // TODO: RC (home page/side bar) TEST
+      field:  `metadata.labels."${ CAPI.PROVIDER }"`, // Pending API Support - https://github.com/rancher/rancher/issues/48256
       equals: false,
       value:  VIRTUAL_HARVESTER_PROVIDER,
       exact:  true
     }),
     new PaginationFilterField({
-      field:  `status.provider`, // TODO: RC (home page/side bar) TEST
+      field:  `status.provider`, // Pending API Support - https://github.com/rancher/rancher/issues/48256
       equals: false,
       value:  VIRTUAL_HARVESTER_PROVIDER,
       exact:  true

From 439f223d2736374f3c5a3e29af4e3ffd8ad6e419 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 10 Dec 2024 16:49:47 +0000
Subject: [PATCH 41/76] Fix lint and test

---
 shell/components/nav/TopLevelMenu.vue            | 16 ++++++++--------
 .../nav/__tests__/TopLevelMenu.test.ts           |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/shell/components/nav/TopLevelMenu.vue b/shell/components/nav/TopLevelMenu.vue
index 69a54e1dfa9..44f02ba145c 100644
--- a/shell/components/nav/TopLevelMenu.vue
+++ b/shell/components/nav/TopLevelMenu.vue
@@ -57,7 +57,7 @@ export default {
 
       canPagination,
       helper,
-      debouncedHelperUpdateSlow: debounce((...args) => this.helper.update(...args), 750),
+      debouncedHelperUpdateSlow:  debounce((...args) => this.helper.update(...args), 750),
       debouncedHelperUpdateQuick: debounce((...args) => this.helper.update(...args), 200),
       provClusters,
       mgmtClusters,
@@ -432,15 +432,15 @@ export default {
         pinnedIds,
         searchTerm:  this.search,
         unPinnedMax: this.maxClustersToShow
-      }
+      };
 
       switch (speed) {
-        case 'slow':
-          this.debouncedHelperUpdateSlow(args);
-          return;
-        case 'quick':
-          this.debouncedHelperUpdateQuick(args);
-          return;
+      case 'slow':
+        this.debouncedHelperUpdateSlow(args);
+        break;
+      case 'quick':
+        this.debouncedHelperUpdateQuick(args);
+        break;
       }
     }
   }
diff --git a/shell/components/nav/__tests__/TopLevelMenu.test.ts b/shell/components/nav/__tests__/TopLevelMenu.test.ts
index 029ef96d26e..2b9487b61a5 100644
--- a/shell/components/nav/__tests__/TopLevelMenu.test.ts
+++ b/shell/components/nav/__tests__/TopLevelMenu.test.ts
@@ -47,7 +47,7 @@ const generateStore = (clusters: any[], settings = [{}]) => {
 };
 
 const waitForIt = async() => {
-  jest.advanceTimersByTime(250); // Wait for debounced call to fetch updated cluster list
+  jest.advanceTimersByTime(1000); // Wait for debounced call to fetch updated cluster list
   await nextTick(); // Wait for changes to cluster list to trigger changes
 };
 

From 9b5d420b779a6d065a567432eca945e4dfe54d48 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Wed, 11 Dec 2024 17:12:34 +0000
Subject: [PATCH 42/76] Changes given real cluster tests - general fixes -
 correct issue were sorting prov clusters on mgmt cluster props (issue in
 master as well...) - bit the bullet, we now don't fetch all mgmt clusters on
 dashboard visit.   - there could be knock on affects, but we'd need to remove
 it sometime in 2.11....

---
 shell/components/nav/TopLevelMenu.vue         |  6 ++--
 .../models/provisioning.cattle.io.cluster.js  | 12 ++-----
 shell/pages/home.vue                          | 23 ++++++------
 shell/plugins/dashboard-store/actions.js      |  6 ++++
 shell/plugins/dashboard-store/mutations.js    |  2 ++
 shell/plugins/steve/steve-pagination-utils.ts |  4 ---
 shell/plugins/steve/subscribe.js              | 30 +++++++++++-----
 shell/store/index.js                          | 35 ++++++++++++++-----
 8 files changed, 74 insertions(+), 44 deletions(-)

diff --git a/shell/components/nav/TopLevelMenu.vue b/shell/components/nav/TopLevelMenu.vue
index 44f02ba145c..f966bde7ec3 100644
--- a/shell/components/nav/TopLevelMenu.vue
+++ b/shell/components/nav/TopLevelMenu.vue
@@ -19,9 +19,11 @@ import { TopLevelMenuHelperPagination, TopLevelMenuHelperLegacy } from '@shell/c
 import { debounce } from 'lodash';
 import { sameContents } from '@shell/utils/array';
 
-// TODO: RC test with rke2 cluster
+// TODO: RC test with rke1/2 cluster
 // TODO: RC test vai off (home and side bar)
 // TODO: RC test permissions (user-base, standard-user)
+
+// TODO: RC bug - nav from page 1 (no mgmt clusters) --> page 2 (requires mgmt clusters from page, fetches, however model getters for provider do not update...)
 export default {
   components: {
     BrandImage,
@@ -100,7 +102,7 @@ export default {
 
     // New
     showPinClusters() {
-      return !this.search;
+      return !this.clusterFilter;
     },
 
     // New
diff --git a/shell/models/provisioning.cattle.io.cluster.js b/shell/models/provisioning.cattle.io.cluster.js
index 81e299fb55a..f7bfeb248a1 100644
--- a/shell/models/provisioning.cattle.io.cluster.js
+++ b/shell/models/provisioning.cattle.io.cluster.js
@@ -349,19 +349,11 @@ export default class ProvCluster extends SteveModel {
   }
 
   get mgmtClusterId() {
-    return this.mgmt?.id || this.id?.replace(`${ this.metadata.namespace }/`, '');
+    return this.status?.clusterName;
   }
 
   get mgmt() {
-    const name = this.status?.clusterName;
-
-    if ( !name ) {
-      return null;
-    }
-
-    const out = this.$rootGetters['management/byId'](MANAGEMENT.CLUSTER, name);
-
-    return out;
+    return this.mgmtClusterId ? this.$rootGetters['management/byId'](MANAGEMENT.CLUSTER, this.mgmtClusterId) : null;
   }
 
   get isReady() {
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index 59d6f11855b..b2852096cd6 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -175,21 +175,21 @@ export default defineComponent({
           label:  this.t('tableHeaders.cpu'),
           value:  '',
           name:   'cpu',
-          sort:   ['status.allocatable.cpu'],
+          sort:   false,
           search: false,
         },
         {
           label:  this.t('tableHeaders.memory'),
           value:  '',
           name:   'memory',
-          sort:   ['status.allocatable.memory'],
+          sort:   false,
           search: false,
         },
         {
           label:        this.t('tableHeaders.pods'),
           name:         'pods',
           value:        '',
-          sort:         ['status.allocatable.pods'],
+          sort:         false,
           search:       false,
           formatter:    'PodsUsage',
           delayLoading: true
@@ -296,7 +296,6 @@ export default defineComponent({
       if ( this.canViewMachine ) {
         const opt: ActionFindPageArgs = {
           force,
-          // TODO: RC test with rke2 cluster
           pagination: new FilterArgs({
             filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
               field: 'spec.clusterName',
@@ -325,15 +324,17 @@ export default defineComponent({
 
       // We need to fetch node pools and node templates in order to correctly show the provider for RKE1 clusters
       if ( this.canViewMgmtPools && this.canViewMgmtTemplates) {
+        const filters = PaginationParamFilter.createMultipleFields(page
+          .filter((p: any) => p.status?.clusterName)
+          .map((r: any) => new PaginationFilterField({
+            field: 'spec.clusterName',
+            value: r.status?.clusterName
+          })));
+
         const poolOpt: ActionFindPageArgs = {
           force,
           // TODO: RC test with rke2 cluster
-          pagination: new FilterArgs({
-            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
-              field: 'spec.clusterName',
-              value: r.status?.clusterName// TODO: handle empty spec
-            }))),
-          })
+          pagination: new FilterArgs({ filters })
         };
 
         this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE_POOL, opt: poolOpt });
@@ -344,7 +345,7 @@ export default defineComponent({
           pagination: new FilterArgs({
             filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
               field: 'spec.clusterName',
-              value: r.status?.clusterName// TODO: handle empty spec
+              value: r.status?.clusterName
             }))),
           })
         };
diff --git a/shell/plugins/dashboard-store/actions.js b/shell/plugins/dashboard-store/actions.js
index b71c0e2d35c..e0fe40ff149 100644
--- a/shell/plugins/dashboard-store/actions.js
+++ b/shell/plugins/dashboard-store/actions.js
@@ -408,6 +408,12 @@ export default {
       return Promise.reject(e);
     }
 
+    // TODO: RC Test
+    await dispatch('unwatch', {
+      type,
+      all: true,
+    });
+
     const pagination = opt.pagination ? {
       request: {
         namespace:  opt.namespaced,
diff --git a/shell/plugins/dashboard-store/mutations.js b/shell/plugins/dashboard-store/mutations.js
index 17419837d64..f772243a3a2 100644
--- a/shell/plugins/dashboard-store/mutations.js
+++ b/shell/plugins/dashboard-store/mutations.js
@@ -164,6 +164,8 @@ export function load(state, {
     }
   }
 
+  cache.havePage = false;
+
   return entry;
 }
 
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index e580c271899..c00ebf4a17e 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -149,10 +149,6 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     [CAPI.RANCHER_CLUSTER]: [
       { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` },
       { field: `status.provider` },
-      { field: 'status.allocatable.cpu' }, // TODO: RC test with rke2 cluster
-      { field: 'status.allocatable.memory' }, // TODO: RC test with rke2 cluster
-      { field: 'status.allocatable.pods' }, // TODO: RC test with rke2 cluster
-
       { field: 'status.clusterName' },
     ]
   }
diff --git a/shell/plugins/steve/subscribe.js b/shell/plugins/steve/subscribe.js
index 286d4e5d851..23ad4174531 100644
--- a/shell/plugins/steve/subscribe.js
+++ b/shell/plugins/steve/subscribe.js
@@ -452,7 +452,7 @@ const sharedActions = {
   },
 
   unwatch(ctx, {
-    type, id, namespace, selector
+    type, id, namespace, selector, all
   }) {
     const { commit, getters, dispatch } = ctx;
 
@@ -467,16 +467,26 @@ const sharedActions = {
         stop: true, // Stops the watch on a type
       };
 
+      const unwatch = (obj) => {
+        if (getters['watchStarted'](obj)) {
+          // Set that we don't want to watch this type
+          // Otherwise, the dispatch to unwatch below will just cause a re-watch when we
+          // detect the stop message from the backend over the web socket
+          commit('setWatchStopped', obj);
+          dispatch('watch', obj); // Ask the backend to stop watching the type
+          // Make sure anything in the pending queue for the type is removed, since we've now removed the type
+          commit('clearFromQueue', type);
+        }
+      };
+
       if (isAdvancedWorker(ctx)) {
         dispatch('watch', obj); // Ask the backend to stop watching the type
+      } else if (all) {
+        getters['watchesOfType'](type).forEach((obj) => {
+          unwatch(obj);
+        });
       } else if (getters['watchStarted'](obj)) {
-        // Set that we don't want to watch this type
-        // Otherwise, the dispatch to unwatch below will just cause a re-watch when we
-        // detect the stop message from the backend over the web socket
-        commit('setWatchStopped', obj);
-        dispatch('watch', obj); // Ask the backend to stop watching the type
-        // Make sure anything in the pending queue for the type is removed, since we've now removed the type
-        commit('clearFromQueue', type);
+        unwatch(obj);
       }
     }
   },
@@ -1025,6 +1035,10 @@ const defaultGetters = {
     return state.inError[keyForSubscribe(obj)];
   },
 
+  watchesOfType: (state) => (type) => {
+    return state.started.filter((entry) => type === (entry.resourceType || entry.type));
+  },
+
   watchStarted: (state) => (obj) => {
     return !!state.started.find((entry) => equivalentWatch(obj, entry));
   },
diff --git a/shell/store/index.js b/shell/store/index.js
index d9c7d345a7e..4074a706bdd 100644
--- a/shell/store/index.js
+++ b/shell/store/index.js
@@ -38,6 +38,7 @@ import semver from 'semver';
 import { STORE, BLANK_CLUSTER } from '@shell/store/store-types';
 import { isDevBuild } from '@shell/utils/version';
 import { markRaw } from 'vue';
+import paginationUtils from '@shell/utils/pagination-utils';
 
 // Disables strict mode for all store instances to prevent warning about changing state outside of mutations
 // because it's more efficient to do that sometimes.
@@ -780,15 +781,11 @@ export const actions = {
     // The alternative is simpler (fetch features up front) but would add another blocking request in
 
     const promises = {
-      // Clusters guaranteed always available or your money back
-      clusters: dispatch('management/findAll', { type: MANAGEMENT.CLUSTER, opt: { watch: false } }),
-
       // Features checks on its own if they are available
       features: dispatch('features/loadServer'),
     };
 
     const toWatch = [
-      MANAGEMENT.CLUSTER,
       MANAGEMENT.FEATURE,
     ];
 
@@ -823,6 +820,14 @@ export const actions = {
 
     res = await allHash(promises);
 
+    // TODO: RC test
+    if (!res.settings && !paginationUtils.isEnabled({ rootGetters }, { store: 'management', resource: { id: MANAGEMENT.CLUSTER, context: 'side-bar' } })) {
+      // This introduces a synchronous request, however we need settings to determine if pagination is enabled
+      // Eventually it will be removed when pagination is always on
+      res.clusters = await dispatch('management/findAll', { type: MANAGEMENT.CLUSTER, opt: { watch: false } });
+      toWatch.push(MANAGEMENT.CLUSTER);
+    }
+
     // See comment above. Now that we have feature flags we can watch resources
     toWatch.forEach((type) => {
       dispatch('management/watch', { type });
@@ -879,7 +884,7 @@ export const actions = {
   // - state.clusterId is the old cluster id (or undefined)
   // - id is the new cluster id (or undefined)
   async loadCluster({
-    state, commit, dispatch, getters
+    state, commit, dispatch, getters, rootGetters
   }, {
     id, product, oldProduct, oldPkg, newPkg, targetRoute
   }) {
@@ -983,9 +988,10 @@ export const actions = {
     // Try and wait until the schema exists before proceeding
     await dispatch('management/waitForSchema', { type: MANAGEMENT.CLUSTER });
 
-    // Similar to above, we're still waiting on loadManagement to fetch required resources
-    // If we don't have all mgmt clusters yet a request to fetch this cluster and then all clusters (in cleanNamespaces) is kicked off
-    await dispatch('management/waitForHaveAll', { type: MANAGEMENT.CLUSTER });
+    // Do we need to wait on loadManagement to fetch required resources?
+    if (!paginationUtils.isEnabled({ rootGetters }, { store: 'management', resource: { id: MANAGEMENT.CLUSTER, context: 'side-bar' } })) {
+      await dispatch('management/waitForHaveAll', { type: MANAGEMENT.CLUSTER });
+    }
 
     // See if it really exists
     try {
@@ -1082,7 +1088,18 @@ export const actions = {
     commit('updateNamespaces', { filters: ids, getters });
   },
 
-  async cleanNamespaces({ getters, dispatch }) {
+  async cleanNamespaces({ getters, dispatch, rootGetters}) {
+    if (paginationUtils.isEnabled({ rootGetters }, { store: 'management', resource: { id: MANAGEMENT.CLUSTER, context: 'side-bar' } })) {
+      // See https://github.com/rancher/dashboard/issues/12864
+      // old world..
+      // - loadManagement makes a request to fetch all mgmt clusters
+      // - we would block on that that request above before getting here (otherwise x2 requests were made)
+      // new world..
+      // - we won't have all mgmt clusters, this is another place that needs updating (see issue)
+
+      return;
+    }
+
     // Initialise / Remove any filters that the user no-longer has access to
     await dispatch('management/findAll', { type: MANAGEMENT.CLUSTER }); // So they can be got byId below
 

From 39c2cd7599dcdc5c2a1b5e28b86718768d8838b3 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 16 Dec 2024 11:46:16 +0000
Subject: [PATCH 43/76] Fix issues with diplaying rke1 data in home page -
 includes https://github.com/rancher/dashboard/pull/12881

---
 shell/components/nav/TopLevelMenu.helper.ts   | 13 +++--
 shell/components/nav/TopLevelMenu.vue         |  5 --
 shell/models/management.cattle.io.nodepool.js |  9 ++--
 .../models/provisioning.cattle.io.cluster.js  |  2 +-
 shell/pages/home.vue                          | 49 ++++++++++---------
 shell/plugins/dashboard-store/actions.js      |  1 -
 shell/plugins/dashboard-store/mutations.js    |  4 +-
 shell/store/index.js                          | 31 +++++++-----
 8 files changed, 61 insertions(+), 53 deletions(-)

diff --git a/shell/components/nav/TopLevelMenu.helper.ts b/shell/components/nav/TopLevelMenu.helper.ts
index 3d1c188e514..1c886ef77f4 100644
--- a/shell/components/nav/TopLevelMenu.helper.ts
+++ b/shell/components/nav/TopLevelMenu.helper.ts
@@ -90,6 +90,7 @@ export interface TopLevelMenuHelper {
 
 export abstract class BaseTopLevelMenuHelper {
   protected $store: VuexStore;
+  protected hasProvCluster: boolean;
 
   /**
   * Filter mgmt clusters by
@@ -125,6 +126,8 @@ export abstract class BaseTopLevelMenuHelper {
     $store: VuexStore,
 }) {
     this.$store = $store;
+
+    this.hasProvCluster = this.$store.getters[`management/schemaFor`](CAPI.RANCHER_CLUSTER);
   }
 
   protected convertToCluster(mgmtCluster: MgmtCluster, provCluster: ProvCluster): TopLevelMenuCluster {
@@ -218,6 +221,12 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
 
   // ---------- requests ----------
   async update(args: UpdateArgs) {
+    if (!this.hasProvCluster) {
+      // We're filtering out mgmt clusters without prov clusters, so if the user can't see any prov clusters at all
+      // exit early
+      return;
+    }
+
     this.args = args;
     const promises = {
       pinned:    this.updatePinned(args),
@@ -372,15 +381,11 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
  * Helper designed to supply non-pagainted results for the top level menu cluster resources
  */
 export class TopLevelMenuHelperLegacy extends BaseTopLevelMenuHelper implements TopLevelMenuHelper {
-  private hasProvCluster: boolean;
-
   constructor({ $store }: {
     $store: VuexStore,
   }) {
     super({ $store });
 
-    this.hasProvCluster = this.$store.getters[`management/schemaFor`](CAPI.RANCHER_CLUSTER);
-
     if (this.hasProvCluster) {
       $store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER });
     }
diff --git a/shell/components/nav/TopLevelMenu.vue b/shell/components/nav/TopLevelMenu.vue
index f966bde7ec3..73cc8b09572 100644
--- a/shell/components/nav/TopLevelMenu.vue
+++ b/shell/components/nav/TopLevelMenu.vue
@@ -19,11 +19,6 @@ import { TopLevelMenuHelperPagination, TopLevelMenuHelperLegacy } from '@shell/c
 import { debounce } from 'lodash';
 import { sameContents } from '@shell/utils/array';
 
-// TODO: RC test with rke1/2 cluster
-// TODO: RC test vai off (home and side bar)
-// TODO: RC test permissions (user-base, standard-user)
-
-// TODO: RC bug - nav from page 1 (no mgmt clusters) --> page 2 (requires mgmt clusters from page, fetches, however model getters for provider do not update...)
 export default {
   components: {
     BrandImage,
diff --git a/shell/models/management.cattle.io.nodepool.js b/shell/models/management.cattle.io.nodepool.js
index e5ddb775df4..5bb0e504c4f 100644
--- a/shell/models/management.cattle.io.nodepool.js
+++ b/shell/models/management.cattle.io.nodepool.js
@@ -4,11 +4,12 @@ import HybridModel from '@shell/plugins/steve/hybrid-class';
 import { notOnlyOfRole } from '@shell/models/cluster.x-k8s.io.machine';
 
 export default class MgmtNodePool extends HybridModel {
-  get nodeTemplate() {
-    const id = (this.spec?.nodeTemplateName || '').replace(/:/, '/');
-    const template = this.$getters['byId'](MANAGEMENT.NODE_TEMPLATE, id);
+  get nodeTemplateId() {
+    return (this.spec?.nodeTemplateName || '').replace(/:/, '/');
+  }
 
-    return template;
+  get nodeTemplate() {
+    return this.$getters['byId'](MANAGEMENT.NODE_TEMPLATE, this.nodeTemplateId);
   }
 
   get provider() {
diff --git a/shell/models/provisioning.cattle.io.cluster.js b/shell/models/provisioning.cattle.io.cluster.js
index f7bfeb248a1..e5c14c5d134 100644
--- a/shell/models/provisioning.cattle.io.cluster.js
+++ b/shell/models/provisioning.cattle.io.cluster.js
@@ -353,7 +353,7 @@ export default class ProvCluster extends SteveModel {
   }
 
   get mgmt() {
-    return this.mgmtClusterId ? this.$rootGetters['management/byId'](MANAGEMENT.CLUSTER, this.mgmtClusterId) : null;
+    return this.$rootGetters['management/byId'](MANAGEMENT.CLUSTER, this.mgmtClusterId);
   }
 
   get isReady() {
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index b2852096cd6..c9d3e16735e 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -150,6 +150,7 @@ export default defineComponent({
 
       paginationHeaders: [
         STEVE_STATE_COL,
+        // https://github.com/rancher/dashboard/issues/12890 BUG - rke1 cluster's prov cluster metadata.name is the mgmt cluster id rather than true name
         {
           ...STEVE_NAME_COL,
           canBeVariable: true,
@@ -323,34 +324,36 @@ export default defineComponent({
       }
 
       // We need to fetch node pools and node templates in order to correctly show the provider for RKE1 clusters
-      if ( this.canViewMgmtPools && this.canViewMgmtTemplates) {
-        const filters = PaginationParamFilter.createMultipleFields(page
+      if ( this.canViewMgmtPools && this.canViewMgmtTemplates ) {
+        const nodePoolFilters = PaginationParamFilter.createMultipleFields(page
           .filter((p: any) => p.status?.clusterName)
           .map((r: any) => new PaginationFilterField({
             field: 'spec.clusterName',
             value: r.status?.clusterName
           })));
+        const nodePools = await this.$store.dispatch(`management/findPage`, {
+          type: MANAGEMENT.NODE_POOL,
+          opt:  {
+            force,
+            pagination: new FilterArgs({ filters: nodePoolFilters })
+          }
+        });
+
+        const templateOpt = PaginationParamFilter.createMultipleFields(nodePools
+          .filter((np: any) => !!np.nodeTemplateId)
+          .map((np: any) => new PaginationFilterField({
+            field: 'id',
+            value: np.nodeTemplateId,
+            exact: true,
+          })));
 
-        const poolOpt: ActionFindPageArgs = {
-          force,
-          // TODO: RC test with rke2 cluster
-          pagination: new FilterArgs({ filters })
-        };
-
-        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE_POOL, opt: poolOpt });
-
-        const templateOpt: ActionFindPageArgs = {
-          force,
-          // TODO: RC test with rke2 cluster
-          pagination: new FilterArgs({
-            filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
-              field: 'spec.clusterName',
-              value: r.status?.clusterName
-            }))),
-          })
-        };
-
-        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE_TEMPLATE, opt: templateOpt });
+        this.$store.dispatch(`management/findPage`, {
+          type: MANAGEMENT.NODE_TEMPLATE,
+          opt:  {
+            force,
+            pagination: new FilterArgs({ filters: templateOpt })
+          }
+        });
       }
     },
 
@@ -539,8 +542,8 @@ export default defineComponent({
               v-if="mcm"
               class="col span-12"
             >
-              <!-- // TODO: RC test vai off check loading indicator when pagination off -->
               <PaginatedResourceTable
+                v-if="provClusterSchema"
                 :schema="provClusterSchema"
                 :table-actions="false"
                 :row-actions="false"
diff --git a/shell/plugins/dashboard-store/actions.js b/shell/plugins/dashboard-store/actions.js
index e0fe40ff149..f174d092e7a 100644
--- a/shell/plugins/dashboard-store/actions.js
+++ b/shell/plugins/dashboard-store/actions.js
@@ -408,7 +408,6 @@ export default {
       return Promise.reject(e);
     }
 
-    // TODO: RC Test
     await dispatch('unwatch', {
       type,
       all: true,
diff --git a/shell/plugins/dashboard-store/mutations.js b/shell/plugins/dashboard-store/mutations.js
index f772243a3a2..5637c39d5d0 100644
--- a/shell/plugins/dashboard-store/mutations.js
+++ b/shell/plugins/dashboard-store/mutations.js
@@ -1,4 +1,4 @@
-import { markRaw, reactive } from 'vue';
+import { reactive } from 'vue';
 import { addObject, addObjects, clear, removeObject } from '@shell/utils/array';
 import { SCHEMA, COUNT } from '@shell/config/types';
 import { normalizeType, keyFieldFor } from '@shell/plugins/dashboard-store/normalize';
@@ -36,7 +36,7 @@ function registerType(state, type) {
       loadCounter:   0,
 
       // Not enumerable so they don't get sent back to the client for SSR
-      map: markRaw(new Map()),
+      map: new Map(),
     };
 
     state.types[type] = cache;
diff --git a/shell/store/index.js b/shell/store/index.js
index 4074a706bdd..ed570362eb0 100644
--- a/shell/store/index.js
+++ b/shell/store/index.js
@@ -226,6 +226,13 @@ const updateActiveNamespaceCache = (state, activeNamespaceCache) => {
   }
 };
 
+/**
+ * Are we in the vai enabled world where mgmt clusters are paginated?
+ */
+const paginateClusters = (rootGetters) => {
+  return paginationUtils.isEnabled({ rootGetters }, { store: 'management', resource: { id: MANAGEMENT.CLUSTER, context: 'side-bar' } });
+};
+
 export const state = () => {
   return {
     managementReady:         false,
@@ -820,10 +827,9 @@ export const actions = {
 
     res = await allHash(promises);
 
-    // TODO: RC test
-    if (!res.settings && !paginationUtils.isEnabled({ rootGetters }, { store: 'management', resource: { id: MANAGEMENT.CLUSTER, context: 'side-bar' } })) {
-      // This introduces a synchronous request, however we need settings to determine if pagination is enabled
-      // Eventually it will be removed when pagination is always on
+    if (!res.settings || !paginateClusters(rootGetters)) {
+      // This introduces a synchronous request, however we need settings to determine if SSP is enabled
+      // Eventually it will be removed when SSP is always on
       res.clusters = await dispatch('management/findAll', { type: MANAGEMENT.CLUSTER, opt: { watch: false } });
       toWatch.push(MANAGEMENT.CLUSTER);
     }
@@ -988,8 +994,8 @@ export const actions = {
     // Try and wait until the schema exists before proceeding
     await dispatch('management/waitForSchema', { type: MANAGEMENT.CLUSTER });
 
-    // Do we need to wait on loadManagement to fetch required resources?
-    if (!paginationUtils.isEnabled({ rootGetters }, { store: 'management', resource: { id: MANAGEMENT.CLUSTER, context: 'side-bar' } })) {
+    // If SSP is on we won't have requested all clusters
+    if (!paginateClusters(rootGetters)) {
       await dispatch('management/waitForHaveAll', { type: MANAGEMENT.CLUSTER });
     }
 
@@ -1088,15 +1094,14 @@ export const actions = {
     commit('updateNamespaces', { filters: ids, getters });
   },
 
-  async cleanNamespaces({ getters, dispatch, rootGetters}) {
-    if (paginationUtils.isEnabled({ rootGetters }, { store: 'management', resource: { id: MANAGEMENT.CLUSTER, context: 'side-bar' } })) {
+  async cleanNamespaces({ getters, dispatch, rootGetters }) {
+    if (paginateClusters(rootGetters)) {
       // See https://github.com/rancher/dashboard/issues/12864
-      // old world..
+      // old world...
       // - loadManagement makes a request to fetch all mgmt clusters
-      // - we would block on that that request above before getting here (otherwise x2 requests were made)
-      // new world..
-      // - we won't have all mgmt clusters, this is another place that needs updating (see issue)
-
+      // - we would block on that that request above before getting here (otherwise x2 requests for all clusters were made)
+      // new world...
+      // - we won't have all mgmt clusters, so this whole function needs updating (see issue)
       return;
     }
 

From 6b445fd71d161474a0939a9039376ead4d4ecbb7 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 16 Dec 2024 14:17:43 +0000
Subject: [PATCH 44/76] Fix unit tests

---
 shell/plugins/dashboard-store/__tests__/mutations.test.ts | 2 ++
 shell/plugins/steve/__tests__/mutations.test.ts           | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/shell/plugins/dashboard-store/__tests__/mutations.test.ts b/shell/plugins/dashboard-store/__tests__/mutations.test.ts
index d50554e1811..de552bdfcac 100644
--- a/shell/plugins/dashboard-store/__tests__/mutations.test.ts
+++ b/shell/plugins/dashboard-store/__tests__/mutations.test.ts
@@ -375,6 +375,8 @@ describe('dashboard-store: mutations', () => {
     it.each([
       ['Add a new pod', mutationHelpers.loadAll.createNewEntry()],
     ])('%s', (_, run) => { // eslint-disable-line jest/no-identical-title
+      run.expected.types[POD].havePage = false;
+
       loadAdd(...run.params);
       const { map: cacheMap, ...cacheState } = run.params[0].types?.[POD] || {};
       const { map: expectedMap, ...expected } = run.expected.types?.[POD];
diff --git a/shell/plugins/steve/__tests__/mutations.test.ts b/shell/plugins/steve/__tests__/mutations.test.ts
index 94d6b76fec3..20d3531df4a 100644
--- a/shell/plugins/steve/__tests__/mutations.test.ts
+++ b/shell/plugins/steve/__tests__/mutations.test.ts
@@ -15,9 +15,10 @@ describe('steve-store: mutations', () => {
           list: [new Resource(pod)],
           map:  new Map([
             [pod.id, new Resource(pod)]
-          ])
+          ]),
         }
       };
+      res.expected.types[POD].havePage = false;
 
       return res;
     };

From 710c3a535e013db5fadc72a88e5e590b47da18b2 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 16 Dec 2024 15:48:10 +0000
Subject: [PATCH 45/76] remove invalid sort/filter type

---
 shell/config/product/explorer.js              | 5 +++--
 shell/plugins/steve/steve-pagination-utils.ts | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index eb3f636f341..d111824dfd7 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -309,9 +309,10 @@ export function init(store) {
         search: 'spec.targetPort', // Pending API support https://github.com/rancher/rancher/issues/48103
       },
       {
+        // Selector is an object. This is broken in non-SSP world anyway (won't sort on object, filtering on `$[x][y]` paths are broken )
         ...SELECTOR,
-        sort:   'spec.selector', // Pending API support https://github.com/rancher/rancher/issues/48103
-        search: 'spec.selector', // Pending API support https://github.com/rancher/rancher/issues/48103
+        sort:   'false',
+        search: 'false',
       },
       {
         ...SPEC_TYPE,
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index 0fa1c429be6..15fec897329 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -175,7 +175,6 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     ],
     [SERVICE]: [
       // { field: 'spec.targetPort' }, // Pending API support https://github.com/rancher/rancher/issues/48103
-      // { field: 'spec.selector' }, // Pending API support https://github.com/rancher/rancher/issues/48103
       // { field: 'spec.type' }, // Pending API support https://github.com/rancher/rancher/issues/48103
     ],
     [INGRESS]: [

From f837f889b7e3ed9317e2a7c108b55cb38ec277a6 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 16 Dec 2024 16:34:43 +0000
Subject: [PATCH 46/76] Running through new indexed fields

---
 shell/config/product/explorer.js              | 24 +++++++-------
 shell/list/persistentvolume.vue               | 10 +++---
 shell/plugins/steve/steve-pagination-utils.ts | 31 ++++++++++++-------
 3 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index d111824dfd7..72878ba8097 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -281,8 +281,8 @@ export function init(store) {
       STEVE_NAMESPACE_COL,
       {
         ...INGRESS_TARGET,
-        sort:   'spec.rules[0].host', // Pending API support https://github.com/rancher/rancher/issues/48103
-        search: 'spec.rules', // Pending API support https://github.com/rancher/rancher/issues/48103
+        sort:   'spec.rules[0].host', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+        search: 'spec.rules', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
       },
       {
         ...INGRESS_DEFAULT_BACKEND,
@@ -292,7 +292,7 @@ export function init(store) {
       {
         ...INGRESS_CLASS,
         sort:   'spec.ingressClassName',
-        search: 'spec.ingressClassName', // Pending API support https://github.com/rancher/rancher/issues/48103
+        search: 'spec.ingressClassName', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
       },
       STEVE_AGE_COL
     ]
@@ -305,8 +305,8 @@ export function init(store) {
       STEVE_NAMESPACE_COL,
       {
         ...TARGET_PORT,
-        sort:   'spec.targetPort', // Pending API support https://github.com/rancher/rancher/issues/48103
-        search: 'spec.targetPort', // Pending API support https://github.com/rancher/rancher/issues/48103
+        sort:   'spec.targetPort', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+        search: 'spec.targetPort', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
       },
       {
         // Selector is an object. This is broken in non-SSP world anyway (won't sort on object, filtering on `$[x][y]` paths are broken )
@@ -316,8 +316,8 @@ export function init(store) {
       },
       {
         ...SPEC_TYPE,
-        sort:   'spec.type', // Pending API support https://github.com/rancher/rancher/issues/48103
-        search: 'spec.type', // Pending API support https://github.com/rancher/rancher/issues/48103
+        sort:   'spec.type', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+        search: 'spec.type', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
       },
       STEVE_AGE_COL
     ]
@@ -357,10 +357,10 @@ export function init(store) {
       STEVE_STATE_COL,
       STEVE_NAME_COL,
       STEVE_NAMESPACE_COL,
-      HPA_REFERENCE, // Pending API support https://github.com/rancher/rancher/issues/48103
-      MIN_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48103
-      MAX_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48103
-      CURRENT_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48103
+      HPA_REFERENCE, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+      MIN_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+      MAX_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+      CURRENT_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
     ]
   );
 
@@ -507,7 +507,7 @@ export function init(store) {
       },
       {
         ...STORAGE_CLASS_DEFAULT,
-        sort: [`annotations."${ STORAGE.DEFAULT_STORAGE_CLASS }"`],
+        sort: [`metadata.annotations."${ STORAGE.DEFAULT_STORAGE_CLASS }"`],
       },
       STEVE_AGE_COL
     ]
diff --git a/shell/list/persistentvolume.vue b/shell/list/persistentvolume.vue
index bbbd2489b88..1daf5583b13 100644
--- a/shell/list/persistentvolume.vue
+++ b/shell/list/persistentvolume.vue
@@ -55,12 +55,10 @@ export default defineComponent({
       const opt: ActionFindPageArgs = {
         force,
         pagination: new FilterArgs({
-          filters: [],
-          // Pending API support https://github.com/rancher/rancher/issues/48103
-          // filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
-          //   field: 'spec.volumeName',
-          //   value: r.metadata.name
-          // }))),
+          filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
+            field: 'spec.volumeName',
+            value: r.metadata.name
+          }))),
         })
       };
 
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index 15fec897329..a4ff25cd1ec 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -11,9 +11,10 @@ import {
   STORAGE_CLASS,
   SERVICE,
   INGRESS,
-  WORKLOAD_TYPES
+  WORKLOAD_TYPES,
+  HPA
 } from '@shell/config/types';
-import { CAPI as CAPI_LABELS, CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations';
+import { CAPI as CAPI_LABELS, CATTLE_PUBLIC_ENDPOINTS, STORAGE } from '@shell/config/labels-annotations';
 import { Schema } from '@shell/plugins/steve/schema';
 
 class NamespaceProjectFilters {
@@ -174,24 +175,30 @@ class StevePaginationUtils extends NamespaceProjectFilters {
       { field: 'status.clusterName' },
     ],
     [SERVICE]: [
-      // { field: 'spec.targetPort' }, // Pending API support https://github.com/rancher/rancher/issues/48103
-      // { field: 'spec.type' }, // Pending API support https://github.com/rancher/rancher/issues/48103
+      // { field: 'spec.targetPort' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+      // { field: 'spec.type' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
     ],
     [INGRESS]: [
-      // { field: 'spec.targetPort' }, // Pending API support https://github.com/rancher/rancher/issues/48103
-      // { field: 'spec.rules' }, // Pending API support https://github.com/rancher/rancher/issues/48103
-      // { field: 'spec.ingressClassName' }, // Pending API support https://github.com/rancher/rancher/issues/48103
+      // { field: 'spec.targetPort' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+      // { field: 'spec.rules' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+      // { field: 'spec.ingressClassName' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+    ],
+    [HPA]: [
+      // { field: 'spec.scaleTargetRef.name' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+      // { field: 'spec.minReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+      // { field: 'spec.maxReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+      // { field: 'spec.currentReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
     ],
     [PVC]: [
-      // { field: 'spec.volumeName' }, // Pending API support https://github.com/rancher/rancher/issues/48103
+      { field: 'spec.volumeName' },
     ],
     [PV]: [
-      // { field: 'status.reason' }, // Pending API support https://github.com/rancher/rancher/issues/48103
-      // { field: 'spec.persistentVolumeReclaimPolicy' }, // Pending API support https://github.com/rancher/rancher/issues/48103
+      { field: 'status.reason' },
+      { field: 'spec.persistentVolumeReclaimPolicy' },
     ],
     [STORAGE_CLASS]: [
-      // { field: 'provisioner' }, // Pending API support https://github.com/rancher/rancher/issues/48103
-      // { field: `metadata.annotations."${ STORAGE.DEFAULT_STORAGE_CLASS }"` }, // Pending API support https://github.com/rancher/rancher/issues/48103
+      { field: 'provisioner' },
+      // { field: `metadata.annotations."${ STORAGE.DEFAULT_STORAGE_CLASS }"` }, // Pending API support https://github.com/rancher/rancher/issues/48256
     ],
     [CATALOG.APP]: [
       // { field: 'spec.chart.metadata.name' }, // Pending API support https://github.com/rancher/rancher/issues/48256

From d8e12baace09aa9f25f060bdde9a7a923dd69c84 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 16 Dec 2024 16:49:14 +0000
Subject: [PATCH 47/76] fix unit tests

---
 shell/config/product/explorer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index 72878ba8097..a60da6fc0c0 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -31,7 +31,7 @@ import {
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 import { STEVE_CACHE } from '@shell/store/features';
 import { configureConditionalDepaginate } from '@shell/store/type-map.utils';
-import { CATTLE_PUBLIC_ENDPOINTS, STORAGE } from 'config/labels-annotations';
+import { CATTLE_PUBLIC_ENDPOINTS, STORAGE } from '@shell/config/labels-annotations';
 
 export const NAME = 'explorer';
 

From 8f02e8ab30a2b8e2537ebe7dd895e2c031413d8f Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 16 Dec 2024 16:58:33 +0000
Subject: [PATCH 48/76] lint fixes

---
 shell/config/settings.ts                        | 4 ----
 shell/config/table-headers.js                   | 2 +-
 shell/list/node.vue                             | 2 +-
 shell/list/workload.vue                         | 1 -
 shell/pages/c/_cluster/settings/performance.vue | 1 -
 shell/plugins/steve/steve-pagination-utils.ts   | 2 +-
 6 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index 6c6f8ac9287..43c76e5bec3 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -9,10 +9,6 @@ import {
   STORAGE_CLASS,
   PVC,
   PV,
-  LIMIT_RANGE,
-  NETWORK_POLICY,
-  POD_DISRUPTION_BUDGET,
-  RESOURCE_QUOTA,
   WORKLOAD_TYPES
 } from '@shell/config/types';
 
diff --git a/shell/config/table-headers.js b/shell/config/table-headers.js
index 708559aeec2..7f0517e6c6e 100644
--- a/shell/config/table-headers.js
+++ b/shell/config/table-headers.js
@@ -1,4 +1,4 @@
-import { CATTLE_PUBLIC_ENDPOINTS, STORAGE } from '@shell/config/labels-annotations';
+import { CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations';
 import { NODE as NODE_TYPE } from '@shell/config/types';
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 
diff --git a/shell/list/node.vue b/shell/list/node.vue
index aa017ed294c..cc4c6303b0b 100644
--- a/shell/list/node.vue
+++ b/shell/list/node.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts, FetchPageSecondaryResourcesOpts } from '@shell/components/PaginatedResourceTable.vue';
+import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts } from '@shell/components/PaginatedResourceTable.vue';
 import Tag from '@shell/components/Tag.vue';
 import { Banner } from '@components/Banner';
 import { PODS } from '@shell/config/table-headers';
diff --git a/shell/list/workload.vue b/shell/list/workload.vue
index 4d21cd3664b..ab2b42cee34 100644
--- a/shell/list/workload.vue
+++ b/shell/list/workload.vue
@@ -4,7 +4,6 @@ import {
   WORKLOAD_TYPES, SCHEMA, NODE, POD, LIST_WORKLOAD_TYPES
 } from '@shell/config/types';
 import ResourceFetch from '@shell/mixins/resource-fetch';
-import { WORKLOAD_HEALTH_SCALE } from '@shell/config/table-headers';
 import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
 
 const workloadSchema = {
diff --git a/shell/pages/c/_cluster/settings/performance.vue b/shell/pages/c/_cluster/settings/performance.vue
index 9452b8187cf..ab4f2e62fcb 100644
--- a/shell/pages/c/_cluster/settings/performance.vue
+++ b/shell/pages/c/_cluster/settings/performance.vue
@@ -5,7 +5,6 @@ import AsyncButton from '@shell/components/AsyncButton';
 import { Banner } from '@components/Banner';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import { MANAGEMENT } from '@shell/config/types';
-import Vue from 'vue';
 import { DEFAULT_PERF_SETTING, SETTING } from '@shell/config/settings';
 import { _EDIT, _VIEW } from '@shell/config/query-params';
 import UnitInput from '@shell/components/form/UnitInput';
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index a4ff25cd1ec..d94a1015bad 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -14,7 +14,7 @@ import {
   WORKLOAD_TYPES,
   HPA
 } from '@shell/config/types';
-import { CAPI as CAPI_LABELS, CATTLE_PUBLIC_ENDPOINTS, STORAGE } from '@shell/config/labels-annotations';
+import { CAPI as CAPI_LABELS } from '@shell/config/labels-annotations';
 import { Schema } from '@shell/plugins/steve/schema';
 
 class NamespaceProjectFilters {

From 958e9d00d8047ff6c613b69373a8f36e78bbc049 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 17 Dec 2024 11:45:35 +0000
Subject: [PATCH 49/76] Fixes after small review

---
 shell/components/ResourceList/index.vue       |  2 +-
 shell/components/ResourceTable.vue            |  2 +-
 shell/components/SortableTable/index.vue      |  2 ++
 shell/config/product/apps.js                  |  2 +-
 shell/config/product/explorer.js              |  7 ++++---
 shell/list/networking.k8s.io.ingress.vue      |  2 --
 shell/list/service.vue                        |  2 --
 shell/plugins/steve/steve-pagination-utils.ts | 12 ++++++------
 8 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/shell/components/ResourceList/index.vue b/shell/components/ResourceList/index.vue
index 2de5ea37969..58638dcc005 100644
--- a/shell/components/ResourceList/index.vue
+++ b/shell/components/ResourceList/index.vue
@@ -9,7 +9,7 @@ import { ResourceListComponentName } from './resource-list.config';
 import { PanelLocation, ExtensionPoint } from '@shell/core/types';
 import ExtensionPanel from '@shell/components/ExtensionPanel';
 import { sameContents } from '@shell/utils/array';
-import { PAGINATED_RESOURCE_TABLE_NAME } from 'components/PaginatedResourceTable.vue';
+import { PAGINATED_RESOURCE_TABLE_NAME } from '@shell/components/PaginatedResourceTable.vue';
 
 export default {
   name: ResourceListComponentName,
diff --git a/shell/components/ResourceTable.vue b/shell/components/ResourceTable.vue
index 86b4add4526..76a89db545e 100644
--- a/shell/components/ResourceTable.vue
+++ b/shell/components/ResourceTable.vue
@@ -167,7 +167,7 @@ export default {
       default: false
     },
     /**
-     * Manaul force the update of live and delayed cells. Change this number to kick off the update
+     * Manual force the update of live and delayed cells. Change this number to kick off the update
      */
     forceUpdateLiveAndDelayed: {
       type:    Number,
diff --git a/shell/components/SortableTable/index.vue b/shell/components/SortableTable/index.vue
index af963c0f88e..7c84a20f28a 100644
--- a/shell/components/SortableTable/index.vue
+++ b/shell/components/SortableTable/index.vue
@@ -575,6 +575,7 @@ export default {
     },
 
     showHeaderRow() {
+      // All of these are used to show content in the header
       return this.search ||
         this.tableActions ||
         this.$slots['header-left'] ||
@@ -1406,6 +1407,7 @@ export default {
                           :col="col.col"
                           v-bind="col.col.formatterOpts"
                           :row-key="row.key"
+                          :get-custom-detail-link="getCustomDetailLink"
                         />
                         <component
                           :is="col.component"
diff --git a/shell/config/product/apps.js b/shell/config/product/apps.js
index 745ff433265..cd37affb07d 100644
--- a/shell/config/product/apps.js
+++ b/shell/config/product/apps.js
@@ -10,7 +10,7 @@ import {
 
 import { CATALOG } from '@shell/config/types';
 import { DSL } from '@shell/store/type-map';
-import { STEVE_AGE_COL, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL } from 'config/pagination-table-headers';
+import { STEVE_AGE_COL, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL } from '@shell/config/pagination-table-headers';
 
 export const NAME = 'apps';
 
diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index a60da6fc0c0..24050d635ab 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -366,8 +366,8 @@ export function init(store) {
 
   const STEVE_WORKLOAD_ENDPOINTS = {
     ...WORKLOAD_ENDPOINTS,
-    sort:   [`metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"`],
-    search: [`metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"`], // Pending API support https://github.com/rancher/rancher/issues/48256
+    sort:   [`metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]`], // Pending API support https://github.com/rancher/rancher/issues/48256
+    search: [`metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]`], // Pending API support https://github.com/rancher/rancher/issues/48256
   };
 
   const createSteveWorkloadImageCol = (resourceFieldPos) => ({
@@ -507,7 +507,8 @@ export function init(store) {
       },
       {
         ...STORAGE_CLASS_DEFAULT,
-        sort: [`metadata.annotations."${ STORAGE.DEFAULT_STORAGE_CLASS }"`],
+        sort: [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`],
+        search: [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`],
       },
       STEVE_AGE_COL
     ]
diff --git a/shell/list/networking.k8s.io.ingress.vue b/shell/list/networking.k8s.io.ingress.vue
index ebc9a468334..c01c022274a 100644
--- a/shell/list/networking.k8s.io.ingress.vue
+++ b/shell/list/networking.k8s.io.ingress.vue
@@ -34,8 +34,6 @@ export default {
   <PaginatedResourceTable
     :schema="schema"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-    :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
-
     :fetchSecondaryResources="fetchSecondaryResources"
   />
 </template>
diff --git a/shell/list/service.vue b/shell/list/service.vue
index 4f8c86a81e1..569e97d4ecd 100644
--- a/shell/list/service.vue
+++ b/shell/list/service.vue
@@ -42,8 +42,6 @@ export default {
   <PaginatedResourceTable
     :schema="schema"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-    :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
-
     :fetchSecondaryResources="fetchSecondaryResources"
   />
 </template>
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index d94a1015bad..cc4f0822da0 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -198,25 +198,25 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     ],
     [STORAGE_CLASS]: [
       { field: 'provisioner' },
-      // { field: `metadata.annotations."${ STORAGE.DEFAULT_STORAGE_CLASS }"` }, // Pending API support https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.annotations[STORAGE.DEFAULT_STORAGE_CLASS]` }, // Pending API support https://github.com/rancher/rancher/issues/48256
     ],
     [CATALOG.APP]: [
       // { field: 'spec.chart.metadata.name' }, // Pending API support https://github.com/rancher/rancher/issues/48256
     ],
     [WORKLOAD_TYPES.CRON_JOB]: [
-      // { field: `metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"` } // Pending API support https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256
     ],
     [WORKLOAD_TYPES.DAEMON_SET]: [
-      // { field: `metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"` } // Pending API support https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256
     ],
     [WORKLOAD_TYPES.DEPLOYMENT]: [
-      // { field: `metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"` } // Pending API support https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256
     ],
     [WORKLOAD_TYPES.JOB]: [
-      // { field: `metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"` } // Pending API support https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256
     ],
     [WORKLOAD_TYPES.STATEFUL_SET]: [
-      // { field: `metadata.annotations."${ CATTLE_PUBLIC_ENDPOINTS }"` } // Pending API support https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256
     ]
 
   }

From c3ae825e7ba429c65c6255c3c88b129c4db9f97b Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 17 Dec 2024 13:05:52 +0000
Subject: [PATCH 50/76] lint

---
 shell/config/product/explorer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index 24050d635ab..d6035b52900 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -507,7 +507,7 @@ export function init(store) {
       },
       {
         ...STORAGE_CLASS_DEFAULT,
-        sort: [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`],
+        sort:   [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`],
         search: [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`],
       },
       STEVE_AGE_COL

From 3844e8f468dad9c8ff9b9152c5a64213987ede75 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 17 Dec 2024 13:12:15 +0000
Subject: [PATCH 51/76] Test for check-plugin-gates pkg build from shell

---
 shell/components/PaginatedResourceTable.vue | 5 +++--
 shell/components/ResourceList/index.vue     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
index 25736ed8a2f..1635e8de3f3 100644
--- a/shell/components/PaginatedResourceTable.vue
+++ b/shell/components/PaginatedResourceTable.vue
@@ -10,7 +10,7 @@ export type FetchSecondaryResources = (opts: FetchSecondaryResourcesOpts) => Pro
 export type FetchPageSecondaryResourcesOpts = { canPaginate: boolean, force: boolean, page: any[], pagResult: StorePaginationResult }
 export type FetchPageSecondaryResources = (opts: FetchPageSecondaryResourcesOpts) => Promise<any>
 
-export const PAGINATED_RESOURCE_TABLE_NAME = 'PaginatedResourceTable';
+// export const PAGINATED_RESOURCE_TABLE_NAME = 'PaginatedResourceTable';
 
 /**
  * This is meant to enable ResourceList like capabilities outside of List pages / components
@@ -23,7 +23,8 @@ export const PAGINATED_RESOURCE_TABLE_NAME = 'PaginatedResourceTable';
  *
  */
 export default defineComponent({
-  name: PAGINATED_RESOURCE_TABLE_NAME,
+  // name: PAGINATED_RESOURCE_TABLE_NAME,
+  name: 'PaginatedResourceTable',
 
   components: { ResourceTable },
 
diff --git a/shell/components/ResourceList/index.vue b/shell/components/ResourceList/index.vue
index 58638dcc005..bc4c1f5126f 100644
--- a/shell/components/ResourceList/index.vue
+++ b/shell/components/ResourceList/index.vue
@@ -70,7 +70,7 @@ export default {
       }
 
       // If the custom component contains the paginated resource table it'll control the fetching
-      if (component?.components?.[PAGINATED_RESOURCE_TABLE_NAME]) {
+      if (component?.components?.['PaginatedResourceTable']) {
         this.componentWillFetch = true;
       }
     }

From 4ddf08a94b617df90e1ba66e4f3fb78cf24a8df3 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 17 Dec 2024 18:08:20 +0000
Subject: [PATCH 52/76] e2e fixes

---
 cypress/e2e/blueprints/nav/fake-cluster.ts           |  2 +-
 .../e2e/po/pages/explorer/cluster-dashboard.po.ts    |  2 +-
 .../tests/navigation/side-nav/main-side-menu.spec.ts |  2 +-
 .../explorer/dashboard/cluster-dashboard.spec.ts     | 12 +-----------
 shell/components/ResourceList/index.vue              |  2 +-
 shell/config/product/explorer.js                     |  4 ++--
 shell/pages/c/_cluster/explorer/EventsTable.vue      |  1 +
 shell/pages/c/_cluster/explorer/index.vue            |  2 ++
 8 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/cypress/e2e/blueprints/nav/fake-cluster.ts b/cypress/e2e/blueprints/nav/fake-cluster.ts
index 8391e69528d..de9a85f57be 100644
--- a/cypress/e2e/blueprints/nav/fake-cluster.ts
+++ b/cypress/e2e/blueprints/nav/fake-cluster.ts
@@ -2474,7 +2474,7 @@ function generateFakeNavClusterData(provClusterId = 'some-prov-cluster-id', mgmt
 }
 
 export function generateFakeClusterDataAndIntercepts(fakeProvClusterId = 'some-prov-cluster-id', fakeMgmtClusterId = 'some-mgmt-cluster-id', addEditClusterCapabilities = false): {} {
-  const longClusterDescription = 'this-is-some-really-really-really-really-really-really-long-decription';
+  const longClusterDescription = 'this-is-some-really-really-really-really-really-really-long-description';
   const fakeNavClusterData = generateFakeNavClusterData(fakeProvClusterId, fakeMgmtClusterId, addEditClusterCapabilities);
 
   // add cluster to fleet clusters for testing https://github.com/rancher/dashboard/issues/9984
diff --git a/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts b/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
index 6eb0c38a2e5..e3e6ad73d71 100644
--- a/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
+++ b/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
@@ -57,7 +57,7 @@ export default class ClusterDashboardPagePo extends PagePo {
   }
 
   fullEventsLink() {
-    return cy.get('.events-table-link').contains('Full events list');
+    return cy.get('[data-testid="events-link"]').contains('Full events list');
   }
 
   fullSecretsList() {
diff --git a/cypress/e2e/tests/navigation/side-nav/main-side-menu.spec.ts b/cypress/e2e/tests/navigation/side-nav/main-side-menu.spec.ts
index 560a43f17f8..ffc0ca298a8 100644
--- a/cypress/e2e/tests/navigation/side-nav/main-side-menu.spec.ts
+++ b/cypress/e2e/tests/navigation/side-nav/main-side-menu.spec.ts
@@ -4,7 +4,7 @@ import PagePo from '@/cypress/e2e/po/pages/page.po';
 import ProductNavPo from '@/cypress/e2e/po/side-bars/product-side-nav.po';
 import { generateFakeClusterDataAndIntercepts } from '@/cypress/e2e/blueprints/nav/fake-cluster';
 
-const longClusterDescription = 'this-is-some-really-really-really-really-really-really-long-decription';
+const longClusterDescription = 'this-is-some-really-really-really-really-really-really-long-description';
 const fakeProvClusterId = 'some-fake-cluster-id';
 const fakeMgmtClusterId = 'some-fake-mgmt-id';
 
diff --git a/cypress/e2e/tests/pages/explorer/dashboard/cluster-dashboard.spec.ts b/cypress/e2e/tests/pages/explorer/dashboard/cluster-dashboard.spec.ts
index 739bb22bffa..4607ef4b87c 100644
--- a/cypress/e2e/tests/pages/explorer/dashboard/cluster-dashboard.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/dashboard/cluster-dashboard.spec.ts
@@ -48,7 +48,7 @@ describe('Cluster Dashboard', { testIsolation: 'off', tags: ['@explorer', '@admi
 
     clusterDashboard.waitForPage(undefined, 'cluster-events');
 
-    // check if burguer menu nav is highlighted correctly for local cluster
+    // check if burger menu nav is highlighted correctly for local cluster
     BurgerMenuPo.checkIfClusterMenuLinkIsHighlighted('local');
   });
 
@@ -257,19 +257,9 @@ describe('Cluster Dashboard', { testIsolation: 'off', tags: ['@explorer', '@admi
   });
 
   it('can view events table empty if no events', { tags: ['@vai', '@adminUser'] }, () => {
-    cy.visit(clusterDashboard.urlPath(), {
-      onBeforeLoad(win) {
-        cy.stub(win.console, 'error').as('consoleError');
-        cy.stub(win.console, 'warn').as('consoleWarn');
-      },
-    });
-
     eventsNoDataset();
     clusterDashboard.goTo();
 
-    cy.get('@consoleError').should('not.be.called'); // See error lot
-    cy.get('@consoleWarn').should('not.be.called'); // See warning log (there will be some....)
-
     cy.wait('@eventsNoData');
     clusterDashboard.waitForPage(undefined, 'cluster-events');
 
diff --git a/shell/components/ResourceList/index.vue b/shell/components/ResourceList/index.vue
index bc4c1f5126f..62b59484c9e 100644
--- a/shell/components/ResourceList/index.vue
+++ b/shell/components/ResourceList/index.vue
@@ -9,7 +9,7 @@ import { ResourceListComponentName } from './resource-list.config';
 import { PanelLocation, ExtensionPoint } from '@shell/core/types';
 import ExtensionPanel from '@shell/components/ExtensionPanel';
 import { sameContents } from '@shell/utils/array';
-import { PAGINATED_RESOURCE_TABLE_NAME } from '@shell/components/PaginatedResourceTable.vue';
+// import { PAGINATED_RESOURCE_TABLE_NAME } from '@shell/components/PaginatedResourceTable.vue';
 
 export default {
   name: ResourceListComponentName,
diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index d6035b52900..11769b8f78f 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -311,8 +311,8 @@ export function init(store) {
       {
         // Selector is an object. This is broken in non-SSP world anyway (won't sort on object, filtering on `$[x][y]` paths are broken )
         ...SELECTOR,
-        sort:   'false',
-        search: 'false',
+        sort:   false,
+        search: false,
       },
       {
         ...SPEC_TYPE,
diff --git a/shell/pages/c/_cluster/explorer/EventsTable.vue b/shell/pages/c/_cluster/explorer/EventsTable.vue
index 4afbbd4b716..4b1b1a6af52 100644
--- a/shell/pages/c/_cluster/explorer/EventsTable.vue
+++ b/shell/pages/c/_cluster/explorer/EventsTable.vue
@@ -101,6 +101,7 @@ export default {
   >
     <template v-slot:header-right>
       <router-link
+        data-testid="events-link"
         :to="allEventsLink"
         class="events-link"
       >
diff --git a/shell/pages/c/_cluster/explorer/index.vue b/shell/pages/c/_cluster/explorer/index.vue
index d3a59952df5..81f13639278 100644
--- a/shell/pages/c/_cluster/explorer/index.vue
+++ b/shell/pages/c/_cluster/explorer/index.vue
@@ -148,6 +148,7 @@ export default {
       clusterCounts,
       selectedTab:        'cluster-events',
       extensionCards:     getApplicableExtensionEnhancements(this, ExtensionPoint.CARD, CardLocation.CLUSTER_DASHBOARD_CARD, this.$route),
+      canViewEvents:      !!this.$store.getters['cluster/schemaFor'](EVENT)
     };
   },
 
@@ -737,6 +738,7 @@ export default {
     <div class="mt-30">
       <Tabbed @changed="tabChange">
         <Tab
+          v-if="canViewEvents"
           name="cluster-events"
           :label="t('clusterIndexPage.sections.events.label')"
           :weight="2"

From 096d290627e593cb7c00d1c0d997c5143daaf63d Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Wed, 18 Dec 2024 14:38:50 +0000
Subject: [PATCH 53/76] Testing new indexed fields with dev image

---
 shell/components/formatter/Endpoints.vue      |  2 +-
 shell/components/nav/TopLevelMenu.helper.ts   |  2 +-
 shell/config/product/explorer.js              | 34 +++++++++----------
 shell/config/table-headers.js                 |  4 +--
 shell/plugins/steve/steve-pagination-utils.ts | 33 ++++++++----------
 shell/utils/cluster.js                        |  4 +--
 6 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/shell/components/formatter/Endpoints.vue b/shell/components/formatter/Endpoints.vue
index 57035bb1e0d..9742006141d 100644
--- a/shell/components/formatter/Endpoints.vue
+++ b/shell/components/formatter/Endpoints.vue
@@ -27,7 +27,7 @@ export default {
       const nodeWithExternal = nodes.find((node) => !!node.externalIp) || {};
       const externalIp = nodeWithExternal.externalIp;
 
-      if ( this.value && this.value.length ) {
+      if ( this.value?.length ) {
         let out ;
 
         try {
diff --git a/shell/components/nav/TopLevelMenu.helper.ts b/shell/components/nav/TopLevelMenu.helper.ts
index 45808a13295..2b43b3c70f8 100644
--- a/shell/components/nav/TopLevelMenu.helper.ts
+++ b/shell/components/nav/TopLevelMenu.helper.ts
@@ -48,7 +48,7 @@ const DEFAULT_SORT: Array<PaginationSort> = [
   },
   // {
   //   asc:   true,
-  //   field: 'status.conditions[0].status' // Pending API changes https://github.com/rancher/rancher/issues/48092
+  //   field: 'status.conditions[0].status' // Pending API support https://github.com/rancher/rancher/issues/48092
   // },
   {
     asc:   true,
diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index 11769b8f78f..74ee307a99a 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -278,11 +278,12 @@ export function init(store) {
     [STATE, NAME_COL, NAMESPACE_COL, INGRESS_TARGET, INGRESS_DEFAULT_BACKEND, INGRESS_CLASS, AGE],
     [
       STEVE_STATE_COL,
+      STEVE_NAME_COL,
       STEVE_NAMESPACE_COL,
       {
         ...INGRESS_TARGET,
-        sort:   'spec.rules[0].host', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-        search: 'spec.rules', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+        sort:   'spec.rules[0].host', // Pending API support https://github.com/rancher/rancher/issues/48473 (index fields) --> https://github.com/rancher/rancher/issues/48384 (service crash)
+        search: false, // This is broken in normal world, so disable here
       },
       {
         ...INGRESS_DEFAULT_BACKEND,
@@ -292,7 +293,7 @@ export function init(store) {
       {
         ...INGRESS_CLASS,
         sort:   'spec.ingressClassName',
-        search: 'spec.ingressClassName', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+        search: 'spec.ingressClassName', // Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields) --> https://github.com/rancher/rancher/issues/48384 (service crash)
       },
       STEVE_AGE_COL
     ]
@@ -302,12 +303,9 @@ export function init(store) {
     [STATE, NAME_COL, NAMESPACE_COL, TARGET_PORT, SELECTOR, SPEC_TYPE, AGE],
     [
       STEVE_STATE_COL,
+      STEVE_NAME_COL,
       STEVE_NAMESPACE_COL,
-      {
-        ...TARGET_PORT,
-        sort:   'spec.targetPort', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-        search: 'spec.targetPort', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      },
+      TARGET_PORT,
       {
         // Selector is an object. This is broken in non-SSP world anyway (won't sort on object, filtering on `$[x][y]` paths are broken )
         ...SELECTOR,
@@ -316,8 +314,8 @@ export function init(store) {
       },
       {
         ...SPEC_TYPE,
-        sort:   'spec.type', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-        search: 'spec.type', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+        sort:   'spec.type', // TODO: RC REGRESSION - shell/components/formatter/ServiceType.vue & shell/models/service.js show mangle value which we do not sort/filter on
+        search: 'spec.type',
       },
       STEVE_AGE_COL
     ]
@@ -357,17 +355,17 @@ export function init(store) {
       STEVE_STATE_COL,
       STEVE_NAME_COL,
       STEVE_NAMESPACE_COL,
-      HPA_REFERENCE, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      MIN_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      MAX_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      CURRENT_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+      HPA_REFERENCE, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      MIN_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      MAX_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      CURRENT_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
     ]
   );
 
   const STEVE_WORKLOAD_ENDPOINTS = {
     ...WORKLOAD_ENDPOINTS,
-    sort:   [`metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]`], // Pending API support https://github.com/rancher/rancher/issues/48256
-    search: [`metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]`], // Pending API support https://github.com/rancher/rancher/issues/48256
+    sort:   [`metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]`],
+    search: [`metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]`],
   };
 
   const createSteveWorkloadImageCol = (resourceFieldPos) => ({
@@ -507,8 +505,8 @@ export function init(store) {
       },
       {
         ...STORAGE_CLASS_DEFAULT,
-        sort:   [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`],
-        search: [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`],
+        sort:   [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`], // Pending API Support - https://github.com/rancher/rancher/issues/48453
+        search: [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`], // Pending API Support - https://github.com/rancher/rancher/issues/48453
       },
       STEVE_AGE_COL
     ]
diff --git a/shell/config/table-headers.js b/shell/config/table-headers.js
index 7f0517e6c6e..294fd3e4329 100644
--- a/shell/config/table-headers.js
+++ b/shell/config/table-headers.js
@@ -663,8 +663,8 @@ export const TARGET_PORT = {
   formatter: 'ServiceTargets',
   labelKey:  'tableHeaders.targetPort',
   name:      'targetPort',
-  sort:      `$['spec']['targetPort']`,
-  value:     `$['spec']['targetPort']`,
+  sort:      false,
+  value:     false,
 };
 
 export const SELECTOR = {
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index cc4f0822da0..24f76d1141d 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -140,8 +140,8 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     [MANAGEMENT.CLUSTER]: [
       { field: 'spec.internal' },
       { field: 'spec.displayName' },
-      // { field: `status.provider` }, // Pending API Support - https://github.com/rancher/rancher/issues/48256
-      // { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` }, // Pending API Support - https://github.com/rancher/rancher/issues/48256
+      { field: `status.provider` },
+      { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` },
 
     ],
     [CONFIG_MAP]: [
@@ -175,19 +175,16 @@ class StevePaginationUtils extends NamespaceProjectFilters {
       { field: 'status.clusterName' },
     ],
     [SERVICE]: [
-      // { field: 'spec.targetPort' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      // { field: 'spec.type' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+      { field: 'spec.type' },
     ],
     [INGRESS]: [
-      // { field: 'spec.targetPort' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      // { field: 'spec.rules' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      // { field: 'spec.ingressClassName' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+      // { field: 'spec.ingressClassName' }, // Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields) --> https://github.com/rancher/rancher/issues/48384 (service crash)
     ],
     [HPA]: [
-      // { field: 'spec.scaleTargetRef.name' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      // { field: 'spec.minReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      // { field: 'spec.maxReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      // { field: 'spec.currentReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+      // { field: 'spec.scaleTargetRef.name' }, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      // { field: 'spec.minReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      // { field: 'spec.maxReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      // { field: 'spec.currentReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
     ],
     [PVC]: [
       { field: 'spec.volumeName' },
@@ -198,25 +195,25 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     ],
     [STORAGE_CLASS]: [
       { field: 'provisioner' },
-      // { field: `metadata.annotations[STORAGE.DEFAULT_STORAGE_CLASS]` }, // Pending API support https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.annotations[STORAGE.DEFAULT_STORAGE_CLASS]` }, // Pending API Support - https://github.com/rancher/rancher/issues/48453
     ],
     [CATALOG.APP]: [
-      // { field: 'spec.chart.metadata.name' }, // Pending API support https://github.com/rancher/rancher/issues/48256
+      { field: 'spec.chart.metadata.name' }
     ],
     [WORKLOAD_TYPES.CRON_JOB]: [
-      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256 (index fields)
     ],
     [WORKLOAD_TYPES.DAEMON_SET]: [
-      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256 (index fields)
     ],
     [WORKLOAD_TYPES.DEPLOYMENT]: [
-      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256 (index fields)
     ],
     [WORKLOAD_TYPES.JOB]: [
-      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256 (index fields)
     ],
     [WORKLOAD_TYPES.STATEFUL_SET]: [
-      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // // Pending API support https://github.com/rancher/rancher/issues/48256 (index fields)
     ]
 
   }
diff --git a/shell/utils/cluster.js b/shell/utils/cluster.js
index beaf7c1474d..ac05751ae47 100644
--- a/shell/utils/cluster.js
+++ b/shell/utils/cluster.js
@@ -79,13 +79,13 @@ export function paginationFilterOnlyKubernetesClusters(store) {
 
   return PaginationParamFilter.createMultipleFields([
     new PaginationFilterField({
-      field:  `metadata.labels."${ CAPI.PROVIDER }"`, // Pending API Support - https://github.com/rancher/rancher/issues/48256
+      field:  `metadata.labels."${ CAPI.PROVIDER }"`,
       equals: false,
       value:  VIRTUAL_HARVESTER_PROVIDER,
       exact:  true
     }),
     new PaginationFilterField({
-      field:  `status.provider`, // Pending API Support - https://github.com/rancher/rancher/issues/48256
+      field:  `status.provider`,
       equals: false,
       value:  VIRTUAL_HARVESTER_PROVIDER,
       exact:  true

From aa73f3d57049e87c040e3ac881b0f2a4178b3f91 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Wed, 18 Dec 2024 15:27:52 +0000
Subject: [PATCH 54/76] tidyuing up imports in hope to fix ts error in
 check-plugins gate

---
 shell/list/catalog.cattle.io.app.vue            | 2 +-
 shell/list/persistentvolumeclaim.vue            | 2 +-
 shell/pages/c/_cluster/explorer/EventsTable.vue | 2 +-
 shell/pages/home.vue                            | 2 +-
 shell/pages/support/index.vue                   | 2 +-
 shell/scripts/typegen.sh                        | 1 +
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/shell/list/catalog.cattle.io.app.vue b/shell/list/catalog.cattle.io.app.vue
index d7637dae9b1..05aaa0c4606 100644
--- a/shell/list/catalog.cattle.io.app.vue
+++ b/shell/list/catalog.cattle.io.app.vue
@@ -1,5 +1,5 @@
 <script>
-import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
 
 export default {
   name:       'ListApps',
diff --git a/shell/list/persistentvolumeclaim.vue b/shell/list/persistentvolumeclaim.vue
index 6491ee82236..965875b2fb7 100644
--- a/shell/list/persistentvolumeclaim.vue
+++ b/shell/list/persistentvolumeclaim.vue
@@ -1,5 +1,5 @@
 <script>
-import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
 
 export default {
   name:       'ListPersistentVolumeClaim',
diff --git a/shell/pages/c/_cluster/explorer/EventsTable.vue b/shell/pages/c/_cluster/explorer/EventsTable.vue
index 4b1b1a6af52..01cfa54cd1b 100644
--- a/shell/pages/c/_cluster/explorer/EventsTable.vue
+++ b/shell/pages/c/_cluster/explorer/EventsTable.vue
@@ -2,7 +2,7 @@
 
 import { MESSAGE, NAME, OBJECT, REASON } from '@shell/config/table-headers';
 import { EVENT } from '@shell/config/types';
-import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
 import { STEVE_EVENT_OBJECT, STEVE_NAME_COL } from '@shell/config/pagination-table-headers';
 import { headerFromSchemaColString } from '@shell/store/type-map.utils';
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index c9d3e16735e..8fe5af689a2 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -27,7 +27,7 @@ import { RESET_CARDS_ACTION, SET_LOGIN_ACTION } from '@shell/config/page-actions
 import { STEVE_NAME_COL, STEVE_STATE_COL } from '@shell/config/pagination-table-headers';
 import { PaginationParamFilter, FilterArgs, PaginationFilterField, PaginationArgs } from '@shell/types/store/pagination.types';
 import ProvCluster from '@shell/models/provisioning.cattle.io.cluster';
-import { sameContents } from 'utils/array';
+import { sameContents } from '@shell/utils/array';
 
 export default defineComponent({
   name:       'Home',
diff --git a/shell/pages/support/index.vue b/shell/pages/support/index.vue
index eb2f064a731..cae7611e6b9 100644
--- a/shell/pages/support/index.vue
+++ b/shell/pages/support/index.vue
@@ -7,7 +7,7 @@ import { getVendor } from '@shell/config/private-label';
 import { SETTING } from '@shell/config/settings';
 import { addParam } from '@shell/utils/url';
 import { isRancherPrime } from '@shell/config/version';
-import { hasCspAdapter } from 'mixins/brand';
+import { hasCspAdapter } from '@shell/mixins/brand';
 import TabTitle from '@shell/components/TabTitle';
 
 export default {
diff --git a/shell/scripts/typegen.sh b/shell/scripts/typegen.sh
index 0c3dbe977ef..e52e8ad0d99 100755
--- a/shell/scripts/typegen.sh
+++ b/shell/scripts/typegen.sh
@@ -40,6 +40,7 @@ ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/resource-fetch.js --declar
 # # models
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/models/namespace.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/models/ > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/models/networking.k8s.io.ingress.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/models/ > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/models/catalog.cattle.io.clusterrepo.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/models/ > /dev/null
 
 #./node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store
 

From 5916758b126d9a29677ee7b80498aec93fecac68 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Wed, 18 Dec 2024 19:37:01 +0000
Subject: [PATCH 55/76] Fix failing check-plugin-gates - caused by
 shell/scripts/test-plugins-build.sh importing
 list/catalog.cattle.io.clusterrepo.vue - the component had been updated to a
 TS component - check-plugin build outputs TS errors for a component file
 imports - vs code shows no errors for imported file

---
 shell/components/PaginatedResourceTable.vue |  4 ++--
 shell/list/namespace.vue                    |  5 ++++-
 shell/scripts/test-plugins-build.sh         | 17 +++++++++++++++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
index 1635e8de3f3..438d5d66a0e 100644
--- a/shell/components/PaginatedResourceTable.vue
+++ b/shell/components/PaginatedResourceTable.vue
@@ -96,8 +96,8 @@ export default defineComponent({
   },
 
   computed: {
-    safeHeaders() {
-      const customHeaders = this.canPaginate ? this.paginationHeaders : this.headers;
+    safeHeaders(): any[] {
+      const customHeaders: any[] = this.canPaginate ? this.paginationHeaders : this.headers;
 
       return customHeaders || this.$store.getters['type-map/headersFor'](this.schema, this.canPaginate);
     }
diff --git a/shell/list/namespace.vue b/shell/list/namespace.vue
index 3f2264f4106..d492c061d4b 100644
--- a/shell/list/namespace.vue
+++ b/shell/list/namespace.vue
@@ -1,6 +1,9 @@
 <script>
+/**
+ * file used in shell/scripts/test-plugins-build.sh to validate imports
+ */
 import { mapGetters } from 'vuex';
-import { NS_SNAPSHOT_QUOTA } from '../config/table-headers';
+import { NS_SNAPSHOT_QUOTA } from '@shell/config/table-headers';
 import ResourceTable from '@shell/components/ResourceTable';
 import { HCI } from '@shell/config/types';
 export default {
diff --git a/shell/scripts/test-plugins-build.sh b/shell/scripts/test-plugins-build.sh
index 39c06cbacfc..a81beac1d1c 100755
--- a/shell/scripts/test-plugins-build.sh
+++ b/shell/scripts/test-plugins-build.sh
@@ -93,6 +93,19 @@ update_version_in_package_json "${SHELL_DIR}/package.json" "${SHELL_VERSION}"
 update_version_in_package_json "${BASE_DIR}/pkg/rancher-components/package.json" "${SHELL_VERSION}"
 update_version_in_package_json "${BASE_DIR}/creators/extension/package.json" "${SHELL_VERSION}"
 
+
+createTestComponent() {
+  # Add test list component to the test package
+  # Validates rancher-components imports
+
+  # NOTE - This fails if importing some components with TS imports...
+  # cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue pkg/test-pkg/list
+  # See https://github.com/rancher/dashboard/issues/12918
+
+  # Use a basic list instead
+  cp ${SHELL_DIR}/list/namespace.vue pkg/test-pkg/list
+}
+
 # Publish shell pkg (tag is needed as publish-shell is optimized to work with release-shell-pkg workflow)
 echo "Publishing Shell package to local registry"
 yarn install
@@ -133,7 +146,7 @@ if [ "${SKIP_STANDALONE}" == "false" ]; then
   # Add test list component to the test package
   # Validates rancher-components imports
   mkdir -p pkg/test-pkg/list
-  cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue pkg/test-pkg/list
+  createTestComponent
 
   FORCE_COLOR=true yarn build-pkg test-pkg | cat
 
@@ -159,7 +172,7 @@ if [ "${TEST_PERSIST_BUILD}" != "true" ]; then
 fi
 
 yarn create @rancher/extension test-pkg -i
-cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue ./pkg/test-pkg/list
+createTestComponent
 FORCE_COLOR=true yarn build-pkg test-pkg | cat
 
 if [ "${TEST_PERSIST_BUILD}" != "true" ]; then

From 595ea9072c8e041431136cd03b6ef7b3ce8765ed Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Fri, 3 Jan 2025 16:43:12 +0000
Subject: [PATCH 56/76] tidying up a smidge

---
 shell/components/ResourceList/index.vue | 1 -
 shell/config/product/explorer.js        | 2 +-
 shell/list/namespace.vue                | 2 +-
 shell/list/workload.vue                 | 6 +++---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/shell/components/ResourceList/index.vue b/shell/components/ResourceList/index.vue
index 62b59484c9e..c31e208cb65 100644
--- a/shell/components/ResourceList/index.vue
+++ b/shell/components/ResourceList/index.vue
@@ -9,7 +9,6 @@ import { ResourceListComponentName } from './resource-list.config';
 import { PanelLocation, ExtensionPoint } from '@shell/core/types';
 import ExtensionPanel from '@shell/components/ExtensionPanel';
 import { sameContents } from '@shell/utils/array';
-// import { PAGINATED_RESOURCE_TABLE_NAME } from '@shell/components/PaginatedResourceTable.vue';
 
 export default {
   name: ResourceListComponentName,
diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index 74ee307a99a..d8163b0f63a 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -314,7 +314,7 @@ export function init(store) {
       },
       {
         ...SPEC_TYPE,
-        sort:   'spec.type', // TODO: RC REGRESSION - shell/components/formatter/ServiceType.vue & shell/models/service.js show mangle value which we do not sort/filter on
+        sort:   'spec.type', // TODO: RC REGRESSION - shell/components/formatter/ServiceType.vue & shell/models/service.js show mangled value which we do not sort/filter on
         search: 'spec.type',
       },
       STEVE_AGE_COL
diff --git a/shell/list/namespace.vue b/shell/list/namespace.vue
index d492c061d4b..d9c12fe851d 100644
--- a/shell/list/namespace.vue
+++ b/shell/list/namespace.vue
@@ -1,6 +1,6 @@
 <script>
 /**
- * file used in shell/scripts/test-plugins-build.sh to validate imports
+ * This file is used in shell/scripts/test-plugins-build.sh (creates an extension with it in, and builds using a shell built from source)
  */
 import { mapGetters } from 'vuex';
 import { NS_SNAPSHOT_QUOTA } from '@shell/config/table-headers';
diff --git a/shell/list/workload.vue b/shell/list/workload.vue
index ab2b42cee34..c3c9253fc73 100644
--- a/shell/list/workload.vue
+++ b/shell/list/workload.vue
@@ -89,7 +89,9 @@ export default {
     const { params:{ resource: type } } = this.$route;
     const allTypes = this.$route.params.resource === workloadSchema.id;
     const schema = type !== workloadSchema.id ? this.$store.getters['cluster/schemaFor'](type) : workloadSchema;
-    const paginationEnabled = !allTypes && this.$store.getters[`cluster/paginationEnabled`]?.({ id: type }); // TODO: RC test vai off workloads page
+    const paginationEnabled = !allTypes && this.$store.getters[`cluster/paginationEnabled`]?.({ id: type });
+
+    // TODO: RC vai off cronjobs shows no data for health (pods associated with job)
 
     return {
       allTypes,
@@ -168,8 +170,6 @@ export default {
       :schema="schema"
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
     />
-    <!-- :fetchSecondaryResources="fetchSecondaryResources"
-    :fetchPageSecondaryResources="fetchPageSecondaryResources" -->
     <ResourceTable
       v-else
       :loading="$fetchState.pending"

From e227f3ebd75583acb87350b00d0dd3e392f5b223 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 6 Jan 2025 15:05:01 +0000
Subject: [PATCH 57/76] Many tweaks - Remove final todo's   - includes fix for
 service type clusterip/headless overlap - Removed ununused ENDPOINT column
 (note ENDPOINT formatter used in other columns) - Testing freshly added index
 fields

---
 shell/components/formatter/ServiceTargets.vue |  2 +-
 shell/components/formatter/ServiceType.vue    | 36 ++++++++++---------
 shell/config/product/explorer.js              |  6 ++--
 shell/config/table-headers.js                 |  9 -----
 shell/list/service.vue                        |  1 +
 shell/list/workload.vue                       |  3 +-
 shell/plugins/steve/steve-pagination-utils.ts | 24 +++++++------
 7 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/shell/components/formatter/ServiceTargets.vue b/shell/components/formatter/ServiceTargets.vue
index 15abb015cfc..87b1c01848b 100644
--- a/shell/components/formatter/ServiceTargets.vue
+++ b/shell/components/formatter/ServiceTargets.vue
@@ -95,7 +95,7 @@ export default {
     },
   },
 };
-</script>>
+</script>
 
 <template>
   <div>
diff --git a/shell/components/formatter/ServiceType.vue b/shell/components/formatter/ServiceType.vue
index 6521ad3e715..b35f01f7578 100644
--- a/shell/components/formatter/ServiceType.vue
+++ b/shell/components/formatter/ServiceType.vue
@@ -17,28 +17,30 @@ export default {
     },
   },
   data() {
-    const { row } = this;
-    let cloned = this.value.toLowerCase();
+    const cloned = this.getLabel(this.value.toLowerCase());
+    const headless = this.value === 'ClusterIP' && this.row?.spec?.clusterIP === 'None' ? this.getLabel('headless') : undefined;
 
-    if (this.value === 'ClusterIP' && row?.spec?.clusterIP === 'None') {
-      cloned = 'headless';
-    }
+    return { translated: cloned, headless };
+  },
 
-    const match = DEFAULT_SERVICE_TYPES.find((s) => s.id.toLowerCase() === cloned);
-    const translationLabel = match?.label;
-    let translated;
+  methods: {
+    getLabel(type) {
+      const match = DEFAULT_SERVICE_TYPES.find((s) => s.id.toLowerCase() === type);
+      const translationLabel = match?.label;
+      let translated;
 
-    if (translationLabel && this.$store.getters['i18n/exists'](translationLabel)) {
-      translated = this.$store.getters['i18n/t'](translationLabel);
-    } else {
-      translated = this.value;
-    }
+      if (translationLabel && this.$store.getters['i18n/exists'](translationLabel)) {
+        translated = this.$store.getters['i18n/t'](translationLabel);
+      } else {
+        translated = this.value;
+      }
 
-    return { translated };
-  },
+      return translated;
+    }
+  }
 };
-</script>>
+</script>
 
 <template>
-  <span>{{ translated }}</span>
+  <span>{{ translated }}{{ headless ? ` (${headless})` : '' }}</span>
 </template>
diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index d8163b0f63a..b03de134351 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -314,7 +314,7 @@ export function init(store) {
       },
       {
         ...SPEC_TYPE,
-        sort:   'spec.type', // TODO: RC REGRESSION - shell/components/formatter/ServiceType.vue & shell/models/service.js show mangled value which we do not sort/filter on
+        sort:   false, // ['spec.type', 'spec.clusterIP'] Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields)
         search: 'spec.type',
       },
       STEVE_AGE_COL
@@ -505,8 +505,8 @@ export function init(store) {
       },
       {
         ...STORAGE_CLASS_DEFAULT,
-        sort:   [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`], // Pending API Support - https://github.com/rancher/rancher/issues/48453
-        search: [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`], // Pending API Support - https://github.com/rancher/rancher/issues/48453
+        sort:   false, // [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`], // Pending API Support - https://github.com/rancher/rancher/issues/48453
+        search: false, // [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`], // Pending API Support - https://github.com/rancher/rancher/issues/48453
       },
       STEVE_AGE_COL
     ]
diff --git a/shell/config/table-headers.js b/shell/config/table-headers.js
index 294fd3e4329..05f3c723f99 100644
--- a/shell/config/table-headers.js
+++ b/shell/config/table-headers.js
@@ -326,15 +326,6 @@ export const POD_RESTARTS = {
   liveUpdates:  true
 };
 
-export const ENDPOINTS = {
-  name:      'endpoint',
-  labelKey:  'tableHeaders.endpoints',
-  value:     'status.endpoints',
-  formatter: 'Endpoints',
-  width:     60,
-  align:     'center',
-};
-
 export const SCALE = {
   name:      'scale',
   labelKey:  'tableHeaders.scale',
diff --git a/shell/list/service.vue b/shell/list/service.vue
index 569e97d4ecd..458785c9196 100644
--- a/shell/list/service.vue
+++ b/shell/list/service.vue
@@ -31,6 +31,7 @@ export default {
 
       if (this.$store.getters[`${ inStore }/schemaFor`](NODE)) {
         // fetch nodes before loading this page, as they may be referenced in the Target table column
+        // shell/components/formatter/ServiceTargets.vue --> shell/components/formatter/Endpoints.vue --> Picks the first one that has a model's externalIp
         await this.$store.dispatch(`${ inStore }/findAll`, { type: NODE });
       }
     }
diff --git a/shell/list/workload.vue b/shell/list/workload.vue
index c3c9253fc73..18907e605c9 100644
--- a/shell/list/workload.vue
+++ b/shell/list/workload.vue
@@ -61,6 +61,7 @@ export default {
       const schema = this.$store.getters[`cluster/schemaFor`](NODE);
 
       if (schema) {
+        // Used for shell/components/formatter/Endpoints.vue (too see column page needs to be wide and per page setting 25 or under)
         this.$fetchType(NODE);
       }
     } catch {}
@@ -91,8 +92,6 @@ export default {
     const schema = type !== workloadSchema.id ? this.$store.getters['cluster/schemaFor'](type) : workloadSchema;
     const paginationEnabled = !allTypes && this.$store.getters[`cluster/paginationEnabled`]?.({ id: type });
 
-    // TODO: RC vai off cronjobs shows no data for health (pods associated with job)
-
     return {
       allTypes,
       schema,
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index 24f76d1141d..84eac5f4d08 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -14,7 +14,7 @@ import {
   WORKLOAD_TYPES,
   HPA
 } from '@shell/config/types';
-import { CAPI as CAPI_LABELS } from '@shell/config/labels-annotations';
+import { CAPI as CAPI_LABELS, CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations';
 import { Schema } from '@shell/plugins/steve/schema';
 
 class NamespaceProjectFilters {
@@ -176,15 +176,17 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     ],
     [SERVICE]: [
       { field: 'spec.type' },
+      // { field: 'spec.clusterIP' }, // Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields)
     ],
     [INGRESS]: [
-      // { field: 'spec.ingressClassName' }, // Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields) --> https://github.com/rancher/rancher/issues/48384 (service crash)
+      // { field: 'spec.rules.host' }, // Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields)
+      // { field: 'spec.ingressClassName' }, // Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields)
     ],
     [HPA]: [
-      // { field: 'spec.scaleTargetRef.name' }, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
-      // { field: 'spec.minReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
-      // { field: 'spec.maxReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
-      // { field: 'spec.currentReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      // { field: 'spec.scaleTargetRef.name' }, // Pending API support https://github.com/rancher/rancher/issues/48473 (hpa filtering fix)
+      // { field: 'spec.minReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48473 (hpa filtering fix)
+      // { field: 'spec.maxReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48473 (hpa filtering fix)
+      // { field: 'spec.currentReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48473 (hpa filtering fix)
     ],
     [PVC]: [
       { field: 'spec.volumeName' },
@@ -201,19 +203,19 @@ class StevePaginationUtils extends NamespaceProjectFilters {
       { field: 'spec.chart.metadata.name' }
     ],
     [WORKLOAD_TYPES.CRON_JOB]: [
-      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256 (index fields)
+      { field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` }
     ],
     [WORKLOAD_TYPES.DAEMON_SET]: [
-      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256 (index fields)
+      { field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` }
     ],
     [WORKLOAD_TYPES.DEPLOYMENT]: [
-      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256 (index fields)
+      { field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` }
     ],
     [WORKLOAD_TYPES.JOB]: [
-      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256 (index fields)
+      { field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` }
     ],
     [WORKLOAD_TYPES.STATEFUL_SET]: [
-      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // // Pending API support https://github.com/rancher/rancher/issues/48256 (index fields)
+      { field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` }
     ]
 
   }

From a9ea0607ec0b8ec20a37391cd5bb0079767d3bb7 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 6 Jan 2025 15:40:44 +0000
Subject: [PATCH 58/76] Improve location of new place where componentWillFetch
 is set

---
 shell/components/ResourceList/index.vue | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/shell/components/ResourceList/index.vue b/shell/components/ResourceList/index.vue
index c31e208cb65..b19ceeca488 100644
--- a/shell/components/ResourceList/index.vue
+++ b/shell/components/ResourceList/index.vue
@@ -54,8 +54,10 @@ export default {
         this.customTypeDisplay = component.typeDisplay.apply(this);
       }
 
-      // If your list page has a fetch then it's responsible for populating rows itself
-      if ( component?.fetch ) {
+      // Is the custom component responsible fetching the resources?
+      // - Component has a fetch method - legacy method. fetch will handle the requests
+      // - Component contains the PaginatedResourceTable component - go forward method. PaginatedResourceTable owns fetching the resources
+      if ( component?.fetch || component?.components?.['PaginatedResourceTable']) {
         this.componentWillFetch = true;
       }
 
@@ -67,11 +69,6 @@ export default {
         this.loadResources = loadResources || [resource];
         this.loadIndeterminate = loadIndeterminate || false;
       }
-
-      // If the custom component contains the paginated resource table it'll control the fetching
-      if (component?.components?.['PaginatedResourceTable']) {
-        this.componentWillFetch = true;
-      }
     }
 
     if ( !this.componentWillFetch ) {

From dc5a5a3591997044e23552e49e5dfcbbfc7d7f30 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 6 Jan 2025 15:59:47 +0000
Subject: [PATCH 59/76] fix lint, comment updated

---
 shell/config/product/explorer.js | 6 +++---
 shell/list/node.vue              | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index b03de134351..36ad3fe4b42 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -31,7 +31,7 @@ import {
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 import { STEVE_CACHE } from '@shell/store/features';
 import { configureConditionalDepaginate } from '@shell/store/type-map.utils';
-import { CATTLE_PUBLIC_ENDPOINTS, STORAGE } from '@shell/config/labels-annotations';
+import { CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations';
 
 export const NAME = 'explorer';
 
@@ -282,7 +282,7 @@ export function init(store) {
       STEVE_NAMESPACE_COL,
       {
         ...INGRESS_TARGET,
-        sort:   'spec.rules[0].host', // Pending API support https://github.com/rancher/rancher/issues/48473 (index fields) --> https://github.com/rancher/rancher/issues/48384 (service crash)
+        sort:   'spec.rules[0].host', // Pending API support https://github.com/rancher/rancher/issues/48473 (index fields)
         search: false, // This is broken in normal world, so disable here
       },
       {
@@ -293,7 +293,7 @@ export function init(store) {
       {
         ...INGRESS_CLASS,
         sort:   'spec.ingressClassName',
-        search: 'spec.ingressClassName', // Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields) --> https://github.com/rancher/rancher/issues/48384 (service crash)
+        search: 'spec.ingressClassName', // Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields)
       },
       STEVE_AGE_COL
     ]
diff --git a/shell/list/node.vue b/shell/list/node.vue
index 25d49a3c771..cc4c6303b0b 100644
--- a/shell/list/node.vue
+++ b/shell/list/node.vue
@@ -19,7 +19,6 @@ import { GROUP_RESOURCES, mapPref } from '@shell/store/prefs';
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 
 import { mapGetters } from 'vuex';
-import { FetchPageSecondaryResourcesOpts } from 'components/PaginatedResourceTable.vue';
 
 export default defineComponent({
   name: 'ListNode',

From 00db7c951cb6d7935920e991cc1df137b9148273 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 7 Jan 2025 10:28:14 +0000
Subject: [PATCH 60/76] Fix failing e2e tests

---
 .../tests/pages/explorer/dashboard/cluster-dashboard.spec.ts   | 2 +-
 shell/config/pagination-table-headers.js                       | 3 ++-
 shell/config/product/explorer.js                               | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cypress/e2e/tests/pages/explorer/dashboard/cluster-dashboard.spec.ts b/cypress/e2e/tests/pages/explorer/dashboard/cluster-dashboard.spec.ts
index 4607ef4b87c..97fa9f37b59 100644
--- a/cypress/e2e/tests/pages/explorer/dashboard/cluster-dashboard.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/dashboard/cluster-dashboard.spec.ts
@@ -265,7 +265,7 @@ describe('Cluster Dashboard', { testIsolation: 'off', tags: ['@explorer', '@admi
 
     clusterDashboard.eventsList().resourceTable().sortableTable().checkRowCount(true, 1);
 
-    const expectedHeaders = ['Reason', 'Object', 'Message', 'Name', 'Date'];
+    const expectedHeaders = ['Reason', 'Object', 'Message', 'Name', 'First Seen', 'Last Seen', 'Count'];
 
     clusterDashboard.eventsList().resourceTable().sortableTable().tableHeaderRow()
       .within('.table-header-container .content')
diff --git a/shell/config/pagination-table-headers.js b/shell/config/pagination-table-headers.js
index afdea01e854..6ae3cce8bd6 100644
--- a/shell/config/pagination-table-headers.js
+++ b/shell/config/pagination-table-headers.js
@@ -48,7 +48,8 @@ export const STEVE_NAMESPACE_COL = {
 
 export const STEVE_EVENT_OBJECT = {
   ...OBJECT,
-  sort: 'involvedObject.kind',
+  sort:   'involvedObject.kind',
+  search: 'involvedObject.kind',
 };
 
 export const STEVE_LIST_GROUPS = [{
diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index 36ad3fe4b42..7dd5c3fb904 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -359,6 +359,7 @@ export function init(store) {
       MIN_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
       MAX_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
       CURRENT_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      STEVE_AGE_COL
     ]
   );
 

From 11eda663bff81f405589118a4de233c59a34e2f5 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 7 Jan 2025 13:34:18 +0000
Subject: [PATCH 61/76] WIP

---
 shell/components/Questions/Reference.vue               |  2 +-
 shell/components/RelatedWorkloadsTable.vue             | 10 +++++-----
 shell/components/form/ResourceLabeledSelect.vue        |  2 +-
 shell/components/form/ResourceSelector.vue             |  2 +-
 shell/components/form/ResourceTabs/index.vue           |  1 +
 shell/detail/catalog.cattle.io.app.vue                 |  4 ++--
 shell/detail/namespace.vue                             |  2 +-
 shell/detail/networking.k8s.io.ingress.vue             |  4 ++--
 shell/detail/workload/index.vue                        |  8 ++++----
 shell/dialog/RollbackWorkloadDialog.vue                |  2 +-
 .../edit/autoscaling.horizontalpodautoscaler/index.vue |  2 +-
 shell/edit/logging-flow/index.vue                      |  6 +++---
 shell/edit/networking.k8s.io.ingress/Rules.vue         |  2 +-
 shell/edit/networking.k8s.io.ingress/index.vue         |  2 +-
 shell/edit/networking.k8s.io.networkpolicy/index.vue   |  4 ++--
 shell/edit/resources.cattle.io.backup.vue              |  2 +-
 shell/edit/service.vue                                 |  2 +-
 shell/edit/ui.cattle.io.navlink.vue                    |  2 +-
 shell/list/node.vue                                    |  2 +-
 shell/models/cluster/node.js                           |  2 +-
 shell/models/service.js                                |  1 +
 shell/models/workload.js                               |  3 ++-
 shell/plugins/steve/mutations.js                       |  5 +++--
 23 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/shell/components/Questions/Reference.vue b/shell/components/Questions/Reference.vue
index aefd3dc3ff6..b29722604e3 100644
--- a/shell/components/Questions/Reference.vue
+++ b/shell/components/Questions/Reference.vue
@@ -31,7 +31,7 @@ export default {
 
   async fetch() {
     if ( this.typeSchema ) {
-      this.all = await this.$store.dispatch(`${ this.inStore }/findAll`, { type: this.typeName });
+      this.all = await this.$store.dispatch(`${ this.inStore }/findAll`, { type: this.typeName }); // TODO: RC
     }
   },
 
diff --git a/shell/components/RelatedWorkloadsTable.vue b/shell/components/RelatedWorkloadsTable.vue
index 846a958fcdd..462b97017da 100644
--- a/shell/components/RelatedWorkloadsTable.vue
+++ b/shell/components/RelatedWorkloadsTable.vue
@@ -22,7 +22,7 @@ export default {
       WORKLOAD_TYPES.JOB,
       WORKLOAD_TYPES.STATEFUL_SET
     ];
-    const allWorkloadsNested = await Promise.all(types.map((type) => this.$store.dispatch('cluster/findAll', { type })));
+    const allWorkloadsNested = await Promise.all(types.map((type) => this.$store.dispatch('cluster/findAll', { type }))); // TODO: RC
     const allWorkloads = allWorkloadsNested.flat();
 
     this.relatedWorkloadRows = allWorkloads.filter(this.filter);
@@ -41,10 +41,10 @@ export default {
 
 <template>
   <div>
-    <ResourceTable
-      :schema="schema"
-      :rows="relatedWorkloadRows"
-      :headers="relatedWorkloadHeaders"
+    <ResourceTable
+      :schema="schema"
+      :rows="relatedWorkloadRows"
+      :headers="relatedWorkloadHeaders"
     />
   </div>
 </template>
diff --git a/shell/components/form/ResourceLabeledSelect.vue b/shell/components/form/ResourceLabeledSelect.vue
index 3326a992793..777efc5fc4a 100644
--- a/shell/components/form/ResourceLabeledSelect.vue
+++ b/shell/components/form/ResourceLabeledSelect.vue
@@ -120,7 +120,7 @@ export default defineComponent({
     }
 
     if (!this.paginate) {
-      await this.$store.dispatch(`${ this.inStore }/findAll`, { type: this.resourceType });
+      await this.$store.dispatch(`${ this.inStore }/findAll`, { type: this.resourceType }); // TODO: RC
     }
   },
 
diff --git a/shell/components/form/ResourceSelector.vue b/shell/components/form/ResourceSelector.vue
index 78ab9ec6741..a693fbb9eab 100644
--- a/shell/components/form/ResourceSelector.vue
+++ b/shell/components/form/ResourceSelector.vue
@@ -36,7 +36,7 @@ export default {
   },
 
   async fetch() {
-    const hash = await allHash({ allResources: this.$store.dispatch('cluster/findAll', { type: this.type }) });
+    const hash = await allHash({ allResources: this.$store.dispatch('cluster/findAll', { type: this.type }) }); // TODO: RC
 
     this.allResources = hash.allResources;
 
diff --git a/shell/components/form/ResourceTabs/index.vue b/shell/components/form/ResourceTabs/index.vue
index b8f469c6b92..c3db9c52cca 100644
--- a/shell/components/form/ResourceTabs/index.vue
+++ b/shell/components/form/ResourceTabs/index.vue
@@ -157,6 +157,7 @@ export default {
       if (!this.didLoadEvents && this.selectedTab === 'events') {
         const inStore = this.$store.getters['currentStore'](EVENT);
 
+        // TODO: RC
         this.$store.dispatch(`${ inStore }/findAll`, { type: EVENT }).then((events) => {
           this.allEvents = events;
           this.didLoadEvents = true;
diff --git a/shell/detail/catalog.cattle.io.app.vue b/shell/detail/catalog.cattle.io.app.vue
index 4c90ae4e7f0..69239cea357 100644
--- a/shell/detail/catalog.cattle.io.app.vue
+++ b/shell/detail/catalog.cattle.io.app.vue
@@ -33,8 +33,8 @@ export default {
   async fetch() {
     const promises = {
       catalog:       this.$store.dispatch('catalog/load'),
-      allOperations: this.$store.dispatch('cluster/findAll', { type: CATALOG.OPERATION }),
-      secrets:       this.value.fetchValues(true),
+      allOperations: this.$store.dispatch('cluster/findAll', { type: CATALOG.OPERATION }), // TODO: RC
+      secrets:       this.value.fetchValues(true), // TODO: RC
     };
 
     const res = await allHash(promises);
diff --git a/shell/detail/namespace.vue b/shell/detail/namespace.vue
index a4deb7d988c..a8506fff7f3 100644
--- a/shell/detail/namespace.vue
+++ b/shell/detail/namespace.vue
@@ -198,7 +198,7 @@ export default {
       return Promise.all(values(WORKLOAD_TYPES)
         // You may not have RBAC to see some of the types
         .filter((type) => Boolean(this.schemaFor(type)))
-        .map((type) => this.$store.dispatch('cluster/findAll', { type }))
+        .map((type) => this.$store.dispatch('cluster/findAll', { type })) // TODO: RC
       );
     },
 
diff --git a/shell/detail/networking.k8s.io.ingress.vue b/shell/detail/networking.k8s.io.ingress.vue
index 1ac52715e25..f04601a1a91 100644
--- a/shell/detail/networking.k8s.io.ingress.vue
+++ b/shell/detail/networking.k8s.io.ingress.vue
@@ -19,7 +19,7 @@ export default {
   mixins: [CreateEditView],
   async fetch() {
     const promises = {
-      services:       this.$store.dispatch('cluster/findAll', { type: SERVICE }),
+      services:       this.$store.dispatch('cluster/findAll', { type: SERVICE }), // TODO: RC SERVICE
       resourceFields: this.schema.fetchResourceFields(),
     };
 
@@ -36,7 +36,7 @@ export default {
 
       promises.filteredSecrets = this.$store.dispatch(`cluster/findPage`, { type: SECRET, opt: findPageArgs });
     } else {
-      promises.secrets = this.$store.dispatch('cluster/findAll', { type: SECRET });
+      promises.secrets = this.$store.dispatch('cluster/findAll', { type: SECRET }); // TODO: RC SECRET
     }
     const hash = await allHash(promises);
 
diff --git a/shell/detail/workload/index.vue b/shell/detail/workload/index.vue
index 58c891ed202..6af70268703 100644
--- a/shell/detail/workload/index.vue
+++ b/shell/detail/workload/index.vue
@@ -49,15 +49,15 @@ export default {
     const hash = {
       // See https://github.com/rancher/dashboard/issues/10417, all pods bad, come from a locally applied selector in the workload model
       allPods:      this.$store.dispatch('cluster/findAll', { type: POD }),
-      allServices:  this.$store.dispatch('cluster/findAll', { type: SERVICE }),
-      allIngresses: this.$store.dispatch('cluster/findAll', { type: INGRESS }),
+      allServices:  this.$store.dispatch('cluster/findAll', { type: SERVICE }), // TODO: RC SERVICE
+      allIngresses: this.$store.dispatch('cluster/findAll', { type: INGRESS }), // TODO: RC INGRESS
       // Nodes should be fetched because they may be referenced in the target
       // column of a service list item.
-      allNodes:     hasNodes ? this.$store.dispatch('cluster/findAll', { type: NODE }) : []
+      allNodes:     hasNodes ? this.$store.dispatch('cluster/findAll', { type: NODE }) : [] // TODO: RC NODE
     };
 
     if (this.value.type === WORKLOAD_TYPES.CRON_JOB) {
-      hash.allJobs = this.$store.dispatch('cluster/findAll', { type: WORKLOAD_TYPES.JOB });
+      hash.allJobs = this.$store.dispatch('cluster/findAll', { type: WORKLOAD_TYPES.JOB }); // TODO: RC JOB
     }
     const res = await allHash(hash);
 
diff --git a/shell/dialog/RollbackWorkloadDialog.vue b/shell/dialog/RollbackWorkloadDialog.vue
index 3fce5860b88..38da88ab2e8 100644
--- a/shell/dialog/RollbackWorkloadDialog.vue
+++ b/shell/dialog/RollbackWorkloadDialog.vue
@@ -84,7 +84,7 @@ export default {
   },
   fetch() {
     // Fetch revisions of the current workload
-    this.$store.dispatch('cluster/findAll', { type: this.revisionsType })
+    this.$store.dispatch('cluster/findAll', { type: this.revisionsType }) // TODO: RC workload
       .then(( response ) => {
         const allRevisions = response;
 
diff --git a/shell/edit/autoscaling.horizontalpodautoscaler/index.vue b/shell/edit/autoscaling.horizontalpodautoscaler/index.vue
index a27992d2533..aeabcd935ce 100644
--- a/shell/edit/autoscaling.horizontalpodautoscaler/index.vue
+++ b/shell/edit/autoscaling.horizontalpodautoscaler/index.vue
@@ -173,7 +173,7 @@ export default {
     },
     async loadWorkloads() {
       await Promise.all(
-        Object.values(SCALABLE_WORKLOAD_TYPES).map((type) => this.$store.dispatch('cluster/findAll', { type })
+        Object.values(SCALABLE_WORKLOAD_TYPES).map((type) => this.$store.dispatch('cluster/findAll', { type }) // TODO: RC workload
         )
       );
     },
diff --git a/shell/edit/logging-flow/index.vue b/shell/edit/logging-flow/index.vue
index 76c19fcb28a..4cedbdf8c1c 100644
--- a/shell/edit/logging-flow/index.vue
+++ b/shell/edit/logging-flow/index.vue
@@ -77,9 +77,9 @@ export default {
     const hash = await allHash({
       allOutputs:        getAllOrDefault(LOGGING.OUTPUT, isFlow && hasAccessToOutputs),
       allClusterOutputs: getAllOrDefault(LOGGING.CLUSTER_OUTPUT, hasAccessToClusterOutputs),
-      allNamespaces:     getAllOrDefault(NAMESPACE, hasAccessToNamespaces),
-      allNodes:          getAllOrDefault(NODE, hasAccessToNodes),
-      allPods:           getAllOrDefault(POD, hasAccessToPods),
+      allNamespaces:     getAllOrDefault(NAMESPACE, hasAccessToNamespaces), // TODO: RC findAll NAMESPACE
+      allNodes:          getAllOrDefault(NODE, hasAccessToNodes), // TODO: RC findAll NODE
+      allPods:           getAllOrDefault(POD, hasAccessToPods), // TODO: RC findAll POD
     });
 
     for ( const k of Object.keys(hash) ) {
diff --git a/shell/edit/networking.k8s.io.ingress/Rules.vue b/shell/edit/networking.k8s.io.ingress/Rules.vue
index 072c912036b..f96ffdc8ca6 100644
--- a/shell/edit/networking.k8s.io.ingress/Rules.vue
+++ b/shell/edit/networking.k8s.io.ingress/Rules.vue
@@ -47,7 +47,7 @@ export default {
   async fetch() {
     if (!this.$store.getters[`cluster/paginationEnabled`]()) {
       // This is only used by shell/models/networking.k8s.io.ingress.js `targetTo`, where we do some dodgy matching of workloads with name 'ingress-'
-      await Promise.all(Object.values(WORKLOAD_TYPES).map((type) => this.$store.dispatch('cluster/findAll', { type })));
+      await Promise.all(Object.values(WORKLOAD_TYPES).map((type) => this.$store.dispatch('cluster/findAll', { type }))); // TODO: RC findAll workloads
     }
   },
 
diff --git a/shell/edit/networking.k8s.io.ingress/index.vue b/shell/edit/networking.k8s.io.ingress/index.vue
index c54e864b992..df4ad9466ec 100644
--- a/shell/edit/networking.k8s.io.ingress/index.vue
+++ b/shell/edit/networking.k8s.io.ingress/index.vue
@@ -53,7 +53,7 @@ export default {
     this.ingressClassSchema = this.$store.getters[`cluster/schemaFor`](INGRESS_CLASS);
 
     const promises = {
-      services:              this.$store.dispatch('cluster/findAll', { type: SERVICE }),
+      services:              this.$store.dispatch('cluster/findAll', { type: SERVICE }), // TODO: RC findAll SERVICE
       ingressClasses:        this.ingressClassSchema ? this.$store.dispatch('cluster/findAll', { type: INGRESS_CLASS }) : Promise.resolve([]),
       ingressResourceFields: this.schema.fetchResourceFields(),
     };
diff --git a/shell/edit/networking.k8s.io.networkpolicy/index.vue b/shell/edit/networking.k8s.io.networkpolicy/index.vue
index 19903b4cd0b..07a6ce1cecd 100644
--- a/shell/edit/networking.k8s.io.networkpolicy/index.vue
+++ b/shell/edit/networking.k8s.io.networkpolicy/index.vue
@@ -43,8 +43,8 @@ export default {
 
   async fetch() {
     const hash = await allHash({
-      allPods:       this.$store.dispatch('cluster/findAll', { type: POD }),
-      allNamespaces: this.$store.dispatch('cluster/findAll', { type: NAMESPACE }),
+      allPods:       this.$store.dispatch('cluster/findAll', { type: POD }), // TODO: RC findAll POD
+      allNamespaces: this.$store.dispatch('cluster/findAll', { type: NAMESPACE }), // TODO: RC findAll NAMESPACE
     });
 
     this.allPods = hash.allPods;
diff --git a/shell/edit/resources.cattle.io.backup.vue b/shell/edit/resources.cattle.io.backup.vue
index 8feae1ca543..271852bed94 100644
--- a/shell/edit/resources.cattle.io.backup.vue
+++ b/shell/edit/resources.cattle.io.backup.vue
@@ -52,7 +52,7 @@ export default {
     const hash = await allHash({
       catalog:     this.$store.dispatch('catalog/load'),
       resourceSet: this.$store.dispatch('cluster/find', { type: BACKUP_RESTORE.RESOURCE_SET, id: this.value?.spec?.resourceSetName || 'rancher-resource-set' }),
-      apps:        this.$store.dispatch('cluster/findAll', { type: CATALOG.APP })
+      apps:        this.$store.dispatch('cluster/findAll', { type: CATALOG.APP }) // TODO: RC APP
     });
 
     this.apps = hash.apps;
diff --git a/shell/edit/service.vue b/shell/edit/service.vue
index d28f99ce6ec..88a9ae21ab4 100644
--- a/shell/edit/service.vue
+++ b/shell/edit/service.vue
@@ -287,7 +287,7 @@ export default {
 
         const hash = {
           provClusters:     this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER }),
-          pods:             this.$store.dispatch(`${ inStore }/findAll`, { type: POD }),
+          pods:             this.$store.dispatch(`${ inStore }/findAll`, { type: POD }), // TODO: RC findAll POD
           harvesterConfigs: this.$store.dispatch(`management/findAll`, { type: HCI.HARVESTER_CONFIG }),
         };
 
diff --git a/shell/edit/ui.cattle.io.navlink.vue b/shell/edit/ui.cattle.io.navlink.vue
index e8f9dfc6e78..bcef181a84a 100644
--- a/shell/edit/ui.cattle.io.navlink.vue
+++ b/shell/edit/ui.cattle.io.navlink.vue
@@ -162,7 +162,7 @@ export default {
   },
   async fetch() {
     this.services = await this.$store
-      .dispatch('cluster/findAll', { type: SERVICE });
+      .dispatch('cluster/findAll', { type: SERVICE }); // TODO: RC SERVICE
   },
   methods: {
     /**
diff --git a/shell/list/node.vue b/shell/list/node.vue
index cc4c6303b0b..0cb6b3868e2 100644
--- a/shell/list/node.vue
+++ b/shell/list/node.vue
@@ -202,7 +202,7 @@ export default defineComponent({
 
       if (this.canViewPods) {
         // No need to block on this
-        this.$store.dispatch(`cluster/findAll`, { type: POD });
+        this.$store.dispatch(`cluster/findAll`, { type: POD }); // TODO: RC findAll POD. if this doesn't run in pag world make clear
       }
 
       return hash;
diff --git a/shell/models/cluster/node.js b/shell/models/cluster/node.js
index da4f364f6f5..7b3f6b5270b 100644
--- a/shell/models/cluster/node.js
+++ b/shell/models/cluster/node.js
@@ -408,7 +408,7 @@ export default class ClusterNode extends SteveModel {
   }
 
   get pods() {
-    const allPods = this.$rootGetters['cluster/all'](POD);
+    const allPods = this.$rootGetters['cluster/all'](POD); // TODO: RC check
 
     return allPods.filter((pod) => pod.spec.nodeName === this.name);
   }
diff --git a/shell/models/service.js b/shell/models/service.js
index 4f28b95fde6..102c46348ec 100644
--- a/shell/models/service.js
+++ b/shell/models/service.js
@@ -138,6 +138,7 @@ export default class extends SteveModel {
 
   async fetchPods() {
     if (this.podRelationship) {
+      // https://github.com/rancher/dashboard/issues/10417
       await this.$dispatch('cluster/findMatching', {
         type:      POD,
         selector:  this.podRelationship.selector,
diff --git a/shell/models/workload.js b/shell/models/workload.js
index 5e42571dc90..10835510f8b 100644
--- a/shell/models/workload.js
+++ b/shell/models/workload.js
@@ -554,6 +554,7 @@ export default class Workload extends WorkloadService {
     if (podRelationship) {
       const pods = this.$getters['podsByNamespace'](this.metadata.namespace);
 
+      // https://github.com/rancher/dashboard/issues/10417
       return pods.filter((obj) => {
         return matches(obj, podRelationship.selector);
       });
@@ -643,7 +644,7 @@ export default class Workload extends WorkloadService {
   }
 
   async matchingPods() {
-    const all = await this.$dispatch('findAll', { type: POD });
+    const all = await this.$dispatch('findAll', { type: POD }); // https://github.com/rancher/dashboard/issues/10417
     const allInNamespace = all.filter((pod) => pod.metadata.namespace === this.metadata.namespace);
 
     const selector = convertSelectorObj(this.spec.selector);
diff --git a/shell/plugins/steve/mutations.js b/shell/plugins/steve/mutations.js
index 7e9b73e54c7..b2f3e020f77 100644
--- a/shell/plugins/steve/mutations.js
+++ b/shell/plugins/steve/mutations.js
@@ -34,6 +34,7 @@ function registerNamespace(state, namespace) {
  * update the podsByNamespace cache with new or changed pods
  */
 function updatePodsByNamespaceCache(state, ctx, pods, loadAll) {
+  // TODO: RC check where this is called
   if (loadAll) {
     // Clear the entire cache - this is a fresh load
     Object.keys(state.podsByNamespace).forEach((ns) => {
@@ -183,7 +184,7 @@ export default {
     for (const entry of data) {
       const resource = load(state, { data: entry, ctx });
 
-      if (resource.type === POD && resource.metadata) {
+      if (resource.type === POD && resource.metadata) { // TODO: RC check if pag calls this
         const cache = registerNamespace(state, resource.namespace);
 
         addObject(cache.list, resource);
@@ -197,7 +198,7 @@ export default {
       type, data: allLatest, ctx
     });
 
-    if (allLatest.length && allLatest[0].type === POD) {
+    if (allLatest.length && allLatest[0].type === POD) { // TODO: RC check if pag calls this
       updatePodsByNamespaceCache(state, ctx, allLatest, false);
     }
   },

From cb87aa3b6e160d6a309d4604b7bff6fe146677fe Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 7 Jan 2025 15:31:15 +0000
Subject: [PATCH 62/76] Remove ununused component, tweaks, update ResourceTabs
 events to be super ok

---
 shell/components/RelatedWorkloadsTable.vue    | 50 ----------
 .../components/form/ResourceLabeledSelect.vue |  6 +-
 shell/components/form/ResourceSelector.vue    |  4 +-
 shell/components/form/ResourceTabs/index.vue  | 96 ++++++++++++-------
 shell/plugins/steve/steve-pagination-utils.ts |  1 +
 5 files changed, 68 insertions(+), 89 deletions(-)
 delete mode 100644 shell/components/RelatedWorkloadsTable.vue

diff --git a/shell/components/RelatedWorkloadsTable.vue b/shell/components/RelatedWorkloadsTable.vue
deleted file mode 100644
index 462b97017da..00000000000
--- a/shell/components/RelatedWorkloadsTable.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<script>
-import {
-  STATE, NAME, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, TYPE, AGE
-} from '@shell/config/table-headers';
-import { WORKLOAD_TYPES } from '@shell/config/types';
-import ResourceTable from '@shell/components/ResourceTable';
-
-export default {
-  components: { ResourceTable },
-  props:      {
-    filter: {
-      type:     Function,
-      required: true
-    }
-  },
-  async fetch() {
-    // Enumerating instead of using Object.values() because it looks like we don't want to include replica sets for this.
-    const types = [
-      WORKLOAD_TYPES.DEPLOYMENT,
-      WORKLOAD_TYPES.CRON_JOB,
-      WORKLOAD_TYPES.DAEMON_SET,
-      WORKLOAD_TYPES.JOB,
-      WORKLOAD_TYPES.STATEFUL_SET
-    ];
-    const allWorkloadsNested = await Promise.all(types.map((type) => this.$store.dispatch('cluster/findAll', { type }))); // TODO: RC
-    const allWorkloads = allWorkloadsNested.flat();
-
-    this.relatedWorkloadRows = allWorkloads.filter(this.filter);
-  },
-  data() {
-    const relatedWorkloadHeaders = [STATE, NAME, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, TYPE, AGE];
-
-    return {
-      relatedWorkloadRows: [],
-      relatedWorkloadHeaders,
-      schema:              this.$store.getters['cluster/schemaFor'](WORKLOAD_TYPES.DEPLOYMENT)
-    };
-  },
-};
-</script>
-
-<template>
-  <div>
-    <ResourceTable
-      :schema="schema"
-      :rows="relatedWorkloadRows"
-      :headers="relatedWorkloadHeaders"
-    />
-  </div>
-</template>
diff --git a/shell/components/form/ResourceLabeledSelect.vue b/shell/components/form/ResourceLabeledSelect.vue
index 777efc5fc4a..96308befce7 100644
--- a/shell/components/form/ResourceLabeledSelect.vue
+++ b/shell/components/form/ResourceLabeledSelect.vue
@@ -120,7 +120,8 @@ export default defineComponent({
     }
 
     if (!this.paginate) {
-      await this.$store.dispatch(`${ this.inStore }/findAll`, { type: this.resourceType }); // TODO: RC
+      // The resource won't be paginated and component expects everything up front
+      await this.$store.dispatch(`${ this.inStore }/findAll`, { type: this.resourceType });
     }
   },
 
@@ -154,7 +155,8 @@ export default defineComponent({
 
   methods: {
     /**
-     * Typeof LabelSelectPaginateFn
+     * Make the request to fetch the resource given the state of the label select (filter, page, page size, etc see LabelSelectPaginateFn)
+     * opts: Typeof LabelSelectPaginateFn
      */
     async paginateType(opts: LabelSelectPaginateFnOptions): Promise<LabelSelectPaginateFnResponse> {
       if (this.paginatedResourceSettings?.overrideRequest) {
diff --git a/shell/components/form/ResourceSelector.vue b/shell/components/form/ResourceSelector.vue
index a693fbb9eab..4c616ab3340 100644
--- a/shell/components/form/ResourceSelector.vue
+++ b/shell/components/form/ResourceSelector.vue
@@ -36,7 +36,9 @@ export default {
   },
 
   async fetch() {
-    const hash = await allHash({ allResources: this.$store.dispatch('cluster/findAll', { type: this.type }) }); // TODO: RC
+    // TODO: RC find all 10417, update comment
+    // https://github.com/rancher/dashboard/issues/10417 require in order to scale application of labelSelects
+    const hash = await allHash({ allResources: this.$store.dispatch('cluster/findAll', { type: this.type }) });
 
     this.allResources = hash.allResources;
 
diff --git a/shell/components/form/ResourceTabs/index.vue b/shell/components/form/ResourceTabs/index.vue
index c3db9c52cca..fe85ded6a12 100644
--- a/shell/components/form/ResourceTabs/index.vue
+++ b/shell/components/form/ResourceTabs/index.vue
@@ -8,10 +8,11 @@ import Tab from '@shell/components/Tabbed/Tab';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import Conditions from '@shell/components/form/Conditions';
 import { EVENT } from '@shell/config/types';
-import SortableTable from '@shell/components/SortableTable';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
 import { _VIEW } from '@shell/config/query-params';
 import RelatedResources from '@shell/components/RelatedResources';
 import { isConditionReadyAndWaiting } from '@shell/plugins/dashboard-store/resource-class';
+import { PaginationParamFilter } from '@shell/types/store/pagination.types';
 
 export default {
 
@@ -21,7 +22,7 @@ export default {
     Tabbed,
     Tab,
     Conditions,
-    SortableTable,
+    PaginatedResourceTable,
     RelatedResources,
   },
 
@@ -71,10 +72,10 @@ export default {
     const inStore = this.$store.getters['currentStore'](EVENT);
 
     return {
-      hasEvents:      this.$store.getters[`${ inStore }/schemaFor`](EVENT), // @TODO be smarter about which resources actually ever have events
-      allEvents:      [],
+      eventSchema:    this.$store.getters[`${ inStore }/schemaFor`](EVENT), // @TODO be smarter about which resources actually ever have events
+      EVENT,
       selectedTab:    this.defaultTab,
-      didLoadEvents:  false,
+      // didLoadEvents:  false,
       inStore,
       showConditions: false,
     };
@@ -92,7 +93,7 @@ export default {
 
   computed: {
     showEvents() {
-      return this.isView && this.needEvents && this.hasEvents;
+      return this.isView && this.needEvents && this.eventSchema;
     },
     showRelated() {
       return this.isView && this.needRelated;
@@ -128,18 +129,6 @@ export default {
         },
       ];
     },
-    events() {
-      return this.allEvents.filter((event) => {
-        return event.involvedObject?.uid === this.value?.metadata?.uid;
-      }).map((event) => {
-        return {
-          reason:    (`${ event.reason || this.t('generic.unknown') }${ event.count > 1 ? ` (${ event.count })` : '' }`).trim(),
-          message:   event.message || this.t('generic.unknown'),
-          date:      event.lastTimestamp || event.firstTimestamp || event.metadata.creationTimestamp,
-          eventType: event.eventType
-        };
-      });
-    },
     conditionsHaveIssues() {
       if (this.showConditions) {
         return this.value.status?.conditions?.filter((cond) => !isConditionReadyAndWaiting(cond)).some((cond) => cond.error);
@@ -153,16 +142,6 @@ export default {
     // Ensures we only fetch events and show the table when the events tab has been activated
     tabChange(neu) {
       this.selectedTab = neu?.selectedName;
-
-      if (!this.didLoadEvents && this.selectedTab === 'events') {
-        const inStore = this.$store.getters['currentStore'](EVENT);
-
-        // TODO: RC
-        this.$store.dispatch(`${ inStore }/findAll`, { type: EVENT }).then((events) => {
-          this.allEvents = events;
-          this.didLoadEvents = true;
-        });
-      }
     },
 
     /**
@@ -181,6 +160,54 @@ export default {
         this.showConditions = this.$store.getters[`${ this.inStore }/pathExistsInSchema`](this.value.type, 'status.conditions');
       }
     },
+
+    /**
+     * Filter out hidden repos from list of all repos
+     */
+    filterRowsLocal(rows) {
+      return rows.filter((event) => event.involvedObject?.uid === this.value?.metadata?.uid);
+    },
+
+    /**
+     * Filter out hidden repos via api
+     *
+     * pagination: PaginationArgs
+     * returns: PaginationArgs
+     */
+    filterRowsApi(pagination) {
+      if (!pagination.filters) {
+        pagination.filters = [];
+      }
+
+      const field = `involvedObject.uid`; // Pending API Support - https://github.com/rancher/rancher/issues/48603
+
+      // of type PaginationParamFilter
+      let existing = null;
+
+      for (let i = 0; i < pagination.filters.length; i++) {
+        const filter = pagination.filters[i];
+
+        if (!!filter.fields.find((f) => f.field === field)) {
+          existing = filter;
+          break;
+        }
+      }
+
+      const required = PaginationParamFilter.createSingleField({
+        field,
+        exact:  true,
+        value:  this.value.metadata.uid,
+        equals: true
+      });
+
+      if (!!existing) {
+        Object.assign(existing, required);
+      } else {
+        pagination.filters.push(required);
+      }
+
+      return pagination;
+    }
   }
 };
 </script>
@@ -209,15 +236,12 @@ export default {
       name="events"
       :weight="-2"
     >
-      <SortableTable
+      <PaginatedResourceTable
         v-if="selectedTab === 'events'"
-        :rows="events"
-        :headers="eventHeaders"
-        key-field="id"
-        :search="false"
-        :table-actions="false"
-        :row-actions="false"
-        default-sort-by="date"
+        :schema="eventSchema"
+        :local-filter="filterRowsLocal"
+        :api-filter="filterRowsApi"
+        :use-query-params-for-simple-filtering="false"
       />
     </Tab>
 
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index 84eac5f4d08..d75d942ec96 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -157,6 +157,7 @@ class StevePaginationUtils extends NamespaceProjectFilters {
       { field: '_type' },
       { field: 'reason' },
       { field: 'involvedObject.kind' },
+      // { field: 'involvedObject.uid' }, // Pending API Support - https://github.com/rancher/rancher/issues/48603
       { field: 'message' },
     ],
     [CATALOG.CLUSTER_REPO]: [

From f589ccfd9bc41d3f39c57fab619c3db063b3995a Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Wed, 8 Jan 2025 11:42:54 +0000
Subject: [PATCH 63/76] wip

---
 shell/components/Questions/Reference.vue      | 29 +++++++++++++++----
 .../components/form/ResourceLabeledSelect.vue | 14 +++++++--
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/shell/components/Questions/Reference.vue b/shell/components/Questions/Reference.vue
index b29722604e3..a55c27abe55 100644
--- a/shell/components/Questions/Reference.vue
+++ b/shell/components/Questions/Reference.vue
@@ -1,6 +1,7 @@
 <script>
 import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
+import ResourceLabeledSelect from '@shell/components/form/ResourceLabeledSelect.vue';
 import { filterBy } from '@shell/utils/array';
 import { PVC, STORAGE_CLASS } from '@shell/config/types';
 import Question from './Question';
@@ -14,8 +15,10 @@ const LEGACY_MAP = {
 export default {
   emits: ['update:value'],
 
-  components: { LabeledInput, LabeledSelect },
-  mixins:     [Question],
+  components: {
+    LabeledInput, LabeledSelect, ResourceLabeledSelect
+  },
+  mixins: [Question],
 
   props: {
     inStore: {
@@ -57,7 +60,9 @@ export default {
     return {
       typeName,
       typeSchema,
-      all: [],
+      all:                          [],
+      labelSelectSetting:           { filterResult: (allOf) },
+      labelSelectPaginationSetting: {},
     };
   },
 
@@ -90,7 +95,21 @@ export default {
     class="row"
   >
     <div class="col span-6">
-      <LabeledSelect
+      <ResourceLabeledSelect
+        :resourceType="typeName"
+        :inStore="inStore"
+        :disabled="$fetchState.pending || disabled"
+        :label="displayLabel"
+        :placeholder="question.description"
+        :required="question.required"
+        :value="value"
+        :tooltip="displayTooltip"
+        :allResourcesSettings="labelSelectSetting"
+        :paginatedResourceSettings="labelSelectPaginationSetting"
+        @update:value="!$fetchState.pending && $emit('update:value', $event)"
+      />
+      <!--
+        <LabeledSelect
         :mode="mode"
         :options="options"
         :disabled="$fetchState.pending || disabled"
@@ -100,7 +119,7 @@ export default {
         :value="value"
         :tooltip="displayTooltip"
         @update:value="!$fetchState.pending && $emit('update:value', $event)"
-      />
+      /> -->
     </div>
     <div class="col span-6 mt-10">
       {{ typeSchema.attributes.kind }}<span v-if="isNamespaced"> in namespace {{ targetNamespace }}</span>
diff --git a/shell/components/form/ResourceLabeledSelect.vue b/shell/components/form/ResourceLabeledSelect.vue
index 96308befce7..b1066a88974 100644
--- a/shell/components/form/ResourceLabeledSelect.vue
+++ b/shell/components/form/ResourceLabeledSelect.vue
@@ -35,7 +35,12 @@ export interface ResourceLabeledSelectPaginateSettings extends SharedSettings {
 /**
  * Settings to use when the LabelSelect is fetching all resources (not paginating)
  */
-export type ResourceLabeledSelectSettings = SharedSettings
+export interface ResourceLabeledSelectSettings extends SharedSettings {
+   /**
+   * Filter the resources shown in LabelSelect
+   */
+   filterResult?: (resources: any[]) => any[]
+}
 
 /**
  * Force a specific mode
@@ -66,6 +71,8 @@ export default defineComponent({
 
   components: { LabeledSelect },
 
+  emits: ['update:value'],
+
   props: {
     /**
      * Resource to show
@@ -149,7 +156,9 @@ export default defineComponent({
 
       const all = this.$store.getters[`${ this.inStore }/all`](this.resourceType);
 
-      return this.allResourcesSettings?.mapResult ? this.allResourcesSettings.mapResult(all) : all;
+      const mapped = this.allResourcesSettings?.mapResult ? this.allResourcesSettings.mapResult(all) : all;
+
+      return this.allResourcesSettings?.filterResult ? this.allResourcesSettings.filterResult(mapped) : mapped;
     }
   },
 
@@ -192,5 +201,6 @@ export default defineComponent({
     :loading="$fetchState.pending"
     :options="allOfType"
     :paginate="paginateType"
+    @update:value="$emit('update:value', $event)"
   />
 </template>

From 92430b36fbdd7c73c0b9495d5f34f799aa2cb94d Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Wed, 8 Jan 2025 13:43:20 +0000
Subject: [PATCH 64/76] Finish off questions/reference

---
 shell/components/Questions/Reference.vue      | 86 ++++++++++++-------
 shell/components/form/LabeledSelect.vue       |  2 +-
 .../components/form/ResourceLabeledSelect.vue | 21 ++---
 shell/components/form/SecretSelector.vue      |  4 +-
 4 files changed, 65 insertions(+), 48 deletions(-)

diff --git a/shell/components/Questions/Reference.vue b/shell/components/Questions/Reference.vue
index a55c27abe55..6422468e4f2 100644
--- a/shell/components/Questions/Reference.vue
+++ b/shell/components/Questions/Reference.vue
@@ -1,8 +1,8 @@
 <script>
 import { LabeledInput } from '@components/Form/LabeledInput';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
 import ResourceLabeledSelect from '@shell/components/form/ResourceLabeledSelect.vue';
-import { filterBy } from '@shell/utils/array';
+import { PaginationParamFilter } from '@shell/types/store/pagination.types';
+
 import { PVC, STORAGE_CLASS } from '@shell/config/types';
 import Question from './Question';
 
@@ -15,10 +15,8 @@ const LEGACY_MAP = {
 export default {
   emits: ['update:value'],
 
-  components: {
-    LabeledInput, LabeledSelect, ResourceLabeledSelect
-  },
-  mixins: [Question],
+  components: { LabeledInput, ResourceLabeledSelect },
+  mixins:     [Question],
 
   props: {
     inStore: {
@@ -32,12 +30,6 @@ export default {
     },
   },
 
-  async fetch() {
-    if ( this.typeSchema ) {
-      this.all = await this.$store.dispatch(`${ this.inStore }/findAll`, { type: this.typeName }); // TODO: RC
-    }
-  },
-
   data() {
     const t = this.question.type;
 
@@ -60,31 +52,61 @@ export default {
     return {
       typeName,
       typeSchema,
-      all:                          [],
-      labelSelectSetting:           { filterResult: (allOf) },
-      labelSelectPaginationSetting: {},
+      all:                 [],
+      allResourceSettings: {
+        updateResources: (all) => {
+          // Filter to only include required namespaced resources
+          const resources = this.isNamespaced ? all.filter((r) => r.metadata.namespace === this.targetNamespace) : all;
+
+          return this.mapResourcesToOptions(resources);
+        }
+      },
+      paginateResourceSetting: {
+        updateResources: (resources) => {
+          return this.mapResourcesToOptions(resources);
+        },
+        /**
+          * of type PaginateTypeOverridesFn
+          * @param [LabelSelectPaginationFunctionOptions] opts
+          * @returns LabelSelectPaginationFunctionOptions
+         */
+        requestSettings: (opts) => {
+          // Filter to only include required namespaced resources
+          const filters = this.isNamespaced ? [
+            PaginationParamFilter.createSingleField({ field: 'metadata.namespace', value: this.targetNamespace }),
+          ] : [];
+
+          return {
+            ...opts,
+            filters,
+            groupByNamespace: false,
+            classify:         true,
+          };
+        }
+      },
     };
   },
 
+  methods: {
+    mapResourcesToOptions(resources) {
+      return resources.map((r) => {
+        if (r.id) {
+          return {
+            label: r.nameDisplay || r.metadata.name,
+            value: r.metadata.name
+          };
+        } else {
+          return r;
+        }
+      });
+    },
+
+  },
+
   computed: {
     isNamespaced() {
       return !!this.typeSchema?.attributes?.namespaced;
     },
-
-    options() {
-      let out = this.all;
-
-      if ( this.isNamespaced ) {
-        out = filterBy(this.all, 'metadata.namespace', this.targetNamespace);
-      }
-
-      return out.map((x) => {
-        return {
-          label: x.nameDisplay || x.metadata.name,
-          value: x.metadata.name
-        };
-      });
-    }
   },
 };
 </script>
@@ -104,8 +126,8 @@ export default {
         :required="question.required"
         :value="value"
         :tooltip="displayTooltip"
-        :allResourcesSettings="labelSelectSetting"
-        :paginatedResourceSettings="labelSelectPaginationSetting"
+        :paginated-resource-settings="paginateResourceSetting"
+        :all-resources-settings="allResourceSettings"
         @update:value="!$fetchState.pending && $emit('update:value', $event)"
       />
       <!--
diff --git a/shell/components/form/LabeledSelect.vue b/shell/components/form/LabeledSelect.vue
index dfba89156a0..c16d1178a8f 100644
--- a/shell/components/form/LabeledSelect.vue
+++ b/shell/components/form/LabeledSelect.vue
@@ -383,7 +383,7 @@ export default {
 
       <template #list-footer>
         <div
-          v-if="canPaginate && totalResults"
+          v-if="canPaginate && totalResults && pages > 1"
           class="pagination-slot"
         >
           <div class="load-more">
diff --git a/shell/components/form/ResourceLabeledSelect.vue b/shell/components/form/ResourceLabeledSelect.vue
index b1066a88974..08ad0dc0d40 100644
--- a/shell/components/form/ResourceLabeledSelect.vue
+++ b/shell/components/form/ResourceLabeledSelect.vue
@@ -13,9 +13,9 @@ interface SharedSettings {
    */
   labelSelectOptions?: { [key: string]: any },
   /**
-   * Map the resources shown in LabelSelect
+   * Map, filter, tweak, etc the resources to show in the LabelSelect
    */
-  mapResult?: (resources: any[]) => any[]
+  updateResources?: (resources: any[]) => any[]
 }
 
 /**
@@ -23,7 +23,7 @@ interface SharedSettings {
  */
 export interface ResourceLabeledSelectPaginateSettings extends SharedSettings {
   /**
-   * Override the convience function which fetches a page of results
+   * Override the convenience function which fetches a page of results
    */
   overrideRequest?: LabelSelectPaginateFn,
   /**
@@ -35,12 +35,7 @@ export interface ResourceLabeledSelectPaginateSettings extends SharedSettings {
 /**
  * Settings to use when the LabelSelect is fetching all resources (not paginating)
  */
-export interface ResourceLabeledSelectSettings extends SharedSettings {
-   /**
-   * Filter the resources shown in LabelSelect
-   */
-   filterResult?: (resources: any[]) => any[]
-}
+export type ResourceLabeledSelectSettings = SharedSettings
 
 /**
  * Force a specific mode
@@ -156,9 +151,9 @@ export default defineComponent({
 
       const all = this.$store.getters[`${ this.inStore }/all`](this.resourceType);
 
-      const mapped = this.allResourcesSettings?.mapResult ? this.allResourcesSettings.mapResult(all) : all;
+      debugger;
 
-      return this.allResourcesSettings?.filterResult ? this.allResourcesSettings.filterResult(mapped) : mapped;
+      return this.allResourcesSettings?.updateResources ? this.allResourcesSettings.updateResources(all) : all;
     }
   },
 
@@ -186,9 +181,9 @@ export default defineComponent({
       const options = this.paginatedResourceSettings?.requestSettings ? this.paginatedResourceSettings.requestSettings(defaultOptions) : defaultOptions;
       const res = await labelSelectPaginationFunction(options);
 
-      return this.paginatedResourceSettings?.mapResult ? {
+      return this.paginatedResourceSettings?.updateResources ? {
         ...res,
-        page: this.paginatedResourceSettings.mapResult(res.page)
+        page: this.paginatedResourceSettings.updateResources(res.page)
       } : res;
     },
   },
diff --git a/shell/components/form/SecretSelector.vue b/shell/components/form/SecretSelector.vue
index 4b491db8720..7f164582f7d 100644
--- a/shell/components/form/SecretSelector.vue
+++ b/shell/components/form/SecretSelector.vue
@@ -70,7 +70,7 @@ export default {
       secrets:            null,
       SECRET,
       allSecretsSettings: {
-        mapResult: (secrets) => {
+        updateResources: (secrets) => {
           const allSecretsInNamespace = secrets.filter((secret) => this.types.includes(secret._type) && secret.namespace === this.namespace);
           const mappedSecrets = this.mapSecrets(allSecretsInNamespace.sort((a, b) => a.name.localeCompare(b.name)));
 
@@ -81,7 +81,7 @@ export default {
       },
       paginateSecretsSetting: {
         requestSettings: this.paginatePageOptions,
-        mapResult:       (secrets) => {
+        updateResources: (secrets) => {
           const mappedSecrets = this.mapSecrets(secrets);
 
           this.secrets = secrets; // We need the key from the selected secret. When paginating we won't touch the store, so just pass back here

From 31b3bd73f9adc5570d67750c55482b83303b0563 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Wed, 8 Jan 2025 14:48:20 +0000
Subject: [PATCH 65/76] Namespace detail - workloads list

---
 shell/detail/catalog.cattle.io.app.vue |  4 ++--
 shell/detail/namespace.vue             | 32 +++++++++++---------------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/shell/detail/catalog.cattle.io.app.vue b/shell/detail/catalog.cattle.io.app.vue
index 69239cea357..cfc4fd328b0 100644
--- a/shell/detail/catalog.cattle.io.app.vue
+++ b/shell/detail/catalog.cattle.io.app.vue
@@ -33,8 +33,8 @@ export default {
   async fetch() {
     const promises = {
       catalog:       this.$store.dispatch('catalog/load'),
-      allOperations: this.$store.dispatch('cluster/findAll', { type: CATALOG.OPERATION }), // TODO: RC
-      secrets:       this.value.fetchValues(true), // TODO: RC
+      allOperations: this.$store.dispatch('cluster/findAll', { type: CATALOG.OPERATION }), // TODO: RC Round 2
+      secret:        this.value.fetchValues(true),
     };
 
     const res = await allHash(promises);
diff --git a/shell/detail/namespace.vue b/shell/detail/namespace.vue
index a8506fff7f3..c9f785d429a 100644
--- a/shell/detail/namespace.vue
+++ b/shell/detail/namespace.vue
@@ -10,9 +10,7 @@ import Tab from '@shell/components/Tabbed/Tab';
 import ResourceTable from '@shell/components/ResourceTable';
 import SortableTable from '@shell/components/SortableTable';
 import Loading from '@shell/components/Loading';
-import {
-  flatten, compact, filter, findKey, values
-} from 'lodash';
+import { flatten, compact, findKey, values } from 'lodash';
 
 export default {
   emits: ['input'],
@@ -89,6 +87,9 @@ export default {
       },
     ];
 
+    const params = this.$route.params;
+    const { id: namespaceId } = params;
+
     return {
       allWorkloads: {
         default: () => ([]),
@@ -97,7 +98,10 @@ export default {
       resourceTypes:  [],
       summaryStates:  ['success', 'info', 'warning', 'error', 'unknown'],
       headers,
-      workloadSchema: WORKLOAD_SCHEMA
+      workloadSchema: WORKLOAD_SCHEMA,
+      inStore:        this.$store.getters['currentProduct'].inStore,
+      statesByType:   getStatesByType(),
+      namespaceId,
     };
   },
 
@@ -106,10 +110,6 @@ export default {
   },
 
   computed: {
-    inStore() {
-      return this.$store.getters['currentProduct'].inStore;
-    },
-
     namespacedResourceCounts() {
       const allClusterResourceCounts = this.$store.getters[`${ this.inStore }/all`](COUNT)[0].counts;
 
@@ -148,20 +148,11 @@ export default {
       }, totals);
     },
 
-    statesByType() {
-      return getStatesByType();
-    },
-
     /**
      * Workload table data for current namespace
      */
     workloadRows() {
-      const params = this.$route.params;
-      const { id } = params;
-      const rows = flatten(compact(this.allWorkloads)).filter((row) => !row.ownedByWorkload);
-      const namespacedRows = filter(rows, ({ metadata: { namespace } }) => namespace === id);
-
-      return namespacedRows;
+      return flatten(compact(this.allWorkloads)).filter((row) => !row.ownedByWorkload);
     }
   },
 
@@ -198,7 +189,10 @@ export default {
       return Promise.all(values(WORKLOAD_TYPES)
         // You may not have RBAC to see some of the types
         .filter((type) => Boolean(this.schemaFor(type)))
-        .map((type) => this.$store.dispatch('cluster/findAll', { type })) // TODO: RC
+        // findAll on each workload type here, argh! however...
+        // - results are shown in a single table containing all workloads rather than an SSP compatible way (one table per type)
+        // - we're restricting by namespace. not great, but a big improvement
+        .map((type) => this.$store.dispatch('cluster/findAll', { type, opt: { namespaced: this.namespaceId } }))
       );
     },
 

From 17778da0ed7e622578e20b7fc6f373156328fdd9 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Wed, 8 Jan 2025 17:42:46 +0000
Subject: [PATCH 66/76] Update ingress detail and edit pages - use common
 helper - both require services and secrets (of type cert) in a specific
 namespace - for ease, just use the existing mechanism

---
 shell/detail/networking.k8s.io.ingress.vue    | 66 +++-------------
 .../edit/networking.k8s.io.ingress/index.vue  | 79 ++++---------------
 shell/utils/ingress.ts                        | 47 +++++++++++
 3 files changed, 77 insertions(+), 115 deletions(-)
 create mode 100644 shell/utils/ingress.ts

diff --git a/shell/detail/networking.k8s.io.ingress.vue b/shell/detail/networking.k8s.io.ingress.vue
index f04601a1a91..fcd2574859f 100644
--- a/shell/detail/networking.k8s.io.ingress.vue
+++ b/shell/detail/networking.k8s.io.ingress.vue
@@ -1,12 +1,10 @@
 <script>
 import { allHash } from '@shell/utils/promise';
-import { SECRET, SERVICE } from '@shell/config/types';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import Rules from '@shell/edit/networking.k8s.io.ingress/Rules';
 import ResourceTabs from '@shell/components/form/ResourceTabs';
 import Tab from '@shell/components/Tabbed/Tab';
-import { SECRET_TYPES as TYPES } from '@shell/config/secret';
-import { FilterArgs, PaginationParamFilter } from '@shell/types/store/pagination.types';
+import IngressHelper from '@shell/utils/ingress';
 
 export default {
   name:       'CRUIngress',
@@ -18,76 +16,38 @@ export default {
   },
   mixins: [CreateEditView],
   async fetch() {
+    this.ingressHelper = new IngressHelper({
+      $store:    this.$store,
+      namespace: this.value.metadata.namespace
+    });
     const promises = {
-      services:       this.$store.dispatch('cluster/findAll', { type: SERVICE }), // TODO: RC SERVICE
+      services:       this.ingressHelper.fetchServices(),
+      secrets:        this.ingressHelper.fetchSecrets(),
       resourceFields: this.schema.fetchResourceFields(),
     };
 
-    if (this.$store.getters[`cluster/paginationEnabled`](SECRET)) {
-      const findPageArgs = { // Of type ActionFindPageArgs
-        namespaced: this.value.metadata.namespace,
-        pagination: new FilterArgs({
-          filters: PaginationParamFilter.createSingleField({
-            field: 'metadata.fields.1',
-            value: TYPES.TLS
-          })
-        }),
-      };
-
-      promises.filteredSecrets = this.$store.dispatch(`cluster/findPage`, { type: SECRET, opt: findPageArgs });
-    } else {
-      promises.secrets = this.$store.dispatch('cluster/findAll', { type: SECRET }); // TODO: RC SECRET
-    }
     const hash = await allHash(promises);
 
-    this.allServices = hash.services;
-    this.allSecrets = hash.secrets;
-    this.filteredSecrets = hash.filteredSecrets;
+    this.services = hash.services;
+    this.secrets = hash.secrets;
   },
   data() {
     return {
-      allSecrets:      null,
-      filteredSecrets: null,
-      allServices:     [],
+      secrets:  [],
+      services: [],
     };
   },
   computed: {
     serviceTargets() {
-      return this.filterByCurrentResourceNamespace(this.allServices)
-        .map((service) => ({
-          label: service.metadata.name,
-          value: service.metadata.name,
-          ports: service.spec.ports?.map((p) => p.port)
-        }));
+      return this.ingressHelper.findAndMapServiceTargets(this.services);
     },
     firstTabLabel() {
       return this.isView ? this.t('ingress.rulesAndCertificates.title') : this.t('ingress.rules.title');
     },
     certificates() {
-      let filteredSecrets;
-
-      if (this.filteredSecrets) {
-        filteredSecrets = this.filteredSecrets;
-      } else if (this.allSecrets ) {
-        filteredSecrets = this.filterByCurrentResourceNamespace(this.allSecrets.filter((secret) => secret._type === TYPES.TLS));
-      } else {
-        return [];
-      }
-
-      return filteredSecrets.map((secret) => {
-        const { id } = secret;
-
-        return id.slice(id.indexOf('/') + 1);
-      });
+      return this.ingressHelper.findAndMapCerts(this.secrets);
     },
   },
-  methods: {
-    filterByCurrentResourceNamespace(resources) {
-      return resources.filter((resource) => {
-        return resource.metadata.namespace === this.value.metadata.namespace;
-      });
-    }
-  }
 };
 </script>
 <template>
diff --git a/shell/edit/networking.k8s.io.ingress/index.vue b/shell/edit/networking.k8s.io.ingress/index.vue
index df4ad9466ec..a27b0792036 100644
--- a/shell/edit/networking.k8s.io.ingress/index.vue
+++ b/shell/edit/networking.k8s.io.ingress/index.vue
@@ -17,6 +17,7 @@ import Rules from './Rules';
 import IngressClass from './IngressClass';
 import Loading from '@shell/components/Loading';
 import { FilterArgs, PaginationParamFilter } from '@shell/types/store/pagination.types';
+import IngressHelper from '@shell/utils/ingress';
 
 export default {
   name:         'CRUIngress',
@@ -50,36 +51,32 @@ export default {
   },
 
   async fetch() {
+    this.ingressHelper = new IngressHelper({
+      $store:    this.$store,
+      namespace: this.value.metadata.namespace
+    });
+
     this.ingressClassSchema = this.$store.getters[`cluster/schemaFor`](INGRESS_CLASS);
 
     const promises = {
-      services:              this.$store.dispatch('cluster/findAll', { type: SERVICE }), // TODO: RC findAll SERVICE
+      secrets:               this.ingressHelper.fetchSecrets(),
+      services:              this.ingressHelper.fetchServices(),
       ingressClasses:        this.ingressClassSchema ? this.$store.dispatch('cluster/findAll', { type: INGRESS_CLASS }) : Promise.resolve([]),
       ingressResourceFields: this.schema.fetchResourceFields(),
     };
 
-    this.filterByApi = this.$store.getters[`cluster/paginationEnabled`](SECRET);
-
-    if (this.filterByApi) {
-      promises.filteredSecrets = this.filterSecretsByApi();
-    } else {
-      promises.secrets = this.$store.dispatch('cluster/findAll', { type: SECRET });
-    }
-
     const hash = await allHash(promises);
 
-    this.allServices = hash.services;
-    this.allSecrets = hash.secrets;
-    this.filteredSecrets = hash.filteredSecrets;
+    this.secrets = hash.secrets;
+    this.services = hash.services;
     this.allIngressClasses = hash.ingressClasses;
   },
   data() {
     return {
       filterByApi:        null,
       ingressClassSchema: null,
-      allSecrets:         null,
-      filteredSecrets:    null,
-      allServices:        [],
+      secrets:            [],
+      services:           [],
       allIngressClasses:  [],
       fvFormRuleSets:     [
         {
@@ -111,10 +108,9 @@ export default {
   },
 
   watch: {
-    async 'value.metadata.namespace'() {
-      if (this.filterByApi) {
-        this.filteredSecrets = await this.filterSecretsByApi();
-      }
+    async 'value.metadata.namespace'(neu) {
+      this.services = await this.ingressHelper.fetchServices({ namespace: neu });
+      this.secrets = await this.ingressHelper.fetchSecrets({ namespace: neu });
     }
   },
 
@@ -162,32 +158,13 @@ export default {
       return { name: [], port: [] };
     },
     serviceTargets() {
-      return this.filterByCurrentResourceNamespace(this.allServices)
-        .map((service) => ({
-          label: service.metadata.name,
-          value: service.metadata.name,
-          ports: service.spec.ports?.map((p) => p.port)
-        }));
+      return this.ingressHelper.findAndMapServiceTargets(this.services);
     },
     firstTabLabel() {
       return this.isView ? this.t('ingress.rulesAndCertificates.title') : this.t('ingress.rules.title');
     },
     certificates() {
-      let filteredSecrets;
-
-      if (this.filteredSecrets) {
-        filteredSecrets = this.filteredSecrets;
-      } else if (this.allSecrets ) {
-        filteredSecrets = this.filterByCurrentResourceNamespace(this.allSecrets.filter((secret) => secret._type === TYPES.TLS));
-      } else {
-        return [];
-      }
-
-      return filteredSecrets.map((secret) => {
-        const { id } = secret;
-
-        return id.slice(id.indexOf('/') + 1);
-      });
+      return this.ingressHelper.findAndMapCerts(this.secrets);
     },
     ingressClasses() {
       return this.allIngressClasses.map((ingressClass) => ({
@@ -210,28 +187,6 @@ export default {
   },
 
   methods: {
-    filterSecretsByApi() {
-      const findPageArgs = { // Of type ActionFindPageArgs
-        namespaced: this.value.metadata.namespace,
-        pagination: new FilterArgs({
-          filters: PaginationParamFilter.createSingleField({
-            field: 'metadata.fields.1',
-            value: TYPES.TLS
-          })
-        }),
-      };
-
-      return this.$store.dispatch(`cluster/findPage`, { type: SECRET, opt: findPageArgs });
-    },
-
-    filterByCurrentResourceNamespace(resources) {
-      // When configuring an Ingress, the options for Secrets and
-      // default backend Services are limited to the namespace of the Ingress.
-      return resources.filter((resource) => {
-        return resource.metadata.namespace === this.value.metadata.namespace;
-      });
-    },
-
     willSave() {
       const backend = get(this.value.spec, this.value.defaultBackendPath);
       const serviceName = get(backend, this.value.serviceNamePath);
diff --git a/shell/utils/ingress.ts b/shell/utils/ingress.ts
new file mode 100644
index 00000000000..a3a4f5d2178
--- /dev/null
+++ b/shell/utils/ingress.ts
@@ -0,0 +1,47 @@
+import { SECRET, SERVICE } from '@shell/config/types';
+import { SECRET_TYPES as TYPES } from '@shell/config/secret';
+import { VuexStore } from '@shell/types/store/vuex';
+
+class IngressHelper {
+  private $store: VuexStore;
+  private namespace: string;
+
+  constructor({
+    $store,
+    namespace,
+  }: {
+    $store: VuexStore
+    namespace: string,
+  }) {
+    this.$store = $store;
+    this.namespace = namespace;
+  }
+
+  async fetchServices(args?: { namespace: string}): Promise<any[]> {
+    return this.$store.dispatch('cluster/findAll', { type: SERVICE, opt: { namespaced: args?.namespace || this.namespace } });
+  }
+
+  async fetchSecrets(args?: { namespace: string}): Promise<any[]> {
+    return this.$store.dispatch('cluster/findAll', { type: SECRET, opt: { namespaced: args?.namespace || this.namespace } });
+  }
+
+  findAndMapCerts(secrets: any[]) {
+    return secrets
+      .filter((secret) => secret._type === TYPES.TLS)
+      .map((secret) => {
+        const { id } = secret;
+
+        return id.slice(id.indexOf('/') + 1);
+      });
+  }
+
+  findAndMapServiceTargets(services: any[]) {
+    return services.map((service) => ({
+      label: service.metadata.name,
+      value: service.metadata.name,
+      ports: service.spec.ports?.map((p: any) => p.port)
+    }));
+  }
+}
+
+export default IngressHelper;

From fb203f945f9da60ed87048a99ac6ba898768c400 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 9 Jan 2025 11:26:18 +0000
Subject: [PATCH 67/76] tidying up ready for review

---
 shell/components/form/ResourceLabeledSelect.vue      |  2 --
 shell/components/form/ResourceSelector.vue           |  3 +--
 shell/components/form/ResourceTabs/index.vue         |  1 -
 shell/detail/workload/index.vue                      | 11 ++++++-----
 shell/edit/logging-flow/index.vue                    |  6 +++---
 shell/edit/networking.k8s.io.ingress/Rules.vue       |  2 +-
 shell/edit/networking.k8s.io.networkpolicy/index.vue |  6 +++---
 shell/edit/service.vue                               |  4 ++--
 shell/list/node.vue                                  |  2 +-
 shell/models/cluster/node.js                         |  2 +-
 shell/models/service.js                              |  2 +-
 shell/models/workload.js                             |  6 +++---
 shell/plugins/steve/mutations.js                     |  5 ++---
 13 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/shell/components/form/ResourceLabeledSelect.vue b/shell/components/form/ResourceLabeledSelect.vue
index 08ad0dc0d40..034a26300b5 100644
--- a/shell/components/form/ResourceLabeledSelect.vue
+++ b/shell/components/form/ResourceLabeledSelect.vue
@@ -151,8 +151,6 @@ export default defineComponent({
 
       const all = this.$store.getters[`${ this.inStore }/all`](this.resourceType);
 
-      debugger;
-
       return this.allResourcesSettings?.updateResources ? this.allResourcesSettings.updateResources(all) : all;
     }
   },
diff --git a/shell/components/form/ResourceSelector.vue b/shell/components/form/ResourceSelector.vue
index 4c616ab3340..2a50136ec25 100644
--- a/shell/components/form/ResourceSelector.vue
+++ b/shell/components/form/ResourceSelector.vue
@@ -36,8 +36,7 @@ export default {
   },
 
   async fetch() {
-    // TODO: RC find all 10417, update comment
-    // https://github.com/rancher/dashboard/issues/10417 require in order to scale application of labelSelects
+    // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
     const hash = await allHash({ allResources: this.$store.dispatch('cluster/findAll', { type: this.type }) });
 
     this.allResources = hash.allResources;
diff --git a/shell/components/form/ResourceTabs/index.vue b/shell/components/form/ResourceTabs/index.vue
index fe85ded6a12..183080c1e78 100644
--- a/shell/components/form/ResourceTabs/index.vue
+++ b/shell/components/form/ResourceTabs/index.vue
@@ -75,7 +75,6 @@ export default {
       eventSchema:    this.$store.getters[`${ inStore }/schemaFor`](EVENT), // @TODO be smarter about which resources actually ever have events
       EVENT,
       selectedTab:    this.defaultTab,
-      // didLoadEvents:  false,
       inStore,
       showConditions: false,
     };
diff --git a/shell/detail/workload/index.vue b/shell/detail/workload/index.vue
index 6af70268703..071ed15fb6a 100644
--- a/shell/detail/workload/index.vue
+++ b/shell/detail/workload/index.vue
@@ -47,17 +47,18 @@ export default {
     } catch {}
 
     const hash = {
-      // See https://github.com/rancher/dashboard/issues/10417, all pods bad, come from a locally applied selector in the workload model
+      // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
       allPods:      this.$store.dispatch('cluster/findAll', { type: POD }),
-      allServices:  this.$store.dispatch('cluster/findAll', { type: SERVICE }), // TODO: RC SERVICE
-      allIngresses: this.$store.dispatch('cluster/findAll', { type: INGRESS }), // TODO: RC INGRESS
+      // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
+      allServices:  this.$store.dispatch('cluster/findAll', { type: SERVICE }),
+      allIngresses: this.$store.dispatch('cluster/findAll', { type: INGRESS }),
       // Nodes should be fetched because they may be referenced in the target
       // column of a service list item.
-      allNodes:     hasNodes ? this.$store.dispatch('cluster/findAll', { type: NODE }) : [] // TODO: RC NODE
+      allNodes:     hasNodes ? this.$store.dispatch('cluster/findAll', { type: NODE }) : []
     };
 
     if (this.value.type === WORKLOAD_TYPES.CRON_JOB) {
-      hash.allJobs = this.$store.dispatch('cluster/findAll', { type: WORKLOAD_TYPES.JOB }); // TODO: RC JOB
+      hash.allJobs = this.$store.dispatch('cluster/findAll', { type: WORKLOAD_TYPES.JOB });
     }
     const res = await allHash(hash);
 
diff --git a/shell/edit/logging-flow/index.vue b/shell/edit/logging-flow/index.vue
index 4cedbdf8c1c..76c19fcb28a 100644
--- a/shell/edit/logging-flow/index.vue
+++ b/shell/edit/logging-flow/index.vue
@@ -77,9 +77,9 @@ export default {
     const hash = await allHash({
       allOutputs:        getAllOrDefault(LOGGING.OUTPUT, isFlow && hasAccessToOutputs),
       allClusterOutputs: getAllOrDefault(LOGGING.CLUSTER_OUTPUT, hasAccessToClusterOutputs),
-      allNamespaces:     getAllOrDefault(NAMESPACE, hasAccessToNamespaces), // TODO: RC findAll NAMESPACE
-      allNodes:          getAllOrDefault(NODE, hasAccessToNodes), // TODO: RC findAll NODE
-      allPods:           getAllOrDefault(POD, hasAccessToPods), // TODO: RC findAll POD
+      allNamespaces:     getAllOrDefault(NAMESPACE, hasAccessToNamespaces),
+      allNodes:          getAllOrDefault(NODE, hasAccessToNodes),
+      allPods:           getAllOrDefault(POD, hasAccessToPods),
     });
 
     for ( const k of Object.keys(hash) ) {
diff --git a/shell/edit/networking.k8s.io.ingress/Rules.vue b/shell/edit/networking.k8s.io.ingress/Rules.vue
index f96ffdc8ca6..072c912036b 100644
--- a/shell/edit/networking.k8s.io.ingress/Rules.vue
+++ b/shell/edit/networking.k8s.io.ingress/Rules.vue
@@ -47,7 +47,7 @@ export default {
   async fetch() {
     if (!this.$store.getters[`cluster/paginationEnabled`]()) {
       // This is only used by shell/models/networking.k8s.io.ingress.js `targetTo`, where we do some dodgy matching of workloads with name 'ingress-'
-      await Promise.all(Object.values(WORKLOAD_TYPES).map((type) => this.$store.dispatch('cluster/findAll', { type }))); // TODO: RC findAll workloads
+      await Promise.all(Object.values(WORKLOAD_TYPES).map((type) => this.$store.dispatch('cluster/findAll', { type })));
     }
   },
 
diff --git a/shell/edit/networking.k8s.io.networkpolicy/index.vue b/shell/edit/networking.k8s.io.networkpolicy/index.vue
index 07a6ce1cecd..946a096ed3b 100644
--- a/shell/edit/networking.k8s.io.networkpolicy/index.vue
+++ b/shell/edit/networking.k8s.io.networkpolicy/index.vue
@@ -43,8 +43,8 @@ export default {
 
   async fetch() {
     const hash = await allHash({
-      allPods:       this.$store.dispatch('cluster/findAll', { type: POD }), // TODO: RC findAll POD
-      allNamespaces: this.$store.dispatch('cluster/findAll', { type: NAMESPACE }), // TODO: RC findAll NAMESPACE
+      allPods:       this.$store.dispatch('cluster/findAll', { type: POD }),
+      allNamespaces: this.$store.dispatch('cluster/findAll', { type: NAMESPACE }),
     });
 
     this.allPods = hash.allPods;
@@ -147,7 +147,7 @@ export default {
 
   methods: {
     updateMatchingPods: throttle(function() {
-      // See https://github.com/rancher/dashboard/issues/10417, all pods bad, need to replace local selector somehow
+      // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
       const allInNamespace = this.allPods.filter((pod) => pod.metadata.namespace === this.value.metadata.namespace);
       const match = matching(allInNamespace, this.podSelectorExpressions);
       const matched = match.length || 0;
diff --git a/shell/edit/service.vue b/shell/edit/service.vue
index 88a9ae21ab4..dcad57b2a93 100644
--- a/shell/edit/service.vue
+++ b/shell/edit/service.vue
@@ -259,7 +259,7 @@ export default {
   methods: {
     updateMatchingPods: throttle(function() {
       const { value: { spec: { selector = { } } } } = this;
-      // See https://github.com/rancher/dashboard/issues/10417, all pods bad, need to replace local selector somehow
+      // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
       const allInNamespace = this.allPods.filter((pod) => pod.metadata.namespace === this.value?.metadata?.namespace);
 
       if (isEmpty(selector)) {
@@ -287,7 +287,7 @@ export default {
 
         const hash = {
           provClusters:     this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER }),
-          pods:             this.$store.dispatch(`${ inStore }/findAll`, { type: POD }), // TODO: RC findAll POD
+          pods:             this.$store.dispatch(`${ inStore }/findAll`, { type: POD }),
           harvesterConfigs: this.$store.dispatch(`management/findAll`, { type: HCI.HARVESTER_CONFIG }),
         };
 
diff --git a/shell/list/node.vue b/shell/list/node.vue
index 0cb6b3868e2..cc4c6303b0b 100644
--- a/shell/list/node.vue
+++ b/shell/list/node.vue
@@ -202,7 +202,7 @@ export default defineComponent({
 
       if (this.canViewPods) {
         // No need to block on this
-        this.$store.dispatch(`cluster/findAll`, { type: POD }); // TODO: RC findAll POD. if this doesn't run in pag world make clear
+        this.$store.dispatch(`cluster/findAll`, { type: POD });
       }
 
       return hash;
diff --git a/shell/models/cluster/node.js b/shell/models/cluster/node.js
index 7b3f6b5270b..da4f364f6f5 100644
--- a/shell/models/cluster/node.js
+++ b/shell/models/cluster/node.js
@@ -408,7 +408,7 @@ export default class ClusterNode extends SteveModel {
   }
 
   get pods() {
-    const allPods = this.$rootGetters['cluster/all'](POD); // TODO: RC check
+    const allPods = this.$rootGetters['cluster/all'](POD);
 
     return allPods.filter((pod) => pod.spec.nodeName === this.name);
   }
diff --git a/shell/models/service.js b/shell/models/service.js
index 102c46348ec..cb15d80bc59 100644
--- a/shell/models/service.js
+++ b/shell/models/service.js
@@ -138,7 +138,7 @@ export default class extends SteveModel {
 
   async fetchPods() {
     if (this.podRelationship) {
-      // https://github.com/rancher/dashboard/issues/10417
+      // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
       await this.$dispatch('cluster/findMatching', {
         type:      POD,
         selector:  this.podRelationship.selector,
diff --git a/shell/models/workload.js b/shell/models/workload.js
index 10835510f8b..ce89339c479 100644
--- a/shell/models/workload.js
+++ b/shell/models/workload.js
@@ -554,7 +554,7 @@ export default class Workload extends WorkloadService {
     if (podRelationship) {
       const pods = this.$getters['podsByNamespace'](this.metadata.namespace);
 
-      // https://github.com/rancher/dashboard/issues/10417
+      // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
       return pods.filter((obj) => {
         return matches(obj, podRelationship.selector);
       });
@@ -644,12 +644,12 @@ export default class Workload extends WorkloadService {
   }
 
   async matchingPods() {
-    const all = await this.$dispatch('findAll', { type: POD }); // https://github.com/rancher/dashboard/issues/10417
+    // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
+    const all = await this.$dispatch('findAll', { type: POD });
     const allInNamespace = all.filter((pod) => pod.metadata.namespace === this.metadata.namespace);
 
     const selector = convertSelectorObj(this.spec.selector);
 
-    // See https://github.com/rancher/dashboard/issues/10417, all pods bad, need to replace local selector somehow
     return matching(allInNamespace, selector);
   }
 
diff --git a/shell/plugins/steve/mutations.js b/shell/plugins/steve/mutations.js
index b2f3e020f77..7e9b73e54c7 100644
--- a/shell/plugins/steve/mutations.js
+++ b/shell/plugins/steve/mutations.js
@@ -34,7 +34,6 @@ function registerNamespace(state, namespace) {
  * update the podsByNamespace cache with new or changed pods
  */
 function updatePodsByNamespaceCache(state, ctx, pods, loadAll) {
-  // TODO: RC check where this is called
   if (loadAll) {
     // Clear the entire cache - this is a fresh load
     Object.keys(state.podsByNamespace).forEach((ns) => {
@@ -184,7 +183,7 @@ export default {
     for (const entry of data) {
       const resource = load(state, { data: entry, ctx });
 
-      if (resource.type === POD && resource.metadata) { // TODO: RC check if pag calls this
+      if (resource.type === POD && resource.metadata) {
         const cache = registerNamespace(state, resource.namespace);
 
         addObject(cache.list, resource);
@@ -198,7 +197,7 @@ export default {
       type, data: allLatest, ctx
     });
 
-    if (allLatest.length && allLatest[0].type === POD) { // TODO: RC check if pag calls this
+    if (allLatest.length && allLatest[0].type === POD) {
       updatePodsByNamespaceCache(state, ctx, allLatest, false);
     }
   },

From 86ae345eed6b3ec1f66930fa54a76a769b458f85 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 9 Jan 2025 13:55:55 +0000
Subject: [PATCH 68/76] Tidying up ready to review

---
 shell/components/Questions/Reference.vue      | 12 -----------
 shell/detail/catalog.cattle.io.app.vue        |  2 +-
 shell/detail/networking.k8s.io.ingress.vue    |  4 ++--
 shell/dialog/RollbackWorkloadDialog.vue       |  2 +-
 .../index.vue                                 |  2 +-
 .../edit/networking.k8s.io.ingress/index.vue  |  8 +++----
 shell/edit/resources.cattle.io.backup.vue     |  2 +-
 shell/edit/ui.cattle.io.navlink.vue           |  2 +-
 shell/utils/ingress.ts                        | 21 +++++++++++++++++--
 9 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/shell/components/Questions/Reference.vue b/shell/components/Questions/Reference.vue
index 6422468e4f2..1e78fa1aa75 100644
--- a/shell/components/Questions/Reference.vue
+++ b/shell/components/Questions/Reference.vue
@@ -130,18 +130,6 @@ export default {
         :all-resources-settings="allResourceSettings"
         @update:value="!$fetchState.pending && $emit('update:value', $event)"
       />
-      <!--
-        <LabeledSelect
-        :mode="mode"
-        :options="options"
-        :disabled="$fetchState.pending || disabled"
-        :label="displayLabel"
-        :placeholder="question.description"
-        :required="question.required"
-        :value="value"
-        :tooltip="displayTooltip"
-        @update:value="!$fetchState.pending && $emit('update:value', $event)"
-      /> -->
     </div>
     <div class="col span-6 mt-10">
       {{ typeSchema.attributes.kind }}<span v-if="isNamespaced"> in namespace {{ targetNamespace }}</span>
diff --git a/shell/detail/catalog.cattle.io.app.vue b/shell/detail/catalog.cattle.io.app.vue
index cfc4fd328b0..c6702f3f50e 100644
--- a/shell/detail/catalog.cattle.io.app.vue
+++ b/shell/detail/catalog.cattle.io.app.vue
@@ -33,7 +33,7 @@ export default {
   async fetch() {
     const promises = {
       catalog:       this.$store.dispatch('catalog/load'),
-      allOperations: this.$store.dispatch('cluster/findAll', { type: CATALOG.OPERATION }), // TODO: RC Round 2
+      allOperations: this.$store.dispatch('cluster/findAll', { type: CATALOG.OPERATION }),
       secret:        this.value.fetchValues(true),
     };
 
diff --git a/shell/detail/networking.k8s.io.ingress.vue b/shell/detail/networking.k8s.io.ingress.vue
index fcd2574859f..3d514b006b0 100644
--- a/shell/detail/networking.k8s.io.ingress.vue
+++ b/shell/detail/networking.k8s.io.ingress.vue
@@ -4,7 +4,7 @@ import CreateEditView from '@shell/mixins/create-edit-view';
 import Rules from '@shell/edit/networking.k8s.io.ingress/Rules';
 import ResourceTabs from '@shell/components/form/ResourceTabs';
 import Tab from '@shell/components/Tabbed/Tab';
-import IngressHelper from '@shell/utils/ingress';
+import IngressDetailEditHelper from '@shell/utils/ingress';
 
 export default {
   name:       'CRUIngress',
@@ -16,7 +16,7 @@ export default {
   },
   mixins: [CreateEditView],
   async fetch() {
-    this.ingressHelper = new IngressHelper({
+    this.ingressHelper = new IngressDetailEditHelper({
       $store:    this.$store,
       namespace: this.value.metadata.namespace
     });
diff --git a/shell/dialog/RollbackWorkloadDialog.vue b/shell/dialog/RollbackWorkloadDialog.vue
index 38da88ab2e8..3fce5860b88 100644
--- a/shell/dialog/RollbackWorkloadDialog.vue
+++ b/shell/dialog/RollbackWorkloadDialog.vue
@@ -84,7 +84,7 @@ export default {
   },
   fetch() {
     // Fetch revisions of the current workload
-    this.$store.dispatch('cluster/findAll', { type: this.revisionsType }) // TODO: RC workload
+    this.$store.dispatch('cluster/findAll', { type: this.revisionsType })
       .then(( response ) => {
         const allRevisions = response;
 
diff --git a/shell/edit/autoscaling.horizontalpodautoscaler/index.vue b/shell/edit/autoscaling.horizontalpodautoscaler/index.vue
index aeabcd935ce..a27992d2533 100644
--- a/shell/edit/autoscaling.horizontalpodautoscaler/index.vue
+++ b/shell/edit/autoscaling.horizontalpodautoscaler/index.vue
@@ -173,7 +173,7 @@ export default {
     },
     async loadWorkloads() {
       await Promise.all(
-        Object.values(SCALABLE_WORKLOAD_TYPES).map((type) => this.$store.dispatch('cluster/findAll', { type }) // TODO: RC workload
+        Object.values(SCALABLE_WORKLOAD_TYPES).map((type) => this.$store.dispatch('cluster/findAll', { type })
         )
       );
     },
diff --git a/shell/edit/networking.k8s.io.ingress/index.vue b/shell/edit/networking.k8s.io.ingress/index.vue
index a27b0792036..5ed99c29ecf 100644
--- a/shell/edit/networking.k8s.io.ingress/index.vue
+++ b/shell/edit/networking.k8s.io.ingress/index.vue
@@ -1,6 +1,6 @@
 <script>
 import { allHash } from '@shell/utils/promise';
-import { SECRET, SERVICE, INGRESS_CLASS } from '@shell/config/types';
+import { INGRESS_CLASS } from '@shell/config/types';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import FormValidation from '@shell/mixins/form-validation';
@@ -10,14 +10,12 @@ import Labels from '@shell/components/form/Labels';
 import Error from '@shell/components/form/Error';
 import Tabbed from '@shell/components/Tabbed';
 import { get, set } from '@shell/utils/object';
-import { SECRET_TYPES as TYPES } from '@shell/config/secret';
 import DefaultBackend from './DefaultBackend';
 import Certificates from './Certificates';
 import Rules from './Rules';
 import IngressClass from './IngressClass';
 import Loading from '@shell/components/Loading';
-import { FilterArgs, PaginationParamFilter } from '@shell/types/store/pagination.types';
-import IngressHelper from '@shell/utils/ingress';
+import IngressDetailEditHelper from '@shell/utils/ingress';
 
 export default {
   name:         'CRUIngress',
@@ -51,7 +49,7 @@ export default {
   },
 
   async fetch() {
-    this.ingressHelper = new IngressHelper({
+    this.ingressHelper = new IngressDetailEditHelper({
       $store:    this.$store,
       namespace: this.value.metadata.namespace
     });
diff --git a/shell/edit/resources.cattle.io.backup.vue b/shell/edit/resources.cattle.io.backup.vue
index 271852bed94..8feae1ca543 100644
--- a/shell/edit/resources.cattle.io.backup.vue
+++ b/shell/edit/resources.cattle.io.backup.vue
@@ -52,7 +52,7 @@ export default {
     const hash = await allHash({
       catalog:     this.$store.dispatch('catalog/load'),
       resourceSet: this.$store.dispatch('cluster/find', { type: BACKUP_RESTORE.RESOURCE_SET, id: this.value?.spec?.resourceSetName || 'rancher-resource-set' }),
-      apps:        this.$store.dispatch('cluster/findAll', { type: CATALOG.APP }) // TODO: RC APP
+      apps:        this.$store.dispatch('cluster/findAll', { type: CATALOG.APP })
     });
 
     this.apps = hash.apps;
diff --git a/shell/edit/ui.cattle.io.navlink.vue b/shell/edit/ui.cattle.io.navlink.vue
index bcef181a84a..e8f9dfc6e78 100644
--- a/shell/edit/ui.cattle.io.navlink.vue
+++ b/shell/edit/ui.cattle.io.navlink.vue
@@ -162,7 +162,7 @@ export default {
   },
   async fetch() {
     this.services = await this.$store
-      .dispatch('cluster/findAll', { type: SERVICE }); // TODO: RC SERVICE
+      .dispatch('cluster/findAll', { type: SERVICE });
   },
   methods: {
     /**
diff --git a/shell/utils/ingress.ts b/shell/utils/ingress.ts
index a3a4f5d2178..048490e4151 100644
--- a/shell/utils/ingress.ts
+++ b/shell/utils/ingress.ts
@@ -2,7 +2,12 @@ import { SECRET, SERVICE } from '@shell/config/types';
 import { SECRET_TYPES as TYPES } from '@shell/config/secret';
 import { VuexStore } from '@shell/types/store/vuex';
 
-class IngressHelper {
+/**
+ * Helper class for common functionality shared between the detail and edit ingress pages
+ *
+ * This could be an untyped mixin.. but this setups up us better for the future
+ */
+class IngressDetailEditHelper {
   private $store: VuexStore;
   private namespace: string;
 
@@ -17,10 +22,22 @@ class IngressHelper {
     this.namespace = namespace;
   }
 
+  /**
+   * Fetch services that will either be used to show
+   * - Create - the possible rule's target service
+   * - Edit - the selected and possible rule's target service
+   * - Detail - the selected rule's target service
+   */
   async fetchServices(args?: { namespace: string}): Promise<any[]> {
     return this.$store.dispatch('cluster/findAll', { type: SERVICE, opt: { namespaced: args?.namespace || this.namespace } });
   }
 
+  /**
+   * Fetch secrets that will either be used to show
+   * - Create - the possible secrets to use as a certificates
+   * - Edit - the selected and possible secrets to use as a certificates
+   * - Detail - the selected secrets to use as certificates
+   */
   async fetchSecrets(args?: { namespace: string}): Promise<any[]> {
     return this.$store.dispatch('cluster/findAll', { type: SECRET, opt: { namespaced: args?.namespace || this.namespace } });
   }
@@ -44,4 +61,4 @@ class IngressHelper {
   }
 }
 
-export default IngressHelper;
+export default IngressDetailEditHelper;

From 09194418bf299c45824bb4aa9bef9bd884d49265 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 9 Jan 2025 16:50:41 +0000
Subject: [PATCH 69/76] finish off functional stuff

---
 shell/components/PaginatedResourceTable.vue     |  7 +++++--
 shell/detail/workload/index.vue                 |  3 +--
 shell/edit/logging-flow/index.vue               | 17 ++---------------
 .../networking.k8s.io.networkpolicy/index.vue   |  9 ++++-----
 shell/edit/service.vue                          |  3 +--
 shell/list/node.vue                             |  7 +++++--
 shell/list/persistentvolume.vue                 |  8 ++++++--
 shell/list/service.vue                          |  1 +
 shell/models/workload.js                        | 17 +++++++++++++++++
 shell/pages/home.vue                            |  4 ++--
 shell/plugins/steve/mutations.js                |  2 +-
 11 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
index 18618364143..40c8335a386 100644
--- a/shell/components/PaginatedResourceTable.vue
+++ b/shell/components/PaginatedResourceTable.vue
@@ -5,7 +5,8 @@ import ResourceTable from '@shell/components/ResourceTable.vue';
 import { StorePaginationResult } from '@shell/types/store/pagination.types';
 
 export type FetchSecondaryResourcesOpts = { canPaginate: boolean }
-export type FetchSecondaryResources = (opts: FetchSecondaryResourcesOpts) => Promise<any>
+export type FetchSecondaryResourcesReturns = Promise<any> | { [key: string]: Promise<any>}
+export type FetchSecondaryResources = (opts: FetchSecondaryResourcesOpts) => FetchSecondaryResourcesReturns
 
 export type FetchPageSecondaryResourcesOpts = { canPaginate: boolean, force: boolean, page: any[], pagResult: StorePaginationResult }
 export type FetchPageSecondaryResources = (opts: FetchPageSecondaryResourcesOpts) => Promise<any>
@@ -86,7 +87,9 @@ export default defineComponent({
     ];
 
     if (this.fetchSecondaryResources) {
-      promises.push(this.fetchSecondaryResources({ canPaginate: this.canPaginate }));
+      const res = this.fetchSecondaryResources({ canPaginate: this.canPaginate });
+
+      promises.push(Array.isArray(res) ? res : [res]);
     }
 
     await Promise.all(promises);
diff --git a/shell/detail/workload/index.vue b/shell/detail/workload/index.vue
index 071ed15fb6a..c461183dce1 100644
--- a/shell/detail/workload/index.vue
+++ b/shell/detail/workload/index.vue
@@ -58,7 +58,7 @@ export default {
     };
 
     if (this.value.type === WORKLOAD_TYPES.CRON_JOB) {
-      hash.allJobs = this.$store.dispatch('cluster/findAll', { type: WORKLOAD_TYPES.JOB });
+      hash.jobs = this.value.matchingJobs();
     }
     const res = await allHash(hash);
 
@@ -92,7 +92,6 @@ export default {
       allIngresses:                    [],
       matchingServices:                [],
       matchingIngresses:               [],
-      allJobs:                         [],
       allNodes:                        [],
       WORKLOAD_METRICS_DETAIL_URL,
       WORKLOAD_METRICS_SUMMARY_URL,
diff --git a/shell/edit/logging-flow/index.vue b/shell/edit/logging-flow/index.vue
index 76c19fcb28a..eaeffa326c1 100644
--- a/shell/edit/logging-flow/index.vue
+++ b/shell/edit/logging-flow/index.vue
@@ -67,7 +67,6 @@ export default {
     const hasAccessToOutputs = this.$store.getters[`${ inStore }/schemaFor`](LOGGING.OUTPUT);
     const hasAccessToNamespaces = this.$store.getters[`cluster/schemaFor`](NAMESPACE);
     const hasAccessToNodes = this.$store.getters[`${ inStore }/schemaFor`](NODE);
-    const hasAccessToPods = this.$store.getters[`${ inStore }/schemaFor`](POD);
     const isFlow = this.value.type === LOGGING.FLOW;
 
     const getAllOrDefault = (type, hasAccess) => {
@@ -77,9 +76,10 @@ export default {
     const hash = await allHash({
       allOutputs:        getAllOrDefault(LOGGING.OUTPUT, isFlow && hasAccessToOutputs),
       allClusterOutputs: getAllOrDefault(LOGGING.CLUSTER_OUTPUT, hasAccessToClusterOutputs),
+      // Can't remove allNamespaces yet given https://github.com/harvester/harvester/issues/7342 and
+      // https://github.com/harvester/harvester-ui-extension/blob/main/pkg/harvester/edit/harvesterhci.io.logging.clusteroutput.vue
       allNamespaces:     getAllOrDefault(NAMESPACE, hasAccessToNamespaces),
       allNodes:          getAllOrDefault(NODE, hasAccessToNodes),
-      allPods:           getAllOrDefault(POD, hasAccessToPods),
     });
 
     for ( const k of Object.keys(hash) ) {
@@ -134,7 +134,6 @@ export default {
       allClusterOutputs:  null,
       allNamespaces:      null,
       allNodes:           null,
-      allPods:            null,
       filtersYaml,
       initialFiltersYaml: filtersYaml,
       globalOutputRefs,
@@ -239,18 +238,6 @@ export default {
       return out;
     },
 
-    containerChoices() {
-      const out = [];
-
-      for ( const pod of this.allPods ) {
-        for ( const c of (pod.spec?.containers || []) ) {
-          out.push(c.name);
-        }
-      }
-
-      return uniq(out).sort();
-    },
-
     isHarvester() {
       return this.$store.getters['currentProduct'].inStore === VIRTUAL;
     },
diff --git a/shell/edit/networking.k8s.io.networkpolicy/index.vue b/shell/edit/networking.k8s.io.networkpolicy/index.vue
index 946a096ed3b..8dd5f2f0c31 100644
--- a/shell/edit/networking.k8s.io.networkpolicy/index.vue
+++ b/shell/edit/networking.k8s.io.networkpolicy/index.vue
@@ -43,12 +43,12 @@ export default {
 
   async fetch() {
     const hash = await allHash({
-      allPods:       this.$store.dispatch('cluster/findAll', { type: POD }),
-      allNamespaces: this.$store.dispatch('cluster/findAll', { type: NAMESPACE }),
+      allPods:       this.$store.dispatch('cluster/findAll', { type: POD }), // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
+      allNamespaces: this.$store.dispatch('cluster/findAll', { type: NAMESPACE }), // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
     });
 
-    this.allPods = hash.allPods;
-    this.allNamespaces = hash.allNamespaces;
+    this.allPods = hash.allPods; // Used in matchingPods, and PolicyRules --> PolicyRule --> PolicyRuleTarget
+    this.allNamespaces = hash.allNamespaces; // Used in PolicyRules --> PolicyRule --> PolicyRuleTarget
 
     this.updateMatchingPods();
   },
@@ -147,7 +147,6 @@ export default {
 
   methods: {
     updateMatchingPods: throttle(function() {
-      // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
       const allInNamespace = this.allPods.filter((pod) => pod.metadata.namespace === this.value.metadata.namespace);
       const match = matching(allInNamespace, this.podSelectorExpressions);
       const matched = match.length || 0;
diff --git a/shell/edit/service.vue b/shell/edit/service.vue
index dcad57b2a93..045dea57a08 100644
--- a/shell/edit/service.vue
+++ b/shell/edit/service.vue
@@ -259,7 +259,6 @@ export default {
   methods: {
     updateMatchingPods: throttle(function() {
       const { value: { spec: { selector = { } } } } = this;
-      // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
       const allInNamespace = this.allPods.filter((pod) => pod.metadata.namespace === this.value?.metadata?.namespace);
 
       if (isEmpty(selector)) {
@@ -287,7 +286,7 @@ export default {
 
         const hash = {
           provClusters:     this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER }),
-          pods:             this.$store.dispatch(`${ inStore }/findAll`, { type: POD }),
+          pods:             this.$store.dispatch(`${ inStore }/findAll`, { type: POD }), // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
           harvesterConfigs: this.$store.dispatch(`management/findAll`, { type: HCI.HARVESTER_CONFIG }),
         };
 
diff --git a/shell/list/node.vue b/shell/list/node.vue
index cc4c6303b0b..70fb7ccdea8 100644
--- a/shell/list/node.vue
+++ b/shell/list/node.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts } from '@shell/components/PaginatedResourceTable.vue';
+import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts, FetchSecondaryResourcesOpts, FetchSecondaryResourcesReturns } from '@shell/components/PaginatedResourceTable.vue';
 import Tag from '@shell/components/Tag.vue';
 import { Banner } from '@components/Banner';
 import { PODS } from '@shell/config/table-headers';
@@ -185,7 +185,10 @@ export default defineComponent({
       row['displayLabels'] = !row.displayLabels;
     },
 
-    fetchSecondaryResources(): { [key: string]: Promise<any>} {
+    fetchSecondaryResources({ canPaginate }: FetchSecondaryResourcesOpts): FetchSecondaryResourcesReturns {
+      if (canPaginate) {
+        return {};
+      }
       const hash: { [key: string]: Promise<any>} = {};
 
       if (this.canViewMgmtNodes) {
diff --git a/shell/list/persistentvolume.vue b/shell/list/persistentvolume.vue
index 1daf5583b13..892910e65b7 100644
--- a/shell/list/persistentvolume.vue
+++ b/shell/list/persistentvolume.vue
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
-import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts } from '@shell/components/PaginatedResourceTable.vue';
+import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts, FetchSecondaryResourcesOpts, FetchSecondaryResourcesReturns } from '@shell/components/PaginatedResourceTable.vue';
 import { PVC } from '@shell/config/types';
 import { ActionFindPageArgs } from '@shell/types/store/dashboard-store.types';
 import { FilterArgs, PaginationFilterField, PaginationParamFilter } from '@shell/types/store/pagination.types';
@@ -38,7 +38,11 @@ export default defineComponent({
   },
 
   methods: {
-    fetchSecondaryResources(): { [key: string]: Promise<any>} {
+    fetchSecondaryResources({ canPaginate }: FetchSecondaryResourcesOpts): FetchSecondaryResourcesReturns {
+      if (canPaginate) {
+        return {};
+      }
+
       return { pvc: this.$store.dispatch(`cluster/findAll`, { type: PVC }) };
     },
 
diff --git a/shell/list/service.vue b/shell/list/service.vue
index 458785c9196..2eea054e399 100644
--- a/shell/list/service.vue
+++ b/shell/list/service.vue
@@ -25,6 +25,7 @@ export default {
   methods: {
     /**
      * opts: FetchSecondaryResourcesOpts
+     * returns: FetchSecondaryResourcesReturns
      */
     async fetchSecondaryResources(opts) {
       const inStore = this.$store.getters['currentStore']();
diff --git a/shell/models/workload.js b/shell/models/workload.js
index ce89339c479..9e1b79444ff 100644
--- a/shell/models/workload.js
+++ b/shell/models/workload.js
@@ -595,6 +595,23 @@ export default class Workload extends WorkloadService {
     return (get(this, 'metadata.relationships') || []).filter((relationship) => relationship.toType === WORKLOAD_TYPES.JOB);
   }
 
+  /**
+   * Ensure the store has all matching jobs
+   */
+  async matchingJobs() {
+    if (this.type !== WORKLOAD_TYPES.CRON_JOB) {
+      return undefined;
+    }
+
+    // This will be 1 request per relationship, though there's not likely to be many per cron job
+    return Promise.all(this.jobRelationships.map((obj) => {
+      return this.$dispatch('find', { type: WORKLOAD_TYPES.JOB, id: obj.toId });
+    }));
+  }
+
+  /**
+   * Expects all required pods are fetched upfront
+   */
   get jobs() {
     if (this.type !== WORKLOAD_TYPES.CRON_JOB) {
       return undefined;
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index e1cca6320b6..92ff7197fe7 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -4,7 +4,7 @@ import { mapPref, AFTER_LOGIN_ROUTE, READ_WHATS_NEW, HIDE_HOME_PAGE_CARDS } from
 import { Banner } from '@components/Banner';
 import BannerGraphic from '@shell/components/BannerGraphic.vue';
 import IndentedPanel from '@shell/components/IndentedPanel.vue';
-import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts, FetchSecondaryResourcesOpts } from '@shell/components/PaginatedResourceTable.vue';
+import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts, FetchSecondaryResourcesOpts, FetchSecondaryResourcesReturns } from '@shell/components/PaginatedResourceTable.vue';
 import { BadgeState } from '@components/BadgeState';
 import CommunityLinks from '@shell/components/CommunityLinks.vue';
 import SingleClusterInfo from '@shell/components/SingleClusterInfo.vue';
@@ -240,7 +240,7 @@ export default defineComponent({
     /**
      * Of type FetchSecondaryResources
      */
-    fetchSecondaryResources(opts: FetchSecondaryResourcesOpts): Promise<any> {
+    fetchSecondaryResources(opts: FetchSecondaryResourcesOpts): FetchSecondaryResourcesReturns {
       if (opts.canPaginate) {
         return Promise.resolve({});
       }
diff --git a/shell/plugins/steve/mutations.js b/shell/plugins/steve/mutations.js
index 7e9b73e54c7..bc0e575cfef 100644
--- a/shell/plugins/steve/mutations.js
+++ b/shell/plugins/steve/mutations.js
@@ -31,7 +31,7 @@ function registerNamespace(state, namespace) {
 }
 
 /**
- * update the podsByNamespace cache with new or changed pods
+ * update the podsByNamespace cache with new or changed pods.
  */
 function updatePodsByNamespaceCache(state, ctx, pods, loadAll) {
   if (loadAll) {

From 7cb061b99de63a772dc355b2159849d2d9285315 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 13 Jan 2025 11:25:37 +0000
Subject: [PATCH 70/76] fix lint

---
 shell/edit/logging-flow/index.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/shell/edit/logging-flow/index.vue b/shell/edit/logging-flow/index.vue
index eaeffa326c1..a8c2673c77e 100644
--- a/shell/edit/logging-flow/index.vue
+++ b/shell/edit/logging-flow/index.vue
@@ -6,14 +6,12 @@ import Loading from '@shell/components/Loading';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
-import {
-  LOGGING, NAMESPACE, NODE, POD, SCHEMA
-} from '@shell/config/types';
+import { LOGGING, NAMESPACE, NODE, SCHEMA } from '@shell/config/types';
 import jsyaml from 'js-yaml';
 import { createYaml } from '@shell/utils/create-yaml';
 import YamlEditor, { EDITOR_MODES } from '@shell/components/YamlEditor';
 import { allHash } from '@shell/utils/promise';
-import { isArray, uniq } from '@shell/utils/array';
+import { isArray } from '@shell/utils/array';
 import { matchRuleIsPopulated } from '@shell/models/logging.banzaicloud.io.flow';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { clone } from '@shell/utils/object';

From 96e30e285cd32266665ddc7ee26f6b869e45259a Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 13 Jan 2025 14:47:33 +0000
Subject: [PATCH 71/76] Tidy up event headers - opens up to event header e2e
 failures again...

---
 .../pages/fleet/advanced/workspaces.spec.ts   |  2 +-
 shell/components/form/ResourceTabs/index.vue  | 23 +++++++++++++++---
 shell/config/pagination-table-headers.js      | 17 ++++++++++++-
 shell/config/product/explorer.js              | 24 ++++++-------------
 shell/config/table-headers.js                 |  6 +++++
 5 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/cypress/e2e/tests/pages/fleet/advanced/workspaces.spec.ts b/cypress/e2e/tests/pages/fleet/advanced/workspaces.spec.ts
index d74342d9722..3d3ca200dc0 100644
--- a/cypress/e2e/tests/pages/fleet/advanced/workspaces.spec.ts
+++ b/cypress/e2e/tests/pages/fleet/advanced/workspaces.spec.ts
@@ -18,7 +18,7 @@ describe('Workspaces', { testIsolation: 'off', tags: ['@fleet', '@adminUser'] },
     let initialCount: number;
 
     it('check table headers are available in list and details view', () => {
-      FleetWorkspaceListPagePo.navTo();
+      fleetWorkspacesPage.goTo();
       fleetWorkspacesPage.waitForPage();
       fleetWorkspacesPage.sortableTable().noRowsShouldNotExist();
       fleetWorkspacesPage.sortableTable().filter(defaultWorkspace);
diff --git a/shell/components/form/ResourceTabs/index.vue b/shell/components/form/ResourceTabs/index.vue
index 183080c1e78..fb6ac1b9b6a 100644
--- a/shell/components/form/ResourceTabs/index.vue
+++ b/shell/components/form/ResourceTabs/index.vue
@@ -13,6 +13,9 @@ import { _VIEW } from '@shell/config/query-params';
 import RelatedResources from '@shell/components/RelatedResources';
 import { isConditionReadyAndWaiting } from '@shell/plugins/dashboard-store/resource-class';
 import { PaginationParamFilter } from '@shell/types/store/pagination.types';
+import { MESSAGE, REASON } from '@shell/config/table-headers';
+import { STEVE_EVENT_LAST_SEEN, STEVE_EVENT_TYPE, STEVE_NAME_COL, STEVE_NAMESPACE_COL } from '@shell/config/pagination-table-headers';
+import { headerFromSchemaColString } from '@shell/store/type-map.utils';
 
 export default {
 
@@ -70,13 +73,25 @@ export default {
 
   data() {
     const inStore = this.$store.getters['currentStore'](EVENT);
+    const eventSchema = this.$store.getters[`${ inStore }/schemaFor`](EVENT); // @TODO be smarter about which resources actually ever have events
 
     return {
-      eventSchema:    this.$store.getters[`${ inStore }/schemaFor`](EVENT), // @TODO be smarter about which resources actually ever have events
+      eventSchema,
       EVENT,
-      selectedTab:    this.defaultTab,
+      selectedTab:       this.defaultTab,
       inStore,
-      showConditions: false,
+      showConditions:    false,
+      paginationHeaders: [
+        STEVE_EVENT_LAST_SEEN,
+        STEVE_EVENT_TYPE,
+        REASON,
+        headerFromSchemaColString('Subobject', eventSchema, this.$store.getters, true),
+        headerFromSchemaColString('Source', eventSchema, this.$store.getters, true),
+        MESSAGE,
+        headerFromSchemaColString('First Seen', eventSchema, this.$store.getters, true),
+        headerFromSchemaColString('Count', eventSchema, this.$store.getters, true),
+        STEVE_NAME_COL,
+      ]
     };
   },
 
@@ -241,6 +256,8 @@ export default {
         :local-filter="filterRowsLocal"
         :api-filter="filterRowsApi"
         :use-query-params-for-simple-filtering="false"
+        :headers="eventHeaders"
+        :paginationHeaders="paginationHeaders"
       />
     </Tab>
 
diff --git a/shell/config/pagination-table-headers.js b/shell/config/pagination-table-headers.js
index 6ae3cce8bd6..613a5601efd 100644
--- a/shell/config/pagination-table-headers.js
+++ b/shell/config/pagination-table-headers.js
@@ -1,5 +1,8 @@
 import {
-  STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE, OBJECT
+  STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE, OBJECT,
+  LAST_SEEN_TIME,
+  EVENT_LAST_SEEN_TIME,
+  EVENT_TYPE
 } from '@shell/config/table-headers';
 
 // This file contains table headers
@@ -52,6 +55,18 @@ export const STEVE_EVENT_OBJECT = {
   search: 'involvedObject.kind',
 };
 
+export const STEVE_EVENT_LAST_SEEN = {
+  ...EVENT_LAST_SEEN_TIME,
+  value: 'metadata.fields.0',
+  sort:  'metadata.fields.0',
+};
+
+export const STEVE_EVENT_TYPE = {
+  ...EVENT_TYPE,
+  value: '_type',
+  sort:  '_type',
+};
+
 export const STEVE_LIST_GROUPS = [{
   tooltipKey: 'resourceTable.groupBy.none',
   icon:       'icon-list-flat',
diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index d5e2cece26f..18710c42c3a 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -20,12 +20,13 @@ import {
   STORAGE_CLASS_PROVISIONER, PERSISTENT_VOLUME_SOURCE,
   HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA,
   ACCESS_KEY, DESCRIPTION, EXPIRES, EXPIRY_STATE, SUB_TYPE, AGE_NORMAN, SCOPE_NORMAN, PERSISTENT_VOLUME_CLAIM, RECLAIM_POLICY, PV_REASON, WORKLOAD_HEALTH_SCALE, POD_RESTARTS,
-  DURATION, MESSAGE, REASON, LAST_SEEN_TIME, EVENT_TYPE, OBJECT, ROLE, ROLES, VERSION, INTERNAL_EXTERNAL_IP, KUBE_NODE_OS, CPU, RAM, SECRET_DATA
+  DURATION, MESSAGE, REASON, EVENT_TYPE, OBJECT, ROLE, ROLES, VERSION, INTERNAL_EXTERNAL_IP, KUBE_NODE_OS, CPU, RAM, SECRET_DATA,
+  EVENT_LAST_SEEN_TIME
 } from '@shell/config/table-headers';
 
 import { DSL } from '@shell/store/type-map';
 import {
-  STEVE_AGE_COL, STEVE_EVENT_OBJECT, STEVE_LIST_GROUPS, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL
+  STEVE_AGE_COL, STEVE_EVENT_LAST_SEEN, STEVE_EVENT_OBJECT, STEVE_EVENT_TYPE, STEVE_LIST_GROUPS, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL
 } from '@shell/config/pagination-table-headers';
 
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
@@ -321,23 +322,12 @@ export function init(store) {
     ]
   );
 
-  const eventLastSeenTime = {
-    ...LAST_SEEN_TIME,
-    defaultSort: true,
-  };
-
   headers(EVENT,
-    [STATE, eventLastSeenTime, EVENT_TYPE, REASON, OBJECT, 'Subobject', 'Source', MESSAGE, 'First Seen', 'Count', NAME_COL, NAMESPACE_COL],
+    [STATE, EVENT_LAST_SEEN_TIME, EVENT_TYPE, REASON, OBJECT, 'Subobject', 'Source', MESSAGE, 'First Seen', 'Count', NAME_COL, NAMESPACE_COL],
     [
-      STEVE_STATE_COL, {
-        ...eventLastSeenTime,
-        value: 'metadata.fields.0',
-        sort:  'metadata.fields.0',
-      }, {
-        ...EVENT_TYPE,
-        value: '_type',
-        sort:  '_type',
-      },
+      STEVE_STATE_COL,
+      STEVE_EVENT_LAST_SEEN,
+      STEVE_EVENT_TYPE,
       REASON,
       STEVE_EVENT_OBJECT,
       'Subobject',
diff --git a/shell/config/table-headers.js b/shell/config/table-headers.js
index 05f3c723f99..bf2f80a94ed 100644
--- a/shell/config/table-headers.js
+++ b/shell/config/table-headers.js
@@ -515,6 +515,12 @@ export const LAST_SEEN_TIME = {
   sort:     'lastTimestamp:desc',
   tooltip:  'tableHeaders.lastSeenTooltip'
 };
+
+export const EVENT_LAST_SEEN_TIME = {
+  ...LAST_SEEN_TIME,
+  defaultSort: true,
+};
+
 export const LAST_HEARTBEAT_TIME = {
   name:      'lastHeartbeatTime',
   labelKey:  'tableHeaders.lastSeen',

From 898b9038abf1cb7e678b9ad45b7ea2b3a9f4d649 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 13 Jan 2025 15:10:53 +0000
Subject: [PATCH 72/76] Fix lint and unit test

---
 shell/components/form/ResourceTabs/index.vue      |  2 +-
 shell/config/pagination-table-headers.js          |  1 -
 .../autoscaling.horizontalpodautoscaler.test.ts   | 15 ++++++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/shell/components/form/ResourceTabs/index.vue b/shell/components/form/ResourceTabs/index.vue
index fb6ac1b9b6a..164ef407195 100644
--- a/shell/components/form/ResourceTabs/index.vue
+++ b/shell/components/form/ResourceTabs/index.vue
@@ -14,7 +14,7 @@ import RelatedResources from '@shell/components/RelatedResources';
 import { isConditionReadyAndWaiting } from '@shell/plugins/dashboard-store/resource-class';
 import { PaginationParamFilter } from '@shell/types/store/pagination.types';
 import { MESSAGE, REASON } from '@shell/config/table-headers';
-import { STEVE_EVENT_LAST_SEEN, STEVE_EVENT_TYPE, STEVE_NAME_COL, STEVE_NAMESPACE_COL } from '@shell/config/pagination-table-headers';
+import { STEVE_EVENT_LAST_SEEN, STEVE_EVENT_TYPE, STEVE_NAME_COL } from '@shell/config/pagination-table-headers';
 import { headerFromSchemaColString } from '@shell/store/type-map.utils';
 
 export default {
diff --git a/shell/config/pagination-table-headers.js b/shell/config/pagination-table-headers.js
index 613a5601efd..5691e288ee1 100644
--- a/shell/config/pagination-table-headers.js
+++ b/shell/config/pagination-table-headers.js
@@ -1,6 +1,5 @@
 import {
   STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE, OBJECT,
-  LAST_SEEN_TIME,
   EVENT_LAST_SEEN_TIME,
   EVENT_TYPE
 } from '@shell/config/table-headers';
diff --git a/shell/detail/__tests__/autoscaling.horizontalpodautoscaler.test.ts b/shell/detail/__tests__/autoscaling.horizontalpodautoscaler.test.ts
index c274017b39f..92f5b0b6446 100644
--- a/shell/detail/__tests__/autoscaling.horizontalpodautoscaler.test.ts
+++ b/shell/detail/__tests__/autoscaling.horizontalpodautoscaler.test.ts
@@ -7,9 +7,18 @@ describe('view: autoscaling.horizontalpodautoscaler', () => {
       'i18n/t':                  (text: string) => text,
       t:                         (text: string) => text,
       currentStore:              () => 'current_store',
-      'current_store/schemaFor': jest.fn(),
-      'current_store/all':       jest.fn(),
-      workspace:                 jest.fn(),
+      'current_store/schemaFor': () => ({
+        attributes: {
+          columns: [
+            { name: 'Subobject', field: '' },
+            { name: 'Source', field: '' },
+            { name: 'First Seen', field: '' },
+            { name: 'Count', field: '' }]
+        }
+      }),
+      'current_store/all': jest.fn(),
+      workspace:           jest.fn(),
+      'i18n/exists':       jest.fn(),
     },
   };
 

From 972e85e11604f1267440f62e320d0bf91cd31822 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 23 Jan 2025 15:56:47 +0000
Subject: [PATCH 73/76] Changes following review - fix and simplify
 FetchPageSecondaryResources - ensure resource detail page events list doesn't
 add ns filters (not needed)

---
 shell/components/PaginatedResourceTable.vue  | 10 ++++++----
 shell/components/Questions/Reference.vue     |  2 +-
 shell/components/form/ResourceTabs/index.vue | 10 ++++++----
 shell/list/networking.k8s.io.ingress.vue     |  2 +-
 shell/list/node.vue                          | 17 ++++++++++-------
 shell/list/persistentvolume.vue              |  9 ++++++---
 shell/list/service.vue                       |  3 +--
 7 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
index 8e40054cf2f..05a992320c6 100644
--- a/shell/components/PaginatedResourceTable.vue
+++ b/shell/components/PaginatedResourceTable.vue
@@ -5,7 +5,7 @@ import ResourceTable from '@shell/components/ResourceTable.vue';
 import { StorePaginationResult } from '@shell/types/store/pagination.types';
 
 export type FetchSecondaryResourcesOpts = { canPaginate: boolean }
-export type FetchSecondaryResourcesReturns = Promise<any> | { [key: string]: Promise<any>}
+export type FetchSecondaryResourcesReturns = Promise<any>
 export type FetchSecondaryResources = (opts: FetchSecondaryResourcesOpts) => FetchSecondaryResourcesReturns
 
 export type FetchPageSecondaryResourcesOpts = { canPaginate: boolean, force: boolean, page: any[], pagResult: StorePaginationResult }
@@ -58,6 +58,8 @@ export default defineComponent({
      * Information may be required from resources other than the primary one shown per row
      *
      * This will fetch them ALL and will be run in a non-server-side pagination world
+     *
+     * of type FetchSecondaryResources
      */
     fetchSecondaryResources: {
       type:    Function,
@@ -70,6 +72,8 @@ export default defineComponent({
      * This will fetch only those relevant to the current page using server-side pagination based filters
      *
      * called from shell/mixins/resource-fetch-api-pagination.js
+     *
+     * of type FetchPageSecondaryResources
      */
     fetchPageSecondaryResources: {
       type:    Function,
@@ -87,9 +91,7 @@ export default defineComponent({
     ];
 
     if (this.fetchSecondaryResources) {
-      const res = this.fetchSecondaryResources({ canPaginate: this.canPaginate });
-
-      promises.push(Array.isArray(res) ? res : [res]);
+      promises.push(this.fetchSecondaryResources({ canPaginate: this.canPaginate }));
     }
 
     await Promise.all(promises);
diff --git a/shell/components/Questions/Reference.vue b/shell/components/Questions/Reference.vue
index 1e78fa1aa75..0d2d9b5a4f8 100644
--- a/shell/components/Questions/Reference.vue
+++ b/shell/components/Questions/Reference.vue
@@ -119,7 +119,7 @@ export default {
     <div class="col span-6">
       <ResourceLabeledSelect
         :resourceType="typeName"
-        :inStore="inStore"
+        :in-store="inStore"
         :disabled="$fetchState.pending || disabled"
         :label="displayLabel"
         :placeholder="question.description"
diff --git a/shell/components/form/ResourceTabs/index.vue b/shell/components/form/ResourceTabs/index.vue
index 164ef407195..e80d5344a02 100644
--- a/shell/components/form/ResourceTabs/index.vue
+++ b/shell/components/form/ResourceTabs/index.vue
@@ -178,7 +178,7 @@ export default {
     /**
      * Filter out hidden repos from list of all repos
      */
-    filterRowsLocal(rows) {
+    filterEventsLocal(rows) {
       return rows.filter((event) => event.involvedObject?.uid === this.value?.metadata?.uid);
     },
 
@@ -188,7 +188,7 @@ export default {
      * pagination: PaginationArgs
      * returns: PaginationArgs
      */
-    filterRowsApi(pagination) {
+    filterEventsApi(pagination) {
       if (!pagination.filters) {
         pagination.filters = [];
       }
@@ -250,14 +250,16 @@ export default {
       name="events"
       :weight="-2"
     >
+      <!-- namespaced: false given we don't want the default handling of namespaced resource (apply header filter)  -->
       <PaginatedResourceTable
         v-if="selectedTab === 'events'"
         :schema="eventSchema"
-        :local-filter="filterRowsLocal"
-        :api-filter="filterRowsApi"
+        :local-filter="filterEventsLocal"
+        :api-filter="filterEventsApi"
         :use-query-params-for-simple-filtering="false"
         :headers="eventHeaders"
         :paginationHeaders="paginationHeaders"
+        :namespaced="false"
       />
     </Tab>
 
diff --git a/shell/list/networking.k8s.io.ingress.vue b/shell/list/networking.k8s.io.ingress.vue
index c01c022274a..13e95ca4cfc 100644
--- a/shell/list/networking.k8s.io.ingress.vue
+++ b/shell/list/networking.k8s.io.ingress.vue
@@ -20,7 +20,7 @@ export default {
 
   methods: {
     /**
-     * opts: FetchSecondaryResourcesOpts
+     * of type FetchSecondaryResources
      */
     async fetchSecondaryResources(opts) {
       // pathExistsInSchema requires schema networking.k8s.io.ingress to have resources fields via schema definition but none were found. has the schema 'fetchResourceFields' been called?
diff --git a/shell/list/node.vue b/shell/list/node.vue
index 70fb7ccdea8..acf76fc77dc 100644
--- a/shell/list/node.vue
+++ b/shell/list/node.vue
@@ -185,22 +185,25 @@ export default defineComponent({
       row['displayLabels'] = !row.displayLabels;
     },
 
-    fetchSecondaryResources({ canPaginate }: FetchSecondaryResourcesOpts): FetchSecondaryResourcesReturns {
+    /**
+     * of type FetchSecondaryResources
+     */
+    async fetchSecondaryResources({ canPaginate }: FetchSecondaryResourcesOpts): FetchSecondaryResourcesReturns {
       if (canPaginate) {
-        return {};
+        return;
       }
-      const hash: { [key: string]: Promise<any>} = {};
+      const promises = [];
 
       if (this.canViewMgmtNodes) {
-        hash.mgmtNodes = this.$store.dispatch(`management/findAll`, { type: MANAGEMENT.NODE });
+        promises.push(this.$store.dispatch(`management/findAll`, { type: MANAGEMENT.NODE }));
       }
 
       if (this.canViewNormanNodes) {
-        hash.normanNodes = this.$store.dispatch(`rancher/findAll`, { type: NORMAN.NODE });
+        promises.push(this.$store.dispatch(`rancher/findAll`, { type: NORMAN.NODE }));
       }
 
       if (this.canViewMachines) {
-        hash.machines = this.$store.dispatch(`management/findAll`, { type: CAPI.MACHINE });
+        promises.push(this.$store.dispatch(`management/findAll`, { type: CAPI.MACHINE }));
       }
 
       if (this.canViewPods) {
@@ -208,7 +211,7 @@ export default defineComponent({
         this.$store.dispatch(`cluster/findAll`, { type: POD });
       }
 
-      return hash;
+      await Promise.all(promises);
     },
 
     /**
diff --git a/shell/list/persistentvolume.vue b/shell/list/persistentvolume.vue
index 892910e65b7..8631483aa62 100644
--- a/shell/list/persistentvolume.vue
+++ b/shell/list/persistentvolume.vue
@@ -38,12 +38,15 @@ export default defineComponent({
   },
 
   methods: {
-    fetchSecondaryResources({ canPaginate }: FetchSecondaryResourcesOpts): FetchSecondaryResourcesReturns {
+    /**
+     * of type FetchSecondaryResources
+     */
+    async fetchSecondaryResources({ canPaginate }: FetchSecondaryResourcesOpts): FetchSecondaryResourcesReturns {
       if (canPaginate) {
-        return {};
+        return;
       }
 
-      return { pvc: this.$store.dispatch(`cluster/findAll`, { type: PVC }) };
+      return this.$store.dispatch(`cluster/findAll`, { type: PVC });
     },
 
     /**
diff --git a/shell/list/service.vue b/shell/list/service.vue
index 2eea054e399..83dc68dfa29 100644
--- a/shell/list/service.vue
+++ b/shell/list/service.vue
@@ -24,8 +24,7 @@ export default {
 
   methods: {
     /**
-     * opts: FetchSecondaryResourcesOpts
-     * returns: FetchSecondaryResourcesReturns
+     * of type FetchSecondaryResources
      */
     async fetchSecondaryResources(opts) {
       const inStore = this.$store.getters['currentStore']();

From bec8e7aaedafd0f916fab167b96aac6b8f0ee3ed Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 23 Jan 2025 16:09:10 +0000
Subject: [PATCH 74/76] missed a param

---
 shell/components/Questions/Reference.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/components/Questions/Reference.vue b/shell/components/Questions/Reference.vue
index 0d2d9b5a4f8..8fdf2cd4400 100644
--- a/shell/components/Questions/Reference.vue
+++ b/shell/components/Questions/Reference.vue
@@ -118,7 +118,7 @@ export default {
   >
     <div class="col span-6">
       <ResourceLabeledSelect
-        :resourceType="typeName"
+        :resource-type="typeName"
         :in-store="inStore"
         :disabled="$fetchState.pending || disabled"
         :label="displayLabel"

From c19aabe62ce1d8a1eba6621a4bbbadfda38d539d Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 23 Jan 2025 17:06:08 +0000
Subject: [PATCH 75/76] Move PaginatedResourceTable and ResourceLabeledSelect
 to type file, improving naming

---
 shell/components/PaginatedResourceTable.vue   | 12 +----
 .../components/form/ResourceLabeledSelect.vue | 53 ++-----------------
 shell/list/networking.k8s.io.ingress.vue      |  2 +-
 shell/list/node.vue                           |  9 ++--
 shell/list/persistentvolume.vue               |  9 ++--
 shell/list/service.vue                        |  2 +-
 shell/pages/home.vue                          |  9 ++--
 .../components/paginatedResourceTable.ts      | 26 +++++++++
 .../types/components/resourceLabeledSelect.ts | 48 +++++++++++++++++
 9 files changed, 97 insertions(+), 73 deletions(-)
 create mode 100644 shell/types/components/paginatedResourceTable.ts
 create mode 100644 shell/types/components/resourceLabeledSelect.ts

diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
index 05a992320c6..237a3b62307 100644
--- a/shell/components/PaginatedResourceTable.vue
+++ b/shell/components/PaginatedResourceTable.vue
@@ -2,14 +2,6 @@
 import { defineComponent } from 'vue';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import ResourceTable from '@shell/components/ResourceTable.vue';
-import { StorePaginationResult } from '@shell/types/store/pagination.types';
-
-export type FetchSecondaryResourcesOpts = { canPaginate: boolean }
-export type FetchSecondaryResourcesReturns = Promise<any>
-export type FetchSecondaryResources = (opts: FetchSecondaryResourcesOpts) => FetchSecondaryResourcesReturns
-
-export type FetchPageSecondaryResourcesOpts = { canPaginate: boolean, force: boolean, page: any[], pagResult: StorePaginationResult }
-export type FetchPageSecondaryResources = (opts: FetchPageSecondaryResourcesOpts) => Promise<any>
 
 /**
  * This is meant to enable ResourceList like capabilities outside of List pages / components
@@ -59,7 +51,7 @@ export default defineComponent({
      *
      * This will fetch them ALL and will be run in a non-server-side pagination world
      *
-     * of type FetchSecondaryResources
+     * of type PagTableFetchSecondaryResources
      */
     fetchSecondaryResources: {
       type:    Function,
@@ -73,7 +65,7 @@ export default defineComponent({
      *
      * called from shell/mixins/resource-fetch-api-pagination.js
      *
-     * of type FetchPageSecondaryResources
+     * of type PagTableFetchPageSecondaryResources
      */
     fetchPageSecondaryResources: {
       type:    Function,
diff --git a/shell/components/form/ResourceLabeledSelect.vue b/shell/components/form/ResourceLabeledSelect.vue
index 034a26300b5..f6ebe7ed393 100644
--- a/shell/components/form/ResourceLabeledSelect.vue
+++ b/shell/components/form/ResourceLabeledSelect.vue
@@ -3,53 +3,8 @@ import { PropType, defineComponent } from 'vue';
 import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
 import { PaginationParamFilter } from '@shell/types/store/pagination.types';
 import { labelSelectPaginationFunction, LabelSelectPaginationFunctionOptions } from '@shell/components/form/labeled-select-utils/labeled-select.utils';
-import { LabelSelectPaginateFn, LabelSelectPaginateFnOptions, LabelSelectPaginateFnResponse } from '@shell/types/components/labeledSelect';
-
-type PaginateTypeOverridesFn = (opts: LabelSelectPaginationFunctionOptions) => LabelSelectPaginationFunctionOptions;
-
-interface SharedSettings {
-  /**
-   * Provide specific LabelSelect options for this mode (paginated / not paginated)
-   */
-  labelSelectOptions?: { [key: string]: any },
-  /**
-   * Map, filter, tweak, etc the resources to show in the LabelSelect
-   */
-  updateResources?: (resources: any[]) => any[]
-}
-
-/**
- * Settings to use when the LabelSelect is paginating
- */
-export interface ResourceLabeledSelectPaginateSettings extends SharedSettings {
-  /**
-   * Override the convenience function which fetches a page of results
-   */
-  overrideRequest?: LabelSelectPaginateFn,
-  /**
-   * Override the default settings used in the convenience function to fetch a page of results
-   */
-  requestSettings?: PaginateTypeOverridesFn,
-}
-
-/**
- * Settings to use when the LabelSelect is fetching all resources (not paginating)
- */
-export type ResourceLabeledSelectSettings = SharedSettings
-
-/**
- * Force a specific mode
- */
-export enum RESOURCE_LABEL_SELECT_MODE {
-  /**
-   * Fetch all resources
-   */
-  ALL_RESOURCES = 'ALL', // eslint-disable-line no-unused-vars
-  /**
-   * Determine if all resources are fetched given system settings
-   */
-  DYNAMIC = 'DYNAMIC', // eslint-disable-line no-unused-vars
-}
+import { LabelSelectPaginateFnOptions, LabelSelectPaginateFnResponse } from '@shell/types/components/labeledSelect';
+import { RESOURCE_LABEL_SELECT_MODE, ResourceLabeledSelectPaginateSettings, ResourceLabeledSelectSettings } from '@shell/types/components/resourceLabeledSelect';
 
 /**
  * Convenience  wrapper around the LabelSelect component to support pagination
@@ -91,7 +46,7 @@ export default defineComponent({
     },
 
     /**
-     * Specific settings to use when we're showing all results
+     * Specific settings to use when we're showing all results in the drop down
      */
     allResourcesSettings: {
       type:    Object as PropType<ResourceLabeledSelectSettings>,
@@ -99,7 +54,7 @@ export default defineComponent({
     },
 
     /**
-     * Specific settings to use when we're showing paginated results
+     * Specific settings to use when we're showing paginated results in the drop down
      */
     paginatedResourceSettings: {
       type:    Object as PropType<ResourceLabeledSelectPaginateSettings>,
diff --git a/shell/list/networking.k8s.io.ingress.vue b/shell/list/networking.k8s.io.ingress.vue
index 13e95ca4cfc..0b57916996c 100644
--- a/shell/list/networking.k8s.io.ingress.vue
+++ b/shell/list/networking.k8s.io.ingress.vue
@@ -20,7 +20,7 @@ export default {
 
   methods: {
     /**
-     * of type FetchSecondaryResources
+     * of type PagTableFetchSecondaryResources
      */
     async fetchSecondaryResources(opts) {
       // pathExistsInSchema requires schema networking.k8s.io.ingress to have resources fields via schema definition but none were found. has the schema 'fetchResourceFields' been called?
diff --git a/shell/list/node.vue b/shell/list/node.vue
index acf76fc77dc..26cb9f7f393 100644
--- a/shell/list/node.vue
+++ b/shell/list/node.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts, FetchSecondaryResourcesOpts, FetchSecondaryResourcesReturns } from '@shell/components/PaginatedResourceTable.vue';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
 import Tag from '@shell/components/Tag.vue';
 import { Banner } from '@components/Banner';
 import { PODS } from '@shell/config/table-headers';
@@ -19,6 +19,7 @@ import { GROUP_RESOURCES, mapPref } from '@shell/store/prefs';
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 
 import { mapGetters } from 'vuex';
+import { PagTableFetchPageSecondaryResourcesOpts, PagTableFetchSecondaryResourcesOpts, PagTableFetchSecondaryResourcesReturns } from '@shell/types/components/paginatedResourceTable';
 
 export default defineComponent({
   name: 'ListNode',
@@ -186,9 +187,9 @@ export default defineComponent({
     },
 
     /**
-     * of type FetchSecondaryResources
+     * of type PagTableFetchSecondaryResources
      */
-    async fetchSecondaryResources({ canPaginate }: FetchSecondaryResourcesOpts): FetchSecondaryResourcesReturns {
+    async fetchSecondaryResources({ canPaginate }: PagTableFetchSecondaryResourcesOpts): PagTableFetchSecondaryResourcesReturns {
       if (canPaginate) {
         return;
       }
@@ -221,7 +222,7 @@ export default defineComponent({
      *
      * So when we have a page.... use those entries as filters when fetching the other resources
      */
-    async fetchPageSecondaryResources({ canPaginate, force, page }: FetchPageSecondaryResourcesOpts) {
+    async fetchPageSecondaryResources({ canPaginate, force, page }: PagTableFetchPageSecondaryResourcesOpts) {
       if (!page?.length) {
         return;
       }
diff --git a/shell/list/persistentvolume.vue b/shell/list/persistentvolume.vue
index 8631483aa62..86993716b1d 100644
--- a/shell/list/persistentvolume.vue
+++ b/shell/list/persistentvolume.vue
@@ -1,9 +1,10 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
-import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts, FetchSecondaryResourcesOpts, FetchSecondaryResourcesReturns } from '@shell/components/PaginatedResourceTable.vue';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
 import { PVC } from '@shell/config/types';
 import { ActionFindPageArgs } from '@shell/types/store/dashboard-store.types';
 import { FilterArgs, PaginationFilterField, PaginationParamFilter } from '@shell/types/store/pagination.types';
+import { PagTableFetchPageSecondaryResourcesOpts, PagTableFetchSecondaryResourcesOpts, PagTableFetchSecondaryResourcesReturns } from '@shell/types/components/paginatedResourceTable';
 
 export default defineComponent({
   name: 'ListPersistentVolume',
@@ -39,9 +40,9 @@ export default defineComponent({
 
   methods: {
     /**
-     * of type FetchSecondaryResources
+     * of type PagTableFetchSecondaryResources
      */
-    async fetchSecondaryResources({ canPaginate }: FetchSecondaryResourcesOpts): FetchSecondaryResourcesReturns {
+    async fetchSecondaryResources({ canPaginate }: PagTableFetchSecondaryResourcesOpts): PagTableFetchSecondaryResourcesReturns {
       if (canPaginate) {
         return;
       }
@@ -54,7 +55,7 @@ export default defineComponent({
      *
      * So when we have a page.... use those entries as filters when fetching the other resources
      */
-    async fetchPageSecondaryResources({ canPaginate, force, page }: FetchPageSecondaryResourcesOpts) {
+    async fetchPageSecondaryResources({ canPaginate, force, page }: PagTableFetchPageSecondaryResourcesOpts) {
       if (!page?.length) {
         return;
       }
diff --git a/shell/list/service.vue b/shell/list/service.vue
index 83dc68dfa29..b8ce2b2f050 100644
--- a/shell/list/service.vue
+++ b/shell/list/service.vue
@@ -24,7 +24,7 @@ export default {
 
   methods: {
     /**
-     * of type FetchSecondaryResources
+     * of type PagTableFetchSecondaryResources
      */
     async fetchSecondaryResources(opts) {
       const inStore = this.$store.getters['currentStore']();
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index 92ff7197fe7..e148344b911 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -4,7 +4,7 @@ import { mapPref, AFTER_LOGIN_ROUTE, READ_WHATS_NEW, HIDE_HOME_PAGE_CARDS } from
 import { Banner } from '@components/Banner';
 import BannerGraphic from '@shell/components/BannerGraphic.vue';
 import IndentedPanel from '@shell/components/IndentedPanel.vue';
-import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts, FetchSecondaryResourcesOpts, FetchSecondaryResourcesReturns } from '@shell/components/PaginatedResourceTable.vue';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
 import { BadgeState } from '@components/BadgeState';
 import CommunityLinks from '@shell/components/CommunityLinks.vue';
 import SingleClusterInfo from '@shell/components/SingleClusterInfo.vue';
@@ -28,6 +28,7 @@ import { STEVE_NAME_COL, STEVE_STATE_COL } from '@shell/config/pagination-table-
 import { PaginationParamFilter, FilterArgs, PaginationFilterField, PaginationArgs } from '@shell/types/store/pagination.types';
 import ProvCluster from '@shell/models/provisioning.cattle.io.cluster';
 import { sameContents } from '@shell/utils/array';
+import { PagTableFetchPageSecondaryResourcesOpts, PagTableFetchSecondaryResourcesOpts, PagTableFetchSecondaryResourcesReturns } from '@shell/types/components/paginatedResourceTable';
 
 export default defineComponent({
   name:       'Home',
@@ -238,9 +239,9 @@ export default defineComponent({
 
   methods: {
     /**
-     * Of type FetchSecondaryResources
+     * Of type PagTableFetchSecondaryResources
      */
-    fetchSecondaryResources(opts: FetchSecondaryResourcesOpts): FetchSecondaryResourcesReturns {
+    fetchSecondaryResources(opts: PagTableFetchSecondaryResourcesOpts): PagTableFetchSecondaryResourcesReturns {
       if (opts.canPaginate) {
         return Promise.resolve({});
       }
@@ -271,7 +272,7 @@ export default defineComponent({
 
     async fetchPageSecondaryResources({
       canPaginate, force, page, pagResult
-    }: FetchPageSecondaryResourcesOpts) {
+    }: PagTableFetchPageSecondaryResourcesOpts) {
       if (!canPaginate || !page?.length) {
         this.clusterCount = 0;
 
diff --git a/shell/types/components/paginatedResourceTable.ts b/shell/types/components/paginatedResourceTable.ts
new file mode 100644
index 00000000000..2af99ff004d
--- /dev/null
+++ b/shell/types/components/paginatedResourceTable.ts
@@ -0,0 +1,26 @@
+import { StorePaginationResult } from '@shell/types/store/pagination.types';
+
+/**
+ * see {@link PagTableFetchSecondaryResources}
+ */
+export type PagTableFetchSecondaryResourcesOpts = { canPaginate: boolean }
+/**
+ * see {@link PagTableFetchSecondaryResources}
+ */
+export type PagTableFetchSecondaryResourcesReturns = Promise<any>
+/**
+ * Function to fetch resources that are required to supplement information needed by rows in a PaginatedResourceTable
+ *
+ * Used in scenarios where ALL resources are expected
+ */
+export type PagTableFetchSecondaryResources = (opts: PagTableFetchSecondaryResourcesOpts) => PagTableFetchSecondaryResourcesReturns
+
+/**
+ * see {@link PagTableFetchPageSecondaryResources}
+ */
+export type PagTableFetchPageSecondaryResourcesOpts = { canPaginate: boolean, force: boolean, page: any[], pagResult: StorePaginationResult }
+/**
+ * Function to fetch resources that are required to supplement information needed by a single page in a PaginatedResourceTable
+ */
+export type PagTableFetchPageSecondaryResources = (opts: PagTableFetchPageSecondaryResourcesOpts) => Promise<any>
+
diff --git a/shell/types/components/resourceLabeledSelect.ts b/shell/types/components/resourceLabeledSelect.ts
new file mode 100644
index 00000000000..d8898e0d58d
--- /dev/null
+++ b/shell/types/components/resourceLabeledSelect.ts
@@ -0,0 +1,48 @@
+import { LabelSelectPaginationFunctionOptions } from '@shell/components/form/labeled-select-utils/labeled-select.utils';
+import { LabelSelectPaginateFn } from '@shell/types/components/labeledSelect';
+
+type PaginateTypeOverridesFn = (opts: LabelSelectPaginationFunctionOptions) => LabelSelectPaginationFunctionOptions;
+
+interface SharedSettings {
+  /**
+   * Provide specific LabelSelect options for this mode (paginated / not paginated)
+   */
+  labelSelectOptions?: { [key: string]: any },
+  /**
+   * Map, filter, tweak, etc the resources to show in the LabelSelect
+   */
+  updateResources?: (resources: any[]) => any[]
+}
+
+/**
+ * Settings to use when the LabelSelect is paginating
+ */
+export interface ResourceLabeledSelectPaginateSettings extends SharedSettings {
+  /**
+   * Override the convenience function which fetches a page of results
+   */
+  overrideRequest?: LabelSelectPaginateFn,
+  /**
+   * Override the default settings used in the convenience function to fetch a page of results
+   */
+  requestSettings?: PaginateTypeOverridesFn,
+}
+
+/**
+ * Settings to use when the LabelSelect is fetching all resources (not paginating)
+ */
+export type ResourceLabeledSelectSettings = SharedSettings
+
+/**
+ * Force a specific mode
+ */
+export enum RESOURCE_LABEL_SELECT_MODE {
+  /**
+   * Fetch all resources
+   */
+  ALL_RESOURCES = 'ALL', // eslint-disable-line no-unused-vars
+  /**
+   * Determine if all resources are fetched given system settings
+   */
+  DYNAMIC = 'DYNAMIC', // eslint-disable-line no-unused-vars
+}
\ No newline at end of file

From 8ff97aaf603c52c2d3b4c245a38f8c34992d43e1 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 23 Jan 2025 17:17:35 +0000
Subject: [PATCH 76/76] fix linting

---
 shell/types/components/paginatedResourceTable.ts | 1 -
 shell/types/components/resourceLabeledSelect.ts  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/shell/types/components/paginatedResourceTable.ts b/shell/types/components/paginatedResourceTable.ts
index 2af99ff004d..ec3cef9cc2d 100644
--- a/shell/types/components/paginatedResourceTable.ts
+++ b/shell/types/components/paginatedResourceTable.ts
@@ -23,4 +23,3 @@ export type PagTableFetchPageSecondaryResourcesOpts = { canPaginate: boolean, fo
  * Function to fetch resources that are required to supplement information needed by a single page in a PaginatedResourceTable
  */
 export type PagTableFetchPageSecondaryResources = (opts: PagTableFetchPageSecondaryResourcesOpts) => Promise<any>
-
diff --git a/shell/types/components/resourceLabeledSelect.ts b/shell/types/components/resourceLabeledSelect.ts
index d8898e0d58d..c65b634218d 100644
--- a/shell/types/components/resourceLabeledSelect.ts
+++ b/shell/types/components/resourceLabeledSelect.ts
@@ -45,4 +45,4 @@ export enum RESOURCE_LABEL_SELECT_MODE {
    * Determine if all resources are fetched given system settings
    */
   DYNAMIC = 'DYNAMIC', // eslint-disable-line no-unused-vars
-}
\ No newline at end of file
+}