From 7e5ad5de3473c3356afe92a85a370f30dc329fee Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 28 Apr 2023 11:09:38 +0100
Subject: [PATCH 01/10] Expand enforced namespace filtering to multiple
 namespaces and projects

> This uses a new endpoint that has yet to merge. See https://github.com/rancher/rancher/issues/40140

WIP
- Contains console.warns (via custom logger, can be disabled)
- Waiting for final BE endpoint changes to merge
- Contains TODOs to resolve on final enpoint changes delivered

Pertinent Points
- Incompatible with incremental loading / manual refresh
  - Harder to get counts (need to sum up from different namespaces)
  - Requires use of new steve pagination
- Enforced NS threshold has been removed
  - The threshold only applies to the primary resource. This has issues when loading a low count primary (daemon sets) which depends on a very high count secondary (pods)
  - Fixing this would involve knowing all secondary resources a list uses, which isn't currently possible (each resource is requested individually, need to know them all first)
- There is no way to subscribe to multiple namespaces (one or all)
  - We mock this in subscribe by only persisting changes to resources from within target namespaces
- Everything should work with Advanced Worker enabled
---
 pkg/epinio/store/epinio-store/getters.ts      |   6 +-
 shell/assets/translations/en-us.yaml          |  16 +--
 shell/components/ResourceList/Masthead.vue    |   5 -
 .../ResourceList/ResourceLoadingIndicator.vue |  10 +-
 shell/components/ResourceList/index.vue       |  10 +-
 shell/components/ResourceTable.vue            |  23 +++-
 shell/components/nav/NamespaceFilter.vue      | 108 +++++++++++-------
 shell/config/settings.ts                      |   3 +-
 shell/mixins/resource-fetch-namespaced.js     |  42 ++++---
 shell/mixins/resource-fetch.js                |   7 +-
 .../pages/c/_cluster/settings/performance.vue |  69 ++++++++---
 shell/plugins/dashboard-store/actions.js      |  12 +-
 shell/plugins/dashboard-store/getters.js      |   7 ++
 shell/plugins/dashboard-store/mutations.js    |   3 +
 shell/plugins/steve/actions.js                |   9 +-
 shell/plugins/steve/getters.js                |  10 +-
 .../projectAndNamespaceFiltering.utils.ts     |  71 ++++++++++++
 shell/plugins/steve/subscribe.js              |  83 +++++++++++++-
 shell/store/index.js                          |  31 +----
 shell/utils/namespace-filter.js               |  22 +++-
 shell/utils/richards-logger.ts                |  18 +++
 21 files changed, 405 insertions(+), 160 deletions(-)
 create mode 100644 shell/plugins/steve/projectAndNamespaceFiltering.utils.ts
 create mode 100644 shell/utils/richards-logger.ts

