@rancher/shell 3.0.1-rc.2 → 3.0.1-rc.4

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

@@ -4,7 +4,6 @@ import { install as installAuthentication } from '@shell/config/router/navigatio
 import { install as installRuntimeExtensionRoute } from '@shell/config/router/navigation-guards/runtime-extension-route';
 import { install as installI18N } from '@shell/config/router/navigation-guards/i18n';
 import { install as installProducts } from '@shell/config/router/navigation-guards/products';
-import { install as installHistory } from '@shell/config/router/navigation-guards/history';
 import { install as installClusters } from '@shell/config/router/navigation-guards/clusters';
 import { install as installHandleInstallRedirect } from '@shell/config/router/navigation-guards/install-redirect';
 import { install as installPageTitle } from '@shell/config/router/navigation-guards/page-title';
@@ -17,7 +16,7 @@ export function installNavigationGuards(router, context) {
   // NOTE: the order of the installation matters.
   // Be intentional when adding, removing or modifying the guards that are installed.
 
-  const navigationGuardInstallers = [installLoadInitialSettings, installAttemptFirstLogin, installAuthentication, installProducts, installHistory, installClusters, installRuntimeExtensionRoute, installI18N, installHandleInstallRedirect, installPageTitle, installServerUpgradeGrowl];
+  const navigationGuardInstallers = [installLoadInitialSettings, installAttemptFirstLogin, installAuthentication, installProducts, installClusters, installRuntimeExtensionRoute, installI18N, installHandleInstallRedirect, installPageTitle, installServerUpgradeGrowl];
 
   navigationGuardInstallers.forEach((installer) => installer(router, context));
 }

package/config/settings.ts

