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

package/mixins/__tests__/brand.spec.ts

@@ -0,0 +1,170 @@
+import { mount } from '@vue/test-utils';
+import { CATALOG, MANAGEMENT } from '@shell/config/types';
+import Brand from '@shell/mixins/brand';
+
+describe('brandMixin', () => {
+  const createWrapper = (vaiOn = false) => {
+    const Component = {
+      template: '<div></div>',
+      mixins:   [Brand],
+    };
+
+    const data = {
+      apps: null, haveAppsAndSettings: null, canPaginate: false
+    };
+
+    const store = {
+      dispatch: (action, ...args) => {
+        switch (action) {
+        case 'management/findAll':
+          if (args[0] === MANAGEMENT.SETTING) {
+            return [];
+          }
+          if (args[0] === CATALOG.APP) {
+            return [];
+          }
+          break;
+        }
+      },
+      getters: {
+        'auth/loggedIn':        () => true,
+        'auth/fromHeader':      () => false,
+        'management/byId':      () => undefined,
+        'management/canList':   () => () => true,
+        'management/schemaFor': (type: string) => {
+          switch (type) {
+          case MANAGEMENT.SETTING:
+            return { linkFor: () => undefined };
+          }
+        },
+        'management/generation':        () => undefined,
+        'management/paginationEnabled': () => vaiOn,
+        'management/all':               (type: string) => {
+          switch (type) {
+          case MANAGEMENT.SETTING:
+            return [];
+          }
+        },
+      }
+    };
+
+    const wrapper = mount(
+      Component,
+      {
+        data:   () => data,
+        global: { mocks: { $store: store } }
+      });
+    const spyManagementFindAll = jest.spyOn(store, 'dispatch');
+
+    return {
+      wrapper,
+      store,
+      spyManagementFindAll,
+    };
+  };
+
+  describe('should make correct requests', () => {
+    it('vai off', async() => {
+      const { wrapper, spyManagementFindAll } = createWrapper(false);
+
+      // NOTE - wrapper.vm.$options.fetch() doesn't work
+      await wrapper.vm.$options.fetch.apply(wrapper.vm);
+
+      // wrapper.vm.$nextTick();
+      expect(spyManagementFindAll).toHaveBeenNthCalledWith(1, 'management/findAll', {
+        type: MANAGEMENT.SETTING,
+        opt:  {
+          load: 'multi', redirectUnauthorized: false, url: `/v1/${ MANAGEMENT.SETTING }s`
+        }
+      });
+      expect(spyManagementFindAll).toHaveBeenNthCalledWith(2, 'management/findAll', { type: CATALOG.APP });
+    });
+
+    it('vai on', async() => {
+      const { wrapper, spyManagementFindAll } = createWrapper(true);
+
+      // NOTE - wrapper.vm.$options.fetch() doesn't work
+      await wrapper.vm.$options.fetch.apply(wrapper.vm);
+
+      expect(spyManagementFindAll).toHaveBeenNthCalledWith(1, 'management/findAll', {
+        type: MANAGEMENT.SETTING,
+        opt:  {
+          load: 'multi', url: `/v1/${ MANAGEMENT.SETTING }s`, redirectUnauthorized: false
+        }
+      });
+      expect(spyManagementFindAll).toHaveBeenNthCalledWith(2, 'management/findPage', {
+        type: CATALOG.APP,
+        opt:  {
+          pagination: {
+            filters: [{
+              equals: true,
+              fields: [{
+                equals: true, exact: true, exists: false, field: 'metadata.name', value: 'rancher-csp-adapter'
+              }, {
+                equals: true, exact: true, exists: false, field: 'metadata.name', value: 'rancher-csp-billing-adapter'
+              }],
+              param: 'filter'
+            }],
+            labelSelector:        undefined,
+            page:                 null,
+            pageSize:             null,
+            projectsOrNamespaces: [],
+            sort:                 []
+          }
+        }
+      });
+    });
+  });
+
+  describe('cspAdapter', () => {
+    it('should have correct csp values (off)', async() => {
+      const { wrapper, store } = createWrapper();
+
+      const spyManagementFindAll = jest.spyOn(store, 'dispatch').mockImplementation((_, options) => {
+        const { type } = options as any;
+
+        if (type === MANAGEMENT.SETTING) {
+          return Promise.resolve([]);
+        }
+        if (type === CATALOG.APP) {
+          return Promise.resolve([]);
+        }
+
+        return Promise.reject(new Error('reason'));
+      });
+
+      // NOTE - wrapper.vm.$options.fetch() doesn't work
+      await wrapper.vm.$options.fetch.apply(wrapper.vm, []);
+
+      expect(spyManagementFindAll).toHaveBeenCalledTimes(2);
+
+      expect(wrapper.vm.canCalcCspAdapter).toBeTruthy();
+      expect(wrapper.vm.cspAdapter).toBeFalsy();
+    });
+
+    it.each(['rancher-csp-adapter', 'rancher-csp-billing-adapter'])('should have correct csp values (on - %p )', async(chartName) => {
+      const { wrapper, store } = createWrapper();
+
+      const spyManagementFindAll = jest.spyOn(store, 'dispatch').mockImplementation((_, options) => {
+        const { type } = options as any;
+
+        if (type === MANAGEMENT.SETTING) {
+          return Promise.resolve([]);
+        }
+        if (type === CATALOG.APP) {
+          return Promise.resolve([{ metadata: { name: chartName } }]);
+        }
+
+        return Promise.reject(new Error('reason'));
+      });
+
+      // NOTE - wrapper.vm.$options.fetch() doesn't work
+      await wrapper.vm.$options.fetch.apply(wrapper.vm, []);
+
+      expect(spyManagementFindAll).toHaveBeenCalledTimes(2);
+
+      expect(wrapper.vm.canCalcCspAdapter).toBeTruthy();
+      expect(wrapper.vm.cspAdapter).toBeTruthy();
+    });
+  });
+});

