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

package/mixins/create-edit-view/impl.js

@@ -117,7 +117,16 @@ export default {
     // If they are resolved, return a false-y value
     // Else they can't be resolved, return an array of errors to show to the user.
     async conflict() {
-      return await handleConflict(this.initialValue.toJSON(), this.value, this.liveValue, this.$store.getters, this.$store, this.storeOverride || this.$store.getters['currentStore'](this.value.type));
+      return await handleConflict(
+        this.initialValue,
+        this.value,
+        this.liveValue,
+        {
+          dispatch: this.$store.dispatch,
+          getters:  this.$store.getters
+        },
+        this.storeOverride || this.$store.getters['currentStore'](this.value.type)
+      );
     },
 
     async save(buttonDone, url, depth = 0) {

package/mixins/resource-fetch-api-pagination.js

@@ -125,7 +125,7 @@ export default {
         context: this.context,
       };
 
-      return this.$store.getters[`${ this.inStore }/paginationEnabled`]?.(args);
+      return this.$store.getters[`${ this.overrideInStore || this.inStore }/paginationEnabled`]?.(args);
     }
   },
 
@@ -200,7 +200,7 @@ export default {
         return;
       }
 
-      return this.$store.getters[`${ this.inStore }/havePage`](this.resource);
+      return this.$store.getters[`${ this.overrideInStore || this.inStore }/havePage`](this.resource);
     },
 
     /**
@@ -280,12 +280,12 @@ export default {
           projectsOrNamespaces,
           filters
         } = stevePaginationUtils.createParamsFromNsFilter({
-          allNamespaces:                this.$store.getters[`${ this.currentProduct?.inStore }/all`](NAMESPACE),
-          selection:                    neu,
-          isAllNamespaces:              this.isAllNamespaces,
-          isLocalCluster:               this.$store.getters['currentCluster'].isLocal,
-          showDynamicRancherNamespaces: this.showDynamicRancherNamespaces,
-          productHidesSystemNamespaces: this.productHidesSystemNamespaces,
+          allNamespaces:                 this.$store.getters[`${ this.currentProduct?.inStore }/all`](NAMESPACE),
+          selection:                     neu,
+          isAllNamespaces:               this.isAllNamespaces,
+          isLocalCluster:                this.$store.getters['currentCluster'].isLocal,
+          showReservedRancherNamespaces: this.showDynamicRancherNamespaces,
+          productHidesSystemNamespaces:  this.productHidesSystemNamespaces,
         });
 
         this.requestFilters.filters = filters;
@@ -352,7 +352,7 @@ export default {
     }
   },
 
-  unmounted() {
+  async beforeUnmount() {
     if (this.havePaginated) {
       // of type @STEVE_WATCH_PARAMS
       const watchArgs = {
@@ -360,9 +360,8 @@ export default {
         mode: STEVE_WATCH_MODE.RESOURCE_CHANGES,
       };
 
-      this.$store.dispatch(`${ this.inStore }/forgetType`, this.resource, (watchParams) => {
-        return watchParams.type === watchArgs.type &&
-        watchParams.mode === watchArgs.type.mode;
+      await this.$store.dispatch(`${ this.overrideInStore || this.inStore }/forgetType`, this.resource, (watchParams) => {
+        return watchParams.type === watchArgs.type && watchParams.mode === watchArgs.type.mode;
       });
     }
   }

package/mixins/resource-fetch.js

@@ -242,7 +242,9 @@ export default {
     },
 
     __getCountForResource(resourceName, namespace, storeType) {
-      const resourceCounts = this.$store.getters[`${ storeType }/all`](COUNT)[0]?.counts[`${ resourceName }`]; // NB `rancher` store behaves differently, lacks counts but has resource
+      const currStore = storeType || this.$store.getters['currentStore']();
+
+      const resourceCounts = this.$store.getters[`${ currStore }/all`](COUNT)[0]?.counts[`${ resourceName }`]; // NB `rancher` store behaves differently, lacks counts but has resource
       const resourceCount = namespace && resourceCounts?.namespaces ? resourceCounts?.namespaces[namespace]?.count : resourceCounts?.summary?.count;
 
       return resourceCount || 0;

package/models/__tests__/chart.test.ts

@@ -1,6 +1,24 @@
 import Chart from '@shell/models/chart';
 import { APP_UPGRADE_STATUS } from '@shell/store/catalog';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
+import { ZERO_TIME } from '@shell/config/types';
+
+type MockChartContext = {
+  rootGetters: {
+    'cluster/all': () => any[];
+    'i18n/t': (key: string) => string;
+  };
+  dispatch?: jest.Mock;
+};
+
+interface CardContent {
+  subHeaderItems: { label: string }[];
+  footerItems: { labels: string[]; icon?: string }[];
+  statuses: { tooltip: { key: string }; color: string }[];
+}
+
+const t = jest.fn((key) => key); // mock translation function
+const dispatch = jest.fn();
 
 const base = {
   chartName:       'my-app',
@@ -29,16 +47,31 @@ function makeInstalledApp(upgradeAvailable = APP_UPGRADE_STATUS.NO_UPGRADE) {
         }
       }
     },
+    metadata: {},
     upgradeAvailable
   };
 }
 
 describe('class Chart', () => {
+  let ctx: MockChartContext;
+
+  beforeEach(() => {
+    ctx = {
+      rootGetters: {
+        'cluster/all': () => [],
+        'i18n/t':      t
+      },
+      dispatch
+    };
+  });
+
   describe('matchingInstalledApps', () => {
     it('matches by name, repo, and home in latest version', () => {
       const installedApp = makeInstalledApp();
 
-      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [installedApp] } });
+      ctx.rootGetters['cluster/all'] = () => [installedApp];
+
+      const chart = new Chart(base, ctx);
 
       expect(chart.matchingInstalledApps).toHaveLength(1);
     });
@@ -47,8 +80,9 @@ describe('class Chart', () => {
       const installedApp = makeInstalledApp();
 
       installedApp.spec.chart.metadata.name = 'different-app';
+      ctx.rootGetters['cluster/all'] = () => [installedApp];
 
-      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [installedApp] } });
+      const chart = new Chart(base, ctx);
 
       expect(chart.matchingInstalledApps).toHaveLength(0);
     });
@@ -57,8 +91,9 @@ describe('class Chart', () => {
       const installedApp = makeInstalledApp();
 
       installedApp.spec.chart.metadata.annotations[CATALOG_ANNOTATIONS.SOURCE_REPO_NAME] = 'different-repo';
+      ctx.rootGetters['cluster/all'] = () => [installedApp];
 
-      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [installedApp] } });
+      const chart = new Chart(base, ctx);
 
       expect(chart.matchingInstalledApps).toHaveLength(0);
     });
@@ -66,9 +101,10 @@ describe('class Chart', () => {
     it('matches by version+home when not latest', () => {
       const installedApp = makeInstalledApp();
 
-      installedApp.spec.chart.metadata.version = '1.2.3'; // not the latest in base
+      installedApp.spec.chart.metadata.version = '1.2.3';
+      ctx.rootGetters['cluster/all'] = () => [installedApp];
 
-      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [installedApp] } });
+      const chart = new Chart(base, ctx);
 
       expect(chart.matchingInstalledApps).toHaveLength(1);
     });
@@ -76,10 +112,11 @@ describe('class Chart', () => {
     it('can use fallback repo from metadata labels', () => {
       const installedApp = makeInstalledApp();
 
-      installedApp.spec.chart.metadata.annotations = {}; // remove SOURCE_REPO_NAME
+      installedApp.spec.chart.metadata.annotations = {};
       installedApp.metadata = { labels: { [CATALOG_ANNOTATIONS.CLUSTER_REPO_NAME]: 'my-repo' } };
+      ctx.rootGetters['cluster/all'] = () => [installedApp];
 
-      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [installedApp] } });
+      const chart = new Chart(base, ctx);
 
       expect(chart.matchingInstalledApps).toHaveLength(1);
     });
@@ -87,45 +124,29 @@ describe('class Chart', () => {
 
   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 installedApp = makeInstalledApp();
+
+      installedApp.spec.chart.metadata.version = '1.2.3';
+      ctx.rootGetters['cluster/all'] = () => [installedApp];
 
-      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [installedApp] } });
+      const chart = new Chart(base, ctx);
 
       expect(chart.isInstalled).toBe(true);
     });
 
     it('is false when no apps match', () => {
-      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [] } });
+      const chart = new Chart(base, ctx);
 
       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 app = makeInstalledApp();
 
-      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [appTemplate, appTemplate] } });
+      app.spec.chart.metadata.version = '1.2.3';
+      ctx.rootGetters['cluster/all'] = () => [app, app];
+
+      const chart = new Chart(base, ctx);
 
       expect(chart.isInstalled).toBe(false);
     });
@@ -133,47 +154,29 @@ describe('class Chart', () => {
 
   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 installedApp = makeInstalledApp(APP_UPGRADE_STATUS.SINGLE_UPGRADE);
+
+      installedApp.spec.chart.metadata.version = '1.2.3';
+      ctx.rootGetters['cluster/all'] = () => [installedApp];
 
-      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [installedApp] } });
+      const chart = new Chart(base, ctx);
 
       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 installedApp = makeInstalledApp(APP_UPGRADE_STATUS.NO_UPGRADE);
+
+      installedApp.spec.chart.metadata.version = '1.2.3';
+      ctx.rootGetters['cluster/all'] = () => [installedApp];
 
-      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [installedApp] } });
+      const chart = new Chart(base, ctx);
 
       expect(chart.upgradeable).toBe(false);
     });
 
     it('is false when not installed', () => {
-      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [] } });
+      const chart = new Chart(base, ctx);
 
       expect(chart.upgradeable).toBe(false);
     });
@@ -181,9 +184,9 @@ describe('class Chart', () => {
 
   describe('cardContent', () => {
     it('includes correct subHeader and footer info', () => {
-      const chart = new Chart(base, { rootGetters: { 'cluster/all': () => [] } });
+      const chart = new Chart(base, ctx);
 
-      const result = chart.cardContent;
+      const result = chart.cardContent as CardContent;
 
       expect(result.subHeaderItems).toHaveLength(2);
       expect(result.subHeaderItems[0].label).toBe('1.3.0');
@@ -200,66 +203,72 @@ describe('class Chart', () => {
         ...base,
         categories: ['database'],
         tags:       ['linux', 'experimentl']
-      }, { rootGetters: { 'cluster/all': () => [] } });
+      }, ctx);
 
-      const result = chart.cardContent;
+      const result = chart.cardContent as 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');
+      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']));
+      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 chart = new Chart({ ...base, deprecated: true }, ctx);
 
-      const result = chart.cardContent;
+      const result = chart.cardContent as CardContent;
 
       const deprecatedStatus = result.statuses.find((s) => s.tooltip.key === 'generic.deprecated');
 
       expect(deprecatedStatus).toBeDefined();
-      expect(deprecatedStatus.color).toBe('error');
+      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] } });
+      ctx.rootGetters['cluster/all'] = () => [installedApp];
 
-      const result = chart.cardContent;
+      const chart = new Chart(base, ctx);
+
+      const result = chart.cardContent as CardContent;
 
       const installedStatus = result.statuses.find((s) => s.tooltip.key === 'generic.installed');
 
       expect(installedStatus).toBeDefined();
-      expect(installedStatus.color).toBe('success');
+      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] } });
+      ctx.rootGetters['cluster/all'] = () => [installedApp];
 
-      const result = chart.cardContent;
+      const chart = new Chart(base, ctx);
+
+      const result = chart.cardContent as CardContent;
 
       const upgradeableStatus = result.statuses.find((s) => s.tooltip.key === 'generic.upgradeable');
 
       expect(upgradeableStatus).toBeDefined();
-      expect(upgradeableStatus.color).toBe('info');
+      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] } });
+      ctx.rootGetters['cluster/all'] = () => [installedApp];
 
-      const result = chart.cardContent;
+      const chart = new Chart({ ...base, deprecated: true }, ctx);
+
+      const result = chart.cardContent as CardContent;
 
       const keys = result.statuses.map((s) => s.tooltip.key);
 
@@ -269,5 +278,27 @@ describe('class Chart', () => {
         'generic.installed'
       ]));
     });
+
+    it('handles zero time for last updated date', () => {
+      const chartWithZeroTime = {
+        ...base,
+        versions: [{
+          ...base.versions[0],
+          created: ZERO_TIME,
+        }]
+      };
+      const chart = new Chart(chartWithZeroTime, {
+        rootGetters: {
+          'cluster/all': () => [],
+          'i18n/t':      (key) => key
+        },
+      });
+
+      const result = chart.cardContent;
+      const lastUpdatedItem = result.subHeaderItems[1];
+
+      expect(lastUpdatedItem.label).toBe('generic.na');
+      expect(lastUpdatedItem.labelTooltip).toBe('catalog.charts.appChartCard.subHeaderItem.missingVersionDate');
+    });
   });
 });

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('');
+    });
+  });
+});