dashboard-shell-shell 1.0.122 → 1.0.1000000081

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

@@ -1,4 +1,4 @@
-import { mount } from '@vue/test-utils';
+import { mount, shallowMount } from '@vue/test-utils';
 import vmwarevsphere from '@shell/machine-config/vmwarevsphere.vue';
 import { DEFAULT_VALUES, SENTINEL } from '@shell/machine-config/vmwarevsphere-config';
 
@@ -172,12 +172,12 @@ describe('component: vmwarevsphere', () => {
         name:     'tag_name',
         category: 'tag_category',
       };
-      const expectedReslut = [{
+      const expectedResult = [{
         ...tag, label: `${ tag.category } / ${ tag.name }`, value: tag.id
       }];
       const wrapper = mount(vmwarevsphere, defaultCreateSetup);
 
-      expect(wrapper.vm.mapTagsToContent([tag])).toStrictEqual(expectedReslut);
+      expect(wrapper.vm.mapTagsToContent([tag])).toStrictEqual(expectedResult);
     });
   });
 
@@ -254,4 +254,49 @@ describe('component: vmwarevsphere', () => {
       });
     });
   });
+
+  describe('syncNetworkValueForLegacyLabels', () => {
+    it('should update the current network value properly', () => {
+      const legacyName = 'legacy_name';
+      const legacyValue = 'legacy_value';
+      const networkLabel = 'network_label';
+
+      const wrapper = shallowMount(vmwarevsphere, {
+        ...defaultEditSetup,
+        propsData: {
+          ...defaultEditSetup.propsData,
+          value: {
+            ...defaultEditSetup.propsData.value,
+            network: [legacyName]
+          }
+        },
+        computed: {
+          networks: () => [
+            {
+              name: legacyName, label: networkLabel, value: legacyValue
+            },
+            {
+              name: 'name1', label: 'label1', value: 'value1'
+            },
+            {
+              name: 'name2', label: 'label2', value: 'value2'
+            },
+            {
+              name: 'name3', label: 'label3', value: 'value3'
+            },
+            {
+              name: 'name4', label: 'label4', value: 'value4'
+            },
+          ]
+        }
+      });
+
+      // check the current network before updating
+      expect(wrapper.vm.value.network).toStrictEqual([legacyName]);
+
+      wrapper.vm.syncNetworkValueForLegacyLabels();
+
+      expect(wrapper.vm.value.network).toStrictEqual([legacyValue]);
+    });
+  });
 });

package/machine-config/azure.vue