package/mixins/brand.js

@@ -1,39 +1,38 @@
 import { mapGetters } from 'vuex';
-import { CATALOG, MANAGEMENT } from '@shell/config/types';
+import { MANAGEMENT } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
 import { createCssVars } from '@shell/utils/color';
 import { setTitle } from '@shell/config/private-label';
 import { setFavIcon, haveSetFavIcon } from '@shell/utils/favicon';
-
-const cspAdaptorApp = ['rancher-csp-adapter', 'rancher-csp-billing-adapter'];
-
-export const hasCspAdapter = (apps) => {
-  return apps?.find((a) => cspAdaptorApp.includes(a.metadata?.name));
-};
+import { allHash } from '@shell/utils/promise';
+import { fetchInitialSettings } from '@shell/utils/settings';
+import CspAdapterUtils from '@shell/utils/cspAdaptor';
 
 export default {
   async fetch() {
-    // For the login page, the schemas won't be loaded - we don't need the apps in this case
     try {
-      if (this.$store.getters['management/canList'](CATALOG.APP)) {
-        this.apps = await this.$store.dispatch('management/findAll', { type: CATALOG.APP });
-      }
-    } catch (e) {}
+      const res = await allHash({
+        // Ensure we read the settings even when we are not authenticated
+        globalSettings: fetchInitialSettings(this.$store),
+        apps:           CspAdapterUtils.fetchCspAdaptorApp(this.$store),
+      });
 
-    // Ensure we read the settings even when we are not authenticated
-    try {
       // The favicon is implicitly dependent on the initial settings having already been fetched
       if (!haveSetFavIcon()) {
         setFavIcon(this.$store);
       }
-    } catch (e) {}
+
+      this.apps = res.apps;
+    } catch (e) { }
 
     // Setting this up front will remove `computed` churn, and we only care that we've initialised them
     this.haveAppsAndSettings = !!this.apps && !!this.globalSettings;
   },
 
   data() {
-    return { apps: null, haveAppsAndSettings: null };
+    return {
+      apps: null, haveAppsAndSettings: null, canPaginate: false
+    };
   },
 
   computed: {
@@ -87,7 +86,7 @@ export default {
       // Note! this used to be `findBy(this.app)` however for that case we lost reactivity on the collection
       // (computed fires before fetch, fetch happens and update apps, computed would not fire again - even with vue.set)
       // So use `.find` in method instead
-      return hasCspAdapter(this.apps);
+      return CspAdapterUtils.hasCspAdapter({ $store: this.$store, apps: this.apps });
     },
 
     canCalcCspAdapter() {

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/create-edit-view/index.js

@@ -44,5 +44,10 @@ export default defineComponent({
       type:    Boolean,
       default: false,
     },
+
+    useTabbedHash: {
+      type:    Boolean,
+      default: undefined
+    }
   },
 });

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