@@ -51,7 +51,6 @@ export const SETTING = {
   INGRESS_IP_DOMAIN:                    'ingress-ip-domain',
   SERVER_URL:                           'server-url',
   RKE_METADATA_CONFIG:                  'rke-metadata-config',
-  TELEMETRY:                            'telemetry-opt',
   EULA_AGREED:                          'eula-agreed',
   AUTH_USER_INFO_MAX_AGE_SECONDS:       'auth-user-info-max-age-seconds',
   AUTH_USER_SESSION_TTL_MINUTES:        'auth-user-session-ttl-minutes',
@@ -156,12 +155,8 @@ export const ALLOWED_SETTINGS: GlobalSetting = {
   },
   [SETTING.BRAND]:                        { canReset: true },
   [SETTING.CLUSTER_TEMPLATE_ENFORCEMENT]: { kind: 'boolean' },
-  [SETTING.TELEMETRY]:                    {
-    kind:    'enum',
-    options: ['prompt', 'in', 'out']
-  },
-  [SETTING.HIDE_LOCAL_CLUSTER]: { kind: 'boolean' },
-  [SETTING.AGENT_TLS_MODE]:     {
+  [SETTING.HIDE_LOCAL_CLUSTER]:           { kind: 'boolean' },
+  [SETTING.AGENT_TLS_MODE]:               {
     kind:    'enum',
     options: ['strict', 'system-store'],
     warning: 'agent-tls-mode'

package/edit/catalog.cattle.io.clusterrepo.vue

@@ -287,12 +287,3 @@ export default {
     />
   </form>
 </template>
-
-<style lang="scss">
-  span.oci-experimental-badge {
-    background-color: var(--warning);
-    color: var(--darker-active-bg);
-    font-size: 12px;
-    padding: 2px 6px;
-  }
-</style>

package/edit/provisioning.cattle.io.cluster/rke2.vue

@@ -22,11 +22,10 @@ import { _CREATE, _EDIT, _VIEW } from '@shell/config/query-params';
 import { findBy, removeObject, clear } from '@shell/utils/array';
 import { createYaml } from '@shell/utils/create-yaml';
 import {
-  clone, diff, set, get, isEmpty
+  clone, diff, set, get, isEmpty, mergeWithReplaceArrays
 } from '@shell/utils/object';
 import { allHash } from '@shell/utils/promise';
 import { sortBy } from '@shell/utils/sort';
-import { vspherePoolConfigMerge } from '@shell/machine-config/vmwarevsphere-pool-config-merge';
 
 import { compare, sortable } from '@shell/utils/version';
 import { isHarvesterSatisfiesVersion, labelForAddon } from '@shell/utils/cluster';
@@ -1260,7 +1259,7 @@ export default {
         delete clonedCurrentConfig.metadata;
 
         if (this.provider === VMWARE_VSPHERE) {
-          machinePool.config = vspherePoolConfigMerge(clonedLatestConfig, clonedCurrentConfig);
+          machinePool.config = mergeWithReplaceArrays(clonedLatestConfig, clonedCurrentConfig);
         } else {
           machinePool.config = merge(clonedLatestConfig, clonedCurrentConfig);
         }
@@ -1644,7 +1643,7 @@ export default {
       const defaultChartValue = this.versionInfo[name];
       const key = this.chartVersionKey(name);
 
-      return merge({}, defaultChartValue?.values || {}, this.userChartValues[key] || {});
+      return mergeWithReplaceArrays(defaultChartValue?.values, this.userChartValues[key]);
     },
 
     initServerAgentArgs() {

package/edit/workload/index.vue

@@ -415,7 +415,7 @@ export default {
           >
             <Tab
               :label="t('workload.storage.title')"
-              name="storage"
+              name="storage-pod"
               :weight="tabWeightMap['storage']"
               @active="$refs.storage.refresh()"
             >

package/edit/workload/storage/csi/index.vue

@@ -44,6 +44,33 @@ export default {
 
     ...mapGetters({ t: 'i18n/t' })
   },
+
+  methods: {
+    /**
+    * Retrieves the label for a given option
+    * @param option The option for which to retrieve the label. option can be
+    * either a string or an object. If it is an object, is should have a `label`
+    * property associated with it.
+    */
+    getOptionLabel(option) {
+      if (typeof option === 'string') {
+        return this.getOptionLabelString(option);
+      }
+
+      const { label } = option;
+
+      return this.getOptionLabelString(label);
+    },
+    /**
+    * Translates a given key into a localized string.
+    * @param key The key to be translated.
+    */
+    getOptionLabelString(key) {
+      // Periods are replaced with `-` to prevent conflict with the default key
+      // separator.
+      return this.t(`workload.storage.csi.drivers.'${ key.replaceAll('.', '-') }'`);
+    }
+  }
 };
 </script>
 
@@ -71,10 +98,11 @@ export default {
         <div class="col span-6">
           <LabeledSelect
             v-model:value="value.csi.driver"
+            data-testid="workload-storage-driver"
             :mode="mode"
             :label="t('workload.storage.driver')"
             :options="driverOpts"
-            :get-option-label="opt=>t(`workload.storage.csi.drivers.'${opt}'`)"
+            :get-option-label="getOptionLabel"
             :required="true"
           />
         </div>

package/edit/workload/storage/index.vue

@@ -301,6 +301,7 @@ export default {
           :button-label="t('workload.storage.addVolume')"
           :dropdown-options="volumeTypeOptions"
           size="sm"
+          data-testid="dropdown-button-storage-volume"
           @click-action="e=>addVolume(e.value)"
         />
       </template>

package/initialize/App.vue

@@ -1,15 +1,10 @@
 <script>
-import NuxtError from '@shell/components/templates/error.vue';
 import NuxtLoading from '@shell/components/nav/GlobalLoading.vue';
 
 import '@shell/assets/styles/app.scss';
 
 export default {
-  data: () => ({
-    isOnline: true,
-
-    showErrorPage: false,
-  }),
+  data: () => ({ isOnline: true }),
 
   created() {
     // add to window so we can listen when ready
@@ -60,7 +55,7 @@ export default {
     },
   },
 
-  components: { NuxtLoading, NuxtError }
+  components: { NuxtLoading }
 };
 </script>
 <template>
@@ -68,10 +63,8 @@ export default {
     <NuxtLoading ref="loading" />
     <div
       id="__layout"
-      :key="showErrorPage"
     >
-      <NuxtError v-if="showErrorPage" />
-      <router-view v-else />
+      <router-view />
     </div>
   </div>
 </template>

package/initialize/install-plugins.js

@@ -15,7 +15,6 @@ import axios from '@shell/utils/axios';
 import cookieUniversal from '@shell/utils/cookie-universal';
 import config from '@shell/utils/config';
 import axiosShell from '@shell/plugins/axios';
-import backButton from '@shell/plugins/back-button';
 import codeMirror from '@shell/plugins/codemirror-loader';
 import { InstallCodeMirror } from 'codemirror-editor-vue3';
 import * as intNumber from '@shell/directives/int-number';
@@ -42,7 +41,7 @@ export async function installPlugins(vueApp) {
 }
 
 export async function installInjectedPlugins(app, vueApp) {
-  const pluginDefinitions = [config, cookieUniversal, axios, plugins, pluginsLoader, axiosShell, intNumber, codeMirror, nuxtClientInit, replaceAll, backButton, plugin, steveCreateWorker, emberCookie];
+  const pluginDefinitions = [config, cookieUniversal, axios, plugins, pluginsLoader, axiosShell, intNumber, codeMirror, nuxtClientInit, replaceAll, plugin, steveCreateWorker, emberCookie];
 
   const installations = pluginDefinitions.map(async(pluginDefinition) => {
     if (typeof pluginDefinition === 'function') {

package/list/management.cattle.io.podsecurityadmissionconfigurationtemplate.vue

@@ -19,13 +19,17 @@ export default {
       required: true,
     },
   },
+  emits: ['error'],
 
   async fetch() {
     const inStore = this.$store.getters['currentStore']();
 
+    try {
     // Fetch storage classes so we can determine if a PVC can be expanded
-    this.$store.dispatch(`${ inStore }/findAll`, { type: STORAGE_CLASS });
-
+      await this.$store.dispatch(`${ inStore }/findAll`, { type: STORAGE_CLASS });
+    } catch (e) {
+      this.$emit('error', e?.data || e);
+    }
     await this.$fetchType(this.resource);
   }
 };

package/models/__tests__/management.cattle.io.cluster.test.ts

@@ -4,28 +4,6 @@ jest.mock('@shell/utils/clipboard', () => {
   return { copyTextToClipboard: jest.fn(() => Promise.resolve({})) };
 });
 
-const importedRKE2ClusterInfo = { status: { driver: 'rke2', provider: 'rke2' } };
-
-const provisionedRKE2ClusterInfo = { status: { driver: 'rke2', provider: 'imported' } };
-
-const importedK3sClusterInfo = { status: { driver: 'k3s', provider: 'k3s' } };
-
-const provisionedK3sClusterInfo = { status: { driver: 'k3s', provider: 'imported' } };
-
-const importedAksClusterInfo = { spec: { aksConfig: { imported: true } }, status: { provider: 'aks', driver: 'AKS' } };
-
-const provisionedAksClusterInfo = { spec: { aksConfig: { imported: false } }, status: { provider: 'aks', driver: 'AKS' } };
-
-const importedRKE1ClusterInfo = { status: { provider: 'rke', driver: 'imported' } };
-
-const provisionedRKE1ClusterInfo = { status: { provider: 'rke', driver: 'rancherKubernetesEngine' } };
-
-const localRKE1ClusterInfo = { status: { provider: 'rke', driver: 'imported' } };
-
-const localRKE2ClusterInfo = { status: { provider: 'rke2', driver: 'rke2' } };
-
-const localEKSClusterInfo = { status: { provider: 'eks', driver: 'imported' } };
-
 describe('class MgmtCluster', () => {
   describe('provisioner', () => {
     const testCases = [
@@ -42,24 +20,4 @@ describe('class MgmtCluster', () => {
     }
     );
   });
-
-  describe('isImported', () => {
-    it.each([
-      [importedRKE2ClusterInfo, true],
-      [provisionedRKE2ClusterInfo, false],
-      [importedK3sClusterInfo, true],
-      [provisionedK3sClusterInfo, false],
-      [importedAksClusterInfo, true],
-      [provisionedAksClusterInfo, false],
-      [importedRKE1ClusterInfo, true],
-      [provisionedRKE1ClusterInfo, false],
-      [localRKE1ClusterInfo, true],
-      [localRKE2ClusterInfo, true],
-      [localEKSClusterInfo, true]
-    ])('should return isImported based on props data', (clusterData, expected) => {
-      const cluster = new MgmtCluster(clusterData);
-
-      expect(cluster.isImported).toBe(expected);
-    });
-  });
 });

package/models/management.cattle.io.cluster.js

@@ -89,30 +89,6 @@ export default class MgmtCluster extends SteveModel {
     return pools.filter((x) => x.spec?.clusterName === this.id);
   }
 
-  get isImported() {
-    if (this.isLocal) {
-      return false;
-    }
-    // imported rke2 and k3s have status.driver === rke2 and k3s respectively
-    // Provisioned rke2 and k3s have status.driver === imported
-    if (this.status?.provider === 'k3s' || this.status?.provider === 'rke2') {
-      return this.status?.driver === this.status?.provider;
-    }
-
-    // imported KEv2
-    const kontainerConfigs = ['aksConfig', 'eksConfig', 'gkeConfig'];
-
-    const isImportedKontainer = kontainerConfigs.filter((key) => {
-      return this.spec?.[key]?.imported === true;
-    }).length;
-
-    if (isImportedKontainer) {
-      return true;
-    }
-
-    return this.provisioner === 'imported';
-  }
-
   get provisioner() {
     // For imported K3s clusters, this.status.driver is 'k3s.'
     return this.status?.driver ? this.status.driver : 'imported';

package/models/management.cattle.io.globalrole.js

@@ -117,6 +117,7 @@ export default class GlobalRole extends SteveDescriptionModel {
       norman.id = this.id;
       norman.name = this.displayName;
       norman.description = this.description;
+      norman.inheritedClusterRoles = this.inheritedClusterRoles;
 
       return norman;
     })();

package/models/nodedriver.js

@@ -18,7 +18,7 @@ export default class NodeDriver extends Driver {
         icon:       'icon icon-play',
         bulkable:   true,
         bulkAction: 'activateBulk',
-        enabled:    !!this.actions.activate && this.state === 'inactive',
+        enabled:    !!this.actions?.activate && this.state === 'inactive',
       },
       {
         action:     'deactivate',
@@ -26,7 +26,7 @@ export default class NodeDriver extends Driver {
         icon:       'icon icon-pause',
         bulkable:   true,
         bulkAction: 'deactivateBulk',
-        enabled:    !!this.actions.deactivate && this.state === 'active',
+        enabled:    !!this.actions?.deactivate && this.state === 'active',
         weight:     -1,
       },
       { divider: true },

package/models/provisioning.cattle.io.cluster.js

@@ -245,7 +245,7 @@ export default class ProvCluster extends SteveModel {
   }
 
   get canDelete() {
-    return super.canDelete && this.stateObj.name !== 'removing';
+    return super.canDelete && this.stateObj?.name !== 'removing';
   }
 
   get canEditYaml() {
@@ -282,7 +282,29 @@ export default class ProvCluster extends SteveModel {
   }
 
   get isImported() {
-    return this.mgmt?.isImported;
+    if (this.isLocal) {
+      return false;
+    }
+
+    // imported rke2 and k3s have status.driver === rke2 and k3s respectively
+    // Provisioned rke2 and k3s have status.driver === imported
+    if (this.mgmt?.status?.provider === 'k3s' || this.mgmt?.status?.provider === 'rke2') {
+      return this.mgmt?.status?.driver === this.mgmt?.status?.provider;
+    }
+
+    // imported KEv2
+    // we can't rely on this.provisioner to determine imported-ness for these clusters, as it will return 'aks' 'eks' 'gke' for both provisioned and imported clusters
+    const kontainerConfigs = ['aksConfig', 'eksConfig', 'gkeConfig'];
+
+    const isImportedKontainer = kontainerConfigs.filter((key) => {
+      return this.mgmt?.spec?.[key]?.imported === true;
+    }).length;
+
+    if (isImportedKontainer) {
+      return true;
+    }
+
+    return this.provisioner === 'imported';
   }
 
   get isCustom() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "3.0.1-rc.2",
+  "version": "3.0.1-rc.4",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -131,7 +131,6 @@
     "vue-router": "4.4.3",
     "vue-select": "4.0.0-beta.6",
     "vue-server-renderer": "2.7.16",
-    "vue-template-compiler": "2.7.16",
     "vue3-resize": "0.2.0",
     "vue3-virtual-scroll-list": "0.2.1",
     "vuedraggable": "4.1.0",
@@ -170,4 +169,4 @@
       ".vue"
     ]
   }
-}
+}

package/pages/auth/setup.vue

@@ -11,7 +11,6 @@ import { getVendor, getProduct, setVendor } from '@shell/config/private-label';
 import { RadioGroup } from '@components/Form/Radio';
 import { setSetting } from '@shell/utils/settings';
 import { SETTING } from '@shell/config/settings';
-import { isDevBuild } from '@shell/utils/version';
 import { exceptionToErrorsArray } from '@shell/utils/error';
 import Password from '@shell/components/form/Password';
 import { applyProducts } from '@shell/store/type-map';
@@ -66,7 +65,6 @@ export default {
       v3User:             null,
       serverUrl:          null,
       mcmEnabled:         null,
-      telemetry:          null,
       eula:               false,
       principals:         null,
       errors:             []
@@ -101,16 +99,7 @@ export default {
   },
 
   async fetch() {
-    const telemetrySetting = this.$store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.TELEMETRY);
     const serverUrlSetting = this.$store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.SERVER_URL);
-    const rancherVersionSetting = this.$store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.VERSION_RANCHER);
-    let telemetry = true;
-
-    if (telemetrySetting?.value && telemetrySetting.value !== 'prompt') {
-      telemetry = telemetrySetting.value !== 'out';
-    } else if (!rancherVersionSetting?.value || isDevBuild(rancherVersionSetting?.value)) {
-      telemetry = false;
-    }
 
     let plSetting;
 
@@ -163,7 +152,6 @@ export default {
     this['v3User'] = v3User;
     this['serverUrl'] = serverUrl;
     this['mcmEnabled'] = mcmEnabled;
-    this['telemetry'] = telemetry;
     this['principals'] = principals;
   },
 
@@ -244,7 +232,6 @@ export default {
 
         if (this.isFirstLogin) {
           promises.push( setSetting(this.$store, SETTING.EULA_AGREED, (new Date()).toISOString()) );
-          promises.push( setSetting(this.$store, SETTING.TELEMETRY, this.telemetry ? 'in' : 'out') );
 
           if ( this.mcmEnabled && this.serverUrl ) {
             promises.push( setSetting(this.$store, SETTING.SERVER_URL, this.serverUrl) );
@@ -406,20 +393,6 @@ export default {
               </div>
             </template>
 
-            <div class="checkbox mt-40">
-              <Checkbox
-                id="checkbox-telemetry"
-                v-model:value="telemetry"
-              >
-                <template #label>
-                  <t
-                    k="setup.telemetry"
-                    :raw="true"
-                    :name="productName"
-                  />
-                </template>
-              </Checkbox>
-            </div>
             <div class="checkbox pt-10 eula">
               <Checkbox
                 id="checkbox-eula"
@@ -461,6 +434,9 @@ export default {
             </h4>
           </div>
         </div>
+        <div>
+          &nbsp;
+        </div>
       </div>
       <BrandImage
         class="col span-6 landscape"
@@ -517,11 +493,14 @@ export default {
       width: 51%;
 
       & > div:first-of-type {
-        flex:3;
+        flex: 3;
       }
       & > div:nth-of-type(2) {
         flex: 9;
       }
+      & > div:nth-of-type(3) {
+        flex: 2;
+      }
     }
 
     .setup-title {

package/pages/c/_cluster/auth/roles/index.vue

@@ -1,5 +1,4 @@
 <script>
-import { mapGetters } from 'vuex';
 import Tab from '@shell/components/Tabbed/Tab';
 import Tabbed from '@shell/components/Tabbed';
 import { MANAGEMENT } from '@shell/config/types';
@@ -8,7 +7,6 @@ import Loading from '@shell/components/Loading';
 import { SUBTYPE_MAPPING, CREATE_VERBS } from '@shell/models/management.cattle.io.roletemplate';
 import { NAME } from '@shell/config/product/auth';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
-import { Banner } from '@components/Banner';
 
 const GLOBAL = SUBTYPE_MAPPING.GLOBAL.key;
 const CLUSTER = SUBTYPE_MAPPING.CLUSTER.key;
@@ -33,7 +31,7 @@ export default {
   name: 'Roles',
 
   components: {
-    Tab, Tabbed, ResourceTable, Loading, Banner
+    Tab, Tabbed, ResourceTable, Loading
   },
 
   async fetch() {
@@ -100,8 +98,6 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['releaseNotesUrl']),
-
     globalResources() {
       return this.globalRoles;
     },
@@ -183,12 +179,6 @@ export default {
         :weight="tabs[GLOBAL].weight"
         :label-key="tabs[GLOBAL].labelKey"
       >
-        <Banner
-          color="warning"
-          class="mb-20"
-        >
-          <span v-clean-html="t('rbac.globalRoles.role.restricted-admin.deprecation', { releaseNotesUrl }, true)" />
-        </Banner>
         <ResourceTable
           :schema="tabs[GLOBAL].schema"
           :rows="globalResources"

package/pages/c/_cluster/explorer/__tests__/index.test.ts

@@ -3,6 +3,7 @@ import Dashboard from '@shell/pages/c/_cluster/explorer/index.vue';
 import { shallowMount } from '@vue/test-utils';
 import { STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
 import { NODE_ARCHITECTURE } from '@shell/config/labels-annotations';
+import { WORKLOAD_TYPES } from '@shell/config/types';
 
 describe('page: cluster dashboard', () => {
   const mountOptions = {
@@ -97,12 +98,81 @@ describe('page: cluster dashboard', () => {
       [STATES_ENUM.WARNING, 'icon-warning', true, false, false, [{ status: 'True' }], 0, 1],
       [STATES_ENUM.HEALTHY, 'icon-checkmark', true, false, false, [{ status: 'True' }], 1, 0],
     ]]
-  ])('%p cluster - %p agent health box', (_, agentId, isLocal, agentResources, statuses) => {
+  ])('%p cluster - %p agent health box :', (_, agentId, isLocal, agentResources, statuses) => {
+    it.each(statuses)('should  NOT show %p status due to missing canList permissions', (status, iconClass, isLoaded, disconnected, error, conditions, readyReplicas, unavailableReplicas) => {
+      const options = clone(mountOptions);
+
+      options.global.mocks.$store.getters.currentCluster.isLocal = isLocal;
+
+      const resources = agentResources.reduce((acc, r) => {
+        const agent = {
+          metadata: { state: { error } },
+          spec:     { replicas: 1 },
+          status:   {
+            readyReplicas,
+            unavailableReplicas,
+            conditions
+          }
+        };
+
+        return isLoaded ? {
+          ...acc,
+          [r]: agent
+        } : 'loading';
+      }, {});
+
+      const wrapper = shallowMount(Dashboard, {
+        ...options,
+        data: () => ({
+          ...resources,
+          disconnected,
+          canViewAgents: true
+        })
+      });
+
+      const box = wrapper.find(`[data-testid="k8s-service-${ agentId }"]`);
+
+      expect(box.exists()).toBe(false);
+    });
+  });
+
+  describe.each([
+    ['local', 'fleet', true, ['fleetDeployment', 'fleetStatefulSet'], [
+      [STATES_ENUM.IN_PROGRESS, 'icon-spinner', false, false, false, '', 0, 0],
+      [STATES_ENUM.UNHEALTHY, 'icon-warning', true, false, false, [{ status: 'False' }], 0, 0],
+      [STATES_ENUM.UNHEALTHY, 'icon-warning', true, false, true, [{ status: 'True' }], 0, 0],
+      [STATES_ENUM.WARNING, 'icon-warning', true, true, false, [{ status: 'True' }], 0, 0],
+      [STATES_ENUM.WARNING, 'icon-warning', true, false, false, [{ status: 'True' }], 0, 0],
+      [STATES_ENUM.WARNING, 'icon-warning', true, false, false, [{ status: 'True' }], 0, 1],
+      [STATES_ENUM.HEALTHY, 'icon-checkmark', true, false, false, [{ status: 'True' }], 1, 0],
+    ]],
+    ['downstream RKE2', 'fleet', false, ['fleetStatefulSet'], [
+      [STATES_ENUM.IN_PROGRESS, 'icon-spinner', false, false, false, '', 0, 0],
+      [STATES_ENUM.UNHEALTHY, 'icon-warning', true, false, false, [{ status: 'False' }], 0, 0],
+      [STATES_ENUM.UNHEALTHY, 'icon-warning', true, false, true, [{ status: 'True' }], 0, 0],
+      [STATES_ENUM.WARNING, 'icon-warning', true, true, false, [{ status: 'True' }], 0, 0],
+      [STATES_ENUM.WARNING, 'icon-warning', true, false, false, [{ status: 'True' }], 0, 0],
+      [STATES_ENUM.WARNING, 'icon-warning', true, false, false, [{ status: 'True' }], 0, 1],
+      [STATES_ENUM.HEALTHY, 'icon-checkmark', true, false, false, [{ status: 'True' }], 1, 0],
+    ]],
+    ['downstream RKE2', 'cattle', false, ['cattleDeployment'], [
+      [STATES_ENUM.IN_PROGRESS, 'icon-spinner', false, false, false, '', 0, 0],
+      [STATES_ENUM.UNHEALTHY, 'icon-warning', true, false, false, [{ status: 'False' }], 0, 0],
+      [STATES_ENUM.UNHEALTHY, 'icon-warning', true, true, false, [{ status: 'True' }], 0, 0],
+      [STATES_ENUM.UNHEALTHY, 'icon-warning', true, false, true, [{ status: 'True' }], 0, 0],
+      [STATES_ENUM.WARNING, 'icon-warning', true, false, false, [{ status: 'True' }], 0, 0],
+      [STATES_ENUM.WARNING, 'icon-warning', true, false, false, [{ status: 'True' }], 0, 1],
+      [STATES_ENUM.HEALTHY, 'icon-checkmark', true, false, false, [{ status: 'True' }], 1, 0],
+    ]]
+  ])('%p cluster - %p agent health box ::', (_, agentId, isLocal, agentResources, statuses) => {
     it.each(statuses)('should show %p status', (status, iconClass, isLoaded, disconnected, error, conditions, readyReplicas, unavailableReplicas) => {
       const options = clone(mountOptions);
 
       options.global.mocks.$store.getters.currentCluster.isLocal = isLocal;
 
+      // let's pass the canList now
+      options.global.mocks.$store.getters['cluster/canList'] = (type: string) => !!(type === WORKLOAD_TYPES.DEPLOYMENT) || !!(type === WORKLOAD_TYPES.STATEFUL_SET);
+
       const resources = agentResources.reduce((acc, r) => {
         const agent = {
           metadata: { state: { error } },

package/pages/c/_cluster/explorer/index.vue

@@ -188,7 +188,11 @@ export default {
     },
 
     fleetAgentNamespace() {
-      return this.$store.getters['cluster/byId'](NAMESPACE, 'cattle-fleet-system');
+      if (this.currentCluster.isLocal) {
+        return this.$store.getters['cluster/canList'](WORKLOAD_TYPES.DEPLOYMENT) && this.$store.getters['cluster/canList'](WORKLOAD_TYPES.STATEFUL_SET) && this.$store.getters['cluster/byId'](NAMESPACE, 'cattle-fleet-system');
+      }
+
+      return this.$store.getters['cluster/canList'](WORKLOAD_TYPES.STATEFUL_SET) && this.$store.getters['cluster/byId'](NAMESPACE, 'cattle-fleet-system');
     },
 
     cattleAgentNamespace() {
@@ -196,7 +200,7 @@ export default {
         return;
       }
 
-      return this.$store.getters['cluster/byId'](NAMESPACE, 'cattle-system');
+      return this.$store.getters['cluster/canList'](WORKLOAD_TYPES.DEPLOYMENT) && this.$store.getters['cluster/byId'](NAMESPACE, 'cattle-system');
     },
 
     canViewAgents() {

package/rancher-components/Banner/Banner.vue

@@ -49,6 +49,7 @@ export default defineComponent({
       default: false
     }
   },
+  emits:    ['close'],
   computed: {
     /**
      * Return message text as label.