@rancher/shell 3.0.5-rc.3 → 3.0.5-rc.6

package/models/__tests__/chart.test.ts

@@ -0,0 +1,273 @@
+import Chart from '@shell/models/chart';
+import { APP_UPGRADE_STATUS } from '@shell/store/catalog';
+import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
+
+const base = {
+  chartName:       'my-app',
+  repoName:        'my-repo',
+  repoNameDisplay: 'My Repo',
+  versions:        [
+    {
+      version: '1.3.0', home: 'https://example.com', created: '2024-03-10T12:00:00Z'
+    },
+    { version: '1.2.3', home: 'https://example.com' }
+  ],
+  categories: [],
+  tags:       [],
+  deprecated: false
+};
+
+function makeInstalledApp(upgradeAvailable = APP_UPGRADE_STATUS.NO_UPGRADE) {
+  return {
+    spec: {
+      chart: {
+        metadata: {
+          name:        'my-app',
+          version:     '1.3.0',
+          home:        'https://example.com',
+          annotations: { [CATALOG_ANNOTATIONS.SOURCE_REPO_NAME]: 'my-repo' }
+        }
+      }
+    },
+    upgradeAvailable
+  };
+}
+
+describe('class Chart', () => {
+  describe('matchingInstalledApps', () => {
+    it('matches by name, repo, and home in latest version', () => {
+      const installedApp = makeInstalledApp();
+
+      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [installedApp] } });
+
+      expect(chart.matchingInstalledApps).toHaveLength(1);
+    });
+
+    it('does not match if name is different', () => {
+      const installedApp = makeInstalledApp();
+
+      installedApp.spec.chart.metadata.name = 'different-app';
+
+      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [installedApp] } });
+
+      expect(chart.matchingInstalledApps).toHaveLength(0);
+    });
+
+    it('does not match if repo is different', () => {
+      const installedApp = makeInstalledApp();
+
+      installedApp.spec.chart.metadata.annotations[CATALOG_ANNOTATIONS.SOURCE_REPO_NAME] = 'different-repo';
+
+      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [installedApp] } });
+
+      expect(chart.matchingInstalledApps).toHaveLength(0);
+    });
+
+    it('matches by version+home when not latest', () => {
+      const installedApp = makeInstalledApp();
+
+      installedApp.spec.chart.metadata.version = '1.2.3'; // not the latest in base
+
+      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [installedApp] } });
+
+      expect(chart.matchingInstalledApps).toHaveLength(1);
+    });
+
+    it('can use fallback repo from metadata labels', () => {
+      const installedApp = makeInstalledApp();
+
+      installedApp.spec.chart.metadata.annotations = {}; // remove SOURCE_REPO_NAME
+      installedApp.metadata = { labels: { [CATALOG_ANNOTATIONS.CLUSTER_REPO_NAME]: 'my-repo' } };
+
+      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [installedApp] } });
+
+      expect(chart.matchingInstalledApps).toHaveLength(1);
+    });
+  });
+
+  describe('isInstalled', () => {
+    it('is true when one app matches', () => {
+      const installedApp = {
+        spec: {
+          chart: {
+            metadata: {
+              name:        'my-app',
+              version:     '1.2.3',
+              home:        'https://example.com',
+              annotations: { [CATALOG_ANNOTATIONS.SOURCE_REPO_NAME]: 'my-repo' }
+            }
+          }
+        }
+      };
+
+      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [installedApp] } });
+
+      expect(chart.isInstalled).toBe(true);
+    });
+
+    it('is false when no apps match', () => {
+      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [] } });
+
+      expect(chart.isInstalled).toBe(false);
+    });
+
+    it('is false when multiple apps match', () => {
+      const appTemplate = {
+        spec: {
+          chart: {
+            metadata: {
+              name:        'my-app',
+              version:     '1.2.3',
+              home:        'https://example.com',
+              annotations: { [CATALOG_ANNOTATIONS.SOURCE_REPO_NAME]: 'my-repo' }
+            }
+          }
+        }
+      };
+
+      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [appTemplate, appTemplate] } });
+
+      expect(chart.isInstalled).toBe(false);
+    });
+  });
+
+  describe('upgradeable', () => {
+    it('is true when installed and upgradeAvailable is SINGLE_UPGRADE', () => {
+      const installedApp = {
+        spec: {
+          chart: {
+            metadata: {
+              name:        'my-app',
+              version:     '1.2.3',
+              home:        'https://example.com',
+              annotations: { [CATALOG_ANNOTATIONS.SOURCE_REPO_NAME]: 'my-repo' }
+            }
+          }
+        },
+        upgradeAvailable: APP_UPGRADE_STATUS.SINGLE_UPGRADE
+      };
+
+      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [installedApp] } });
+
+      expect(chart.upgradeable).toBe(true);
+    });
+
+    it('is false if upgradeAvailable is different', () => {
+      const installedApp = {
+        spec: {
+          chart: {
+            metadata: {
+              name:        'my-app',
+              version:     '1.2.3',
+              home:        'https://example.com',
+              annotations: { [CATALOG_ANNOTATIONS.SOURCE_REPO_NAME]: 'my-repo' }
+            }
+          }
+        },
+        upgradeAvailable: APP_UPGRADE_STATUS.NO_UPGRADE
+      };
+
+      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [installedApp] } });
+
+      expect(chart.upgradeable).toBe(false);
+    });
+
+    it('is false when not installed', () => {
+      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [] } });
+
+      expect(chart.upgradeable).toBe(false);
+    });
+  });
+
+  describe('cardContent', () => {
+    it('includes correct subHeader and footer info', () => {
+      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [] } });
+
+      const result = chart.cardContent;
+
+      expect(result.subHeaderItems).toHaveLength(2);
+      expect(result.subHeaderItems[0].label).toBe('1.3.0');
+      expect(result.subHeaderItems[1].label).toBe('Mar 10, 2024');
+
+      expect(result.footerItems).toHaveLength(1);
+      expect(result.footerItems[0].labels).toContain('My Repo');
+
+      expect(result.statuses).toHaveLength(0);
+    });
+
+    it('includes category and tag items when present', () => {
+      const chart = new Chart({
+        ...base,
+        categories: ['database'],
+        tags:       ['linux', 'experimentl']
+      }, { rootGetters: { 'cluster/all': () => [] } });
+
+      const result = chart.cardContent;
+
+      expect(result.footerItems).toHaveLength(3);
+
+      const categoryItem = result.footerItems.find((i) => i.icon === 'icon-category-alt');
+
+      expect(categoryItem).toBeDefined();
+      expect(categoryItem.labels).toContain('database');
+
+      const tagItem = result.footerItems.find((i) => i.icon === 'icon-tag-alt');
+
+      expect(tagItem).toBeDefined();
+      expect(tagItem.labels).toStrictEqual(expect.arrayContaining(['linux', 'experimentl']));
+    });
+
+    it('includes deprecated status when deprecated is true', () => {
+      const chart = new Chart({ ...base, deprecated: true }, { rootGetters: { 'cluster/all': () => [] } });
+
+      const result = chart.cardContent;
+
+      const deprecatedStatus = result.statuses.find((s) => s.tooltip.key === 'generic.deprecated');
+
+      expect(deprecatedStatus).toBeDefined();
+      expect(deprecatedStatus.color).toBe('error');
+    });
+
+    it('includes installed status when app is installed', () => {
+      const installedApp = makeInstalledApp();
+
+      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [installedApp] } });
+
+      const result = chart.cardContent;
+
+      const installedStatus = result.statuses.find((s) => s.tooltip.key === 'generic.installed');
+
+      expect(installedStatus).toBeDefined();
+      expect(installedStatus.color).toBe('success');
+    });
+
+    it('includes upgradeable status when upgrade is available', () => {
+      const installedApp = makeInstalledApp(APP_UPGRADE_STATUS.SINGLE_UPGRADE);
+
+      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [installedApp] } });
+
+      const result = chart.cardContent;
+
+      const upgradeableStatus = result.statuses.find((s) => s.tooltip.key === 'generic.upgradeable');
+
+      expect(upgradeableStatus).toBeDefined();
+      expect(upgradeableStatus.color).toBe('info');
+    });
+
+    it('shows all statuses together when all conditions are met', () => {
+      const installedApp = makeInstalledApp(APP_UPGRADE_STATUS.SINGLE_UPGRADE);
+
+      const chart = new Chart({ ...base, deprecated: true }, { rootGetters: { 'cluster/all': () => [installedApp] } });
+
+      const result = chart.cardContent;
+
+      const keys = result.statuses.map((s) => s.tooltip.key);
+
+      expect(keys).toStrictEqual(expect.arrayContaining([
+        'generic.deprecated',
+        'generic.upgradeable',
+        'generic.installed'
+      ]));
+    });
+  });
+});

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

