From f905fa16cb3b75c300698f2ee221a22cd376ec81 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 19 Dec 2024 15:21:43 +0000
Subject: [PATCH 1/6] Test / Wire in new label filtering to limited places

- Wired in to
  - Workload detail page - pods and services (broken due to reverse selector)
  - Service Detail - Pods List
  - Service create/edit - Pod selector tab
- Also
  - Fix showPodRestarts in random location
- TODOs
  - Lots of testing / validation required
  - reverse deployment --> service selector (not services given deployment, but for each service contains pods from deployment)
  - workload model usages of pods getter
  - services model usages of pods getter
  - many many more....
---
 shell/components/ResourceDetail/Masthead.vue  |   2 +-
 shell/detail/service.vue                      |   7 +-
 shell/detail/workload/index.vue               | 130 +++++++++++-------
 shell/edit/service.vue                        |  31 +++--
 shell/models/service.js                       |  64 +++++++--
 shell/models/workload.js                      | 105 ++++++++++----
 shell/plugins/steve/steve-pagination-utils.ts | 108 ++++++++++++++-
 shell/types/kube/kube-api.ts                  |  19 +++
 shell/types/store/pagination.types.ts         |  19 ++-
 9 files changed, 380 insertions(+), 105 deletions(-)
 create mode 100644 shell/types/kube/kube-api.ts

diff --git a/shell/components/ResourceDetail/Masthead.vue b/shell/components/ResourceDetail/Masthead.vue
index b92f853fe28..1c08e2a0f60 100644
--- a/shell/components/ResourceDetail/Masthead.vue
+++ b/shell/components/ResourceDetail/Masthead.vue
@@ -505,7 +505,7 @@ export default {
             class="live-date"
             :value="value.creationTimestamp"
           /></span>
-          <span v-if="value.showPodRestarts">{{ t("resourceDetail.masthead.restartCount") }}:<span class="live-data"> {{ value.restartCount }}</span></span>
+          <!-- <span v-if="value.showPodRestarts">{{ t("resourceDetail.masthead.restartCount") }}:<span class="live-data"> {{ value.restartCount }}</span></span> -->
         </div>
       </div>
       <slot name="right">
diff --git a/shell/detail/service.vue b/shell/detail/service.vue
index 6c00515b460..1fb0cb2e521 100644
--- a/shell/detail/service.vue
+++ b/shell/detail/service.vue
@@ -37,7 +37,8 @@ export default {
   },
 
   async fetch() {
-    await this.value.fetchPods();
+    // TODO: RC test (blocked given services bug in dev image)
+    this.matchingPods = await this.value.fetchPods();
   },
 
   data() {
@@ -83,7 +84,7 @@ export default {
 
     return {
       servicePortInfoHeaders,
-      pods:            [],
+      matchingPods:            [],
       podTableHeaders: this.$store.getters['type-map/headersFor'](
         this.$store.getters['cluster/schemaFor'](POD)
       ),
@@ -155,7 +156,7 @@ export default {
       :weight="4"
     >
       <ResourceTable
-        :rows="value.pods"
+        :rows="matchingPods"
         :headers="podTableHeaders"
         key-field="id"
         :table-actions="false"
diff --git a/shell/detail/workload/index.vue b/shell/detail/workload/index.vue
index 58c891ed202..8a037fca5c4 100644
--- a/shell/detail/workload/index.vue
+++ b/shell/detail/workload/index.vue
@@ -16,6 +16,7 @@ import { allDashboardsExist } from '@shell/utils/grafana';
 import PlusMinus from '@shell/components/form/PlusMinus';
 import { matches } from '@shell/utils/selector';
 import { PROJECT } from '@shell/config/labels-annotations';
+import { FilterArgs } from '@shell/types/store/pagination.types';
 
 const SCALABLE_TYPES = Object.values(SCALABLE_WORKLOAD_TYPES);
 const WORKLOAD_METRICS_DETAIL_URL = '/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/d/rancher-workload-pods-1/rancher-workload-pods?orgId=1';
@@ -48,14 +49,33 @@ 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 }),
+      // allPods:      this.$store.dispatch('cluster/findAll', { type: POD }),
+      // 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 }) : []
     };
 
+    debugger;
+    if (this.podSchema) {
+      hash.matchingPods = this.value.fetchPods();
+    }
+
+    // if (this.serviceSchema) {
+    //   const findPageArgs = { // Of type ActionFindPageArgs
+    //     namespaced: this.value.metadata.namespace,
+    //     pagination: new FilterArgs({
+    //       filters: PaginationParamFilter.createSingleField({
+    //         field: 'metadata.fields.1',
+    //         value: TYPES.TLS
+    //       })
+    //     }),
+    //   };
+
+    //   hash.matchingServices = this.$store.dispatch('cluster/findPage', { type: SERVICE, opt: findPageArgs });
+    // }
+
     if (this.value.type === WORKLOAD_TYPES.CRON_JOB) {
       hash.allJobs = this.$store.dispatch('cluster/findAll', { type: WORKLOAD_TYPES.JOB });
     }
@@ -80,17 +100,20 @@ export default {
         this.showProjectMetrics = await allDashboardsExist(this.$store, this.currentCluster.id, [this.WORKLOAD_PROJECT_METRICS_DETAIL_URL, this.WORKLOAD_PROJECT_METRICS_SUMMARY_URL], 'cluster', projectId);
       }
     }
-    this.findMatchingServices();
+    // this.findMatchingServices();
     this.findMatchingIngresses();
   },
 
+  // TODO: RC https://github.com/rancher/dashboard/pull/6311
+
   data() {
     return {
-      allPods:                         [],
-      allServices:                     [],
+      // allPods:                         [],
+      // allServices:                     [],
       allIngresses:                    [],
       matchingServices:                [],
       matchingIngresses:               [],
+      matchingPods: [],
       allJobs:                         [],
       allNodes:                        [],
       WORKLOAD_METRICS_DETAIL_URL,
@@ -180,21 +203,22 @@ export default {
       }, 0);
     },
 
