@rancher/shell 3.0.1-rc.1 → 3.0.1-rc.3

package/assets/styles/app.scss

@@ -32,4 +32,3 @@
 
 @import "./vendor/vue-select";
 @import "./vendor/code-mirror";
-@import 'node_modules/xterm/css/xterm.css';

package/assets/translations/en-us.yaml

@@ -1065,7 +1065,7 @@ catalog:
     target:
       git: Git repository containing Helm chart or cluster template definitions
       http: http(s) URL to an index generated by Helm
-      oci: OCI Repository <span class="oci-experimental-badge text-bold ml-5">Experimental</span>
+      oci: OCI Repository
       label: Target
     url:
       label: Index URL
@@ -1475,6 +1475,7 @@ cluster:
     placeholder: A unique name for the cluster
   directoryConfig:
     title: Data directory configuration
+    banner: Data directory configuration can not be changed once the cluster has been created
     radioInput:
       defaultLabel: Use default data directory configuration
       commonLabel: Use a common base directory for data directory configuration (sub-directories will be used for the system-agent, provisioning and distro paths)
@@ -4877,10 +4878,6 @@ rbac:
       admin:
         label: Administrator
         description: Administrators have full control over the entire installation and all resources in all clusters.
-      restricted-admin:
-        label: Restricted Administrator
-        description: Restricted Admins have full control over all resources in all downstream clusters but no access to the local cluster.
-        deprecation: 'Warning: The Restricted Administrator role has been deprecated as of Rancher 2.8.0 and will be removed in a future release - Check out the <a href="{releaseNotesUrl}" target="_blank" rel="noopener noreferrer nofollow">Release Notes</a>'
       user:
         label: Standard User
         description: Standard Users can create new clusters and manage clusters and projects they have been granted access to.

package/assets/translations/zh-hans.yaml

@@ -4556,9 +4556,6 @@ rbac:
       admin:
         label: 管理员
         description: 管理员可以完全控制整个安装以及所有集群中的所有资源。
-      restricted-admin:
-        label: 受限管理员
-        description: 受限管理员可以完全控制所有下游集群的所有资源，但不能访问本地集群。
       user:
         label: 普通用户
         description: 普通用户可以创建集群，并管理其授权访问的集群和项目。

package/components/GlobalRoleBindings.vue

