dashboard-shell-shell 1.0.121 → 1.0.1000000081

package/types/shell/index.d.ts

@@ -1,25 +1,7 @@
 // Auto-generated type definitions for shell
 // Do not modify this file as changes will get overwritten
-declare module '*.vue' {
-  import Vue from 'vue';
-  export default Vue;
-}
-
-// This is required to keep typescript from complaining. It is required for
-// our i18n plugin. For more info see:
-// https://v2.vuejs.org/v2/guide/typescript.html?redirect=true#Augmenting-Types-for-Use-with-Plugins
-declare module 'vue/types/vue' {
-  // eslint-disable-next-line no-unused-vars
-  interface Vue {
-      /**
-       * Lookup a given string with the given arguments
-       * @param raw if set, do not do HTML escaping.
-       */
-      t: (key: string, args?: Record<string, any>, raw?: boolean) => string,
-  }
-}
-
-declare module 'js-yaml';
+/// <reference types="@rancher/shell/types/vue-shim" />
+/// <reference types="@rancher/shell/types/global-vue" />
 
 // @shell/config/labels-annotations
 
@@ -305,6 +287,8 @@ export namespace NAME {
     export { sort_3 as sort };
     let formatter_3: string;
     export { formatter_3 as formatter };
+    let width_2: number;
+    export { width_2 as width };
     let canBeVariable_1: boolean;
     export { canBeVariable_1 as canBeVariable };
 }
@@ -329,8 +313,8 @@ export namespace SIMPLE_NAME {
     export { value_5 as value };
     let sort_5: string[];
     export { sort_5 as sort };
-    let width_2: number;
-    export { width_2 as width };
+    let width_3: number;
+    export { width_3 as width };
     let canBeVariable_2: boolean;
     export { canBeVariable_2 as canBeVariable };
 }
