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

package/models/__tests__/fleet.cattle.io.helmop.test.ts

@@ -0,0 +1,224 @@
+import HelmOp from '@shell/models/fleet.cattle.io.helmop.js';
+
+describe('class HelmOp', () => {
+  let instance;
+
+  describe('source getter', () => {
+    it('should return correct source for SOURCE_TYPE.REPO (HTTPS)', () => {
+      instance = new HelmOp({
+        spec: {
+          helm: {
+            repo:  'https://charts.rancher.io/fleet',
+            chart: 'fleet-agent'
+          }
+        }
+      });
+
+      const source = instance.source;
+
+      expect(source.value).toBe('https://charts.rancher.io/fleet');
+      expect(source.display).toBe('charts.rancher.io/fleet');
+      expect(source.icon).toBe('icon icon-application');
+      expect(source.showLink).toBe(true);
+    });
+
+    it('should return correct source for SOURCE_TYPE.REPO (GitHub HTTPS .git)', () => {
+      instance = new HelmOp({
+        spec: {
+          helm: {
+            repo:  'https://github.com/rancher/fleet.git',
+            chart: 'fleet'
+          }
+        }
+      });
+
+      const source = instance.source;
+
+      expect(source.value).toBe('https://github.com/rancher/fleet.git');
+      expect(source.display).toBe('rancher/fleet');
+      expect(source.icon).toBe('icon icon-application');
+      expect(source.showLink).toBe(true);
+    });
+
+    it('should return correct source for SOURCE_TYPE.REPO (GitHub SSH)', () => {
+      instance = new HelmOp({
+        spec: {
+          helm: {
+            repo:  'git@github.com:rancher/fleet.git',
+            chart: 'fleet'
+          }
+        }
+      });
+
+      const source = instance.source;
+
+      expect(source.value).toBe('https://github.com/rancher/fleet');
+      expect(source.display).toBe('rancher/fleet');
+      expect(source.icon).toBe('icon icon-application');
+      expect(source.showLink).toBe(true);
+    });
+
+    it('should return correct source for SOURCE_TYPE.OCI', () => {
+      instance = new HelmOp({ spec: { helm: { repo: 'oci://ghcr.io/rancher/some-chart' } } });
+
+      const source = instance.source;
+
+      expect(source.value).toBe('oci://ghcr.io');
+      expect(source.display).toBe('oci://ghcr.io');
+      expect(source.icon).toBe('icon icon-application');
+      expect(source.showLink).toBe(false);
+    });
+
+    it('should return correct source for SOURCE_TYPE.TARBALL', () => {
+      instance = new HelmOp({ spec: { helm: { chart: 'https://github.com/rancher/fleet-helm-charts/releases/download/fleet-0.12.1-beta.2/fleet-0.12.1-beta.2.tgz' } } });
+
+      const source = instance.source;
+
+      expect(source.value).toBe('https://github.com/rancher/fleet-helm-charts/releases/download/fleet-0.12.1-beta.2/fleet-0.12.1-beta.2.tgz');
+      expect(source.display).toBe('rancher/fleet-helm-charts/releases/download/fleet-0.12.1-beta.2/fleet-0.12.1-beta.2.tgz');
+      expect(source.icon).toBe('icon icon-application');
+      expect(source.showLink).toBe(true);
+    });
+
+    it('should handle missing helm spec gracefully', () => {
+      instance = new HelmOp({ spec: {} });
+      const source = instance.source;
+
+      expect(source.value).toBe('');
+      expect(source.display).toBeNull();
+      expect(source.icon).toBe('icon icon-application');
+      expect(source.showLink).toBe(false);
+    });
+  });
+
+  describe('sourceSub getter', () => {
+    it('should display chart name and desired version when both are present (SOURCE_TYPE.REPO)', () => {
+      instance = new HelmOp({
+        spec: {
+          helm: {
+            repo:    'https://charts.rancher.io/fleet',
+            chart:   'fleet-agent',
+            version: '0.12.x'
+          }
+        }
+      });
+
+      const sourceSub = instance.sourceSub;
+
+      expect(sourceSub.value).toBe('fleet-agent : 0.12.x');
+      expect(sourceSub.display).toBe('fleet-agent : 0.12.x');
+    });
+
+    it('should display chart name and desired version when both are present (SOURCE_TYPE.OCI)', () => {
+      instance = new HelmOp({
+        spec: {
+          helm: {
+            repo:    'oci://ghcr.io/rancher/some-chart',
+            version: '1.0.0'
+          }
+        }
+      });
+
+      const sourceSub = instance.sourceSub;
+
+      expect(sourceSub.value).toBe('rancher/some-chart : 1.0.0');
+      expect(sourceSub.display).toBe('rancher/some-chart : 1.0.0');
+    });
+
+    it('should display only installed version when only it is present', () => {
+      instance = new HelmOp({
+        status: { version: '0.12.3' },
+        spec:   { helm: {} }
+      });
+
+      const sourceSub = instance.sourceSub;
+
+      expect(sourceSub.value).toBe('0.12.3');
+      expect(sourceSub.display).toBe('0.12.3');
+    });
+
+    it('should display semantic version when installed version is missing', () => {
+      instance = new HelmOp({
+        spec: {
+          helm: {
+            version: '0.12.x',
+            chart:   'test-chart'
+          }
+        }
+      });
+
+      const sourceSub = instance.sourceSub;
+
+      expect(sourceSub.value).toBe('0.12.x');
+      expect(sourceSub.display).toBe('0.12.x');
+    });
+
+    it('should display "semantic -> installed" when both versions are present (no chart)', () => {
+      instance = new HelmOp({
+        spec:   { helm: { version: '0.12.x' } },
+        status: { version: '0.12.5' }
+      });
+
+      const sourceSub = instance.sourceSub;
+
+      expect(sourceSub.value).toBe('0.12.x -> 0.12.5');
+      expect(sourceSub.display).toBe('0.12.x -> 0.12.5');
+    });
+
+    it('should display chart and "semantic -> installed" when all are present', () => {
+      instance = new HelmOp({
+        spec: {
+          helm: {
+            repo:    'https://charts.rancher.io/fleet',
+            chart:   'fleet-agent',
+            version: '0.12.x'
+          }
+        },
+        status: { version: '0.12.5' }
+      });
+
+      const sourceSub = instance.sourceSub;
+
+      expect(sourceSub.value).toBe('fleet-agent : 0.12.x -> 0.12.5');
+      expect(sourceSub.display).toBe('fleet-agent : 0.12.x -> 0.12.5');
+    });
+
+    it('should display chart and only semantic version when all are present but semantic version is equal to installed version (no duplicate info)', () => {
+      instance = new HelmOp({
+        spec: {
+          helm: {
+            repo:    'https://charts.rancher.io/fleet',
+            chart:   'fleet-agent',
+            version: '0.12.3'
+          }
+        },
+        status: { version: '0.12.3' }
+      });
+
+      const sourceSub = instance.sourceSub;
+
+      expect(sourceSub.value).toBe('fleet-agent : 0.12.3');
+      expect(sourceSub.display).toBe('fleet-agent : 0.12.3');
+    });
+
+    it('should return empty string when no version or chart information is available', () => {
+      instance = new HelmOp({
+        spec:   { helm: {} },
+        status: {}
+      });
+
+      const sourceSub = instance.sourceSub;
+
+      expect(sourceSub.value).toBe('');
+      expect(sourceSub.display).toBe('');
+    });
+
+    it('should correctly handle missing helm spec', () => {
+      instance = new HelmOp({ spec: {}, status: {} });
+      const sourceSub = instance.sourceSub;
+
+      expect(sourceSub.value).toBe('');
+      expect(sourceSub.display).toBe('');
+    });
+  });
+});

