@rancher/shell 1.2.3 → 2.0.1

package/composables/useLabeledFormElement.ts

@@ -0,0 +1,138 @@
+import { ref, computed, ComputedRef, Ref } from 'vue';
+import { _VIEW, _EDIT } from '@shell/config/query-params';
+
+interface LabeledFormElementProps {
+  mode: string;
+  value: string | number | Record<string, any>
+  required: boolean;
+  disabled: boolean;
+  rules: Array<any>;
+}
+
+interface UseLabeledFormElement {
+  raised: Ref<boolean>;
+  focused: Ref<boolean>;
+  blurred: Ref<number | null>;
+  requiredField: ComputedRef<any>;
+  isDisabled: ComputedRef<any>;
+  validationMessage: ComputedRef<any>;
+  onFocusLabeled: () => void;
+  onBlurLabeled: () => void;
+}
+
+export const labeledFormElementProps = {
+  tooltipKey: {
+    type:    String,
+    default: null
+  },
+  placeholder: {
+    type:    [String, Number],
+    default: ''
+  },
+  placeholderKey: {
+    type:    String,
+    default: null
+  },
+  label: {
+    type:    String,
+    default: null
+  },
+  labelKey: {
+    type:    String,
+    default: null
+  },
+  value: {
+    type:    [String, Number, Object],
+    default: ''
+  },
+  mode: {
+    type:    String,
+    default: _EDIT,
+  },
+  rules: {
+    default:   (): Array<unknown> => [],
+    type:      Array,
+    // we only want functions in the rules array
+    validator: (rules: Array<unknown>): boolean => rules.every((rule: unknown) => ['function'].includes(typeof rule))
+  },
+  required: {
+    type:    Boolean,
+    default: false,
+  },
+  disabled: {
+    type:    Boolean,
+    default: false,
+  },
+};
+
+export const useLabeledFormElement = (props: LabeledFormElementProps, emit: (event: string, ...args: any[]) => void): UseLabeledFormElement => {
+  const raised = ref(props.mode === _VIEW || !!`${ props.value }`);
+  const focused = ref(false);
+  const blurred = ref<number | null>(null);
+
+  const requiredField = computed(() => {
+    return props.required || props.rules?.some((rule: any) => rule?.name === 'required');
+  });
+
+  const isView = computed(() => {
+    return props.mode === _VIEW;
+  });
+
+  const isDisabled = computed(() => {
+    return props.disabled || isView.value;
+  });
+
+  const validationMessage = computed(() => {
+    const requiredRule = props.rules.find((rule: any) => rule?.name === 'required') as Function;
+    const ruleMessages = [];
+    const value = props.value;
+
+    if (requiredRule && blurred.value && !focused.value) {
+      const message = requiredRule(value);
+
+      if (!!message) {
+        return message;
+      }
+    }
+
+    for (const rule of props.rules) {
+      const message = rule(value);
+
+      if (!!message && rule.name !== 'required') {
+        ruleMessages.push(message);
+      }
+    }
+
+    if (ruleMessages.length > 0 && (blurred.value || focused.value)) {
+      return ruleMessages.join(', ');
+    } else {
+      return undefined;
+    }
+  });
+
+  const onFocusLabeled = () => {
+    raised.value = true;
+    focused.value = true;
+  };
+
+  const onBlurLabeled = () => {
+    focused.value = false;
+
+    if (!props.value) {
+      raised.value = false;
+    }
+
+    blurred.value = Date.now();
+  };
+
+  return {
+    raised,
+    focused,
+    blurred,
+    onFocusLabeled,
+    onBlurLabeled,
+    isDisabled,
+    validationMessage,
+    requiredField
+  };
+};

package/config/harvester-manager-types.js

@@ -1 +1,3 @@
 export const NAME = 'harvesterManager';
+
+export const KIND = { MACHINE_TEMPLATE: 'HarvesterMachineTemplate' };

package/config/home-links.js

@@ -4,6 +4,7 @@ import { SETTING } from '@shell/config/settings';
 import { allHash } from '@shell/utils/promise';
 import { isRancherPrime } from '@shell/config/version';
 
