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

package/mixins/__tests__/chart.test.ts

@@ -29,7 +29,10 @@ describe('chartMixin', () => {
             return () => 'repo';
           },
           'catalog/chart': () => {
-            return { id: chartId };
+            return {
+              id:                    chartId,
+              matchingInstalledApps: []
+            };
           },
           'i18n/t': () => jest.fn()
         }
@@ -101,4 +104,139 @@ describe('chartMixin', () => {
       expect(warnings).toHaveLength(expected as number);
     }
   );
+
+  describe('fetchChart', () => {
+    it('should call catalog/version with showDeprecated', async() => {
+      const mockStore = {
+        dispatch: jest.fn(() => Promise.resolve()),
+        getters:  {
+          currentCluster: () => {},
+          isRancher:      () => true,
+          'catalog/repo': () => {
+            return () => 'repo';
+          },
+          'catalog/chart': () => {
+            return {
+              id: 'chart-id', versions: [{ version: '1.0.0' }], matchingInstalledApps: []
+            };
+          },
+          'catalog/version': jest.fn(),
+          'prefs/get':       () => {},
+          'i18n/t':          () => jest.fn()
+        }
+      };
+
+      const DummyComponent = {
+        mixins:   [ChartMixin],
+        template: '<div></div>',
+      };
+
+      const wrapper = mount(
+        DummyComponent,
+        {
+          global: {
+            mocks: {
+              $store: mockStore,
+              $route: {
+                query: {
+                  chart:      'chart_name',
+                  deprecated: 'true'
+                }
+              }
+            }
+          }
+        });
+
+      await wrapper.vm.fetchChart();
+
+      expect(mockStore.getters['catalog/version']).toHaveBeenCalledWith(expect.objectContaining({ showDeprecated: true }));
+    });
+  });
+
+  describe('action', () => {
+    const DummyComponent = {
+      mixins:   [ChartMixin],
+      template: '<div></div>',
+    };
+
+    const mockStore = {
+      dispatch: jest.fn(() => Promise.resolve()),
+      getters:  { 'i18n/t': (key: string) => key }
+    };
+
+    it('should return "install" action when not installed', () => {
+      const wrapper = mount(DummyComponent, {
+        data:   () => ({ existing: null }),
+        global: { mocks: { $store: mockStore } }
+      });
+
+      expect(wrapper.vm.action).toStrictEqual({
+        name: 'install',
+        tKey: 'install',
+        icon: 'icon-plus',
+      });
+    });
+
+    it('should return "editVersion" action when installed and on same version', () => {
+      const wrapper = mount(DummyComponent, {
+        data: () => ({
+          existing: { spec: { chart: { metadata: { version: '1.0.0' } } } },
+          version:  { version: '1.0.0' }
+        }),
+        global: {
+          mocks: {
+            $store: mockStore,
+            $route: { query: {} }
+          }
+        }
+      });
+
+      expect(wrapper.vm.action).toStrictEqual({
+        name: 'editVersion',
+        tKey: 'edit',
+        icon: 'icon-edit',
+      });
+    });
+
+    it('should return "upgrade" action when installed and on a newer version', () => {
+      const wrapper = mount(DummyComponent, {
+        data: () => ({
+          existing: { spec: { chart: { metadata: { version: '1.0.0' } } } },
+          version:  { version: '1.0.1' }
+        }),
+        global: {
+          mocks: {
+            $store: mockStore,
+            $route: { query: {} }
+          }
+        }
+      });
+
+      expect(wrapper.vm.action).toStrictEqual({
+        name: 'upgradeVersion',
+        tKey: 'upgrade',
+        icon: 'icon-upgrade-alt',
+      });
+    });
+    it('should return "downgrade" action when installed and on an older version', () => {
+      const wrapper = mount(DummyComponent, {
+        data: () => ({
+          existing: { spec: { chart: { metadata: { version: '1.0.1' } } } },
+          version:  { version: '1.0.0' }
+        }),
+        global: {
+          mocks: {
+            $store: mockStore,
+            $route: { query: {} }
+          }
+        }
+      });
+
+      expect(wrapper.vm.action).toStrictEqual({
+        name: 'downgrade',
+        tKey: 'downgrade',
+        icon: 'icon-history',
+      });
+    });
+  });
 });

package/mixins/chart.js

@@ -1,6 +1,5 @@
 
 import { mapGetters } from 'vuex';