package/models/__tests__/node.test.ts

@@ -1,74 +1,18 @@
-import Node from '@shell/models/management.cattle.io.node';
+import Node from '@shell/models/cluster/node';
 
 describe('class Node', () => {
-  const foo = 'foo';
-  const bar = 'bar';
-  const t = jest.fn(() => bar);
-  const ctx = { rootGetters: { 'i18n/t': t } };
-
   const resetMocks = () => {
     // Clear all mock function calls:
     jest.clearAllMocks();
   };
 
-  it('should not return addresses if they are not present in the resource status', () => {
-    const node = new Node({ status: {} });
+  it.each([
+    ['1200', 1200],
+    ['1k', 1000]
+  ])('given %p status pod capacity value from the backend, should parse the value correctly as %p', (value, result) => {
+    const node = new Node({ status: { capacity: { pods: value } } });
 
-    expect(node.addresses).toStrictEqual([]);
+    expect(node.podCapacity).toStrictEqual(result);
     resetMocks();
   });
-
-  describe('should return addresses', () => {
-    const addresses = [foo];
-
-    it('if they are present directly on the resource status', () => {
-      const node = new Node({ status: { addresses } });
-
-      expect(node.addresses).toStrictEqual(addresses);
-    });
-  });
-
-  describe('should return an internalIp', () => {
-    const addresses = [{ type: 'InternalIP', address: foo }];
-
-    it('if addresses includes an object with an appropriate type and address', () => {
-      const node = new Node({ status: { addresses } });
-
-      expect(node.internalIp).toStrictEqual(foo);
-    });
-  });
-
-  describe('should return an externalIp', () => {
-    const addresses = [{ type: 'ExternalIP', address: foo }];
-
-    it('if addresses includes an object with an appropriate type and address', () => {
-      const node = new Node({ status: { addresses } });
-
-      expect(node.externalIp).toStrictEqual(foo);
-    });
-    it('if internalNodeStatus.addresses includes an object with an appropriate type and address', () => {
-      const node = new Node({ status: { internalNodeStatus: { addresses } } });
-
-      expect(node.externalIp).toStrictEqual(foo);
-    });
-  });
-
-  describe('should return an appropriate message', () => {
-    it('if there is no internalIp to display', () => {
-      const node = new Node({ status: {} }, ctx);
-
-      expect(node.internalIp).toStrictEqual(bar);
-      expect(t).toHaveBeenCalledTimes(1);
-      expect(t).toHaveBeenCalledWith('generic.none');
-      resetMocks();
-    });
-    it('if there is no externalIp to display', () => {
-      const node = new Node({ status: {} }, ctx);
-
-      expect(node.externalIp).toStrictEqual(bar);
-      expect(t).toHaveBeenCalledTimes(1);
-      expect(t).toHaveBeenCalledWith('generic.none');
-      resetMocks();
-    });
-  });
 });

package/models/catalog.cattle.io.app.js

@@ -31,7 +31,7 @@ export default class CatalogApp extends SteveModel {
     const upgrade = {
       action:  'goToUpgrade',
       enabled: true,
-      icon:    'icon icon-fw icon-edit',
+      icon:    'icon icon-edit',
       label:   this.t('catalog.install.action.goToUpgrade'),
     };
 

package/models/catalog.cattle.io.operation.js

@@ -17,7 +17,7 @@ export default class CatalogOperation extends SteveModel {
     const openLogs = {
       action:  'openLogs',
       enabled: true,
-      icon:    'icon icon-fw icon-chevron-right',
+      icon:    'icon icon-chevron-right',
       label:   this.t('action.openLogs'),
       total:   1,
     };

package/models/chart.js

@@ -4,7 +4,7 @@ import {
 } from '@shell/config/query-params';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 import SteveModel from '@shell/plugins/steve/steve-class';
-import { CATALOG } from '@shell/config/types';
+import { CATALOG, ZERO_TIME } from '@shell/config/types';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
 import day from 'dayjs';
 
@@ -121,42 +121,58 @@ export default class Chart extends SteveModel {
    */
   get cardContent() {
     if (!this._cardContent) {
-      const subHeaderItems = [
-        {
+      const latestVersion = this.versions?.[0] || {};
+      const subHeaderItems = [];
+
+      if (latestVersion) {
+        const hasZeroTime = latestVersion.created === ZERO_TIME;
+
+        subHeaderItems.push({
           icon:        'icon-version-alt',
           iconTooltip: { key: 'tableHeaders.version' },
-          label:       this.versions[0].version
-        },
-        {
+          label:       latestVersion.version
+        });
+
+        const lastUpdatedItem = {
           icon:        'icon-refresh-alt',
           iconTooltip: { key: 'tableHeaders.lastUpdated' },
-          label:       day(this.versions[0].created).format('MMM D, YYYY')
+          label:       hasZeroTime ? this.t('generic.na') : day(latestVersion.created).format('MMM D, YYYY')
+        };
+
+        if (hasZeroTime) {
+          lastUpdatedItem.labelTooltip = this.t('catalog.charts.appChartCard.subHeaderItem.missingVersionDate');
         }
-      ];
+
+        subHeaderItems.push(lastUpdatedItem);
+      }
+
       const footerItems = [
         {
-          type:        REPO,
-          icon:        'icon-repository-alt',
-          iconTooltip: { key: 'tableHeaders.repoName' },
-          labels:      [this.repoNameDisplay]
+          type:         REPO,
+          icon:         'icon-repository-alt',
+          iconTooltip:  { key: 'tableHeaders.repoName' },
+          labels:       [this.repoNameDisplay],
+          labelTooltip: this.t('catalog.charts.findSimilar.message', { type: this.t('catalog.charts.findSimilar.types.repo') }, true)
         }
       ];
 
       if (this.categories.length) {
         footerItems.push( {
-          type:        CATEGORY,
-          icon:        'icon-category-alt',
-          iconTooltip: { key: 'generic.category' },
-          labels:      this.categories
+          type:         CATEGORY,
+          icon:         'icon-category-alt',
+          iconTooltip:  { key: 'generic.category' },
+          labels:       this.categories,
+          labelTooltip: this.t('catalog.charts.findSimilar.message', { type: this.t('catalog.charts.findSimilar.types.category') }, true)
         });
       }
 
       if (this.tags.length) {
         footerItems.push({
-          type:        TAG,
-          icon:        'icon-tag-alt',
-          iconTooltip: { key: 'generic.tags' },
-          labels:      this.tags
+          type:         TAG,
+          icon:         'icon-tag-alt',
+          iconTooltip:  { key: 'generic.tags' },
+          labels:       this.tags,
+          labelTooltip: this.t('catalog.charts.findSimilar.message', { type: this.t('catalog.charts.findSimilar.types.tag') }, true)
         });
       }
 

package/models/cloudcredential.js

@@ -1,65 +1,11 @@
-import { CAPI, CLOUD_CREDENTIALS } from '@shell/config/labels-annotations';
+import { CAPI } from '@shell/config/labels-annotations';
 import { fullFields, prefixFields, simplify, suffixFields } from '@shell/store/plugins';
 import { isEmpty, set } from '@shell/utils/object';
-import { MANAGEMENT, SECRET } from '@shell/config/types';
+import { SECRET } from '@shell/config/types';
 import { escapeHtml } from '@shell/utils/string';
 import NormanModel from '@shell/plugins/steve/norman-class';
-import { DATE_FORMAT, TIME_FORMAT } from '@shell/store/prefs';
-import day from 'dayjs';
-
-const harvesterProvider = 'harvester';
-
-const renew = {
-  [harvesterProvider]: {
-    renew: ({ cloudCredential, $ctx }) => {
-      return renew[harvesterProvider].renewBulk(
-        { cloudCredentials: [cloudCredential], $ctx }
-      );
-    },
-    renewBulk: async({ cloudCredentials, $ctx }) => {
-      // A harvester cloud credential (at the moment) is a kubeconfig complete with expiring token
-      // So to renew we just need to generate a new kubeconfig and save it to the cc (similar to shell/cloud-credential/harvester.vue)
-      await Promise.all(cloudCredentials.map(async(cc) => {
-        try {
-          if (!cc.harvestercredentialConfig?.clusterId) {
-            throw new Error(`credential has no matching harvester cluster`);
-          }
-          const mgmtCluster = $ctx.rootGetters['management/byId'](MANAGEMENT.CLUSTER, cc.harvestercredentialConfig.clusterId);
-
-          if (!mgmtCluster) {
-            throw new Error(`cannot find harvester cluster`);
-          }
-
-          const kubeconfigContent = await mgmtCluster.generateKubeConfig();
-
-          cc.setData('kubeconfigContent', kubeconfigContent);
-
-          await cc.save();
-        } catch (error) {
-          console.error(`Unable to refresh harvester cloud credential '${ cc.id }'`, error); // eslint-disable-line no-console
-        }
-      }));
-    }
-  }
-};
 
 export default class CloudCredential extends NormanModel {
-  get _availableActions() {
-    const out = super._availableActions;
-
-    out.splice(0, 0, { divider: true });
-    out.splice(0, 0, {
-      action:     'renew',
-      enabled:    this.canRenew,
-      bulkable:   this.canBulkRenew,
-      bulkAction: 'renewBulk',
-      icon:       'icon icon-fw icon-refresh',
-      label:      this.t('manager.cloudCredentials.renew'),
-    });
-
-    return out;
-  }
-
   get hasSensitiveData() {
     return true;
   }
@@ -231,111 +177,4 @@ export default class CloudCredential extends NormanModel {
   get doneRoute() {
     return 'c-cluster-manager-secret';
   }
-
-  get canRenew() {
-    return !!renew[this.provider]?.renew && this.expires !== undefined && this.canUpdate;
-  }
-
-  get canBulkRenew() {
-    return !!renew[this.provider]?.renewBulk;
-  }
-
-  get expiresForSort() {
-    // Why not just `expires`? Ensures the correct sort order of expired --> expiring --> never expires
-    // (instead of 'never expired' --> 'expired' --> 'expiring')
-    return this.expires !== undefined ? this.expires : Number.MAX_SAFE_INTEGER;
-  }
-
-  get expires() {
-    const expires = this.annotations[CLOUD_CREDENTIALS.EXPIRATION];
-
-    if (typeof expires === 'string') {
-      return parseInt(expires);
-    } else if (typeof expires === 'number') {
-      return expires;
-    }
-
-    return undefined; // Weird things happen if this isn't a number
-  }
-
-  get expireData() {
-    if (typeof this.expiresIn !== 'number') {
-      return null;
-    }
-
-    const sevenDays = 1000 * 60 * 60 * 24 * 7;
-
-    if (this.expiresIn === 0) {
-      return {
-        expired:  true,
-        expiring: false,
-      };
-    } else if (this.expiresIn < sevenDays) {
-      return {
-        expired:  false,
-        expiring: true,
-      };
-    } else if (this.expiresIn) {
-      return {
-        expired:  false,
-        expiring: false,
-      };
-    }
-
-    return null;
-  }
-
-  get expiresString() {
-    if (this.expires === undefined) {
-      return '';
-    }
-
-    if (this.expireData.expired) {
-      return this.t('manager.cloudCredentials.expired');
-    }
-
-    const dateFormat = escapeHtml( this.$rootGetters['prefs/get'](DATE_FORMAT));
-    const timeFormat = escapeHtml( this.$rootGetters['prefs/get'](TIME_FORMAT));
-
-    return day(this.expires).format(`${ dateFormat } ${ timeFormat }`);
-  }
-
-  get expiresIn() {
-    if (this.expires === undefined) {
-      return null;
-    }
-
-    const timeThen = this.expires;
-    const timeNow = Date.now();
-
-    const expiresIn = timeThen - timeNow;
-
-    return expiresIn < 0 ? 0 : expiresIn;
-  }
-
-  renew() {
-    const renewFn = renew[this.provider]?.renew;
-
-    if (!renewFn) {
-      console.error('No fn renew function for ', this.provider); // eslint-disable-line no-console
-    }
-
-    return renewFn({
-      cloudCredential: this,
-      $ctx:            this.$ctx
-    });
-  }
-
-  async renewBulk(cloudCredentials = []) {
-    const renewBulkFn = renew[this.provider]?.renewBulk;
-
-    if (!renewBulkFn) {
-      console.error('No fn renew bulk function for ', this.provider); // eslint-disable-line no-console
-    }
-
-    return renewBulkFn({
-      cloudCredentials,
-      $ctx: this.$ctx
-    });
-  }
 }

package/models/cluster/node.js

@@ -16,7 +16,7 @@ export default class ClusterNode extends SteveModel {
     const cordon = {
       action:   'cordon',
       enabled:  !!normanAction.cordon,
-      icon:     'icon icon-fw icon-pause',
+      icon:     'icon icon-pause',
       label:    'Cordon',
       total:    1,
       bulkable: true
@@ -25,7 +25,7 @@ export default class ClusterNode extends SteveModel {
     const uncordon = {
       action:   'uncordon',
       enabled:  !!normanAction.uncordon,
-      icon:     'icon icon-fw icon-play',
+      icon:     'icon icon-play',
       label:    'Uncordon',
       total:    1,
       bulkable: true
@@ -34,7 +34,7 @@ export default class ClusterNode extends SteveModel {
     const drain = {
       action:     'drain',
       enabled:    !!normanAction.drain,
-      icon:       'icon icon-fw icon-dot-open',
+      icon:       'icon icon-dot-open',
       label:      this.t('drainNode.action'),
       bulkable:   true,
       bulkAction: 'drain'
@@ -43,7 +43,7 @@ export default class ClusterNode extends SteveModel {
     const stopDrain = {
       action:   'stopDrain',
       enabled:  !!normanAction.stopDrain,
-      icon:     'icon icon-fw icon-x',
+      icon:     'icon icon-x',
       label:    this.t('drainNode.actionStop'),
       bulkable: true,
     };
@@ -51,14 +51,14 @@ export default class ClusterNode extends SteveModel {
     const openSsh = {
       action:  'openSsh',
       enabled: !!this.provisionedMachine?.links?.shell,
-      icon:    'icon icon-fw icon-chevron-right',
+      icon:    'icon icon-chevron-right',
       label:   'SSH Shell',
     };
 
     const downloadKeys = {
       action:  'downloadKeys',
       enabled: !!this.provisionedMachine?.links?.sshkeys,
-      icon:    'icon icon-fw icon-download',
+      icon:    'icon icon-download',
       label:   this.t('node.actions.downloadSSHKey'),
     };
 
@@ -227,7 +227,7 @@ export default class ClusterNode extends SteveModel {
   }
 
   get podCapacity() {
-    return Number.parseInt(this.status.capacity?.pods);
+    return parseSi(this.status.capacity?.pods);
   }
 
   get podConsumed() {

package/models/cluster.x-k8s.io.machine.js

@@ -60,13 +60,13 @@ export default class CapiMachine extends SteveModel {
     const openSsh = {
       action:  'openSsh',
       enabled: !!this.links.shell && this.isRunning,
-      icon:    'icon icon-fw icon-chevron-right',
+      icon:    'icon icon-chevron-right',
       label:   'SSH Shell',
     };
     const downloadKeys = {
       action:  'downloadKeys',
       enabled: !!this.links.sshkeys,
-      icon:    'icon icon-fw icon-download',
+      icon:    'icon icon-download',
       label:   this.t('node.actions.downloadSSHKey'),
     };
     const forceRemove = {
@@ -80,7 +80,7 @@ export default class CapiMachine extends SteveModel {
       action:     'toggleScaleDownModal',
       bulkAction: 'toggleScaleDownModal',
       enabled:    !!this.canScaleDown,
-      icon:       'icon icon-minus icon-fw',
+      icon:       'icon icon-minus',
       label:      this.t('node.actions.scaleDown'),
       bulkable:   true
     };