+// i18n-uses customLinks.defaults.*
 const DEFAULT_LINKS = [
   {
     key:     'docs',
@@ -27,7 +28,7 @@ const DEFAULT_LINKS = [
   },
   {
     key:     'getStarted',
-    value:   'https://ranchermanager.docs.rancher.com/getting-started/overview',
+    value:   `${ DOCS_BASE }/getting-started/overview`,
     enabled: true,
   },
 ];

package/config/labels-annotations.js

@@ -14,6 +14,7 @@ export const CREATOR_ID = 'field.cattle.io/creatorId';
 export const RESOURCE_QUOTA = 'field.cattle.io/resourceQuota';
 export const AZURE_MIGRATED = 'auth.cattle.io/azuread-endpoint-migrated';
 export const WORKSPACE_ANNOTATION = 'objectset.rio.cattle.io/id';
+export const NODE_ARCHITECTURE = 'kubernetes.io/arch';
 
 export const KUBERNETES = {
   SERVICE_ACCOUNT_UID:  'kubernetes.io/service-account.uid',
@@ -152,7 +153,7 @@ export const CLUSTER_BADGE = {
   TEXT:      'ui.rancher/badge-text',
   // Badge color - as a hex color - e.g. #ff00ff
   COLOR:     'ui.rancher/badge-color',
-  // Custom icon text - max 2 characters
+  // Custom icon text - max 3 characters
   ICON_TEXT: 'ui.rancher/badge-icon-text',
 };
 

package/config/middleware.js

@@ -3,10 +3,4 @@ const middleware = {};
 middleware['authenticated'] = require('../middleware/authenticated.js');
 middleware['authenticated'] = middleware['authenticated'].default || middleware['authenticated'];
 
-middleware['i18n'] = require('../middleware/i18n.js');
-middleware['i18n'] = middleware['i18n'].default || middleware['i18n'];
-
-middleware['unauthenticated'] = require('../middleware/unauthenticated.js');
-middleware['unauthenticated'] = middleware['unauthenticated'].default || middleware['unauthenticated'];
-
 export default middleware;

package/config/pagination-table-headers.js

@@ -0,0 +1,57 @@
+import { STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE } from '@shell/config/table-headers';
+
+// This file contains table headers
+// These table headers are used for server side pagination
+// They MUST contain sort and search values that are paths to raw properties (not computed properties in models)
+// They SHOULD avoid formatters that change the value from the same used by sort and search (user will see an order that doesn't match what they see)
+
+export const STEVE_NAME_COL = {
+  ...NAME_COL,
+  defaultSort: true,
+  value:       'metadata.name',
+  sort:        ['metadata.name'],
+  search:      'metadata.name',
+};
+
+export const STEVE_ID_COL = {
+  name:     'steve-id',
+  labelKey: 'tableHeaders.id',
+  value:    'id',
+  sort:     ['id'],
+  search:   'id',
+};
+
+export const STEVE_STATE_COL = {
+  ...STATE,
+  // value:  'metadata.state.name', Use the state as defined by the resource rather than converted via the model.
+  // This means we'll show something different to what we sort and filter on.
+  sort:   [], // ['metadata.state.name'], // Pending API support
+  search: false, // 'metadata.state.name', // Pending API support
+};
+
+export const STEVE_AGE_COL = {
+  ...AGE,
+  value:  'metadata.creationTimestamp',
+  sort:   'metadata.creationTimestamp',
+  search: false,
+};
+
+export const STEVE_NAMESPACE_COL = {
+  ...NAMESPACE_COL,
+  value:  'metadata.namespace',
+  sort:   'metadata.namespace',
+  search: 'metadata.namespace',
+};
+
+export const STEVE_LIST_GROUPS = [{
+  tooltipKey: 'resourceTable.groupBy.none',
+  icon:       'icon-list-flat',
+  value:      'none',
+}, {
+  icon:          'icon-folder',
+  value:         'metadata.namespace',
+  field:         'metadata.namespace', // Default groupByLabel field in models is NS based
+  hideColumn:    NAMESPACE_COL.name,
+  tooltipKey:    'resourceTable.groupBy.namespace',
+  groupLabelKey: 'groupByLabel',
+}];

package/config/pod-security-admission.ts

@@ -1,4 +1,4 @@
-import { PSADimension, PSALevel, PSAMode } from '@shell/types/pod-security-admission';
+import { PSADimension, PSALevel, PSAMode } from '@shell/types/resources/pod-security-admission';
 
 /**
  * All the PSA labels are created with this prefix, so we can use this to identify them

package/config/private-label.js

@@ -3,7 +3,7 @@ import { SETTING } from './settings';
 export const ANY = 0;
 export const STANDARD = 1;
 export const CUSTOM = 2;
-export const DOCS_BASE = 'https://ranchermanager.docs.rancher.com/v2.8';
+export const DOCS_BASE = 'https://ranchermanager.docs.rancher.com/v2.9';
 
 const STANDARD_VENDOR = 'Rancher';
 const STANDARD_PRODUCT = 'Explorer';
@@ -23,6 +23,7 @@ export function setMode(m) {
 
 export function setVendor(v) {
   vendor = v;
+  setTitle();
 }
 
 export function setProduct(p) {
@@ -71,3 +72,22 @@ export function getVendor() {
 export function getProduct() {
   return product;
 }
+
+export function setTitle() {
+  const v = getVendor();
+
+  if (v === 'Harvester') {
+    const ico = require(`~shell/assets/images/pl/harvester.png`);
+
+    document.title = 'Harvester';
+    const link = document.createElement('link');
+
+    link.hid = 'icon';
+    link.rel = 'icon';
+    link.type = 'image/x-icon';
+    link.hrefv = ico;
+    const head = document.getElementsByTagName('head')[0];
+
+    head.appendChild(link);
+  }
+}

package/config/product/auth.js

@@ -174,6 +174,7 @@ export function init(store) {
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/googleoauth`, 'auth/googleoauth');
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/azuread`, 'auth/azuread');
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/keycloakoidc`, 'auth/oidc');
+  componentForType(`${ MANAGEMENT.AUTH_CONFIG }/genericoidc`, 'auth/oidc');
 
   basicType([
     'config',

package/config/product/explorer.js

@@ -1,27 +1,35 @@
 import {
+  CATALOG,
   CONFIG_MAP,
   EVENT,
   NODE, SECRET, INGRESS,
   WORKLOAD, WORKLOAD_TYPES, SERVICE, HPA, NETWORK_POLICY, PV, PVC, STORAGE_CLASS, POD, POD_DISRUPTION_BUDGET, LIMIT_RANGE, RESOURCE_QUOTA,
-  RBAC,
   MANAGEMENT,
   NAMESPACE,
   NORMAN,
+  SNAPSHOT,
   VIRTUAL_TYPES,
 } from '@shell/config/types';
 
 import {
-  STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE, KEYS,
+  STATE, USER_STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE, KEYS,
   INGRESS_DEFAULT_BACKEND, INGRESS_TARGET, INGRESS_CLASS,
   SPEC_TYPE, TARGET_PORT, SELECTOR, NODE as NODE_COL, TYPE, WORKLOAD_IMAGES, POD_IMAGES,
   USER_ID, USERNAME, USER_DISPLAY_NAME, USER_PROVIDER, USER_LAST_LOGIN, USER_DISABLED_IN, USER_DELETED_IN, WORKLOAD_ENDPOINTS, STORAGE_CLASS_DEFAULT,
   STORAGE_CLASS_PROVISIONER, PERSISTENT_VOLUME_SOURCE,
   HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA,
   ACCESS_KEY, DESCRIPTION, EXPIRES, EXPIRY_STATE, SUB_TYPE, AGE_NORMAN, SCOPE_NORMAN, PERSISTENT_VOLUME_CLAIM, RECLAIM_POLICY, PV_REASON, WORKLOAD_HEALTH_SCALE, POD_RESTARTS,
-  DURATION, MESSAGE, REASON, LAST_SEEN_TIME, EVENT_TYPE, OBJECT, ROLE,
+  DURATION, MESSAGE, REASON, LAST_SEEN_TIME, EVENT_TYPE, OBJECT, ROLE, ROLES, VERSION, INTERNAL_EXTERNAL_IP, KUBE_NODE_OS, CPU, RAM, SECRET_DATA
 } from '@shell/config/table-headers';
 
 import { DSL } from '@shell/store/type-map';
+import {
+  STEVE_AGE_COL, STEVE_LIST_GROUPS, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL
+} from '@shell/config/pagination-table-headers';
+
+import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
+import { STEVE_CACHE } from '@shell/store/features';
+import { configureConditionalDepaginate } from '@shell/store/type-map.utils';
 
 export const NAME = 'explorer';
 
@@ -49,7 +57,9 @@ export function init(store) {
     typeStoreMap:        {
       [MANAGEMENT.PROJECT]:                       'management',
       [MANAGEMENT.CLUSTER_ROLE_TEMPLATE_BINDING]: 'management',
-      [MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING]: 'management'
+      [MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING]: 'management',
+      [NORMAN.CLUSTER_ROLE_TEMPLATE_BINDING]:     'rancher',
+      [NORMAN.PROJECT_ROLE_TEMPLATE_BINDING]:     'rancher',
     }
   });
 
@@ -61,6 +71,7 @@ export function init(store) {
     NODE,
     VIRTUAL_TYPES.CLUSTER_MEMBERS,
     EVENT,
+    'c-cluster-explorer-tools'
   ], 'cluster');
   basicType([
     LIMIT_RANGE,
@@ -156,27 +167,36 @@ export function init(store) {
   mapGroup(/^(.*\.)?cluster\.x-k8s\.io$/, 'clusterProvisioning');
   mapGroup(/^(aks|eks|gke|rke|rke-machine-config|rke-machine|provisioning)\.cattle\.io$/, 'clusterProvisioning');
 
+  const dePaginateBindings = configureConditionalDepaginate({ maxResourceCount: 5000 });
+  const dePaginateNormanBindings = configureConditionalDepaginate({ maxResourceCount: 5000, isNorman: true }) ;
+
   configureType(NODE, { isCreatable: false, isEditable: true });
   configureType(WORKLOAD_TYPES.JOB, { isEditable: false, match: WORKLOAD_TYPES.JOB });
-  configureType(MANAGEMENT.CLUSTER_ROLE_TEMPLATE_BINDING, { isEditable: false });
-  configureType(MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING, { isEditable: false, depaginate: true });
+  configureType(MANAGEMENT.CLUSTER_ROLE_TEMPLATE_BINDING, { isEditable: false, depaginate: dePaginateBindings });
+  configureType(MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING, { isEditable: false, depaginate: dePaginateBindings });
   configureType(MANAGEMENT.PROJECT, { displayName: store.getters['i18n/t']('namespace.project.label') });
-  configureType(NORMAN.PROJECT_ROLE_TEMPLATE_BINDING, { depaginate: true });
+  configureType(NORMAN.CLUSTER_ROLE_TEMPLATE_BINDING, { depaginate: dePaginateNormanBindings });
+  configureType(NORMAN.PROJECT_ROLE_TEMPLATE_BINDING, { depaginate: dePaginateNormanBindings });
+  configureType(SNAPSHOT, { depaginate: true });
+  configureType(NORMAN.ETCD_BACKUP, { depaginate: true });
 
   configureType(EVENT, { limit: 500 });
   weightType(EVENT, -1, true);
 
-  // Allow Pods to be grouped by node
   configureType(POD, {
     listGroups: [
+      ...STEVE_LIST_GROUPS,
+      // Allow Pods to be grouped by node
       {
-        icon:       'icon-cluster',
-        value:      'role',
-        field:      'groupByNode',
-        hideColumn: 'groupByNode',
-        tooltipKey: 'resourceTable.groupBy.node'
+        icon:          'icon-cluster',
+        value:         'role',
+        field:         'spec.nodeName',
+        hideColumn:    NODE_COL.name,
+        groupLabelKey: 'groupByNode',
+        tooltipKey:    'resourceTable.groupBy.node'
       }
-    ]
+    ],
+    listGroupsWillOverride: true,
   });
 
   setGroupDefaultType('serviceDiscovery', SERVICE);
@@ -195,20 +215,43 @@ export function init(store) {
   configureType(MANAGEMENT.PSA, { localOnly: true });
 
   headers(PV, [STATE, NAME_COL, RECLAIM_POLICY, PERSISTENT_VOLUME_CLAIM, PERSISTENT_VOLUME_SOURCE, PV_REASON, AGE]);
-  headers(CONFIG_MAP, [NAME_COL, NAMESPACE_COL, KEYS, AGE]);
+
+  headers(CONFIG_MAP,
+    [NAME_COL, NAMESPACE_COL, KEYS, AGE],
+    [
+      STEVE_NAME_COL,
+      STEVE_NAMESPACE_COL, {
+        ...KEYS,
+        sort:   false,
+        search: false,
+      },
+      STEVE_AGE_COL
+    ]
+  );
+
   headers(SECRET, [
     STATE,
     NAME_COL,
     NAMESPACE_COL,
     SUB_TYPE,
-    {
-      name:      'data',
-      labelKey:  'tableHeaders.data',
-      value:     'dataPreview',
-      formatter: 'SecretData'
-    },
+    SECRET_DATA,
     AGE
+  ], [
+    STEVE_STATE_COL,
+    STEVE_NAME_COL,
+    STEVE_NAMESPACE_COL, {
+      ...SUB_TYPE,
+      value:  'metadata.fields.1',
+      sort:   'metadata.fields.1',
+      search: 'metadata.fields.1',
+    }, {
+      ...SECRET_DATA,
+      sort:   false,
+      search: false,
+    },
+    STEVE_AGE_COL
   ]);
+
   headers(INGRESS, [STATE, NAME_COL, NAMESPACE_COL, INGRESS_TARGET, INGRESS_DEFAULT_BACKEND, INGRESS_CLASS, AGE]);
   headers(SERVICE, [STATE, NAME_COL, NAMESPACE_COL, TARGET_PORT, SELECTOR, SPEC_TYPE, AGE]);
   headers(EVENT, [STATE, { ...LAST_SEEN_TIME, defaultSort: true }, EVENT_TYPE, REASON, OBJECT, 'Subobject', 'Source', MESSAGE, 'First Seen', 'Count', NAME_COL, NAMESPACE_COL]);
@@ -221,26 +264,89 @@ export function init(store) {
   headers(WORKLOAD_TYPES.JOB, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Completions', DURATION, POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
   headers(WORKLOAD_TYPES.CRON_JOB, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Schedule', 'Last Schedule', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
   headers(WORKLOAD_TYPES.REPLICATION_CONTROLLER, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(POD, [STATE, NAME_COL, NAMESPACE_COL, POD_IMAGES, 'Ready', 'Restarts', 'IP', NODE_COL, AGE]);
+
+  headers(POD,
+    [STATE, NAME_COL, NAMESPACE_COL, POD_IMAGES, 'Ready', 'Restarts', 'IP', NODE_COL, AGE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAME_COL,
+      STEVE_NAMESPACE_COL, {
+        ...POD_IMAGES,
+        sort:   false,
+        search: 'spec.containers.image'
+      }, 'Ready', 'Restarts', 'IP', {
+        ...NODE_COL,
+        search: 'spec.nodeName'
+      },
+      STEVE_AGE_COL
+    ]);
+
+  headers(NODE,
+    [
+      STATE,
+      NAME_COL,
+      ROLES,
+      VERSION,
+      INTERNAL_EXTERNAL_IP,
+      {
+        ...KUBE_NODE_OS,
+        breakpoint: COLUMN_BREAKPOINTS.LAPTOP,
+        getValue:   (row) => row.status?.nodeInfo?.operatingSystem
+      },
+      {
+        ...CPU,
+        breakpoint: COLUMN_BREAKPOINTS.LAPTOP,
+        getValue:   (row) => row.cpuUsagePercentage
+      }, {
+        ...RAM,
+        breakpoint: COLUMN_BREAKPOINTS.LAPTOP,
+        getValue:   (row) => row.ramUsagePercentage
+      },
+      AGE
+    ],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAME_COL,
+      {
+        ...ROLES,
+        sort:   false,
+        search: false
+      },
+      {
+        ...VERSION,
+        value:    'status.nodeInfo.kubeletVersion',
+        getValue: undefined,
+        sort:     ['status.nodeInfo.kubeletVersion'],
+        search:   'status.nodeInfo.kubeletVersion'
+      }, {
+        ...INTERNAL_EXTERNAL_IP,
+        sort:   false,
+        search: false,
+      }, {
+        ...KUBE_NODE_OS,
+        breakpoint: COLUMN_BREAKPOINTS.LAPTOP,
+        getValue:   undefined
+      }, {
+        ...CPU,
+        breakpoint: COLUMN_BREAKPOINTS.LAPTOP,
+        getValue:   (row) => row.cpuUsagePercentage,
+        sort:       false,
+        search:     false,
+      }, {
+        ...RAM,
+        breakpoint: COLUMN_BREAKPOINTS.LAPTOP,
+        sort:       false,
+        search:     false,
+      },
+      STEVE_AGE_COL
+    ]);
+
   headers(MANAGEMENT.PSA, [STATE, NAME_COL, {
     ...DESCRIPTION,
     width: undefined
   }, AGE]);
   headers(STORAGE_CLASS, [STATE, NAME_COL, STORAGE_CLASS_PROVISIONER, STORAGE_CLASS_DEFAULT, AGE]);
 
-  headers(RBAC.ROLE, [
-    STATE,
-    NAME_COL,
-    NAMESPACE_COL,
-    AGE
-  ]);
-
-  headers(RBAC.CLUSTER_ROLE, [
-    STATE,
-    NAME_COL,
-    AGE,
-  ]);
-
   configureType(MANAGEMENT.CLUSTER_ROLE_TEMPLATE_BINDING, {
     listGroups: [
       {
@@ -254,7 +360,7 @@ export function init(store) {
   });
 
   headers(MANAGEMENT.USER, [
-    STATE,
+    USER_STATE,
     USER_ID,
     USER_DISPLAY_NAME,
     USER_PROVIDER,
@@ -286,15 +392,16 @@ export function init(store) {
   });
 
   virtualType({
-    labelKey:   'members.clusterAndProject',
-    group:      'cluster',
-    namespaced: false,
-    name:       VIRTUAL_TYPES.CLUSTER_MEMBERS,
-    icon:       'globe',
-    weight:     -1,
-    route:      { name: 'c-cluster-product-members' },
-    exact:      true,
-    ifHaveType: {
+    labelKey:     'members.clusterAndProject',
+    group:        'cluster',
+    namespaced:   false,
+    name:         VIRTUAL_TYPES.CLUSTER_MEMBERS,
+    icon:         'globe',
+    weight:       -1,
+    route:        { name: 'c-cluster-product-members' },
+    exact:        false,
+    'exact-path': true,
+    ifHaveType:   {
       type:  MANAGEMENT.CLUSTER_ROLE_TEMPLATE_BINDING,
       store: 'management'
     }
@@ -307,6 +414,8 @@ export function init(store) {
     name:           WORKLOAD,
     weight:         99,
     icon:           'folder',
+    // Workloads fetch ALL resources of ALL resource types... which scales badly. Until this is replaced by an overview page disable entirely
+    ifFeature:      `!${ STEVE_CACHE }`,
     ifHaveSubTypes: Object.values(WORKLOAD_TYPES),
     route:          {
       name:   'c-cluster-product-resource',
@@ -327,6 +436,18 @@ export function init(store) {
     exact:            true,
   });
 
+  virtualType({
+    labelKey:   'nav.tools',
+    group:      'cluster',
+    icon:       'globe',
+    namespaced: false,
+    name:       'c-cluster-explorer-tools',
+    weight:     -2,
+    route:      { name: 'c-cluster-explorer-tools' },
+    exact:      true,
+    ifHaveType: [CATALOG.CLUSTER_REPO, CATALOG.APP],
+  });
+
   virtualType({
     label:            store.getters['i18n/t'](`typeLabel.${ NAMESPACE }`, { count: 2 }),
     group:            'cluster',

package/config/product/fleet.js

@@ -3,6 +3,7 @@ import { FLEET } from '@shell/config/types';
 import { STATE, NAME as NAME_COL, AGE } from '@shell/config/table-headers';
 import { FLEET as FLEET_FEATURE } from '@shell/store/features';
 import { gitRepoGraphConfig } from '@shell/pages/c/_cluster/fleet/GitRepoGraphConfig';
+import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 
 export const NAME = 'fleet';
 export const CHART_NAME = 'fleet';
@@ -26,6 +27,10 @@ export function init(store) {
     removable:             false,
     showClusterSwitcher:   false,
     showWorkspaceSwitcher: true,
+    to:                    {
+      name:   'c-cluster-fleet',
+      params: { resource: FLEET.DASHBOARD, cluster: BLANK_CLUSTER }
+    },
   });
 
   virtualType({
@@ -37,7 +42,7 @@ export function init(store) {
     weight:     110,
     route:      {
       name:   'c-cluster-fleet',
-      params: { resource: FLEET.DASHBOARD }
+      params: { resource: FLEET.DASHBOARD, cluster: BLANK_CLUSTER }
     },
     exact: true,
   });

package/config/product/legacy.js

@@ -8,6 +8,7 @@ export function init(store) {
     product,
     basicType,
     virtualType,
+    setGroupDefaultType,
   } = DSL(store, NAME);
 
   product({
@@ -16,17 +17,6 @@ export function init(store) {
     showNamespaceFilter: true,
   });
 
-  virtualType({
-    ifHave:     IF_HAVE.PROJECT,
-    labelKey:   'legacy.project.label',
-    namespaced: true,
-    name:       'v1-project',
-    weight:     105,
-    route:      { name: 'c-cluster-project-apps' },
-    exact:      true,
-    overview:   false,
-  });
-
   virtualType({
     ifHave:     IF_HAVE.NO_PROJECT,
     labelKey:   'legacy.project.label',
@@ -68,4 +58,5 @@ export function init(store) {
     'project-config-maps',
     'project-secrets',
   ], 'Project');
+  setGroupDefaultType('project-config-maps', 'Project');
 }