@@ -602,7 +602,10 @@ export default {
         />
       </div>
     </div>
-    <hr class="mt-20">
+    <hr
+      class="mt-20"
+      role="none"
+    >
     <div class="row mt-20">
       <div class="col span-6">
         <LabeledInput
@@ -668,7 +671,10 @@ export default {
           </div>
         </div>
       </div>
-      <hr class="mt-20 mb-20">
+      <hr
+        class="mt-20 mb-20"
+        role="none"
+      >
       <h2>{{ t('cluster.machineConfig.azure.sections.purchasePlan') }}</h2>
       <div class="row mt-20">
         <div class="col span-6">
@@ -681,7 +687,10 @@ export default {
           />
         </div>
       </div>
-      <hr class="mt-20">
+      <hr
+        class="mt-20"
+        role="none"
+      >
       <h2>{{ t('cluster.machineConfig.azure.sections.network') }}</h2>
       <div class="row mt-20 mb-20">
         <div class="col span-6">
@@ -803,7 +812,10 @@ export default {
           />
         </div>
       </div>
-      <hr class="mt-20 mb-20">
+      <hr
+        class="mt-20 mb-20"
+        role="none"
+      >
       <h2>{{ t('cluster.machineConfig.azure.sections.disks') }}</h2>
       <div class="row mt-20 mb-20">
         <div class="col span-6">

package/machine-config/vmwarevsphere.vue

@@ -558,6 +558,7 @@ export default {
       this.resetValueIfNecessary('network', content, options, true);
 
       set(this, 'networksResults', content);
+      this.syncNetworkValueForLegacyLabels();
       this.vappMode = this.getInitialVappMode(this.value);
     },
 
@@ -669,6 +670,21 @@ export default {
       }
     },
 
+    // Network labels have been updated to include the MOID.
+    // To ensure previously selected networks remain consistent with this change,
+    // we update the current network value to allow correct selection from the network list.
+    syncNetworkValueForLegacyLabels() {
+      const currentNetwork = this.value.network[0];
+
+      if (this.mode !== _CREATE && currentNetwork) {
+        const networkMatch = this.networks.find((network) => currentNetwork === network.name && currentNetwork !== network.label);
+
+        if (networkMatch) {
+          this.value.network = [networkMatch.value];
+        }
+      }
+    },
+
     mapPathOptionsToContent(pathOptions) {
       return (pathOptions || []).map((pathOption) => {
         return {

package/mixins/resource-fetch.js

@@ -3,6 +3,7 @@ import { COUNT, MANAGEMENT } from '@shell/config/types';
 import { SETTING, DEFAULT_PERF_SETTING } from '@shell/config/settings';
 import ResourceFetchNamespaced from '@shell/mixins/resource-fetch-namespaced';
 import ResourceFetchApiPagination from '@shell/mixins/resource-fetch-api-pagination';
+import { cloud2harvesterhci } from '@shell/utils/router'
 
 // Number of pages to fetch when loading incrementally
 const PAGES = 4;
@@ -34,7 +35,7 @@ export default {
     // Normally owner components supply `resource` and `inStore` as part of their data, however these are needed here before parent data runs
     // So set up both here
     const params = { ...this.$route.params };
-    const resource = params.resource || this.schema?.id; // Resource can either be on a page showing single list, or a page of a resource showing a list of another resource
+    const resource = cloud2harvesterhci(params.resource) || this.schema?.id; // Resource can either be on a page showing single list, or a page of a resource showing a list of another resource
     const inStore = this.$store.getters['currentStore'](resource);
 
     return {

package/models/__tests__/logging.banzaicloud.io.flow.test.ts

@@ -0,0 +1,88 @@
+import LogFlow from '@shell/models/logging.banzaicloud.io.flow';
+
+describe('class LogFlow', () => {
+  it('prop "outputs" should take namespace in consideration when filtering logging v2 "outputs"', () => {
+    const logOutputs = [
+      {
+        apiVersion: 'logging.banzaicloud.io/v1beta1',
+        kind:       'Output',
+        metadata:   {
+          creationTimestamp: '2025-03-17T10:51:55Z',
+          namespace:         'default',
+          name:              'output1',
+          uid:               '927b4a2e-6be0-476f-9bdd-cf30c4a27d8b'
+        },
+        name:   'output1',
+        spec:   { awsElasticsearch: { endpoint: {} } },
+        status: { active: false }
+      },
+      {
+        apiVersion: 'logging.banzaicloud.io/v1beta1',
+        kind:       'Output',
+        metadata:   {
+          creationTimestamp: '2025-03-17T10:51:55Z',
+          namespace:         'cattle-fleet-system',
+          name:              'output2',
+          uid:               '927b4a2e-6be0-476f-9bdd-cf30c4a27d8c'
+        },
+        name:   'output2',
+        spec:   { awsElasticsearch: { endpoint: {} } },
+        status: { active: false }
+      },
+      {
+        apiVersion: 'logging.banzaicloud.io/v1beta1',
+        kind:       'Output',
+        metadata:   {
+          creationTimestamp: '2025-03-17T10:51:55Z',
+          namespace:         'cattle-fleet-system',
+          name:              'output3',
+          uid:               '927b4a2e-6be0-476f-9bdd-cf30c4a27d8d'
+        },
+        name:   'output3',
+        spec:   { awsElasticsearch: { endpoint: {} } },
+        status: { active: false }
+      },
+      {
+        apiVersion: 'logging.banzaicloud.io/v1beta1',
+        kind:       'Output',
+        metadata:   {
+          creationTimestamp: '2025-03-17T10:51:55Z',
+          namespace:         'kube-system',
+          name:              'output4',
+          uid:               '927b4a2e-6be0-476f-9bdd-cf30c4a27d8e'
+        },
+        name:   'output4',
+        spec:   { awsElasticsearch: { endpoint: {} } },
+        status: { active: false }
+      },
+    ];
+
+    const logFlowData = {
+      apiVersion: 'logging.banzaicloud.io/v1beta1',
+      kind:       'Flow',
+      metadata:   {
+        name:              'flow2',
+        creationTimestamp: '2025-03-17T10:53:02Z',
+        generation:        1,
+        namespace:         'cattle-fleet-system',
+        resourceVersion:   '4070',
+        uid:               'fdf7d553-d101-4c37-91b0-784f95dc950a',
+        fields:            [
+          'flow2', true, null
+        ]
+      },
+      spec: {
+        localOutputRefs: [
+          'output2',
+          'output3'
+        ]
+      }
+    };
+
+    const logFlow = new LogFlow(logFlowData);
+
+    jest.spyOn(logFlow, 'allOutputs', 'get').mockReturnValue(logOutputs);
+
+    expect(logFlow.outputs).toStrictEqual([logOutputs[1], logOutputs[2]]);
+  });
+});

package/models/__tests__/namespace.test.ts

@@ -84,7 +84,31 @@ describe('class Namespace', () => {
   });
 
   it.todo('should return the project');
-  it.todo('should return the groupByLabel with i18n');
+
+  describe('handling groupById', () => {
+    it('should return the groupById if have project id', () => {
+      const namespace = new Namespace({});
+
+      jest.spyOn(namespace, 'project', 'get').mockReturnValue({
+        id:   'mock-project-id',
+        type: 'project',
+        name: 'mock-project',
+      });
+
+      expect(namespace.groupById).toStrictEqual('mock-project-id');
+    });
+
+    it('should return the groupById if project id undefined', () => {
+      const t = jest.fn(() => 'Not in a Project');
+      const ctx = { rootGetters: { 'i18n/t': t } };
+      const namespace = new Namespace({}, ctx);
+
+      jest.spyOn(namespace, 'project', 'get').mockReturnValue({});
+
+      expect(namespace.groupById).toStrictEqual('Not in a Project');
+    });
+  });
+
   it.todo('should return the project name with i18n');
   it.todo('should return the projectNameSort');
   it.todo('should check if istioInstalled');

package/models/cloudcredential.js

@@ -275,6 +275,11 @@ export default class CloudCredential extends NormanModel {
         expired:  false,
         expiring: true,
       };
+    } else if (this.expiresIn) {
+      return {
+        expired:  false,
+        expiring: false,
+      };
     }
 
     return null;

package/models/kontainerdriver.js

@@ -72,14 +72,17 @@ export default class KontainerDriver extends Driver {
     return this.$dispatch('rancher/request', {
       url:    `v3/kontainerDrivers/${ escape(this.id) }?action=activate`,
       method: 'post',
-    }, { root: true });
+    }, { root: true }).catch((err) => {
+      this.$dispatch('growl/fromError', { title: this.t('drivers.error.activate', { name: this.nameDisplay }), err }, { root: true });
+    });
   }
 
   async activateBulk(resources) {
     await Promise.all(resources.map((resource) => this.$dispatch('rancher/request', {
       url:    `v3/kontainerDrivers/${ escape(resource.id) }?action=activate`,
       method: 'post',
-    }, { root: true }
-    )));
+    }, { root: true }).catch((err) => {
+      this.$dispatch('growl/fromError', { title: this.t('drivers.error.activate', { name: resource.nameDisplay }), err }, { root: true });
+    })));
   }
 }

package/models/logging.banzaicloud.io.flow.js

@@ -64,7 +64,8 @@ export default class LogFlow extends SteveModel {
   get outputs() {
     const localOutputRefs = this.spec?.localOutputRefs || [];
 
-    return this.allOutputs.filter((output) => localOutputRefs.includes(output.name));
+    return this.allOutputs.filter((output) => localOutputRefs.includes(output.name) &&
+    output.metadata?.namespace === this.metadata?.namespace);
   }
 
   get outputsSortable() {

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

@@ -168,12 +168,12 @@ export default class MgmtNode extends HybridModel {
   }
 
   get canScaleDown() {
-    if (!this.isEtcd && !this.isControlPlane) {
+    const hasAction = this.norman?.actions?.scaledown;
+
+    if (!this.isEtcd && !this.isControlPlane && hasAction) {
       return true;
     }
 
-    const hasAction = this.norman?.actions?.scaledown;
-
     return hasAction && notOnlyOfRole(this, this.provisioningCluster?.nodes);
   }
 }

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

@@ -2,6 +2,7 @@ import { ALLOWED_SETTINGS } from '@shell/config/settings';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
 import { isServerUrl } from '@shell/utils/validators/setting';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
+import { harvester2cloud } from '@shell/utils/router'
 import {
   _EDIT,
   _UNFLAG,
@@ -54,7 +55,7 @@ export default class Setting extends HybridModel {
   goToEdit(moreQuery = {}) {
     if (this.$rootGetters['currentProduct'].inStore === HARVESTER) {
       location.name = `${ HARVESTER }-c-cluster-brand`;
-      location.params = { cluster: this.$rootGetters['currentCluster'].id, product: HARVESTER };
+      location.params = { cluster: this.$rootGetters['currentCluster'].id, product: harvester2cloud(HARVESTER) };
 
       location.query = {
         ...location.query,

package/models/namespace.js

@@ -5,7 +5,6 @@ import {
 import { ISTIO, MANAGEMENT } from '@shell/config/types';
 
 import { get, set } from '@shell/utils/object';
-import { escapeHtml } from '@shell/utils/string';
 import { insertAt, isArray } from '@shell/utils/array';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
@@ -124,11 +123,11 @@ export default class Namespace extends SteveModel {
     return project;
   }
 
-  get groupByLabel() {
-    const name = this.project?.nameDisplay;
+  get groupById() {
+    const projectId = this.project?.id;
 
-    if ( name ) {
-      return this.$rootGetters['i18n/t']('resourceTable.groupLabel.project', { name: escapeHtml(name) });
+    if ( projectId ) {
+      return projectId;
     } else {
       return this.$rootGetters['i18n/t']('resourceTable.groupLabel.notInAProject');
     }

package/models/nodedriver.js

@@ -80,14 +80,17 @@ export default class NodeDriver extends Driver {
     return this.$dispatch('rancher/request', {
       url:    `v3/nodeDrivers/${ escape(this.id) }?action=activate`,
       method: 'post',
-    }, { root: true });
+    }, { root: true }).catch((err) => {
+      this.$dispatch('growl/fromError', { title: this.t('drivers.error.activate', { name: this.nameDisplay }), err }, { root: true });
+    });
   }
 
   async activateBulk(resources) {
     await Promise.all(resources.map((resource) => this.$dispatch('rancher/request', {
       url:    `v3/nodeDrivers/${ escape(resource.id) }?action=activate`,
       method: 'post',
-    }, { root: true }
-    )));
+    }, { root: true }).catch((err) => {
+      this.$dispatch('growl/fromError', { title: this.t('drivers.error.activate', { name: resource.nameDisplay }), err }, { root: true });
+    })));
   }
 }

package/models/storage.k8s.io.storageclass.js

@@ -141,14 +141,14 @@ export default class extends SteveModel {
       out.unshift({
         action:  'resetDefault',
         enabled: true,
-        icon:    'icon icon-fw icon-checkmark',
+        // icon:    'icon icon-fw icon-checkmark',
         label:   this.t('storageClass.actions.resetDefault'),
       });
     } else {
       out.unshift({
         action:  'setDefault',
         enabled: true,
-        icon:    'icon icon-fw icon-checkmark',
+        // icon:    'icon icon-fw icon-checkmark',
         label:   this.t('storageClass.actions.setAsDefault'),
       });
     }

package/models/workload.js

@@ -34,7 +34,10 @@ export default class Workload extends WorkloadService {
       enabled: !!this.links.update,
     });
 
-    if (type !== WORKLOAD_TYPES.JOB && type !== WORKLOAD_TYPES.CRON_JOB) {
+    if (type !== WORKLOAD_TYPES.JOB &&
+      type !== WORKLOAD_TYPES.CRON_JOB &&
+      type !== WORKLOAD_TYPES.REPLICA_SET
+    ) {
       insertAt(out, 0, {
         action:  'toggleRollbackModal',
         label:   this.t('action.rollback'),

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "dashboard-shell-shell",
+  "version": "1.0.1000000081",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
   "author": "SUSE",
   "private": false,
-  "version": "1.0.00000000122",
   "engines": {
     "node": ">=20.0.0"
   },

package/pages/about.vue

@@ -119,8 +119,12 @@ export default {
     <table>
       <thead>
         <tr>
-          <th>{{ t('about.versions.component') }}</th>
-          <th>{{ t('about.versions.version') }}</th>
+          <th class="custom-th">
+            {{ t('about.versions.component') }}
+          </th>
+          <th class="custom-th">
+            {{ t('about.versions.version') }}
+          </th>
         </tr>
       </thead>
       <tr v-if="rancherVersion">
@@ -210,11 +214,11 @@ export default {
           v-for="(d, i) in downloadImageList"
           :key="i"
         >
-          <td>
+          <th>
             <div class="os">
               <i :class="`icon ${d.icon} mr-5`" /> {{ t(d.label) }}
             </div>
-          </td>
+          </th>
           <td>
             <a
               v-if="d.imageList"
@@ -241,11 +245,11 @@ export default {
           :key="i"
           class="link"
         >
-          <td>
+          <th>
             <div class="os">
               <i :class="`icon ${d.icon} mr-5`" /> {{ t(d.label) }}
             </div>
-          </td>
+          </th>
           <td>
             <a
               v-if="d.cliLink"
@@ -273,7 +277,7 @@ export default {
     overflow: hidden;
     border-radius: var(--border-radius);
 
-    tr > td:first-of-type {
+    tr > th:first-of-type {
       width: 20%;
     }
 
@@ -284,11 +288,15 @@ export default {
       text-align: left;
     }
 
-    th {
+    th.custom-th {
       background-color: var(--sortable-table-top-divider);
       border-bottom: 1px solid var(--sortable-table-top-divider);
     }
 
+    th:not(.custom-th) {
+      font-weight: normal;
+    }
+
     a {
       cursor: pointer;
     }