@rancher/shell 3.0.5-rc.7 → 3.0.5-rc.9

package/models/persistentvolumeclaim.js

@@ -41,7 +41,7 @@ export default class PVC extends SteveModel {
     insertAt(out, 0, {
       action:  'goToEditVolumeSize',
       enabled: this.expandable && this.bound,
-      icon:    'icon icon-fw icon-plus',
+      icon:    'icon icon-plus',
       label:   this.t('persistentVolumeClaim.expand.label'),
     });
 

package/models/pod.js

@@ -61,7 +61,7 @@ export default class Pod extends WorkloadService {
     return {
       action:  'openShell',
       enabled: !!this.links.view && this.isRunning,
-      icon:    'icon icon-fw icon-chevron-right',
+      icon:    'icon-chevron-right',
       label:   'Execute Shell',
       total:   1,
     };
@@ -71,7 +71,7 @@ export default class Pod extends WorkloadService {
     return {
       action:  'openLogs',
       enabled: !!this.links.view,
-      icon:    'icon icon-fw icon-chevron-right',
+      icon:    'icon icon-chevron-right',
       label:   'View Logs',
       total:   1,
     };

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

@@ -74,15 +74,17 @@ export default class ProvCluster extends SteveModel {
     return super.creationTimestamp;
   }
 
-  // Models can specify a single action that will be shown as a button in the details masthead
-  get detailsAction() {
-    const canExplore = this.mgmt?.isReady && !this.hasError;
-
-    return {
-      action:  'explore',
-      label:   this.$rootGetters['i18n/t']('cluster.explore'),
-      enabled: canExplore,
-    };
+  get canExplore() {
+    return this.mgmt?.isReady && !this.hasError;
+  }
+
+  get canEdit() {
+    // If the cluster is a KEV1 cluster or Harvester cluster then prevent edit
+    if (this.isKev1 || this.isHarvester) {
+      return false;
+    }
+
+    return super.canEdit;
   }
 
   get _availableActions() {
@@ -134,7 +136,7 @@ export default class ProvCluster extends SteveModel {
       }, {
         action:  'restoreSnapshotAction',
         label:   this.$rootGetters['i18n/t']('nav.restoreSnapshot'),
-        icon:    'icon icon-fw icon-backup-restore',
+        icon:    'icon icon-backup-restore',
         enabled: canSnapshot,
       }, {
         action:  'rotateCertificates',
@@ -148,19 +150,6 @@ export default class ProvCluster extends SteveModel {
         enabled: canEditRKE2cluster
       }, { divider: true }];
 
-    // Harvester Cluster 1:1 Harvester Cloud Cred
-    if (this.cloudCredential?.canRenew || this.cloudCredential?.canBulkRenew) {
-      out.splice(0, 0, { divider: true });
-      out.splice(0, 0, {
-        action:     'renew',
-        enabled:    this.cloudCredential?.canRenew,
-        bulkable:   this.cloudCredential?.canBulkRenew,
-        bulkAction: 'renewBulk',
-        icon:       'icon icon-fw icon-refresh',
-        label:      this.$rootGetters['i18n/t']('cluster.cloudCredentials.renew'),
-      });
-    }
-
     const all = actions.concat(out);
 
     // If the cluster is a KEV1 cluster or Harvester cluster then prevent edit
@@ -1018,24 +1007,11 @@ export default class ProvCluster extends SteveModel {
     return super.description || this.mgmt?.description;
   }
 
-  renew() {
-    return this.cloudCredential?.renew();
-  }
-
-  renewBulk(clusters = []) {
-    // In theory we don't need to filter by cloudCred, but do so for safety
-    const cloudCredentials = clusters.filter((c) => c.cloudCredential).map((c) => c.cloudCredential);
-
-    return this.cloudCredential?.renewBulk(cloudCredentials);
+  get disableResourceDetailDrawerConfigTab() {
+    return !!this.isHarvester;
   }
 
-  get cloudCredential() {
-    return this.$rootGetters['rancher/all'](NORMAN.CLOUD_CREDENTIAL).find((cc) => cc.id === this.spec.cloudCredentialSecretName);
-  }
-
-  get cloudCredentialWarning() {
-    const expireData = this.cloudCredential?.expireData;
-
-    return expireData?.expired || expireData?.expiring;
+  get fullDetailPageOverride() {
+    return true;
   }
 }

package/models/rke.cattle.io.etcdsnapshot.js

@@ -17,7 +17,7 @@ export default class EtcdBackup extends NormanModel {
     return [{
       action: 'promptRestore',
       enabled,
-      icon:   'icon icon-fw icon-backup-restore',
+      icon:   'icon icon-backup-restore',
       label:  'Restore'
     }];
   }

package/models/secret.js

@@ -625,4 +625,8 @@ export default class Secret extends SteveModel {
 
     return this.t('resourceTable.groupLabel.project', { name: escapeHtml(this?.project?.nameDisplay || '') }, true);
   }
+
+  get fullDetailPageOverride() {
+    return 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-checkmark',
         label:   this.t('storageClass.actions.resetDefault'),
       });
     } else {
       out.unshift({
         action:  'setDefault',
         enabled: true,
-        icon:    'icon icon-fw icon-checkmark',
+        icon:    'icon icon-checkmark',
         label:   this.t('storageClass.actions.setAsDefault'),
       });
     }

package/models/workload.js

@@ -1,7 +1,7 @@
 import { findBy, insertAt } from '@shell/utils/array';
 import { CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations';
 import { WORKLOAD_TYPES, SERVICE, POD } from '@shell/config/types';
-import { get, set } from '@shell/utils/object';
+import { set } from '@shell/utils/object';
 import day from 'dayjs';
 import { convertSelectorObj, parse } from '@shell/utils/selector';
 import { SEPARATOR } from '@shell/config/workload';
@@ -76,7 +76,7 @@ export default class Workload extends WorkloadService {
     insertAt(out, 0, {
       action:  'openShell',
       enabled: !!this.links.view,
-      icon:    'icon icon-fw icon-chevron-right',
+      icon:    'icon icon-chevron-right',
       label:   this.t('action.openShell'),
       total:   1,
     });
@@ -595,6 +595,9 @@ export default class Workload extends WorkloadService {
     return selector;
   }
 
+  /**
+   * Match Expression version of the podSelector
+   */
   get podMatchExpression() {
     return this.podSelector ? parse(this.podSelector) : null;
   }
@@ -632,7 +635,7 @@ export default class Workload extends WorkloadService {
       return undefined;
     }
 
-    return (get(this, 'metadata.relationships') || []).filter((relationship) => relationship.toType === WORKLOAD_TYPES.JOB);
+    return this.metadata?.relationships?.filter((relationship) => relationship.toType === WORKLOAD_TYPES.JOB) || [];
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "3.0.5-rc.7",
+  "version": "3.0.5-rc.9",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -27,17 +27,18 @@
     "e2e:dev": "start-server-and-test dev https://localhost:8005 cy:open"
   },
   "dependencies": {
-    "@aws-sdk/client-ec2": "3.658.1",
-    "@aws-sdk/client-eks": "3.1.0",
-    "@aws-sdk/client-iam": "3.658.1",
-    "@aws-sdk/client-kms": "3.8.1",
+    "@aws-sdk/client-ec2": "3.863.0",
+    "@aws-sdk/client-eks": "3.879.0",
+    "@aws-sdk/client-iam": "3.863.0",
+    "@aws-sdk/client-kms": "3.863.0",
+    "@smithy/fetch-http-handler": "5.1.1",
     "@babel/plugin-proposal-optional-chaining": "7.21.0",
     "@babel/plugin-proposal-private-methods": "7.18.6",
     "@babel/plugin-proposal-private-property-in-object": "7.14.5",
     "@babel/preset-typescript": "7.16.7",
     "@novnc/novnc": "1.2.0",
     "@popperjs/core": "2.11.8",
-    "@rancher/icons": "2.0.37",
+    "@rancher/icons": "2.0.38",
     "@types/is-url": "1.2.30",
     "@types/node": "20.10.8",
     "@types/semver": "^7.5.8",
@@ -51,7 +52,7 @@
     "add": "2.0.6",
     "ansi_up": "5.0.0",
     "axios-retry": "3.1.9",
-    "axios": "1.8.4",
+    "axios": "1.12.2",
     "babel-eslint": "10.1.0",
     "babel-plugin-module-resolver": "4.0.0",
     "babel-preset-vue": "2.0.2",
@@ -63,17 +64,17 @@
     "color": "4.2.3",
     "cookie-universal": "2.2.2",
     "cookie": "0.7.0",
-    "core-js": "3.40.0",
-    "cron-validator": "1.3.1",
+    "core-js": "3.45.0",
+    "cron-validator": "1.4.0",
     "cronstrue": "2.53.0",
     "cross-env": "7.0.3",
     "css-loader": "6.7.3",
     "csv-loader": "3.0.3",
     "custom-event-polyfill": "^1.0.7",
     "cypress": "11.1.0",
-    "d3-selection": "1.4.1",
+    "d3-selection": "3.0.0",
     "d3": "7.3.0",
-    "dayjs": "1.8.29",
+    "dayjs": "1.11.18",
     "defu": "5.0.1",
     "diff2html": "3.4.24",
     "dompurify": "3.2.5",
@@ -83,7 +84,7 @@
     "eslint-import-resolver-node": "0.3.9",
     "eslint-module-utils": "2.6.1",
     "eslint-plugin-cypress": "2.12.1",
-    "eslint-plugin-import": "2.31.0",
+    "eslint-plugin-import": "2.32.0",
     "eslint-plugin-jest": "24.4.0",
     "eslint-plugin-n": "15.2.0",
     "eslint-plugin-vue": "9.32.0",
@@ -108,7 +109,7 @@
     "jsdiff": "1.1.1",
     "jsonpath-plus": "10.3.0",
     "jsrsasign": "11.0.0",
-    "jszip": "3.8.0",
+    "jszip": "3.10.1",
     "lodash": "4.17.21",
     "marked": "4.0.17",
     "node-polyfill-webpack-plugin": "3.0.0",
@@ -117,7 +118,7 @@
     "papaparse": "5.3.0",
     "portal-vue": "~3.0.0",
     "sass-loader": "12.6.0",
-    "sass": "1.83.1",
+    "sass": "1.89.2",
     "serve-static": "1.14.1",
     "set-cookie-parser": "2.4.6",
     "shell-quote": "1.7.3",
@@ -129,15 +130,15 @@
     "ufo": "0.7.11",
     "unfetch": "4.2.0",
     "url-parse": "1.5.10",
-    "vue-router": "4.5.0",
+    "vue-router": "4.5.1",
     "vue-select": "4.0.0-beta.6",
     "vue-server-renderer": "2.7.16",
-    "vue": "^3.2.13",
+    "vue": "3.5.18",
     "vue3-resize": "0.2.0",
     "vue3-virtual-scroll-list": "0.2.1",
     "vuedraggable": "4.1.0",
     "vuex": "4.1.0",
-    "webpack-bundle-analyzer": "4.5.0",
+    "webpack-bundle-analyzer": "4.10.2",
     "webpack-virtual-modules": "0.4.3",
     "worker-loader": "3.0.8",
     "xterm-addon-canvas": "0.5.0",
@@ -171,4 +172,4 @@
       ".vue"
     ]
   }
-}
+}

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

@@ -5,12 +5,15 @@ interface FooterItem {
   icon?: string;
   iconTooltip?: Record<{key?: string, text?: string}>;
   labels: string[];
+  labelTooltip?: string;
+  type?: string;
 }
 
 const emit = defineEmits<{(e: 'click:item', type: string, label: string): void; }>();
 
 defineProps<{
   items: FooterItem[];
+  clickable?: boolean;
 }>();
 
 function onClickItem(type: string, label: string) {
@@ -32,19 +35,32 @@ function onClickItem(type: string, label: string) {
         v-clean-tooltip="t(footerItem.iconTooltip?.key)"
         :class="['icon', 'app-chart-card-footer-item-icon', footerItem.icon]"
       />
-      <rc-item-card-action
+      <template
         v-for="(label, j) in footerItem.labels"
         :key="j"
-        class="app-chart-card-footer-item-text secondary-text-link"
-        data-testid="app-chart-card-footer-item-text"
-        tabindex="0"
-        :aria-label="t('catalog.charts.appChartCard.footerItem.ariaLabel')"
-        @click="onClickItem(footerItem.type, label)"
-        @keydown.enter="onClickItem(footerItem.type, label)"
-        @keydown.space.prevent="onClickItem(footerItem.type, label)"
       >
-        {{ label }}<span v-if="footerItem.labels.length > 1 && j !== footerItem.labels.length - 1">, </span>
-      </rc-item-card-action>
+        <rc-item-card-action
+          v-if="clickable && footerItem.type"
+          v-clean-tooltip="footerItem.labelTooltip"
+          class="app-chart-card-footer-item-text secondary-text-link"
+          data-testid="app-chart-card-footer-item-text"
+          tabindex="0"
+          :aria-label="t('catalog.charts.appChartCard.footerItem.ariaLabel')"
+          @click="onClickItem(footerItem.type, label)"
+        >
+          {{ label }}
+          <span v-if="footerItem.labels.length > 1 && j !== footerItem.labels.length - 1">, </span>
+        </rc-item-card-action>
+        <span
+          v-else
+          v-clean-tooltip="footerItem.labelTooltip"
+          class="app-chart-card-footer-item-text"
+          data-testid="app-chart-card-footer-item-text"
+        >
+          {{ label }}
+          <span v-if="footerItem.labels.length > 1 && j !== footerItem.labels.length - 1">, </span>
+        </span>
+      </template>
     </div>
   </div>
 </template>

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

@@ -4,6 +4,7 @@ interface SubHeaderItem {
   icon: string;
   iconTooltip?: Record<{key?: string, text?: string}>;
   label: string;
+  labelTooltip?: string;
 }
 
 defineProps<{
@@ -24,7 +25,9 @@ defineProps<{
         v-clean-tooltip="t(subHeaderItem.iconTooltip.key)"
         :class="['icon', 'app-chart-card-sub-header-item-icon', subHeaderItem.icon]"
       />
-      <p>{{ subHeaderItem.label }}</p>
+      <p v-clean-tooltip="subHeaderItem.labelTooltip">
+        {{ subHeaderItem.label }}
+      </p>
     </div>
   </div>
 </template>

package/pages/c/_cluster/apps/charts/__tests__/AppChartCardFooter.spec.js

@@ -0,0 +1,41 @@
+import { shallowMount } from '@vue/test-utils';
+import AppChartCardFooter from '../AppChartCardFooter.vue';
+import { REPO } from '@shell/config/query-params';
+
+describe('component: AppChartCardFooter', () => {
+  it('should render', () => {
+    const wrapper = shallowMount(AppChartCardFooter, {
+      propsData: { items: [] },
+      stubs:     { 'rc-item-card-action': true },
+    });
+
+    expect(wrapper.exists()).toBe(true);
+  });
+
+  it('should apply tooltips to labels', () => {
+    const tooltipContent = 'my tooltip';
+    const items = [
+      {
+        type:         REPO,
+        labels:       ['label1', 'label2'],
+        labelTooltip: tooltipContent,
+      },
+    ];
+
+    const wrapper = shallowMount(AppChartCardFooter, {
+      propsData:  { items },
+      stubs:      { 'rc-item-card-action': true },
+      directives: {
+        'clean-tooltip': (el, binding) => {
+          el.setAttribute('data-tooltip-value', binding.value);
+        },
+      },
+    });
+
+    const actions = wrapper.findAll('[data-tooltip-value]');
+
+    expect(actions).toHaveLength(2);
+    expect(actions.at(0).attributes('data-tooltip-value')).toBe(tooltipContent);
+    expect(actions.at(1).attributes('data-tooltip-value')).toBe(tooltipContent);
+  });
+});