@@ -108,7 +108,6 @@ export default {
       // This not only identifies global roles but the order here is the order we want to display them in the UI
       globalPermissions: [
         'admin',
-        'restricted-admin',
         'user',
         'user-base',
       ],
@@ -121,7 +120,6 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['releaseNotesUrl']),
     ...mapGetters({ t: 'i18n/t' }),
 
     isCreate() {
@@ -375,11 +373,6 @@ export default {
                     </div>
                   </template>
                 </Checkbox>
-                <p
-                  v-if="role.id === 'restricted-admin'"
-                  v-clean-html="t('rbac.globalRoles.role.restricted-admin.deprecation', { releaseNotesUrl }, true)"
-                  class="deprecation-notice"
-                />
               </div>
             </div>
           </template>

package/components/SideNav.vue

@@ -111,8 +111,10 @@ export default {
 
   computed: {
     ...mapState(['managementReady', 'clusterReady']),
-    ...mapGetters(['productId', 'clusterId', 'currentProduct', 'rootProduct', 'isSingleProduct', 'namespaceMode', 'isExplorer', 'isVirtualCluster']),
-    ...mapGetters({ locale: 'i18n/selectedLocaleLabel', availableLocales: 'i18n/availableLocales' }),
+    ...mapGetters(['isStandaloneHarvester', 'productId', 'clusterId', 'currentProduct', 'rootProduct', 'isSingleProduct', 'namespaceMode', 'isExplorer', 'isVirtualCluster']),
+    ...mapGetters({
+      locale: 'i18n/selectedLocaleLabel', availableLocales: 'i18n/availableLocales', hasMultipleLocales: 'i18n/hasMultipleLocales'
+    }),
     ...mapGetters('type-map', ['activeProducts']),
 
     favoriteTypes: mapPref(FAVORITE_TYPES),
@@ -437,7 +439,7 @@ export default {
       </span>
 
       <!-- locale selector -->
-      <span v-if="isSingleProduct">
+      <span v-if="isSingleProduct && hasMultipleLocales && !isStandaloneHarvester">
         <v-dropdown
           popperClass="localeSelector"
           placement="top"

package/components/SortableTable/THead.vue

@@ -429,7 +429,7 @@ export default {
       color: var(--body-text);
 
       .table-header-container {
-        display: flex;
+        display: inline-flex;
 
         .content {
           display: flex;

package/components/auth/RoleDetailEdit.vue

@@ -1,5 +1,4 @@
 <script>
-import { mapGetters } from 'vuex';
 import { MANAGEMENT, RBAC } from '@shell/config/types';
 import CruResource from '@shell/components/CruResource';
 import CreateEditView from '@shell/mixins/create-edit-view';
@@ -15,7 +14,6 @@ import { ucFirst } from '@shell/utils/string';
 import SortableTable from '@shell/components/SortableTable';
 import { _CLONE, _DETAIL } from '@shell/config/query-params';
 import { SCOPED_RESOURCES, SCOPED_RESOURCE_GROUPS } from '@shell/config/roles';
-import { Banner } from '@components/Banner';
 import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
 
 import { SUBTYPE_MAPPING, VERBS } from '@shell/models/management.cattle.io.roletemplate';
@@ -66,7 +64,6 @@ export default {
     SortableTable,
     Loading,
     Error,
-    Banner,
     LabeledInput
   },
 
@@ -163,12 +160,6 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['releaseNotesUrl']),
-
-    showRestrictedAdminDeprecationBanner() {
-      return this.value.subtype === GLOBAL && this.value.id === 'restricted-admin';
-    },
-
     label() {
       return this.t(`rbac.roletemplate.subtypes.${ this.value.subtype }.label`);
     },
@@ -559,13 +550,6 @@ export default {
     @finish="save"
     @cancel="cancel"
   >
-    <Banner
-      v-if="showRestrictedAdminDeprecationBanner"
-      color="warning"
-      class="mb-20"
-    >
-      <span v-clean-html="t('rbac.globalRoles.role.restricted-admin.deprecation', { releaseNotesUrl }, true)" />
-    </Banner>
     <template v-if="isDetail">
       <SortableTable
         key-field="index"

package/components/nav/TopLevelMenu.vue

@@ -920,7 +920,7 @@ export default {
     // needs !important so that we can
     // offset the tooltip a bit so it doesn't
     // overlap the pin icon and cause bad UX
-    left: 35px !important;
+    left: 48px !important;
   }
 
   .localeSelector, .footer-tooltip {
@@ -1069,7 +1069,7 @@ export default {
           line-height: normal;
 
           & > p {
-            width: 195px;
+            width: 182px;
             white-space: nowrap;
             overflow: hidden;
             text-overflow: ellipsis;
@@ -1117,9 +1117,11 @@ export default {
 
         > i, > img {
           display: block;
-          width: 42px;
           font-size: $icon-size;
           margin-right: 14px;
+          &.group-icon {
+            width: 42px;
+          }
         }
 
         .rancher-provider-icon,

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/constraints.gatekeeper.sh.constraint/index.vue

@@ -1,7 +1,7 @@
 <script>
 import merge from 'lodash/merge';
 import { ucFirst } from '@shell/utils/string';
-import { isSimpleKeyValue } from '@shell/utils/object';
+import { isSimpleKeyValue, set } from '@shell/utils/object';
 import { _CREATE, _VIEW } from '@shell/config/query-params';
 import { SCHEMA, NAMESPACE } from '@shell/config/types';
 import CreateEditView from '@shell/mixins/create-edit-view';
@@ -222,6 +222,9 @@ export default {
         this.value.spec.match.namespaces = [];
         this.value.spec.match.excludedNamespaces = [];
       }
+    },
+    setParameters(e) {
+      return set(this.value.spec, 'parameters', e);
     }
   }
 };
@@ -356,7 +359,7 @@ export default {
             v-model:value="parametersYaml"
             class="yaml-editor"
             :editor-mode="editorMode"
-            @newObject="$set(value.spec, 'parameters', $event)"
+            @newObject="setParameters"
           />
         </Tab>
       </Tabbed>

package/edit/provisioning.cattle.io.cluster/__tests__/DirectoryConfig.test.ts

@@ -113,7 +113,7 @@ describe('component: DirectoryConfig', () => {
     expect(wrapper.vm.value.k8sDistro).toStrictEqual(k8sDistroValue);
   });
 
-  it('should render the component with configuration being an empty object, without errors and radio be of value DATA_DIR_RADIO_OPTIONS.DEFAULT (edit scenario)', () => {
+  it('should render the component with configuration being an empty object, without errors and radio be of value DATA_DIR_RADIO_OPTIONS.CUSTOM (edit scenario)', () => {
     const newMountOptions = clone(mountOptions);
 
     newMountOptions.propsData.value = {};
@@ -131,17 +131,21 @@ describe('component: DirectoryConfig', () => {
     const k8sDistroInput = wrapper.find('[data-testid="rke2-directory-config-k8sDistro-data-dir"]');
 
     expect(title.exists()).toBe(true);
-    expect(radioInput.exists()).toBe(true);
+    expect(radioInput.isVisible()).toBe(false);
 
-    expect(wrapper.vm.dataConfigRadioValue).toBe(DATA_DIR_RADIO_OPTIONS.DEFAULT);
+    expect(wrapper.vm.dataConfigRadioValue).toBe(DATA_DIR_RADIO_OPTIONS.CUSTOM);
 
     // since we have all of the vars empty, then the inputs should not be there
-    expect(systemAgentInput.exists()).toBe(false);
-    expect(provisioningInput.exists()).toBe(false);
-    expect(k8sDistroInput.exists()).toBe(false);
+    expect(systemAgentInput.exists()).toBe(true);
+    expect(provisioningInput.exists()).toBe(true);
+    expect(k8sDistroInput.exists()).toBe(true);
+
+    expect(systemAgentInput.attributes().disabled).toBeDefined();
+    expect(provisioningInput.attributes().disabled).toBeDefined();
+    expect(k8sDistroInput.attributes().disabled).toBeDefined();
   });
 
-  it('radio input should be set to DATA_DIR_RADIO_OPTIONS.CUSTOM with all data dir values existing and different (edit scenario)', async() => {
+  it('radio input should be set to DATA_DIR_RADIO_OPTIONS.CUSTOM with all data dir values existing and different (edit scenario)', () => {
     const newMountOptions = clone(mountOptions);
     const inputPath = 'some-data-dir';
 
@@ -157,14 +161,20 @@ describe('component: DirectoryConfig', () => {
 
     expect(wrapper.vm.dataConfigRadioValue).toBe(DATA_DIR_RADIO_OPTIONS.CUSTOM);
 
+    const radioInput = wrapper.find('[data-testid="rke2-directory-config-radio-input"]');
     const systemAgentInput = wrapper.find('[data-testid="rke2-directory-config-systemAgent-data-dir"]');
     const provisioningInput = wrapper.find('[data-testid="rke2-directory-config-provisioning-data-dir"]');
     const k8sDistroInput = wrapper.find('[data-testid="rke2-directory-config-k8sDistro-data-dir"]');
 
+    expect(radioInput.isVisible()).toBe(false);
     expect(systemAgentInput.isVisible()).toBe(true);
     expect(provisioningInput.isVisible()).toBe(true);
     expect(k8sDistroInput.isVisible()).toBe(true);
 
+    expect(systemAgentInput.attributes().disabled).toBeDefined();
+    expect(provisioningInput.attributes().disabled).toBeDefined();
+    expect(k8sDistroInput.attributes().disabled).toBeDefined();
+
     expect(wrapper.vm.value.systemAgent).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.AGENT }`);
     expect(wrapper.vm.value.provisioning).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.PROVISIONING }`);
     expect(wrapper.vm.value.k8sDistro).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.K8S_DISTRO_K3S }`);

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/provisioning.cattle.io.cluster/tabs/DirectoryConfig.vue

@@ -1,8 +1,9 @@
 
 <script>
 import { LabeledInput } from '@components/Form/LabeledInput';
-import { _CREATE } from '@shell/config/query-params';
+import { _CREATE, _EDIT } from '@shell/config/query-params';
 import RadioGroup from '@components/Form/Radio/RadioGroup.vue';
+import { Banner } from '@components/Banner';
 
 export const DATA_DIR_RADIO_OPTIONS = {
   DEFAULT: 'defaultDataDir',
@@ -23,7 +24,8 @@ export default {
   name:       'DirectoryConfig',
   components: {
     LabeledInput,
-    RadioGroup
+    RadioGroup,
+    Banner
   },
   props: {
     mode: {
@@ -50,9 +52,7 @@ export default {
     }
 
     if (this.mode !== _CREATE) {
-      if (this.value?.systemAgent?.length || this.value?.provisioning?.length || this.value?.k8sDistro?.length) {
-        dataConfigRadioValue = DATA_DIR_RADIO_OPTIONS.CUSTOM;
-      }
+      dataConfigRadioValue = DATA_DIR_RADIO_OPTIONS.CUSTOM;
     }
 
     return {
@@ -85,6 +85,9 @@ export default {
     }
   },
   computed: {
+    isDisabled() {
+      return this.mode === _EDIT;
+    },
     dataConfigRadioOptions() {
       const defaultDataDirOption = {
         value: DATA_DIR_RADIO_OPTIONS.DEFAULT,
@@ -148,10 +151,17 @@ export default {
 <template>
   <div class="row">
     <div class="col span-8">
-      <h3 class="mb-20">
+      <h3>
         {{ t('cluster.directoryConfig.title') }}
       </h3>
+      <Banner
+        class="mb-20"
+        :closable="false"
+        color="info"
+        label-key="cluster.directoryConfig.banner"
+      />
       <RadioGroup
+        v-show="!isDisabled"
         :value="dataConfigRadioValue"
         class="mb-10"
         :mode="mode"
@@ -167,6 +177,7 @@ export default {
         :mode="mode"
         :label="t('cluster.directoryConfig.common.label')"
         :tooltip="t('cluster.directoryConfig.common.tooltip')"
+        :disabled="isDisabled"
         data-testid="rke2-directory-config-common-data-dir"
       />
       <div v-if="dataConfigRadioValue === DATA_DIR_RADIO_OPTIONS.CUSTOM">
@@ -176,6 +187,7 @@ export default {
           :mode="mode"
           :label="t('cluster.directoryConfig.systemAgent.label')"
           :tooltip="t('cluster.directoryConfig.systemAgent.tooltip')"
+          :disabled="isDisabled"
           data-testid="rke2-directory-config-systemAgent-data-dir"
         />
         <LabeledInput
@@ -184,6 +196,7 @@ export default {
           :mode="mode"
           :label="t('cluster.directoryConfig.provisioning.label')"
           :tooltip="t('cluster.directoryConfig.provisioning.tooltip')"
+          :disabled="isDisabled"
           data-testid="rke2-directory-config-provisioning-data-dir"
         />
         <LabeledInput
@@ -192,6 +205,7 @@ export default {
           :mode="mode"
           :label="t('cluster.directoryConfig.k8sDistro.label')"
           :tooltip="t('cluster.directoryConfig.k8sDistro.tooltip')"
+          :disabled="isDisabled"
           data-testid="rke2-directory-config-k8sDistro-data-dir"
         />
       </div>

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/fleet.cattle.io.gitrepo.js

@@ -338,6 +338,11 @@ export default class GitRepo extends SteveModel {
     for (const bd of bundleDeployments) {
       const clusterId = FleetUtils.clusterIdFromBundleDeploymentLabels(bd.metadata?.labels);
       const c = clusters[clusterId];
+
+      if (!c) {
+        continue;
+      }
+
       const resources = FleetUtils.resourcesFromBundleDeploymentStatus(bd.status);
 
       resources.forEach((r) => {

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/provisioning.cattle.io.cluster.js

@@ -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.1",
+  "version": "3.0.1-rc.3",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -36,7 +36,6 @@
     "@babel/plugin-proposal-private-property-in-object": "7.14.5",
     "@babel/preset-typescript": "7.16.7",
     "@novnc/novnc": "1.2.0",
-    "@nuxtjs/axios": "5.13.6",
     "@popperjs/core": "2.4.4",
     "@rancher/icons": "2.0.29",
     "@types/is-url": "1.2.30",
@@ -51,6 +50,8 @@
     "@vue/vue3-jest": "^27.0.0-alpha.1",
     "add": "2.0.6",
     "ansi_up": "5.0.0",
+    "axios": "0.21.4",
+    "axios-retry": "3.1.9",
     "babel-eslint": "10.1.0",
     "babel-plugin-module-resolver": "4.0.0",
     "babel-preset-vue": "2.0.2",
@@ -73,6 +74,7 @@
     "d3-selection": "1.4.1",
     "dagre-d3": "0.6.4",
     "dayjs": "1.8.29",
+    "defu": "5.0.1",
     "diff2html": "3.4.24",
     "dompurify": "2.5.4",
     "element-matches": "^0.1.2",
@@ -160,7 +162,7 @@
     "semver": "7.5.4",
     "@types/lodash": "4.17.5",
     "@types/node": "~20.10.0",
-    "@vue/cli-service/html-webpack-plugin": "^5.0.0"  
+    "@vue/cli-service/html-webpack-plugin": "^5.0.0"
   },
   "nyc": {
     "extension": [
@@ -168,4 +170,4 @@
       ".vue"
     ]
   }
-}
+}

package/pages/auth/login.vue

@@ -31,6 +31,7 @@ import {
 import loadPlugins from '@shell/plugins/plugin';
 import Loading from '@shell/components/Loading';
 import { getGlobalBannerFontSizes } from '@shell/utils/banners';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 
 export default {
   name:       'Login',
@@ -64,7 +65,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['isStandaloneHarvester']),
+    ...mapGetters(['isSingleProduct']),
     ...mapGetters({ t: 'i18n/t', hasMultipleLocales: 'i18n/hasMultipleLocales' }),
 
     loggedOutSuccessMsg() {
@@ -77,6 +78,10 @@ export default {
       return this.t('login.loggedOut');
     },
 
+    isHarvester() {
+      return this.isSingleProduct?.productName === HARVESTER;
+    },
+
     singleProvider() {
       return this.providers.length === 1 ? this.providers[0] : undefined;
     },
@@ -498,7 +503,7 @@ export default {
           </div>
         </template>
         <div
-          v-if="showLocaleSelector && hasMultipleLocales && !isStandaloneHarvester"
+          v-if="showLocaleSelector && hasMultipleLocales && !isHarvester"
           class="locale-selector"
         >
           <LocaleSelector

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/Form/TextArea/TextAreaAutoGrow.vue

@@ -1,6 +1,6 @@
 <script lang="ts">
 import { defineComponent, inject, PropType } from 'vue';
-import debounce from 'lodash/debounce';
+import { debounce } from 'lodash';
 import { _EDIT, _VIEW } from '@shell/config/query-params';
 
 interface NonReactiveProps {

package/scripts/extension/parse-tag-name

@@ -4,27 +4,34 @@ GITHUB_RELEASE_TAG=$1
 GITHUB_RUN_ID=$2
 GITHUB_WORKFLOW_TYPE=$3
 
-# Ensure "catalog" workflow release tag name does not match a pkg/<pkg-name>
+echo "Parse tag name - evaluating release tag $GITHUB_RELEASE_TAG"
+
+# Ensure "catalog" workflow release tag name matches the root <pkg-name>
 if [[ "${GITHUB_WORKFLOW_TYPE}" == "catalog" ]]; then
+  BASE_EXT=$(jq -r .name package.json)
+  EXT_VERSION=$(jq -r .version package.json)
+
+  if [[ "${GITHUB_RELEASE_TAG}" != "${BASE_EXT}-${EXT_VERSION}" ]]; then
+    echo -e "release tag doesn't match catalog tag: release tag -> ${GITHUB_RELEASE_TAG} ::: curr catalog tag -> ${BASE_EXT}-${EXT_VERSION}"
+    gh run cancel ${GITHUB_RUN_ID}
+  fi
+# Ensure "chart" workflow release tag name matches some pkg/<pkg-name>
+else
+  NO_MATCHES="true"
+
   for d in pkg/*/ ; do
     pkg=$(basename $d)
 
     PKG_VERSION=$(jq -r .version pkg/${pkg}/package.json)
-    PKG_NAME="${pkg}-${PKG_VERSION}"
+    CURR_PKG_TAG="${pkg}-${PKG_VERSION}"
 
-    if [[ "${GITHUB_RELEASE_TAG}" == "${PKG_NAME}" ]]; then
-      gh run cancel ${GITHUB_RUN_ID}
-    else
-      continue
+    if [[ "${GITHUB_RELEASE_TAG}" == "${CURR_PKG_TAG}" ]]; then
+      NO_MATCHES="false"
     fi
   done
-else
-  # Ensure "charts" workflow release tag name does not match the root <pkg-name>
-  BASE_EXT=$(jq -r .name package.json)
-  EXT_VERSION=$(jq -r .version package.json)
 
-  if [[ "${GITHUB_RELEASE_TAG}" == "${BASE_EXT}-${EXT_VERSION}" ]]; then
-    echo -e "tag: ${GITHUB_RELEASE_TAG}"
+  if [[ "${NO_MATCHES}" == "true" ]]; then
+    echo -e "release tag doesn't match any chart tag: ${GITHUB_RELEASE_TAG}. Check your pkg/<!-YOUR-EXT-> folders and corresponding versions to complete the match"
     gh run cancel ${GITHUB_RUN_ID}
   fi
 fi

package/scripts/publish-shell.sh

@@ -6,7 +6,6 @@ SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
 BASE_DIR="$(cd $SCRIPT_DIR && cd ../.. && pwd)"
 SHELL_DIR=$BASE_DIR/shell/
 CREATORS_DIR=$BASE_DIR/creators/extension
-PUBLISH_ARGS="--no-git-tag-version --access public --registry $NPM_REGISTRY $NPM_TAG"
 FORCE_PUBLISH_TO_NPM="false"
 DEFAULT_NPM_REGISTRY="https://registry.npmjs.org"
 
@@ -31,6 +30,8 @@ if [ "$FORCE_PUBLISH_TO_NPM" == "true" ]; then
   export NPM_REGISTRY=$DEFAULT_NPM_REGISTRY
 fi
 
+PUBLISH_ARGS="--no-git-tag-version --access public --registry $NPM_REGISTRY"
+
 pushd ${SHELL_DIR} >/dev/null
 
 function publish() {
@@ -47,9 +48,16 @@ function publish() {
 
   # if the PKG_VERSION has a - it means it will be a pre-release
   if [[ $PKG_VERSION == *"-"* ]]; then
-    PUBLISH_ARGS="--no-git-tag-version --access public --registry $NPM_REGISTRY --tag pre-release"
+    PUBLISH_ARGS="$PUBLISH_ARGS --tag pre-release"
+  fi
+
+  # when testing the workflow, we don't want to actually do an npm publish but only a dry run
+  if [ ${DRY_RUN} == "true" ]; then
+    PUBLISH_ARGS="$PUBLISH_ARGS --dry-run"
   fi
 
+  echo "Publish to NPM - arguments ::: ${PUBLISH_ARGS}"
+
   echo "Publishing ${NAME} from ${FOLDER}"
   pushd ${FOLDER} >/dev/null
 

package/scripts/test-plugins-build.sh

@@ -169,8 +169,9 @@ fi
 
 # function to clone repos and install dependencies (including the newly published shell version)
 function clone_repo_test_extension_build() {
-  REPO_NAME=$1
-  PKG_NAME=$2
+  REPO_ORG=$1
+  REPO_NAME=$2
+  PKG_NAME=$3
 
   echo -e "\nSetting up $REPO_NAME repository locally\n"
 
@@ -183,7 +184,7 @@ function clone_repo_test_extension_build() {
   fi
 
   # cloning repo
-  git clone https://github.com/rancher/$REPO_NAME.git
+  git clone https://github.com/$REPO_ORG/$REPO_NAME.git
   pushd ${BASE_DIR}/$REPO_NAME
 
   echo -e "\nInstalling dependencies for $REPO_NAME\n"
@@ -196,9 +197,6 @@ function clone_repo_test_extension_build() {
   sed -i.bak -e "s/\"\@rancher\/shell\": \"[0-9]*.[0-9]*.[0-9]*\",/\"\@rancher\/shell\": \"${SHELL_VERSION}\",/g" package.json
   rm package.json.bak
 
-  # we need to remove yarn.lock, otherwise it would install a version that we don't want
-  rm yarn.lock
-
   echo -e "\nInstalling newly built shell version\n"
 
   # installing new version of shell
@@ -223,8 +221,9 @@ function clone_repo_test_extension_build() {
 
 # Here we just add the extension that we want to include as a check (all our official extensions should be included here)
 # Don't forget to add the unit tests exception to clone_repo_test_extension_build function if a new extension has those
-# clone_repo_test_extension_build "kubewarden-ui" "kubewarden"
-# clone_repo_test_extension_build "elemental-ui" "elemental"
-# clone_repo_test_extension_build "capi-ui-extension" "capi"
+clone_repo_test_extension_build "rancher" "kubewarden-ui" "kubewarden"
+clone_repo_test_extension_build "rancher" "elemental-ui" "elemental"
+clone_repo_test_extension_build "neuvector" "manager-ext" "neuvector-ui-ext"
+# clone_repo_test_extension_build "rancher" "capi-ui-extension" "capi"
 
 echo "All done"

package/scripts/typegen.sh

@@ -31,9 +31,11 @@ ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/normalize
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/resource-class.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/classify.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/actions.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/steve/steve-class.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/steve/ > /dev/null
 
 # # mixins
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/create-edit-view/index.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins/create-edit-view > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/resource-fetch.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins > /dev/null
 
 # # models
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/models/namespace.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/models/ > /dev/null

package/types/shell/index.d.ts

@@ -2352,6 +2352,67 @@ declare var _default: import("vue").DefineComponent<{
 export default _default;
 }
 
+// @shell/mixins/resource-fetch
+
+declare module '@shell/mixins/resource-fetch' {
+declare namespace _default {
+    const mixins: any[];
+    const inheritAttrs: boolean;
+    function data(): {
+        perfConfig: {};
+        init: boolean;
+        multipleResources: any[];
+        loadResources: any[];
+        hasManualRefresh: boolean;
+        watch: boolean;
+        isTooManyItemsToAutoUpdate: boolean;
+        force: boolean;
+        incremental: boolean;
+        fetchedResourceType: any[];
+        paginating: any;
+    };
+    function data(): {
+        perfConfig: {};
+        init: boolean;
+        multipleResources: any[];
+        loadResources: any[];
+        hasManualRefresh: boolean;
+        watch: boolean;
+        isTooManyItemsToAutoUpdate: boolean;
+        force: boolean;
+        incremental: boolean;
+        fetchedResourceType: any[];
+        paginating: any;
+    };
+    function beforeUnmount(): void;
+    function beforeUnmount(): void;
+    namespace computed {
+        function rows(): any;
+        function rows(): any;
+        function loading(): any;
+        function loading(): any;
+        const refreshFlag: import("vuex").Computed;
+    }
+    namespace watch {
+        function refreshFlag(neu: any): Promise<void>;
+        function refreshFlag(neu: any): Promise<void>;
+    }
+    namespace methods {
+        function $initializeFetchData(type: any, multipleResources: any[], storeType: any): void;
+        function $initializeFetchData(type: any, multipleResources: any[], storeType: any): void;
+        function $fetchType(type: any, multipleResources: any[], storeType: any): any;
+        function $fetchType(type: any, multipleResources: any[], storeType: any): any;
+        function __getCountForResources(resourceNames: any, namespace: any, storeType: any): any;
+        function __getCountForResources(resourceNames: any, namespace: any, storeType: any): any;
+        function __getCountForResource(resourceName: any, namespace: any, storeType: any): any;
+        function __getCountForResource(resourceName: any, namespace: any, storeType: any): any;
+        function __gatherResourceFetchData(resourceName: any, multipleResources: any, currStore: any): void;
+        function __gatherResourceFetchData(resourceName: any, multipleResources: any, currStore: any): void;
+    }
+}
+export default _default;
+}
+
 // @shell/models/namespace
 
 declare module '@shell/models/namespace' {
@@ -3115,6 +3176,40 @@ export default class Resource {
 }
 }
 
+// @shell/plugins/steve/hybrid-class
+
+declare module '@shell/plugins/steve/hybrid-class' {
+export function cleanHybridResources(data: any): any;
+export default class HybridModel {
+    constructor(data: any, ctx: any, rehydrateNamespace?: any, setClone?: boolean);
+    get labels(): any;
+    setLabels(val: any): void;
+    metadata: {};
+    setLabel(key: any, val: any): void;
+    get annotations(): any;
+    setAnnotations(val: any): void;
+    setAnnotation(key: any, val: any): void;
+    get state(): any;
+}
+}
+
+// @shell/plugins/steve/steve-class
+
+declare module '@shell/plugins/steve/steve-class' {
+export default class SteveModel extends HybridModel {
+    get name(): any;
+    get namespace(): any;
+    /**
+     * Set description based on the type of model available with private fallback
+     */
+    set description(arg: any);
+    get description(): any;
+    _description: any;
+    cleanForSave(data: any, forNew: any): any;
+}
+import HybridModel from "./hybrid-class";
+}
+
 // @shell/store/features
 
 declare module '@shell/store/features' {
@@ -3940,6 +4035,26 @@ export function dropKeys(obj: any, keys: any): void;
  * @returns
  */
 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.
+ *
+ * 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.
+ * However, Lodash's merge function treats arrays like object so index values are merged and not appended to arrays
+ * resulting in undesired outcomes for us, Example:
+ *
+ * const lastSavedConfigFromBE = { a: ["test"] };
+ * const currentConfigByUser = { a: [] };
+ * 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.
+ * It fixed https://github.com/rancher/dashboard/issues/12418
+ */
+export function mergeWithReplaceArrays(obj1?: {}, obj2?: {}): any;
 export { isEqualBasic as isEqual };
 export function toDictionary(array: any, callback: any): any;
 /**
@@ -4588,7 +4703,7 @@ declare module '@shell/utils/version' {
 export function parse(str: any): any;
 export function sortable(str: any): any;
 export function compare(in1: any, in2: any): any;
-export function isPrerelease(version: any): boolean;
+export function isPrerelease(version?: string): boolean;
 export function isDevBuild(version: any): boolean;
 export function getVersionInfo(store: any): {
     displayVersion: any;

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
+  clone, get, getter, isEmpty, toDictionary, remove, diff, definedKeys, deepToRaw, mergeWithReplaceArrays
 } from '@shell/utils/object';
 
 describe('fx: get', () => {
@@ -378,3 +378,32 @@ describe('fx: deepToRaw', () => {
     });
   });
 });
+
+describe('fx: mergeWithReplaceArrays', () => {
+  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: [] }],
+    [{ a: ['one', 'two'] }, { a: ['one', 'two', 'three'] }, { a: ['one', 'two', 'three'] }],
+    [{ a: ['one', 'two'], b: ['three', 'four'] }, { a: ['one'], b: [] }, { a: ['one'], b: [] }],
+    [{
+      a: ['one', 'two'], b: ['three', 'four'], c: 'five'
+    }, { a: ['one'], b: [] }, {
+      a: ['one'], b: [], c: 'five'
+    }],
+    // Some other test cases
+    [{ a: 'one' }, { b: 'two' }, { a: 'one', b: 'two' }],
+    [{ a: 'one' }, { a: '', b: 'two' }, { a: '', b: 'two' }],
+    [{ a: 'one', b: 'two' }, { a: 1, c: { d: null } }, {
+      a: 1, b: 'two', c: { d: null }
+    }],
+    [undefined, undefined, {}],
+    [{}, undefined, {}],
+    [undefined, {}, {}],
+  ];
+
+  it.each(testCases)('should merge properly', (obj1, obj2, expected) => {
+    const result = mergeWithReplaceArrays(obj1, obj2);
+
+    expect(result).toStrictEqual(expected);
+  });
+});

package/utils/object.js

@@ -8,6 +8,7 @@ import isObject from 'lodash/isObject';
 import isArray from 'lodash/isArray';
 import isEqual from 'lodash/isEqual';
 import difference from 'lodash/difference';
+import mergeWith from 'lodash/mergeWith';
 import { splitObjectPath, joinObjectPath } from '@shell/utils/string';
 import { addObject } from '@shell/utils/array';
 
@@ -471,3 +472,30 @@ export function deepToRaw(obj, cache = new WeakSet()) {
     return result;
   }
 }
+
+/**
+ * Helper function to alter Lodash merge function default behaviour on merging arrays while updating machine pool configuration.
+ *
+ * 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.
+ * However, Lodash's merge function treats arrays like object so index values are merged and not appended to arrays
+ * resulting in undesired outcomes for us, Example:
+ *
+ * const lastSavedConfigFromBE = { a: ["test"] };
+ * const currentConfigByUser = { a: [] };
+ * 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.
+ * It fixed https://github.com/rancher/dashboard/issues/12418
+ */
+export function mergeWithReplaceArrays(obj1 = {}, obj2 = {}) {
+  return mergeWith(obj1, obj2, (obj1Value, obj2Value) => {
+    if (Array.isArray(obj1Value) && Array.isArray(obj2Value)) {
+      return obj2Value;
+    }
+  });
+}

package/utils/version.js

@@ -66,7 +66,7 @@ function comparePart(in1, in2) {
   return in1.localeCompare(in2);
 }
 
-export function isPrerelease(version) {
+export function isPrerelease(version = '') {
   if (!semver.valid(version)) {
     version = semver.clean(version, { loose: true });
   }

package/vue.config.js

@@ -131,11 +131,11 @@ const instrumentCode = () => {
 };
 
 const getLoaders = (SHELL_ABS) => [
-  // Ensure there is a fallback for browsers that don't support web workers
+  // no fallback for pre-2013 browsers https://caniuse.com/webworkers
   {
     test:    /web-worker.[a-z-]+.js/i,
     loader:  'worker-loader',
-    options: { inline: 'fallback' },
+    options: { inline: 'no-fallback' },
   },
   // Handler for csv files (e.g. ec2 instance data)
   {
@@ -462,7 +462,7 @@ const getWatcherIgnored = (excludes) => {
     /dist-pkg/,
     /scripts\/standalone/,
   ];
-  const pathExcludedPkg = excludes.map((excluded) => new RegExp(`/pkg.${ excluded }`));
+  const pathExcludedPkg = excludes.map((excluded) => new RegExp(`/pkg.${ excluded }/`));
   const pathsCombined = [...paths, ...pathExcludedPkg];
   const regexCombined = new RegExp(pathsCombined.map(({ source }) => source).join('|'));
 
@@ -516,6 +516,7 @@ module.exports = function(dir, _appConfig) {
             @import "~shell/assets/styles/base/_variables.scss";
             @import "~shell/assets/styles/base/_functions.scss";
             @import "~shell/assets/styles/base/_mixins.scss";
+            @import 'node_modules/xterm/css/xterm.css';
           `
         }
       }

package/machine-config/__tests__/vmwarevsphere-pool-config-merge.test.ts

@@ -1,30 +0,0 @@
-import { vspherePoolConfigMerge } from '@shell/machine-config/vmwarevsphere-pool-config-merge';
-
-describe('vspherePoolConfigMerge', () => {
-  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: [] }],
-    [{ a: ['one', 'two'] }, { a: ['one', 'two', 'three'] }, { a: ['one', 'two', 'three'] }],
-    [{ a: ['one', 'two'], b: ['three', 'four'] }, { a: ['one'], b: [] }, { a: ['one'], b: [] }],
-    [{
-      a: ['one', 'two'], b: ['three', 'four'], c: 'five'
-    }, { a: ['one'], b: [] }, {
-      a: ['one'], b: [], c: 'five'
-    }],
-    // Some other test cases
-    [{ a: 'one' }, { b: 'two' }, { a: 'one', b: 'two' }],
-    [{ a: 'one' }, { a: '', b: 'two' }, { a: '', b: 'two' }],
-    [{ a: 'one', b: 'two' }, { a: 1, c: { d: null } }, {
-      a: 1, b: 'two', c: { d: null }
-    }],
-    [undefined, undefined, {}],
-    [{}, undefined, {}],
-    [undefined, {}, {}],
-  ];
-
-  it.each(testCases)('should merge properly', (obj1, obj2, expected) => {
-    const result = vspherePoolConfigMerge(obj1, obj2);
-
-    expect(result).toStrictEqual(expected);
-  });
-});

package/machine-config/vmwarevsphere-pool-config-merge.ts

@@ -1,25 +0,0 @@
-import mergeWith from 'lodash/mergeWith';
-
-/**
- * Helper function to alter Lodash merge function default behaviour on merging arrays while updating machine pool configuration.
- *
- * 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.
- * However, Lodash's merge function treats arrays like object so index values are merged and not appended to arrays
- * resulting in undesired outcomes for us, Example:
- *
- * const lastSavedConfigFromBE = { a: ["test"] };
- * const currentConfigByUser = { a: [] };
- * 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.
- */
-export function vspherePoolConfigMerge(obj1 = {}, obj2 = {}): Object {
-  return mergeWith(obj1, obj2, (obj1Value, obj2Value) => {
-    if (Array.isArray(obj1Value) && Array.isArray(obj2Value)) {
-      return obj2Value;
-    }
-  });
-}