@rancher/shell 0.3.18 → 0.3.20

package/assets/translations/en-us.yaml

@@ -3041,6 +3041,7 @@ login:
     noResponse: "No response received"
   error: An error occurred logging in. Please try again.
   clientError: Invalid username or password. Please try again.
+  specificError: 'An error occured logging in: {msg}'
   useLocal: Use a local user
   loginWithProvider: Log in with {provider}
   username: Username

package/components/PromptModal.vue

@@ -42,6 +42,9 @@ export default {
       const isSticky = !!this.modalData?.modalSticky;
 
       return !isSticky ? '' : 'display: flex; flex-direction: column; ';
+    },
+    closeOnClickOutside() {
+      return this.modalData?.closeOnClickOutside;
     }
   },
 
@@ -85,6 +88,7 @@ export default {
     :styles="`background-color: var(--nav-bg); border-radius: var(--border-radius); ${stickyProps} max-height: 95vh; ${cssProps}`"
     height="auto"
     :scrollable="true"
+    :click-to-close="closeOnClickOutside"
     @closed="close()"
   >
     <component

package/components/PromptRestore.vue

@@ -116,7 +116,7 @@ export default {
 
       if (!cluster?.isRke2) {
         promise = this.$store.dispatch('rancher/findAll', { type: NORMAN.ETCD_BACKUP }).then((snapshots) => {
-          return snapshots.filter((s) => s.clusterId === cluster.metadata.name);
+          return snapshots.filter((s) => s.state === STATES_ENUM.ACTIVE && s.clusterId === cluster.metadata.name);
         });
       } else {
         promise = this.$store.dispatch('management/findAll', { type: SNAPSHOT }).then((snapshots) => {

package/components/ResourceTable.vue

@@ -400,7 +400,10 @@ export default {
 
     pagingParams() {
       if ( !this.schema ) {
-        return {};
+        return {
+          singularLabel: '',
+          pluralLabel:   ''
+        };
       }
 
       return {

package/components/__tests__/PromptRestore.test.ts

@@ -3,55 +3,87 @@ import PromptRestore from '@shell/components/PromptRestore.vue';
 import Vuex from 'vuex';
 import { ExtendedVue, Vue } from 'vue/types/vue';
 import { DefaultProps } from 'vue/types/options';
-import { CAPI } from '@shell/config/types';
+import { CAPI, NORMAN } from '@shell/config/types';
 import { STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
 
-const SUCCESSFUL_SNAPSHOT_1 = {
-  isRke2:       true,
+const RKE2_CLUSTER_NAME = 'rke2_cluster_name';
+const RKE2_SUCCESSFUL_SNAPSHOT_1 = {
+  clusterName:  RKE2_CLUSTER_NAME,
   type:         CAPI.RANCHER_CLUSTER,
   created:      'Thu Jul 20 2023 11:11:39',
   snapshotFile: { status: STATES_ENUM.SUCCESSFUL },
-  id:           'id',
-  name:         'name'
+  id:           'rke2_id_1',
+  name:         'rke2_name_1'
 };
-const SUCCESSFUL_SNAPSHOT_2 = {
-  isRke2:       true,
+const RKE2_SUCCESSFUL_SNAPSHOT_2 = {
+  clusterName:  RKE2_CLUSTER_NAME,
   type:         CAPI.RANCHER_CLUSTER,
   created:      'Thu Jul 20 2022 11:11:39',
   snapshotFile: { status: STATES_ENUM.SUCCESSFUL },
-  id:           'id2',
-  name:         'name2'
+  id:           'rke2_id_2',
+  name:         'rke2_name_2'
 };
-const FAILED_SNAPSHOT = {
-  isRke2:       true,
+const RKE2_FAILED_SNAPSHOT = {
+  clusterName:  RKE2_CLUSTER_NAME,
   type:         CAPI.RANCHER_CLUSTER,
   created:      'Thu Jul 20 2021 11:11:39',
   snapshotFile: { status: STATES_ENUM.FAILED },
-  id:           'id_3',
-  name:         'name_3'
+  id:           'rke2_id_3',
+  name:         'rke2_name_3'
 };
 
-describe('component: GrowlManager', () => {
+const RKE1_CLUSTER_NAME = 'rke1_cluster_name';
+const RKE1_SUCCESSFUL_SNAPSHOT_1 = {
+  clusterId: RKE1_CLUSTER_NAME,
+  type:      NORMAN.ETCD_BACKUP,
+  state:     STATES_ENUM.ACTIVE,
+  created:   'Thu Jul 30 2023 11:11:39',
+  id:        'rke1_id_1',
+  name:      'rke1_name_1'
+};
+const RKE1_SUCCESSFUL_SNAPSHOT_2 = {
+  clusterId: RKE1_CLUSTER_NAME,
+  type:      NORMAN.ETCD_BACKUP,
+  state:     STATES_ENUM.ACTIVE,
+  created:   'Thu Jul 30 2022 11:11:39',
+  id:        'rke1_id_2',
+  name:      'rke1_name_2'
+};
+const RKE1_WITH_ERROR_SNAPSHOT = {
+  clusterId: RKE1_CLUSTER_NAME,
+  type:      NORMAN.ETCD_BACKUP,
+  state:     STATES_ENUM.ERROR,
+  created:   'Thu Jul 30 2021 11:11:39',
+  id:        'rke1_id_3',
+  name:      'rke1_name_3'
+};
+
+describe('component: PromptRestore', () => {
   const localVue = createLocalVue();
 
   localVue.use(Vuex);
 
-  const testCases = [
+  const rke2TestCases = [
     [[], 0],
-    [[FAILED_SNAPSHOT], 0],
-    [[SUCCESSFUL_SNAPSHOT_1], 1],
-    [[SUCCESSFUL_SNAPSHOT_1, SUCCESSFUL_SNAPSHOT_2], 2],
-    [[FAILED_SNAPSHOT, SUCCESSFUL_SNAPSHOT_1, SUCCESSFUL_SNAPSHOT_2], 2]
+    [[RKE2_FAILED_SNAPSHOT], 0],
+    [[RKE2_SUCCESSFUL_SNAPSHOT_1], 1],
+    [[RKE2_SUCCESSFUL_SNAPSHOT_1, RKE2_SUCCESSFUL_SNAPSHOT_2], 2],
+    [[RKE2_FAILED_SNAPSHOT, RKE2_SUCCESSFUL_SNAPSHOT_1, RKE2_SUCCESSFUL_SNAPSHOT_2], 2]
   ];
 
-  it.each(testCases)('should list RKE2 snapshots properly', async(snapShots, expected) => {
+  it.each(rke2TestCases)('should list RKE2 snapshots properly', async(snapShots, expected) => {
     const store = new Vuex.Store({
       modules: {
         'action-menu': {
           namespaced: true,
           state:      {
             showPromptRestore: true,
-            toRestore:         snapShots
+            toRestore:         [{
+              isRke2:   true,
+              type:     CAPI.RANCHER_CLUSTER,
+              metadata: { name: RKE2_CLUSTER_NAME },
+              snapShots
+            }]
           },
         },
       },
@@ -69,4 +101,42 @@ describe('component: GrowlManager', () => {
 
     expect(wrapper.vm.clusterSnapshots).toHaveLength(expected);
   });
+
+  const rke1TestCases = [
+    [[], 0],
+    [[RKE1_WITH_ERROR_SNAPSHOT], 0],
+    [[RKE1_SUCCESSFUL_SNAPSHOT_1], 1],
+    [[RKE1_SUCCESSFUL_SNAPSHOT_1, RKE1_SUCCESSFUL_SNAPSHOT_2], 2],
+    [[RKE1_WITH_ERROR_SNAPSHOT, RKE1_SUCCESSFUL_SNAPSHOT_1, RKE1_SUCCESSFUL_SNAPSHOT_2], 2]
+  ];
+
+  it.each(rke1TestCases)('should list RKE1 snapshots properly', async(snapShots, expected) => {
+    const store = new Vuex.Store({
+      modules: {
+        'action-menu': {
+          namespaced: true,
+          state:      {
+            showPromptRestore: true,
+            toRestore:         [{
+              type:     CAPI.RANCHER_CLUSTER,
+              metadata: { name: RKE1_CLUSTER_NAME },
+              snapShots
+            }]
+          },
+        },
+      },
+      getters: { 'i18n/t': () => jest.fn(), 'prefs/get': () => jest.fn() },
+      actions: { 'rancher/findAll': jest.fn().mockResolvedValue(snapShots) }
+    });
+
+    const wrapper = shallowMount(PromptRestore as unknown as ExtendedVue<Vue, {}, {}, {}, DefaultProps>, {
+      store,
+      localVue
+    });
+
+    await wrapper.vm.fetchSnapshots();
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.vm.clusterSnapshots).toHaveLength(expected);
+  });
 });

package/components/auth/RoleDetailEdit.vue

@@ -579,6 +579,7 @@ export default {
             name="storageSource"
             :label="defaultLabel"
             class="mb-10"
+            data-testid="roletemplate-creator-default-options"
             :options="newUserDefaultOptions"
             :mode="mode"
           />
@@ -592,6 +593,7 @@ export default {
             name="storageSource"
             :label="t('rbac.roletemplate.locked.label')"
             class="mb-10"
+            data-testid="roletemplate-locked-options"
             :options="lockedOptions"
             :mode="mode"
           />

package/components/nav/WindowManager/ContainerShell.vue

@@ -288,7 +288,7 @@ export default {
             this.pod.os = undefined;
             // the pod will still return an os if one's been defined in the node so we'll skip the backups if that's the case and rely on retry count to break the retry loop
             if (!this.pod.os) {
-              this.os = this.backupShells.shift();
+              this.os = undefined;
             }
             this.connect();
           } else {

package/components/nav/WindowManager/__tests__/ContainerShell.test.ts

@@ -322,11 +322,11 @@ describe('component: ContainerShell', () => {
     expect(wrapper.vm.isOpening).toBe(false);
     expect(wrapper.vm.errorMsg).toBe('eventMessageError');
     // the backup shell that was leftover was windows so it became the new os in dataprops
-    expect(wrapper.vm.os).toBe('windows');
+    expect(wrapper.vm.os).toBeUndefined();
     // but we still didn't write it to the pod itself since we don't know if it worked
     expect(defaultContainerShellParams.propsData.pod.os).toBeUndefined();
     // we can see here that we removed that last backup shell because we're attempting to use it now
-    expect(wrapper.vm.backupShells).toHaveLength(0);
+    expect(wrapper.vm.backupShells).toHaveLength(1);
     expect(connect.mock.calls).toHaveLength(2);
   });
 
@@ -351,8 +351,8 @@ describe('component: ContainerShell', () => {
     eventMessage({ detail: { data: `3${ linuxErrorMessage }` } });
     eventDisconnected();
 
-    expect(wrapper.vm.backupShells).toHaveLength(0);
-    expect(wrapper.vm.os).toBe('windows');
+    expect(wrapper.vm.backupShells).toHaveLength(1);
+    expect(wrapper.vm.os).toBeUndefined();
     // the pod os was 'linux' but we cleared it out since that didn't work
     expect(defaultContainerShellParams.propsData.pod.os).toBeUndefined();
     expect(connect.mock.calls).toHaveLength(2);
@@ -367,11 +367,11 @@ describe('component: ContainerShell', () => {
     expect(wrapper.vm.isOpen).toBe(false);
     expect(wrapper.vm.isOpening).toBe(false);
     expect(wrapper.vm.errorMsg).toBe(windowsErrorMessage);
-    expect(wrapper.vm.os).toBe('windows');
+    expect(wrapper.vm.os).toBeUndefined();
     // we never found a shell that worked so we're going to leave the pod os as undefined
     expect(defaultContainerShellParams.propsData.pod.os).toBeUndefined();
     // we're out of backupShells now so we're not going to retry after that second disconnect
-    expect(connect.mock.calls).toHaveLength(2);
+    expect(connect.mock.calls).toHaveLength(3);
 
     resetMocks();
   });
@@ -409,8 +409,8 @@ describe('component: ContainerShell', () => {
     eventMessage({ detail: { data: `3${ linuxErrorMessage }` } });
     eventDisconnected();
 
-    expect(wrapper.vm.backupShells).toHaveLength(0);
-    expect(wrapper.vm.os).toBe('windows');
+    expect(wrapper.vm.backupShells).toHaveLength(1);
+    expect(wrapper.vm.os).toBeUndefined();
     expect(testUndefinedOsParams.propsData.pod.os).toBeUndefined();
 
     eventConnecting();
@@ -423,9 +423,9 @@ describe('component: ContainerShell', () => {
     expect(wrapper.vm.isOpen).toBe(false);
     expect(wrapper.vm.isOpening).toBe(false);
     expect(wrapper.vm.errorMsg).toBe(windowsErrorMessage);
-    expect(wrapper.vm.os).toBe('windows');
+    expect(wrapper.vm.os).toBeUndefined();
     expect(testUndefinedOsParams.propsData.pod.os).toBeUndefined();
-    expect(connect.mock.calls).toHaveLength(2);
+    expect(connect.mock.calls).toHaveLength(3);
 
     resetMocks();
   });
@@ -461,8 +461,8 @@ describe('component: ContainerShell', () => {
     eventMessage({ detail: { data: `3${ linuxErrorMessage }` } });
     eventDisconnected();
 
-    expect(wrapper.vm.backupShells).toHaveLength(0);
-    expect(wrapper.vm.os).toBe('windows');
+    expect(wrapper.vm.backupShells).toHaveLength(1);
+    expect(wrapper.vm.os).toBeUndefined();
     expect(testUndefinedOsParams.propsData.pod.os).toBeUndefined();
     expect(wrapper.vm.errorMsg).toBe(linuxErrorMessage);
 
@@ -475,9 +475,9 @@ describe('component: ContainerShell', () => {
     expect(wrapper.vm.isOpen).toBe(true);
     expect(wrapper.vm.isOpening).toBe(false);
     expect(wrapper.vm.errorMsg).toBe('');
-    expect(wrapper.vm.os).toBe('windows');
+    expect(wrapper.vm.os).toBeUndefined();
     // the second shell worked so we're going to set it on the pod itself so if we need to connect again we'll just use the correct shell on the first attempt
-    expect(testUndefinedOsParams.propsData.pod.os).toBe('windows');
+    expect(testUndefinedOsParams.propsData.pod.os).toBeUndefined();
     expect(connect.mock.calls).toHaveLength(2);
 
     resetMocks();

package/core/types.ts

@@ -364,6 +364,23 @@ export interface ConfigureTypeOptions {
   // showConfigView
 }
 
+export interface ConfigureVirtualTypeOptions extends ConfigureTypeOptions {
+  /**
+   * The translation key displayed anywhere this type is referenced
+   */
+  labelKey: string;
+
+  /**
+   * An identifier that should be unique across all types
+   */
+  name: string;
+
+  /**
+   * The route that this type should correspond to {@link PluginRouteConfig} {@link RouteConfig}
+   */
+  route: PluginRouteConfig | RouteConfig;
+}
+
 export interface DSLReturnType {
   /**
    * Register multiple types by name and place them all in a group if desired. Primarily used for grouping things in the cluster explorer navigation.
@@ -404,6 +421,13 @@ export interface DSLReturnType {
    */
   mapGroup: (groupName: string, label: string) => void;
 
+  /**
+   * Create and configure a myriad of options for a type
+   * @param options {@link ConfigureVirtualTypeOptions}
+   * @returns {@link void}
+   */
+  virtualType: (options: ConfigureVirtualTypeOptions) => void;
+
   /**
    * Leaving these here for completeness but I don't think these should be advertised as useable to plugin creators.
    */
@@ -417,7 +441,6 @@ export interface DSLReturnType {
   // moveType: (match, group)
   // setGroupDefaultType: (input, defaultType)
   // spoofedType: (obj)
-  // virtualType: (obj)
   // weightGroup: (input, weight, forBasic)
   // weightType: (input, weight, forBasic)
 }

package/detail/node.vue

@@ -82,8 +82,8 @@ export default {
         }
       ],
       imageTableHeaders: [
-        { ...SIMPLE_NAME, width: 400 },
-        IMAGE_SIZE
+        { ...SIMPLE_NAME, width: null },
+        { ...IMAGE_SIZE, width: 100 } // Ensure one header has a size, all other columns will scale
       ],
       taintTableHeaders: [
         KEY,

package/dialog/DiagnosticTimingsDialog.vue

@@ -111,6 +111,7 @@ export default {
 
         <AsyncButton
           :mode="applyMode"
+          data-testid="download-diagnostics-modal-action"
           @click="apply"
         />
       </div>

package/edit/ui.cattle.io.navlink.vue

@@ -8,9 +8,10 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import { RadioGroup } from '@components/Form/Radio';
 import FileImageSelector from '@shell/components/form/FileImageSelector';
 import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
-import NameNsDescription, { normalizeName } from '@shell/components/form/NameNsDescription';
+import NameNsDescription from '@shell/components/form/NameNsDescription';
 import { Banner } from '@components/Banner';
 import FormValidation from '@shell/mixins/form-validation';
+import { normalizeName } from '@shell/utils/kube';
 
 const LINK_TYPE_URL = 'url';
 const LINK_TYPE_SERVICE = 'service';

package/models/etcdbackup.js

@@ -1,10 +1,11 @@
 import NormanModel from '@shell/plugins/steve/norman-class';
+import { STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
 
 export default class Rke1EtcdBackup extends NormanModel {
   get _availableActions() {
     const restore = {
       action:  'promptRestore',
-      enabled: true,
+      enabled: this.state === STATES_ENUM.ACTIVE,
       icon:    'icon icon-fw icon-backup-restore',
       label:   'Restore'
     };

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

@@ -19,6 +19,13 @@ import { KONTAINER_TO_DRIVER } from './management.cattle.io.kontainerdriver';
 // If the logo is not named with the provider name, add an override here
 const PROVIDER_LOGO_OVERRIDE = {};
 
+function findRelationship(verb, type, relationships = []) {
+  const from = `${ verb }Type`;
+  const id = `${ verb }Id`;
+
+  return relationships.find((r) => r[from] === type)?.[id];
+}
+
 export default class MgmtCluster extends HybridModel {
   get details() {
     const out = [
@@ -440,9 +447,12 @@ export default class MgmtCluster extends HybridModel {
     // cluster has the less human readable management cluster ID in it: fleet-default/c-khk48
 
     const verb = this.isLocal || isRKE1 || this.isHostedKubernetesProvider ? 'to' : 'from';
-    const from = `${ verb }Type`;
-    const id = `${ verb }Id`;
+    const res = findRelationship(verb, CAPI.RANCHER_CLUSTER, this.metadata?.relationships);
+
+    if (res) {
+      return res;
+    }
 
-    return this.metadata.relationships.find((r) => r[from] === CAPI.RANCHER_CLUSTER)?.[id];
+    return findRelationship(verb === 'to' ? 'from' : 'to', CAPI.RANCHER_CLUSTER, this.metadata?.relationships);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "0.3.18",
+  "version": "0.3.20",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/pages/auth/login.vue

@@ -149,7 +149,7 @@ export default {
         return this.t('login.error');
       }
 
-      return this.err;
+      return this.err?.length ? this.t('login.specificError', { msg: this.err }) : '';
     },
 
     errorToDisplay() {

package/pages/c/_cluster/apps/charts/install.vue

@@ -81,6 +81,9 @@ export default {
   ],
 
   async fetch() {
+    this.errors = [];
+    // IMPORTANT! Any exception thrown before this.value is set will result in an empty page
+
     /*
       fetchChart is defined in shell/mixins. It first checks the URL
       query for an app name and namespace. It uses those values to check
@@ -91,23 +94,43 @@ export default {
       it checks for target name and namespace values defined in the
       Helm chart itself.
     */
-    await this.fetchChart();
+    try {
+      await this.fetchChart();
+    } catch (e) {
+      console.warn('Unable to fetch chart: ', e); // eslint-disable-line no-console
+    }
 
-    await this.fetchAutoInstallInfo();
-    this.errors = [];
+    try {
+      await this.fetchAutoInstallInfo();
+    } catch (e) {
+      console.warn('Unable to determine if other charts require install: ', e); // eslint-disable-line no-console
+    }
 
     // If the chart doesn't contain system `systemDefaultRegistry` properties there's no point applying them
     if (this.showCustomRegistry) {
       // Note: Cluster scoped registry is only supported for node driver clusters
-      this.clusterRegistry = await this.getClusterRegistry();
-      this.globalRegistry = await this.getGlobalRegistry();
+      try {
+        this.clusterRegistry = await this.getClusterRegistry();
+      } catch (e) {
+        console.warn('Unable to get cluster registry: ', e); // eslint-disable-line no-console
+      }
+
+      try {
+        this.globalRegistry = await this.getGlobalRegistry();
+      } catch (e) {
+        console.warn('Unable to get global registry: ', e); // eslint-disable-line no-console
+      }
       this.defaultRegistrySetting = this.clusterRegistry || this.globalRegistry;
     }
 
-    this.serverUrlSetting = await this.$store.dispatch('management/find', {
-      type: MANAGEMENT.SETTING,
-      id:   'server-url'
-    });
+    try {
+      this.serverUrlSetting = await this.$store.dispatch('management/find', {
+        type: MANAGEMENT.SETTING,
+        id:   'server-url'
+      });
+    } catch (e) {
+      console.error('Unable to fetch `server-url` setting: ', e); // eslint-disable-line no-console
+    }
 
     /*
       Figure out the namespace where the chart is
@@ -137,20 +160,38 @@ export default {
     }
 
     /* Check if the app is deprecated. */
-    this.legacyApp = this.existing ? await this.existing.deployedAsLegacy() : false;
+    try {
+      this.legacyApp = this.existing ? await this.existing.deployedAsLegacy() : false;
+    } catch (e) {
+      this.legacyApp = false;
+      console.warn('Unable to determine if existing install is a legacy app: ', e); // eslint-disable-line no-console
+    }
 
     /* Check if the app is a multicluster deprecated app.
     (Multicluster apps were replaced by Fleet.) */
-    this.mcapp = this.existing ? await this.existing.deployedAsMultiCluster() : false;
+
+    try {
+      this.mcapp = this.existing ? await this.existing.deployedAsMultiCluster() : false;
+    } catch (e) {
+      this.mcapp = false;
+      console.warn('Unable to determine if existing install is a mc app: ', e); // eslint-disable-line no-console
+    }
 
     /* The form state is intialized as a chartInstallAction resource. */
-    this.value = await this.$store.dispatch('cluster/create', {
-      type:     'chartInstallAction',
-      metadata: {
-        namespace: this.forceNamespace || this.$store.getters['defaultNamespace'],
-        name:      this.existing?.spec?.name || this.query.appName || '',
-      }
-    });
+    try {
+      this.value = await this.$store.dispatch('cluster/create', {
+        type:     'chartInstallAction',
+        metadata: {
+          namespace: this.forceNamespace || this.$store.getters['defaultNamespace'],
+          name:      this.existing?.spec?.name || this.query.appName || '',
+        }
+      });
+    } catch (e) {
+      console.error('Unable to create object of type `chartInstallAction`: ', e); // eslint-disable-line no-console
+
+      // Nothing's going to work without a `value`. See https://github.com/rancher/dashboard/issues/9452 to handle this and other catches.
+      return;
+    }
 
     /* Logic for when the Helm chart is not already installed */
     if ( !this.existing) {
@@ -803,12 +844,19 @@ export default {
 
       if (hasPermissionToSeeProvCluster) {
         const mgmCluster = this.$store.getters['currentCluster'];
-        const provCluster = mgmCluster?.provClusterId ? await this.$store.dispatch('management/find', {
-          type: CAPI.RANCHER_CLUSTER,
-          id:   mgmCluster.provClusterId
-        }) : {};
+        const provClusterId = mgmCluster?.provClusterId;
+        let provCluster;
+
+        try {
+          provCluster = provClusterId ? await this.$store.dispatch('management/find', {
+            type: CAPI.RANCHER_CLUSTER,
+            id:   provClusterId
+          }) : {};
+        } catch (e) {
+          console.error(`Unable to fetch prov cluster '${ provClusterId }': `, e); // eslint-disable-line no-console
+        }
 
-        if (provCluster.isRke2) { // isRke2 returns true for both RKE2 and K3s clusters.
+        if (provCluster?.isRke2) { // isRke2 returns true for both RKE2 and K3s clusters.
           const agentConfig = provCluster.spec?.rkeConfig?.machineSelectorConfig?.find((x) => !x.machineLabelSelector).config;
 
           // If a cluster scoped registry exists,
@@ -819,10 +867,11 @@ export default {
             return clusterRegistry;
           }
         }
-        if (provCluster.isRke1) {
+
+        if (provCluster?.isRke1) {
           // For RKE1 clusters, the cluster scoped private registry is on the management
           // cluster, not the provisioning cluster.
-          const rke1Registries = mgmCluster.spec?.rancherKubernetesEngineConfig?.privateRegistries;
+          const rke1Registries = mgmCluster?.spec?.rancherKubernetesEngineConfig?.privateRegistries;
 
           if (rke1Registries?.length > 0) {
             const defaultRegistry = rke1Registries.find((registry) => {

package/pages/diagnostic.vue

@@ -162,9 +162,8 @@ export default {
     },
 
     downloadData(btnCb) {
-      const date = new Date().toLocaleDateString();
-      const time = new Date().toLocaleTimeString();
-      const fileName = `rancher-diagnostic-data-${ date }-${ time.replaceAll(':', '_') }.json`;
+      // simplify filename due to e2e tests
+      const fileName = 'rancher-diagnostic-data.json';
       const data = {
         systemInformation: this.systemInformation,
         logs:              this.latestLogs,
@@ -235,6 +234,7 @@ export default {
         'aws',
         'digitalocean',
         'linode',
+        'targetRoute', // contains circular references, isn't useful (added later to store)
       ];
 
       const clearListsKeys = [
@@ -316,10 +316,12 @@ export default {
         <AsyncButton
           mode="timing"
           class="mr-20"
+          data-testid="diagnostics-generate-response-times"
           @click="gatherResponseTimes"
         />
         <AsyncButton
           mode="diagnostic"
+          data-testid="diagnostics-download-diagnostic-package"
           @click="promptDownload"
         />
       </div>

package/scripts/extension/publish

@@ -2,7 +2,6 @@
 
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 BASE_DIR="$(pwd)"
-BASE_EXT=$(basename ${BASE_DIR})
 
 CYAN="\033[96m"
 YELLOW="\033[93m"
@@ -17,6 +16,7 @@ REGISTRY_ORG=""
 IMAGE_PREFIX="ui-extension-"
 FORCE="false"
 GITHUB_BUILD="true"
+GITHUB_RELEASE_TAG=""
 
 GITHUB_SOURCE=$(git config --get remote.origin.url | sed -e 's/^git@.*:\([[:graph:]]*\).git/\1/')
 GITHUB_BRANCH="main"
@@ -24,18 +24,19 @@ GITHUB_BRANCH="main"
 usage() {
   echo "Usage: $0 [<options>] [plugins]"
   echo " options:"
-  echo "  -p           Push container images on build"
+  echo "  -s <repo>    Specify destination GitHub repository (org/name) - defaults to the git origin"
+  echo "  -b <branch>  Specify destination GitHub branch"
+  echo "  -t <tag>     Specify the Github release tag to build when a release has been tagged and published"
   echo "  -f           Force building the chart even if it already exists"
+  echo "  -c           Build as a container image rather than publishing to Github"
+  echo "  -p           Push container images on build"
   echo "  -r <name>    Specify destination container registry for built images"
   echo "  -o <name>    Specify destination container registry organization for built images"
   echo "  -i <prefix>  Specify prefix for the built container image (default: 'ui-extension-')"
-  echo "  -c           Build as a container image rather than publishing to Github"
-  echo "  -s <repo>    Specify destination GitHub repository (org/name) - defaults to the git origin"
-  echo "  -b <branch>  Specify destination GitHub branch"
   exit 1
 }
 
-while getopts "hvr:o:pi:fcb:s:" opt; do
+while getopts "hvr:o:pi:fcb:t:s:" opt; do
   case $opt in
     h)
       usage
@@ -66,6 +67,9 @@ while getopts "hvr:o:pi:fcb:s:" opt; do
       GITHUB_BUILD="true"
       GITHUB_BRANCH="${OPTARG}"
       ;;
+    t)
+      GITHUB_RELEASE_TAG="${OPTARG}"
+      ;;
     *)
       usage
       ;;
@@ -90,6 +94,10 @@ if [ "${GITHUB_BUILD}" == "true" ]; then
 
   echo -e "${CYAN}GitHub Repository: ${GITHUB_SOURCE}${RESET}"
   echo -e "${CYAN}GitHub Branch    : ${GITHUB_BRANCH}${RESET}"
+
+  if [[ -n "${GITHUB_RELEASE_TAG}" ]]; then
+    echo -e "${CYAN}GitHub Release   : ${GITHUB_RELEASE_TAG}${RESET}"
+  fi
 else
   echo -e ${CYAN}"Image prefix: ${IMAGE_PREFIX}${RESET}"
 fi
@@ -116,7 +124,11 @@ if ! [[ -d ${BASE_DIR}/node_modules ]]; then
   exit 1
 fi
 
-COMMANDS=("node" "jq" "yq" "git" "docker" "helm" "yarn")
+COMMANDS=("node" "jq" "yq" "git" "helm" "yarn")
+if [ "${GITHUB_BUILD}" == "false" ]; then
+  COMMANDS+=("docker")
+fi
+
 HAVE_COMMANDS="true"
 for CMD in "${COMMANDS[@]}"
 do
@@ -132,7 +144,15 @@ fi
 
 # --------------------------------------------------------------------------------
 # Only do conatiner args checks if not GitHub publish
+# --------------------------------------------------------------------------------
 if [ "${GITHUB_BUILD}" == "false" ]; then
+  BASE_EXT=$(jq -r .name ${BASE_DIR}/package.json)
+  EXT_VERSION=$(jq -r .version ${BASE_DIR}/package.json)
+
+  if [ -z ${EXT_VERSION} ]; then
+    EXT_VERSION="0.0.0"
+  fi
+
   if [[ -z ${REGISTRY_ORG} ]]; then
     # Infer that the user has the same Docker registry org as their GitHub org
     GITHUB_REPO=$(git config --get remote.origin.url | sed -e 's/^git@.*:\([[:graph:]]*\).git/\1/')
@@ -146,6 +166,12 @@ if [ "${GITHUB_BUILD}" == "false" ]; then
     exit 1
   fi
 
+  if [ -n "${GITHUB_RELEASE_TAG}" ] && [[ ${GITHUB_RELEASE_TAG} != "${BASE_EXT}-${EXT_VERSION}" ]]; then
+    echo -e "${YELLOW}Github tagged release name does not match ${RESET}${BOLD}${BASE_EXT}-${EXT_VERSION}${RESET}"
+    echo -e "${YELLOW}Stopping build${RESET}"
+    exit 1
+  fi
+
   docker images > /dev/null
   if [ $? -ne 0 ]; then
     echo "docker is not running - this is required to build container images for the UI Plugins"
@@ -185,6 +211,13 @@ for d in pkg/*/ ; do
     PKG_NAME="${pkg}-${PKG_VERSION}"
     PKG_ASSET=${ASSETS}/${pkg}/${PKG_NAME}.tgz
 
+    # Skip the build for a package that does not match the tagged release name
+    if [[ -n "${GITHUB_RELEASE_TAG}" ]] && [ ${GITHUB_BUILD} == "true" ] && [[ ${GITHUB_RELEASE_TAG} != ${PKG_NAME} ]]; then
+      echo -e "${YELLOW}Github release tag ${RESET}${BOLD}${GITHUB_RELEASE_TAG}${RESET}${YELLOW} does not match asset name${RESET}"
+      echo -e "${YELLOW}Skipping ${RESET}${BOLD}${PKG_NAME}${RESET}"
+      continue
+    fi
+
     echo -e "${CYAN}${BOLD}Building plugin: ${pkg} (${PKG_VERSION}) ${RESET}"
 
     echo "Package version: ${PKG_VERSION}"
@@ -299,6 +332,15 @@ for d in pkg/*/ ; do
   fi
 done
 
+if [ "${GITHUB_BUILD}" == "true" ] && [[ -n "${GITHUB_RELEASE_TAG}" ]] && [ "${BUILT}" == "false" ]; then
+  echo -e "${YELLOW}Github release tag ${RESET}${BOLD}${GITHUB_RELEASE_TAG}${RESET}${YELLOW} did not match any package name.${RESET}"
+  echo -e "${YELLOW}Stopping build${RESET}"
+
+  rm -rf ${CHART_TMP}
+  rm -rf ${TMP} 
+  exit 1
+fi
+
 if [ -f ${ROOT_INDEX} ] && [ "${GITHUB_BUILD}" == "false" ]; then
   UPDATE="--merge ${ROOT_INDEX}"
   helm repo index ${ASSETS} ${UPDATE}
@@ -309,12 +351,6 @@ if [ -f ${ASSETS}/index.yaml ] && ! [ -e "${ROOT_INDEX}" ]; then
 fi
 
 if [ "${GITHUB_BUILD}" == "false" ]; then
-  EXT_VERSION=$(jq -r .version ${BASE_DIR}/package.json)
-
-  if [ -z ${EXT_VERSION} ]; then
-    EXT_VERSION="0.0.0"
-  fi
-
   echo -e "${CYAN}Base extension: ${BASE_EXT}${RESET}"
   echo -e "${CYAN}Extension version: ${EXT_VERSION}${RESET}"
 
@@ -325,7 +361,11 @@ else
 fi
 
 if [ "${GITHUB_BUILD}" == "true" ] && [ -f ${ROOT_INDEX} ]; then
-  cp ${ROOT_INDEX} tmp
+  if [[ -n "${GITHUB_RELEASE_TAG}" ]] && [ -f ${ASSETS}/index.yaml ]; then
+    cp ${ASSETS}/index.yaml tmp
+  else
+    cp ${ROOT_INDEX} tmp
+  fi
 fi
 
 if [ "${GITHUB_BUILD}" == "true" ] && [ "${BUILT}" == "true" ]; then

package/store/auth.js

@@ -334,6 +334,8 @@ export const actions = {
     } catch (err) {
       if (err._status === 401) {
         return Promise.reject(LOGIN_ERRORS.CLIENT_UNAUTHORIZED);
+      } else if (err.message) {
+        return Promise.reject(err.message);
       } else if ( err._status >= 400 && err._status <= 499 ) {
         return Promise.reject(LOGIN_ERRORS.CLIENT);
       }

package/types/shell/index.d.ts

@@ -3727,6 +3727,7 @@ export function matching(ary: any, selector: any, labelKey: any): any;
 // @shell/utils/socket
 
 declare module '@shell/utils/socket' {
+export const addEventListener: any;
 export const STATE_CONNECTING: "connecting";
 export const STATE_CONNECTED: "connected";
 export const EVENT_CONNECTING: "connecting";

package/utils/socket.js

@@ -11,6 +11,7 @@ const SECURE = 'wss://';
 
 const STATE_DISCONNECTED = 'disconnected';
 
+export const addEventListener = EventTarget.addEventListener;
 export const STATE_CONNECTING = 'connecting';
 export const STATE_CONNECTED = 'connected';
 const STATE_CLOSING = 'closing';