@@ -127,7 +127,7 @@ describe('class GitRepo', () => {
   describe('resourcesStatuses', () => {
     it.each([
       []
-    ])('foobat', () => {
+    ])('fn', () => {
       jest.spyOn(GitRepo.prototype, '$getters', 'get').mockReturnValue({ byId: jest.fn() });
 
       jest.spyOn(GitRepo.prototype, 'targetClusters', 'get').mockReturnValue([{

package/models/chart.js

@@ -1,9 +1,12 @@
-import { compatibleVersionsFor } from '@shell/store/catalog';
+import { compatibleVersionsFor, APP_UPGRADE_STATUS } from '@shell/store/catalog';
 import {
-  REPO_TYPE, REPO, CHART, VERSION, _FLAGGED, HIDE_SIDE_NAV
+  REPO_TYPE, REPO, CHART, VERSION, _FLAGGED, HIDE_SIDE_NAV, CATEGORY, TAG
 } 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 as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
+import day from 'dayjs';
 
 export default class Chart extends SteveModel {
   queryParams(from, hideSideNav) {
@@ -47,4 +50,143 @@ export default class Chart extends SteveModel {
       query,
     });
   }
+
+  /**
+   * Returns the list of installed apps that match this chart by:
+   * - chart name
+   * - repository name
+   * - and either:
+   *   - the home URL matches the latest version’s home URL
+   *   - or version + home URL match any other known version
+   *
+   * Inverse logic of `matchingCharts` in `catalog.cattle.io.app.js`.
+   *
+   * @returns {Array<Object>} List of matching installed app objects.
+   */
+  get matchingInstalledApps() {
+    const latestVersion = this.versions?.[0] || [];
+    const appHome = latestVersion?.home;
+    const installedApps = this.$rootGetters['cluster/all'](CATALOG.APP);
+
+    return installedApps.filter((installedApp) => {
+      const metadata = installedApp?.spec?.chart?.metadata;
+      const name = metadata?.name;
+      const version = metadata?.version;
+      const home = metadata?.home;
+
+      const repoName = metadata?.annotations?.[CATALOG_ANNOTATIONS.SOURCE_REPO_NAME] ||
+                       installedApp?.metadata?.labels?.[CATALOG_ANNOTATIONS.CLUSTER_REPO_NAME];
+
+      // name and repo should match
+      if (name !== this.chartName || !repoName || repoName !== this.repoName) {
+        return false;
+      }
+
+      // match by comparing home URL in the latest version vs home URL from the installed app
+      if (appHome && home === appHome) {
+        return true;
+      }
+
+      // match by version + home for the rest
+      return this.versions?.some((v) => v.version === version && home === appHome);
+    });
+  }
+
+  /**
+   * Determines if the chart is installed by checking if exactly one matching installed app is found.
+   *
+   * @returns {boolean} `true` if the chart is currently installed.
+   */
+  get isInstalled() {
+    return this.matchingInstalledApps.length === 1;
+  }
+
+  /**
+   * Determines if the installed app has a single available upgrade.
+   * Requires the chart to be installed.
+   *
+   * @returns {boolean} `true` if the app is installed and has a single upgrade available.
+   */
+  get upgradeable() {
+    return this.isInstalled && this.matchingInstalledApps[0].upgradeAvailable === APP_UPGRADE_STATUS.SINGLE_UPGRADE;
+  }
+
+  /**
+   * Builds structured metadata for display in RcItemCard.vue:
+   * - Sub-header (version and last updated)
+   * - Footer (repository, categories, tags)
+   * - Status indicators (e.g. deprecated, upgradeable, installed)
+   *
+   * @returns {Object} Card content object with `subHeaderItems`, `footerItems`, and `statuses` arrays.
+   */
+  get cardContent() {
+    if (!this._cardContent) {
+      const subHeaderItems = [
+        {
+          icon:        'icon-version-alt',
+          iconTooltip: { key: 'tableHeaders.version' },
+          label:       this.versions[0].version
+        },
+        {
+          icon:        'icon-refresh-alt',
+          iconTooltip: { key: 'tableHeaders.lastUpdated' },
+          label:       day(this.versions[0].created).format('MMM D, YYYY')
+        }
+      ];
+      const footerItems = [
+        {
+          type:        REPO,
+          icon:        'icon-repository-alt',
+          iconTooltip: { key: 'tableHeaders.repoName' },
+          labels:      [this.repoNameDisplay]
+        }
+      ];
+
+      if (this.categories.length) {
+        footerItems.push( {
+          type:        CATEGORY,
+          icon:        'icon-category-alt',
+          iconTooltip: { key: 'generic.category' },
+          labels:      this.categories
+        });
+      }
+
+      if (this.tags.length) {
+        footerItems.push({
+          type:        TAG,
+          icon:        'icon-tag-alt',
+          iconTooltip: { key: 'generic.tags' },
+          labels:      this.tags
+        });
+      }
+
+      const statuses = [];
+
+      if (this.deprecated) {
+        statuses.push({
+          icon: 'icon-alert-alt', color: 'error', tooltip: { key: 'generic.deprecated' }
+        });
+      }
+
+      if (this.upgradeable) {
+        statuses.push({
+          icon: 'icon-upgrade-alt', color: 'info', tooltip: { key: 'generic.upgradeable' }
+        });
+      }
+
+      if (this.isInstalled) {
+        statuses.push({
+          icon: 'icon-confirmation-alt', color: 'success', tooltip: { key: 'generic.installed' }
+        });
+      }
+
+      this._cardContent = {
+        subHeaderItems,
+        footerItems,
+        statuses
+      };
+    }
+
+    return this._cardContent;
+  }
 }

package/models/{cis.cattle.io.clusterscan.js → compliance.cattle.io.clusterscan.js}

@@ -1,5 +1,5 @@
-import { NAME as PRODUCT_NAME } from '@shell/config/product/cis';
-import { CIS } from '@shell/config/types';
+import { NAME as PRODUCT_NAME } from '@shell/config/product/compliance';
+import { COMPLIANCE } from '@shell/config/types';
 import { findBy } from '@shell/utils/array';
 import { downloadFile, generateZip } from '@shell/utils/download';
 import { get, isEmpty } from '@shell/utils/object';
@@ -53,7 +53,7 @@ export default class ClusterScan extends SteveModel {
       action:  'downloadLatestReport',
       enabled: this.hasReport,
       icon:    'icon icon-fw icon-download',
-      label:   t('cis.downloadReport'),
+      label:   t('compliance.downloadReport'),
       total:   1,
     };
 
@@ -61,7 +61,7 @@ export default class ClusterScan extends SteveModel {
       action:  'downloadAllReports',
       enabled: this.hasReport,
       icon:    'icon icon-fw icon-download',
-      label:   t('cis.downloadAllReports'),
+      label:   t('compliance.downloadAllReports'),
       total:   1,
     };
 
@@ -69,7 +69,7 @@ export default class ClusterScan extends SteveModel {
       out.unshift({ divider: true });
       if (this.spec?.scheduledScanConfig?.cronSchedule) {
         out.unshift(downloadAllReports);
-        downloadReport.label = t('cis.downloadLatestReport');
+        downloadReport.label = t('compliance.downloadLatestReport');
       }
       out.unshift(downloadReport);
     }
@@ -92,7 +92,7 @@ export default class ClusterScan extends SteveModel {
   get hasReports() {
     const { relationships = [] } = this.metadata;
 
-    const reportRel = findBy(relationships, 'toType', CIS.REPORT);
+    const reportRel = findBy(relationships, 'toType', COMPLIANCE.REPORT);
 
     return !!reportRel;
   }
@@ -100,7 +100,7 @@ export default class ClusterScan extends SteveModel {
   async getReports() {
     const owned = await this.findOwned();
 
-    const reports = owned.filter((obj) => obj.type === CIS.REPORT) || [];
+    const reports = owned.filter((obj) => obj.type === COMPLIANCE.REPORT) || [];
 
     return sortBy(reports, 'metadata.creationTimestamp', true);
   }
@@ -158,7 +158,7 @@ export default class ClusterScan extends SteveModel {
       return {
         name:   'c-cluster-product-resource-id',
         params: {
-          resource: CIS.CLUSTER_SCAN_PROFILE,
+          resource: COMPLIANCE.CLUSTER_SCAN_PROFILE,
           product:  PRODUCT_NAME,
           id:       this.status?.lastRunScanProfileName
         }

package/models/{cis.cattle.io.clusterscanbenchmark.js → compliance.cattle.io.clusterscanbenchmark.js}

@@ -3,7 +3,7 @@ import SteveModel from '@shell/plugins/steve/steve-class';
 
 export default class ClusterScanBenchmark extends SteveModel {
   warnDeletionMessage(toRemove = []) {
-    return this.$rootGetters['i18n/t']('cis.deleteBenchmarkWarning', { count: toRemove.length });
+    return this.$rootGetters['i18n/t']('compliance.deleteBenchmarkWarning', { count: toRemove.length });
   }
 
   get isDefault() {

package/models/{cis.cattle.io.clusterscanprofile.js → compliance.cattle.io.clusterscanprofile.js}

@@ -1,11 +1,11 @@
 
 import SteveModel from '@shell/plugins/steve/steve-class';
-import { NAME as PRODUCT_NAME } from '@shell/config/product/cis';
-import { CIS } from '@shell/config/types';
+import { NAME as PRODUCT_NAME } from '@shell/config/product/compliance';
+import { COMPLIANCE } from '@shell/config/types';
 
-export default class CISProfile extends SteveModel {
+export default class ComplianceProfile extends SteveModel {
   warnDeletionMessage(toRemove = []) {
-    return this.$rootGetters['i18n/t']('cis.deleteProfileWarning', { count: toRemove.length });
+    return this.$rootGetters['i18n/t']('compliance.deleteProfileWarning', { count: toRemove.length });
   }
 
   get numberTestsSkipped() {
@@ -19,7 +19,7 @@ export default class CISProfile extends SteveModel {
       return {
         name:   'c-cluster-product-resource-id',
         params: {
-          resource: CIS.BENCHMARK,
+          resource: COMPLIANCE.BENCHMARK,
           product:  PRODUCT_NAME,
           id:       this.spec?.benchmarkVersion
         }

package/models/{cis.cattle.io.clusterscanreport.js → compliance.cattle.io.clusterscanreport.js}

@@ -1,7 +1,7 @@
 import { compare } from '@shell/utils/sort';
 import SteveModel from '@shell/plugins/steve/steve-class';
 
-export default class CISReport extends SteveModel {
+export default class ComplianceReport extends SteveModel {
   get aggregatedTests() {
     const json = this.parsedReport;
     const results = json?.results;