dashboard-shell-shell 3.0.2-test.20250913 → 3.0.5-logTest.2

package/config/settings.ts

@@ -45,7 +45,6 @@ export const SETTING = {
   AUTH_TOKEN_MAX_TTL_MINUTES:                    'auth-token-max-ttl-minutes',
   KUBECONFIG_GENERATE_TOKEN:                     'kubeconfig-generate-token',
   KUBECONFIG_DEFAULT_TOKEN_TTL_MINUTES:          'kubeconfig-default-token-ttl-minutes',
-  ENGINE_URL:                                    'engine-install-url',
   ENGINE_ISO_URL:                                'engine-iso-url',
   FIRST_LOGIN:                                   'first-login',
   INGRESS_IP_DOMAIN:                             'ingress-ip-domain',
@@ -57,7 +56,6 @@ export const SETTING = {
   AUTH_USER_INFO_RESYNC_CRON:                    'auth-user-info-resync-cron',
   AUTH_LOCAL_VALIDATE_DESC:                      'auth-password-requirements-description',
   PASSWORD_MIN_LENGTH:                           'password-min-length', // CATTLE_PASSWORD_MIN_LENGTH
-  CLUSTER_TEMPLATE_ENFORCEMENT:                  'cluster-template-enforcement',
   UI_INDEX:                                      'ui-index',
   UI_DASHBOARD_INDEX:                            'ui-dashboard-index',
   UI_DASHBOARD_HARVESTER_LEGACY_PLUGIN:          'ui-dashboard-harvester-legacy-plugin',
@@ -108,6 +106,7 @@ export const SETTING = {
   DISABLE_INACTIVE_USER_AFTER:                   'disable-inactive-user-after',
   DELETE_INACTIVE_USER_AFTER:                    'delete-inactive-user-after',
   K3S_UPGRADER_UNINSTALL_CONCURRENCY:            'k3s-based-upgrader-uninstall-concurrency',
+  SYSTEM_AGENT_UPGRADER_INSTALL_CONCURRENCY:     'system-agent-upgrader-install-concurrency',
   IMPORTED_CLUSTER_VERSION_MANAGEMENT:           'imported-cluster-version-management',
   CLUSTER_AGENT_DEFAULT_PRIORITY_CLASS:          'cluster-agent-default-priority-class',
   CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET: 'cluster-agent-default-pod-disruption-budget'
@@ -144,7 +143,6 @@ export const ALLOWED_SETTINGS_NEW: GlobalSetting = {
 // These are the settings that are allowed to be edited via the UI
 export const ALLOWED_SETTINGS: GlobalSetting = {
   [SETTING.CA_CERTS]:            { kind: 'multiline', readOnly: true },
-  [SETTING.ENGINE_URL]:          {},
   [SETTING.ENGINE_ISO_URL]:      {},
   [SETTING.PASSWORD_MIN_LENGTH]: {
     kind:    'integer',
@@ -184,14 +182,17 @@ export const ALLOWED_SETTINGS: GlobalSetting = {
     kind:    'enum',
     options: ['dynamic', 'true', 'false']
   },
-  [SETTING.BRAND]:                        { canReset: true },
-  [SETTING.CLUSTER_TEMPLATE_ENFORCEMENT]: { kind: 'boolean' },
-  [SETTING.HIDE_LOCAL_CLUSTER]:           { kind: 'boolean' },
-  [SETTING.AGENT_TLS_MODE]:               {
+  [SETTING.BRAND]:              { canReset: true },
+  [SETTING.HIDE_LOCAL_CLUSTER]: { kind: 'boolean' },
+  [SETTING.AGENT_TLS_MODE]:     {
     kind:    'enum',
     options: ['strict', 'system-store'],
     warning: 'agent-tls-mode'
   },
+  [SETTING.SYSTEM_AGENT_UPGRADER_INSTALL_CONCURRENCY]: {
+    kind:    'integer',
+    ruleSet: [{ name: 'minValue', factoryArg: 1 }]
+  },
   [SETTING.K3S_UPGRADER_UNINSTALL_CONCURRENCY]: {
     kind:    'integer',
     ruleSet: [{ name: 'minValue', factoryArg: 1 }]
@@ -202,7 +203,20 @@ export const ALLOWED_SETTINGS: GlobalSetting = {
 
 };
 
-export const PROVISIONING_SETTINGS = ['engine-iso-url', 'engine-install-url', 'imported-cluster-version-management', 'cluster-agent-default-priority-class', 'cluster-agent-default-pod-disruption-budget'];
+/**
+ * Show settings in a special cluster provisioning section
+ *
+ * These should probably be an option in the maps above...
+ */
+export const PROVISIONING_SETTINGS = [
+  SETTING.ENGINE_ISO_URL,
+  SETTING.RKE_METADATA_CONFIG,
+  SETTING.K3S_UPGRADER_UNINSTALL_CONCURRENCY,
+  SETTING.IMPORTED_CLUSTER_VERSION_MANAGEMENT,
+  SETTING.CLUSTER_AGENT_DEFAULT_PRIORITY_CLASS,
+  SETTING.CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET
+];
+
 /**
  * Settings on how to handle warnings returning in api responses, specifically which to show as growls
  */
@@ -228,14 +242,17 @@ export interface PerfSettingsKubeApi {
 
 export interface PerfSettings {
   inactivity: {
-      enabled: boolean;
-      threshold: number;
+    enabled: boolean;
+    threshold: number;
   };
   incrementalLoading: {
-      enabled: boolean;
-      threshold: number;
+    enabled: boolean;
+    threshold: number;
+  };
+  manualRefresh: {
+    enabled: boolean;
+    threshold: number;
   };
-  manualRefresh: {};
   disableWebsocketNotification: boolean;
   garbageCollection: GC_PREFERENCES;
   forceNsFilterV2: any;
@@ -279,8 +296,8 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
     }
   },
   serverPagination: {
-    enabled:          false,
-    useDefaultStores: true,
-    stores:           undefined,
+    useDefaultStores:          true,
+    stores:                    undefined,
+    resourceChangesDebounceMs: 4000,
   }
 };

package/config/store.js

@@ -38,6 +38,7 @@ let store = {};
   resolveStoreModules(require('../store/wm.js'), 'wm.js');
   resolveStoreModules(require('../store/customisation.js'), 'customisation.js');
   resolveStoreModules(require('../store/cru-resource.ts'), 'cru-resource.ts');
+  resolveStoreModules(require('../store/notifications.ts'), 'notifications.ts');
 
   // If the environment supports hot reloading...
 
@@ -67,6 +68,7 @@ let store = {};
       '../store/wm.js',
       '../store/customisation.js',
       '../store/cru-resource.ts',
+      '../store/notifications.ts',
     ], () => {
       // Update `root.modules` with the latest definitions.
       updateModules();

package/config/system-namespaces.js

@@ -12,7 +12,7 @@ export default [
   'linkerd',
   'security-scan',
   'tekton-pipelines',
-  'cis-operator-system',
+  'compliance-operator-system',
   'istio-system',
   'longhorn-system',
 ];

package/config/table-headers.js

@@ -1,4 +1,4 @@
-import { CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations';
+import { CATTLE_PUBLIC_ENDPOINTS, UI_PROJECT_SECRET_COPY } from '@shell/config/labels-annotations';
 import { NODE as NODE_TYPE } from '@shell/config/types';
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 
@@ -52,7 +52,7 @@ export const NAME = {
   getValue:      (row) => row.nameDisplay,
   sort:          ['nameSort'],
   formatter:     'LinkDetail',
-  width: 200,
+  width:         200,
   canBeVariable: true,
 };
 
@@ -267,11 +267,13 @@ export const CREATION_DATE = {
 };
 
 export const DESCRIPTION = {
-  name:     'description',
-  labelKey: 'tableHeaders.description',
-  align:    'left',
-  sort:     ['description'],
-  width:    300,
+  name:      'description',
+  labelKey:  'tableHeaders.description',
+  align:     'left',
+  value:     'description',
+  sort:      ['description'],
+  formatter: 'Description',
+  width:     300,
 };
 
 export const NS_SNAPSHOT_QUOTA = {
@@ -382,6 +384,29 @@ export const SECRET_DATA = {
   formatter: 'SecretData'
 };
 
+export const SECRET_CLONE = {
+  name:      'secret-clone',
+  labelKey:  'tableHeaders.secret.project-clone',
+  tooltip:   'tableHeaders.secret.project-clone-tooltip',
+  value:     'isProjectSecretCopy',
+  sort:      `metadata.annotations."${ UI_PROJECT_SECRET_COPY }"`,
+  search:    false,
+  formatter: 'Checked',
+};
+
+export const SECRET_PROJECT_SCOPED = {
+  name:     'secret-project-scoped',
+  labelKey: 'tableHeaders.secret.project-scoped',
+  tooltip:  'tableHeaders.secret.project-scoped-tooltip',
+  value:    'clusterAndProjectLabel',
+  // Cannot _sort_ upstream secrets by if they are cluster scoped
+  // https://github.com/rancher/rancher/issues/51001
+  // metadata.labels[management.cattle.io/project-scoped-secret] - covers both cluster scoped AND clones
+  // metadata.annotations[management.cattle.io/project-scoped-secret-copy]
+  // sort:     [`metadata.labels[${ UI_PROJECT_SECRET }]`, `metadata.annotations[${ UI_PROJECT_SECRET_COPY }]`],
+  search:   false,
+};
+
 export const TARGET_KIND = {
   name:     'target-kind',
   labelKey: 'tableHeaders.targetKind',
@@ -760,6 +785,52 @@ export const FLEET_SUMMARY = {
   width:     100,
 };
 
+export const FLEET_APPLICATION_TYPE = {
+  name:     'applicationType',
+  labelKey: 'fleet.tableHeaders.applicationType',
+  value:    'kind',
+  sort:     'kind',
+  search:   false,
+  align:    'center',
+  width:    100,
+};
+
+export const FLEET_APPLICATION_SOURCE = {
+  name:      'applicationSource',
+  labelKey:  'fleet.tableHeaders.applicationSource',
+  value:     'source.value',
+  formatter: 'FleetApplicationSource',
+  sort:      'source.value',
+  search:    ['source.value', 'sourceSub.value'],
+};
+
+export const FLEET_APPLICATION_TARGET = {
+  name:     'applicationTarget',
+  labelKey: 'fleet.tableHeaders.applicationTarget',
+  value:    'targetInfo.modeDisplay',
+  sort:     ['targetInfo.modeDisplay'],
+};
+
+export const FLEET_APPLICATION_CLUSTERS_READY = {
+  name:      'applicationClustersReady',
+  labelKey:  'fleet.tableHeaders.applicationClustersReady',
+  value:     'readyClusters',
+  formatter: 'FleetApplicationClustersReady',
+  sort:      'readyClusters',
+  search:    false,
+};
+
+export const FLEET_APPLICATION_RESOURCES_SUMMARY = {
+  name:      'applicationResourcesSummary',
+  labelKey:  'fleet.tableHeaders.applicationResourcesSummary',
+  value:     'status.resourceCounts',
+  sort:      false,
+  search:    false,
+  formatter: 'FleetSummaryGraph',
+  align:     'center',
+  width:     100,
+};
+
 export const FLEET_REPO_CLUSTER_SUMMARY = {
   name:      'clusterSummary',
   labelKey:  'tableHeaders.clusterResources',
@@ -1051,36 +1122,20 @@ export const FLEET_BUNDLE_LAST_UPDATED = {
   sort:          ['lastUpdateTime']
 };
 
-export const FLEET_BUNDLE_TYPE = {
-  name:     'bundleType',
-  labelKey: 'tableHeaders.fleetBundleType',
-  value:    'bundleType',
-  sort:     ['bundleType'],
-  width:    100,
-};
-
-export const FLEET_REPO_CLUSTERS_READY = {
-  name:     'clustersReady',
-  labelKey: 'tableHeaders.clustersReady',
-  value:    'status.readyClusters',
-  sort:     'status.readyClusters',
-  search:   false,
-};
-
 export const FLEET_REPO_TARGET = {
   name:     'target',
   labelKey: 'tableHeaders.target',
   value:    'targetInfo.modeDisplay',
-  sort:     ['targetInfo.modeDisplay', 'targetInfo.cluster', 'targetInfo.clusterGroup'],
-
+  sort:     ['targetInfo.modeDisplay'],
 };
 
 export const FLEET_REPO = {
-  name:     'repo',
-  labelKey: 'tableHeaders.repo',
-  value:    'repoDisplay',
-  sort:     'repoDisplay',
-  search:   ['spec.repo', 'status.commit'],
+  name:      'repo',
+  labelKey:  'tableHeaders.repo',
+  value:     'source.value',
+  formatter: 'FleetApplicationSource',
+  sort:      'source.value',
+  search:    ['source.value', 'sourceSub.value'],
 };
 
 export const UI_PLUGIN_CATALOG = [
@@ -1114,3 +1169,9 @@ export const UI_PLUGIN_CATALOG = [
     value:    'repo.metadata.name'
   }
 ];
+
+// SECRETS
+export const PROJECT = {
+  name:     'project',
+  labelKey: 'tableHeaders.project',
+};

package/config/types.js

@@ -14,7 +14,6 @@ export const STEVE = {
 export const NORMAN = {
   APP:                           'app',
   AUTH_CONFIG:                   'authconfig',
-  ETCD_BACKUP:                   'etcdbackup',
   CLUSTER:                       'cluster',
   CLUSTER_TOKEN:                 'clusterregistrationtoken',
   CLUSTER_ROLE_TEMPLATE_BINDING: 'clusterroletemplatebinding',
@@ -134,6 +133,14 @@ export const CATALOG = {
   REPO:         'catalog.cattle.io.repo',
 };
 
+// Charts/Apps
+export const CATALOG_SORT_OPTIONS = {
+  RECOMMENDED:       'recommended',
+  LAST_UPDATED_DESC: 'lastupdatedDescending',
+  ALPHABETICAL_ASC:  'alphaAscending',
+  ALPHABETICAL_DESC: 'alphaDescending'
+};
+
 // UI Plugin type
 export const UI_PLUGIN = 'catalog.cattle.io.uiplugin';
 
@@ -211,7 +218,8 @@ export const MANAGEMENT = {
   GLOBAL_DNS_PROVIDER:           'management.cattle.io.globaldnsprovider',
   RKE_TEMPLATE:                  'management.cattle.io.clustertemplate',
   RKE_TEMPLATE_REVISION:         'management.cattle.io.clustertemplaterevision',
-  CLUSTER_PROXY_CONFIG:          'management.cattle.io.clusterproxyconfig'
+  CLUSTER_PROXY_CONFIG:          'management.cattle.io.clusterproxyconfig',
+  OIDC_CLIENT:                   'management.cattle.io.oidcclient'
 };
 
 export const CAPI = {
@@ -229,12 +237,14 @@ export const CAPI = {
 // Base: /k8s/clusters/<id>/v1/
 
 export const FLEET = {
+  APPLICATION:              'fleet.cattle.io.application',
   BUNDLE:                   'fleet.cattle.io.bundle',
   BUNDLE_DEPLOYMENT:        'fleet.cattle.io.bundledeployment',
   CLUSTER:                  'fleet.cattle.io.cluster',
   CLUSTER_GROUP:            'fleet.cattle.io.clustergroup',
   DASHBOARD:                'fleet.cattle.io.dashboard',
   GIT_REPO:                 'fleet.cattle.io.gitrepo',
+  HELM_OP:                  'fleet.cattle.io.helmop',
   WORKSPACE:                'management.cattle.io.fleetworkspace',
   TOKEN:                    'fleet.cattle.io.clusterregistrationtoken',
   BUNDLE_NAMESPACE_MAPPING: 'fleet.cattle.io.bundlenamespacemapping',
@@ -292,11 +302,11 @@ export const BACKUP_RESTORE = {
   RESTORE:      'resources.cattle.io.restore',
 };
 
-export const CIS = {
-  CLUSTER_SCAN:         'cis.cattle.io.clusterscan',
-  CLUSTER_SCAN_PROFILE: 'cis.cattle.io.clusterscanprofile',
-  BENCHMARK:            'cis.cattle.io.clusterscanbenchmark',
-  REPORT:               'cis.cattle.io.clusterscanreport'
+export const COMPLIANCE = {
+  CLUSTER_SCAN:         'compliance.cattle.io.clusterscan',
+  CLUSTER_SCAN_PROFILE: 'compliance.cattle.io.clusterscanprofile',
+  BENCHMARK:            'compliance.cattle.io.clusterscanbenchmark',
+  REPORT:               'compliance.cattle.io.clusterscanreport'
 };
 
 export const UI = { NAV_LINK: 'ui.cattle.io.navlink' };
@@ -305,6 +315,7 @@ export const VIRTUAL_TYPES = {
   CLUSTER_MEMBERS:    'cluster-members',
   PROJECT_NAMESPACES: 'projects-namespaces',
   NAMESPACES:         'namespaces',
+  PROJECT_SECRETS:    'projectsecret',
   JWT_AUTHENTICATION: 'jwt.authentication'
 };
 

package/config/version.js

@@ -30,4 +30,4 @@ export function setKubeVersionData(v) {
   _kubeVersionData = JSON.parse(JSON.stringify(v));
 }
 
-export const CURRENT_RANCHER_VERSION = '2.11';
+export const CURRENT_RANCHER_VERSION = '2.12';

package/core/plugin-helpers.ts

@@ -32,12 +32,13 @@ function checkRouteProduct($route: RouteLocation, locationConfigParam: string) {
   return false;
 }
 
-function checkRouteMode({ name, query }: {name: string, query: any}, locationConfigParam: LocationConfigParams) {
+function checkRouteMode({ name, query, meta }: {name: string, query: any, meta: any}, locationConfigParam: LocationConfigParams) {
   if (locationConfigParam === _EDIT && query.mode && query.mode === _EDIT && !query.as) {
     return true;
   } else if (locationConfigParam === _CONFIG && query.as && query.as === _CONFIG) {
     return true;
-  } else if (locationConfigParam === _DETAIL && !query.as && name.includes('-id') && (!query.mode || query?.mode !== _EDIT)) {
+  // I don't think we should be inspecting route names to infer modes. I'm thinking we may want to move it all to route metadata at some point
+  } else if (locationConfigParam === _DETAIL && !query.as && (name.includes('-id') || meta.mode === 'detail') && (!query.mode || query?.mode !== _EDIT)) {
     return true;
     // alias to target all list views
   } else if (locationConfigParam === _LIST && !name.includes('-id') && name.includes('-resource')) {

package/core/plugin.ts

@@ -14,7 +14,8 @@ import {
   ExtensionPoint,
   TabLocation,
   ModelExtensionConstructor,
-  PluginRouteRecordRaw, RegisterStore, UnregisterStore, CoreStoreSpecifics, CoreStoreConfig, OnNavToPackage, OnNavAwayFromPackage, OnLogOut,
+  PluginRouteRecordRaw, RegisterStore, UnregisterStore, CoreStoreSpecifics, CoreStoreConfig,
+  NavHooks, OnNavToPackage, OnNavAwayFromPackage, OnLogIn, OnLogOut,
   ExtensionEnvironment
 } from './types';
 import coreStore, { coreStoreModule, coreStoreState } from '@shell/plugins/dashboard-store';
@@ -43,6 +44,7 @@ export class Plugin implements IPlugin {
   public onEnter: OnNavToPackage = () => Promise.resolve();
   public onLeave: OnNavAwayFromPackage = () => Promise.resolve();
   public _onLogOut: OnLogOut = () => Promise.resolve();
+  public onLogIn: OnLogIn = () => Promise.resolve();
 
   public uiConfig: { [key: string]: any } = {};
 
@@ -314,13 +316,36 @@ export class Plugin implements IPlugin {
   }
 
   public addNavHooks(
-    onEnter: OnNavToPackage = () => Promise.resolve(),
-    onLeave: OnNavAwayFromPackage = () => Promise.resolve(),
-    onLogOut: OnLogOut = () => Promise.resolve(),
+    onEnter?: OnNavToPackage | NavHooks,
+    onLeave?: OnNavAwayFromPackage,
+    onLogOut?: OnLogOut,
+    onLogIn?: OnLogIn,
   ): void {
-    this.onEnter = onEnter;
-    this.onLeave = onLeave;
-    this._onLogOut = onLogOut;
+    if (typeof onEnter === 'object') {
+      const hooks = onEnter as NavHooks;
+
+      if (hooks.onEnter) {
+        this.onEnter = hooks.onEnter;
+      }
+
+      if (hooks.onLeave) {
+        this.onLeave = hooks.onLeave;
+      }
+
+      if (hooks.onLogout) {
+        this._onLogOut = hooks.onLogout;
+      }
+
+      if (hooks.onLogin) {
+        this.onLogIn = hooks.onLogin;
+      }
+    } else {
+      // No first arg, or first arg is not an object, so this is the legacy invocation
+      this.onEnter = (onEnter as OnNavToPackage) || (() => Promise.resolve());
+      this.onLeave = onLeave || (() => Promise.resolve());
+      this._onLogOut = onLogOut || (() => Promise.resolve());
+      this.onLogIn = onLogIn || (() => Promise.resolve());
+    }
   }
 
   public async onLogOut(store: any) {

package/core/types.ts

@@ -39,8 +39,19 @@ export type OnEnterLeavePackageConfig = {
 export type OnNavToPackage = (store: any, config: OnEnterLeavePackageConfig) => Promise<void>;
 export type OnNavAwayFromPackage = (store: any, config: OnEnterLeavePackageConfig) => Promise<void>;
 export type OnLogOut = (store: any) => Promise<void>;
+export type OnLogIn = (store: any) => Promise<void>;
 
-/** Enum regarding the extensionable areas/places of the UI */
+/**
+ * Navigation hooks specified as an object
+ */
+export type NavHooks = {
+  onEnter?: OnNavToPackage,
+  onLeave?: OnNavAwayFromPackage,
+  onLogout?: OnLogOut,
+  onLogin?: OnLogIn,
+}
+
+/** Enum regarding the extensible areas/places of the UI */
 export enum ExtensionPoint {
   ACTION = 'Action', // eslint-disable-line no-unused-vars
   TAB = 'Tab', // eslint-disable-line no-unused-vars
@@ -49,31 +60,32 @@ export enum ExtensionPoint {
   TABLE_COL = 'TableColumn', // eslint-disable-line no-unused-vars
 }
 
-/** Enum regarding action locations that are extensionable in the UI */
+/** Enum regarding action locations that are extensible in the UI */
 export enum ActionLocation {
   HEADER = 'header-action', // eslint-disable-line no-unused-vars
   TABLE = 'table-action', // eslint-disable-line no-unused-vars
 }
 
-/** Enum regarding panel locations that are extensionable in the UI */
+/** Enum regarding panel locations that are extensible in the UI */
 export enum PanelLocation {
+  ABOUT_TOP = 'about-top', // eslint-disable-line no-unused-vars
   DETAILS_MASTHEAD = 'details-masthead', // eslint-disable-line no-unused-vars
   DETAIL_TOP = 'detail-top', // eslint-disable-line no-unused-vars
   RESOURCE_LIST = 'resource-list', // eslint-disable-line no-unused-vars
 }
 
-/** Enum regarding tab locations that are extensionable in the UI */
+/** Enum regarding tab locations that are extensible in the UI */
 export enum TabLocation {
   RESOURCE_DETAIL = 'tab', // eslint-disable-line no-unused-vars
   CLUSTER_CREATE_RKE2 = 'cluster-create-rke2', // eslint-disable-line no-unused-vars
 }
 
-/** Enum regarding card locations that are extensionable in the UI */
+/** Enum regarding card locations that are extensible in the UI */
 export enum CardLocation {
   CLUSTER_DASHBOARD_CARD = 'cluster-dashboard-card', // eslint-disable-line no-unused-vars
 }
 
-/** Enum regarding table col locations that are extensionable in the UI */
+/** Enum regarding table col locations that are extensible in the UI */
 export enum TableColumnLocation {
   RESOURCE = 'resource-list', // eslint-disable-line no-unused-vars
 }
@@ -323,6 +335,10 @@ export interface HeaderOptions {
 }
 
 export interface ConfigureTypeOptions {
+  /**
+   * Override for the create button string on a list view
+   */
+  listCreateButtonLabelKey?: boolean;
   /**
    * The resource can edit/show yaml
    */
@@ -643,8 +659,10 @@ export interface IPlugin {
   addNavHooks(
     onEnter?: OnNavToPackage,
     onLeave?: OnNavAwayFromPackage,
-    onLogOut?: OnLogOut
+    onLogOut?: OnLogOut,
+    onLogIn?: OnLogIn,
   ): void;
+  addNavHooks(hooks: NavHooks): void;
 
   /**
    * Adds a model extension

package/detail/catalog.cattle.io.app.vue

@@ -11,6 +11,7 @@ import merge from 'lodash/merge';
 import { CATALOG } from '@shell/config/types';
 import { sortBy } from '@shell/utils/sort';
 import { allHash } from '@shell/utils/promise';
+import { mergeWithReplace } from '@shell/utils/object';
 
 export default {
   name: 'DetailRelease',
@@ -52,7 +53,10 @@ export default {
     },
 
     valuesYaml() {
-      const combined = merge(merge({}, this.value?.chartValues || {}), this.value?.values || {});
+      const combined = mergeWithReplace(
+        merge({}, this.value?.chartValues || {}),
+        this.value?.values || {},
+      );
 
       return jsyaml.dump(combined);
     },