@@ -535,8 +519,8 @@ export namespace CPU {
     export { value_21 as value };
     let formatter_11: string;
     export { formatter_11 as formatter };
-    let width_3: number;
-    export { width_3 as width };
+    let width_4: number;
+    export { width_4 as width };
 }
 export namespace RAM {
     let name_23: string;
@@ -551,8 +535,8 @@ export namespace RAM {
     export { value_22 as value };
     let formatter_12: string;
     export { formatter_12 as formatter };
-    let width_4: number;
-    export { width_4 as width };
+    let width_5: number;
+    export { width_5 as width };
 }
 export namespace PRINCIPAL {
     let name_24: string;
@@ -579,8 +563,8 @@ export namespace PODS {
     export { value_24 as value };
     let formatter_14: string;
     export { formatter_14 as formatter };
-    let width_5: number;
-    export { width_5 as width };
+    let width_6: number;
+    export { width_6 as width };
 }
 export namespace AGE {
     let name_26: string;
@@ -597,8 +581,8 @@ export namespace AGE {
     export { search_4 as search };
     let formatter_15: string;
     export { formatter_15 as formatter };
-    let width_6: number;
-    export { width_6 as width };
+    let width_7: number;
+    export { width_7 as width };
     let align_1: string;
     export { align_1 as align };
 }
@@ -631,8 +615,8 @@ export namespace DESCRIPTION {
     export { align_2 as align };
     let sort_28: string[];
     export { sort_28 as sort };
-    let width_7: number;
-    export { width_7 as width };
+    let width_8: number;
+    export { width_8 as width };
 }
 export namespace NS_SNAPSHOT_QUOTA {
     let name_29: string;
@@ -722,8 +706,8 @@ export namespace SCALE {
     export { sort_33 as sort };
     let formatter_22: string;
     export { formatter_22 as formatter };
-    let width_8: number;
-    export { width_8 as width };
+    let width_9: number;
+    export { width_9 as width };
     let align_4: string;
     export { align_4 as align };
 }
@@ -744,8 +728,8 @@ export namespace SUCCESS {
     export { labelKey_36 as labelKey };
     let value_35: string;
     export { value_35 as value };
-    let width_9: number;
-    export { width_9 as width };
+    let width_10: number;
+    export { width_10 as width };
     let align_5: string;
     export { align_5 as align };
 }
@@ -756,8 +740,8 @@ export namespace REQ_RATE {
     export { labelKey_37 as labelKey };
     let value_36: string;
     export { value_36 as value };
-    let width_10: number;
-    export { width_10 as width };
+    let width_11: number;
+    export { width_11 as width };
     let align_6: string;
     export { align_6 as align };
 }
@@ -768,8 +752,8 @@ export namespace P95 {
     export { labelKey_38 as labelKey };
     let value_37: string;
     export { value_37 as value };
-    let width_11: number;
-    export { width_11 as width };
+    let width_12: number;
+    export { width_12 as width };
     let align_7: string;
     export { align_7 as align };
 }
@@ -800,8 +784,8 @@ export namespace TARGET_KIND {
     export { labelKey_41 as labelKey };
     let value_40: string;
     export { value_40 as value };
-    let width_12: number;
-    export { width_12 as width };
+    let width_13: number;
+    export { width_13 as width };
 }
 export namespace TARGET {
     let name_42: string;
@@ -930,8 +914,8 @@ export namespace SIMPLE_TYPE {
     export { value_50 as value };
     let sort_44: string[];
     export { sort_44 as sort };
-    let width_13: number;
-    export { width_13 as width };
+    let width_14: number;
+    export { width_14 as width };
 }
 export namespace IMAGE_SIZE {
     let name_52: string;
@@ -956,8 +940,8 @@ export namespace TYPE {
     export { getValue_11 as getValue };
     let sort_46: string[];
     export { sort_46 as sort };
-    let width_14: number;
-    export { width_14 as width };
+    let width_15: number;
+    export { width_15 as width };
 }
 export namespace SUB_TYPE {
     let name_54: string;
@@ -968,8 +952,8 @@ export namespace SUB_TYPE {
     export { value_53 as value };
     let sort_47: string[];
     export { sort_47 as sort };
-    let width_15: number;
-    export { width_15 as width };
+    let width_16: number;
+    export { width_16 as width };
 }
 export namespace EVENT_TYPE {
     let name_55: string;
@@ -990,8 +974,8 @@ export namespace STATUS {
     export { value_55 as value };
     let sort_49: string[];
     export { sort_49 as sort };
-    let width_16: number;
-    export { width_16 as width };
+    let width_17: number;
+    export { width_17 as width };
 }
 export namespace LAST_SEEN_TIME {
     let name_57: string;
@@ -1018,8 +1002,8 @@ export namespace LAST_HEARTBEAT_TIME {
     export { sort_51 as sort };
     let formatter_29: string;
     export { formatter_29 as formatter };
-    let width_17: number;
-    export { width_17 as width };
+    let width_18: number;
+    export { width_18 as width };
 }
 export namespace REASON {
     let name_59: string;
@@ -1188,8 +1172,8 @@ export namespace INGRESS_DEFAULT_BACKEND {
     export { sort_66 as sort };
     let formatter_35: string;
     export { formatter_35 as formatter };
-    let width_18: number;
-    export { width_18 as width };
+    let width_19: number;
+    export { width_19 as width };
     let align_10: string;
     export { align_10 as align };
 }
@@ -1272,8 +1256,8 @@ export namespace RESOURCES {
     export { value_79 as value };
     let sort_73: string;
     export { sort_73 as sort };
-    let width_19: number;
-    export { width_19 as width };
+    let width_20: number;
+    export { width_20 as width };
 }
 export namespace URL {
     let name_81: string;
@@ -1342,8 +1326,8 @@ export namespace WORKLOAD_HEALTH_SCALE {
     export { formatter_42 as formatter };
     export function getValue_13(): any;
     export { getValue_13 as getValue };
-    let width_20: number;
-    export { width_20 as width };
+    let width_21: number;
+    export { width_21 as width };
     export let skipSelect: boolean;
     let delayLoading_1: boolean;
     export { delayLoading_1 as delayLoading };
@@ -1367,8 +1351,8 @@ export namespace FLEET_SUMMARY {
     export { formatter_43 as formatter };
     let align_11: string;
     export { align_11 as align };
-    let width_21: number;
-    export { width_21 as width };
+    let width_22: number;
+    export { width_22 as width };
 }
 export namespace FLEET_REPO_CLUSTER_SUMMARY {
     let name_87: string;
@@ -1385,8 +1369,8 @@ export namespace FLEET_REPO_CLUSTER_SUMMARY {
     export { formatter_44 as formatter };
     let align_12: string;
     export { align_12 as align };
-    let width_22: number;
-    export { width_22 as width };
+    let width_23: number;
+    export { width_23 as width };
 }
 export namespace FLEET_REPO_PER_CLUSTER_STATE {
     let name_88: string;
@@ -1397,8 +1381,8 @@ export namespace FLEET_REPO_PER_CLUSTER_STATE {
     export { tooltip_1 as tooltip };
     let sort_79: string[];
     export { sort_79 as sort };
-    let width_23: number;
-    export { width_23 as width };
+    let width_24: number;
+    export { width_24 as width };
     let _default_2: string;
     export { _default_2 as default };
     let formatter_45: string;
@@ -1423,8 +1407,8 @@ export namespace APP_SUMMARY {
     export { formatter_46 as formatter };
     let align_13: string;
     export { align_13 as align };
-    let width_24: number;
-    export { width_24 as width };
+    let width_25: number;
+    export { width_25 as width };
 }
 export namespace CONSTRAINT_VIOLATION_CONSTRAINT_LINK {
     let name_90: string;
@@ -1581,8 +1565,8 @@ export namespace GROUP_NAME {
     export { search_12 as search };
     let formatter_53: string;
     export { formatter_53 as formatter };
-    let width_25: number;
-    export { width_25 as width };
+    let width_26: number;
+    export { width_26 as width };
 }
 export namespace GROUP_ROLE_NAME {
     let name_100: string;
@@ -1649,8 +1633,8 @@ export namespace ACCESS_KEY {
     export { align_14 as align };
     let sort_95: string[];
     export { sort_95 as sort };
-    let width_26: number;
-    export { width_26 as width };
+    let width_27: number;
+    export { width_27 as width };
 }
 export namespace SCOPE {
     let name_106: string;
@@ -1665,8 +1649,8 @@ export namespace SCOPE {
     export { align_15 as align };
     let sort_96: string[];
     export { sort_96 as sort };
-    let width_27: number;
-    export { width_27 as width };
+    let width_28: number;
+    export { width_28 as width };
 }
 export namespace SCOPE_NORMAN {
     let value_105: string;
@@ -1685,8 +1669,8 @@ export namespace EXPIRES {
     export { align_16 as align };
     let sort_98: string[];
     export { sort_98 as sort };
-    let width_28: number;
-    export { width_28 as width };
+    let width_29: number;
+    export { width_29 as width };
     let formatter_56: string;
     export { formatter_56 as formatter };
 }
@@ -1701,8 +1685,8 @@ export namespace LAST_USED {
     export { align_17 as align };
     let sort_99: string[];
     export { sort_99 as sort };
-    let width_29: number;
-    export { width_29 as width };
+    let width_30: number;
+    export { width_30 as width };
     let formatter_57: string;
     export { formatter_57 as formatter };
     export namespace formatterOpts_14 {
@@ -1721,8 +1705,8 @@ export namespace RESTART {
     export { sort_100 as sort };
     let formatter_58: string;
     export { formatter_58 as formatter };
-    let width_30: number;
-    export { width_30 as width };
+    let width_31: number;
+    export { width_31 as width };
     let align_18: string;
     export { align_18 as align };
 }
@@ -1761,8 +1745,8 @@ export namespace STATE_NORMAN {
     export { sort_102 as sort };
     let value_111: string;
     export { value_111 as value };
-    let width_31: number;
-    export { width_31 as width };
+    let width_32: number;
+    export { width_32 as width };
     let _default_3: string;
     export { _default_3 as default };
     let formatter_60: string;
@@ -1834,8 +1818,8 @@ export namespace FLEET_BUNDLE_TYPE {
     export { value_116 as value };
     let sort_107: string[];
     export { sort_107 as sort };
-    let width_32: number;
-    export { width_32 as width };
+    let width_33: number;
+    export { width_33 as width };
 }
 export namespace FLEET_REPO_CLUSTERS_READY {
     let name_118: string;
@@ -2475,7 +2459,7 @@ export default class Namespace {
     get isObscure(): any;
     get projectId(): any;
     get project(): any;
-    get groupByLabel(): any;
+    get groupById(): any;
     get projectNameSort(): any;
     get istioInstalled(): boolean;
     get injectionEnabled(): boolean;
@@ -2880,37 +2864,24 @@ export default class Resource {
         divider: boolean;
         action?: undefined;
         label?: undefined;
-        icon?: undefined;
         enabled?: undefined;
+        altAction?: undefined;
         bulkable?: undefined;
         bulkAction?: undefined;
         weight?: undefined;
-        altAction?: undefined;
     } | {
         action: string;
         label: any;
-        icon: string;
         enabled: any;
         divider?: undefined;
+        altAction?: undefined;
         bulkable?: undefined;
         bulkAction?: undefined;
         weight?: undefined;
-        altAction?: undefined;
-    } | {
-        action: string;
-        label: any;
-        icon: string;
-        bulkable: boolean;
-        bulkAction: string;
-        enabled: boolean;
-        weight: number;
-        divider?: undefined;
-        altAction?: undefined;
     } | {
         action: string;
         altAction: string;
         label: any;
-        icon: string;
         bulkable: boolean;
         enabled: any;
         bulkAction: string;
@@ -2921,37 +2892,24 @@ export default class Resource {
         divider: boolean;
         action?: undefined;
         label?: undefined;
-        icon?: undefined;
         enabled?: undefined;
+        altAction?: undefined;
         bulkable?: undefined;
         bulkAction?: undefined;
         weight?: undefined;
-        altAction?: undefined;
     } | {
         action: string;
         label: any;
-        icon: string;
         enabled: any;
         divider?: undefined;
+        altAction?: undefined;
         bulkable?: undefined;
         bulkAction?: undefined;
         weight?: undefined;
-        altAction?: undefined;
-    } | {
-        action: string;
-        label: any;
-        icon: string;
-        bulkable: boolean;
-        bulkAction: string;
-        enabled: boolean;
-        weight: number;
-        divider?: undefined;
-        altAction?: undefined;
     } | {
         action: string;
         altAction: string;
         label: any;
-        icon: string;
         bulkable: boolean;
         enabled: any;
         bulkAction: string;
@@ -3446,13 +3404,6 @@ export function getIndividualBanners(store: any): {};
  * Overlay settings from the individual banner settings onto the single banner setting
  */
 export function overlayIndividualBanners(parsedBanner: any, banners: any): void;
-/**
- * Get banner font sizes - used to add margins when header and footer banners are present
- **/
-export function getGlobalBannerFontSizes(store: any): {
-    headerFont: string;
-    footerFont: string;
-};
 }
 
 // @shell/utils/clipboard
@@ -3505,6 +3456,13 @@ export function abbreviateClusterName(input: string): string;
 export function labelForAddon(store: any, name: any, configuration?: boolean): any;
 export function filterOutDeprecatedPatchVersions(allVersions: any, currentVersion: any): any;
 export function getAllOptionsAfterCurrentVersion(store: any, versions: any, currentVersion: any, defaultVersion: any): any;
+export function initSchedulingCustomization(value: any, features: any, store: any, mode: any): Promise<{
+    clusterAgentDefaultPC: any;
+    clusterAgentDefaultPDB: any;
+    schedulingCustomizationFeatureEnabled: any;
+    schedulingCustomizationOriginallyEnabled: boolean;
+    errors: any[];
+}>;
 }
 
 // @shell/utils/color
@@ -3839,7 +3797,8 @@ export const EMBER_FRAME: "ember-iframe";
 
 declare module '@shell/utils/error' {
 export function stringify(err: any): any;
-export function exceptionToErrorsArray(err: any): any;
+export function exceptionToErrorsArray(err: any): any[];
+export function translateError(error: any): any;
 export class ClusterNotFoundError extends Error {
     static NAME: string;
     constructor(message: any);
@@ -3987,7 +3946,8 @@ export function dropKeys(obj: any, keys: any): void;
  */
 export function deepToRaw(obj: any, cache?: any): any;
 /**
- * Helper function to alter Lodash merge function default behaviour on merging arrays while updating machine pool configuration.
+ * Helper function to alter Lodash merge function default behaviour on merging
+ * arrays and objects.
  *
  * In rke2.vue, the syncMachineConfigWithLatest function updates machine pool configuration by
  * merging the latest configuration received from the backend with the current configuration updated by the user.
@@ -3999,13 +3959,39 @@ export function deepToRaw(obj: any, cache?: any): any;
  * merge(lastSavedConfigFromBE, currentConfigByUser); // returns { a: ["test"] }; but we expect { a: [] };
  *
  * More info: https://github.com/lodash/lodash/issues/1313
- *
+
  * This helper function addresses the issue by always replacing the old array with the new array during the merge process.
  *
- * This helper is used for another case in rke2.vue to handle merging addon chart default values with the user's current values.
+ * This helper is also used for another case in rke2.vue to handle merging addon chart default values with the user's current values.
  * It fixed https://github.com/rancher/dashboard/issues/12418
+ *
+ * If `mutateOriginal` is true, the merge is done directly into `obj1` (mutating it).
+ * This is useful in cases like:
+ *   machinePool.config = mergeWithReplace(clonedLatestConfig, clonedCurrentConfig, { mutateOriginal: true })
+ * where merging into a new empty object may lead to incomplete structure.
+ *
+ * Use `mutateOriginal` when you want to preserve obj1’s original shape, references,
+ * or when assigning the result directly to an existing object.
+ *
+ * @param {Object} [obj1={}] - The first object to merge
+ * @param {Object} [obj2={}] - The second object to merge
+ * @param {Object} [options={}] - Options for customizing merge behavior
+ * @param {boolean} [options.mutateOriginal=false] - true: mutates obj1
+ *                  directly. false: returns a new object
+ * @param {boolean} [options.replaceArray=true] - true: replaces arrays in obj1
+ *                  with arrays in obj2 when both properties are arrays
+ *                  false: default lodash merge behavior - recursively merges
+ *                  array members
+ * @param {boolean} [options.replaceObjectProps=false] - true: merges objects in
+ *                  obj1 with objects in obj2, overwriting duplicate props
+ *                  false: default lodash merge behavior - recursively merges
+ *                  object props
  */
-export function mergeWithReplaceArrays(obj1?: {}, obj2?: {}): any;
+export function mergeWithReplace(obj1?: any, obj2?: any, { mutateOriginal, replaceArray, replaceObjectProps, }?: {
+    mutateOriginal?: boolean;
+    replaceArray?: boolean;
+    replaceObjectProps?: boolean;
+}): any;
 export { isEqualBasic as isEqual };
 export function toDictionary(array: any, callback: any): any;
 /**
@@ -4175,6 +4161,10 @@ export function setPromiseResult(promise: any, obj: any, key: any, label: any):
 // @shell/utils/router
 
 declare module '@shell/utils/router' {
+export function harvesterhci2cloud(str: any): any;
+export function cloud2harvesterhci(str: any): any;
+export function harvester2cloud(str: any): any;
+export function cloud2harvester(str: any): any;
 export function queryParamsFor(current: any, qp: any, defaults?: {}): any;
 export function getClusterFromRoute(to: any): any;
 export function getProductFromRoute(to: any): any;
@@ -4190,7 +4180,7 @@ export function routeRequiresInstallRedirect(to: any): boolean;
 
 declare module '@shell/utils/select' {
 export function onClickOption(option: any, e: any): void;
-export function calculatePosition(dropdownList: any, component: any, width: any, placement: any): void;
+export function calculatePosition(dropdownList: any, component: any, width: any, placement: any, type: any, isLabel: any, leftWidth: any): void;
 }
 
 // @shell/utils/selector
@@ -4371,7 +4361,7 @@ export function random32(count: any): number | number[];
 export function randomStr(length?: number, chars?: string): any;
 export function formatPercent(value: any, maxPrecision?: number): string;
 export function pluralize(str: any): any;
-export function resourceNames(names: any, t: any, options?: {}): any;
+export function resourceNames(names: any, plusMore: any, t: any, endString: any): any;
 export function indent(lines: any, count?: number, token?: string, afterRegex?: any): any;
 export function decamelize(str: any): any;
 export function dasherize(str: any): any;
@@ -4379,7 +4369,7 @@ export function asciiLike(str: any): boolean;
 export function coerceStringTypeToScalarType(val: any, type: any): any;
 export function matchesSomeRegex(stringRaw: any, regexes?: any[]): boolean;
 export function ensureRegex(strOrRegex: any, exact?: boolean): any;
-export function nlToBr(value: any): string;
+export function nlToBr(value: any): any;
 export function splitObjectPath(path: any): any;
 export function joinObjectPath(ary: any): string;
 export function shortenedImage(image: any): any;

package/types/vue-shim.d.ts

@@ -1,4 +1,6 @@
 /* eslint-disable */
+import type ShellApi from '@shell/plugins/internal-api/shell/shell.api';
+
 export {};
 
 declare module 'vue' {
@@ -15,6 +17,7 @@ declare module 'vue' {
       getters: Record<string, any>,
       dispatch: (action: string, payload?: any) => Promise<any>,
       commit: (mutation: string, payload?: any) => void,
-    }
+    },
+    $shell: ShellApi,
   }
 }

package/utils/__tests__/object.test.ts

@@ -1,6 +1,6 @@
 import { reactive, isReactive } from 'vue';
 import {
-  clone, get, getter, isEmpty, toDictionary, remove, diff, definedKeys, deepToRaw, mergeWithReplaceArrays
+  clone, get, getter, isEmpty, toDictionary, remove, diff, definedKeys, deepToRaw, mergeWithReplace
 } from '@shell/utils/object';
 
 describe('fx: get', () => {
@@ -379,7 +379,7 @@ describe('fx: deepToRaw', () => {
   });
 });
 
-describe('fx: mergeWithReplaceArrays', () => {
+describe('fx: mergeWithReplace', () => {
   const testCases: Array<[object?, object?, object?]> = [
     // Some array test cases, an array from the first object should be replaced with the array from the second object
     [{ a: ['one'] }, { a: [] }, { a: [] }],
@@ -401,8 +401,42 @@ describe('fx: mergeWithReplaceArrays', () => {
     [undefined, {}, {}],
   ];
 
-  it.each(testCases)('should merge properly', (obj1, obj2, expected) => {
-    const result = mergeWithReplaceArrays(obj1, obj2);
+  it.each(testCases)('should merge arrays properly', (obj1, obj2, expected) => {
+    const result = mergeWithReplace(obj1, obj2);
+
+    expect(result).toStrictEqual(expected);
+  });
+
+  it.each([
+    [
+      { a: { b: false, c: false } }, { a: { b: true, c: null } }, { a: { b: true, c: null } }
+    ],
+    [
+      {
+        a: [{
+          b: 'test', c: 'test', value: true
+        }]
+      }, {
+        a: [{
+          b: 'test', c: 'test', operator: 'exists'
+        }]
+      }, {
+        a: [{
+          b: 'test', c: 'test', operator: 'exists'
+        }]
+      }
+    ],
+    [
+      {
+        a: { enabled: false }, b: { enabled: false }, c: { enabled: false }
+      },
+      { c: { enabled: true, stripUnderscores: true } },
+      {
+        a: { enabled: false }, b: { enabled: false }, c: { enabled: true, stripUnderscores: true }
+      }
+    ]
+  ])('should overwrite duplicate object properties when merging objects', (left, right, expected) => {
+    const result = mergeWithReplace(left, right, { replaceObjectProps: true });
 
     expect(result).toStrictEqual(expected);
   });

package/utils/__tests__/string.test.ts

@@ -81,9 +81,9 @@ describe('fx: resourceNames', () => {
     it.each(args)(`having: %p`, (
       names,
       expectation,
-      options,
+      options: any,
     ) => {
-      const result = resourceNames(names, t, options);
+      const result = resourceNames(names, options.plusMore, t, options.endString);
 
       expect(result).toStrictEqual(expectation);
     });

package/utils/auth.js

@@ -242,6 +242,7 @@ export function setProduct(store, to) {
  */
 export function validateResource(store, to) {
   const product = store.getters['currentProduct'];
+  
   const resource = getResourceFromRoute(to);
 
   // In order to check a resource is valid we need these