@rancher/shell 3.0.9 → 3.0.10

package/edit/token.vue

@@ -2,7 +2,7 @@
 import { mapGetters } from 'vuex';
 import day from 'dayjs';
 import sortBy from 'lodash/sortBy';
-import { MANAGEMENT, EXT } from '@shell/config/types';
+import { MANAGEMENT, NORMAN } from '@shell/config/types';
 import { Banner } from '@components/Banner';
 import DetailText from '@shell/components/DetailText';
 import Footer from '@shell/components/form/Footer';
@@ -14,7 +14,6 @@ import CreateEditView from '@shell/mixins/create-edit-view';
 import { diffFrom } from '@shell/utils/time';
 import { filterHiddenLocalCluster, filterOnlyKubernetesClusters } from '@shell/utils/cluster';
 import { SETTING } from '@shell/config/settings';
-import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
 
 export default {
   components: {
@@ -25,7 +24,6 @@ export default {
     LabeledSelect,
     RadioGroup,
     Select,
-    Checkbox,
   },
 
   mixins: [CreateEditView],
@@ -43,11 +41,7 @@ export default {
 
     return {
       errors: null,
-      user:   null,
       form:   {
-        enabled:           true,
-        description:       '',
-        clusterName:       '',
         expiryType:        'never',
         customExpiry:      0,
         customExpiryUnits: 'minute',
@@ -57,13 +51,11 @@ export default {
       accessKey:  '',
       secretKey:  '',
       maxTTL,
-      ttl:        ''
     };
   },
 
   computed: {
     ...mapGetters({ t: 'i18n/t' }),
-
     scopes() {
       const all = this.$store.getters['management/all'](MANAGEMENT.CLUSTER);
       const kubeClusters = filterHiddenLocalCluster(filterOnlyKubernetesClusters(all, this.$store), this.$store);
@@ -79,20 +71,16 @@ export default {
       const options = ['never', 'day', 'month', 'year', 'custom'];
       let opts = options.map((opt) => ({ value: opt, label: this.t(`accountAndKeys.apiKeys.add.expiry.options.${ opt }`) }));
 
-      // When the TTL is greater than 0, present only two options
+      // When the TTL is anything other than 0, present only two options
       // (1) The maximum allowed
       // (2) Custom
-      if (this.maxTTL > 0 ) {
+      if (this.maxTTL !== 0 ) {
         const now = day();
         const expiry = now.add(this.maxTTL, 'minute');
         const max = diffFrom(expiry, now, this.t);
 
         opts = opts.filter((opt) => opt.value === 'custom');
         opts.unshift({ value: 'max', label: this.t('accountAndKeys.apiKeys.add.expiry.options.maximum', { value: max.string }) });
-      } else {
-        // maxTTL <= 0 means there is no maximum, so we can show the 'never' option which results in an infinite TTL
-        // OR if we set a positive TTL, then it assumes that value
-        opts = opts.filter((opt) => opt.value === 'never' || opt.value === 'custom');
       }
 
       return opts;
@@ -103,9 +91,6 @@ export default {
 
       return filtered.map((opt) => ({ value: opt, label: this.t(`accountAndKeys.apiKeys.add.customExpiry.options.${ opt }`) }));
     },
-    hasNeverOption() {
-      return this.expiryOptions?.filter((opt) => opt.value === 'never')?.length === 1;
-    }
   },
 
   mounted() {
@@ -130,33 +115,31 @@ export default {
       });
     },
 
-    async actuallySave() {
-      // update expiration value before save
+    async actuallySave(url) {
       this.updateExpiry();
-
       if ( this.isCreate ) {
-        const steveToken = await this.$store.dispatch('management/create', {
-          type: EXT.TOKEN,
-          spec: {
-            description:   this.form.description,
-            kind:          '',
-            userPrincipal: null, // will be set by the backend to the current user
-            clusterName:   this.form.clusterName,
-            enabled:       this.form.enabled,
-            ttl:           this.ttl
-            // userID: not needed as it will be set by the backend to the current user
-          }
-        });
-
-        const steveTokenSaved = await steveToken.save();
-
-        this.created = steveTokenSaved;
-        this.ttlLimited = this.created?.spec?.ttl !== this.ttl;
-        const token = this.created?.status?.bearerToken?.split(':');
+        // Description is a bit weird, so need to clone and set this
+        // rather than use this.value - need to find a way to set this if we ever
+        // want to allow edit (which I don't think we do)
+        const res = await this.value.save();
+
+        this.created = res;
+        this.ttlLimited = res.ttl !== this.value.ttl;
+        const token = this.created.token.split(':');
 
         this.accessKey = token[0];
         this.secretKey = (token.length > 1) ? token[1] : '';
-        this.token = this.created?.status?.bearerToken;
+        this.token = this.created.token;
+
+        // Force a refresh of the token so we get the expiry date correctly
+        await this.$store.dispatch('rancher/find', {
+          type: NORMAN.TOKEN,
+          id:   res.id,
+          opt:  { force: true }
+        }, { root: true });
+      } else {
+        // Note: update of existing key not supported currently
+        await this.value.save();
       }
     },
 
@@ -176,9 +159,7 @@ export default {
       const units = (v === 'custom') ? this.form.customExpiryUnits : v;
       let ttl = 0;
 
-      if (v === 'never') {
-        ttl = -1;
-      } else if (units === 'max') {
+      if (units === 'max') {
         ttl = this.maxTTL * 60 * 1000;
       } else if ( units !== 'never' ) {
         const now = day();
@@ -186,8 +167,7 @@ export default {
 
         ttl = expiry.diff(now);
       }
-
-      this.ttl = ttl;
+      this.value.ttl = ttl;
     }
   }
 };
@@ -198,7 +178,7 @@ export default {
     <div class="pl-10 pr-10">
       <LabeledInput
         key="description"
-        v-model:value="form.description"
+        v-model:value="value.description"
         :placeholder="t('accountAndKeys.apiKeys.add.description.placeholder')"
         label-key="accountAndKeys.apiKeys.add.description.label"
         mode="edit"
@@ -206,30 +186,13 @@ export default {
       />
 
       <LabeledSelect
-        v-model:value="form.clusterName"
+        v-model:value="value.clusterId"
         class="mt-20 scope-select"
         label-key="accountAndKeys.apiKeys.add.scope"
         :options="scopes"
       />
 
-      <Checkbox
-        v-model:value="form.enabled"
-        class="mt-20 mb-20"
-        :mode="mode"
-        label-key="accountAndKeys.apiKeys.add.enabled"
-      />
-
-      <Banner
-        v-if="hasNeverOption"
-        color="warning"
-        class="mt-20"
-      >
-        <div>
-          {{ t('accountAndKeys.apiKeys.info.expiryOptionsWithNever') }}
-        </div>
-      </Banner>
-
-      <h5 class="mb-20">
+      <h5 class="pt-20">
         {{ t('accountAndKeys.apiKeys.add.expiry.label') }}
       </h5>
 
@@ -241,9 +204,7 @@ export default {
           class="mr-20"
           name="expiryGroup"
         />
-        <div
-          class="ml-20 mt-10 expiry"
-        >
+        <div class="ml-20 mt-10 expiry">
           <input
             v-model="form.customExpiry"
             :disabled="form.expiryType !== 'custom'"

package/models/token.js

@@ -16,8 +16,4 @@ export default class extends NormanModel {
 
     return expiry.isBefore(day());
   }
-
-  get isDeprecated() {
-    return true;
-  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancher/dashboard",
   "license": "Apache-2.0",
@@ -8,7 +8,7 @@
   "private": false,
   "types": "types/shell/index.d.ts",
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=24.0.0"
   },
   "files": [
     "**/*"
@@ -41,7 +41,7 @@
     "@popperjs/core": "2.11.8",
     "@rancher/icons": "2.0.55",
     "@types/is-url": "1.2.30",
-    "@types/node": "20.10.8",
+    "@types/node": "25.3.3",
     "@types/semver": "^7.5.8",
     "@typescript-eslint/eslint-plugin": "5.62.0",
     "@typescript-eslint/parser": "5.62.0",
@@ -65,7 +65,7 @@
     "color": "5.0.3",
     "cookie-universal": "2.2.2",
     "cookie": "0.7.0",
-    "core-js": "3.45.0",
+    "core-js": "3.48.0",
     "cron-validator": "1.4.0",
     "cronstrue": "3.9.0",
     "cross-env": "7.0.3",
@@ -119,7 +119,7 @@
     "papaparse": "5.3.0",
     "portal-vue": "~3.0.0",
     "sass-loader": "12.6.0",
-    "sass": "1.89.2",
+    "sass": "1.97.3",
     "serve-static": "1.14.1",
     "set-cookie-parser": "2.4.6",
     "shell-quote": "1.7.3",
@@ -131,10 +131,10 @@
     "ufo": "0.7.11",
     "unfetch": "4.2.0",
     "url-parse": "1.5.10",
-    "vue-router": "4.5.1",
+    "vue-router": "4.6.4",
     "vue-select": "4.0.0-beta.6",
     "vue-server-renderer": "2.7.16",
-    "vue": "3.5.18",
+    "vue": "3.5.29",
     "vue3-resize": "0.2.0",
     "vue3-virtual-scroll-list": "0.2.1",
     "vuedraggable": "4.1.0",
@@ -164,7 +164,7 @@
     "roarr": "7.0.4",
     "semver": "7.5.4",
     "@types/lodash": "4.17.5",
-    "@types/node": "20.10.8",
+    "@types/node": "25.3.3",
     "@vue/cli-service/html-webpack-plugin": "^5.0.0"
   },
   "nyc": {

package/pages/account/index.vue

@@ -9,107 +9,94 @@ import { mapGetters } from 'vuex';
 
 import { Banner } from '@components/Banner';
 import ResourceTable from '@shell/components/ResourceTable';
+import CopyToClipboardText from '@shell/components/CopyToClipboardText';
 import TabTitle from '@shell/components/TabTitle';
 
-import { allHash } from '@shell/utils/promise';
-
-import {
-  ACCESS_KEY, DESCRIPTION, EXPIRES, EXPIRY_STATE,
-  LAST_USED, AGE_NORMAN, SCOPE_NORMAN, NORMAN_KEY_DEPRECATION
-} from '@shell/config/table-headers';
-import { FilterArgs, PaginationParamFilter } from '@shell/types/store/pagination.types';
+const API_ENDPOINT = '/v3';
 
 export default {
   components: {
-    BackLink, Banner, Loading, ResourceTable, Principal, TabTitle
+    CopyToClipboardText, BackLink, Banner, Loading, ResourceTable, Principal, TabTitle
   },
   mixins: [BackRoute],
   async fetch() {
-    const hashedRequests = {};
-
     this.canChangePassword = await this.calcCanChangePassword();
 
-    this.normanTokenSchema = this.$store.getters[`rancher/schemaFor`](NORMAN.TOKEN);
-    this.steveTokenSchema = this.$store.getters[`management/schemaFor`](EXT.TOKEN);
+    if (this.apiKeySchema) {
+      this.rows = await this.$store.dispatch('rancher/findAll', { type: NORMAN.TOKEN });
+    }
 
-    const selfUser = await this.$store.dispatch('auth/getSelfUser');
+    // Get all settings - the API host setting may not be set, so this avoids a 404 request if we look for the specific setting
+    const allSettings = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.SETTING });
+    const apiHostSetting = allSettings.find((i) => i.id === SETTING.API_HOST);
+    const serverUrlSetting = allSettings.find((i) => i.id === SETTING.SERVER_URL);
 
-    if (this.normanTokenSchema) {
-      hashedRequests.normanTokens = this.$store.dispatch('rancher/findAll', { type: NORMAN.TOKEN });
-    }
+    this.apiHostSetting = apiHostSetting?.value;
+    this.serverUrlSetting = serverUrlSetting?.value;
 
-    if (this.steveTokenSchema) {
-      this.filterByUserTokens = this.$store.getters[`management/paginationEnabled`](EXT.TOKEN);
-
-      if (this.filterByUserTokens && selfUser?.status?.userID) {
-        // Only get associated with the current user
-        const opt = { // Of type ActionFindPageArgs
-          pagination: new FilterArgs({
-            filters: PaginationParamFilter.createSingleField({
-              field: 'metadata.fields.1',
-              value: selfUser.status?.userID,
-            })
-          })
-        };
-
-        hashedRequests.steveTokens = this.$store.dispatch(`management/findPage`, { type: EXT.TOKEN, opt });
-      } else {
-        hashedRequests.steveTokens = this.$store.dispatch('management/findAll', { type: EXT.TOKEN });
-      }
-    }
+    const selfUser = await this.$store.dispatch('auth/getSelfUser');
 
     if (selfUser?.canGetUser && selfUser.status?.userID) {
       // Fetch the user info for ChangePassword (ChangePasswordDialog needs the user info for the user whose password is being changed)
-      hashedRequests.user = this.$store.dispatch('management/find', {
+      this.user = await this.$store.dispatch('management/find', {
         type: MANAGEMENT.USER,
         id:   selfUser.status?.userID
       });
+    } else {
+      throw new Error(this.t('changePassword.errors.cannotFetchSelf'));
     }
-
-    // Get all settings - the API host setting may not be set, so this avoids a 404 request if we look for the specific setting
-    hashedRequests.allSettings = this.$store.dispatch('management/findAll', { type: MANAGEMENT.SETTING });
-
-    const {
-      normanTokens, steveTokens, allSettings, user
-    } = await allHash(hashedRequests);
-
-    this.normanTokens = normanTokens;
-    this.steveTokens = steveTokens;
-    this.user = user;
-
-    const apiHostSetting = allSettings.find((i) => i.id === SETTING.API_HOST);
-    const serverUrlSetting = allSettings.find((i) => i.id === SETTING.SERVER_URL);
-
-    this.apiHostSetting = apiHostSetting?.value;
-    this.serverUrlSetting = serverUrlSetting?.value;
   },
   data() {
     return {
-      normanTokenSchema: undefined,
-      steveTokenSchema:  undefined,
       apiHostSetting:    null,
       serverUrlSetting:  null,
       rows:              null,
       canChangePassword: false,
-      user:              null,
-      normanTokens:      null,
-      steveTokens:       null,
+      user:              null
     };
   },
   computed: {
     ...mapGetters({ t: 'i18n/t' }),
 
     apiKeyheaders() {
-      return [
-        EXPIRY_STATE,
-        ACCESS_KEY,
-        DESCRIPTION,
-        SCOPE_NORMAN,
-        NORMAN_KEY_DEPRECATION,
-        LAST_USED,
-        EXPIRES,
-        AGE_NORMAN
-      ];
+      return this.apiKeySchema ? this.$store.getters['type-map/headersFor'](this.apiKeySchema) : [];
+    },
+
+    // Port of Ember code for API Url - see: https://github.com/rancher/ui/blob/8e07c492673171731f3b26af14c978bc103d1828/lib/shared/addon/endpoint/service.js#L58
+    apiUrlBase() {
+      let setting = this.apiHostSetting;
+
+      if (setting && setting.indexOf('http') !== 0) {
+        setting = `http://${ setting }`;
+      }
+
+      // Use Server Setting URL if the api host setting is not set
+      let url = setting || this.serverUrlSetting;
+
+      // If the URL is relative, add on the current base URL from the browser
+      if ( url.indexOf('http') !== 0 ) {
+        url = `${ window.location.origin }/${ url.replace(/^\/+/, '') }`;
+      }
+
+      // URL must end in a single slash
+      url = `${ url.replace(/\/+$/, '') }/`;
+
+      return url;
+    },
+
+    apiUrl() {
+      const base = this.apiUrlBase;
+      const path = API_ENDPOINT.replace(/^\/+/, '');
+
+      return `${ base }${ path }`;
+    },
+
+    apiKeySchema() {
+      try {
+        return this.$store.getters[`rancher/schemaFor`](NORMAN.TOKEN);
+      } catch (e) {}
+
+      return null;
     },
 
     principal() {
@@ -123,7 +110,7 @@ export default {
       return principal || {};
     },
 
-    filteredNormanTokens() {
+    apiKeys() {
       // Filter out tokens that are not API Keys and are not expired UI Sessions
       const isApiKey = (key) => {
         const labels = key.labels;
@@ -133,24 +120,7 @@ export default {
         return ( !expired || !labels || !labels['ui-session'] ) && !current;
       };
 
-      return !this.normanTokens ? [] : this.normanTokens.filter(isApiKey);
-    },
-
-    filteredNewTokens() {
-      // Filter out tokens that are not API Keys and are not expired UI Sessions
-      const isApiKey = (key) => {
-        const labels = key.metadata?.labels;
-        const expired = key.status?.expired;
-        const current = key.status?.current;
-
-        return ( !expired || !labels || !labels['ui-session'] ) && !current;
-      };
-
-      return !this.steveTokens ? [] : this.steveTokens.filter(isApiKey);
-    },
-
-    apiKeys() {
-      return (this.filteredNormanTokens || []).concat(this.filteredNewTokens || []);
+      return !this.rows ? [] : this.rows.filter(isApiKey);
     }
   },
 
@@ -221,9 +191,16 @@ export default {
     <div class="keys-header">
       <div>
         <h2 v-t="'accountAndKeys.apiKeys.title'" />
+        <div class="api-url">
+          <span>{{ t("accountAndKeys.apiKeys.apiEndpoint") }}</span>
+          <CopyToClipboardText
+            :aria-label="t('accountAndKeys.apiKeys.copyApiEnpoint')"
+            :text="apiUrl"
+          />
+        </div>
       </div>
       <button
-        v-if="steveTokenSchema"
+        v-if="apiKeySchema"
         role="button"
         :aria-label="t('accountAndKeys.apiKeys.add.label')"
         class="btn role-primary add mb-20"
@@ -234,17 +211,11 @@ export default {
       </button>
     </div>
     <div
-      v-if="steveTokenSchema"
+      v-if="apiKeySchema"
       class="keys"
     >
-      <Banner
-        v-if="filteredNormanTokens.length"
-        color="warning"
-        class="mb-20"
-        :label="t('accountAndKeys.apiKeys.normanTokenDeprecation')"
-      />
       <ResourceTable
-        :schema="steveTokenSchema"
+        :schema="apiKeySchema"
         :rows="apiKeys"
         :headers="apiKeyheaders"
         key-field="id"

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

@@ -1,27 +1,78 @@
 <script setup lang="ts">
+import { reactive } from 'vue';
 import { RcItemCardAction } from '@components/RcItemCard';
 import { RcButton } from '@components/RcButton';
-import { RcIcon } from '@components/RcIcon';
+import { isTruncated } from '@shell/utils/style';
+import RcIcon from '@components/RcIcon/RcIcon.vue';
+import type { RcIconType } from '@components/RcIcon/types';
 
 interface FooterItem {
-  icon?: string;
-  iconTooltip?: Record<{key?: string, text?: string}>;
+  icon?: RcIconType;
+  iconTooltip?: { key?: string; text?: string };
   labels: string[];
   labelTooltip?: string;
   type?: string;
 }
 
-const emit = defineEmits<{(e: 'click:item', type: string, label: string): void; }>();
+const emit = defineEmits<{(e: 'click:item', type: string, label: string): void }>();
 
 defineProps<{
   items: FooterItem[];
   clickable?: boolean;
 }>();
 
-function onClickItem(type: string, label: string) {
+const tooltipOverrides = reactive<Record<string, string | undefined>>({});
+const labelElements: Record<string, HTMLElement | null> = {};
+
+function onClickItem(type: string, label: string): void {
   emit('click:item', type, label);
 }
 
+/**
+ * Creates a unique key for identifying a label element.
+ * @param itemIndex - Index of the footer item
+ * @param labelIndex - Index of the label within the footer item
+ */
+function createLabelKey(itemIndex: number, labelIndex: number): string {
+  return `${ itemIndex }-${ labelIndex }`;
+}
+
+/**
+ * Registers a label element reference for truncation detection.
+ * @param key - Unique identifier for the label
+ * @param el - The HTML element or null
+ */
+function registerLabelRef(key: string, el: HTMLElement | null): void {
+  labelElements[key] = el;
+}
+
+/**
+ * Updates the tooltip content based on whether the label text is truncated.
+ * If truncated, prepends the full label text to the base tooltip.
+ * @param key - Unique identifier for the label
+ * @param label - The label text content
+ * @param baseTooltip - The original tooltip content
+ */
+function updateTooltipOnHover(key: string, label: string, baseTooltip?: string): void {
+  if (!baseTooltip) {
+    tooltipOverrides[key] = undefined;
+
+    return;
+  }
+
+  const element = labelElements[key];
+
+  tooltipOverrides[key] = isTruncated(element) ? `${ label }. ${ baseTooltip }` : baseTooltip;
+}
+
+/**
+ * Returns the tooltip to display for a given label.
+ * @param key - Unique identifier for the label
+ * @param fallback - Fallback tooltip if no override exists
+ */
+function getTooltip(key: string, fallback?: string): string | undefined {
+  return tooltipOverrides[key] ?? fallback;
+}
 </script>
 
 <template>
@@ -34,7 +85,7 @@ function onClickItem(type: string, label: string) {
     >
       <RcIcon
         v-if="footerItem.icon"
-        v-clean-tooltip="footerItem.iconTooltip?.key ? t(footerItem.iconTooltip?.key) : undefined"
+        v-clean-tooltip="footerItem.iconTooltip?.key ? t(footerItem.iconTooltip.key) : undefined"
         class="app-chart-card-footer-item-icon"
         :type="footerItem.icon"
       />
@@ -47,14 +98,18 @@ function onClickItem(type: string, label: string) {
           class="app-chart-card-footer-item-action"
         >
           <rc-button
-            v-clean-tooltip="footerItem.labelTooltip"
+            v-clean-tooltip="getTooltip(createLabelKey(i, j), footerItem.labelTooltip)"
             variant="ghost"
             class="app-chart-card-footer-button secondary-text-link"
             data-testid="app-chart-card-footer-item-text"
             :aria-label="t('catalog.charts.appChartCard.footerItem.ariaLabel', { filter: label })"
             @click="onClickItem(footerItem.type, label)"
+            @mouseenter="updateTooltipOnHover(createLabelKey(i, j), label, footerItem.labelTooltip)"
           >
-            <span class="app-chart-card-footer-button-label">{{ label }}</span>
+            <span
+              :ref="(el) => registerLabelRef(createLabelKey(i, j), el as HTMLElement)"
+              class="app-chart-card-footer-button-label"
+            >{{ label }}</span>
           </rc-button>
           <span
             v-if="footerItem.labels.length > 1 && j !== footerItem.labels.length - 1"
@@ -63,9 +118,11 @@ function onClickItem(type: string, label: string) {
         </rc-item-card-action>
         <span
           v-else
-          v-clean-tooltip="footerItem.labelTooltip"
+          :ref="(el) => registerLabelRef(createLabelKey(i, j), el as HTMLElement)"
+          v-clean-tooltip="getTooltip(createLabelKey(i, j), footerItem.labelTooltip)"
           class="app-chart-card-footer-item-text"
           data-testid="app-chart-card-footer-item-text"
+          @mouseenter="updateTooltipOnHover(createLabelKey(i, j), label, footerItem.labelTooltip)"
         >
           {{ label }}
           <span

package/pages/c/_cluster/explorer/index.vue

@@ -394,29 +394,12 @@ export default {
     },
 
     metricAggregations() {
-      let checkNodes = this.nodes;
-
-      // Special case local cluster
-      if (this.currentCluster.isLocal) {
-        const nodeNames = this.nodes.reduce((acc, n) => {
-          acc[n.id] = n;
-
-          return acc;
-        }, {});
-
-        checkNodes = this.mgmtNodes.filter((n) => {
-          const nodeName = n.metadata?.labels?.['management.cattle.io/nodename'] || n.id;
-
-          return !!nodeNames[nodeName];
-        });
-      }
-
-      const someNonWorkerRoles = checkNodes.some((node) => node.hasARole && !node.isWorker);
       const metrics = this.nodeMetrics.filter((nodeMetrics) => {
         const node = this.nodes.find((nd) => nd.id === nodeMetrics.id);
 
-        return node && (!someNonWorkerRoles || node.isWorker);
+        return node;
       });
+
       const initialAggregation = {
         cpu:    0,
         memory: 0