-
 import {
   REPO_TYPE, REPO, CHART, VERSION, NAMESPACE, NAME, DESCRIPTION as DESCRIPTION_QUERY, DEPRECATED as DEPRECATED_QUERY, HIDDEN, _FLAGGED, _CREATE, _EDIT
 } from '@shell/config/query-params';
@@ -9,10 +8,9 @@ import { SHOW_PRE_RELEASE, mapPref } from '@shell/store/prefs';
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import { NAME as MANAGER } from '@shell/config/product/manager';
 import { OPA_GATE_KEEPER_ID } from '@shell/pages/c/_cluster/gatekeeper/index.vue';
-
 import { formatSi, parseSi } from '@shell/utils/units';
 import { CAPI, CATALOG } from '@shell/config/types';
-import { isPrerelease } from '@shell/utils/version';
+import { isPrerelease, compare } from '@shell/utils/version';
 import difference from 'lodash/difference';
 import { LINUX, APP_UPGRADE_STATUS } from '@shell/store/catalog';
 import { clone } from '@shell/utils/object';
@@ -230,11 +228,27 @@ export default {
     },
 
     action() {
-      if (this.existing) {
-        return this.currentVersion === this.targetVersion ? 'update' : 'upgrade';
+      if (!this.existing) {
+        return {
+          name: 'install', tKey: 'install', icon: 'icon-plus'
+        };
+      }
+
+      if (this.currentVersion === this.targetVersion) {
+        return {
+          name: 'editVersion', tKey: 'edit', icon: 'icon-edit'
+        };
+      }
+
+      if (compare(this.currentVersion, this.targetVersion) < 0) {
+        return {
+          name: 'upgradeVersion', tKey: 'upgrade', icon: 'icon-upgrade-alt'
+        };
       }
 
-      return 'install';
+      return {
+        name: 'downgrade', tKey: 'downgrade', icon: 'icon-history'
+      };
     },
 
     isChartTargeted() {
@@ -276,7 +290,10 @@ export default {
     async fetchChart() {
       this.versionInfoError = null;
 
-      await this.$store.dispatch('catalog/load'); // not the problem
+      await Promise.all([
+        this.$store.dispatch('catalog/load'),
+        this.$store.dispatch('cluster/findAll', { type: CATALOG.APP })
+      ]);
 
       this.fetchStoreChart();
 
@@ -316,6 +333,15 @@ export default {
           this.mode = _CREATE;
           this.existing = null;
         }
+      } else if (this.chart) {
+        const matching = this.chart.matchingInstalledApps;
+
+        if (matching.length === 1) {
+          this.existing = matching[0];
+          this.mode = _EDIT;
+        } else {
+          this.mode = _CREATE;
+        }
       } else {
         // Regular create
 
@@ -345,10 +371,11 @@ export default {
 
       try {
         this.version = this.$store.getters['catalog/version']({
-          repoType:    this.query.repoType,
-          repoName:    this.query.repoName,
-          chartName:   this.query.chartName,
-          versionName: this.query.versionName
+          repoType:       this.query.repoType,
+          repoName:       this.query.repoName,
+          chartName:      this.query.chartName,
+          versionName:    this.query.versionName,
+          showDeprecated: this.showDeprecated
         });
       } catch (e) {
         console.error('Unable to fetch Version: ', e); // eslint-disable-line no-console
@@ -503,18 +530,24 @@ export default {
         version:  this.query.versionName,
       };
 
+      const query = {
+        [REPO_TYPE]: provider.repoType,
+        [REPO]:      provider.repoName,
+        [CHART]:     provider.name,
+        [VERSION]:   provider.version,
+      };
+
+      if (this.showDeprecated) {
+        query[DEPRECATED_QUERY] = this.query.deprecated;
+      }
+
       return {
         name:   install ? 'c-cluster-apps-charts-install' : 'c-cluster-apps-charts-chart',
         params: {
           cluster: this.$route.params.cluster,
           product: this.$store.getters['productId'],
         },
-        query: {
-          [REPO_TYPE]: provider.repoType,
-          [REPO]:      provider.repoName,
-          [CHART]:     provider.name,
-          [VERSION]:   provider.version,
-        }
+        query
       };
     },
 
@@ -530,13 +563,20 @@ export default {
     },
 
     clusterToolsLocation() {
+      const query = {};
+
+      if (this.showDeprecated) {
+        query[DEPRECATED_QUERY] = this.query.deprecated;
+      }
+
       return {
         name:   `c-cluster-explorer-tools`,
         params: {
           product:  EXPLORER,
           cluster:  this.$store.getters['clusterId'],
           resource: CATALOG.APP,
-        }
+        },
+        query
       };
     },
 

package/models/__tests__/namespace.test.ts

@@ -186,4 +186,73 @@ describe('class Namespace', () => {
   it.todo('should return the resourceQuota');
   it.todo('should set the resourceQuota as reactive Vue property');
   it.todo('should reset project with cleanForNew');
+
+  describe('glance', () => {
+    it('should return projectGlance instead of namespace when namespace is in a project', () => {
+      const t = jest.fn((key) => key);
+      const ctx = { rootGetters: { 'i18n/t': t } };
+      const namespace = new Namespace({}, ctx);
+
+      const project = {
+        detailLocation: 'project-detail',
+        nameDisplay:    'My Project',
+      };
+
+      jest.spyOn(namespace, 'project', 'get').mockReturnValue(project);
+      Object.defineProperty(namespace, '_glance', { get: jest.fn(() => [{ name: 'namespace' }, { name: 'other' }]) });
+
+      const result = namespace.glance;
+
+      expect(result).toHaveLength(2);
+      expect(result[0].name).toBe('project');
+      expect(result[0].label).toBe('component.resource.detail.glance.project');
+      expect(result[0].formatter).toBe('Link');
+      expect(result[0].formatterOpts?.to).toBe('project-detail');
+      expect(result[0].content).toBe('My Project');
+      expect(result[1].name).toBe('other');
+    });
+
+    it('should remove namespace from glance when namespace is not in a project', () => {
+      const namespace = new Namespace({});
+
+      jest.spyOn(namespace, 'project', 'get').mockReturnValue(null);
+      Object.defineProperty(namespace, '_glance', { get: jest.fn(() => [{ name: 'namespace' }, { name: 'other' }]) });
+
+      const result = namespace.glance;
+
+      expect(result).toHaveLength(1);
+      expect(result[0].name).toBe('other');
+    });
+  });
+
+  describe('projectGlance', () => {
+    it('should return undefined if namespace is not in a project', () => {
+      const namespace = new Namespace({});
+
+      jest.spyOn(namespace, 'project', 'get').mockReturnValue(null);
+
+      expect(namespace.projectGlance).toBeUndefined();
+    });
+
+    it('should return project glance information if namespace is in a project', () => {
+      const t = jest.fn((key) => key);
+      const ctx = { rootGetters: { 'i18n/t': t } };
+      const namespace = new Namespace({}, ctx);
+
+      const project = {
+        detailLocation: 'project-detail',
+        nameDisplay:    'My Project',
+      };
+
+      jest.spyOn(namespace, 'project', 'get').mockReturnValue(project);
+
+      const result = namespace.projectGlance;
+
+      expect(result?.name).toBe('project');
+      expect(result?.label).toBe('component.resource.detail.glance.project');
+      expect(result?.formatter).toBe('Link');
+      expect(result?.formatterOpts.to).toBe('project-detail');
+      expect(result?.content).toBe('My Project');
+    });
+  });
 });

package/models/apps.statefulset.js

@@ -1,5 +1,5 @@
 import Workload from './workload';
-import { WORKLOAD_TYPES, POD, WORKLOAD_TYPE_TO_KIND_MAPPING } from '@shell/config/types';
+import { WORKLOAD_TYPES, WORKLOAD_TYPE_TO_KIND_MAPPING } from '@shell/config/types';
 
 export default class StatefulSet extends Workload {
   async rollBack(cluster, statefulSet, revision) {
@@ -21,16 +21,14 @@ export default class StatefulSet extends Workload {
     await this.rollBackWorkload(cluster, statefulSet, 'statefulsets', body);
   }
 
-  // we need to provide a new pods getter for statefulsets because the relationship
-  // done on the parent model "workload" is not correct
+  /**
+   * See fetchPods description for more info
+   */
   get pods() {
-    const relationships = this.metadata?.relationships || [];
-    const podRelationship = relationships.filter((relationship) => relationship.toType === POD)[0];
-
-    if (podRelationship) {
-      const pods = this.$getters['podsByNamespace'](this.metadata.namespace);
-
-      return pods.filter((pod) => {
+    if (this.podMatchExpression) {
+      // Given https://github.com/rancher/dashboard/issues/7555 we want to avoid scenarios where we show pods that have an applicable label but aren't applicable (?!)
+      // super.pods is the pods that match the statefulsets podSelector, so start from that and then filter further by pod's owner
+      return super.pods.filter((pod) => {
         // a bit of a duplication of podRelationship, but always safe to check...
         if (pod.metadata?.ownerReferences?.length) {
           const ownerReferencesStatefulSet = pod.metadata?.ownerReferences?.find((own) => own.kind === WORKLOAD_TYPE_TO_KIND_MAPPING[WORKLOAD_TYPES.STATEFUL_SET]);

package/models/chart.js

@@ -1,6 +1,6 @@
 import { compatibleVersionsFor, APP_UPGRADE_STATUS } from '@shell/store/catalog';
 import {
-  REPO_TYPE, REPO, CHART, VERSION, _FLAGGED, HIDE_SIDE_NAV, CATEGORY, TAG
+  REPO_TYPE, REPO, CHART, VERSION, _FLAGGED, HIDE_SIDE_NAV, CATEGORY, TAG, DEPRECATED as DEPRECATED_QUERY
 } from '@shell/config/query-params';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 import SteveModel from '@shell/plugins/steve/steve-class';
@@ -29,6 +29,10 @@ export default class Chart extends SteveModel {
       [VERSION]:   version,
     };
 
+    if (this.deprecated) {
+      out[DEPRECATED_QUERY] = true;
+    }
+
     if ( from ) {
       out[from] = _FLAGGED;
     }

package/models/fleet-application.js

@@ -1,7 +1,7 @@
 import { matching, convertSelectorObj } from '@shell/utils/selector';
 import isEmpty from 'lodash/isEmpty';
 import { escapeHtml } from '@shell/utils/string';
-import { FLEET, MANAGEMENT } from '@shell/config/types';
+import { FLEET } from '@shell/config/types';
 import { FLEET as FLEET_ANNOTATIONS } from '@shell/config/labels-annotations';
 import { addObject, addObjects, findBy } from '@shell/utils/array';
 import SteveModel from '@shell/plugins/steve/steve-class';
@@ -29,8 +29,19 @@ function normalizeStateCounts(data) {
 }
 
 export default class FleetApplication extends SteveModel {
-  get currentUser() {
-    return this.$rootGetters['auth/v3User'] || {};
+  async getCurrentUser() {
+    const user = this.$rootGetters['auth/v3User'];
+
+    if (user?.id) {
+      return user;
+    }
+
+    const res = await this.$dispatch('rancher/request', {
+      url:    '/v3/users?me=true',
+      method: 'get',
+    }, { root: true });
+
+    return res?.data?.[0] || {};
   }
 
   pause() {
@@ -48,10 +59,6 @@ export default class FleetApplication extends SteveModel {
       delete this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_ID];
     }
 
-    if (this.metadata?.labels?.[FLEET_ANNOTATIONS.CREATED_BY_USER_NAME]) {
-      delete this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_NAME];
-    }
-
     super.goToClone();
   }
 
@@ -144,11 +151,11 @@ export default class FleetApplication extends SteveModel {
   }
 
   statusResourceCountsForCluster(clusterId) {
-    if (!this.targetClusters.some((c) => c.id === clusterId)) {
+    if (!(this.targetClusters || []).some((c) => c.id === clusterId)) {
       return {};
     }
 
-    return this.status?.perClusterResourceCounts[clusterId] || { desiredReady: 0 };
+    return this.status?.perClusterResourceCounts?.[clusterId] || { desiredReady: 0 };
   }
 
   get resourcesStatuses() {
@@ -224,43 +231,6 @@ export default class FleetApplication extends SteveModel {
     return primaryDisplayStatusFromCount(resourceCounts) || STATES_ENUM.ACTIVE;
   }
 
-  get authorId() {
-    return this.metadata?.labels?.[FLEET_ANNOTATIONS.CREATED_BY_USER_ID];
-  }
-
-  get author() {
-    if (this.authorId) {
-      return this.$rootGetters['management/byId'](MANAGEMENT.USER, this.authorId);
-    }
-
-    return null;
-  }
-
-  get createdBy() {
-    const displayName = this.metadata?.labels?.[FLEET_ANNOTATIONS.CREATED_BY_USER_NAME];
-
-    if (!displayName) {
-      return null;
-    }
-
-    return {
-      displayName,
-      location: !this.author ? null : {
-        name:   'c-cluster-product-resource-id',
-        params: {
-          cluster:  '_',
-          product:  'auth',
-          resource: MANAGEMENT.USER,
-          id:       this.author.id,
-        }
-      }
-    };
-  }
-
-  get showCreatedBy() {
-    return !!this.createdBy;
-  }
-
   get clustersList() {
     return this.$getters['all'](FLEET.CLUSTER);
   }

package/models/fleet.cattle.io.bundle.js

@@ -1,7 +1,7 @@
 import { escapeHtml, ucFirst } from '@shell/utils/string';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { addObject, addObjects, findBy } from '@shell/utils/array';
-import { FLEET, MANAGEMENT } from '@shell/config/types';
+import { FLEET } from '@shell/config/types';
 import { FLEET as FLEET_ANNOTATIONS } from '@shell/config/labels-annotations';
 import { convertSelectorObj, matching } from '@shell/utils/selector';
 
@@ -129,41 +129,4 @@ export default class FleetBundle extends SteveModel {
       );
     }
   }
-
-  get authorId() {
-    return this.metadata?.labels?.[FLEET_ANNOTATIONS.CREATED_BY_USER_ID];
-  }
-
-  get author() {
-    if (this.authorId) {
-      return this.$rootGetters['management/byId'](MANAGEMENT.USER, this.authorId);
-    }
-
-    return null;
-  }
-
-  get createdBy() {
-    const displayName = this.metadata?.labels?.[FLEET_ANNOTATIONS.CREATED_BY_USER_NAME];
-
-    if (!displayName) {
-      return null;
-    }
-
-    return {
-      displayName,
-      location: !this.author ? null : {
-        name:   'c-cluster-product-resource-id',
-        params: {
-          cluster:  '_',
-          product:  'auth',
-          resource: MANAGEMENT.USER,
-          id:       this.author.id,
-        }
-      }
-    };
-  }
-
-  get showCreatedBy() {
-    return !!this.createdBy;
-  }
 }

package/models/fleet.cattle.io.gitrepo.js

@@ -209,4 +209,8 @@ export default class GitRepo extends FleetApplication {
       display: this.commitDisplay
     };
   }
+
+  get fullDetailPageOverride() {
+    return true;
+  }
 }

package/models/fleet.cattle.io.helmop.js

@@ -199,4 +199,8 @@ export default class HelmOp extends FleetApplication {
   get bundleDeployments() {
     return this.$getters['matching'](FLEET.BUNDLE_DEPLOYMENT, { [FLEET_ANNOTATIONS.HELM_NAME]: this.name });
   }
+
+  get fullDetailPageOverride() {
+    return true;
+  }
 }

package/models/management.cattle.io.project.js

@@ -179,4 +179,16 @@ export default class Project extends HybridModel {
   get confirmRemove() {
     return true;
   }
+
+  get glance() {
+    const glance = [...this._glance];
+
+    const namespaceIndex = glance.findIndex((item) => item.name === 'namespace');
+
+    if (namespaceIndex > -1) {
+      glance.splice(namespaceIndex, 1);
+    }
+
+    return glance;
+  }
 }

package/models/namespace.js

@@ -269,4 +269,34 @@ export default class Namespace extends SteveModel {
   get hideDetailLocation() {
     return !!this.$rootGetters['currentProduct'].hideNamespaceLocation;
   }
+
+  get glance() {
+    const glance = [...this._glance];
+
+    const namespaceIndex = glance.findIndex((item) => item.name === 'namespace');
+
+    if (namespaceIndex > -1) {
+      glance.splice(namespaceIndex, 1, this.projectGlance);
+    }
+
+    // projectGlance could be undefined
+    return glance.filter(Boolean);
+  }
+
+  get projectGlance() {
+    // Not all namespaces are in a project
+    if (!this.project) {
+      return undefined;
+    }
+
+    return {
+      name:          'project',
+      label:         this.t('component.resource.detail.glance.project'),
+      formatter:     'Link',
+      formatterOpts: {
+        to: this.project.detailLocation, row: {}, options: { internal: true }
+      },
+      content: this.project.nameDisplay
+    };
+  }
 }

package/models/workload.js

@@ -595,6 +595,9 @@ export default class Workload extends WorkloadService {
     return selector;
   }
 
+  /**
+   * Match Expression version of the podSelector
+   */
   get podMatchExpression() {
     return this.podSelector ? parse(this.podSelector) : null;
   }