diff --git a/pkg/epinio/store/epinio-store/getters.ts b/pkg/epinio/store/epinio-store/getters.ts
index 5727b593661..ed8e811fcb9 100644
--- a/pkg/epinio/store/epinio-store/getters.ts
+++ b/pkg/epinio/store/epinio-store/getters.ts
@@ -1,7 +1,7 @@
 import { EPINIO_TYPES } from '../../types';
 import {
-  NAMESPACE_FILTER_SPECIAL as SPECIAL,
-  NAMESPACE_FILTER_ALL as ALL
+  NAMESPACE_FILTER_ALL as ALL,
+  NAMESPACE_FILTER_KINDS
 } from '@shell/utils/namespace-filter';
 
 export default {
@@ -51,7 +51,7 @@ export default {
   }: any) => {
     const out = [{
       id:    ALL,
-      kind:  SPECIAL,
+      kind:  NAMESPACE_FILTER_KINDS.SPECIAL,
       label: rootGetters['i18n/t']('nav.ns.all'),
     }];
 
diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 5d1c04999ef..50ca5adc387 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -4591,8 +4591,8 @@ resourceList:
     create: Create
     createFromYaml: Create from YAML
     createResource: "Create {resourceName}"
-  nsFiltering: "There are too many {resource}.<br>Please filter them by selecting a Namespace above."
-  nsFilterToolTip: "There are too many resources, filtering is restricted to a single {mode}."
+  nsFiltering: "There are too many {resource}.<br>Please filter them by selecting Namespaces / Projects above."
+  nsFilterToolTip: "There are too many resources, filtering is restricted to projects and namespaces"
 resourceLoadingIndicator:
   loading: Loading
 
@@ -6994,6 +6994,7 @@ performance:
       When enabled, resources will appear more quickly, but it may take slightly longer to load the entire set of resources. This setting only applies to resources that come from the Kubernetes API
     checkboxLabel: Enable incremental loading
     inputLabel: Resource Threshold
+    incompatibleDescription: "Incremental Loading is incomaptible with Namespace/Project filtering. Enabling this will disable it."
   manualRefresh:
     label: Manual Refresh
     setting: You can configure a threshold above which manual refresh will be enabled.
@@ -7002,6 +7003,7 @@ performance:
       When enabled, list data will not auto-update but instead the user must manually trigger a list-view refresh. This setting only applies to resources that come from the Kubernetes API
     checkboxLabel: Enable manual refresh of data for lists
     inputLabel: Resource Threshold
+    incompatibleDescription: "Manual Refresh is incomaptible with Namespace/Project filtering. Enabling this will disable it."
   websocketNotification:
     label: Websocket Notifications
     description: |-
@@ -7029,12 +7031,10 @@ performance:
         description: Resource types must exceed this amount to be considered for garbage collection.
         inputLabel: Resource Count
   nsFiltering:
-    label: Require Namespace Filtering
-    description: When there are too many resources to show in a list, require the user to select a single namespace and only fetch resources from within it.
-    checkboxLabel: Enable Required Namespace Filtering
-    count:
-      inputLabel: Resource Threshold
-      description: The threshold above which filtering by a namespace is required
+    label: Require Namespace / Project Filtering
+    description: Require the user to select namespaces and/or projects. This restricts the number of resources fetched when viewing lists and should help the responsiveness of the UI in systems with a lot of resources.
+    checkboxLabel: Enable Required Namespace / Project Filtering
+    incompatibleDescription: "Required Namespace / Project Filtering is incomaptible with Manual Refresh and Incremental Loading. Enabling this will disable them."
   advancedWorker:
     label: Websocket Web Worker
     description: Updates to resources pushed to the UI come via WebSocket and are handled in the UI thread. Enable this option to handle cluster WebSocket updates in a Web Worker in a separate thread. This should help the responsiveness of the UI in systems where resources change often.
diff --git a/shell/components/ResourceList/Masthead.vue b/shell/components/ResourceList/Masthead.vue
index c2c5e49d6a4..ce9de88817d 100644
--- a/shell/components/ResourceList/Masthead.vue
+++ b/shell/components/ResourceList/Masthead.vue
@@ -65,10 +65,6 @@ export default {
       default: false
     },
 
-    loadNamespace: {
-      type:    String,
-      default: null
-    },
 
     showIncrementalLoadingIndicator: {
       type:    Boolean,
@@ -183,7 +179,6 @@ export default {
         v-if="showIncrementalLoadingIndicator"
         :resources="loadResources"
         :indeterminate="loadIndeterminate"
-        :namespace="loadNamespace"
       />
     </div>
     <div class="actions-container">
diff --git a/shell/components/ResourceList/ResourceLoadingIndicator.vue b/shell/components/ResourceList/ResourceLoadingIndicator.vue
index fb2b6c91017..7240cb99b96 100644
--- a/shell/components/ResourceList/ResourceLoadingIndicator.vue
+++ b/shell/components/ResourceList/ResourceLoadingIndicator.vue
@@ -17,10 +17,6 @@ export default {
       type:    Boolean,
       default: false,
     },
-    namespace: {
-      type:    String,
-      default: undefined
-    },
   },
 
   data() {
@@ -44,10 +40,6 @@ export default {
     // Have we loaded all resources for the types that are needed
     haveAll() {
       return this.resources.reduce((acc, r) => {
-        if (this.namespace) {
-          return acc && this.$store.getters[`${ this.inStore }/haveAllNamespace`](r, this.namespace);
-        }
-
         return acc && this.$store.getters[`${ this.inStore }/haveAll`](r);
       }, true);
     },
@@ -58,7 +50,7 @@ export default {
 
       return this.resources.reduce((acc, r) => {
         const resourceCounts = clusterCounts?.[0]?.counts?.[r];
-        const resourceCount = this.namespace ? resourceCounts?.namespaces?.[this.namespace]?.count : resourceCounts?.summary?.count;
+        const resourceCount = resourceCounts?.summary?.count;
         const count = resourceCount || 0;
 
         return acc + count;
diff --git a/shell/components/ResourceList/index.vue b/shell/components/ResourceList/index.vue
index 8d556ed82a3..046092573f2 100644
--- a/shell/components/ResourceList/index.vue
+++ b/shell/components/ResourceList/index.vue
@@ -8,6 +8,7 @@ import IconMessage from '@shell/components/IconMessage.vue';
 import { ResourceListComponentName } from './resource-list.config';
 import { PanelLocation, ExtensionPoint } from '@shell/core/types';
 import ExtensionPanel from '@shell/components/ExtensionPanel';
+import { sameContents } from 'utils/array';
 
 export default {
   name: ResourceListComponentName,
@@ -146,8 +147,12 @@ export default {
      *
      * This covers case 1
      */
-    namespaceFilter(neu) {
-      if (neu && !this.hasFetch) {
+    namespaceFilter(neu, old) {
+      if (sameContents(neu, old)) {
+        return;
+      }
+
+      if (neu &&  !this.hasFetch) {
         this.$fetchType(this.resource);
       }
     }
@@ -191,7 +196,6 @@ export default {
       :show-incremental-loading-indicator="showIncrementalLoadingIndicator"
       :load-resources="loadResources"
       :load-indeterminate="loadIndeterminate"
-      :load-namespace="namespaceFilter"
     >
       <template slot="extraActions">
         <slot name="extraActions" />
diff --git a/shell/components/ResourceTable.vue b/shell/components/ResourceTable.vue
index ffe7f210e77..c27a060d0fc 100644
--- a/shell/components/ResourceTable.vue
+++ b/shell/components/ResourceTable.vue
@@ -6,6 +6,7 @@ import ButtonGroup from '@shell/components/ButtonGroup';
 import SortableTable from '@shell/components/SortableTable';
 import { NAMESPACE } from '@shell/config/table-headers';
 import { findBy } from '@shell/utils/array';
+import richardsLogger from '@shell/utils/richards-logger';
 
 // Default group-by in the case the group stored in the preference does not apply
 const DEFAULT_GROUP = 'namespace';
@@ -176,7 +177,12 @@ export default {
       return acc;
     }, {});
 
-    return { listGroups, listGroupMapped };
+    
+    richardsLogger.warn('rt', 'data', this.schema, this);
+    // Confirm which store we're in, if schema isn't available we're probably showing a list with different types
+    const inStore = this.schema?.id ? this.$store.getters['currentStore'](this.schema.id) : undefined;
+
+    return { listGroups, listGroupMapped, inStore };
   },
 
   computed: {
@@ -244,11 +250,22 @@ export default {
     filteredRows() {
       const isAll = this.$store.getters['isAllNamespaces'];
 
-      // If the resources isn't namespaced or we want ALL of them, there's nothing to do.
-      if ( !this.isNamespaced || (isAll && !this.currentProduct?.hideSystemResources) || this.ignoreFilter) {
+      richardsLogger.warn('RC', 'rt', 'filteredRows', this.inStore, this.schema?.id)
+
+      // Do we need to filter by namespace like things?
+      if (
+        !this.isNamespaced || // Resource type isn't namespaced
+        this.ignoreFilter || // Component owner strictly states no filtering
+        isAll && !this.currentProduct?.hideSystemResources || // Need all
+        (this.inStore ? this.$store.getters[this.inStore + '/haveNamespace'](this.schema.id)?.length : false)// Store reports type has namespace filter, so rows already contain the correctly filtered resources
+      ) {
+        richardsLogger.warn('RC', 'rt', 'filteredRows', this.schema?.id, 'SKIPPING', !this.isNamespaced, this.ignoreFilter, isAll && !this.currentProduct?.hideSystemResources, this.inStore ? this.$store.getters[this.inStore + '/haveNamespace'](this.schema.id)?.length : false)
+
         return this.rows || [];
       }
 
+      richardsLogger.warn('RC', 'rt', 'filteredRows', this.schema?.id, 'FILTERING', this.inStore ? this.$store.getters[this.inStore + '/haveNamespace'](this.schema.id)?.length : false, this.rows)
+
       const includedNamespaces = this.$store.getters['namespaces']();
 
       // Shouldn't happen, but does for resources like management.cattle.io.preference
diff --git a/shell/components/nav/NamespaceFilter.vue b/shell/components/nav/NamespaceFilter.vue
index 8937c4c16f8..205cbd8f39b 100644
--- a/shell/components/nav/NamespaceFilter.vue
+++ b/shell/components/nav/NamespaceFilter.vue
@@ -5,7 +5,6 @@ import { NAMESPACE, MANAGEMENT } from '@shell/config/types';
 import { sortBy } from '@shell/utils/sort';
 import { isArray, addObjects, findBy, filterBy } from '@shell/utils/array';
 import {
-  NAMESPACE_FILTER_SPECIAL as SPECIAL,
   NAMESPACE_FILTER_ALL_USER as ALL_USER,
   NAMESPACE_FILTER_ALL as ALL,
   NAMESPACE_FILTER_ALL_SYSTEM as ALL_SYSTEM,
@@ -13,8 +12,15 @@ import {
   NAMESPACE_FILTER_NAMESPACED_YES as NAMESPACED_YES,
   NAMESPACE_FILTER_NAMESPACED_NO as NAMESPACED_NO,
   createNamespaceFilterKey,
+  NAMESPACE_FILTER_KINDS,
+  NAMESPACE_FILTER_NS_FULL_PREFIX,
+  NAMESPACE_FILTER_P_FULL_PREFIX,
 } from '@shell/utils/namespace-filter';
 import { KEY } from '@shell/utils/platform';
+import richardsLogger from '@shell/utils/richards-logger';
+
+
+const forcedNamespaceValidTypes = [NAMESPACE_FILTER_KINDS.DIVIDER, NAMESPACE_FILTER_KINDS.PROJECT, NAMESPACE_FILTER_KINDS.NAMESPACE]
 
 export default {
   data() {
@@ -25,6 +31,7 @@ export default {
       total:          0,
       activeElement:  null,
       cachedFiltered: [],
+      NAMESPACE_FILTER_KINDS,
     };
   },
 
@@ -36,27 +43,31 @@ export default {
     },
 
     filtered() {
+      richardsLogger.warn('ns filter component', 'filtered', 1, this.namespaceFilterMode)
       let out = this.options;
 
       out = out.filter((item) => {
         // Filter out anything not applicable to singleton selection
-        if (this.namespaceFilterMode) {
+        if (this.namespaceFilterMode?.length) {
           // We always show dividers, projects and namespaces
-          if (!['divider', 'project', this.namespaceFilterMode].includes(item.kind)) {
-            // Hide any invalid option that's not selected
-            return this.value.findIndex(v => v.id === item.id) >= 0;
+          if (!forcedNamespaceValidTypes.includes(item.kind)) {
+            const validCustomType = this.namespaceFilterMode.find(prefix => item.kind.startsWith(prefix));
+            if (!validCustomType) {
+              // Hide any invalid option that's not selected
+              return this.value.findIndex(v => v.id === item.id) >= 0;
+            }
           }
         }
 
         // Filter by the current filter
         if (this.hasFilter) {
-          return item.kind !== SPECIAL && item.label.toLowerCase().includes(this.filter.toLowerCase());
+          return item.kind !== NAMESPACE_FILTER_KINDS.SPECIAL && item.label.toLowerCase().includes(this.filter.toLowerCase());
         }
 
         return true;
       });
 
-      if (out?.[0]?.kind === 'divider') {
+      if (out?.[0]?.kind === NAMESPACE_FILTER_KINDS.DIVIDER) {
         out.splice(0, 1);
       }
 
@@ -66,12 +77,30 @@ export default {
         return m;
       }, {});
 
+      // Need final backend changes (for bug fixes, testing, etc)
+      // TODO: RC (BE FIX REQUIRED) list fails
+      // - resources.project.cattle.io.networking.k8s.io.ingresses 502 Bad Gateway
+      // - resources.project.cattle.io.catalog.cattle.io.apps 502 Bad Gateway
+      // TODO: RC (BE FIX REQUIRED) missing permissions objects - lists top level. .actions. data[].links. permissions
+      // TODO: RC (BE FIX REQUIRED) missing metadata.fields
+      // TODO: RC test downstream cluster
+      // TODO: RC test rewrite of links
+      // TODO: RC remove console.warn's
+      // TODO: RC test incremental loading / force . works with AW? works with forced ns off?
+      // TODO: RC test fleet
+      // TODO: RC test create/edit/remove
+
+
       // Mark all of the selected options
       out.forEach((i) => {
         i.selected = !!mapped[i.id] || (i.id === ALL && this.value && this.value.length === 0);
         i.elementId = (i.id || '').replace('://', '_');
-        // Are we in singleton resource type mode, if so is this an allowed type?
-        i.enabled = !this.namespaceFilterMode || i.kind === this.namespaceFilterMode;
+        i.enabled = true;
+        // Are we in restricted resource type mode, if so is this an allowed type?
+        if(this.namespaceFilterMode?.length) {
+          const isLastSelected = i.selected && (i.id === ALL || this.value.length === 1);
+          i.enabled = !isLastSelected && this.namespaceFilterMode.find(f => f === i.kind)
+        }
       });
 
       return out;
@@ -134,27 +163,27 @@ export default {
         out = [
           {
             id:    ALL,
-            kind:  SPECIAL,
+            kind:  NAMESPACE_FILTER_KINDS.SPECIAL,
             label: t('nav.ns.all'),
           },
           {
             id:    ALL_USER,
-            kind:  SPECIAL,
+            kind:  NAMESPACE_FILTER_KINDS.SPECIAL,
             label: t('nav.ns.user'),
           },
           {
             id:    ALL_SYSTEM,
-            kind:  SPECIAL,
+            kind:  NAMESPACE_FILTER_KINDS.SPECIAL,
             label: t('nav.ns.system'),
           },
           {
             id:    NAMESPACED_YES,
-            kind:  SPECIAL,
+            kind:  NAMESPACE_FILTER_KINDS.SPECIAL,
             label: t('nav.ns.namespaced'),
           },
           {
             id:    NAMESPACED_NO,
-            kind:  SPECIAL,
+            kind:  NAMESPACE_FILTER_KINDS.SPECIAL,
             label: t('nav.ns.clusterLevel'),
           },
         ];
@@ -224,8 +253,8 @@ export default {
           }
 
           out.push({
-            id:    `project://${ id }`,
-            kind:  'project',
+            id:    `${NAMESPACE_FILTER_P_FULL_PREFIX}${ id }`,
+            kind:  NAMESPACE_FILTER_KINDS.PROJECT,
             label: t('nav.ns.project', { name: project.nameDisplay }),
           });
 
@@ -243,7 +272,7 @@ export default {
 
           out.push({
             id:       ALL_ORPHANS,
-            kind:     'project',
+            kind:     NAMESPACE_FILTER_KINDS.PROJECT,
             label:    t('nav.ns.orphan'),
             disabled: true,
           });
@@ -265,8 +294,8 @@ export default {
           out,
           namespaces.map((namespace) => {
             return {
-              id:    `ns://${ namespace.id }`,
-              kind:  'namespace',
+              id:    `${NAMESPACE_FILTER_NS_FULL_PREFIX}${ namespace.id }`,
+              kind:  NAMESPACE_FILTER_KINDS.NAMESPACE,
               label: t('nav.ns.namespace', { name: namespace.nameDisplay }),
             };
           })
@@ -275,7 +304,7 @@ export default {
 
       function divider(out) {
         out.push({
-          kind:     'divider',
+          kind:     NAMESPACE_FILTER_KINDS.DIVIDER,
           label:    `Divider ${ out.length }`,
           disabled: true,
         });
@@ -283,7 +312,7 @@ export default {
     },
 
     isSingleSpecial() {
-      return this.value && this.value.length === 1 && this.value[0].kind === 'special';
+      return this.value && this.value.length === 1 && this.value[0].kind === NAMESPACE_FILTER_KINDS.SPECIAL;
     },
 
     value: {
@@ -311,7 +340,7 @@ export default {
         neu = neu.filter(x => !!x.id);
 
         const last = neu[neu.length - 1];
-        const lastIsSpecial = last?.kind === SPECIAL;
+        const lastIsSpecial = last?.kind === NAMESPACE_FILTER_KINDS.SPECIAL;
         const hadUser = !!old.find(x => x.id === ALL_USER);
         const hadAll = !!old.find(x => x.id === ALL);
 
@@ -320,7 +349,7 @@ export default {
         }
 
         if (neu.length > 1) {
-          neu = neu.filter(x => x.kind !== SPECIAL);
+          neu = neu.filter(x => x.kind !== NAMESPACE_FILTER_KINDS.SPECIAL);
         }
 
         if (neu.find(x => x.id === 'all')) {
@@ -579,28 +608,26 @@ export default {
     },
     selectOption(option) {
       // Ignore click for a divider
-      if (option.kind === 'divider') {
+      if (option.kind === NAMESPACE_FILTER_KINDS.DIVIDER) {
         return;
       }
 
       const current = this.value;
-      const exists = current.findIndex(v => v.id === option.id);
-      const optionIsSelected = exists !== -1;
 
-      // Any type of mode means only a single resource can be selected. So clear out any stale
-      // values (multiple selected in another context OR a single one selected in this context)
-      if (this.namespaceFilterMode) {
-        if (current.length === 1 && optionIsSelected) {
-          // Don't deselect the only selected option
-          return;
-        }
-        current.length = 0;
+      // Remove invalid
+      if (!!this.namespaceFilterMode?.length) {
+        this.value.forEach(v => {
+          if (!this.namespaceFilterMode.find(f => f === v.kind)) {
+            const index = current.findIndex(c => c.id === v.id);
+            current.splice(index, 1);
+          }
+        })
       }
 
-      const remove = !this.namespaceFilterMode && optionIsSelected;
+      const exists = current.findIndex(v => v.id === option.id);
 
       // Remove if it exists (or always add if in singleton mode - we've reset the list above)
-      if (remove) {
+      if (exists !== -1) {
         current.splice(exists, 1);
       } else {
         current.push(option);
@@ -694,8 +721,9 @@ export default {
           class="ns-value"
         >
           <div>{{ ns.label }}</div>
+          <!-- block user from removing the last selection if ns forced filtering is on -->
           <i
-            v-if="!namespaceFilterMode"
+            v-if="!namespaceFilterMode || value.length > 1"
             class="icon icon-close"
             :data-testid="`namespaces-values-close-${j}`"
             @click="removeOption(ns, $event)"
@@ -754,7 +782,7 @@ export default {
           class="ns-singleton-info"
         >
           <i
-            v-tooltip="t('resourceList.nsFilterToolTip', { mode: namespaceFilterMode})"
+            v-tooltip="t('resourceList.nsFilterToolTip')"
             class="icon icon-info"
           />
         </div>
@@ -791,7 +819,7 @@ export default {
           @keydown="itemKeyHandler($event, opt)"
         >
           <div
-            v-if="opt.kind === 'divider'"
+            v-if="opt.kind === NAMESPACE_FILTER_KINDS.DIVIDER"
             class="ns-divider"
           />
           <div
@@ -799,7 +827,7 @@ export default {
             class="ns-item"
           >
             <i
-              v-if="opt.kind === 'namespace'"
+              v-if="opt.kind === NAMESPACE_FILTER_KINDS.NAMESPACE"
               class="icon icon-folder"
             />
             <div>{{ opt.label }}</div>
diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index 6d0a8bec94f..555ea4a3bfb 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -159,9 +159,8 @@ export const DEFAULT_PERF_SETTING = {
   },
   disableWebsocketNotification: true,
   garbageCollection:            GC_DEFAULTS,
-  forceNsFilter:                {
+  forceNsFilterV2:                {
     enabled:   false,
-    threshold: 1500,
   },
   advancedWorker: { enabled: false },
 };
diff --git a/shell/mixins/resource-fetch-namespaced.js b/shell/mixins/resource-fetch-namespaced.js
index cad0a8e6e02..f5d89711756 100644
--- a/shell/mixins/resource-fetch-namespaced.js
+++ b/shell/mixins/resource-fetch-namespaced.js
@@ -1,5 +1,8 @@
+import { NAMESPACE_FILTER_KINDS, NAMESPACE_FILTER_NS_PREFIX, NAMESPACE_FILTER_P_PREFIX } from 'utils/namespace-filter';
 import { mapGetters } from 'vuex';
 import { ResourceListComponentName } from '../components/ResourceList/resource-list.config';
+import richardsLogger from '@shell/utils/richards-logger';
+
 
 /**
  * Companion mixin used with `resource-fetch` for `ResourceList` to determine if the user needs to filter the list by a single namespace
@@ -11,40 +14,44 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['currentProduct', 'currentCluster', 'isSingleNamespace']),
+    ...mapGetters(['currentProduct', 'currentCluster', 'namespaceFilters']),
 
     /**
      * Does the user need to update the filter to supply a single namespace?
      */
     namespaceFilterRequired() {
-      return this.__namespaceRequired && !this.__singleNamespaceFilter;
+      richardsLogger.warn('rfn', 'namespaceFilterRequired', this.__namespaceRequired, this.__validFilter)
+
+      return this.__namespaceRequired && !this.__validFilter;
     },
 
     /**
      * Returns the namespace that requests should be filtered by
      */
     namespaceFilter() {
-      return this.__namespaceRequired ? this.__singleNamespaceFilter : '';
+      richardsLogger.warn('rfn', 'namespaceFilters', this.namespaceFilters)
+
+      return this.__namespaceRequired ? this.__validFilter : '';
     },
 
     /**
-     * If the Project/Namespace filter from the header contains a single NS... return it
+     * If the Project/Namespace filter from the header contains a valid ns / project filter ... return it
      */
-    __singleNamespaceFilter() {
-      const ns = this.isSingleNamespace;
-
-      return ns ? ns.replace('ns://', '') : '';
+    __validFilter() {
+      const valid = this.namespaceFilters.every(f => f.startsWith(NAMESPACE_FILTER_NS_PREFIX) || f.startsWith(NAMESPACE_FILTER_P_PREFIX))
+      richardsLogger.warn('rfn', '__validFilter', valid, this.namespaceFilters)
+      return valid ? this.namespaceFilters : null;
     },
 
     /**
      * Do we need to filter the list by a namespace?
      */
     __namespaceRequired() {
-      if (!this.forceNsFilter?.enabled || this.perfConfig.forceNsFilter.threshold === undefined) {
+      if (!this.perfConfig.forceNsFilterV2?.enabled) {
         return false;
       }
 
-      return !this.currentProduct.showWorkspaceSwitcher && this.__areResourcesNamespaced && this.__areResourcesTooMany;
+      return !this.currentProduct.showWorkspaceSwitcher && this.__areResourcesNamespaced;
     },
 
     /**
@@ -52,28 +59,19 @@ export default {
      */
     __areResourcesNamespaced() {
       return (this.loadResources || []).every((type) => {
-        const schema = this.$store.getters['cluster/schemaFor'](type);
+        const schema = this.$store.getters['cluster/schemaFor'](type);// TODO: RC test fleet, cluster management isn't included
 
         return schema?.attributes?.namespaced;
       });
     },
 
-    /**
-     * Are there too many core list resources to show in the list?
-     */
-    __areResourcesTooMany() {
-      // __getCountForResources is defined on resource-fetch mixin...
-      const count = this.__getCountForResources(this.loadResources);
-
-      return count > this.perfConfig.forceNsFilter.threshold;
-    },
-
   },
 
   watch: {
     __namespaceRequired: {
       handler(neu) {
-        this.$store.dispatch('setNamespaceFilterMode', neu ? 'namespace' : null, { root: true });
+        richardsLogger.warn('rfn', 'watch __namespaceRequired', neu);
+        this.$store.dispatch('setNamespaceFilterMode', neu ? [NAMESPACE_FILTER_KINDS.NAMESPACE, NAMESPACE_FILTER_KINDS.PROJECT]: null, { root: true });
       },
       immediate: true,
     },
diff --git a/shell/mixins/resource-fetch.js b/shell/mixins/resource-fetch.js
index 9cda48eb4f5..ef326a8fa63 100644
--- a/shell/mixins/resource-fetch.js
+++ b/shell/mixins/resource-fetch.js
@@ -2,6 +2,7 @@ import { mapGetters } from 'vuex';
 import { COUNT, MANAGEMENT } from '@shell/config/types';
 import { SETTING, DEFAULT_PERF_SETTING } from '@shell/config/settings';
 import ResourceFetchNamespaced from '@shell/mixins/resource-fetch-namespaced';
+import richardsLogger from '@shell/utils/richards-logger';
 
 // Number of pages to fetch when loading incrementally
 const PAGES = 4;
@@ -38,11 +39,6 @@ export default {
       // incremental loading vars
       incremental:                false,
       fetchedResourceType:        [],
-      // force ns filtering
-      forceNsFilter:              {
-        ...perfConfig.forceNsFilter,
-        threshold: parseInt(perfConfig?.forceNsFilter?.threshold || '0', 10)
-      }
     };
   },
   beforeDestroy() {
@@ -103,6 +99,7 @@ export default {
     },
     // data fetching for the mechanism
     $fetchType(type, multipleResources = [], storeType) {
+      richardsLogger.warn('fs', type, '$fetchType')
       const currStore = storeType || this.$store.getters['currentStore']();
 
       this.$initializeFetchData(type, multipleResources, currStore);
diff --git a/shell/pages/c/_cluster/settings/performance.vue b/shell/pages/c/_cluster/settings/performance.vue
index dacb0909ee6..1e948952a26 100644
--- a/shell/pages/c/_cluster/settings/performance.vue
+++ b/shell/pages/c/_cluster/settings/performance.vue
@@ -9,6 +9,18 @@ import { DEFAULT_PERF_SETTING, SETTING } from '@shell/config/settings';
 import { _EDIT, _VIEW } from '@shell/config/query-params';
 import UnitInput from '@shell/components/form/UnitInput';
 
+const incompatible = {
+  'incrementalLoading': ['forceNsFilterV2'],
+  'manualRefresh': ['forceNsFilterV2'],
+  'forceNsFilterV2': ['incrementalLoading', 'manualRefresh'],
+}
+
+const l10n = {
+  'incrementalLoading': 'incrementalLoad',
+  'manualRefresh': 'manualRefresh',
+  'forceNsFilterV2': 'nsFiltering',
+}
+
 export default {
   layout:     'authenticated',
   components: {
@@ -102,8 +114,40 @@ export default {
         this.errors.push(err);
         btnCB(false);
       }
+    },
+
+    compatibleWarning(property, enabled) {
+      if (!enabled) {
+        // Disabling a preference won't automatically turn on an incompatible one, so just set and exit
+        this.value[property].enabled = false;
+        return;
+      }
+
+      // We're enabling a preference. Are there any incomaptible preferences?
+      if ((incompatible[property] || []).every(p => !this.value[p].enabled)) {
+        // No, just set and exit
+        this.value[property].enabled = true;
+        return;
+      }
+
+      // Incompatible preferences found, so confirm with user before applying
+      this.$store.dispatch('cluster/promptModal', {
+        component:      'GenericPrompt',
+        componentProps: {
+          applyMode:   'enable',
+          applyAction: buttonDone => {
+            this.value[property].enabled = true;
+            (incompatible[property] || []).forEach(incompatible => {
+              this.value[incompatible].enabled = false
+            })
+            buttonDone(true);
+          },
+          title: this.t('promptRemove.title', {}, true),
+          body:  this.t(`performance.${l10n[property]}.incompatibleDescription`, {}, true),
+        },
+      });
     }
-  }
+  },
 };
 </script>
 <template>
@@ -159,11 +203,12 @@ export default {
           <h2>{{ t('performance.incrementalLoad.label') }}</h2>
           <p>{{ t('performance.incrementalLoad.description') }}</p>
           <Checkbox
-            v-model="value.incrementalLoading.enabled"
+            :value="value.incrementalLoading.enabled"
             :mode="mode"
             :label="t('performance.incrementalLoad.checkboxLabel')"
             class="mt-10 mb-20"
             :primary="true"
+            @input="compatibleWarning('incrementalLoading', $event)"
           />
           <div class="ml-20">
             <p :class="{ 'text-muted': !value.incrementalLoading.enabled }">
@@ -189,11 +234,12 @@ export default {
             label-key="performance.experimental"
           />
           <Checkbox
-            v-model="value.manualRefresh.enabled"
+            :value="value.manualRefresh.enabled"
             :mode="mode"
             :label="t('performance.manualRefresh.checkboxLabel')"
             class="mt-10 mb-20"
             :primary="true"
+            @input="compatibleWarning('manualRefresh', $event)"
           />
           <div class="ml-20">
             <p :class="{ 'text-muted': !value.manualRefresh.enabled }">
@@ -299,26 +345,13 @@ export default {
             label-key="performance.experimental"
           />
           <Checkbox
-            v-model="value.forceNsFilter.enabled"
+            :value="value.forceNsFilterV2.enabled"
             :mode="mode"
             :label="t('performance.nsFiltering.checkboxLabel')"
             class="mt-10 mb-20"
             :primary="true"
+            @input="compatibleWarning('forceNsFilterV2', $event)"
           />
-          <div class="ml-20">
-            <p :class="{ 'text-muted': !value.forceNsFilter.enabled }">
-              {{ t('performance.nsFiltering.count.description') }}
-            </p>
-            <LabeledInput
-              v-model="value.forceNsFilter.threshold"
-              :mode="mode"
-              :label="t('performance.nsFiltering.count.inputLabel')"
-              :disabled="!value.forceNsFilter.enabled"
-              class="input"
-              type="number"
-              min="0"
-            />
-          </div>
         </div>
         <!-- Advanced Websocket Worker -->
         <div class="mt-40">
diff --git a/shell/plugins/dashboard-store/actions.js b/shell/plugins/dashboard-store/actions.js
index f61caf30653..77f9fd36aea 100644
--- a/shell/plugins/dashboard-store/actions.js
+++ b/shell/plugins/dashboard-store/actions.js
@@ -7,6 +7,7 @@ import { classify } from '@shell/plugins/dashboard-store/classify';
 import { normalizeType } from './normalize';
 import garbageCollect from '@shell/utils/gc/gc';
 import { addSchemaIndexFields } from '@shell/plugins/steve/schema.utils';
+import richardsLogger from '@shell/utils/richards-logger';
 
 export const _ALL = 'all';
 export const _MERGE = 'merge';
@@ -149,8 +150,11 @@ export default {
       commit('registerType', type);
     }
 
+    richardsLogger.warn('ds', 'findAll', 3, type)
     // No need to request the resources if we have them already
     if ( opt.force !== true && (getters['haveAll'](type) || getters['haveAllNamespace'](type, opt.namespaced))) {
+      richardsLogger.warn('ds', 'findAll', 4, type)
+
       const args = {
         type,
         revision:  '',
@@ -160,6 +164,7 @@ export default {
       };
 
       if (opt.watch !== false ) {
+        richardsLogger.warn('ds', 'findAll', 5, type, 'watching', args)
         dispatch('watch', args);
       }
 
@@ -317,13 +322,16 @@ export default {
 
     // ToDo: SM if we start a "bigger" watch (such as watch without a namespace vs a watch with a namespace), we should stop the stop the "smaller" watch so we don't have duplicate events coming back
     if ( opt.watch !== false ) {
-      dispatch('watch', {
+      const args  = {
         type,
         revision:  out.revision,
         namespace: opt.watchNamespace || opt.namespaced, // it could be either apparently
         // ToDo: SM namespaced is sometimes a boolean and sometimes a string, I don't see it as especially broken but we should refactor that in the future
         force:     opt.forceWatch === true,
-      });
+      }
+      richardsLogger.warn('ds', 'findAll', 20, type, 'watching', args)
+
+      dispatch('watch', args);
     }
 
     const all = getters.all(type);
diff --git a/shell/plugins/dashboard-store/getters.js b/shell/plugins/dashboard-store/getters.js
index e7d21e583f6..00b3f91dedf 100644
--- a/shell/plugins/dashboard-store/getters.js
+++ b/shell/plugins/dashboard-store/getters.js
@@ -10,6 +10,7 @@ import mutations from './mutations';
 import { keyFieldFor, normalizeType } from './normalize';
 import { lookup } from './model-loader';
 import garbageCollect from '@shell/utils/gc/gc';
+import richardsLogger from '@shell/utils/richards-logger';
 
 export const urlFor = (state, getters) => (type, id, opt) => {
   opt = opt || {};
@@ -268,12 +269,18 @@ export default {
     const entry = state.types[type];
 
     if ( entry ) {
+      richardsLogger.warn('ds', 'getter', 'haveAllNamespace', entry.haveNamespace, namespace, entry.haveNamespace === namespace)
       return entry.haveNamespace === namespace;
     }
 
     return false;
   },
 
+  haveNamespace: (state, getters) => (type) => {
+    type = getters.normalizeType(type);
+    return state.types[type]?.haveNamespace || null;
+  },
+
   haveSelector: (state, getters) => (type, selector) => {
     type = getters.normalizeType(type);
     const entry = state.types[type];
diff --git a/shell/plugins/dashboard-store/mutations.js b/shell/plugins/dashboard-store/mutations.js
index 085cfc7d030..c284cf2cc41 100644
--- a/shell/plugins/dashboard-store/mutations.js
+++ b/shell/plugins/dashboard-store/mutations.js
@@ -5,6 +5,7 @@ import { normalizeType, keyFieldFor } from '@shell/plugins/dashboard-store/norma
 import { addSchemaIndexFields } from '@shell/plugins/steve/schema.utils';
 import { classify } from '@shell/plugins/dashboard-store/classify';
 import garbageCollect from '@shell/utils/gc/gc';
+import richardsLogger from '@shell/utils/richards-logger';
 
 function registerType(state, type) {
   let cache = state.types[type];
@@ -295,8 +296,10 @@ export function loadAll(state, {
 
   // Allow requester to skip setting that everything has loaded
   if (!skipHaveAll) {
+    
     cache.haveNamespace = namespace;
     cache.haveAll = !namespace;
+    richardsLogger.warn('ds', 'loadAll', type, cache.haveNamespace, cache.haveAll )
   }
 
   return proxies;
diff --git a/shell/plugins/steve/actions.js b/shell/plugins/steve/actions.js
index 722e934c48f..8966e7d7dec 100644
--- a/shell/plugins/steve/actions.js
+++ b/shell/plugins/steve/actions.js
@@ -8,16 +8,19 @@ import isObject from 'lodash/isObject';
 import { classify } from '@shell/plugins/dashboard-store/classify';
 import { NAMESPACE } from '@shell/config/types';
 import jsyaml from 'js-yaml';
+import pAndNFiltering from './projectAndNamespaceFiltering.utils';
+
 
 export default {
 
-  // Need to override this, so that thhe 'this' context is correct (this class not the base class)
+  // Need to override this, so that the 'this' context is correct (this class not the base class)
   async loadSchemas(ctx, watch = true) {
     return await loadSchemas(ctx, watch);
   },
 
   async request({ state, dispatch, rootGetters }, pOpt ) {
     const opt = pOpt.opt || pOpt;
+    const type = pOpt.type;
 
     const spoofedRes = await handleSpoofedRequest(rootGetters, 'cluster', opt);
 
@@ -126,6 +129,10 @@ export default {
           out = responseObject(res);
         }
 
+        if (pAndNFiltering.isApplicable(opt)) {
+          out = pAndNFiltering.convertResourceResponse(out, opt, type)
+        }
+
         finishDeferred(key, 'resolve', out);
 
         return out;
diff --git a/shell/plugins/steve/getters.js b/shell/plugins/steve/getters.js
index 2c4908fad54..8b6a22f7db3 100644
--- a/shell/plugins/steve/getters.js
+++ b/shell/plugins/steve/getters.js
@@ -8,6 +8,7 @@ import HybridModel, { cleanHybridResources } from './hybrid-class';
 import NormanModel from './norman-class';
 import { urlFor } from '@shell/plugins/dashboard-store/getters';
 import { normalizeType } from '@shell/plugins/dashboard-store/normalize';
+import pAndNFiltering from './projectAndNamespaceFiltering.utils';
 
 export const STEVE_MODEL_TYPES = {
   NORMAN:  'norman',
@@ -73,9 +74,12 @@ export default {
     let url = urlFor(state, getters)(type, id, opt);
 
     if (opt.namespaced) {
-      const parts = url.split('/');
-
-      url = `${ parts.join('/') }/${ opt.namespaced }`;
+      if (pAndNFiltering.isApplicable(opt)) {
+        url = pAndNFiltering.convertUrl(url, opt.namespaced)
+      } else {
+        const parts = url.split('/');
+        url = `${ parts.join('/') }/${ opt.namespaced }`;
+      }
 
       return url;
     }
diff --git a/shell/plugins/steve/projectAndNamespaceFiltering.utils.ts b/shell/plugins/steve/projectAndNamespaceFiltering.utils.ts
new file mode 100644
index 00000000000..bd5b34bdbb8
--- /dev/null
+++ b/shell/plugins/steve/projectAndNamespaceFiltering.utils.ts
@@ -0,0 +1,71 @@
+import { NAMESPACE_FILTER_NS_FULL_PREFIX, NAMESPACE_FILTER_P_FULL_PREFIX } from 'utils/namespace-filter';
+import richardsLogger from '@shell/utils/richards-logger';
+
+class ProjectAndNamespaceFiltering {
+
+  static resourcePrefix = 'apis/resources.project.cattle.io/v1alpha1'; // --> api/v1 // collection links
+  static urlResourcePrefix = 'resources.project.cattle.io.'
+
+  /**
+   * Is the resource requested in multiple namespaces (only)
+   */
+  isApplicable(opt: any): boolean {
+    return Array.isArray(opt.namespaced);
+  }
+
+  /**
+   * Takes the standard url for a resource e.g. `v1/pod` and converts it to one that supports filtering by the provided projects and namespaces
+   * e.g. `v1/resources.project.cattle.io.pod?fieldSelector=projectsornamespaces=kube-system,kube-public`
+   *
+   */  convertUrl(url: string, namespaceFilter: string[]): string  {
+    const obj =
+    new URL(url);
+
+    // Change resource in path
+    const parts = obj.pathname.split('/');
+    parts[parts.length - 1] = ProjectAndNamespaceFiltering.urlResourcePrefix + parts[parts.length - 1];
+    obj.pathname = parts.join('/');
+
+    // add ns / project filter param
+    const projectsOrNamespaces = namespaceFilter
+      .map(f => f.replace(NAMESPACE_FILTER_NS_FULL_PREFIX, '').replace(NAMESPACE_FILTER_P_FULL_PREFIX, ''))
+      .join(',');
+
+    // NOTE - This replaces the whole `fieldSelector`
+    obj.searchParams.set('fieldSelector', `projectsornamespaces=${projectsOrNamespaces}`);
+
+    return obj.toString();
+  }
+
+  /**
+   * Results from `resources.project.cattle.io.<type>` endpoint contain links that point to it's own endpoint.
+   * We always want these links to represent their original type. This method finds all links and converts them
+   * back to the original type
+   */
+  convertResourceResponse(res: any, opt: any, type: string) {
+    richardsLogger.warn('pAndNUtils', 'updateNamespaceProjectResult', 1, opt, res, type);
+
+    res.resourceType = type;
+    for (let link in res.links || {}) {
+      res.links[link] = ProjectAndNamespaceFiltering.fixLink(res.links[link], type)
+    }
+
+    res.data.forEach((d: any) => {
+      d.type = type;
+      for (let link in d.links || {}) {
+        d.links[link] = ProjectAndNamespaceFiltering.fixLink(d.links[link], type)
+      }
+    })
+    richardsLogger.warn('pAndNUtils', 'updateNamespaceProjectResult', 2, res);
+    return res;
+  }
+
+  private static fixLink(link: string, type: string) : string {
+    return link
+    .replace(ProjectAndNamespaceFiltering.urlResourcePrefix, '')
+    .replace(ProjectAndNamespaceFiltering.resourcePrefix, 'api/v1')
+       // TODO: RC test
+  }
+}
+
+export default new ProjectAndNamespaceFiltering();
\ No newline at end of file
diff --git a/shell/plugins/steve/subscribe.js b/shell/plugins/steve/subscribe.js
index 9256179ee21..649dc9eb846 100644
--- a/shell/plugins/steve/subscribe.js
+++ b/shell/plugins/steve/subscribe.js
@@ -31,6 +31,8 @@ import { escapeHtml } from '@shell/utils/string';
 import { keyForSubscribe } from '@shell/plugins/steve/resourceWatcher';
 import { waitFor } from '@shell/utils/async';
 import { WORKER_MODES } from './worker';
+import pAndNFiltering from '@shell/plugins/steve/projectAndNamespaceFiltering.utils';
+import richardsLogger from '@shell/utils/richards-logger';
 
 import { BLANK_CLUSTER } from '@shell/store/index.js';
 import { STORE } from '@shell/store/store-types';
@@ -104,7 +106,7 @@ export async function createWorker(store, ctx) {
       }
     },
     batchChanges: (batch) => {
-      dispatch('batchChanges', batch);
+      dispatch('batchChanges', namespaceHandler.validateBatchChange(ctx, batch));
     },
     dispatch: (msg) => {
       dispatch(`ws.${ msg.name }`, msg);
@@ -178,7 +180,76 @@ export function equivalentWatch(a, b) {
   return true;
 }
 
-function queueChange({ getters, state }, { data, revision }, load, label) {
+/**
+ * Sockets will not be able to subscribe to more than one namespace. If this is requested we pretend to handle it
+ * - Changes to all resources are monitored (no namespace provided in sub)
+ * - We ignore any events not from a required namespace (we have the conversion of project --> namespaces already)
+ */
+const namespaceHandler = {
+  /**
+   * Note - namespace can be a list of projects or namespaces
+   */
+  subscribeNamespace: (namespace) => {
+    if (pAndNFiltering.isApplicable({ namespaced: namespace }) && namespace.length) {
+      return undefined; // AKA sub to everything
+    }
+
+    return namespace;
+  },
+
+  validChange: ({ getters, rootGetters }, type, data) => {
+    const haveNamespace = getters.haveNamespace(type);
+
+    richardsLogger.warn('sub', type, 'queueChange', 'haveNamespace', haveNamespace);
+    if (haveNamespace?.length) {
+      const namespaces = rootGetters.activeNamespaceCache;
+
+      if (!namespaces[data.metadata.namespace]) {
+        richardsLogger.warn('sub', type, 'queueChange', 'skipping', namespaces);
+
+        return false;
+      }
+      richardsLogger.warn('sub', type, 'queueChange', 'doing', namespaces);
+    }
+
+    return true;
+  },
+
+  validateBatchChange: ({ getters, rootGetters }, batch) => {
+    const namespaces = rootGetters.activeNamespaceCache;
+    // richardsLogger.warn('sub', 'validBatchChange start', 'batch', batch, 'namespaces', namespaces)
+
+    Object.entries(batch).forEach(([type, entries]) => {
+      const haveNamespace = getters.haveNamespace(type);
+
+      if (!haveNamespace?.length) {
+        return;
+      }
+
+      const schema = getters.schemaFor(type);
+
+      if (!schema?.attributes?.namespaced) {
+        return;
+      }
+
+      Object.keys(entries).forEach((id) => {
+        const namespace = id.split('/')[0];
+
+        if (!namespace || !namespaces[namespace]) {
+          richardsLogger.warn('sub', type, 'validBatchChange', 'bskipping', id, haveNamespace, namespaces);
+          delete entries[id];
+        } else {
+          richardsLogger.warn('sub', type, 'validBatchChange', 'bdoing', id, haveNamespace, namespaces);
+        }
+      });
+    });
+
+    // richardsLogger.warn('sub', 'validBatchChange end', 'batch', batch, 'namespaces', namespaces)
+    return batch;
+  }
+};
+
+function queueChange({ getters, state, rootGetters }, { data, revision }, load, label) {
   const type = getters.normalizeType(data.type);
 
   const entry = getters.typeEntry(type);
@@ -191,6 +262,11 @@ function queueChange({ getters, state }, { data, revision }, load, label) {
 
   // console.log(`${ label } Event [${ state.config.namespace }]`, data.type, data.id); // eslint-disable-line no-console
 
+  richardsLogger.warn('sub', type, 'queueChange', data, state);
+  if (!namespaceHandler.validChange({ getters, rootGetters }, type, data)) {
+    return;
+  }
+
   if ( load ) {
     state.queue.push({
       action: 'dispatch',
@@ -335,6 +411,7 @@ const sharedActions = {
       type, selector, id, revision, namespace, stop, force
     } = params;
 
+    namespace = namespaceHandler.subscribeNamespace(namespace);
     type = getters.normalizeType(type);
 
     if (rootGetters['type-map/isSpoofed'](type)) {
@@ -413,6 +490,8 @@ const sharedActions = {
     const { commit, getters, dispatch } = ctx;
 
     if (getters['schemaFor'](type)) {
+      namespace = namespaceHandler.subscribeNamespace(namespace);
+
       const obj = {
         type,
         id,
diff --git a/shell/store/index.js b/shell/store/index.js
index 6860885189f..ce0ec5d4968 100644
--- a/shell/store/index.js
+++ b/shell/store/index.js
@@ -27,6 +27,7 @@ import {
   NAMESPACE_FILTER_NAMESPACED_PREFIX as NAMESPACED_PREFIX,
   NAMESPACE_FILTER_NAMESPACED_YES as NAMESPACED_YES,
   splitNamespaceFilterKey,
+  NAMESPACE_FILTER_NS_FULL_PREFIX,
 } from '@shell/utils/namespace-filter';
 import { allHash, allHashSettled } from '@shell/utils/promise';
 import { sortBy } from '@shell/utils/sort';
@@ -373,34 +374,6 @@ export const getters = {
     return state.namespaceFilters.filter(x => !`${ x }`.startsWith(NAMESPACED_PREFIX)).length === 0;
   },
 
-  isSingleNamespace(state, getters) {
-    const product = getters['currentProduct'];
-
-    if ( !product ) {
-      return false;
-    }
-
-    if ( product.showWorkspaceSwitcher ) {
-      return false;
-    }
-
-    if ( getters.isAllNamespaces ) {
-      return false;
-    }
-
-    const filters = state.namespaceFilters;
-
-    if ( filters.length !== 1 ) {
-      return false;
-    }
-
-    if (filters[0].startsWith('ns://')) {
-      return filters[0];
-    }
-
-    return false;
-  },
-
   isMultipleNamespaces(state, getters) {
     const product = getters['currentProduct'];
 
@@ -422,7 +395,7 @@ export const getters = {
       return true;
     }
 
-    return !filters[0].startsWith('ns://');
+    return !filters[0].startsWith(NAMESPACE_FILTER_NS_FULL_PREFIX);
   },
 
   namespaceFilters(state) {
diff --git a/shell/utils/namespace-filter.js b/shell/utils/namespace-filter.js
index 6fae34ba427..27f8a447ff0 100644
--- a/shell/utils/namespace-filter.js
+++ b/shell/utils/namespace-filter.js
@@ -1,13 +1,25 @@
-export const NAMESPACE_FILTER_SPECIAL = 'special';
+export const NAMESPACE_FILTER_ALL_PREFIX = 'all';
+export const NAMESPACE_FILTER_NS_PREFIX = 'ns';
+export const NAMESPACE_FILTER_P_PREFIX = 'project';
 
-export const NAMESPACE_FILTER_ALL = 'all';
-export const NAMESPACE_FILTER_ALL_SYSTEM = 'all://system';
-export const NAMESPACE_FILTER_ALL_USER = 'all://user';
-export const NAMESPACE_FILTER_ALL_ORPHANS = 'all://orphans';
+export const NAMESPACE_FILTER_NS_FULL_PREFIX = NAMESPACE_FILTER_NS_PREFIX + '://';
+export const NAMESPACE_FILTER_P_FULL_PREFIX = NAMESPACE_FILTER_P_PREFIX + '://';
+
+export const NAMESPACE_FILTER_ALL = NAMESPACE_FILTER_ALL_PREFIX;
+export const NAMESPACE_FILTER_ALL_SYSTEM = NAMESPACE_FILTER_ALL_PREFIX + '://system';
+export const NAMESPACE_FILTER_ALL_USER = NAMESPACE_FILTER_ALL_PREFIX + '://user';
+export const NAMESPACE_FILTER_ALL_ORPHANS = NAMESPACE_FILTER_ALL_PREFIX + '://orphans';
 export const NAMESPACE_FILTER_NAMESPACED_PREFIX = 'namespaced://';
 export const NAMESPACE_FILTER_NAMESPACED_YES = 'namespaced://true';
 export const NAMESPACE_FILTER_NAMESPACED_NO = 'namespaced://false';
 
+export const NAMESPACE_FILTER_KINDS = {
+  DIVIDER: 'divider',
+  PROJECT: 'project',
+  NAMESPACE: 'namespace',
+  SPECIAL: 'special'
+}
+
 const SEPARATOR = '__%%__';
 
 export const createNamespaceFilterKey = (clusterId, product) => {
diff --git a/shell/utils/richards-logger.ts b/shell/utils/richards-logger.ts
new file mode 100644
index 00000000000..dfb68b098cb
--- /dev/null
+++ b/shell/utils/richards-logger.ts
@@ -0,0 +1,18 @@
+class RichardsLogger {
+  private enabled = true;
+
+  enable(enable: boolean) {
+    this.enabled = enable;
+  }
+
+  warn() {
+    if (this.enabled) {
+      console.warn('CUSTOM', ...arguments)
+    }
+  }
+
+}
+
+const logger = new RichardsLogger();
+
+export default logger;
\ No newline at end of file

From 15bc1cd0361505c7af785fd8da826e500eff70a7 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 4 May 2023 17:26:55 +0100
Subject: [PATCH 02/10] Changes following BE update and testing

---
 shell/components/nav/NamespaceFilter.vue      | 12 ++-------
 shell/mixins/resource-fetch-namespaced.js     | 10 +++++--
 .../projectAndNamespaceFiltering.utils.ts     | 26 +++++--------------
 shell/utils/richards-logger.ts                |  2 +-
 4 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/shell/components/nav/NamespaceFilter.vue b/shell/components/nav/NamespaceFilter.vue
index 205cbd8f39b..f3af962b1aa 100644
--- a/shell/components/nav/NamespaceFilter.vue
+++ b/shell/components/nav/NamespaceFilter.vue
@@ -78,17 +78,9 @@ export default {
       }, {});
 
       // Need final backend changes (for bug fixes, testing, etc)
-      // TODO: RC (BE FIX REQUIRED) list fails
-      // - resources.project.cattle.io.networking.k8s.io.ingresses 502 Bad Gateway
-      // - resources.project.cattle.io.catalog.cattle.io.apps 502 Bad Gateway
-      // TODO: RC (BE FIX REQUIRED) missing permissions objects - lists top level. .actions. data[].links. permissions
-      // TODO: RC (BE FIX REQUIRED) missing metadata.fields
-      // TODO: RC test downstream cluster
-      // TODO: RC test rewrite of links
       // TODO: RC remove console.warn's
-      // TODO: RC test incremental loading / force . works with AW? works with forced ns off?
-      // TODO: RC test fleet
-      // TODO: RC test create/edit/remove
+      // TODO: RC (BE FIX REQUIRED) validate resources.x aren't available when x isn't (even if zero results returned)
+      // TODO: RC (BE FIX REQUIRED) feature only works if resources schema's available
 
 
       // Mark all of the selected options
diff --git a/shell/mixins/resource-fetch-namespaced.js b/shell/mixins/resource-fetch-namespaced.js
index f5d89711756..44d408db923 100644
--- a/shell/mixins/resource-fetch-namespaced.js
+++ b/shell/mixins/resource-fetch-namespaced.js
@@ -51,15 +51,21 @@ export default {
         return false;
       }
 
-      return !this.currentProduct.showWorkspaceSwitcher && this.__areResourcesNamespaced;
+      return  !this.currentProduct.showWorkspaceSwitcher && this.__areResourcesNamespaced;
     },
 
     /**
      * Are all core list resources namespaced?
      */
     __areResourcesNamespaced() {
+      // Only enable for the cluster store at the moment. In theory this should work in management as well, as they're both 'steve' stores
+      if (this.currentProduct.inStore !== 'cluster') {
+        return false;
+      }
+
       return (this.loadResources || []).every((type) => {
-        const schema = this.$store.getters['cluster/schemaFor'](type);// TODO: RC test fleet, cluster management isn't included
+        richardsLogger.warn('rfn', '__areResourcesNamespaced', type)
+        const schema = this.$store.getters['cluster/schemaFor'](type);
 
         return schema?.attributes?.namespaced;
       });
diff --git a/shell/plugins/steve/projectAndNamespaceFiltering.utils.ts b/shell/plugins/steve/projectAndNamespaceFiltering.utils.ts
index bd5b34bdbb8..ce3480e14f9 100644
--- a/shell/plugins/steve/projectAndNamespaceFiltering.utils.ts
+++ b/shell/plugins/steve/projectAndNamespaceFiltering.utils.ts
@@ -3,7 +3,6 @@ import richardsLogger from '@shell/utils/richards-logger';
 
 class ProjectAndNamespaceFiltering {
 
-  static resourcePrefix = 'apis/resources.project.cattle.io/v1alpha1'; // --> api/v1 // collection links
   static urlResourcePrefix = 'resources.project.cattle.io.'
 
   /**
@@ -17,7 +16,8 @@ class ProjectAndNamespaceFiltering {
    * Takes the standard url for a resource e.g. `v1/pod` and converts it to one that supports filtering by the provided projects and namespaces
    * e.g. `v1/resources.project.cattle.io.pod?fieldSelector=projectsornamespaces=kube-system,kube-public`
    *
-   */  convertUrl(url: string, namespaceFilter: string[]): string  {
+   */
+  convertUrl(url: string, namespaceFilter: string[]): string  {
     const obj =
     new URL(url);
 
@@ -38,34 +38,22 @@ class ProjectAndNamespaceFiltering {
   }
 
   /**
-   * Results from `resources.project.cattle.io.<type>` endpoint contain links that point to it's own endpoint.
-   * We always want these links to represent their original type. This method finds all links and converts them
-   * back to the original type
+   * Results from `resources.project.cattle.io.<type>` endpoint contains content referring to it's own endpoint.
+   * We always want these resources to represent their original type
    */
   convertResourceResponse(res: any, opt: any, type: string) {
     richardsLogger.warn('pAndNUtils', 'updateNamespaceProjectResult', 1, opt, res, type);
 
+    // Originally this was more, but at the moment it's just the type
     res.resourceType = type;
-    for (let link in res.links || {}) {
-      res.links[link] = ProjectAndNamespaceFiltering.fixLink(res.links[link], type)
-    }
-
     res.data.forEach((d: any) => {
       d.type = type;
-      for (let link in d.links || {}) {
-        d.links[link] = ProjectAndNamespaceFiltering.fixLink(d.links[link], type)
-      }
-    })
+    });
+
     richardsLogger.warn('pAndNUtils', 'updateNamespaceProjectResult', 2, res);
     return res;
   }
 
-  private static fixLink(link: string, type: string) : string {
-    return link
-    .replace(ProjectAndNamespaceFiltering.urlResourcePrefix, '')
-    .replace(ProjectAndNamespaceFiltering.resourcePrefix, 'api/v1')
-       // TODO: RC test
-  }
 }
 
 export default new ProjectAndNamespaceFiltering();
\ No newline at end of file
diff --git a/shell/utils/richards-logger.ts b/shell/utils/richards-logger.ts
index dfb68b098cb..8e88eda4adb 100644
--- a/shell/utils/richards-logger.ts
+++ b/shell/utils/richards-logger.ts
@@ -7,7 +7,7 @@ class RichardsLogger {
 
   warn() {
     if (this.enabled) {
-      console.warn('CUSTOM', ...arguments)
+      console.warn('CUSTOM', ...arguments)//, new Error()
     }
   }
 

From 1708b4d5c36fadbed79eacc3ba82d98d6df472da Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 12 May 2023 11:59:46 +0100
Subject: [PATCH 03/10] Update after BE changes - Filtering is now no longer
 done via `resources.project.cattle.io.` - No need to update the URL anywhere
 or massage resources fetched via endpoint - Also no need to make the planned
 change to remove `resources.project.cattle.io.` from side nav

---
 shell/assets/translations/en-us.yaml          |  4 +-
 shell/components/ResourceList/index.vue       |  5 +-
 shell/plugins/steve/actions.js                |  6 --
 shell/plugins/steve/getters.js                | 24 +++++---
 .../projectAndNamespaceFiltering.utils.ts     | 57 +++++++------------
 5 files changed, 38 insertions(+), 58 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 50ca5adc387..30b74f929a2 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -4591,8 +4591,8 @@ resourceList:
     create: Create
     createFromYaml: Create from YAML
     createResource: "Create {resourceName}"
-  nsFiltering: "There are too many {resource}.<br>Please filter them by selecting Namespaces / Projects above."
-  nsFilterToolTip: "There are too many resources, filtering is restricted to projects and namespaces"
+  nsFiltering: "Please select one or more namespaces or projects from the filter above."
+  nsFilterToolTip: "Filtering is restricted to projects and namespaces"
 resourceLoadingIndicator:
   loading: Loading
 
diff --git a/shell/components/ResourceList/index.vue b/shell/components/ResourceList/index.vue
index 046092573f2..4163c55415b 100644
--- a/shell/components/ResourceList/index.vue
+++ b/shell/components/ResourceList/index.vue
@@ -181,10 +181,7 @@ export default {
     icon="icon-filter_alt"
   >
     <template #message>
-      <span
-        v-clean-html="t('resourceList.nsFiltering', { resource: $store.getters['type-map/labelFor'](schema, 2) || customTypeDisplay }, true)"
-        class="filter"
-      />
+      {{t('resourceList.nsFiltering')}}
     </template>
   </IconMessage>
   <div v-else>
diff --git a/shell/plugins/steve/actions.js b/shell/plugins/steve/actions.js
index 8966e7d7dec..cde16e39d59 100644
--- a/shell/plugins/steve/actions.js
+++ b/shell/plugins/steve/actions.js
@@ -8,8 +8,6 @@ import isObject from 'lodash/isObject';
 import { classify } from '@shell/plugins/dashboard-store/classify';
 import { NAMESPACE } from '@shell/config/types';
 import jsyaml from 'js-yaml';
-import pAndNFiltering from './projectAndNamespaceFiltering.utils';
-
 
 export default {
 
@@ -129,10 +127,6 @@ export default {
           out = responseObject(res);
         }
 
-        if (pAndNFiltering.isApplicable(opt)) {
-          out = pAndNFiltering.convertResourceResponse(out, opt, type)
-        }
-
         finishDeferred(key, 'resolve', out);
 
         return out;
diff --git a/shell/plugins/steve/getters.js b/shell/plugins/steve/getters.js
index 8b6a22f7db3..aa96e132a15 100644
--- a/shell/plugins/steve/getters.js
+++ b/shell/plugins/steve/getters.js
@@ -43,6 +43,15 @@ export default {
         });
       });
     }
+
+    // `opt.namespaced` is either
+    // - a string representing a single namespace - add restriction to the url
+    // - an array of namespaces or projects - add restriction as a param
+    const namespaceProjectFilter = pAndNFiltering.checkAndCreateParam(opt);
+
+    if (namespaceProjectFilter) {
+      url += `${ (url.includes('?') ? '&' : '?') + namespaceProjectFilter}`;
+    }
     // End: Filter
 
     // Limit
@@ -73,15 +82,12 @@ export default {
   urlFor: (state, getters) => (type, id, opt) => {
     let url = urlFor(state, getters)(type, id, opt);
 
-    if (opt.namespaced) {
-      if (pAndNFiltering.isApplicable(opt)) {
-        url = pAndNFiltering.convertUrl(url, opt.namespaced)
-      } else {
-        const parts = url.split('/');
-        url = `${ parts.join('/') }/${ opt.namespaced }`;
-      }
-
-      return url;
+    // `namespaced` is either
+    // - a string representing a single namespace - add restriction to the url
+    // - an array of namespaces or projects - add restriction as a param
+    if (opt.namespaced && !pAndNFiltering.isApplicable(opt)) {
+      const parts = url.split('/');
+      url = `${ parts.join('/') }/${ opt.namespaced }`;
     }
 
     return url;
diff --git a/shell/plugins/steve/projectAndNamespaceFiltering.utils.ts b/shell/plugins/steve/projectAndNamespaceFiltering.utils.ts
index ce3480e14f9..4d9b1e47a15 100644
--- a/shell/plugins/steve/projectAndNamespaceFiltering.utils.ts
+++ b/shell/plugins/steve/projectAndNamespaceFiltering.utils.ts
@@ -1,57 +1,40 @@
 import { NAMESPACE_FILTER_NS_FULL_PREFIX, NAMESPACE_FILTER_P_FULL_PREFIX } from 'utils/namespace-filter';
-import richardsLogger from '@shell/utils/richards-logger';
+
+type Opt = { [key: string]: any, namespaced?: string[]}
 
 class ProjectAndNamespaceFiltering {
 
-  static urlResourcePrefix = 'resources.project.cattle.io.'
+  static param = 'projectsornamespaces'
 
   /**
-   * Is the resource requested in multiple namespaces (only)
+   * Does the request `opt` definition require resources are fetched from a specific set namespaces/projects?
    */
-  isApplicable(opt: any): boolean {
+  isApplicable(opt: Opt): boolean {
     return Array.isArray(opt.namespaced);
   }
 
   /**
-   * Takes the standard url for a resource e.g. `v1/pod` and converts it to one that supports filtering by the provided projects and namespaces
-   * e.g. `v1/resources.project.cattle.io.pod?fieldSelector=projectsornamespaces=kube-system,kube-public`
-   *
+   * Check if `opt` requires resources from specific ns/projects, if so return the required query param (x=y)
    */
-  convertUrl(url: string, namespaceFilter: string[]): string  {
-    const obj =
-    new URL(url);
-
-    // Change resource in path
-    const parts = obj.pathname.split('/');
-    parts[parts.length - 1] = ProjectAndNamespaceFiltering.urlResourcePrefix + parts[parts.length - 1];
-    obj.pathname = parts.join('/');
-
-    // add ns / project filter param
-    const projectsOrNamespaces = namespaceFilter
-      .map(f => f.replace(NAMESPACE_FILTER_NS_FULL_PREFIX, '').replace(NAMESPACE_FILTER_P_FULL_PREFIX, ''))
-      .join(',');
+  checkAndCreateParam(opt: Opt): string {
+    if (!this.isApplicable(opt)) {
+      return ''
+    }
 
-    // NOTE - This replaces the whole `fieldSelector`
-    obj.searchParams.set('fieldSelector', `projectsornamespaces=${projectsOrNamespaces}`);
-
-    return obj.toString();
+    return this.createParam(opt.namespaced);
   }
 
-  /**
-   * Results from `resources.project.cattle.io.<type>` endpoint contains content referring to it's own endpoint.
-   * We always want these resources to represent their original type
-   */
-  convertResourceResponse(res: any, opt: any, type: string) {
-    richardsLogger.warn('pAndNUtils', 'updateNamespaceProjectResult', 1, opt, res, type);
+  private createParam(namespaceFilter: string[] | undefined): string {
+    if (!namespaceFilter || !namespaceFilter.length) {
+      return '';
+    }
 
-    // Originally this was more, but at the moment it's just the type
-    res.resourceType = type;
-    res.data.forEach((d: any) => {
-      d.type = type;
-    });
+    const projectsOrNamespaces = namespaceFilter
+      .map(f => f.replace(NAMESPACE_FILTER_NS_FULL_PREFIX, '')
+      .replace(NAMESPACE_FILTER_P_FULL_PREFIX, ''))
+      .join(',');
 
-    richardsLogger.warn('pAndNUtils', 'updateNamespaceProjectResult', 2, res);
-    return res;
+    return `${ProjectAndNamespaceFiltering.param}=${projectsOrNamespaces}`;
   }
 
 }

From 281fb6672cd9006b783a47ecb1540ff58ad2dd6c Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 12 May 2023 14:55:09 +0100
Subject: [PATCH 04/10] Simplify forced filtering setting - Given forced
 filtering is now not resource dependent have a high level utils function to
 determine if enabled - This should have opened up the door to setting a nicer
 default then ALL_USER, however it's actually initially applied somewhere
 other than ns filter - Fixed a bug where the all option [] was valid

---
 shell/assets/translations/en-us.yaml          |  2 +-
 shell/components/nav/NamespaceFilter.vue      | 40 ++++++++++++++-----
 shell/mixins/resource-fetch-namespaced.js     | 24 +++++------
 shell/plugins/steve/getters.js                |  2 +-
 shell/plugins/steve/subscribe.js              |  2 +-
 shell/store/index.js                          | 18 ---------
 .../projectAndNamespaceFiltering.utils.ts     | 20 ++++++++++
 shell/utils/settings.ts                       | 12 +++---
 8 files changed, 67 insertions(+), 53 deletions(-)
 rename shell/{plugins/steve => utils}/projectAndNamespaceFiltering.utils.ts (66%)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 30b74f929a2..811774bdba7 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -4591,7 +4591,7 @@ resourceList:
     create: Create
     createFromYaml: Create from YAML
     createResource: "Create {resourceName}"
-  nsFiltering: "Please select one or more namespaces or projects from the filter above."
+  nsFiltering: "Please select one or more namespaces or projects using the filter above."
   nsFilterToolTip: "Filtering is restricted to projects and namespaces"
 resourceLoadingIndicator:
   loading: Loading
diff --git a/shell/components/nav/NamespaceFilter.vue b/shell/components/nav/NamespaceFilter.vue
index f3af962b1aa..cd127295295 100644
--- a/shell/components/nav/NamespaceFilter.vue
+++ b/shell/components/nav/NamespaceFilter.vue
@@ -18,7 +18,7 @@ import {
 } from '@shell/utils/namespace-filter';
 import { KEY } from '@shell/utils/platform';
 import richardsLogger from '@shell/utils/richards-logger';
-
+import pAndNFiltering from '@shell/utils/projectAndNamespaceFiltering.utils';
 
 const forcedNamespaceValidTypes = [NAMESPACE_FILTER_KINDS.DIVIDER, NAMESPACE_FILTER_KINDS.PROJECT, NAMESPACE_FILTER_KINDS.NAMESPACE]
 
@@ -38,6 +38,14 @@ export default {
   computed: {
     ...mapGetters(['currentProduct', 'namespaceFilterMode']),
 
+    namespaceFilterMode() {
+      if (pAndNFiltering.isEnabled(this.$store.getters)) { // Note - not reactive
+        return [NAMESPACE_FILTER_KINDS.NAMESPACE, NAMESPACE_FILTER_KINDS.PROJECT];
+      }
+
+      return null;
+    },
+
     hasFilter() {
       return this.filter.length > 0;
     },
@@ -77,11 +85,8 @@ export default {
         return m;
       }, {});
 
-      // Need final backend changes (for bug fixes, testing, etc)
-      // TODO: RC remove console.warn's
-      // TODO: RC (BE FIX REQUIRED) validate resources.x aren't available when x isn't (even if zero results returned)
-      // TODO: RC (BE FIX REQUIRED) feature only works if resources schema's available
-
+      // TODO: RC Need final backend changes (for bug fixes, testing, etc)
+      // TODO: RC remove console.warn's / richardsLogger
 
       // Mark all of the selected options
       out.forEach((i) => {
@@ -309,11 +314,11 @@ export default {
 
     value: {
       get() {
+        richardsLogger.warn('ns filter component', 'value', 'get')
+
         // Use last picked filter from user preferences
         const prefs = this.$store.getters['prefs/get'](NAMESPACE_FILTERS);
-
-        const prefDefault = this.currentProduct?.customNamespaceFilter ? [] : [ALL_USER];
-        const values = prefs && prefs[this.key] ? prefs[this.key] : prefDefault;
+        const values = prefs && prefs[this.key] ? prefs[this.key] : this.defaultOption();
         const options = this.options;
 
         // Remove values that are not valid options
@@ -327,6 +332,7 @@ export default {
       },
 
       set(neu) {
+        richardsLogger.warn('ns filter component', 'value', 'set', neu)
         const old = (this.value || []).slice();
 
         neu = neu.filter(x => !!x.id);
@@ -353,7 +359,7 @@ export default {
         // If there was something selected and you remove it, go back to user by default
         // Unless it was user or all
         if (neu.length === 0 && !hadUser && !hadAll) {
-          ids = this.currentProduct?.customNamespaceFilter ? [] : [ALL_USER];
+          ids = this.defaultOption();
         } else {
           ids = neu.map(x => x.id);
         }
@@ -643,6 +649,20 @@ export default {
       this.selectOption(ns);
       event.preventDefault();
       event.stopPropagation();
+    },
+
+    defaultOption() {
+      // Note - This is one place where a default ns/project filter value is provided (ALL_USER)
+      // There's also..
+      // - dashboard root store `loadCluster` --> when `updateNamespaces` is dispatched
+      // - harvester root store `loadCluster` --> when `updateNamespaces` is dispatched (can be discarded)
+      // Due to this, we can't really set a nicer default when forced ns/project filtering is on (ALL_USER is invalid)
+
+      if (this.currentProduct?.customNamespaceFilter) {
+        return [];
+      }
+
+      return  [ALL_USER];
     }
   }
 };
diff --git a/shell/mixins/resource-fetch-namespaced.js b/shell/mixins/resource-fetch-namespaced.js
index 44d408db923..7168e153e7f 100644
--- a/shell/mixins/resource-fetch-namespaced.js
+++ b/shell/mixins/resource-fetch-namespaced.js
@@ -1,8 +1,8 @@
-import { NAMESPACE_FILTER_KINDS, NAMESPACE_FILTER_NS_PREFIX, NAMESPACE_FILTER_P_PREFIX } from 'utils/namespace-filter';
+import { NAMESPACE_FILTER_NS_PREFIX, NAMESPACE_FILTER_P_PREFIX } from 'utils/namespace-filter';
 import { mapGetters } from 'vuex';
 import { ResourceListComponentName } from '../components/ResourceList/resource-list.config';
 import richardsLogger from '@shell/utils/richards-logger';
-
+import pAndNFiltering from '@shell/utils/projectAndNamespaceFiltering.utils';
 
 /**
  * Companion mixin used with `resource-fetch` for `ResourceList` to determine if the user needs to filter the list by a single namespace
@@ -38,20 +38,22 @@ export default {
      * If the Project/Namespace filter from the header contains a valid ns / project filter ... return it
      */
     __validFilter() {
-      const valid = this.namespaceFilters.every(f => f.startsWith(NAMESPACE_FILTER_NS_PREFIX) || f.startsWith(NAMESPACE_FILTER_P_PREFIX))
+      const valid = this.namespaceFilters.length && this.namespaceFilters.every(f => f.startsWith(NAMESPACE_FILTER_NS_PREFIX) || f.startsWith(NAMESPACE_FILTER_P_PREFIX))
       richardsLogger.warn('rfn', '__validFilter', valid, this.namespaceFilters)
       return valid ? this.namespaceFilters : null;
     },
 
     /**
-     * Do we need to filter the list by a namespace?
+     * Do we need to filter the list by a namespace? This will control whether the user is shown an error
+     * 
+     * We shouldn't show an error on pages with resources that aren't namespaced
      */
     __namespaceRequired() {
-      if (!this.perfConfig.forceNsFilterV2?.enabled) {
+      if (!pAndNFiltering.isEnabled(this.$store.getters)) {
         return false;
-      }
+       }
 
-      return  !this.currentProduct.showWorkspaceSwitcher && this.__areResourcesNamespaced;
+       return this.__areResourcesNamespaced;
     },
 
     /**
@@ -74,14 +76,6 @@ export default {
   },
 
   watch: {
-    __namespaceRequired: {
-      handler(neu) {
-        richardsLogger.warn('rfn', 'watch __namespaceRequired', neu);
-        this.$store.dispatch('setNamespaceFilterMode', neu ? [NAMESPACE_FILTER_KINDS.NAMESPACE, NAMESPACE_FILTER_KINDS.PROJECT]: null, { root: true });
-      },
-      immediate: true,
-    },
-
     async namespaceFilter(neu) {
       if (neu) {
         // When a NS filter is required and the user selects a different one, kick off a new set of API requests
diff --git a/shell/plugins/steve/getters.js b/shell/plugins/steve/getters.js
index aa96e132a15..a32ab931cd1 100644
--- a/shell/plugins/steve/getters.js
+++ b/shell/plugins/steve/getters.js
@@ -8,7 +8,7 @@ import HybridModel, { cleanHybridResources } from './hybrid-class';
 import NormanModel from './norman-class';
 import { urlFor } from '@shell/plugins/dashboard-store/getters';
 import { normalizeType } from '@shell/plugins/dashboard-store/normalize';
-import pAndNFiltering from './projectAndNamespaceFiltering.utils';
+import pAndNFiltering from '@shell/utils/projectAndNamespaceFiltering.utils';
 
 export const STEVE_MODEL_TYPES = {
   NORMAN:  'norman',
diff --git a/shell/plugins/steve/subscribe.js b/shell/plugins/steve/subscribe.js
index 649dc9eb846..075b35bdf57 100644
--- a/shell/plugins/steve/subscribe.js
+++ b/shell/plugins/steve/subscribe.js
@@ -31,7 +31,7 @@ import { escapeHtml } from '@shell/utils/string';
 import { keyForSubscribe } from '@shell/plugins/steve/resourceWatcher';
 import { waitFor } from '@shell/utils/async';
 import { WORKER_MODES } from './worker';
-import pAndNFiltering from '@shell/plugins/steve/projectAndNamespaceFiltering.utils';
+import pAndNFiltering from '@shell/utils/projectAndNamespaceFiltering.utils';
 import richardsLogger from '@shell/utils/richards-logger';
 
 import { BLANK_CLUSTER } from '@shell/store/index.js';
diff --git a/shell/store/index.js b/shell/store/index.js
index ce0ec5d4968..163501872be 100644
--- a/shell/store/index.js
+++ b/shell/store/index.js
@@ -243,7 +243,6 @@ export const state = () => {
     serverVersion:           null,
     systemNamespaces:        [],
     isSingleProduct:         undefined,
-    namespaceFilterMode:     null,
   };
 };
 
@@ -280,15 +279,6 @@ export const getters = {
     return state.systemNamespaces;
   },
 
-  /**
-   * Namespace Filter Mode supplies a resource type to the NamespaceFilter.
-   *
-   * Only one of the resource type is allowed to be selected
-   */
-  namespaceFilterMode(state) {
-    return state.namespaceFilterMode;
-  },
-
   currentCluster(state, getters) {
     return getters['management/byId'](MANAGEMENT.CLUSTER, state.clusterId);
   },
@@ -595,10 +585,6 @@ export const mutations = {
     state.allNamespaces = namespace;
   },
 
-  setNamespaceFilterMode(state, mode) {
-    state.namespaceFilterMode = mode;
-  },
-
   pageActions(state, pageActions) {
     state.pageActions = pageActions;
   },
@@ -941,10 +927,6 @@ export const actions = {
     commit('updateNamespaces', { filters: ids });
   },
 
-  setNamespaceFilterMode({ commit }, mode) {
-    commit('setNamespaceFilterMode', mode);
-  },
-
   async cleanNamespaces({ getters, dispatch }) {
     // Initialise / Remove any filters that the user no-longer has access to
     await dispatch('management/findAll', { type: MANAGEMENT.CLUSTER }); // So they can be got byId below
diff --git a/shell/plugins/steve/projectAndNamespaceFiltering.utils.ts b/shell/utils/projectAndNamespaceFiltering.utils.ts
similarity index 66%
rename from shell/plugins/steve/projectAndNamespaceFiltering.utils.ts
rename to shell/utils/projectAndNamespaceFiltering.utils.ts
index 4d9b1e47a15..9972eac2c77 100644
--- a/shell/plugins/steve/projectAndNamespaceFiltering.utils.ts
+++ b/shell/utils/projectAndNamespaceFiltering.utils.ts
@@ -1,4 +1,5 @@
 import { NAMESPACE_FILTER_NS_FULL_PREFIX, NAMESPACE_FILTER_P_FULL_PREFIX } from 'utils/namespace-filter';
+import { getPerformanceSetting } from 'utils/settings';
 
 type Opt = { [key: string]: any, namespaced?: string[]}
 
@@ -13,6 +14,25 @@ class ProjectAndNamespaceFiltering {
     return Array.isArray(opt.namespaced);
   }
 
+  isEnabled(rootGetters: any): boolean {
+    const currentProduct = rootGetters['currentProduct']
+    // Only enable for the cluster store at the moment. In theory this should work in management as well, as they're both 'steve' stores
+    if (currentProduct?.inStore !== 'cluster') {
+      return false;
+    }
+
+    if (currentProduct.showWorkspaceSwitcher) {
+      return false;
+    }
+
+    const perfConfig = getPerformanceSetting(rootGetters)
+    if (!perfConfig.forceNsFilterV2?.enabled) {
+      return false;
+    }
+
+    return true;
+  }
+
   /**
    * Check if `opt` requires resources from specific ns/projects, if so return the required query param (x=y)
    */
diff --git a/shell/utils/settings.ts b/shell/utils/settings.ts
index 9e76555daa8..55727d77e6d 100644
--- a/shell/utils/settings.ts
+++ b/shell/utils/settings.ts
@@ -44,19 +44,17 @@ export const setSetting = async(store: Store<any>, id: string, val: string): Pro
 };
 
 export const getPerformanceSetting = (rootGetters: Record<string, (arg0: string, arg1: string) => any>) => {
-  const perfSetting = rootGetters['management/byId'](MANAGEMENT.SETTING, SETTING.UI_PERFORMANCE);
-  let perfConfig = {};
+  const perfSettingResource = rootGetters['management/byId'](MANAGEMENT.SETTING, SETTING.UI_PERFORMANCE);
+  let perfSetting = {};
 
-  if (perfSetting && perfSetting.value) {
+  if (perfSettingResource?.value) {
     try {
-      perfConfig = JSON.parse(perfSetting.value);
+      perfSetting = JSON.parse(perfSettingResource.value);
     } catch (e) {
       console.warn('ui-performance setting contains invalid data'); // eslint-disable-line no-console
     }
   }
 
   // Start with the default and overwrite the values from the setting - ensures we have defaults for newly added options
-  perfConfig = Object.assign(DEFAULT_PERF_SETTING, perfConfig);
-
-  return perfConfig;
+  return Object.assign(DEFAULT_PERF_SETTING, perfSetting || {});
 };

From 12f205b6bd0e10e783e4c09b79ac02e683f3824a Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 12 May 2023 15:12:55 +0100
Subject: [PATCH 05/10] Fix issue where no filter options are shown on refresh

---
 shell/components/nav/NamespaceFilter.vue | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/shell/components/nav/NamespaceFilter.vue b/shell/components/nav/NamespaceFilter.vue
index cd127295295..d7c0b9d0748 100644
--- a/shell/components/nav/NamespaceFilter.vue
+++ b/shell/components/nav/NamespaceFilter.vue
@@ -100,6 +100,8 @@ export default {
         }
       });
 
+      richardsLogger.warn('ns filter component', 'filtered', 10, out)
+
       return out;
     },
 
@@ -280,6 +282,8 @@ export default {
         addNamespace(out, namespaces);
       }
 
+      // richardsLogger.warn('ns filter component', 'options', 10,out)
+
       return out;
 
       function addNamespace(out, namespaces) {
@@ -314,7 +318,7 @@ export default {
 
     value: {
       get() {
-        richardsLogger.warn('ns filter component', 'value', 'get')
+        // richardsLogger.warn('ns filter component', 'value', 'get')
 
         // Use last picked filter from user preferences
         const prefs = this.$store.getters['prefs/get'](NAMESPACE_FILTERS);
@@ -332,7 +336,7 @@ export default {
       },
 
       set(neu) {
-        richardsLogger.warn('ns filter component', 'value', 'set', neu)
+        // richardsLogger.warn('ns filter component', 'value', 'set', neu)
         const old = (this.value || []).slice();
 
         neu = neu.filter(x => !!x.id);
@@ -396,9 +400,15 @@ export default {
      * To break this multiple-render per cycle behaviour detatch `filtered` from the value used in `v-for`.
      *
      */
-    filtered(neu) {
-      if (!!neu) {
-        this.cachedFiltered = neu;
+    filtered: {
+      immediate: true,
+      handler(neu) {
+        // richardsLogger.warn('ns filter component', 'watch', 'filtered', 1)
+
+        if (!!neu) {
+        // richardsLogger.warn('ns filter component', 'watch', 'filtered', neu)
+          this.cachedFiltered = neu;
+        }
       }
     }
   },

From 6fffc0d36a19f3bdf74042460497c738b1116e35 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 12 May 2023 15:35:16 +0100
Subject: [PATCH 06/10] Fix linting

---
 shell/components/ResourceList/Masthead.vue    |  1 -
 shell/components/ResourceList/index.vue       |  4 +--
 shell/components/ResourceTable.vue            | 15 +++++-----
 shell/components/nav/NamespaceFilter.vue      | 23 ++++++++-------
 shell/config/settings.ts                      |  6 ++--
 shell/mixins/resource-fetch-namespaced.js     | 18 ++++++------
 shell/mixins/resource-fetch.js                |  2 +-
 .../pages/c/_cluster/settings/performance.vue | 28 ++++++++++---------
 shell/plugins/dashboard-store/actions.js      | 13 +++++----
 shell/plugins/dashboard-store/getters.js      |  4 ++-
 shell/plugins/dashboard-store/mutations.js    |  3 +-
 shell/plugins/steve/getters.js                |  3 +-
 shell/utils/namespace-filter.js               | 18 ++++++------
 .../projectAndNamespaceFiltering.utils.ts     | 16 +++++------
 shell/utils/richards-logger.ts                |  5 ++--
 15 files changed, 83 insertions(+), 76 deletions(-)

diff --git a/shell/components/ResourceList/Masthead.vue b/shell/components/ResourceList/Masthead.vue
index ce9de88817d..c79d407d734 100644
--- a/shell/components/ResourceList/Masthead.vue
+++ b/shell/components/ResourceList/Masthead.vue
@@ -65,7 +65,6 @@ export default {
       default: false
     },
 
-
     showIncrementalLoadingIndicator: {
       type:    Boolean,
       default: false
diff --git a/shell/components/ResourceList/index.vue b/shell/components/ResourceList/index.vue
index 4163c55415b..e83a44f1f0e 100644
--- a/shell/components/ResourceList/index.vue
+++ b/shell/components/ResourceList/index.vue
@@ -152,7 +152,7 @@ export default {
         return;
       }
 
-      if (neu &&  !this.hasFetch) {
+      if (neu && !this.hasFetch) {
         this.$fetchType(this.resource);
       }
     }
@@ -181,7 +181,7 @@ export default {
     icon="icon-filter_alt"
   >
     <template #message>
-      {{t('resourceList.nsFiltering')}}
+      {{ t('resourceList.nsFiltering') }}
     </template>
   </IconMessage>
   <div v-else>
diff --git a/shell/components/ResourceTable.vue b/shell/components/ResourceTable.vue
index c27a060d0fc..0a1e66ff1c8 100644
--- a/shell/components/ResourceTable.vue
+++ b/shell/components/ResourceTable.vue
@@ -177,12 +177,13 @@ export default {
       return acc;
     }, {});
 
-    
     richardsLogger.warn('rt', 'data', this.schema, this);
     // Confirm which store we're in, if schema isn't available we're probably showing a list with different types
     const inStore = this.schema?.id ? this.$store.getters['currentStore'](this.schema.id) : undefined;
 
-    return { listGroups, listGroupMapped, inStore };
+    return {
+      listGroups, listGroupMapped, inStore
+    };
   },
 
   computed: {
@@ -250,21 +251,21 @@ export default {
     filteredRows() {
       const isAll = this.$store.getters['isAllNamespaces'];
 
-      richardsLogger.warn('RC', 'rt', 'filteredRows', this.inStore, this.schema?.id)
+      richardsLogger.warn('RC', 'rt', 'filteredRows', this.inStore, this.schema?.id);
 
       // Do we need to filter by namespace like things?
       if (
         !this.isNamespaced || // Resource type isn't namespaced
         this.ignoreFilter || // Component owner strictly states no filtering
-        isAll && !this.currentProduct?.hideSystemResources || // Need all
-        (this.inStore ? this.$store.getters[this.inStore + '/haveNamespace'](this.schema.id)?.length : false)// Store reports type has namespace filter, so rows already contain the correctly filtered resources
+        (isAll && !this.currentProduct?.hideSystemResources) || // Need all
+        (this.inStore ? this.$store.getters[`${ this.inStore }/haveNamespace`](this.schema.id)?.length : false)// Store reports type has namespace filter, so rows already contain the correctly filtered resources
       ) {
-        richardsLogger.warn('RC', 'rt', 'filteredRows', this.schema?.id, 'SKIPPING', !this.isNamespaced, this.ignoreFilter, isAll && !this.currentProduct?.hideSystemResources, this.inStore ? this.$store.getters[this.inStore + '/haveNamespace'](this.schema.id)?.length : false)
+        richardsLogger.warn('RC', 'rt', 'filteredRows', this.schema?.id, 'SKIPPING', !this.isNamespaced, this.ignoreFilter, isAll && !this.currentProduct?.hideSystemResources, this.inStore ? this.$store.getters[`${ this.inStore }/haveNamespace`](this.schema.id)?.length : false);
 
         return this.rows || [];
       }
 
-      richardsLogger.warn('RC', 'rt', 'filteredRows', this.schema?.id, 'FILTERING', this.inStore ? this.$store.getters[this.inStore + '/haveNamespace'](this.schema.id)?.length : false, this.rows)
+      richardsLogger.warn('RC', 'rt', 'filteredRows', this.schema?.id, 'FILTERING', this.inStore ? this.$store.getters[`${ this.inStore }/haveNamespace`](this.schema.id)?.length : false, this.rows);
 
       const includedNamespaces = this.$store.getters['namespaces']();
 
diff --git a/shell/components/nav/NamespaceFilter.vue b/shell/components/nav/NamespaceFilter.vue
index d7c0b9d0748..56ac68cdacd 100644
--- a/shell/components/nav/NamespaceFilter.vue
+++ b/shell/components/nav/NamespaceFilter.vue
@@ -20,7 +20,7 @@ import { KEY } from '@shell/utils/platform';
 import richardsLogger from '@shell/utils/richards-logger';
 import pAndNFiltering from '@shell/utils/projectAndNamespaceFiltering.utils';
 
-const forcedNamespaceValidTypes = [NAMESPACE_FILTER_KINDS.DIVIDER, NAMESPACE_FILTER_KINDS.PROJECT, NAMESPACE_FILTER_KINDS.NAMESPACE]
+const forcedNamespaceValidTypes = [NAMESPACE_FILTER_KINDS.DIVIDER, NAMESPACE_FILTER_KINDS.PROJECT, NAMESPACE_FILTER_KINDS.NAMESPACE];
 
 export default {
   data() {
@@ -51,7 +51,7 @@ export default {
     },
 
     filtered() {
-      richardsLogger.warn('ns filter component', 'filtered', 1, this.namespaceFilterMode)
+      richardsLogger.warn('ns filter component', 'filtered', 1, this.namespaceFilterMode);
       let out = this.options;
 
       out = out.filter((item) => {
@@ -60,6 +60,7 @@ export default {
           // We always show dividers, projects and namespaces
           if (!forcedNamespaceValidTypes.includes(item.kind)) {
             const validCustomType = this.namespaceFilterMode.find(prefix => item.kind.startsWith(prefix));
+
             if (!validCustomType) {
               // Hide any invalid option that's not selected
               return this.value.findIndex(v => v.id === item.id) >= 0;
@@ -94,13 +95,14 @@ export default {
         i.elementId = (i.id || '').replace('://', '_');
         i.enabled = true;
         // Are we in restricted resource type mode, if so is this an allowed type?
-        if(this.namespaceFilterMode?.length) {
+        if (this.namespaceFilterMode?.length) {
           const isLastSelected = i.selected && (i.id === ALL || this.value.length === 1);
-          i.enabled = !isLastSelected && this.namespaceFilterMode.find(f => f === i.kind)
+
+          i.enabled = !isLastSelected && this.namespaceFilterMode.find(f => f === i.kind);
         }
       });
 
-      richardsLogger.warn('ns filter component', 'filtered', 10, out)
+      richardsLogger.warn('ns filter component', 'filtered', 10, out);
 
       return out;
     },
@@ -252,7 +254,7 @@ export default {
           }
 
           out.push({
-            id:    `${NAMESPACE_FILTER_P_FULL_PREFIX}${ id }`,
+            id:    `${ NAMESPACE_FILTER_P_FULL_PREFIX }${ id }`,
             kind:  NAMESPACE_FILTER_KINDS.PROJECT,
             label: t('nav.ns.project', { name: project.nameDisplay }),
           });
@@ -295,7 +297,7 @@ export default {
           out,
           namespaces.map((namespace) => {
             return {
-              id:    `${NAMESPACE_FILTER_NS_FULL_PREFIX}${ namespace.id }`,
+              id:    `${ NAMESPACE_FILTER_NS_FULL_PREFIX }${ namespace.id }`,
               kind:  NAMESPACE_FILTER_KINDS.NAMESPACE,
               label: t('nav.ns.namespace', { name: namespace.nameDisplay }),
             };
@@ -624,12 +626,13 @@ export default {
 
       // Remove invalid
       if (!!this.namespaceFilterMode?.length) {
-        this.value.forEach(v => {
+        this.value.forEach((v) => {
           if (!this.namespaceFilterMode.find(f => f === v.kind)) {
             const index = current.findIndex(c => c.id === v.id);
+
             current.splice(index, 1);
           }
-        })
+        });
       }
 
       const exists = current.findIndex(v => v.id === option.id);
@@ -672,7 +675,7 @@ export default {
         return [];
       }
 
-      return  [ALL_USER];
+      return [ALL_USER];
     }
   }
 };
diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index 555ea4a3bfb..68acdd8b3e2 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -159,8 +159,6 @@ export const DEFAULT_PERF_SETTING = {
   },
   disableWebsocketNotification: true,
   garbageCollection:            GC_DEFAULTS,
-  forceNsFilterV2:                {
-    enabled:   false,
-  },
-  advancedWorker: { enabled: false },
+  forceNsFilterV2:              { enabled: false },
+  advancedWorker:               { enabled: false },
 };
diff --git a/shell/mixins/resource-fetch-namespaced.js b/shell/mixins/resource-fetch-namespaced.js
index 7168e153e7f..5328cc6fe3b 100644
--- a/shell/mixins/resource-fetch-namespaced.js
+++ b/shell/mixins/resource-fetch-namespaced.js
@@ -20,7 +20,7 @@ export default {
      * Does the user need to update the filter to supply a single namespace?
      */
     namespaceFilterRequired() {
-      richardsLogger.warn('rfn', 'namespaceFilterRequired', this.__namespaceRequired, this.__validFilter)
+      richardsLogger.warn('rfn', 'namespaceFilterRequired', this.__namespaceRequired, this.__validFilter);
 
       return this.__namespaceRequired && !this.__validFilter;
     },
@@ -29,7 +29,7 @@ export default {
      * Returns the namespace that requests should be filtered by
      */
     namespaceFilter() {
-      richardsLogger.warn('rfn', 'namespaceFilters', this.namespaceFilters)
+      richardsLogger.warn('rfn', 'namespaceFilters', this.namespaceFilters);
 
       return this.__namespaceRequired ? this.__validFilter : '';
     },
@@ -38,22 +38,24 @@ export default {
      * If the Project/Namespace filter from the header contains a valid ns / project filter ... return it
      */
     __validFilter() {
-      const valid = this.namespaceFilters.length && this.namespaceFilters.every(f => f.startsWith(NAMESPACE_FILTER_NS_PREFIX) || f.startsWith(NAMESPACE_FILTER_P_PREFIX))
-      richardsLogger.warn('rfn', '__validFilter', valid, this.namespaceFilters)
+      const valid = this.namespaceFilters.length && this.namespaceFilters.every(f => f.startsWith(NAMESPACE_FILTER_NS_PREFIX) || f.startsWith(NAMESPACE_FILTER_P_PREFIX));
+
+      richardsLogger.warn('rfn', '__validFilter', valid, this.namespaceFilters);
+
       return valid ? this.namespaceFilters : null;
     },
 
     /**
      * Do we need to filter the list by a namespace? This will control whether the user is shown an error
-     * 
+     *
      * We shouldn't show an error on pages with resources that aren't namespaced
      */
     __namespaceRequired() {
       if (!pAndNFiltering.isEnabled(this.$store.getters)) {
         return false;
-       }
+      }
 
-       return this.__areResourcesNamespaced;
+      return this.__areResourcesNamespaced;
     },
 
     /**
@@ -66,7 +68,7 @@ export default {
       }
 
       return (this.loadResources || []).every((type) => {
-        richardsLogger.warn('rfn', '__areResourcesNamespaced', type)
+        richardsLogger.warn('rfn', '__areResourcesNamespaced', type);
         const schema = this.$store.getters['cluster/schemaFor'](type);
 
         return schema?.attributes?.namespaced;
diff --git a/shell/mixins/resource-fetch.js b/shell/mixins/resource-fetch.js
index ef326a8fa63..9ad21339ce9 100644
--- a/shell/mixins/resource-fetch.js
+++ b/shell/mixins/resource-fetch.js
@@ -99,7 +99,7 @@ export default {
     },
     // data fetching for the mechanism
     $fetchType(type, multipleResources = [], storeType) {
-      richardsLogger.warn('fs', type, '$fetchType')
+      richardsLogger.warn('fs', type, '$fetchType');
       const currStore = storeType || this.$store.getters['currentStore']();
 
       this.$initializeFetchData(type, multipleResources, currStore);
diff --git a/shell/pages/c/_cluster/settings/performance.vue b/shell/pages/c/_cluster/settings/performance.vue
index 1e948952a26..e5430bd9b7b 100644
--- a/shell/pages/c/_cluster/settings/performance.vue
+++ b/shell/pages/c/_cluster/settings/performance.vue
@@ -10,16 +10,16 @@ import { _EDIT, _VIEW } from '@shell/config/query-params';
 import UnitInput from '@shell/components/form/UnitInput';
 
 const incompatible = {
-  'incrementalLoading': ['forceNsFilterV2'],
-  'manualRefresh': ['forceNsFilterV2'],
-  'forceNsFilterV2': ['incrementalLoading', 'manualRefresh'],
-}
+  incrementalLoading: ['forceNsFilterV2'],
+  manualRefresh:      ['forceNsFilterV2'],
+  forceNsFilterV2:    ['incrementalLoading', 'manualRefresh'],
+};
 
 const l10n = {
-  'incrementalLoading': 'incrementalLoad',
-  'manualRefresh': 'manualRefresh',
-  'forceNsFilterV2': 'nsFiltering',
-}
+  incrementalLoading: 'incrementalLoad',
+  manualRefresh:      'manualRefresh',
+  forceNsFilterV2:    'nsFiltering',
+};
 
 export default {
   layout:     'authenticated',
@@ -120,6 +120,7 @@ export default {
       if (!enabled) {
         // Disabling a preference won't automatically turn on an incompatible one, so just set and exit
         this.value[property].enabled = false;
+
         return;
       }
 
@@ -127,6 +128,7 @@ export default {
       if ((incompatible[property] || []).every(p => !this.value[p].enabled)) {
         // No, just set and exit
         this.value[property].enabled = true;
+
         return;
       }
 
@@ -135,15 +137,15 @@ export default {
         component:      'GenericPrompt',
         componentProps: {
           applyMode:   'enable',
-          applyAction: buttonDone => {
+          applyAction: (buttonDone) => {
             this.value[property].enabled = true;
-            (incompatible[property] || []).forEach(incompatible => {
-              this.value[incompatible].enabled = false
-            })
+            (incompatible[property] || []).forEach((incompatible) => {
+              this.value[incompatible].enabled = false;
+            });
             buttonDone(true);
           },
           title: this.t('promptRemove.title', {}, true),
-          body:  this.t(`performance.${l10n[property]}.incompatibleDescription`, {}, true),
+          body:  this.t(`performance.${ l10n[property] }.incompatibleDescription`, {}, true),
         },
       });
     }
diff --git a/shell/plugins/dashboard-store/actions.js b/shell/plugins/dashboard-store/actions.js
index 77f9fd36aea..afb0b4d1742 100644
--- a/shell/plugins/dashboard-store/actions.js
+++ b/shell/plugins/dashboard-store/actions.js
@@ -150,10 +150,10 @@ export default {
       commit('registerType', type);
     }
 
-    richardsLogger.warn('ds', 'findAll', 3, type)
+    richardsLogger.warn('ds', 'findAll', 3, type);
     // No need to request the resources if we have them already
     if ( opt.force !== true && (getters['haveAll'](type) || getters['haveAllNamespace'](type, opt.namespaced))) {
-      richardsLogger.warn('ds', 'findAll', 4, type)
+      richardsLogger.warn('ds', 'findAll', 4, type);
 
       const args = {
         type,
@@ -164,7 +164,7 @@ export default {
       };
 
       if (opt.watch !== false ) {
-        richardsLogger.warn('ds', 'findAll', 5, type, 'watching', args)
+        richardsLogger.warn('ds', 'findAll', 5, type, 'watching', args);
         dispatch('watch', args);
       }
 
@@ -322,14 +322,15 @@ export default {
 
     // ToDo: SM if we start a "bigger" watch (such as watch without a namespace vs a watch with a namespace), we should stop the stop the "smaller" watch so we don't have duplicate events coming back
     if ( opt.watch !== false ) {
-      const args  = {
+      const args = {
         type,
         revision:  out.revision,
         namespace: opt.watchNamespace || opt.namespaced, // it could be either apparently
         // ToDo: SM namespaced is sometimes a boolean and sometimes a string, I don't see it as especially broken but we should refactor that in the future
         force:     opt.forceWatch === true,
-      }
-      richardsLogger.warn('ds', 'findAll', 20, type, 'watching', args)
+      };
+
+      richardsLogger.warn('ds', 'findAll', 20, type, 'watching', args);
 
       dispatch('watch', args);
     }
diff --git a/shell/plugins/dashboard-store/getters.js b/shell/plugins/dashboard-store/getters.js
index 00b3f91dedf..b1f22afbfa7 100644
--- a/shell/plugins/dashboard-store/getters.js
+++ b/shell/plugins/dashboard-store/getters.js
@@ -269,7 +269,8 @@ export default {
     const entry = state.types[type];
 
     if ( entry ) {
-      richardsLogger.warn('ds', 'getter', 'haveAllNamespace', entry.haveNamespace, namespace, entry.haveNamespace === namespace)
+      richardsLogger.warn('ds', 'getter', 'haveAllNamespace', entry.haveNamespace, namespace, entry.haveNamespace === namespace);
+
       return entry.haveNamespace === namespace;
     }
 
@@ -278,6 +279,7 @@ export default {
 
   haveNamespace: (state, getters) => (type) => {
     type = getters.normalizeType(type);
+
     return state.types[type]?.haveNamespace || null;
   },
 
diff --git a/shell/plugins/dashboard-store/mutations.js b/shell/plugins/dashboard-store/mutations.js
index c284cf2cc41..0568eda40ab 100644
--- a/shell/plugins/dashboard-store/mutations.js
+++ b/shell/plugins/dashboard-store/mutations.js
@@ -296,10 +296,9 @@ export function loadAll(state, {
 
   // Allow requester to skip setting that everything has loaded
   if (!skipHaveAll) {
-    
     cache.haveNamespace = namespace;
     cache.haveAll = !namespace;
-    richardsLogger.warn('ds', 'loadAll', type, cache.haveNamespace, cache.haveAll )
+    richardsLogger.warn('ds', 'loadAll', type, cache.haveNamespace, cache.haveAll );
   }
 
   return proxies;
diff --git a/shell/plugins/steve/getters.js b/shell/plugins/steve/getters.js
index a32ab931cd1..f64ade14dbf 100644
--- a/shell/plugins/steve/getters.js
+++ b/shell/plugins/steve/getters.js
@@ -50,7 +50,7 @@ export default {
     const namespaceProjectFilter = pAndNFiltering.checkAndCreateParam(opt);
 
     if (namespaceProjectFilter) {
-      url += `${ (url.includes('?') ? '&' : '?') + namespaceProjectFilter}`;
+      url += `${ (url.includes('?') ? '&' : '?') + namespaceProjectFilter }`;
     }
     // End: Filter
 
@@ -87,6 +87,7 @@ export default {
     // - an array of namespaces or projects - add restriction as a param
     if (opt.namespaced && !pAndNFiltering.isApplicable(opt)) {
       const parts = url.split('/');
+
       url = `${ parts.join('/') }/${ opt.namespaced }`;
     }
 
diff --git a/shell/utils/namespace-filter.js b/shell/utils/namespace-filter.js
index 27f8a447ff0..a039510485d 100644
--- a/shell/utils/namespace-filter.js
+++ b/shell/utils/namespace-filter.js
@@ -2,23 +2,23 @@ export const NAMESPACE_FILTER_ALL_PREFIX = 'all';
 export const NAMESPACE_FILTER_NS_PREFIX = 'ns';
 export const NAMESPACE_FILTER_P_PREFIX = 'project';
 
-export const NAMESPACE_FILTER_NS_FULL_PREFIX = NAMESPACE_FILTER_NS_PREFIX + '://';
-export const NAMESPACE_FILTER_P_FULL_PREFIX = NAMESPACE_FILTER_P_PREFIX + '://';
+export const NAMESPACE_FILTER_NS_FULL_PREFIX = `${ NAMESPACE_FILTER_NS_PREFIX }://`;
+export const NAMESPACE_FILTER_P_FULL_PREFIX = `${ NAMESPACE_FILTER_P_PREFIX }://`;
 
 export const NAMESPACE_FILTER_ALL = NAMESPACE_FILTER_ALL_PREFIX;
-export const NAMESPACE_FILTER_ALL_SYSTEM = NAMESPACE_FILTER_ALL_PREFIX + '://system';
-export const NAMESPACE_FILTER_ALL_USER = NAMESPACE_FILTER_ALL_PREFIX + '://user';
-export const NAMESPACE_FILTER_ALL_ORPHANS = NAMESPACE_FILTER_ALL_PREFIX + '://orphans';
+export const NAMESPACE_FILTER_ALL_SYSTEM = `${ NAMESPACE_FILTER_ALL_PREFIX }://system`;
+export const NAMESPACE_FILTER_ALL_USER = `${ NAMESPACE_FILTER_ALL_PREFIX }://user`;
+export const NAMESPACE_FILTER_ALL_ORPHANS = `${ NAMESPACE_FILTER_ALL_PREFIX }://orphans`;
 export const NAMESPACE_FILTER_NAMESPACED_PREFIX = 'namespaced://';
 export const NAMESPACE_FILTER_NAMESPACED_YES = 'namespaced://true';
 export const NAMESPACE_FILTER_NAMESPACED_NO = 'namespaced://false';
 
 export const NAMESPACE_FILTER_KINDS = {
-  DIVIDER: 'divider',
-  PROJECT: 'project',
+  DIVIDER:   'divider',
+  PROJECT:   'project',
   NAMESPACE: 'namespace',
-  SPECIAL: 'special'
-}
+  SPECIAL:   'special'
+};
 
 const SEPARATOR = '__%%__';
 
diff --git a/shell/utils/projectAndNamespaceFiltering.utils.ts b/shell/utils/projectAndNamespaceFiltering.utils.ts
index 9972eac2c77..74ae8ca0085 100644
--- a/shell/utils/projectAndNamespaceFiltering.utils.ts
+++ b/shell/utils/projectAndNamespaceFiltering.utils.ts
@@ -4,7 +4,6 @@ import { getPerformanceSetting } from 'utils/settings';
 type Opt = { [key: string]: any, namespaced?: string[]}
 
 class ProjectAndNamespaceFiltering {
-
   static param = 'projectsornamespaces'
 
   /**
@@ -15,7 +14,8 @@ class ProjectAndNamespaceFiltering {
   }
 
   isEnabled(rootGetters: any): boolean {
-    const currentProduct = rootGetters['currentProduct']
+    const currentProduct = rootGetters['currentProduct'];
+
     // Only enable for the cluster store at the moment. In theory this should work in management as well, as they're both 'steve' stores
     if (currentProduct?.inStore !== 'cluster') {
       return false;
@@ -25,7 +25,8 @@ class ProjectAndNamespaceFiltering {
       return false;
     }
 
-    const perfConfig = getPerformanceSetting(rootGetters)
+    const perfConfig = getPerformanceSetting(rootGetters);
+
     if (!perfConfig.forceNsFilterV2?.enabled) {
       return false;
     }
@@ -38,7 +39,7 @@ class ProjectAndNamespaceFiltering {
    */
   checkAndCreateParam(opt: Opt): string {
     if (!this.isApplicable(opt)) {
-      return ''
+      return '';
     }
 
     return this.createParam(opt.namespaced);
@@ -51,12 +52,11 @@ class ProjectAndNamespaceFiltering {
 
     const projectsOrNamespaces = namespaceFilter
       .map(f => f.replace(NAMESPACE_FILTER_NS_FULL_PREFIX, '')
-      .replace(NAMESPACE_FILTER_P_FULL_PREFIX, ''))
+        .replace(NAMESPACE_FILTER_P_FULL_PREFIX, ''))
       .join(',');
 
-    return `${ProjectAndNamespaceFiltering.param}=${projectsOrNamespaces}`;
+    return `${ ProjectAndNamespaceFiltering.param }=${ projectsOrNamespaces }`;
   }
-
 }
 
-export default new ProjectAndNamespaceFiltering();
\ No newline at end of file
+export default new ProjectAndNamespaceFiltering();
diff --git a/shell/utils/richards-logger.ts b/shell/utils/richards-logger.ts
index 8e88eda4adb..787efc782b9 100644
--- a/shell/utils/richards-logger.ts
+++ b/shell/utils/richards-logger.ts
@@ -7,12 +7,11 @@ class RichardsLogger {
 
   warn() {
     if (this.enabled) {
-      console.warn('CUSTOM', ...arguments)//, new Error()
+      console.warn('CUSTOM', ...arguments);//, new Error()
     }
   }
-
 }
 
 const logger = new RichardsLogger();
 
-export default logger;
\ No newline at end of file
+export default logger;

From 9fada7f0b660c9009743d6a9b4d2d5a47f809ee3 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 12 May 2023 15:40:38 +0100
Subject: [PATCH 07/10] Remove richards-logger

---
 shell/components/ResourceTable.vue         |  8 --------
 shell/components/nav/NamespaceFilter.vue   | 15 ---------------
 shell/mixins/resource-fetch-namespaced.js  |  8 --------
 shell/mixins/resource-fetch.js             |  2 --
 shell/plugins/dashboard-store/actions.js   |  7 -------
 shell/plugins/dashboard-store/getters.js   |  3 ---
 shell/plugins/dashboard-store/mutations.js |  2 --
 shell/plugins/steve/subscribe.js           | 11 -----------
 shell/utils/richards-logger.ts             | 17 -----------------
 9 files changed, 73 deletions(-)
 delete mode 100644 shell/utils/richards-logger.ts

diff --git a/shell/components/ResourceTable.vue b/shell/components/ResourceTable.vue
index 0a1e66ff1c8..94c94654cdb 100644
--- a/shell/components/ResourceTable.vue
+++ b/shell/components/ResourceTable.vue
@@ -6,7 +6,6 @@ import ButtonGroup from '@shell/components/ButtonGroup';
 import SortableTable from '@shell/components/SortableTable';
 import { NAMESPACE } from '@shell/config/table-headers';
 import { findBy } from '@shell/utils/array';
-import richardsLogger from '@shell/utils/richards-logger';
 
 // Default group-by in the case the group stored in the preference does not apply
 const DEFAULT_GROUP = 'namespace';
@@ -177,7 +176,6 @@ export default {
       return acc;
     }, {});
 
-    richardsLogger.warn('rt', 'data', this.schema, this);
     // Confirm which store we're in, if schema isn't available we're probably showing a list with different types
     const inStore = this.schema?.id ? this.$store.getters['currentStore'](this.schema.id) : undefined;
 
@@ -251,8 +249,6 @@ export default {
     filteredRows() {
       const isAll = this.$store.getters['isAllNamespaces'];
 
-      richardsLogger.warn('RC', 'rt', 'filteredRows', this.inStore, this.schema?.id);
-
       // Do we need to filter by namespace like things?
       if (
         !this.isNamespaced || // Resource type isn't namespaced
@@ -260,13 +256,9 @@ export default {
         (isAll && !this.currentProduct?.hideSystemResources) || // Need all
         (this.inStore ? this.$store.getters[`${ this.inStore }/haveNamespace`](this.schema.id)?.length : false)// Store reports type has namespace filter, so rows already contain the correctly filtered resources
       ) {
-        richardsLogger.warn('RC', 'rt', 'filteredRows', this.schema?.id, 'SKIPPING', !this.isNamespaced, this.ignoreFilter, isAll && !this.currentProduct?.hideSystemResources, this.inStore ? this.$store.getters[`${ this.inStore }/haveNamespace`](this.schema.id)?.length : false);
-
         return this.rows || [];
       }
 
-      richardsLogger.warn('RC', 'rt', 'filteredRows', this.schema?.id, 'FILTERING', this.inStore ? this.$store.getters[`${ this.inStore }/haveNamespace`](this.schema.id)?.length : false, this.rows);
-
       const includedNamespaces = this.$store.getters['namespaces']();
 
       // Shouldn't happen, but does for resources like management.cattle.io.preference
diff --git a/shell/components/nav/NamespaceFilter.vue b/shell/components/nav/NamespaceFilter.vue
index 56ac68cdacd..4d38e3f42a0 100644
--- a/shell/components/nav/NamespaceFilter.vue
+++ b/shell/components/nav/NamespaceFilter.vue
@@ -17,7 +17,6 @@ import {
   NAMESPACE_FILTER_P_FULL_PREFIX,
 } from '@shell/utils/namespace-filter';
 import { KEY } from '@shell/utils/platform';
-import richardsLogger from '@shell/utils/richards-logger';
 import pAndNFiltering from '@shell/utils/projectAndNamespaceFiltering.utils';
 
 const forcedNamespaceValidTypes = [NAMESPACE_FILTER_KINDS.DIVIDER, NAMESPACE_FILTER_KINDS.PROJECT, NAMESPACE_FILTER_KINDS.NAMESPACE];
@@ -51,7 +50,6 @@ export default {
     },
 
     filtered() {
-      richardsLogger.warn('ns filter component', 'filtered', 1, this.namespaceFilterMode);
       let out = this.options;
 
       out = out.filter((item) => {
@@ -86,9 +84,6 @@ export default {
         return m;
       }, {});
 
-      // TODO: RC Need final backend changes (for bug fixes, testing, etc)
-      // TODO: RC remove console.warn's / richardsLogger
-
       // Mark all of the selected options
       out.forEach((i) => {
         i.selected = !!mapped[i.id] || (i.id === ALL && this.value && this.value.length === 0);
@@ -102,8 +97,6 @@ export default {
         }
       });
 
-      richardsLogger.warn('ns filter component', 'filtered', 10, out);
-
       return out;
     },
 
@@ -284,8 +277,6 @@ export default {
         addNamespace(out, namespaces);
       }
 
-      // richardsLogger.warn('ns filter component', 'options', 10,out)
-
       return out;
 
       function addNamespace(out, namespaces) {
@@ -320,8 +311,6 @@ export default {
 
     value: {
       get() {
-        // richardsLogger.warn('ns filter component', 'value', 'get')
-
         // Use last picked filter from user preferences
         const prefs = this.$store.getters['prefs/get'](NAMESPACE_FILTERS);
         const values = prefs && prefs[this.key] ? prefs[this.key] : this.defaultOption();
@@ -338,7 +327,6 @@ export default {
       },
 
       set(neu) {
-        // richardsLogger.warn('ns filter component', 'value', 'set', neu)
         const old = (this.value || []).slice();
 
         neu = neu.filter(x => !!x.id);
@@ -405,10 +393,7 @@ export default {
     filtered: {
       immediate: true,
       handler(neu) {
-        // richardsLogger.warn('ns filter component', 'watch', 'filtered', 1)
-
         if (!!neu) {
-        // richardsLogger.warn('ns filter component', 'watch', 'filtered', neu)
           this.cachedFiltered = neu;
         }
       }
diff --git a/shell/mixins/resource-fetch-namespaced.js b/shell/mixins/resource-fetch-namespaced.js
index 5328cc6fe3b..0421bda1008 100644
--- a/shell/mixins/resource-fetch-namespaced.js
+++ b/shell/mixins/resource-fetch-namespaced.js
@@ -1,7 +1,6 @@
 import { NAMESPACE_FILTER_NS_PREFIX, NAMESPACE_FILTER_P_PREFIX } from 'utils/namespace-filter';
 import { mapGetters } from 'vuex';
 import { ResourceListComponentName } from '../components/ResourceList/resource-list.config';
-import richardsLogger from '@shell/utils/richards-logger';
 import pAndNFiltering from '@shell/utils/projectAndNamespaceFiltering.utils';
 
 /**
@@ -20,8 +19,6 @@ export default {
      * Does the user need to update the filter to supply a single namespace?
      */
     namespaceFilterRequired() {
-      richardsLogger.warn('rfn', 'namespaceFilterRequired', this.__namespaceRequired, this.__validFilter);
-
       return this.__namespaceRequired && !this.__validFilter;
     },
 
@@ -29,8 +26,6 @@ export default {
      * Returns the namespace that requests should be filtered by
      */
     namespaceFilter() {
-      richardsLogger.warn('rfn', 'namespaceFilters', this.namespaceFilters);
-
       return this.__namespaceRequired ? this.__validFilter : '';
     },
 
@@ -40,8 +35,6 @@ export default {
     __validFilter() {
       const valid = this.namespaceFilters.length && this.namespaceFilters.every(f => f.startsWith(NAMESPACE_FILTER_NS_PREFIX) || f.startsWith(NAMESPACE_FILTER_P_PREFIX));
 
-      richardsLogger.warn('rfn', '__validFilter', valid, this.namespaceFilters);
-
       return valid ? this.namespaceFilters : null;
     },
 
@@ -68,7 +61,6 @@ export default {
       }
 
       return (this.loadResources || []).every((type) => {
-        richardsLogger.warn('rfn', '__areResourcesNamespaced', type);
         const schema = this.$store.getters['cluster/schemaFor'](type);
 
         return schema?.attributes?.namespaced;
diff --git a/shell/mixins/resource-fetch.js b/shell/mixins/resource-fetch.js
index 9ad21339ce9..0b7afbef670 100644
--- a/shell/mixins/resource-fetch.js
+++ b/shell/mixins/resource-fetch.js
@@ -2,7 +2,6 @@ import { mapGetters } from 'vuex';
 import { COUNT, MANAGEMENT } from '@shell/config/types';
 import { SETTING, DEFAULT_PERF_SETTING } from '@shell/config/settings';
 import ResourceFetchNamespaced from '@shell/mixins/resource-fetch-namespaced';
-import richardsLogger from '@shell/utils/richards-logger';
 
 // Number of pages to fetch when loading incrementally
 const PAGES = 4;
@@ -99,7 +98,6 @@ export default {
     },
     // data fetching for the mechanism
     $fetchType(type, multipleResources = [], storeType) {
-      richardsLogger.warn('fs', type, '$fetchType');
       const currStore = storeType || this.$store.getters['currentStore']();
 
       this.$initializeFetchData(type, multipleResources, currStore);
diff --git a/shell/plugins/dashboard-store/actions.js b/shell/plugins/dashboard-store/actions.js
index afb0b4d1742..7c1660cc355 100644
--- a/shell/plugins/dashboard-store/actions.js
+++ b/shell/plugins/dashboard-store/actions.js
@@ -7,7 +7,6 @@ import { classify } from '@shell/plugins/dashboard-store/classify';
 import { normalizeType } from './normalize';
 import garbageCollect from '@shell/utils/gc/gc';
 import { addSchemaIndexFields } from '@shell/plugins/steve/schema.utils';
-import richardsLogger from '@shell/utils/richards-logger';
 
 export const _ALL = 'all';
 export const _MERGE = 'merge';
@@ -150,11 +149,8 @@ export default {
       commit('registerType', type);
     }
 
-    richardsLogger.warn('ds', 'findAll', 3, type);
     // No need to request the resources if we have them already
     if ( opt.force !== true && (getters['haveAll'](type) || getters['haveAllNamespace'](type, opt.namespaced))) {
-      richardsLogger.warn('ds', 'findAll', 4, type);
-
       const args = {
         type,
         revision:  '',
@@ -164,7 +160,6 @@ export default {
       };
 
       if (opt.watch !== false ) {
-        richardsLogger.warn('ds', 'findAll', 5, type, 'watching', args);
         dispatch('watch', args);
       }
 
@@ -330,8 +325,6 @@ export default {
         force:     opt.forceWatch === true,
       };
 
-      richardsLogger.warn('ds', 'findAll', 20, type, 'watching', args);
-
       dispatch('watch', args);
     }
 
diff --git a/shell/plugins/dashboard-store/getters.js b/shell/plugins/dashboard-store/getters.js
index b1f22afbfa7..857dc7ee0a2 100644
--- a/shell/plugins/dashboard-store/getters.js
+++ b/shell/plugins/dashboard-store/getters.js
@@ -10,7 +10,6 @@ import mutations from './mutations';
 import { keyFieldFor, normalizeType } from './normalize';
 import { lookup } from './model-loader';
 import garbageCollect from '@shell/utils/gc/gc';
-import richardsLogger from '@shell/utils/richards-logger';
 
 export const urlFor = (state, getters) => (type, id, opt) => {
   opt = opt || {};
@@ -269,8 +268,6 @@ export default {
     const entry = state.types[type];
 
     if ( entry ) {
-      richardsLogger.warn('ds', 'getter', 'haveAllNamespace', entry.haveNamespace, namespace, entry.haveNamespace === namespace);
-
       return entry.haveNamespace === namespace;
     }
 
diff --git a/shell/plugins/dashboard-store/mutations.js b/shell/plugins/dashboard-store/mutations.js
index 0568eda40ab..085cfc7d030 100644
--- a/shell/plugins/dashboard-store/mutations.js
+++ b/shell/plugins/dashboard-store/mutations.js
@@ -5,7 +5,6 @@ import { normalizeType, keyFieldFor } from '@shell/plugins/dashboard-store/norma
 import { addSchemaIndexFields } from '@shell/plugins/steve/schema.utils';
 import { classify } from '@shell/plugins/dashboard-store/classify';
 import garbageCollect from '@shell/utils/gc/gc';
-import richardsLogger from '@shell/utils/richards-logger';
 
 function registerType(state, type) {
   let cache = state.types[type];
@@ -298,7 +297,6 @@ export function loadAll(state, {
   if (!skipHaveAll) {
     cache.haveNamespace = namespace;
     cache.haveAll = !namespace;
-    richardsLogger.warn('ds', 'loadAll', type, cache.haveNamespace, cache.haveAll );
   }
 
   return proxies;
diff --git a/shell/plugins/steve/subscribe.js b/shell/plugins/steve/subscribe.js
index 075b35bdf57..f3e7f22983f 100644
--- a/shell/plugins/steve/subscribe.js
+++ b/shell/plugins/steve/subscribe.js
@@ -32,7 +32,6 @@ import { keyForSubscribe } from '@shell/plugins/steve/resourceWatcher';
 import { waitFor } from '@shell/utils/async';
 import { WORKER_MODES } from './worker';
 import pAndNFiltering from '@shell/utils/projectAndNamespaceFiltering.utils';
-import richardsLogger from '@shell/utils/richards-logger';
 
 import { BLANK_CLUSTER } from '@shell/store/index.js';
 import { STORE } from '@shell/store/store-types';
@@ -200,16 +199,12 @@ const namespaceHandler = {
   validChange: ({ getters, rootGetters }, type, data) => {
     const haveNamespace = getters.haveNamespace(type);
 
-    richardsLogger.warn('sub', type, 'queueChange', 'haveNamespace', haveNamespace);
     if (haveNamespace?.length) {
       const namespaces = rootGetters.activeNamespaceCache;
 
       if (!namespaces[data.metadata.namespace]) {
-        richardsLogger.warn('sub', type, 'queueChange', 'skipping', namespaces);
-
         return false;
       }
-      richardsLogger.warn('sub', type, 'queueChange', 'doing', namespaces);
     }
 
     return true;
@@ -217,7 +212,6 @@ const namespaceHandler = {
 
   validateBatchChange: ({ getters, rootGetters }, batch) => {
     const namespaces = rootGetters.activeNamespaceCache;
-    // richardsLogger.warn('sub', 'validBatchChange start', 'batch', batch, 'namespaces', namespaces)
 
     Object.entries(batch).forEach(([type, entries]) => {
       const haveNamespace = getters.haveNamespace(type);
@@ -236,15 +230,11 @@ const namespaceHandler = {
         const namespace = id.split('/')[0];
 
         if (!namespace || !namespaces[namespace]) {
-          richardsLogger.warn('sub', type, 'validBatchChange', 'bskipping', id, haveNamespace, namespaces);
           delete entries[id];
-        } else {
-          richardsLogger.warn('sub', type, 'validBatchChange', 'bdoing', id, haveNamespace, namespaces);
         }
       });
     });
 
-    // richardsLogger.warn('sub', 'validBatchChange end', 'batch', batch, 'namespaces', namespaces)
     return batch;
   }
 };
@@ -262,7 +252,6 @@ function queueChange({ getters, state, rootGetters }, { data, revision }, load,
 
   // console.log(`${ label } Event [${ state.config.namespace }]`, data.type, data.id); // eslint-disable-line no-console
 
-  richardsLogger.warn('sub', type, 'queueChange', data, state);
   if (!namespaceHandler.validChange({ getters, rootGetters }, type, data)) {
     return;
   }
diff --git a/shell/utils/richards-logger.ts b/shell/utils/richards-logger.ts
deleted file mode 100644
index 787efc782b9..00000000000
--- a/shell/utils/richards-logger.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-class RichardsLogger {
-  private enabled = true;
-
-  enable(enable: boolean) {
-    this.enabled = enable;
-  }
-
-  warn() {
-    if (this.enabled) {
-      console.warn('CUSTOM', ...arguments);//, new Error()
-    }
-  }
-}
-
-const logger = new RichardsLogger();
-
-export default logger;

From aa34bd3e29bcf0fa8841dcd215bdbeb79992a2de Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 12 May 2023 17:46:45 +0100
Subject: [PATCH 08/10] Fix churn issue - Moving the store setting to
 enable/disable filtering in the store to a function in a computed property
 caused havoc for churn - Make this much neater by moving flag to the setup
 stage for both ns filter

---
 shell/components/nav/NamespaceFilter.vue      | 55 +++++++++++--------
 shell/mixins/resource-fetch-namespaced.js     |  2 +-
 shell/plugins/steve/actions.js                |  1 -
 .../projectAndNamespaceFiltering.utils.ts     |  6 +-
 4 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/shell/components/nav/NamespaceFilter.vue b/shell/components/nav/NamespaceFilter.vue
index 4d38e3f42a0..9e90e3d7fd1 100644
--- a/shell/components/nav/NamespaceFilter.vue
+++ b/shell/components/nav/NamespaceFilter.vue
@@ -18,32 +18,36 @@ import {
 } from '@shell/utils/namespace-filter';
 import { KEY } from '@shell/utils/platform';
 import pAndNFiltering from '@shell/utils/projectAndNamespaceFiltering.utils';
+import { SETTING } from '@shell/config/settings';
 
 const forcedNamespaceValidTypes = [NAMESPACE_FILTER_KINDS.DIVIDER, NAMESPACE_FILTER_KINDS.PROJECT, NAMESPACE_FILTER_KINDS.NAMESPACE];
 
 export default {
+
   data() {
     return {
-      isOpen:         false,
-      filter:         '',
-      hidden:         0,
-      total:          0,
-      activeElement:  null,
-      cachedFiltered: [],
+      isOpen:              false,
+      filter:              '',
+      hidden:              0,
+      total:               0,
+      activeElement:       null,
+      cachedFiltered:      [],
       NAMESPACE_FILTER_KINDS,
+      namespaceFilterMode: undefined,
     };
   },
 
-  computed: {
-    ...mapGetters(['currentProduct', 'namespaceFilterMode']),
-
-    namespaceFilterMode() {
-      if (pAndNFiltering.isEnabled(this.$store.getters)) { // Note - not reactive
-        return [NAMESPACE_FILTER_KINDS.NAMESPACE, NAMESPACE_FILTER_KINDS.PROJECT];
-      }
+  async fetch() {
+    // Determine if filtering by specific namespaces/projects is required
+    // This is done once and up front
+    // - it doesn't need to be re-active
+    // - added it as a computed caused massive amounts of churn around the `filtered` watcher
+    await this.$store.dispatch('management/find', { type: MANAGEMENT.SETTING, id: SETTING.UI_PERFORMANCE });
+    this.namespaceFilterMode = this.calcNamespaceFilterMode();
+  },
 
-      return null;
-    },
+  computed: {
+    ...mapGetters(['currentProduct']),
 
     hasFilter() {
       return this.filter.length > 0;
@@ -390,12 +394,9 @@ export default {
      * To break this multiple-render per cycle behaviour detatch `filtered` from the value used in `v-for`.
      *
      */
-    filtered: {
-      immediate: true,
-      handler(neu) {
-        if (!!neu) {
-          this.cachedFiltered = neu;
-        }
+    filtered(neu) {
+      if (!!neu) {
+        this.cachedFiltered = neu;
       }
     }
   },
@@ -655,19 +656,27 @@ export default {
       // - dashboard root store `loadCluster` --> when `updateNamespaces` is dispatched
       // - harvester root store `loadCluster` --> when `updateNamespaces` is dispatched (can be discarded)
       // Due to this, we can't really set a nicer default when forced ns/project filtering is on (ALL_USER is invalid)
-
       if (this.currentProduct?.customNamespaceFilter) {
         return [];
       }
 
       return [ALL_USER];
-    }
+    },
+
+    calcNamespaceFilterMode() {
+      if (pAndNFiltering.isEnabled(this.$store.getters)) {
+        return [NAMESPACE_FILTER_KINDS.NAMESPACE, NAMESPACE_FILTER_KINDS.PROJECT];
+      }
+
+      return null;
+    },
   }
 };
 </script>
 
 <template>
   <div
+    v-if="!$fetchState.pending"
     class="ns-filter"
     data-testid="namespaces-filter"
     tabindex="0"
diff --git a/shell/mixins/resource-fetch-namespaced.js b/shell/mixins/resource-fetch-namespaced.js
index 0421bda1008..d7e755ff09a 100644
--- a/shell/mixins/resource-fetch-namespaced.js
+++ b/shell/mixins/resource-fetch-namespaced.js
@@ -1,4 +1,4 @@
-import { NAMESPACE_FILTER_NS_PREFIX, NAMESPACE_FILTER_P_PREFIX } from 'utils/namespace-filter';
+import { NAMESPACE_FILTER_NS_PREFIX, NAMESPACE_FILTER_P_PREFIX } from '@shell/utils/namespace-filter';
 import { mapGetters } from 'vuex';
 import { ResourceListComponentName } from '../components/ResourceList/resource-list.config';
 import pAndNFiltering from '@shell/utils/projectAndNamespaceFiltering.utils';
diff --git a/shell/plugins/steve/actions.js b/shell/plugins/steve/actions.js
index cde16e39d59..ba1a5742100 100644
--- a/shell/plugins/steve/actions.js
+++ b/shell/plugins/steve/actions.js
@@ -18,7 +18,6 @@ export default {
 
   async request({ state, dispatch, rootGetters }, pOpt ) {
     const opt = pOpt.opt || pOpt;
-    const type = pOpt.type;
 
     const spoofedRes = await handleSpoofedRequest(rootGetters, 'cluster', opt);
 
diff --git a/shell/utils/projectAndNamespaceFiltering.utils.ts b/shell/utils/projectAndNamespaceFiltering.utils.ts
index 74ae8ca0085..d7284cbf74c 100644
--- a/shell/utils/projectAndNamespaceFiltering.utils.ts
+++ b/shell/utils/projectAndNamespaceFiltering.utils.ts
@@ -1,5 +1,5 @@
-import { NAMESPACE_FILTER_NS_FULL_PREFIX, NAMESPACE_FILTER_P_FULL_PREFIX } from 'utils/namespace-filter';
-import { getPerformanceSetting } from 'utils/settings';
+import { NAMESPACE_FILTER_NS_FULL_PREFIX, NAMESPACE_FILTER_P_FULL_PREFIX } from '@shell/utils/namespace-filter';
+import { getPerformanceSetting } from '@shell/utils/settings';
 
 type Opt = { [key: string]: any, namespaced?: string[]}
 
@@ -21,7 +21,7 @@ class ProjectAndNamespaceFiltering {
       return false;
     }
 
-    if (currentProduct.showWorkspaceSwitcher) {
+    if (currentProduct?.showWorkspaceSwitcher) {
       return false;
     }
 

From 936d35bdb1c8d1cfe62d813cca5ae666d4c19590 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 12 May 2023 17:58:08 +0100
Subject: [PATCH 09/10] Fix failing tests

---
 .../__tests__/NamespaceFilter.test.ts         | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/shell/components/__tests__/NamespaceFilter.test.ts b/shell/components/__tests__/NamespaceFilter.test.ts
index f0deed8de74..19c594e1df3 100644
--- a/shell/components/__tests__/NamespaceFilter.test.ts
+++ b/shell/components/__tests__/NamespaceFilter.test.ts
@@ -10,6 +10,7 @@ describe('component: NamespaceFilter', () => {
           options:  () => [],
           value:    () => [],
         },
+        mocks:      { $fetchState: { pending: false } },
         directives: { shortkey: () => jest.fn() }
       });
       const filter = wrapper.find(`[data-testid="namespaces-filter"]`);
@@ -25,7 +26,10 @@ describe('component: NamespaceFilter', () => {
           options:  () => [],
           value:    () => [],
         },
-        mocks:      { $store: { getters: { 'i18n/t': () => text, namespaceFilterMode: () => undefined } } },
+        mocks: {
+          $store:      { getters: { 'i18n/t': () => text, namespaceFilterMode: () => undefined } },
+          $fetchState: { pending: false }
+        },
         directives: { shortkey: () => jest.fn() }
       });
       const element = wrapper.find(`[data-testid="namespaces-values-none"]`).element.textContent;
@@ -44,6 +48,7 @@ describe('component: NamespaceFilter', () => {
             kind:  'special',
           }]),
         },
+        mocks:      { $fetchState: { pending: false } },
         directives: { shortkey: () => jest.fn() }
       });
 
@@ -61,7 +66,10 @@ describe('component: NamespaceFilter', () => {
           value:    () => [{ label: text }],
         },
         directives: { shortkey: () => jest.fn() },
-        mocks:      { $store: { getters: { 'i18n/t': () => text, namespaceFilterMode: () => undefined } } },
+        mocks:      {
+          $store:      { getters: { 'i18n/t': () => text, namespaceFilterMode: () => undefined } },
+          $fetchState: { pending: false }
+        },
       });
 
       const element = wrapper.find(`[data-testid="namespaces-value-0"]`).element.textContent;
@@ -97,7 +105,8 @@ describe('component: NamespaceFilter', () => {
               'prefs/get':         () => preferences,
               namespaceFilterMode: () => undefined,
             },
-          }
+          },
+          $fetchState: { pending: false }
         },
         directives: { shortkey: () => jest.fn() }
       });
@@ -116,7 +125,10 @@ describe('component: NamespaceFilter', () => {
           options:  () => [],
           value:    () => [],
         },
-        mocks:      { $store: { getters: { 'i18n/t': () => '', namespaceFilterMode: () => undefined } } },
+        mocks: {
+          $store:      { getters: { 'i18n/t': () => '', namespaceFilterMode: () => undefined } },
+          $fetchState: { pending: false }
+        },
         directives: { shortkey: () => jest.fn() }
       });
       const dropdown = wrapper.find(`[data-testid="namespaces-dropdown"]`);
@@ -135,7 +147,10 @@ describe('component: NamespaceFilter', () => {
           options:  () => [],
           value:    () => [],
         },
-        mocks:      { $store: { getters: { 'i18n/t': () => text, namespaceFilterMode: () => undefined } } },
+        mocks: {
+          $store:      { getters: { 'i18n/t': () => text, namespaceFilterMode: () => undefined } },
+          $fetchState: { pending: false }
+        },
         directives: { shortkey: () => jest.fn() }
       });
       const dropdown = wrapper.find(`[data-testid="namespaces-dropdown"]`);
@@ -153,7 +168,10 @@ describe('component: NamespaceFilter', () => {
           options: () => [],
           value:   () => [],
         },
-        mocks:      { $store: { getters: { 'i18n/t': () => text, namespaceFilterMode: () => undefined } } },
+        mocks: {
+          $store:      { getters: { 'i18n/t': () => text, namespaceFilterMode: () => undefined } },
+          $fetchState: { pending: false }
+        },
         directives: { shortkey: () => jest.fn() }
       });
 
@@ -194,7 +212,8 @@ describe('component: NamespaceFilter', () => {
           $store: {
             getters:  { 'i18n/t': () => text, namespaceFilterMode: () => undefined },
             dispatch: action
-          }
+          },
+          $fetchState: { pending: false }
         },
         directives: { shortkey: () => jest.fn() }
       });

From 5feb263fb5d76c5623067e58b682c3732176f331 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 15 May 2023 11:58:39 +0100
Subject: [PATCH 10/10] Don't allow selection of `Not in a Project`

---
 shell/components/nav/NamespaceFilter.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/shell/components/nav/NamespaceFilter.vue b/shell/components/nav/NamespaceFilter.vue
index 9e90e3d7fd1..bd63539518f 100644
--- a/shell/components/nav/NamespaceFilter.vue
+++ b/shell/components/nav/NamespaceFilter.vue
@@ -96,8 +96,10 @@ export default {
         // Are we in restricted resource type mode, if so is this an allowed type?
         if (this.namespaceFilterMode?.length) {
           const isLastSelected = i.selected && (i.id === ALL || this.value.length === 1);
+          const kindAllowed = this.namespaceFilterMode.find(f => f === i.kind);
+          const isNotInProjectGroup = i.id === ALL_ORPHANS;
 
-          i.enabled = !isLastSelected && this.namespaceFilterMode.find(f => f === i.kind);
+          i.enabled = (!isLastSelected && kindAllowed) && !isNotInProjectGroup;
         }
       });