@@ -7,6 +7,7 @@ import paginationUtils from '@shell/utils/pagination-utils';
 import debounce from 'lodash/debounce';
 import { PaginationParamFilter, PaginationFilterField, PaginationArgs } from '@shell/types/store/pagination.types';
 import stevePaginationUtils from '@shell/plugins/steve/steve-pagination-utils';
+import { STEVE_WATCH_MODE } from '@shell/types/store/subscribe.types';
 
 /**
  * Companion mixin used with `resource-fetch` for `ResourceList` to determine if the user needs to filter the list by a single namespace
@@ -124,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);
     }
   },
 
@@ -199,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);
     },
 
     /**
@@ -279,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;
@@ -350,4 +351,19 @@ export default {
       });
     }
   },
+
+  unmounted() {
+    if (this.havePaginated) {
+      // of type @STEVE_WATCH_PARAMS
+      const watchArgs = {
+        type: this.resource,
+        mode: STEVE_WATCH_MODE.RESOURCE_CHANGES,
+      };
+
+      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/mixins/vue-select-overrides.js

@@ -20,6 +20,7 @@ export default {
         e.preventDefault();
         e.stopPropagation();
 
+        this.isOpen = false;
         vm.open = false;
         vm.search = '';
 

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

@@ -125,7 +125,7 @@ export default class CapiMachineDeployment extends SteveModel {
       return;
     }
 
-    const initialValue = this.cluster.toJSON();
+    const initialValue = this.cluster;
 
     this.inClusterSpec.quantity += delta;
 
@@ -145,7 +145,16 @@ export default class CapiMachineDeployment extends SteveModel {
         let errors = exceptionToErrorsArray(err);
 
         if ( err.status === 409 && depth < 2 ) {
-          const conflicts = await handleConflict(initialValue, value, liveModel, this.$rootGetters, { dispatch: this.$dispatch }, 'management');
+          const conflicts = await handleConflict(
+            initialValue,
+            value,
+            liveModel,
+            {
+              dispatch: this.$dispatch,
+              getters:  this.$rootGetters
+            },
+            'management'
+          );
 
           if ( conflicts === false ) {
             // It was automatically figured out, save again

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;

package/models/fleet-application.js

@@ -1,5 +1,4 @@
-import { convert, matching, convertSelectorObj } from '@shell/utils/selector';
-import jsyaml from 'js-yaml';
+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';
@@ -139,85 +138,11 @@ export default class FleetApplication extends SteveModel {
   }
 
   get targetInfo() {
-    let mode = null;
-    let cluster = null;
-    let clusterGroup = null;
-    let advanced = null;
-
-    const targets = this.spec.targets || [];
-
-    advanced = jsyaml.dump(targets);
-
-    if (advanced === '[]\n') {
-      advanced = `# - name:
-#  clusterSelector:
-#    matchLabels:
-#     foo: bar
-#    matchExpressions:
-#     - key: foo
-#       op: In
-#       values: [bar, baz]
-#  clusterGroup: foo
-#  clusterGroupSelector:
-#    matchLabels:
-#     foo: bar
-#    matchExpressions:
-#     - key: foo
-#       op: In
-#       values: [bar, baz]
-`;
-    }
-
-    if (this.metadata.namespace === 'fleet-local') {
-      mode = 'local';
-    } else if (!targets.length) {
-      mode = 'none';
-    } else if (targets.length === 1) {
-      const target = targets[0];
-
-      if (Object.keys(target).length > 1) {
-        // There are multiple properties in a single target, so use the 'advanced' mode
-        // (otherwise any existing content is nuked for what we provide)
-        mode = 'advanced';
-      } else if (target.clusterGroup) {
-        clusterGroup = target.clusterGroup;
-
-        if (!mode) {
-          mode = 'clusterGroup';
-        }
-      } else if (target.clusterName) {
-        mode = 'cluster';
-        cluster = target.clusterName;
-      } else if (target.clusterSelector) {
-        if (Object.keys(target.clusterSelector).length === 0) {
-          mode = 'all';
-        } else {
-          const expressions = convert(target.clusterSelector.matchLabels, target.clusterSelector.matchExpressions);
-
-          if (expressions.length === 1 &&
-            expressions[0].key === FLEET_ANNOTATIONS.CLUSTER_NAME &&
-            expressions[0].operator === 'In' &&
-            expressions[0].values.length === 1
-          ) {
-            cluster = expressions[0].values[0];
-            if (!mode) {
-              mode = 'cluster';
-            }
-          }
-        }
-      }
-    }
-
-    if (!mode) {
-      mode = 'advanced';
-    }
+    const mode = FleetUtils.Application.getTargetMode(this.spec.targets || [], this.metadata.namespace);
 
     return {
       mode,
       modeDisplay: this.t(`fleet.gitRepo.targetDisplay."${ mode }"`),
-      cluster,
-      clusterGroup,
-      advanced
     };
   }
 
@@ -361,17 +286,21 @@ export default class FleetApplication extends SteveModel {
     return this.status?.readyClusters || 0;
   }
 
+  get meta() {
+    return this.currentRoute()?.meta || {};
+  }
+
   get _detailLocation() {
     return {
       ...super._detailLocation,
-      name: 'c-cluster-fleet-application-resource-namespace-id'
+      name: this.meta.detailLocation || super._detailLocation.name
     };
   }
 
   get doneOverride() {
     return {
       ...super.listLocation,
-      name: 'c-cluster-fleet-application'
+      name: this.meta.doneOverride || super.listLocation.name
     };
   }
 

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

@@ -136,6 +136,17 @@ export default class FleetCluster extends SteveModel {
     };
   }
 
+  get helmOpsInfo() {
+    const ready = this.status?.readyHelmOps || 0;
+    const total = this.status?.desiredReadyHelmOps || 0;
+
+    return {
+      ready,
+      unready: total - ready,
+      total,
+    };
+  }
+
   get bundleInfo() {
     const bundlesData = {
       ready: 0,
@@ -212,8 +223,8 @@ export default class FleetCluster extends SteveModel {
     return parsedLabels;
   }
 
-  async saveYaml(yaml) {
-    await this._saveYaml(yaml);
+  async saveYaml(yaml, initialYaml) {
+    await this._saveYaml(yaml, initialYaml);
 
     const parsed = jsyaml.load(yaml);
 

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

@@ -118,10 +118,10 @@ export default class GitRepo extends FleetApplication {
 
   get resourceIcon() {
     if (this.github) {
-      return FleetUtils.resourceIcons[FLEET.GIT_REPO];
+      return 'icon icon-github';
     }
 
-    return '';
+    return FleetUtils.resourceIcons[FLEET.GIT_REPO];
   }
 
   get repoDisplay() {