dashboard-shell-shell 3.0.2-test.20250913 → 3.0.5-logTest.2

package/models/workload.js

@@ -1,11 +1,12 @@
 import { findBy, insertAt } from '@shell/utils/array';
-import { TIMESTAMP, CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations';
+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, matching, matches } from '@shell/utils/selector';
+import { convertSelectorObj, parse } from '@shell/utils/selector';
 import { SEPARATOR } from '@shell/config/workload';
 import WorkloadService from '@shell/models/workload.service';
+import { matching } from '@shell/utils/selector-typed';
 
 export const defaultContainer = {
   imagePullPolicy: 'Always',
@@ -18,6 +19,7 @@ export const defaultContainer = {
   },
   volumeMounts: []
 };
+
 export default class Workload extends WorkloadService {
   // remove clone as yaml/edit as yaml until API supported
   get _availableActions() {
@@ -46,11 +48,12 @@ export default class Workload extends WorkloadService {
       });
 
       insertAt(out, 0, {
-        action:   'redeploy',
-        label:    this.t('action.redeploy'),
-        icon:     'icon icon-refresh',
-        enabled:  !!this.links.update,
-        bulkable: true,
+        action:     'redeploy',
+        label:      this.t('action.redeploy'),
+        icon:       'icon icon-refresh',
+        enabled:    !!this.links.update,
+        bulkable:   true,
+        bulkAction: 'redeploy'
       });
 
       insertAt(out, 0, {
@@ -196,8 +199,8 @@ export default class Workload extends WorkloadService {
     }
 
     this.$dispatch('growl/error', {
-      title:   'Unavailable',
-      message: 'There are no running pods to execute a shell in.'
+      title:   '不可用',
+      message: '没有正在运行的 Pod 可用来执行 Shell。'
     }, { root: true });
   }
 
@@ -205,22 +208,20 @@ export default class Workload extends WorkloadService {
     return this.goToEdit({ sidecar: true });
   }
 
-  get showPodRestarts() {
-    return true;
-  }
-
   get restartCount() {
-    const pods = this.pods;
+    return this.pods.reduce((total, pod) => {
+      const { status:{ containerStatuses = [] } } = pod;
 
-    let sum = 0;
+      if (containerStatuses.length) {
+        total += containerStatuses.reduce((tot, container) => {
+          tot += container.restartCount || 0;
 
-    pods.forEach((pod) => {
-      if (pod.status.containerStatuses) {
-        sum += pod.status?.containerStatuses[0].restartCount || 0;
+          return tot;
+        }, 0);
       }
-    });
 
-    return sum;
+      return total;
+    }, 0);
   }
 
   get hasSidecars() {
@@ -334,6 +335,10 @@ export default class Workload extends WorkloadService {
     const type = this._type ? this._type : this.type;
 
     const detailItem = {
+      restarts: {
+        label:   this.t('resourceDetail.masthead.restartCount'),
+        content: this.restartCount
+      },
       endpoint: {
         label:     'Endpoints',
         content:   this.endpoint,
@@ -400,10 +405,13 @@ export default class Workload extends WorkloadService {
       });
     }
 
-    out.push( {
+    out.push({
       label:     'Image',
       content:   this.imageNames,
       formatter: 'PodImages'
+    }, {
+      label:   detailItem.restarts.label,
+      content: detailItem.restarts.content,
     });
 
     switch (type) {
@@ -437,19 +445,14 @@ export default class Workload extends WorkloadService {
     return out;
   }
 
-  redeploy() {
-    const now = (new Date()).toISOString().replace(/\.\d+Z$/, 'Z');
+  redeploy(resources = this) {
+    const workloads = Array.isArray(resources) ? resources : [resources];
 
-    if ( !this.spec.template.metadata ) {
-      set(this.spec.template, 'metadata', {});
-    }
-
-    const annotations = this.spec.template.metadata.annotations || {};
-
-    annotations[TIMESTAMP] = now;
-    set(this.spec.template.metadata, 'annotations', annotations);
-
-    this.save();
+    this.$dispatch('promptModal', {
+      modalWidth:     '500px',
+      componentProps: { workloads },
+      component:      'RedeployWorkloadDialog'
+    });
   }
 
   // match existing container ports with services created for this workload
@@ -550,30 +553,60 @@ export default class Workload extends WorkloadService {
     }
   }
 
-  get pods() {
-    const relationships = this.metadata?.relationships || [];
-    const podRelationship = relationships.filter((relationship) => relationship.toType === POD)[0];
+  async fetchPods() {
+    if (this.podMatchExpression) {
+      return this.$dispatch('findLabelSelector', {
+        type:     POD,
+        matching: {
+          namespace:     this.metadata.namespace,
+          labelSelector: { matchExpressions: this.podMatchExpression },
+        },
+      });
+    }
 
-    if (podRelationship) {
-      const pods = this.$getters['podsByNamespace'](this.metadata.namespace);
+    return undefined;
+  }
 
-      // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
-      return pods.filter((obj) => {
-        return matches(obj, podRelationship.selector);
-      });
+  async unWatchPods() {
+    return await this.$dispatch('unwatch', { type: POD, all: true });
+  }
+
+  /**
+   * This getter expects a superset of workload pods to have been fetched already
+   *
+   * It assumes fetchPods has been called and should be used instead of the response of fetchPods
+   * (findAll --> findLabelSelector world results won't trigger change detection)
+   */
+  get pods() {
+    if (this.podMatchExpression) {
+      return this.$getters['matchingLabelSelector'](POD, { matchExpressions: this.podMatchExpression }, this.metadata.namespace);
     } else {
       return [];
     }
   }
 
-  get podGauges() {
+  /**
+   * Return a string version of a matchLabel expression
+   */
+  get podSelector() {
+    const relationships = this.metadata?.relationships || [];
+    const selector = relationships.filter((relationship) => relationship.toType === POD)[0]?.selector;
+
+    return selector;
+  }
+
+  get podMatchExpression() {
+    return this.podSelector ? parse(this.podSelector) : null;
+  }
+
+  calcPodGauges(pods) {
     const out = { };
 
-    if (!this.pods) {
+    if (!pods) {
       return out;
     }
 
-    this.pods.map((pod) => {
+    pods.map((pod) => {
       const { stateColor, stateDisplay } = pod;
 
       if (out[stateDisplay]) {
@@ -589,13 +622,17 @@ export default class Workload extends WorkloadService {
     return out;
   }
 
+  get podGauges() {
+    return this.calcPodGauges(this.pods);
+  }
+
   // Job Specific
   get jobRelationships() {
     if (this.type !== WORKLOAD_TYPES.CRON_JOB) {
       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) || [];
   }
 
   /**
@@ -664,13 +701,16 @@ export default class Workload extends WorkloadService {
   }
 
   async matchingPods() {
-    // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
-    const all = await this.$dispatch('findAll', { type: POD });
-    const allInNamespace = all.filter((pod) => pod.metadata.namespace === this.metadata.namespace);
-
-    const selector = convertSelectorObj(this.spec.selector);
+    const matchInfo = await matching({
+      labelSelector: { matchExpressions: convertSelectorObj(this.spec.selector) },
+      type:          POD,
+      $store:        this.$store || { getters: this.$rootGetters, dispatch: (action, args) => this.$dispatch(action.split('/')[1], args) },
+      inStore:       this.$rootGetters['currentProduct'].inStore,
+      namespace:     this.metadata.namespace,
+      transient:     true,
+    });
 
-    return matching(allInNamespace, selector);
+    return matchInfo.matches;
   }
 
   cleanForSave(data) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "3.0.2-test.20250913",
+  "version": "3.0.5-logTest.2",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -51,11 +51,12 @@
     "add": "2.0.6",
     "ansi_up": "5.0.0",
     "axios-retry": "3.1.9",
-    "axios": "0.21.4",
+    "axios": "1.8.4",
     "babel-eslint": "10.1.0",
     "babel-plugin-module-resolver": "4.0.0",
     "babel-preset-vue": "2.0.2",
     "cache-loader": "4.1.0",
+    "chart.js": "4.4.8",
     "clipboard-polyfill": "4.0.1",
     "codemirror-editor-vue3": "2.8.0",
     "codemirror": ">=5.64.0 <6",
@@ -75,7 +76,7 @@
     "dayjs": "1.8.29",
     "defu": "5.0.1",
     "diff2html": "3.4.24",
-    "dompurify": "2.5.4",
+    "dompurify": "3.2.5",
     "element-matches": "^0.1.2",
     "entities": "4.5.0",
     "eslint-config-standard": "16.0.3",
@@ -85,7 +86,7 @@
     "eslint-plugin-import": "2.31.0",
     "eslint-plugin-jest": "24.4.0",
     "eslint-plugin-n": "15.2.0",
-    "eslint-plugin-vue": "9.10.0",
+    "eslint-plugin-vue": "9.32.0",
     "eslint": "7.32.0",
     "event-target-shim": "5.0.1",
     "express": "4.17.1",
@@ -105,7 +106,7 @@
     "js-yaml-loader": "1.2.2",
     "js-yaml": "4.1.0",
     "jsdiff": "1.1.1",
-    "jsonpath-plus": "10.0.7",
+    "jsonpath-plus": "10.3.0",
     "jsrsasign": "11.0.0",
     "jszip": "3.8.0",
     "lodash": "4.17.21",

package/pages/about.vue

@@ -5,13 +5,14 @@ import BackRoute from '@shell/mixins/back-link';
 import { MANAGEMENT } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
 import { getVendor } from '@shell/config/private-label';
-import { downloadFile } from '@shell/utils/download';
 import { mapGetters } from 'vuex';
 import TabTitle from '@shell/components/TabTitle';
+import { PanelLocation, ExtensionPoint } from '@shell/core/types';
+import ExtensionPanel from '@shell/components/ExtensionPanel';
 
 export default {
   components: {
-    BackLink, Loading, TabTitle
+    BackLink, ExtensionPanel, Loading, TabTitle
   },
   mixins: [BackRoute],
   async fetch() {
@@ -19,8 +20,10 @@ export default {
   },
   data() {
     return {
-      dashboardVersion: this.$config.dashboardVersion,
-      settings:         null,
+      extensionType:     ExtensionPoint.PANEL,
+      extensionLocation: PanelLocation.ABOUT_TOP,
+      dashboardVersion:  this.$config.dashboardVersion,
+      settings:          null,
       SETTING
     };
   },
@@ -43,50 +46,27 @@ export default {
     },
     downloads() {
       return [
-        this.createOSOption('about.os.mac', 'icon-apple', this.settings?.find((s) => s.id === SETTING.CLI_URL.DARWIN)?.value, null),
-        this.createOSOption('about.os.linux', 'icon-linux', this.settings?.find((s) => s.id === SETTING.CLI_URL.LINUX)?.value, this.downloadLinuxImages),
-        this.createOSOption('about.os.windows', 'icon-windows', this.settings?.find((s) => s.id === SETTING.CLI_URL.WINDOWS)?.value, this.downloadWindowsImages)
+        this.createOSOption('about.os.mac', 'icon-apple', this.settings?.find((s) => s.id === SETTING.CLI_URL.DARWIN)?.value),
+        this.createOSOption('about.os.linux', 'icon-linux', this.settings?.find((s) => s.id === SETTING.CLI_URL.LINUX)?.value),
+        this.createOSOption('about.os.windows', 'icon-windows', this.settings?.find((s) => s.id === SETTING.CLI_URL.WINDOWS)?.value)
       ];
     },
-    downloadImageList() {
-      return this.downloads.filter((d) => !!d.imageList);
-    },
     downloadCli() {
       return this.downloads.filter((d) => !!d.cliLink);
     }
   },
   methods: {
-    createOSOption(label, icon, cliLink, imageList) {
+    createOSOption(label, icon, cliLink) {
       const slash = cliLink?.lastIndexOf('/');
 
       return {
         label,
         icon,
-        imageList,
         cliLink,
         cliFile: slash >= 0 ? cliLink.substr(slash + 1, cliLink.length - 1) : cliLink
       };
     },
 
-    async downloadLinuxImages() {
-      const res = await this.$store.dispatch('management/request', { url: '/v3/kontainerdrivers/rancher-images' });
-
-      try {
-        await downloadFile(`.rancher-linux-images.txt`, res.data);
-      } catch (error) {
-        this.$store.dispatch('growl/fromError', { title: 'Error downloading Linux image list', err: error }, { root: true });
-      }
-    },
-
-    async downloadWindowsImages() {
-      const res = await this.$store.dispatch('management/request', { url: '/v3/kontainerdrivers/rancher-windows-images' });
-
-      try {
-        await downloadFile(`.rancher-windows-images.txt`, res.data);
-      } catch (error) {
-        this.$store.dispatch('growl/fromError', { title: 'Error downloading Windows image list', err: error }, { root: true });
-      }
-    },
   }
 };
 </script>
@@ -115,6 +95,12 @@ export default {
         {{ t('about.diagnostic.title') }}
       </router-link>
     </div>
+    <!-- Extensions area -->
+    <ExtensionPanel
+      :resource="{}"
+      :type="extensionType"
+      :location="extensionLocation"
+    />
     <h3>{{ t('about.versions.title') }}</h3>
     <table>
       <thead>
@@ -205,36 +191,6 @@ export default {
         {{ t('about.versions.releaseNotes') }}
       </a>
     </p>
-    <template v-if="downloadImageList.length">
-      <h3 class="pt-40">
-        {{ t('about.downloadImageList.title') }}
-      </h3>
-      <table>
-        <tr
-          v-for="(d, i) in downloadImageList"
-          :key="i"
-        >
-          <th>
-            <div class="os">
-              <i :class="`icon ${d.icon} mr-5`" /> {{ t(d.label) }}
-            </div>
-          </th>
-          <td>
-            <a
-              v-if="d.imageList"
-              tabindex="0"
-              :data-testid="`image_list_download_link__${d.label}`"
-              role="link"
-              :aria-label="t('about.versions.downloadImages', { listName: t(d.label) })"
-              @click="d.imageList"
-              @keyup.enter="d.imageList"
-            >
-              {{ t('asyncButton.download.action') }}
-            </a>
-          </td>
-        </tr>
-      </table>
-    </template>
     <template v-if="downloadCli.length">
       <h3 class="pt-40">
         {{ t('about.downloadCLI.title') }}