-    podRestarts() {
-      return this.value.pods.reduce((total, pod) => {
-        const { status:{ containerStatuses = [] } } = pod;
+    // Not used anywhere!
+    // podRestarts() {
+    //   return this.value.pods.reduce((total, pod) => {
+    //     const { status:{ containerStatuses = [] } } = pod;
 
-        if (containerStatuses.length) {
-          total += containerStatuses.reduce((tot, container) => {
-            tot += container.restartCount;
+    //     if (containerStatuses.length) {
+    //       total += containerStatuses.reduce((tot, container) => {
+    //         tot += container.restartCount;
 
-            return tot;
-          }, 0);
-        }
+    //         return tot;
+    //       }, 0);
+    //     }
 
-        return total;
-      }, 0);
-    },
+    //     return total;
+    //   }, 0);
+    // },
 
     podHeaders() {
       return this.$store.getters['type-map/headersFor'](this.podSchema).filter((h) => !h.name || h.name !== NAMESPACE_COL.name);
@@ -213,15 +237,19 @@ export default {
     },
 
     showPodGaugeCircles() {
-      const podGauges = Object.values(this.value.podGauges);
-      const total = this.value.pods.length;
+      const podGauges = Object.values(this.podGauges);
+      const total = this.matchingPods.length;
 
       return !podGauges.find((pg) => pg.count === total);
     },
 
+    podGauges() {
+      return this.value.calcPodGauges(this.matchingPods);
+    },
+
     showJobGaugeCircles() {
       const jobGauges = Object.values(this.value.jobGauges);
-      const total = this.isCronJob ? this.totalRuns : this.value.pods.length;
+      const total = this.isCronJob ? this.totalRuns : this.matchingPods.length;
 
       return !jobGauges.find((jg) => jg.count === total);
     },
@@ -252,30 +280,30 @@ export default {
     async scaleUp() {
       await this.scale(true);
     },
-    findMatchingServices() {
-      if (!this.serviceSchema) {
-        return [];
-      }
-      const matchingPods = this.value.pods;
-
-      // Find Services that have selectors that match this
-      // workload's Pod(s).
-      const matchingServices = this.allServices.filter((service) => {
-        const selector = service.spec.selector;
-
-        for (let i = 0; i < matchingPods.length; i++) {
-          const pod = matchingPods[i];
-
-          if (service.metadata?.namespace === this.value.metadata?.namespace && matches(pod, selector)) {
-            return true;
-          }
-        }
-
-        return false;
-      });
-
-      this.matchingServices = matchingServices;
-    },
+    // findMatchingServices() {
+    //   if (!this.serviceSchema) {
+    //     return [];
+    //   }
+    //   const matchingPods = this.value.pods;
+
+    //   // Find Services that have selectors that match this
+    //   // workload's Pod(s).
+    //   const matchingServices = this.allServices.filter((service) => {
+    //     const selector = service.spec.selector;
+
+    //     for (let i = 0; i < matchingPods.length; i++) {
+    //       const pod = matchingPods[i];
+
+    //       if (service.metadata?.namespace === this.value.metadata?.namespace && matches(pod, selector)) {
+    //         return true;
+    //       }
+    //     }
+
+    //     return false;
+    //   });
+
+    //   this.matchingServices = matchingServices;
+    // },
     findMatchingIngresses() {
       if (!this.ingressSchema) {
         return [];
@@ -341,15 +369,15 @@ export default {
       {{ isJob || isCronJob ? t('workload.detailTop.runs') :t('workload.detailTop.pods') }}
     </h3>
     <div
-      v-if="value.pods || value.jobGauges"
+      v-if="matchingPods || value.jobGauges"
       class="gauges mb-20"
-      :class="{'gauges__pods': !!value.pods}"
+      :class="{'gauges__pods': !!matchingPods}"
     >
       <template v-if="value.jobGauges">
         <CountGauge
           v-for="(group, key) in value.jobGauges"
           :key="key"
-          :total="isCronJob? totalRuns : value.pods.length"
+          :total="isCronJob? totalRuns : matchingPods.length"
           :useful="group.count || 0"
           :graphical="showJobGaugeCircles"
           :primary-color-var="`--sizzle-${group.color}`"
@@ -358,9 +386,9 @@ export default {
       </template>
       <template v-else>
         <CountGauge
-          v-for="(group, key) in value.podGauges"
+          v-for="(group, key) in podGauges"
           :key="key"
-          :total="value.pods.length"
+          :total="matchingPods.length"
           :useful="group.count || 0"
           :graphical="showPodGaugeCircles"
           :primary-color-var="`--sizzle-${group.color}`"
@@ -393,8 +421,8 @@ export default {
         :weight="4"
       >
         <ResourceTable
-          v-if="value.pods"
-          :rows="value.pods"
+          v-if="matchingPods?.length"
+          :rows="matchingPods"
           :headers="podHeaders"
           key-field="id"
           :schema="podSchema"
diff --git a/shell/edit/service.vue b/shell/edit/service.vue
index d28f99ce6ec..1f0b8b05d99 100644
--- a/shell/edit/service.vue
+++ b/shell/edit/service.vue
@@ -20,7 +20,7 @@ import { Banner } from '@components/Banner';
 import Labels from '@shell/components/form/Labels';
 import HarvesterServiceAddOnConfig from '@shell/components/HarvesterServiceAddOnConfig';
 import { clone } from '@shell/utils/object';
-import { POD, CAPI, HCI } from '@shell/config/types';
+import { POD, CAPI, HCI, COUNT, NAMESPACE, SERVICE } from '@shell/config/types';
 import { matching } from '@shell/utils/selector';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import { allHash } from '@shell/utils/promise';
@@ -28,6 +28,7 @@ import { isHarvesterSatisfiesVersion } from '@shell/utils/cluster';
 import { Port } from '@shell/utils/validators/formRules';
 import { _CLONE } from '@shell/config/query-params';
 
+
 const SESSION_AFFINITY_ACTION_VALUES = {
   NONE:     'None',
   CLIENTIP: 'ClientIP',
@@ -98,7 +99,6 @@ export default {
 
     return {
       matchingPods,
-      allPods:                     [],
       defaultServiceTypes:         DEFAULT_SERVICE_TYPES,
       saving:                      false,
       sessionAffinityActionLabels: Object.values(SESSION_AFFINITY_ACTION_LABELS)
@@ -109,7 +109,8 @@ export default {
       ),
       fvFormRuleSets:            [],
       fvReportedValidationPaths: ['spec'],
-      closedErrorMessages:       []
+      closedErrorMessages:       [],
+      inStore: this.$store.getters['currentStore'](POD),
     };
   },
 
@@ -257,24 +258,28 @@ export default {
   },
 
   methods: {
-    updateMatchingPods: throttle(function() {
+    updateMatchingPods: throttle(async function() {
+
       const { value: { spec: { selector = { } } } } = this;
-      // See https://github.com/rancher/dashboard/issues/10417, all pods bad, need to replace local selector somehow
-      const allInNamespace = this.allPods.filter((pod) => pod.metadata.namespace === this.value?.metadata?.namespace);
 
-      if (isEmpty(selector)) {
+      debugger;
+      const counts = this.$store.getters[`${ this.inStore }/all`](COUNT)?.[0]?.counts || {};
+      const namespaceCount = counts[SERVICE].namespaces[this.value?.metadata?.namespace]?.count || 0
+
+      if (isEmpty(selector) || namespaceCount === 0) {
         this.matchingPods = {
           matched: 0,
-          total:   allInNamespace.length,
+          total:   namespaceCount,
           none:    true,
           sample:  null,
         };
       } else {
-        const match = matching(allInNamespace, selector);
+        debugger;
+        const match = await this.value.fetchPods();
 
         this.matchingPods = {
           matched: match.length,
-          total:   allInNamespace.length,
+          total:   namespaceCount,
           none:    match.length === 0,
           sample:  match[0] ? match[0].nameDisplay : null,
         };
@@ -283,17 +288,15 @@ export default {
 
     async loadPods() {
       try {
-        const inStore = this.$store.getters['currentStore'](POD);
-
         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 }),
           harvesterConfigs: this.$store.dispatch(`management/findAll`, { type: HCI.HARVESTER_CONFIG }),
         };
 
         const res = await allHash(hash);
 
-        this.allPods = res.pods;
+        // this.allPods = res.pods;
         this.updateMatchingPods();
       } catch (e) { }
     },
diff --git a/shell/models/service.js b/shell/models/service.js
index 4f28b95fde6..b26787dec81 100644
--- a/shell/models/service.js
+++ b/shell/models/service.js
@@ -1,6 +1,10 @@
 import find from 'lodash/find';
 import { POD } from '@shell/config/types';
 import SteveModel from '@shell/plugins/steve/steve-class';
+import { parse } from '@shell/utils/selector';
+import { FilterArgs } from '@shell/types/store/pagination.types';
+import { isEmpty } from 'lodash';
+
 
 // i18n-uses servicesPage.serviceTypes.clusterIp.*, servicesPage.serviceTypes.externalName.*, servicesPage.serviceTypes.headless.*
 // i18n-uses servicesPage.serviceTypes.loadBalancer.*, servicesPage.serviceTypes.nodePort.*
@@ -49,7 +53,7 @@ export const CLUSTERIP = (() => {
   return clusterIp.id;
 })();
 
-export default class extends SteveModel {
+export default class Service extends SteveModel {
   get customValidationRules() {
     return [
       {
@@ -136,19 +140,61 @@ export default class extends SteveModel {
     return (relationships || []).filter((relationship) => relationship.toType === POD)[0];
   }
 
-  async fetchPods() {
-    if (this.podRelationship) {
-      await this.$dispatch('cluster/findMatching', {
-        type:      POD,
-        selector:  this.podRelationship.selector,
-        namespace: this.namespace
-      }, { root: true });
+  /**
+   * TODO: RC docs. always return object (relationship selectors are strings)
+   */
+  get podSelector() {
+    const { spec: { selector = { } } } = this;
+
+    // const selector = this.podRelationship?.selector;
+    // if (typeof selector === 'string') {
+    //   return {
+    //     matchExpressions: parse(selector)
+    //   }
+    // }
+
+    if (isEmpty(selector)) {
+      return;
     }
+
+    return {
+      matchLabels: selector // TODO: RC confirm this is alll is ever is??? can it be string | exp[] | ??
+    };
   }
 
+  async fetchPods(podSelector = this.podSelector) {
+    if (podSelector) {
+      const findPageArgs = { // Of type ActionFindPageArgs
+        namespaced: this.metadata.namespace,
+        pagination: new FilterArgs({
+          labelSelector: podSelector
+        }),
+      };
+
+      return this.$dispatch('findPage', { type: POD, opt: findPageArgs });
+    }
+
+    return Promise.resolve(undefined)
+  }
+
+
+  // async fetchPods() {
+  //   if (this.podSelector) {
+  //     await this.$dispatch('cluster/findMatching', {
+  //       type:      POD,
+  //       selector:  this.podRelationship.selector,
+  //       namespace: this.namespace
+  //     }, { root: true });
+  //   }
+  // }
+
   get pods() {
-    return this.podRelationship ? this.$getters.matching( POD, this.podRelationship.selector, this.namespace ) : [];
+    console.warn('Anything using this must be updated to ????!!!')
+    return []
   }
+  // get pods() {
+  //   return this.podRelationship ? this.$getters.matching( POD, this.podRelationship.selector, this.namespace ) : [];
+  // }
 
   get serviceType() {
     const serviceType = this.spec?.type;
diff --git a/shell/models/workload.js b/shell/models/workload.js
index 5e42571dc90..5d600472ce5 100644
--- a/shell/models/workload.js
+++ b/shell/models/workload.js
@@ -3,9 +3,10 @@ import { TIMESTAMP, CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotat
 import { WORKLOAD_TYPES, SERVICE, POD } from '@shell/config/types';
 import { get, set } from '@shell/utils/object';
 import day from 'dayjs';
-import { convertSelectorObj, matching, matches } from '@shell/utils/selector';
+import { convertSelectorObj, matching, parse } from '@shell/utils/selector';
 import { SEPARATOR } from '@shell/config/workload';
 import WorkloadService from '@shell/models/workload.service';
+import { FilterArgs } from '@shell/types/store/pagination.types';
 
 export const defaultContainer = {
   imagePullPolicy: 'Always',
@@ -202,22 +203,35 @@ export default class Workload extends WorkloadService {
     return this.goToEdit({ sidecar: true });
   }
 
-  get showPodRestarts() {
-    return true;
-  }
+  // When this added... it already existed somewhere else
+  // get restartCount() {
+  //   const pods = this.pods;
+
+  //   let sum = 0;
+
+  //   pods.forEach((pod) => {
+  //     if (pod.status.containerStatuses) {
+  //       sum += pod.status?.containerStatuses[0].restartCount || 0;
+  //     }
+  //   });
+
+  //   return sum;
+  // }
 
   get restartCount() {
-    const pods = this.pods;
+    return this.pods.reduce((total, pod) => {
+      const { status:{ containerStatuses = [] } } = pod;
 
-    let sum = 0;
+      if (containerStatuses.length) {
+        total += containerStatuses.reduce((tot, container) => {
+          tot += container.restartCount || 0;
 
-    pods.forEach((pod) => {
-      if (pod.status.containerStatuses) {
-        sum += pod.status?.containerStatuses[0].restartCount || 0;
+          return tot;
+        }, 0);
       }
-    });
 
-    return sum;
+      return total;
+    }, 0);
   }
 
   get hasSidecars() {
@@ -331,6 +345,10 @@ export default class Workload extends WorkloadService {
     const type = this._type ? this._type : this.type;
 
     const detailItem = {
+      restarts: {
+        label: this.t('resourceDetail.masthead.restartCount'),
+        content: this.restartCount
+      },
       endpoint: {
         label:     'Endpoints',
         content:   this.endpoint,
@@ -548,28 +566,48 @@ export default class Workload extends WorkloadService {
   }
 
   get pods() {
-    const relationships = this.metadata?.relationships || [];
-    const podRelationship = relationships.filter((relationship) => relationship.toType === POD)[0];
+    console.warn('Anything using this must be updated to ????!!!')
+    return []
+  }
 
-    if (podRelationship) {
-      const pods = this.$getters['podsByNamespace'](this.metadata.namespace);
+  // get pods() {
+  //   const relationships = this.metadata?.relationships || [];
+  //   const podRelationship = relationships.filter((relationship) => relationship.toType === POD)[0];
 
-      return pods.filter((obj) => {
-        return matches(obj, podRelationship.selector);
-      });
-    } else {
-      return [];
+  //   if (podRelationship) {
+  //     const pods = this.$getters['podsByNamespace'](this.metadata.namespace);
+
+  //     return pods.filter((obj) => {
+  //       return matches(obj, podRelationship.selector);
+  //     });
+  //   } else {
+  //     return [];
+  //   }
+  // }
+
+  /**
+   * TODO: RC docs. always return object (relationship selectors are strings)
+   */
+  get podSelector() {
+    const relationships = this.metadata?.relationships || [];
+    const selector = relationships.filter((relationship) => relationship.toType === POD)[0]?.selector;
+    if (typeof selector === 'string') {
+      return {
+        matchExpressions: parse(selector)
+      }
     }
+
+    return selector;
   }
 
-  get podGauges() {
+  calcPodGauges(pods) {
     const out = { };
 
-    if (!this.pods) {
+    if (!pods) {
       return out;
     }
 
-    this.pods.map((pod) => {
+    pods.map((pod) => {
       const { stateColor, stateDisplay } = pod;
 
       if (out[stateDisplay]) {
@@ -585,6 +623,27 @@ export default class Workload extends WorkloadService {
     return out;
   }
 
+  get podGauges() {
+    return this.calcPodGauges(this.pods);
+  }
+
+  async fetchPods() {
+    const podSelector = this.podSelector;
+
+      if (podSelector) {
+        const findPageArgs = { // Of type ActionFindPageArgs
+          namespaced: this.metadata.namespace,
+          pagination: new FilterArgs({
+            labelSelector: podSelector
+          }),
+        };
+
+        return this.$dispatch('findPage', { type: POD, opt: findPageArgs });
+      }
+
+    return Promise.resolve(undefined)
+  }
+
   // Job Specific
   get jobRelationships() {
     if (this.type !== WORKLOAD_TYPES.CRON_JOB) {
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index 24f76d1141d..4d393ab92bc 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -16,12 +16,17 @@ import {
 } from '@shell/config/types';
 import { CAPI as CAPI_LABELS } from '@shell/config/labels-annotations';
 import { Schema } from '@shell/plugins/steve/schema';
+import { KubeLabelSelector, KubeLabelSelectorExpression } from 'types/kube/kube-api';
+
+interface NamespaceWithName extends Namespace {
+  name: string,
+}
 
 class NamespaceProjectFilters {
   /**
    * User needs all resources.... except if there's some settings which should remove resources in specific circumstances
    */
-  protected handlePrefAndSettingFilter(allNamespaces: Namespace[], showDynamicRancherNamespaces: boolean, productHidesSystemNamespaces: boolean): PaginationParamFilter[] {
+  protected handlePrefAndSettingFilter(allNamespaces: NamespaceWithName[], showDynamicRancherNamespaces: boolean, productHidesSystemNamespaces: boolean): PaginationParamFilter[] {
     // These are AND'd together
     // Not ns 1 AND ns 2
     return allNamespaces.reduce((res, ns) => {
@@ -47,7 +52,7 @@ class NamespaceProjectFilters {
    *
    * Users resources are those not in system namespaces
    */
-  protected handleSystemOrUserFilter(allNamespaces: Namespace[], isAllSystem: boolean, isAllUser: boolean) {
+  protected handleSystemOrUserFilter(allNamespaces: NamespaceWithName[], isAllSystem: boolean, isAllUser: boolean) {
     const allSystem = allNamespaces.filter((ns) => ns.isSystem);
 
     // > Neither of these use projectsOrNamespaces to avoid scenarios where the local cluster provides a namespace which has
@@ -241,7 +246,7 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     showDynamicRancherNamespaces,
     productHidesSystemNamespaces,
   }: {
-    allNamespaces: Namespace[],
+    allNamespaces: NamespaceWithName[],
     selection: string[],
     /**
      * There is no user provided filter
@@ -362,6 +367,14 @@ class StevePaginationUtils extends NamespaceProjectFilters {
       }
     }
 
+    if (opt.pagination.labelSelector) {
+      const filters = this.convertLabelSelectorPaginationParams(schema, opt.pagination.labelSelector);
+
+      if (filters) {
+        params.push(filters);
+      }
+    }
+
     // Note - There is a `limit` property that is by default 100,000. This can be disabled by using `limit=-1`,
     // but we shouldn't be fetching any pages big enough to exceed the default
 
@@ -454,6 +467,95 @@ class StevePaginationUtils extends NamespaceProjectFilters {
 
     return res;
   }
+
+  private convertLabelSelectorPaginationParams(schema: Schema, labelSelector: KubeLabelSelector): string {
+    // Get a list of matchExpressions
+    const expressions: KubeLabelSelectorExpression[] = labelSelector.matchExpressions ? [...labelSelector.matchExpressions] : []
+
+    // matchLabels are just shortcuts on matchExpressions, for ease convert them
+    if (labelSelector.matchLabels) {
+      Object.entries(labelSelector.matchLabels).forEach(([key, value]) => {
+        const expression: KubeLabelSelectorExpression = {
+          key,
+          values: [value],
+          operator: 'In'
+        }
+
+        expressions.push(expression);
+      })
+    }
+
+    // TODO: RC gt | lt only applicable to NodeSelector. can check on node schema??
+
+    // concert all matchExpressions into string params
+    const filters: string[] = expressions.reduce((res, exp) => {
+      const labelKey = `metadata.labels[${exp.key}]`;
+
+      // TODO: RC console for all below
+      switch(exp.operator) {
+        case 'In':
+          if (!exp.values?.length) {
+            // The operator 'IN' must have `values` specified
+            return res;
+          }
+
+          res.push(`filter=${labelKey} IN (${exp.values.join(',')})`);
+          break;
+        case 'NotIn':
+          if (!exp.values?.length) {
+            // The operator 'NotIn' must have `values` specified
+            return res;
+          }
+
+          res.push(`filter=${labelKey} NOTIN (${exp.values.join(',')})`);
+          break;
+        case 'Exists':
+          if (exp.values?.length) {
+            // The operator 'Exist' must not have `values` specified
+            return res;
+          }
+
+          res.push(`filter=${labelKey}`);
+          break;
+        case 'DoesNotExist':
+          if (exp.values?.length) {
+            // The operator 'DoesNotExist' must not have `values` specified
+            return res;
+          }
+
+          res.push(`filter=!${labelKey}`);
+          break;
+        case 'Gt': // TODO: RC test
+          if (typeof exp.values !== 'string') {
+            // The operator 'Gt' must not have `values` that is a string
+            return res;
+          }
+          res.push(`filter=${labelKey} > (${exp.values})`);
+          break;
+        case 'Lt': // TODO: RC test
+          if (typeof exp.values !== 'string') {
+            // The operator 'Lt' must not have `values` that is a string
+            return res;
+          }
+          res.push(`filter=${labelKey} < (${exp.values})`);
+          break;
+      }
+
+      return res
+    }, [] as string[]);
+
+    return filters.join(',')
+
+    // foo IN [bar] => ?filter=foo+IN+(bar)
+    // foo IN [bar, baz2] => ?filter=foo+IN+(bar,baz2) 
+    // aaa NotIn [bar, baz2]=> ?filter=foo+NOTIN+(bar,baz2) 
+    // bbb Exists=> ?filter=bbb
+    // ccc DoesNotExist ?filter=!bbb. # or %21bbb
+
+    // ddd Gt 1=> ?filter=ddd+<+1
+    // eee Lt 2=> ?filter=eee+>+2
+
+  }
 }
 
 export default new StevePaginationUtils();
diff --git a/shell/types/kube/kube-api.ts b/shell/types/kube/kube-api.ts
new file mode 100644
index 00000000000..09da7a2cb6b
--- /dev/null
+++ b/shell/types/kube/kube-api.ts
@@ -0,0 +1,19 @@
+export interface KubeLabelSelectorExpression {
+  key: string,
+  /**
+   * Gt and Lt are only applicable to node selectors
+   */
+  operator: 'In' | 'NotIn' | 'Exists' | 'DoesNotExist' | 'Gt' | 'Lt',
+  /** 
+   * An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+   */
+  values?: string[],
+}
+
+export interface KubeLabelSelector {
+  matchExpressions?: KubeLabelSelectorExpression[],
+  /**
+   * matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+   */
+  matchLabels?: { [key: string]: string }
+}
\ No newline at end of file
diff --git a/shell/types/store/pagination.types.ts b/shell/types/store/pagination.types.ts
index 356cbe4b4b7..88018e752e4 100644
--- a/shell/types/store/pagination.types.ts
+++ b/shell/types/store/pagination.types.ts
@@ -1,4 +1,5 @@
 import { NAMESPACE_FILTER_NS_FULL_PREFIX, NAMESPACE_FILTER_P_FULL_PREFIX } from '@shell/utils/namespace-filter';
+import { KubeLabelSelector } from 'types/kube/kube-api';
 
 // Pagination Typing
 // These structures are designed to offer both convenience and flexibility based on a common structure and are
@@ -316,6 +317,11 @@ export class PaginationArgs {
    */
   projectsOrNamespaces: PaginationParamProjectOrNamespace[];
 
+  /**
+   * TODO: RC
+   */
+  labelSelector: KubeLabelSelector | null;
+
   /**
    * Creates an instance of PaginationArgs.
    *
@@ -327,6 +333,7 @@ export class PaginationArgs {
     sort = [],
     filters = [],
     projectsOrNamespaces = [],
+    labelSelector = null,
   }:
   // This would be neater as just Partial<PaginationArgs> but we lose all jsdoc
   {
@@ -354,6 +361,10 @@ export class PaginationArgs {
      * For definition see {@link PaginationArgs} `projectsOrNamespaces`
      */
     projectsOrNamespaces?: PaginationParamProjectOrNamespace | PaginationParamProjectOrNamespace[],
+    /**
+     * TODO: RC
+     */
+    labelSelector: KubeLabelSelector | null,
   }) {
     this.page = page;
     this.pageSize = pageSize;
@@ -368,6 +379,7 @@ export class PaginationArgs {
     } else {
       this.projectsOrNamespaces = [];
     }
+    this.labelSelector = labelSelector;
   }
 }
 
@@ -386,6 +398,7 @@ export class FilterArgs extends PaginationArgs {
     sort = [],
     filters = [],
     projectsOrNamespaces = [],
+    labelSelector = null,
   }:
   // This would be neater as just Partial<PaginationArgs> but we lose all jsdoc
   {
@@ -405,9 +418,13 @@ export class FilterArgs extends PaginationArgs {
      * For definition see {@link PaginationArgs} `projectsOrNamespaces`
      */
     projectsOrNamespaces?: PaginationParamProjectOrNamespace | PaginationParamProjectOrNamespace[],
+    /**
+     * TODO: RC
+     */
+    labelSelector: KubeLabelSelector | null
   }) {
     super({
-      page: null, pageSize: null, sort, filters, projectsOrNamespaces
+      page: null, pageSize: null, sort, filters, projectsOrNamespaces, labelSelector
     });
   }
 }

From 0b98e77c2523044d82ae6c79ec756ffe78e689cd Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Fri, 31 Jan 2025 16:12:34 +0000
Subject: [PATCH 2/6] wired in, NOT tested

---
 shell/components/form/ResourceSelector.vue    |  75 +++++++++---
 .../PolicyRule.vue                            |  30 ++---
 .../PolicyRuleTarget.vue                      | 114 +++++++++++-------
 .../PolicyRules.vue                           |  31 ++---
 .../networking.k8s.io.networkpolicy/index.vue |  62 ++++++----
 shell/edit/service.vue                        |   4 +-
 shell/models/service.js                       |   2 +-
 shell/models/workload.js                      |  20 ++-
 shell/pages/c/_cluster/longhorn/index.vue     |   2 +-
 .../CatalogList/CatalogUninstallDialog.vue    |   6 +-
 .../plugins/dashboard-store/resource-class.js |   2 +-
 shell/utils/selector.js                       |  57 ++++++++-
 12 files changed, 278 insertions(+), 127 deletions(-)

diff --git a/shell/components/form/ResourceSelector.vue b/shell/components/form/ResourceSelector.vue
index 2a50136ec25..7b00275e16e 100644
--- a/shell/components/form/ResourceSelector.vue
+++ b/shell/components/form/ResourceSelector.vue
@@ -4,8 +4,10 @@ import MatchExpressions from '@shell/components/form/MatchExpressions';
 import ResourceTable from '@shell/components/ResourceTable';
 import { allHash } from '@shell/utils/promise';
 import { _EDIT } from '@shell/config/query-params';
-import { convert, matching, simplify } from '@shell/utils/selector';
+import { convert, findMatchingResources, matching, simplify } from '@shell/utils/selector';
 import throttle from 'lodash/throttle';
+import { FilterArgs } from '@shell/types/store/pagination.types';
+import { COUNT } from '@shell/config/types';
 
 export default {
   name: 'ResourceSelector',
@@ -37,9 +39,9 @@ export default {
 
   async fetch() {
     // 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 }) });
+    // const hash = await allHash({ allResources: this.$store.dispatch('cluster/findAll', { type: this.type }) });
 
-    this.allResources = hash.allResources;
+    // this.allResources = hash.allResources;
 
     this.updateMatchingResources();
   },
@@ -55,11 +57,12 @@ export default {
 
     return {
       matchingResources,
-      allResources:        [],
-      allResourcesInScope: [],
-      tableHeaders:        this.$store.getters['type-map/headersFor'](
+      // allResources:        [],
+      // allResourcesInScope: [],
+      tableHeaders: this.$store.getters['type-map/headersFor'](
         this.$store.getters['cluster/schemaFor'](this.type)
       ),
+      inStore: this.$store.getters['currentProduct'].inStore,
     };
   },
 
@@ -73,6 +76,9 @@ export default {
     schema() {
       return this.$store.getters['cluster/schemaFor'](this.type);
     },
+    /**
+     * of type matchExpression aka `KubeLabelSelectorExpression[]`
+     */
     selectorExpressions: {
       get() {
         return convert(
@@ -87,22 +93,53 @@ export default {
         this.value['matchExpressions'] = matchExpressions;
       }
     },
+    allResourcesInScope() {
+      const counts = this.$store.getters[`${ this.inStore }/all`](COUNT)?.[0]?.counts || {};
+
+      if (this.namespace) {
+        return counts?.[this.type].namespaces[this.namespace]?.count || 0;
+      }
+
+      return counts[this.type]?.summary?.count || 0;
+    }
   },
 
   methods: {
-    updateMatchingResources: throttle(function() {
-      this.allResourcesInScope = this.namespace ? this.allResources.filter((res) => res.metadata.namespace === this.namespace) : this.allResources;
-      const match = matching(this.allResourcesInScope, this.selectorExpressions);
-      const matched = match.length || 0;
-      const sample = match[0]?.nameDisplay;
-
-      this.matchingResources = {
-        matched,
-        matches: match,
-        none:    matched === 0,
-        sample,
-        total:   this.allResourcesInScope.length,
-      };
+    updateMatchingResources: throttle(async function() {
+      // TODO: RC TEST
+      this.matchingResources = await findMatchingResources({
+        labelSelector: { matchExpressions: this.selectorExpressions },
+        type:          this.type,
+        $store:        this.$store,
+        inScopeCount:  this.allResourcesInScope,
+        namespace:     this.namespace,
+      });
+
+      // let match = [];
+
+      // if (this.selectorExpressions?.length) {
+      //   const findPageArgs = { // Of type ActionFindPageArgs
+      //     namespaced: this.namespace,
+      //     pagination: new FilterArgs({ labelSelector: { matchExpressions: this.selectorExpressions } }),
+      //   };
+
+      //   const res = await this.$dispatch('findPage', { type: this.type, opt: findPageArgs });
+
+      //   match = res;
+      // }
+
+      // // this.allResourcesInScope = this.namespace ? this.allResources.filter((res) => res.metadata.namespace === this.namespace) : this.allResources;
+      // // const match = matching(this.allResourcesInScope, this.selectorExpressions);
+      // const matched = match.length || 0;
+      // const sample = match[0]?.nameDisplay;
+
+      // this.matchingResources = {
+      //   matched,
+      //   matches: match,
+      //   none:    matched === 0,
+      //   sample,
+      //   total:   this.allResourcesInScope.length,
+      // };
     }, 250, { leading: true }),
   }
 
diff --git a/shell/edit/networking.k8s.io.networkpolicy/PolicyRule.vue b/shell/edit/networking.k8s.io.networkpolicy/PolicyRule.vue
index 53e08321cef..32fbf608393 100644
--- a/shell/edit/networking.k8s.io.networkpolicy/PolicyRule.vue
+++ b/shell/edit/networking.k8s.io.networkpolicy/PolicyRule.vue
@@ -28,18 +28,18 @@ export default {
       type:    String,
       default: ''
     },
-    allPods: {
-      type:    Array,
-      default: () => {
-        return [];
-      },
-    },
-    allNamespaces: {
-      type:    Array,
-      default: () => {
-        return [];
-      },
-    },
+    // allPods: {
+    //   type:    Array,
+    //   default: () => {
+    //     return [];
+    //   },
+    // },
+    // allNamespaces: {
+    //   type:    Array,
+    //   default: () => {
+    //     return [];
+    //   },
+    // },
   },
   data() {
     return { targetKey: this.type === 'ingress' ? 'from' : 'to' };
@@ -65,14 +65,16 @@ export default {
           :mode="mode"
         >
           <template #default="props">
+            <!--
+            :all-pods="allPods"
+            :all-namespaces="allNamespaces"-->
             <PolicyRuleTarget
               ref="lastTarget"
               v-model:value="props.row.value"
               :mode="mode"
               :type="type"
               :namespace="namespace"
-              :all-namespaces="allNamespaces"
-              :all-pods="allPods"
+              
               :data-testid="`policy-rule-target-${props.i}`"
             />
           </template>
diff --git a/shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue b/shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue
index 98a1a35d9e5..0e8da4217f0 100644
--- a/shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue
+++ b/shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue
@@ -41,18 +41,18 @@ export default {
       type:    String,
       default: ''
     },
-    allPods: {
-      type:    Array,
-      default: () => {
-        return [];
-      },
-    },
-    allNamespaces: {
-      type:    Array,
-      default: () => {
-        return [];
-      },
-    },
+    // allPods: {
+    //   type:    Array,
+    //   default: () => {
+    //     return [];
+    //   },
+    // },
+    // allNamespaces: {
+    //   type:    Array,
+    //   default: () => {
+    //     return [];
+    //   },
+    // },
   },
   data() {
     if (!this.value[TARGET_OPTIONS.IP_BLOCK] &&
@@ -78,6 +78,9 @@ export default {
     };
   },
   computed: {
+    /**
+     * of type matchExpression aka `KubeLabelSelectorExpression[]`
+     */
     podSelectorExpressions: {
       get() {
         return convert(
@@ -89,6 +92,9 @@ export default {
         this.value[TARGET_OPTIONS.POD_SELECTOR] = simplify(podSelectorExpressions);
       }
     },
+    /**
+     * of type matchExpression aka `KubeLabelSelectorExpression[]`
+     */
     namespaceSelectorExpressions: {
       get() {
         return convert(
@@ -148,10 +154,10 @@ export default {
       handler:   'updateMatches',
       immediate: true
     },
-    allNamespaces: {
-      handler:   'updateMatches',
-      immediate: true
-    },
+    // allNamespaces: {
+    //   handler:   'updateMatches',
+    //   immediate: true // TODO: RC
+    // },
     'value.podSelector': {
       handler:   'updateMatches',
       immediate: true
@@ -173,9 +179,9 @@ export default {
   },
   methods: {
     updateMatches() {
-      throttle(() => {
-        this.matchingNamespaces = this.getMatchingNamespaces();
-        this.matchingPods = this.getMatchingPods();
+      throttle(async() => {
+        this.matchingNamespaces = await this.getMatchingNamespaces();
+        this.matchingPods = await this.getMatchingPods();
       }, this.throttle, { leading: true })();
     },
     validateCIDR() {
@@ -191,34 +197,54 @@ export default {
         this.invalidCidr = null;
       }
     },
-    getMatchingPods() {
-      const namespaces = this.targetType === TARGET_OPTIONS.NAMESPACE_AND_POD_SELECTOR ? this.matchingNamespaces.matches : [{ id: this.namespace }];
-      const allInNamespace = this.allPods.filter((pod) => namespaces.some((ns) => ns.id === pod.metadata.namespace));
-      const match = matching(allInNamespace, this.podSelectorExpressions);
-      const matched = match.length || 0;
-      const sample = match[0]?.nameDisplay;
+    async getMatchingPods() {
+      //TODO: RC TEST
+      return await findMatchingResources({
+        labelSelector: { matchExpressions: this.podSelectorExpressions },
+        type:          POD,
+        $store:        this.$store,
+        inStore: 'cluster',
+        namespace:     this.targetType === TARGET_OPTIONS.NAMESPACE_AND_POD_SELECTOR ? this.matchingNamespaces.matches.map(ns => ns.id) : this.namespace, // TODO: RC multiple?
+        transient: true,
+      });
 
-      return {
-        matched,
-        matches: match,
-        none:    matched === 0,
-        sample,
-        total:   allInNamespace.length,
-      };
+      // const namespaces = this.targetType === TARGET_OPTIONS.NAMESPACE_AND_POD_SELECTOR ? this.matchingNamespaces.matches : [{ id: this.namespace }];
+      // const allInNamespace = this.allPods.filter((pod) => namespaces.some((ns) => ns.id === pod.metadata.namespace));
+      // const match = matching(allInNamespace, this.podSelectorExpressions);
+      // const matched = match.length || 0;
+      // const sample = match[0]?.nameDisplay;
+
+      // return {
+      //   matched,
+      //   matches: match,
+      //   none:    matched === 0,
+      //   sample,
+      //   total:   allInNamespace.length,
+      // };
     },
-    getMatchingNamespaces() {
-      const allNamespaces = this.allNamespaces;
-      const match = matching(allNamespaces, this.namespaceSelectorExpressions);
-      const matched = match.length || 0;
-      const sample = match[0]?.nameDisplay;
+    async getMatchingNamespaces() {
+      //TODO: RC TEST
+      return await findMatchingResources({
+        labelSelector: { matchExpressions: this.namespaceSelectorExpressions },
+        type:          NAMESPACE,
+        $store:        this.$store,
+        inStore: 'cluster',
+        transient: true,
+      });
 
-      return {
-        matched,
-        matches: match,
-        none:    matched === 0,
-        sample,
-        total:   allNamespaces.length,
-      };
+
+      // const allNamespaces = this.allNamespaces;
+      // const match = matching(allNamespaces, this.namespaceSelectorExpressions);
+      // const matched = match.length || 0;
+      // const sample = match[0]?.nameDisplay;
+
+      // return {
+      //   matched,
+      //   matches: match,
+      //   none:    matched === 0,
+      //   sample,
+      //   total:   allNamespaces.length,
+      // };
     },
   }
 };
diff --git a/shell/edit/networking.k8s.io.networkpolicy/PolicyRules.vue b/shell/edit/networking.k8s.io.networkpolicy/PolicyRules.vue
index fbf14531ef4..5960bb65fae 100644
--- a/shell/edit/networking.k8s.io.networkpolicy/PolicyRules.vue
+++ b/shell/edit/networking.k8s.io.networkpolicy/PolicyRules.vue
@@ -24,18 +24,18 @@ export default {
       type:    String,
       default: 'ingress'
     },
-    allPods: {
-      type:    Array,
-      default: () => {
-        return [];
-      },
-    },
-    allNamespaces: {
-      type:    Array,
-      default: () => {
-        return [];
-      },
-    },
+    // allPods: {
+    //   type:    Array,
+    //   default: () => {
+    //     return [];
+    //   },
+    // },
+    // allNamespaces: {
+    //   type:    Array,
+    //   default: () => {
+    //     return [];
+    //   },
+    // },
   },
   data() {
     if (!this.value.spec[this.type]) {
@@ -76,14 +76,17 @@ export default {
             :show-header="false"
             class="container-group"
           >
+          <!--
+          :all-pods="allPods"
+          :all-namespaces="allNamespaces"
+          -->
             <PolicyRule
               ref="lastRule"
               v-model:value="value.spec[type][idx]"
               :mode="mode"
               :type="type"
               :namespace="value.metadata.namespace"
-              :all-namespaces="allNamespaces"
-              :all-pods="allPods"
+              
             />
           </Tab>
         </Tabbed>
diff --git a/shell/edit/networking.k8s.io.networkpolicy/index.vue b/shell/edit/networking.k8s.io.networkpolicy/index.vue
index 8dd5f2f0c31..8fa958d2145 100644
--- a/shell/edit/networking.k8s.io.networkpolicy/index.vue
+++ b/shell/edit/networking.k8s.io.networkpolicy/index.vue
@@ -8,7 +8,7 @@ import CruResource from '@shell/components/CruResource';
 import { Banner } from '@components/Banner';
 import Labels from '@shell/components/form/Labels';
 import { NAMESPACE, POD } from '@shell/config/types';
-import { convert, matching, simplify } from '@shell/utils/selector';
+import { convert, findMatchingResources, matching, simplify } from '@shell/utils/selector';
 import { Checkbox } from '@components/Form/Checkbox';
 import { addObject, removeObject } from '@shell/utils/array';
 import MatchExpressions from '@shell/components/form/MatchExpressions';
@@ -43,12 +43,12 @@ export default {
 
   async fetch() {
     const hash = await allHash({
-      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
+      // 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; // Used in matchingPods, and PolicyRules --> PolicyRule --> PolicyRuleTarget
-    this.allNamespaces = hash.allNamespaces; // Used in PolicyRules --> PolicyRule --> PolicyRuleTarget
+    // this.allPods = hash.allPods; // Used in matchingPods, and PolicyRules --> PolicyRule --> PolicyRuleTarget
+    // this.allNamespaces = hash.allNamespaces; // Used in PolicyRules --> PolicyRule --> PolicyRuleTarget
 
     this.updateMatchingPods();
   },
@@ -75,8 +75,8 @@ export default {
     return {
       POD,
       matchingPods,
-      allPods:         [],
-      allNamespaces:   [],
+      // allPods:         [],
+      // allNamespaces:   [],
       podTableHeaders: this.$store.getters['type-map/headersFor'](
         this.$store.getters['cluster/schemaFor'](POD)
       ),
@@ -127,6 +127,9 @@ export default {
         this.value.spec['policyTypes'] = policyTypes;
       }
     },
+    /**
+     * of type matchExpression aka `KubeLabelSelectorExpression[]`
+     */
     podSelectorExpressions: {
       get() {
         return convert(
@@ -146,19 +149,27 @@ export default {
   },
 
   methods: {
-    updateMatchingPods: throttle(function() {
-      const allInNamespace = this.allPods.filter((pod) => pod.metadata.namespace === this.value.metadata.namespace);
-      const match = matching(allInNamespace, this.podSelectorExpressions);
-      const matched = match.length || 0;
-      const sample = match[0]?.nameDisplay;
+    updateMatchingPods: throttle(async function() {
+      //TODO: RC TEST
+      this.matchingPods = await findMatchingResources({
+        labelSelector: { matchExpressions: this.selectorExpressions },
+        type:          POD,
+        $store:        this.$store,
+        inStore: 'cluster',
+        namespace:     this.value.metadata.namespace,
+      });
+      // const allInNamespace = this.allPods.filter((pod) => pod.metadata.namespace === this.value.metadata.namespace);
+      // const match = matching(allInNamespace, this.podSelectorExpressions);
+      // const matched = match.length || 0;
+      // const sample = match[0]?.nameDisplay;
 
-      this.matchingPods = {
-        matched,
-        matches: match,
-        none:    matched === 0,
-        sample,
-        total:   allInNamespace.length,
-      };
+      // this.matchingPods = {
+      //   matched,
+      //   matches: match,
+      //   none:    matched === 0,
+      //   sample,
+      //   total:   allInNamespace.length,
+      // };
     }, 250, { leading: true }),
   },
 };
@@ -201,13 +212,16 @@ export default {
               :label="t('networkpolicy.ingress.enable')"
               data-testid="network-policy-ingress-enable-checkbox"
             />
+            <!--
+            :all-pods="allPods"
+             :all-namespaces="allNamespaces"
+             -->
             <PolicyRules
               v-if="hasIngressPolicies"
               :value="value"
               type="ingress"
               :mode="mode"
-              :all-namespaces="allNamespaces"
-              :all-pods="allPods"
+              
               @update:value="$emit('input', $event)"
             />
           </Tab>
@@ -226,13 +240,15 @@ export default {
               :mode="mode"
               :label="t('networkpolicy.egress.enable')"
             />
+            <!--
+            :all-namespaces="allNamespaces"
+            :all-pods="allPods" -->
             <PolicyRules
               v-if="hasEgressPolicies"
               :value="value"
               type="egress"
               :mode="mode"
-              :all-namespaces="allNamespaces"
-              :all-pods="allPods"
+              
               @update:value="$emit('input', $event)"
             />
           </Tab>
diff --git a/shell/edit/service.vue b/shell/edit/service.vue
index da5d3f5c4c9..5881d2ed8b0 100644
--- a/shell/edit/service.vue
+++ b/shell/edit/service.vue
@@ -260,6 +260,7 @@ export default {
 
   methods: {
     updateMatchingPods: throttle(async function() {
+      // TODO: RC convert to findMatchingResources?
       const { value: { spec: { selector = { } } } } = this;
 
       debugger;
@@ -294,7 +295,8 @@ export default {
           harvesterConfigs: this.$store.dispatch(`management/findAll`, { type: HCI.HARVESTER_CONFIG }),
         };
 
-        const res = await allHash(hash);
+        await allHash(hash);
+        // const res = await allHash(hash);
 
         // this.allPods = res.pods;
         this.updateMatchingPods();
diff --git a/shell/models/service.js b/shell/models/service.js
index 6992aa47e1d..1e9c585b8b8 100644
--- a/shell/models/service.js
+++ b/shell/models/service.js
@@ -175,7 +175,7 @@ export default class Service extends SteveModel {
 
   // async fetchPods() {
   //   if (this.podSelector) {
-  //     await this.$dispatch('cluster/findMatching', {
+  //     await this.$dispatch('cluster/findMatching', { // TODO: RC LEGACY? No-op
   //       type:      POD,
   //       selector:  this.podRelationship.selector,
   //       namespace: this.namespace
diff --git a/shell/models/workload.js b/shell/models/workload.js
index 561e9596e68..c33324bb4d6 100644
--- a/shell/models/workload.js
+++ b/shell/models/workload.js
@@ -3,7 +3,7 @@ import { TIMESTAMP, CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotat
 import { WORKLOAD_TYPES, SERVICE, POD } from '@shell/config/types';
 import { get, set } from '@shell/utils/object';
 import day from 'dayjs';
-import { convertSelectorObj, matching, parse } from '@shell/utils/selector';
+import { convertSelectorObj, findMatchingResources, matching, parse } from '@shell/utils/selector';
 import { SEPARATOR } from '@shell/config/workload';
 import WorkloadService from '@shell/models/workload.service';
 import { FilterArgs } from '@shell/types/store/pagination.types';
@@ -717,13 +717,23 @@ export default class Workload extends WorkloadService {
   }
 
   async matchingPods() {
+    // TODO: RC where is this used, for shell? test
+    // TODO: RC TEST
+    return await findMatchingResources({
+      labelSelector: { matchExpressions: convertSelectorObj(this.spec.selector) },
+      type:          POD,
+      $store:        this.$store,
+      inStore:       'cluster',
+      namespace:     this.metadata.namespace,
+    });
+
     // 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 all = await this.$dispatch('findAll', { type: POD });
+    // const allInNamespace = all.filter((pod) => pod.metadata.namespace === this.metadata.namespace);
 
-    const selector = convertSelectorObj(this.spec.selector);
+    // const selector = convertSelectorObj(this.spec.selector);
 
-    return matching(allInNamespace, selector);
+    // return matching(allInNamespace, selector);
   }
 
   cleanForSave(data) {
diff --git a/shell/pages/c/_cluster/longhorn/index.vue b/shell/pages/c/_cluster/longhorn/index.vue
index 98f2967e3fb..988d33cd509 100644
--- a/shell/pages/c/_cluster/longhorn/index.vue
+++ b/shell/pages/c/_cluster/longhorn/index.vue
@@ -12,7 +12,7 @@ export default {
 
   async fetch() {
     if ( this.$store.getters['cluster/schemaFor'](SERVICE) ) {
-      this.uiServices = await this.$store.dispatch('cluster/findMatching', {
+      this.uiServices = await this.$store.dispatch('cluster/findMatching', { // TODO: RC LEGACY? No-op
         type:     SERVICE,
         selector: 'app=longhorn-ui'
       });
diff --git a/shell/pages/c/_cluster/uiplugins/CatalogList/CatalogUninstallDialog.vue b/shell/pages/c/_cluster/uiplugins/CatalogList/CatalogUninstallDialog.vue
index 04bc0568cc0..362a69cbcda 100644
--- a/shell/pages/c/_cluster/uiplugins/CatalogList/CatalogUninstallDialog.vue
+++ b/shell/pages/c/_cluster/uiplugins/CatalogList/CatalogUninstallDialog.vue
@@ -95,13 +95,13 @@ export default {
 
       if ( selector ) {
         const hash = await allHash({
-          deployment: this.$store.dispatch('management/findMatching', {
+          deployment: this.$store.dispatch('management/findMatching', { // TODO: RC LEGACY? No-op
             type: WORKLOAD_TYPES.DEPLOYMENT, selector, namespace
           }),
-          service: this.$store.dispatch('management/findMatching', {
+          service: this.$store.dispatch('management/findMatching', { // TODO: RC LEGACY? No-op
             type: SERVICE, selector, namespace
           }),
-          repo: this.$store.dispatch('management/findMatching', { type: CATALOG.CLUSTER_REPO, selector })
+          repo: this.$store.dispatch('management/findMatching', { type: CATALOG.CLUSTER_REPO, selector }) // TODO: RC LEGACY? No-op
         });
 
         for ( const resource of Object.keys(hash) ) {
diff --git a/shell/plugins/dashboard-store/resource-class.js b/shell/plugins/dashboard-store/resource-class.js
index 586f4feffa2..63a8349779c 100644
--- a/shell/plugins/dashboard-store/resource-class.js
+++ b/shell/plugins/dashboard-store/resource-class.js
@@ -1838,7 +1838,7 @@ export default class Resource {
     const out = [];
 
     for ( const sel of selectors ) {
-      const matching = await this.$dispatch('findMatching', sel);
+      const matching = await this.$dispatch('findMatching', sel); // TODO: RC LEGACY? No-op
 
       addObjects(out, matching.data);
     }
diff --git a/shell/utils/selector.js b/shell/utils/selector.js
index edae7685aac..4185e32b940 100644
--- a/shell/utils/selector.js
+++ b/shell/utils/selector.js
@@ -1,5 +1,7 @@
+import { COUNT } from '@shell/config/types';
+import { FilterArgs } from '@shell/types/store/pagination.types';
 import { isArray, addObject, findBy } from '@shell/utils/array';
-import { get } from '@shell/utils/object';
+import { get, isEmpty } from '@shell/utils/object';
 
 const parseCache = {};
 
@@ -227,3 +229,56 @@ export function matches(obj, selector, labelKey = 'metadata.labels') {
 export function matching(ary, selector, labelKey) {
   return ary.filter((obj) => matches(obj, selector, labelKey));
 }
+
+/**
+ * TODO: RC comment
+ *
+ * inScopeCount OR $store and inStore
+ */
+export async function findMatchingResources({
+  /**
+   * of type `KubeLabelSelector`
+   */
+  labelSelector,
+  type,
+  $store = undefined,
+  inStore = undefined,
+  inScopeCount = undefined,
+  namespace = undefined,
+  transient = false,
+}) {
+  let match = [];
+
+  if (labelSelector?.matchExpressions?.length || !isEmpty(labelSelector?.matchLabel)) {
+    if (!inScopeCount) {
+      const counts = $store.getters[`${ inStore }/all`](COUNT)?.[0]?.counts || {};
+
+      inScopeCount = namespace ? counts?.[type]?.namespaces[this.namespace]?.count || 0 : counts?.[type]?.summary?.count || 0;
+    }
+
+    if (inScopeCount) {
+      const findPageArgs = { // Of type ActionFindPageArgs
+        namespaced: namespace,
+        pagination: new FilterArgs({ labelSelector }),
+        transient,
+      };
+
+      const res = await this.$dispatch('findPage', { type, opt: findPageArgs });
+
+      match = res;
+    }
+  }
+
+  // this.allResourcesInScope = this.namespace ? this.allResources.filter((res) => res.metadata.namespace === this.namespace) : this.allResources;
+  // const match = matching(this.allResourcesInScope, this.selectorExpressions);
+  const matched = match.length || 0;
+  const sample = match[0]?.nameDisplay;
+
+  return {
+    matched,
+    matches: match,
+    none:    matched === 0,
+    sample,
+    total:   inScopeCount.length,
+  };
+}

From 4d3e233fef2fabfee746b0fdb4dfc232f6a3d9d0 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Fri, 31 Jan 2025 17:00:17 +0000
Subject: [PATCH 3/6] improvement

---
 shell/edit/service.vue  | 56 +++++++++++++++++++++++++----------------
 shell/utils/selector.js | 53 --------------------------------------
 2 files changed, 34 insertions(+), 75 deletions(-)

diff --git a/shell/edit/service.vue b/shell/edit/service.vue
index 5881d2ed8b0..43fa18115d9 100644
--- a/shell/edit/service.vue
+++ b/shell/edit/service.vue
@@ -23,7 +23,7 @@ import { clone } from '@shell/utils/object';
 import {
   POD, CAPI, HCI, COUNT, NAMESPACE, SERVICE
 } from '@shell/config/types';
-import { matching } from '@shell/utils/selector';
+import { findMatchingResources, matching } from '@shell/utils/selector';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import { allHash } from '@shell/utils/promise';
 import { isHarvesterSatisfiesVersion } from '@shell/utils/cluster';
@@ -261,30 +261,42 @@ export default {
   methods: {
     updateMatchingPods: throttle(async function() {
       // TODO: RC convert to findMatchingResources?
+      // TODO: RC TEST
+
       const { value: { spec: { selector = { } } } } = this;
 
-      debugger;
-      const counts = this.$store.getters[`${ this.inStore }/all`](COUNT)?.[0]?.counts || {};
-      const namespaceCount = counts[SERVICE].namespaces[this.value?.metadata?.namespace]?.count || 0;
+      this.matchingPods = await findMatchingResources({
+        labelSelector: selector,
+        type:          SERVICE,
+        $store:        this.$store,
+        inStore:       this.inStore,
+        namespace:     this.value?.metadata?.namespace, // TODO: RC is this ever null?
+      });
 
-      if (isEmpty(selector) || namespaceCount === 0) {
-        this.matchingPods = {
-          matched: 0,
-          total:   namespaceCount,
-          none:    true,
-          sample:  null,
-        };
-      } else {
-        debugger;
-        const match = await this.value.fetchPods();
-
-        this.matchingPods = {
-          matched: match.length,
-          total:   namespaceCount,
-          none:    match.length === 0,
-          sample:  match[0] ? match[0].nameDisplay : null,
-        };
-      }
+      // const { value: { spec: { selector = { } } } } = this;
+
+      // debugger;
+      // const counts = this.$store.getters[`${ this.inStore }/all`](COUNT)?.[0]?.counts || {};
+      // const namespaceCount = counts[SERVICE].namespaces[this.value?.metadata?.namespace]?.count || 0;
+
+      // if (isEmpty(selector) || namespaceCount === 0) {
+      //   this.matchingPods = {
+      //     matched: 0,
+      //     total:   namespaceCount,
+      //     none:    true,
+      //     sample:  null,
+      //   };
+      // } else {
+      //   debugger;
+      //   const match = await this.value.fetchPods();
+
+      //   this.matchingPods = {
+      //     matched: match.length,
+      //     total:   namespaceCount,
+      //     none:    match.length === 0,
+      //     sample:  match[0] ? match[0].nameDisplay : null,
+      //   };
+      // }
     }, 250, { leading: true }),
 
     async loadPods() {
diff --git a/shell/utils/selector.js b/shell/utils/selector.js
index 4185e32b940..9b3b093973f 100644
--- a/shell/utils/selector.js
+++ b/shell/utils/selector.js
@@ -229,56 +229,3 @@ export function matches(obj, selector, labelKey = 'metadata.labels') {
 export function matching(ary, selector, labelKey) {
   return ary.filter((obj) => matches(obj, selector, labelKey));
 }
-
-/**
- * TODO: RC comment
- *
- * inScopeCount OR $store and inStore
- */
-export async function findMatchingResources({
-  /**
-   * of type `KubeLabelSelector`
-   */
-  labelSelector,
-  type,
-  $store = undefined,
-  inStore = undefined,
-  inScopeCount = undefined,
-  namespace = undefined,
-  transient = false,
-}) {
-  let match = [];
-
-  if (labelSelector?.matchExpressions?.length || !isEmpty(labelSelector?.matchLabel)) {
-    if (!inScopeCount) {
-      const counts = $store.getters[`${ inStore }/all`](COUNT)?.[0]?.counts || {};
-
-      inScopeCount = namespace ? counts?.[type]?.namespaces[this.namespace]?.count || 0 : counts?.[type]?.summary?.count || 0;
-    }
-
-    if (inScopeCount) {
-      const findPageArgs = { // Of type ActionFindPageArgs
-        namespaced: namespace,
-        pagination: new FilterArgs({ labelSelector }),
-        transient,
-      };
-
-      const res = await this.$dispatch('findPage', { type, opt: findPageArgs });
-
-      match = res;
-    }
-  }
-
-  // this.allResourcesInScope = this.namespace ? this.allResources.filter((res) => res.metadata.namespace === this.namespace) : this.allResources;
-  // const match = matching(this.allResourcesInScope, this.selectorExpressions);
-  const matched = match.length || 0;
-  const sample = match[0]?.nameDisplay;
-
-  return {
-    matched,
-    matches: match,
-    none:    matched === 0,
-    sample,
-    total:   inScopeCount.length,
-  };
-}

From df2a4db2160b75c418b339bf904aa17d4fc60ccd Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 3 Feb 2025 14:02:29 +0000
Subject: [PATCH 4/6] sdfdsf

---
 shell/components/form/ResourceSelector.vue    |  10 +-
 shell/detail/workload/index.vue               |   1 -
 .../PolicyRuleTarget.vue                      |  16 +--
 .../networking.k8s.io.networkpolicy/index.vue |  12 +-
 shell/edit/service.vue                        |   2 +-
 shell/models/service.js                       |  45 ++++----
 shell/models/workload.js                      |   2 +-
 shell/pages/c/_cluster/longhorn/index.vue     |  10 +-
 .../CatalogList/CatalogUninstallDialog.vue    |  45 ++++++--
 shell/plugins/dashboard-store/actions.js      |  39 +++++++
 .../plugins/dashboard-store/resource-class.js |  17 ++-
 shell/plugins/steve/steve-class.js            |   4 +
 shell/plugins/steve/steve-pagination-utils.ts | 105 +++++++++---------
 shell/types/kube/kube-api.ts                  |   4 +-
 shell/types/store/pagination.types.ts         |  10 +-
 shell/utils/selector-typed.ts                 |  63 +++++++++++
 16 files changed, 270 insertions(+), 115 deletions(-)
 create mode 100644 shell/utils/selector-typed.ts

diff --git a/shell/components/form/ResourceSelector.vue b/shell/components/form/ResourceSelector.vue
index 7b00275e16e..6a86545378b 100644
--- a/shell/components/form/ResourceSelector.vue
+++ b/shell/components/form/ResourceSelector.vue
@@ -2,12 +2,11 @@
 import { Banner } from '@components/Banner';
 import MatchExpressions from '@shell/components/form/MatchExpressions';
 import ResourceTable from '@shell/components/ResourceTable';
-import { allHash } from '@shell/utils/promise';
 import { _EDIT } from '@shell/config/query-params';
-import { convert, findMatchingResources, matching, simplify } from '@shell/utils/selector';
+import { convert, simplify } from '@shell/utils/selector';
 import throttle from 'lodash/throttle';
-import { FilterArgs } from '@shell/types/store/pagination.types';
 import { COUNT } from '@shell/config/types';
+import { findMatchingResources } from '@shell/utils/selector-typed';
 
 export default {
   name: 'ResourceSelector',
@@ -38,11 +37,6 @@ export default {
   },
 
   async fetch() {
-    // 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;
-
     this.updateMatchingResources();
   },
 
diff --git a/shell/detail/workload/index.vue b/shell/detail/workload/index.vue
index e5b05bb47ee..9ed5c465ca7 100644
--- a/shell/detail/workload/index.vue
+++ b/shell/detail/workload/index.vue
@@ -58,7 +58,6 @@ export default {
       allNodes:     hasNodes ? this.$store.dispatch('cluster/findAll', { type: NODE }) : []
     };
 
-    debugger;
     if (this.podSchema) {
       hash.matchingPods = this.value.fetchPods();
     }
diff --git a/shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue b/shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue
index 0e8da4217f0..a898c677a51 100644
--- a/shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue
+++ b/shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue
@@ -10,6 +10,7 @@ import ArrayList from '@shell/components/form/ArrayList';
 import { Banner } from '@components/Banner';
 import throttle from 'lodash/throttle';
 import { isValidCIDR } from '@shell/utils/validators/cidr';
+import { findMatchingResources } from '@shell/utils/selector-typed';
 
 const TARGET_OPTIONS = {
   IP_BLOCK:                   'ipBlock',
@@ -198,14 +199,14 @@ export default {
       }
     },
     async getMatchingPods() {
-      //TODO: RC TEST
+      // TODO: RC TEST
       return await findMatchingResources({
         labelSelector: { matchExpressions: this.podSelectorExpressions },
         type:          POD,
         $store:        this.$store,
-        inStore: 'cluster',
-        namespace:     this.targetType === TARGET_OPTIONS.NAMESPACE_AND_POD_SELECTOR ? this.matchingNamespaces.matches.map(ns => ns.id) : this.namespace, // TODO: RC multiple?
-        transient: true,
+        inStore:       'cluster',
+        namespace:     this.targetType === TARGET_OPTIONS.NAMESPACE_AND_POD_SELECTOR ? this.matchingNamespaces.matches.map((ns) => ns.id) : this.namespace, // TODO: RC multiple?
+        transient:     true,
       });
 
       // const namespaces = this.targetType === TARGET_OPTIONS.NAMESPACE_AND_POD_SELECTOR ? this.matchingNamespaces.matches : [{ id: this.namespace }];
@@ -223,16 +224,15 @@ export default {
       // };
     },
     async getMatchingNamespaces() {
-      //TODO: RC TEST
+      // TODO: RC TEST
       return await findMatchingResources({
         labelSelector: { matchExpressions: this.namespaceSelectorExpressions },
         type:          NAMESPACE,
         $store:        this.$store,
-        inStore: 'cluster',
-        transient: true,
+        inStore:       'cluster',
+        transient:     true,
       });
 
-
       // const allNamespaces = this.allNamespaces;
       // const match = matching(allNamespaces, this.namespaceSelectorExpressions);
       // const matched = match.length || 0;
diff --git a/shell/edit/networking.k8s.io.networkpolicy/index.vue b/shell/edit/networking.k8s.io.networkpolicy/index.vue
index 8fa958d2145..f8d337530d2 100644
--- a/shell/edit/networking.k8s.io.networkpolicy/index.vue
+++ b/shell/edit/networking.k8s.io.networkpolicy/index.vue
@@ -8,7 +8,9 @@ import CruResource from '@shell/components/CruResource';
 import { Banner } from '@components/Banner';
 import Labels from '@shell/components/form/Labels';
 import { NAMESPACE, POD } from '@shell/config/types';
-import { convert, findMatchingResources, matching, simplify } from '@shell/utils/selector';
+import { convert, simplify } from '@shell/utils/selector';
+import { findMatchingResources } from '@shell/utils/selector-typed';
+
 import { Checkbox } from '@components/Form/Checkbox';
 import { addObject, removeObject } from '@shell/utils/array';
 import MatchExpressions from '@shell/components/form/MatchExpressions';
@@ -150,12 +152,12 @@ export default {
 
   methods: {
     updateMatchingPods: throttle(async function() {
-      //TODO: RC TEST
+      // TODO: RC TEST
       this.matchingPods = await findMatchingResources({
         labelSelector: { matchExpressions: this.selectorExpressions },
         type:          POD,
         $store:        this.$store,
-        inStore: 'cluster',
+        inStore:       'cluster',
         namespace:     this.value.metadata.namespace,
       });
       // const allInNamespace = this.allPods.filter((pod) => pod.metadata.namespace === this.value.metadata.namespace);
@@ -221,7 +223,7 @@ export default {
               :value="value"
               type="ingress"
               :mode="mode"
-              
+
               @update:value="$emit('input', $event)"
             />
           </Tab>
@@ -248,7 +250,7 @@ export default {
               :value="value"
               type="egress"
               :mode="mode"
-              
+
               @update:value="$emit('input', $event)"
             />
           </Tab>
diff --git a/shell/edit/service.vue b/shell/edit/service.vue
index 43fa18115d9..38b5ebfa87c 100644
--- a/shell/edit/service.vue
+++ b/shell/edit/service.vue
@@ -23,7 +23,7 @@ import { clone } from '@shell/utils/object';
 import {
   POD, CAPI, HCI, COUNT, NAMESPACE, SERVICE
 } from '@shell/config/types';
-import { findMatchingResources, matching } from '@shell/utils/selector';
+import { findMatchingResources } from '@shell/utils/selector-typed';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import { allHash } from '@shell/utils/promise';
 import { isHarvesterSatisfiesVersion } from '@shell/utils/cluster';
diff --git a/shell/models/service.js b/shell/models/service.js
index 1e9c585b8b8..2f3e845b603 100644
--- a/shell/models/service.js
+++ b/shell/models/service.js
@@ -153,37 +153,42 @@ export default class Service extends SteveModel {
     // }
 
     if (isEmpty(selector)) {
-      return;
+      return undefined;
     }
 
     return { matchLabels: selector // TODO: RC confirm this is alll is ever is??? can it be string | exp[] | ??
     };
   }
 
-  async fetchPods(podSelector = this.podSelector) {
-    if (podSelector) {
-      const findPageArgs = { // Of type ActionFindPageArgs
-        namespaced: this.metadata.namespace,
-        pagination: new FilterArgs({ labelSelector: podSelector }),
-      };
+  // TODO: RC confirm with pagination off.... no findPage usage
+  // TODO: RC ARG??? podSelector vs  this.podRelationship.selector
 
-      return this.$dispatch('findPage', { type: POD, opt: findPageArgs });
-    }
+  async fetchPods() {
+    // TODO: RC TEST
+    // if (!podSelector) {
+    //   return;
+    // }
 
-    return Promise.resolve(undefined);
+    return await this.$dispatch('findMatchingOrPage', {
+      type:     POD,
+      matching: {
+        namespace:     this.metadata.namespace,
+        labelSelector: { matchLabels: this.podRelationship.selector } // TODO: RC is this string or map
+      }
+      // findPageOpts: { // Of type ActionFindPageArgs
+      //   namespaced: this.metadata.namespace,
+      //   pagination: new FilterArgs({ labelSelector: { matchLabels: this.podRelationship.selector} }),
+      // },
+      // findMatchingOpts: {
+      //   type:      POD,
+      //   selector:  this.podRelationship.selector,
+      //   namespace: this.namespace
+      // }
+    });
   }
 
-  // async fetchPods() {
-  //   if (this.podSelector) {
-  //     await this.$dispatch('cluster/findMatching', { // TODO: RC LEGACY? No-op
-  //       type:      POD,
-  //       selector:  this.podRelationship.selector,
-  //       namespace: this.namespace
-  //     }, { root: true });
-  //   }
-  // }
-
   get pods() {
+    // TODO: RC What uses this??
     console.warn('Anything using this must be updated to ????!!!');
 
     return [];
diff --git a/shell/models/workload.js b/shell/models/workload.js
index c33324bb4d6..e079c617a88 100644
--- a/shell/models/workload.js
+++ b/shell/models/workload.js
@@ -3,7 +3,7 @@ import { TIMESTAMP, CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotat
 import { WORKLOAD_TYPES, SERVICE, POD } from '@shell/config/types';
 import { get, set } from '@shell/utils/object';
 import day from 'dayjs';
-import { convertSelectorObj, findMatchingResources, matching, parse } from '@shell/utils/selector';
+import { convertSelectorObj, findMatchingResources, parse } from '@shell/utils/selector';
 import { SEPARATOR } from '@shell/config/workload';
 import WorkloadService from '@shell/models/workload.service';
 import { FilterArgs } from '@shell/types/store/pagination.types';
diff --git a/shell/pages/c/_cluster/longhorn/index.vue b/shell/pages/c/_cluster/longhorn/index.vue
index 988d33cd509..e3abd47a26b 100644
--- a/shell/pages/c/_cluster/longhorn/index.vue
+++ b/shell/pages/c/_cluster/longhorn/index.vue
@@ -12,9 +12,15 @@ export default {
 
   async fetch() {
     if ( this.$store.getters['cluster/schemaFor'](SERVICE) ) {
-      this.uiServices = await this.$store.dispatch('cluster/findMatching', { // TODO: RC LEGACY? No-op
+      // TODO: RC TEST
+      this.uiServices = await this.$store.dispatch('cluster/findMatchingOrPage', {
         type:     SERVICE,
-        selector: 'app=longhorn-ui'
+        matching: { labelSelector: { matchLabels: { app: 'longhorn-ui' } } }
+
+        // type:             SERVICE,
+        // context:          this.$store,
+        // findPageOpts:     { pagination: new FilterArgs({ labelSelector: { matchLabels: { app: 'longhorn-ui' } } }) },
+        // findMatchingOpts: { type: SERVICE, selector: 'app=longhorn-ui' }
       });
     }
   },
diff --git a/shell/pages/c/_cluster/uiplugins/CatalogList/CatalogUninstallDialog.vue b/shell/pages/c/_cluster/uiplugins/CatalogList/CatalogUninstallDialog.vue
index 362a69cbcda..8be25ecf0eb 100644
--- a/shell/pages/c/_cluster/uiplugins/CatalogList/CatalogUninstallDialog.vue
+++ b/shell/pages/c/_cluster/uiplugins/CatalogList/CatalogUninstallDialog.vue
@@ -7,6 +7,7 @@ import { allHash } from '@shell/utils/promise';
 
 import AsyncButton from '@shell/components/AsyncButton';
 import AppModal from '@shell/components/AppModal.vue';
+import { FilterArgs } from '@shell/types/store/pagination.types';
 
 export default {
   emits: ['closed', 'refresh', 'update'],
@@ -90,18 +91,48 @@ export default {
     },
 
     async removeCatalogResources(catalog) {
-      const selector = `${ UI_PLUGIN_LABELS.CATALOG_IMAGE }=${ catalog.name }`;
+      // const selector = `${ UI_PLUGIN_LABELS.CATALOG_IMAGE }=${ catalog.name }`;
+      const pageSelector = { [UI_PLUGIN_LABELS.CATALOG_IMAGE]: catalog.name };
       const namespace = UI_PLUGIN_NAMESPACE;
 
-      if ( selector ) {
+      // const findPageOpts = {
+      //   namespaced: namespace,
+      //   pagination: new FilterArgs({ labelSelector: { matchLabels: pageSelector } }),
+      // };
+
+      if ( catalog.name ) {
         const hash = await allHash({
-          deployment: this.$store.dispatch('management/findMatching', { // TODO: RC LEGACY? No-op
-            type: WORKLOAD_TYPES.DEPLOYMENT, selector, namespace
+          deployment: this.$store.dispatch('management/findMatchingOrPage', {
+            type:     WORKLOAD_TYPES.DEPLOYMENT,
+            matching: { namespace, labelSelector: { matchLabels: pageSelector } }
+            // type:             WORKLOAD_TYPES.DEPLOYMENT,            // context:          this.$store,
+            // findPageOpts,
+            // findMatchingOpts: {
+            //   type: WORKLOAD_TYPES.DEPLOYMENT, selector, namespace
+            // }
           }),
-          service: this.$store.dispatch('management/findMatching', { // TODO: RC LEGACY? No-op
-            type: SERVICE, selector, namespace
+          service: this.$store.dispatch('management/findMatchingOrPage', {
+            type:     SERVICE,
+            matching: { namespace, labelSelector: { matchLabels: pageSelector } }
+            // type:             SERVICE,
+            // context:          this.$store,
+            // findPageOpts,
+            // findMatchingOpts: { // TODO: RC LEGACY? No-op
+            //   type: SERVICE, selector, namespace
+            // }
           }),
-          repo: this.$store.dispatch('management/findMatching', { type: CATALOG.CLUSTER_REPO, selector }) // TODO: RC LEGACY? No-op
+          repo: this.$store.dispatch('management/findMatchingOrPage', {
+            type:     CATALOG.CLUSTER_REPO,
+            matching: { labelSelector: { matchLabels: pageSelector } }
+
+            // type:         CATALOG.CLUSTER_REPO,
+            // context:      this.$store,
+            // findPageOpts: {
+            //   ...findPageOpts,
+            //   namespace: undefined,
+            // },
+            // findMatchingOpts: { type: CATALOG.CLUSTER_REPO, selector }
+          })
         });
 
         for ( const resource of Object.keys(hash) ) {
diff --git a/shell/plugins/dashboard-store/actions.js b/shell/plugins/dashboard-store/actions.js
index f174d092e7a..123b3c94eb4 100644
--- a/shell/plugins/dashboard-store/actions.js
+++ b/shell/plugins/dashboard-store/actions.js
@@ -9,6 +9,7 @@ import garbageCollect from '@shell/utils/gc/gc';
 import { addSchemaIndexFields } from '@shell/plugins/steve/schema.utils';
 import { addParam } from '@shell/utils/url';
 import { conditionalDepaginate } from '@shell/store/type-map.utils';
+import { FilterArgs } from '@shell/types/store/pagination.types';
 
 export const _ALL = 'all';
 export const _MERGE = 'merge';
@@ -446,6 +447,44 @@ export default {
     } : findAllGetter(getters, type, opt);
   },
 
+  /**
+   *
+   * labelSelector is of type KubeLabelSelector
+   */
+  async findMatchingOrPage(ctx, {
+    type,
+    matching: {
+      namespace,
+      labelSelector
+    },
+    opts
+  }) {
+    const { getters, dispatch } = ctx;
+
+    const args = {
+      id: type,
+      context,
+    };
+
+    if (getters[`paginationEnabled`]?.(args)) {
+      return dispatch('findPage', {
+        type,
+        opts: {
+          ...(opts || {}),
+          namespaced: namespace,
+          pagination: new FilterArgs({ labelSelector }),
+        }
+      });
+    }
+
+    return dispatch('findMatching', {
+      type,
+      selector: labelSelector.matchLabels,
+      opts,
+      namespace,
+    });
+  },
+
   async findMatching(ctx, {
     type,
     selector,
diff --git a/shell/plugins/dashboard-store/resource-class.js b/shell/plugins/dashboard-store/resource-class.js
index 63a8349779c..010d580cd8f 100644
--- a/shell/plugins/dashboard-store/resource-class.js
+++ b/shell/plugins/dashboard-store/resource-class.js
@@ -1838,9 +1838,22 @@ export default class Resource {
     const out = [];
 
     for ( const sel of selectors ) {
-      const matching = await this.$dispatch('findMatching', sel); // TODO: RC LEGACY? No-op
+      const {
+        type,
+        selector,
+        namespace,
+        opt,
+      } = sel;
+      const matching = await this.$dispatch('findMatchingOrPage', {
+        type,
+        matching: {
+          namespace,
+          labelSelector: { matchLabels: selector } // TODO: RC selector is string or map
+        },
+        opts: opt
+      });
 
-      addObjects(out, matching.data);
+      addObjects(out, matching.data); // TODO: RC not data...??
     }
 
     for ( const obj of ids ) {
diff --git a/shell/plugins/steve/steve-class.js b/shell/plugins/steve/steve-class.js
index 882407f0fce..58b23497cf2 100644
--- a/shell/plugins/steve/steve-class.js
+++ b/shell/plugins/steve/steve-class.js
@@ -58,4 +58,8 @@ export default class SteveModel extends HybridModel {
 
     return val;
   }
+
+  paginationEnabled() {
+    return this.$getters['paginationEnabled'](this.type);
+  }
 }
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index ef3808cb119..b66f2d1f163 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -474,91 +474,90 @@ class StevePaginationUtils extends NamespaceProjectFilters {
 
   private convertLabelSelectorPaginationParams(schema: Schema, labelSelector: KubeLabelSelector): string {
     // Get a list of matchExpressions
-    const expressions: KubeLabelSelectorExpression[] = labelSelector.matchExpressions ? [...labelSelector.matchExpressions] : []
+    const expressions: KubeLabelSelectorExpression[] = labelSelector.matchExpressions ? [...labelSelector.matchExpressions] : [];
 
     // matchLabels are just shortcuts on matchExpressions, for ease convert them
     if (labelSelector.matchLabels) {
       Object.entries(labelSelector.matchLabels).forEach(([key, value]) => {
         const expression: KubeLabelSelectorExpression = {
           key,
-          values: [value],
+          values:   [value],
           operator: 'In'
-        }
+        };
 
         expressions.push(expression);
-      })
+      });
     }
 
     // TODO: RC gt | lt only applicable to NodeSelector. can check on node schema??
 
     // concert all matchExpressions into string params
     const filters: string[] = expressions.reduce((res, exp) => {
-      const labelKey = `metadata.labels[${exp.key}]`;
+      const labelKey = `metadata.labels[${ exp.key }]`;
 
       // TODO: RC console for all below
-      switch(exp.operator) {
-        case 'In':
-          if (!exp.values?.length) {
-            // The operator 'IN' must have `values` specified
-            return res;
-          }
+      switch (exp.operator) {
+      case 'In':
+        if (!exp.values?.length) {
+          // The operator 'IN' must have `values` specified
+          return res;
+        }
 
-          res.push(`filter=${labelKey} IN (${exp.values.join(',')})`);
-          break;
-        case 'NotIn':
-          if (!exp.values?.length) {
-            // The operator 'NotIn' must have `values` specified
-            return res;
-          }
+        res.push(`filter=${ labelKey } IN (${ exp.values.join(',') })`);
+        break;
+      case 'NotIn':
+        if (!exp.values?.length) {
+          // The operator 'NotIn' must have `values` specified
+          return res;
+        }
 
-          res.push(`filter=${labelKey} NOTIN (${exp.values.join(',')})`);
-          break;
-        case 'Exists':
-          if (exp.values?.length) {
-            // The operator 'Exist' must not have `values` specified
-            return res;
-          }
+        res.push(`filter=${ labelKey } NOTIN (${ exp.values.join(',') })`);
+        break;
+      case 'Exists':
+        if (exp.values?.length) {
+          // The operator 'Exist' must not have `values` specified
+          return res;
+        }
 
-          res.push(`filter=${labelKey}`);
-          break;
-        case 'DoesNotExist':
-          if (exp.values?.length) {
-            // The operator 'DoesNotExist' must not have `values` specified
-            return res;
-          }
+        res.push(`filter=${ labelKey }`);
+        break;
+      case 'DoesNotExist':
+        if (exp.values?.length) {
+          // The operator 'DoesNotExist' must not have `values` specified
+          return res;
+        }
 
-          res.push(`filter=!${labelKey}`);
-          break;
-        case 'Gt': // TODO: RC test
-          if (typeof exp.values !== 'string') {
-            // The operator 'Gt' must not have `values` that is a string
-            return res;
-          }
-          res.push(`filter=${labelKey} > (${exp.values})`);
-          break;
-        case 'Lt': // TODO: RC test
-          if (typeof exp.values !== 'string') {
-            // The operator 'Lt' must not have `values` that is a string
-            return res;
-          }
-          res.push(`filter=${labelKey} < (${exp.values})`);
-          break;
+        res.push(`filter=!${ labelKey }`);
+        break;
+      case 'Gt': // TODO: RC test
+        if (typeof exp.values !== 'string') {
+          // The operator 'Gt' must not have `values` that is a string
+          return res;
+        }
+        res.push(`filter=${ labelKey } > (${ exp.values })`);
+        break;
+      case 'Lt': // TODO: RC test
+        if (typeof exp.values !== 'string') {
+          // The operator 'Lt' must not have `values` that is a string
+          return res;
+        }
+        res.push(`filter=${ labelKey } < (${ exp.values })`);
+        break;
       }
 
-      return res
+      return res;
     }, [] as string[]);
 
-    return filters.join(',')
+    return filters.join(',');
 
     // foo IN [bar] => ?filter=foo+IN+(bar)
-    // foo IN [bar, baz2] => ?filter=foo+IN+(bar,baz2) 
-    // aaa NotIn [bar, baz2]=> ?filter=foo+NOTIN+(bar,baz2) 
+    // foo IN [bar, baz2] => ?filter=foo+IN+(bar,baz2)
+    // aaa NotIn [bar, baz2]=> ?filter=foo+NOTIN+(bar,baz2)
     // bbb Exists=> ?filter=bbb
     // ccc DoesNotExist ?filter=!bbb. # or %21bbb
 
     // ddd Gt 1=> ?filter=ddd+<+1
     // eee Lt 2=> ?filter=eee+>+2
-
   }
 }
 
diff --git a/shell/types/kube/kube-api.ts b/shell/types/kube/kube-api.ts
index 09da7a2cb6b..8d8383e2e6e 100644
--- a/shell/types/kube/kube-api.ts
+++ b/shell/types/kube/kube-api.ts
@@ -4,7 +4,7 @@ export interface KubeLabelSelectorExpression {
    * Gt and Lt are only applicable to node selectors
    */
   operator: 'In' | 'NotIn' | 'Exists' | 'DoesNotExist' | 'Gt' | 'Lt',
-  /** 
+  /**
    * An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
    */
   values?: string[],
@@ -16,4 +16,4 @@ export interface KubeLabelSelector {
    * matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
    */
   matchLabels?: { [key: string]: string }
-}
\ No newline at end of file
+}
diff --git a/shell/types/store/pagination.types.ts b/shell/types/store/pagination.types.ts
index 88018e752e4..acf1165ad6c 100644
--- a/shell/types/store/pagination.types.ts
+++ b/shell/types/store/pagination.types.ts
@@ -320,7 +320,7 @@ export class PaginationArgs {
   /**
    * TODO: RC
    */
-  labelSelector: KubeLabelSelector | null;
+  labelSelector?: KubeLabelSelector;
 
   /**
    * Creates an instance of PaginationArgs.
@@ -333,7 +333,7 @@ export class PaginationArgs {
     sort = [],
     filters = [],
     projectsOrNamespaces = [],
-    labelSelector = null,
+    labelSelector = undefined,
   }:
   // This would be neater as just Partial<PaginationArgs> but we lose all jsdoc
   {
@@ -364,7 +364,7 @@ export class PaginationArgs {
     /**
      * TODO: RC
      */
-    labelSelector: KubeLabelSelector | null,
+    labelSelector?: KubeLabelSelector,
   }) {
     this.page = page;
     this.pageSize = pageSize;
@@ -398,7 +398,7 @@ export class FilterArgs extends PaginationArgs {
     sort = [],
     filters = [],
     projectsOrNamespaces = [],
-    labelSelector = null,
+    labelSelector = undefined,
   }:
   // This would be neater as just Partial<PaginationArgs> but we lose all jsdoc
   {
@@ -421,7 +421,7 @@ export class FilterArgs extends PaginationArgs {
     /**
      * TODO: RC
      */
-    labelSelector: KubeLabelSelector | null
+    labelSelector?: KubeLabelSelector
   }) {
     super({
       page: null, pageSize: null, sort, filters, projectsOrNamespaces, labelSelector
diff --git a/shell/utils/selector-typed.ts b/shell/utils/selector-typed.ts
new file mode 100644
index 00000000000..9559d3eebfd
--- /dev/null
+++ b/shell/utils/selector-typed.ts
@@ -0,0 +1,63 @@
+import { COUNT } from '@shell/config/types';
+import { KubeLabelSelector } from '@shell/types/kube/kube-api';
+import { FilterArgs } from '@shell/types/store/pagination.types';
+import { isEmpty } from '@shell/utils/object';
+
+/**
+ * Conditionally make a http request to fetch the results of a labelSelector
+ *
+ * In order to determine resources that are in scope either supply `inScopeCount`, OR `$store` and `inStore` (this would be nicer in TS)
+ *
+ * Returns a specific object fit for ??? TODO: RC
+ */
+
+// TODO: RC use this version everywhere
+
+export async function findMatchingResources({
+  labelSelector,
+  type,
+  inStore,
+  $store,
+  inScopeCount = undefined,
+  namespace = undefined,
+  transient = false,
+}: {
+  labelSelector: KubeLabelSelector,
+  type: string,
+  inStore: string,
+  $store: any,
+  inScopeCount?: number
+  namespace?: string,
+  transient?: boolean,
+}) {
+  let match = [];
+
+  if (labelSelector?.matchExpressions?.length || !isEmpty(labelSelector?.matchLabels)) {
+    if (typeof inScopeCount === 'undefined') {
+      const counts = $store.getters[`${ inStore }/all`](COUNT)?.[0]?.counts || {};
+
+      inScopeCount = namespace ? counts?.[type]?.namespaces[namespace]?.count || 0 : counts?.[type]?.summary?.count || 0;
+    }
+
+    if (inScopeCount) {
+      const findPageArgs = { // Of type ActionFindPageArgs
+        namespaced: namespace,
+        pagination: new FilterArgs({ labelSelector }),
+        transient,
+      };
+
+      match = await $store.dispatch(`${ inStore }/findPage`, { type, opt: findPageArgs });
+    }
+  }
+
+  const matched = match.length || 0;
+  const sample = match[0]?.nameDisplay;
+
+  return {
+    matched,
+    matches: match,
+    none:    matched === 0,
+    sample,
+    total:   inScopeCount,
+  };
+}

From 5f9ca2dbcb44c5e151ef3729fd26629a6ffc89ad Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 3 Feb 2025 16:21:16 +0000
Subject: [PATCH 5/6] ryrty

---
 shell/components/form/ResourceSelector.vue    |  4 +-
 .../PolicyRuleTarget.vue                      | 11 +--
 .../networking.k8s.io.networkpolicy/index.vue |  8 +-
 shell/edit/service.vue                        |  6 +-
 shell/models/service.js                       |  8 +-
 shell/models/workload.js                      | 49 +++++++----
 shell/pages/c/_cluster/longhorn/index.vue     |  2 +-
 .../CatalogList/CatalogUninstallDialog.vue    |  6 +-
 shell/plugins/dashboard-store/actions.js      | 12 ++-
 .../plugins/dashboard-store/resource-class.js |  2 +-
 shell/utils/selector-typed.ts                 | 88 ++++++++++++++-----
 shell/utils/selector.js                       |  4 +-
 12 files changed, 134 insertions(+), 66 deletions(-)

diff --git a/shell/components/form/ResourceSelector.vue b/shell/components/form/ResourceSelector.vue
index 6a86545378b..917ccd37cb9 100644
--- a/shell/components/form/ResourceSelector.vue
+++ b/shell/components/form/ResourceSelector.vue
@@ -6,7 +6,7 @@ import { _EDIT } from '@shell/config/query-params';
 import { convert, simplify } from '@shell/utils/selector';
 import throttle from 'lodash/throttle';
 import { COUNT } from '@shell/config/types';
-import { findMatchingResources } from '@shell/utils/selector-typed';
+import { matching } from '@shell/utils/selector-typed';
 
 export default {
   name: 'ResourceSelector',
@@ -101,7 +101,7 @@ export default {
   methods: {
     updateMatchingResources: throttle(async function() {
       // TODO: RC TEST
-      this.matchingResources = await findMatchingResources({
+      this.matchingResources = await matching({
         labelSelector: { matchExpressions: this.selectorExpressions },
         type:          this.type,
         $store:        this.$store,
diff --git a/shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue b/shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue
index a898c677a51..b40911f56a8 100644
--- a/shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue
+++ b/shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue
@@ -5,12 +5,12 @@ import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { _EDIT } from '@shell/config/query-params';
 import MatchExpressions from '@shell/components/form/MatchExpressions';
 import { convert, matching, simplify } from '@shell/utils/selector';
-import { POD } from '@shell/config/types';
+import { NAMESPACE, POD } from '@shell/config/types';
 import ArrayList from '@shell/components/form/ArrayList';
 import { Banner } from '@components/Banner';
 import throttle from 'lodash/throttle';
 import { isValidCIDR } from '@shell/utils/validators/cidr';
-import { findMatchingResources } from '@shell/utils/selector-typed';
+import { matching } from '@shell/utils/selector-typed';
 
 const TARGET_OPTIONS = {
   IP_BLOCK:                   'ipBlock',
@@ -199,8 +199,7 @@ export default {
       }
     },
     async getMatchingPods() {
-      // TODO: RC TEST
-      return await findMatchingResources({
+      return await matching({
         labelSelector: { matchExpressions: this.podSelectorExpressions },
         type:          POD,
         $store:        this.$store,
@@ -209,6 +208,8 @@ export default {
         transient:     true,
       });
 
+      // TODO: RC TEST
+
       // const namespaces = this.targetType === TARGET_OPTIONS.NAMESPACE_AND_POD_SELECTOR ? this.matchingNamespaces.matches : [{ id: this.namespace }];
       // const allInNamespace = this.allPods.filter((pod) => namespaces.some((ns) => ns.id === pod.metadata.namespace));
       // const match = matching(allInNamespace, this.podSelectorExpressions);
@@ -225,7 +226,7 @@ export default {
     },
     async getMatchingNamespaces() {
       // TODO: RC TEST
-      return await findMatchingResources({
+      return await matching({
         labelSelector: { matchExpressions: this.namespaceSelectorExpressions },
         type:          NAMESPACE,
         $store:        this.$store,
diff --git a/shell/edit/networking.k8s.io.networkpolicy/index.vue b/shell/edit/networking.k8s.io.networkpolicy/index.vue
index f8d337530d2..55b7397af3c 100644
--- a/shell/edit/networking.k8s.io.networkpolicy/index.vue
+++ b/shell/edit/networking.k8s.io.networkpolicy/index.vue
@@ -9,7 +9,7 @@ import { Banner } from '@components/Banner';
 import Labels from '@shell/components/form/Labels';
 import { NAMESPACE, POD } from '@shell/config/types';
 import { convert, simplify } from '@shell/utils/selector';
-import { findMatchingResources } from '@shell/utils/selector-typed';
+import { matching } from '@shell/utils/selector-typed';
 
 import { Checkbox } from '@components/Form/Checkbox';
 import { addObject, removeObject } from '@shell/utils/array';
@@ -153,13 +153,15 @@ export default {
   methods: {
     updateMatchingPods: throttle(async function() {
       // TODO: RC TEST
-      this.matchingPods = await findMatchingResources({
-        labelSelector: { matchExpressions: this.selectorExpressions },
+      const matchInfo = await matching({
+        labelSelector: { matchExpressions: this.podSelectorExpressions },
         type:          POD,
         $store:        this.$store,
         inStore:       'cluster',
         namespace:     this.value.metadata.namespace,
       });
+
+      this.matchingPods = matchInfo.matches;
       // 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 38b5ebfa87c..f4d6b76bd29 100644
--- a/shell/edit/service.vue
+++ b/shell/edit/service.vue
@@ -23,7 +23,7 @@ import { clone } from '@shell/utils/object';
 import {
   POD, CAPI, HCI, COUNT, NAMESPACE, SERVICE
 } from '@shell/config/types';
-import { findMatchingResources } from '@shell/utils/selector-typed';
+import { matching } from '@shell/utils/selector-typed';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import { allHash } from '@shell/utils/promise';
 import { isHarvesterSatisfiesVersion } from '@shell/utils/cluster';
@@ -260,12 +260,12 @@ export default {
 
   methods: {
     updateMatchingPods: throttle(async function() {
-      // TODO: RC convert to findMatchingResources?
+      // TODO: RC convert to matching?
       // TODO: RC TEST
 
       const { value: { spec: { selector = { } } } } = this;
 
-      this.matchingPods = await findMatchingResources({
+      this.matchingPods = await matching({
         labelSelector: selector,
         type:          SERVICE,
         $store:        this.$store,
diff --git a/shell/models/service.js b/shell/models/service.js
index 2f3e845b603..e0e3373d37c 100644
--- a/shell/models/service.js
+++ b/shell/models/service.js
@@ -165,11 +165,11 @@ export default class Service extends SteveModel {
 
   async fetchPods() {
     // TODO: RC TEST
-    // if (!podSelector) {
-    //   return;
-    // }
+    if (!this.podRelationship?.selector) {
+      return;
+    }
 
-    return await this.$dispatch('findMatchingOrPage', {
+    return await this.$dispatch('findLabelSelector', {
       type:     POD,
       matching: {
         namespace:     this.metadata.namespace,
diff --git a/shell/models/workload.js b/shell/models/workload.js
index e079c617a88..725879eaaf9 100644
--- a/shell/models/workload.js
+++ b/shell/models/workload.js
@@ -3,10 +3,11 @@ import { TIMESTAMP, CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotat
 import { WORKLOAD_TYPES, SERVICE, POD } from '@shell/config/types';
 import { get, set } from '@shell/utils/object';
 import day from 'dayjs';
-import { convertSelectorObj, findMatchingResources, parse } from '@shell/utils/selector';
+import { convertSelectorObj, parse } from '@shell/utils/selector';
 import { SEPARATOR } from '@shell/config/workload';
 import WorkloadService from '@shell/models/workload.service';
 import { FilterArgs } from '@shell/types/store/pagination.types';
+import { matching } from '@shell/utils/selector-typed';
 
 export const defaultContainer = {
   imagePullPolicy: 'Always',
@@ -565,6 +566,29 @@ export default class Workload extends WorkloadService {
     }
   }
 
+  async fetchPods() {
+    // const podSelector = this.podSelector;
+
+    // if (podSelector) {
+    return this.$dispatch('findLabelSelector', {
+      type:     POD,
+      matching: {
+        namespaced: this.metadata.namespace,
+        pagination: new FilterArgs({ labelSelector: this.podSelector }),
+      }
+    });
+
+    // const findPageArgs = { // Of type ActionFindPageArgs
+    //   namespaced: this.metadata.namespace,
+    //   pagination: new FilterArgs({ labelSelector: podSelector }),
+    // };
+
+    // return this.$dispatch('findPage', { type: POD, opt: findPageArgs });
+    // }
+
+    // return Promise.resolve(undefined);
+  }
+
   get pods() {
     console.warn('Anything using this must be updated to ????!!!');
 
@@ -587,7 +611,7 @@ export default class Workload extends WorkloadService {
   // }
 
   /**
-   * TODO: RC docs. always return object (relationship selectors are strings)
+   * TODO: RC what SHOULD this do? always return object (relationship selectors are strings)
    */
   get podSelector() {
     const relationships = this.metadata?.relationships || [];
@@ -627,21 +651,6 @@ export default class Workload extends WorkloadService {
     return this.calcPodGauges(this.pods);
   }
 
-  async fetchPods() {
-    const podSelector = this.podSelector;
-
-    if (podSelector) {
-      const findPageArgs = { // Of type ActionFindPageArgs
-        namespaced: this.metadata.namespace,
-        pagination: new FilterArgs({ labelSelector: podSelector }),
-      };
-
-      return this.$dispatch('findPage', { type: POD, opt: findPageArgs });
-    }
-
-    return Promise.resolve(undefined);
-  }
-
   // Job Specific
   get jobRelationships() {
     if (this.type !== WORKLOAD_TYPES.CRON_JOB) {
@@ -717,9 +726,11 @@ export default class Workload extends WorkloadService {
   }
 
   async matchingPods() {
+    // TODO: RC fetchPods (findLabelSelector) vs matchingPods (matching)
+
     // TODO: RC where is this used, for shell? test
     // TODO: RC TEST
-    return await findMatchingResources({
+    const matchInfo = await matching({
       labelSelector: { matchExpressions: convertSelectorObj(this.spec.selector) },
       type:          POD,
       $store:        this.$store,
@@ -727,6 +738,8 @@ export default class Workload extends WorkloadService {
       namespace:     this.metadata.namespace,
     });
 
+    return matchInfo.matches;
+
     // 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);
diff --git a/shell/pages/c/_cluster/longhorn/index.vue b/shell/pages/c/_cluster/longhorn/index.vue
index e3abd47a26b..bd825a5a073 100644
--- a/shell/pages/c/_cluster/longhorn/index.vue
+++ b/shell/pages/c/_cluster/longhorn/index.vue
@@ -13,7 +13,7 @@ export default {
   async fetch() {
     if ( this.$store.getters['cluster/schemaFor'](SERVICE) ) {
       // TODO: RC TEST
-      this.uiServices = await this.$store.dispatch('cluster/findMatchingOrPage', {
+      this.uiServices = await this.$store.dispatch('cluster/findLabelSelector', {
         type:     SERVICE,
         matching: { labelSelector: { matchLabels: { app: 'longhorn-ui' } } }
 
diff --git a/shell/pages/c/_cluster/uiplugins/CatalogList/CatalogUninstallDialog.vue b/shell/pages/c/_cluster/uiplugins/CatalogList/CatalogUninstallDialog.vue
index 8be25ecf0eb..d2fb1e950ae 100644
--- a/shell/pages/c/_cluster/uiplugins/CatalogList/CatalogUninstallDialog.vue
+++ b/shell/pages/c/_cluster/uiplugins/CatalogList/CatalogUninstallDialog.vue
@@ -102,7 +102,7 @@ export default {
 
       if ( catalog.name ) {
         const hash = await allHash({
-          deployment: this.$store.dispatch('management/findMatchingOrPage', {
+          deployment: this.$store.dispatch('management/findLabelSelector', {
             type:     WORKLOAD_TYPES.DEPLOYMENT,
             matching: { namespace, labelSelector: { matchLabels: pageSelector } }
             // type:             WORKLOAD_TYPES.DEPLOYMENT,            // context:          this.$store,
@@ -111,7 +111,7 @@ export default {
             //   type: WORKLOAD_TYPES.DEPLOYMENT, selector, namespace
             // }
           }),
-          service: this.$store.dispatch('management/findMatchingOrPage', {
+          service: this.$store.dispatch('management/findLabelSelector', {
             type:     SERVICE,
             matching: { namespace, labelSelector: { matchLabels: pageSelector } }
             // type:             SERVICE,
@@ -121,7 +121,7 @@ export default {
             //   type: SERVICE, selector, namespace
             // }
           }),
-          repo: this.$store.dispatch('management/findMatchingOrPage', {
+          repo: this.$store.dispatch('management/findLabelSelector', {
             type:     CATALOG.CLUSTER_REPO,
             matching: { labelSelector: { matchLabels: pageSelector } }
 
diff --git a/shell/plugins/dashboard-store/actions.js b/shell/plugins/dashboard-store/actions.js
index 123b3c94eb4..d3d9f035d87 100644
--- a/shell/plugins/dashboard-store/actions.js
+++ b/shell/plugins/dashboard-store/actions.js
@@ -363,6 +363,9 @@ export default {
   },
 
   /**
+   * If result not already cached, make a http request to fetch a specific set of resources
+   *
+   * This accepts all the new sql-cache backed api features (sort, filter, etc)
    *
    * @param {*} ctx
    * @param { {type: string, opt: ActionFindPageArgs} } opt
@@ -448,10 +451,13 @@ export default {
   },
 
   /**
+   * If result not already cached, fetch filtered resource either via
+   * a) sql-cache backed api request (if pagination is supported for this type) - findPage
+   * b) legacy / native kube api request - findMatching
    *
-   * labelSelector is of type KubeLabelSelector
+   * Filter is defined via the kube labelSelector object (see KubeLabelSelector)
    */
-  async findMatchingOrPage(ctx, {
+  async findLabelSelector(ctx, {
     type,
     matching: {
       namespace,
@@ -461,6 +467,8 @@ export default {
   }) {
     const { getters, dispatch } = ctx;
 
+    // TODO: RC return all if no / empty labelSelector.. or none?
+
     const args = {
       id: type,
       context,
diff --git a/shell/plugins/dashboard-store/resource-class.js b/shell/plugins/dashboard-store/resource-class.js
index 010d580cd8f..8889e4e7d9c 100644
--- a/shell/plugins/dashboard-store/resource-class.js
+++ b/shell/plugins/dashboard-store/resource-class.js
@@ -1844,7 +1844,7 @@ export default class Resource {
         namespace,
         opt,
       } = sel;
-      const matching = await this.$dispatch('findMatchingOrPage', {
+      const matching = await this.$dispatch('findLabelSelector', {
         type,
         matching: {
           namespace,
diff --git a/shell/utils/selector-typed.ts b/shell/utils/selector-typed.ts
index 9559d3eebfd..c4d8c1d72c0 100644
--- a/shell/utils/selector-typed.ts
+++ b/shell/utils/selector-typed.ts
@@ -2,18 +2,22 @@ import { COUNT } from '@shell/config/types';
 import { KubeLabelSelector } from '@shell/types/kube/kube-api';
 import { FilterArgs } from '@shell/types/store/pagination.types';
 import { isEmpty } from '@shell/utils/object';
+import { matching as rootMatching } from '@shell/utils/selector';
+
+// TODO: RC use this version everywhere
 
 /**
- * Conditionally make a http request to fetch the results of a labelSelector
+ * Find matching resources either via
+ * a) fetching filtered resources directly (if pagination is supported for this type) - findPage
+ * b) fetching all of type and filtering locally - findAll --> root matching
+ *
+ * This is a much smarter version of shell/utils/selector.js `matching` (which just does local filtering)
  *
- * In order to determine resources that are in scope either supply `inScopeCount`, OR `$store` and `inStore` (this would be nicer in TS)
+ * If fetching all of a type can be avoided it's better to use the findLabelSelector action
  *
- * Returns a specific object fit for ??? TODO: RC
+ * Resources are returned in a common format which includes metadata
  */
-
-// TODO: RC use this version everywhere
-
-export async function findMatchingResources({
+export async function matching({
   labelSelector,
   type,
   inStore,
@@ -22,32 +26,74 @@ export async function findMatchingResources({
   namespace = undefined,
   transient = false,
 }: {
+  /**
+   * Standard kube label selector object
+   */
   labelSelector: KubeLabelSelector,
+  /**
+   * Resource type
+   */
   type: string,
+  /**
+   * Store in which resources will be cached
+   */
   inStore: string,
+  /**
+   * Standard vuex store object
+   */
   $store: any,
+  /**
+   * Number of resources that are applicable when filtering.
+   *
+   * Used to skip any potential http request if there's no resources to filter from
+   *
+   * If this property is not supplied we'll try and fetch it via the COUNTS object.
+   */
   inScopeCount?: number
+  /**
+   * Optional namespace to apply selector to
+   */
   namespace?: string,
+  /**
+   * Should the result bypass the store?
+   */
   transient?: boolean,
-}) {
+}): Promise<{
+  matched: number,
+  matches: any[],
+  none: boolean,
+  sample: any,
+  total: number,
+}> {
+  // TODO: RC confirm value of selector from everywhere (matches has some funky logic aka converts odd things, if valid returns all candidates)
   let match = [];
 
-  if (labelSelector?.matchExpressions?.length || !isEmpty(labelSelector?.matchLabels)) {
-    if (typeof inScopeCount === 'undefined') {
-      const counts = $store.getters[`${ inStore }/all`](COUNT)?.[0]?.counts || {};
+  if ($store.getters[`${ inStore }/paginationEnabled`]?.({ id: type })) {
+    if (labelSelector?.matchExpressions?.length || !isEmpty(labelSelector?.matchLabels)) {
+      if (typeof inScopeCount === 'undefined') {
+        const counts = $store.getters[`${ inStore }/all`](COUNT)?.[0]?.counts || {};
 
-      inScopeCount = namespace ? counts?.[type]?.namespaces[namespace]?.count || 0 : counts?.[type]?.summary?.count || 0;
-    }
+        inScopeCount = namespace ? counts?.[type]?.namespaces[namespace]?.count || 0 : counts?.[type]?.summary?.count || 0;
+      }
 
-    if (inScopeCount) {
-      const findPageArgs = { // Of type ActionFindPageArgs
-        namespaced: namespace,
-        pagination: new FilterArgs({ labelSelector }),
-        transient,
-      };
+      if (inScopeCount) {
+        const findPageArgs = { // Of type ActionFindPageArgs
+          namespaced: namespace,
+          pagination: new FilterArgs({ labelSelector }),
+          transient,
+        };
 
-      match = await $store.dispatch(`${ inStore }/findPage`, { type, opt: findPageArgs });
+        match = await $store.dispatch(`${ inStore }/findPage`, { type, opt: findPageArgs });
+      }
     }
+  } else {
+    let candidates = await $store.dispatch(`${ inStore }/findAll`, { type });
+
+    if (namespace) {
+      candidates = candidates.filter((e: any) => e.metadata?.namespace === namespace);
+    }
+
+    match = rootMatching(candidates, labelSelector);
   }
 
   const matched = match.length || 0;
@@ -58,6 +104,6 @@ export async function findMatchingResources({
     matches: match,
     none:    matched === 0,
     sample,
-    total:   inScopeCount,
+    total:   inScopeCount || 0,
   };
 }
diff --git a/shell/utils/selector.js b/shell/utils/selector.js
index 9b3b093973f..edae7685aac 100644
--- a/shell/utils/selector.js
+++ b/shell/utils/selector.js
@@ -1,7 +1,5 @@
-import { COUNT } from '@shell/config/types';
-import { FilterArgs } from '@shell/types/store/pagination.types';
 import { isArray, addObject, findBy } from '@shell/utils/array';
-import { get, isEmpty } from '@shell/utils/object';
+import { get } from '@shell/utils/object';
 
 const parseCache = {};
 

From e94cfbc03c2e70733835970144d87c78846a4aac Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 3 Feb 2025 16:28:27 +0000
Subject: [PATCH 6/6] werer

---
 .../PolicyRuleTarget.vue                             | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue b/shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue
index b40911f56a8..010e7db63ee 100644
--- a/shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue
+++ b/shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue
@@ -11,6 +11,7 @@ import { Banner } from '@components/Banner';
 import throttle from 'lodash/throttle';
 import { isValidCIDR } from '@shell/utils/validators/cidr';
 import { matching } from '@shell/utils/selector-typed';
+import { allHash } from '@shell/utils/promise';
 
 const TARGET_OPTIONS = {
   IP_BLOCK:                   'ipBlock',
@@ -181,9 +182,14 @@ export default {
   methods: {
     updateMatches() {
       throttle(async() => {
-        this.matchingNamespaces = await this.getMatchingNamespaces();
-        this.matchingPods = await this.getMatchingPods();
-      }, this.throttle, { leading: true })();
+        const { ns, p } = await allHash({
+          ns: this.getMatchingNamespaces(),
+          p:  this.getMatchingPods()
+        });
+
+        this.matchingNamespaces = ns;
+        this.matchingPods = p;
+      }, this.throttle, { leading: true })(); // TODO: RC shouldn't there be a number? what's default?
     },
     validateCIDR() {
       const exceptCidrs = this.value[TARGET_OPTIONS.IP_BLOCK]?.except || [];