@rancher/shell 3.0.12-rc.2 → 3.0.12-rc.4

package/detail/provisioning.cattle.io.cluster.vue

@@ -96,7 +96,18 @@ export default {
     await this.value.waitForProvisioner();
 
     // Support for the 'provisioner' extension
-    const extClass = this.$extension.getDynamic('provisioner', this.value.machineProvider);
+    let extClass = this.$extension.getDynamic('provisioner', this.value.machineProvider);
+    let provider = this.value.machineProvider;
+
+    if (!extClass) {
+      extClass = this.$extension.getDynamic('provisioner', this.value.provisioner.toLowerCase());
+      provider = this.value.provisioner.toLowerCase();
+    }
+
+    if (!extClass && this.value.isImported) {
+      extClass = this.$extension.getDynamic('provisioner', 'imported');
+      provider = 'imported';
+    }
 
     if (extClass) {
       this.extProvider = new extClass({
@@ -111,7 +122,7 @@ export default {
         ...this.extDetailTabs,
         ...this.extProvider.detailTabs
       };
-      this.extCustomParams = { provider: this.value.machineProvider };
+      this.extCustomParams = { provider };
     }
 
     // Support for a model extension
@@ -120,7 +131,7 @@ export default {
         ...this.extDetailTabs,
         ...this.value.customProvisionerHelper.detailTabs
       };
-      this.extCustomParams = { provider: this.value.machineProvider };
+      this.extCustomParams = { provider };
     }
 
     const schema = this.$store.getters[`management/schemaFor`](CAPI.RANCHER_CLUSTER);
@@ -147,10 +158,6 @@ export default {
       fetchOne.normanClusters = this.$store.dispatch('rancher/findAll', { type: NORMAN.CLUSTER });
     }
 
-    if ( this.value.isRke1 && this.$store.getters['isRancher'] ) {
-      fetchOne.normanNodePools = this.$store.dispatch('rancher/findAll', { type: NORMAN.NODE_POOL });
-    }
-
     const fetchOneRes = await allHash(fetchOne);
 
     this.allMachines = fetchOneRes.machines || [];
@@ -203,10 +210,6 @@ export default {
     if ( this.$store.getters['management/canList'](MANAGEMENT.RKE_TEMPLATE) ) {
       this.$store.dispatch('management/findAll', { type: MANAGEMENT.RKE_TEMPLATE });
     }
-
-    if ( this.$store.getters['management/canList'](MANAGEMENT.RKE_TEMPLATE_REVISION) ) {
-      this.$store.dispatch('management/findAll', { type: MANAGEMENT.RKE_TEMPLATE_REVISION });
-    }
   },
 
   created() {
@@ -284,9 +287,11 @@ export default {
       extCustomParams: null,
       extDetailTabs:   {
         machines:     true, // in this component
+        nodes:        true, // in this component
         logs:         true, // in this component
         registration: true, // in this component
         snapshots:    true, // in this component
+        autoscaler:   true, // in this component
         related:      true, // in ResourceTabs
         events:       true, // in ResourceTabs
         conditions:   true, // in ResourceTabs
@@ -408,8 +413,23 @@ export default {
 
         const templateNamePrefix = `${ pool.metadata.name }-`;
 
+        // The MachineDeployment still exists for empty pools. The
+        // infrastructureRef points to the template that matches the current
+        // config. Fallback to the prefix-match to return an arbitrary template
+        // when multiple exist
+        const machineDeployment = this.allMachineDeployments.find(
+          (d) => d.metadata.name === pool.metadata.name && d.metadata.namespace === pool.metadata.namespace
+        );
+        const activeTemplateName = machineDeployment?.spec?.template?.spec?.infrastructureRef?.name;
+
         // All of these properties are needed to ensure the pool displays correctly and that we can scale up and down
-        pool._template = this.machineTemplates.find((t) => t.metadata.name.startsWith(templateNamePrefix));
+        pool._template = this.machineTemplates.find((t) => {
+          if (activeTemplateName) {
+            return t.metadata.name === activeTemplateName;
+          }
+
+          return t.metadata.name.startsWith(templateNamePrefix);
+        });
         pool._cluster = this.value;
         pool._clusterSpec = mp;
 
@@ -451,7 +471,7 @@ export default {
     },
 
     showNodes() {
-      return !this.showMachines && this.haveNodes && !!this.nodes.length && this.extDetailTabs.machines;
+      return !this.showMachines && this.haveNodes && !!this.nodes.length && this.extDetailTabs.nodes;
     },
 
     showSnapshots() {
@@ -628,7 +648,7 @@ export default {
     },
 
     showAutoScalerTab() {
-      return isAutoscalerFeatureFlagEnabled(this.$store) && this.value.hasAccessToAutoscalerConfigMap;
+      return isAutoscalerFeatureFlagEnabled(this.$store) && this.value.hasAccessToAutoscalerConfigMap && this.extDetailTabs.autoscaler;
     }
   },
 

package/detail/workload/index.vue

@@ -36,7 +36,8 @@ export default {
       nodes:        fetchNodesForServiceTargets({
         $store:  this.$store,
         inStore: this.$store.getters['currentStore']()
-      })
+      }),
+      summaries: this.value.fetchSummaries()
     };
 
     if (this.podSchema) {
@@ -71,7 +72,6 @@ export default {
         this.showProjectMetrics = await allDashboardsExist(this.$store, this.currentCluster.id, [this.WORKLOAD_PROJECT_METRICS_DETAIL_URL, this.WORKLOAD_PROJECT_METRICS_SUMMARY_URL], 'cluster', projectId);
       }
     }
-    this.findMatchingIngresses();
   },
 
   async unmounted() {
@@ -82,8 +82,6 @@ export default {
 
   data() {
     return {
-      allIngresses:                    [],
-      matchingIngresses:               [],
       WORKLOAD_METRICS_DETAIL_URL,
       WORKLOAD_METRICS_SUMMARY_URL,
       POD_PROJECT_METRICS_DETAIL_URL:  '',
@@ -124,6 +122,10 @@ export default {
       return this.$store.getters['cluster/schemaFor'](SERVICE);
     },
 
+    relatedServices() {
+      return this.value.relatedServices;
+    },
+
     podTemplateSpec() {
       if ( this.value.type === WORKLOAD_TYPES.CRON_JOB ) {
         return this.value.spec.jobTemplate.spec.template.spec;
@@ -208,51 +210,6 @@ export default {
     }
   },
 
-  methods: {
-    findMatchingIngresses() {
-      if (!this.ingressSchema) {
-        return [];
-      }
-
-      // Find Ingresses that forward traffic to Services
-      // that select this workload.
-      const matchingIngresses = this.allIngresses.filter((ingress) => {
-        try {
-          const rules = ingress.spec.rules;
-
-          if (!rules || !Array.isArray(rules)) return false;
-
-          for (let i = 0; i < rules.length; i++) {
-            const paths = rules[i]?.http?.paths;
-
-            if (!paths || !Array.isArray(paths)) continue;
-            // For each Ingress, check if any Services that match
-            // this workload are also target backends for the Ingress.
-            for (let j = 0; j < paths.length; j++) {
-              const pathData = paths[j];
-              const targetServiceName = pathData?.backend?.service?.name;
-
-              if (!targetServiceName) continue;
-
-              for (let k = 0; k < this.value.relatedServices.length; k++) {
-                const service = this.value.relatedServices[k];
-                const matchingServiceName = service?.metadata?.name;
-
-                if (ingress.metadata?.namespace === this.value.metadata?.namespace && matchingServiceName === targetServiceName) {
-                  return true;
-                }
-              }
-            }
-          }
-        } catch (err) {
-          return false;
-        }
-      });
-
-      this.matchingIngresses = matchingIngresses;
-    }
-  },
-
   watch: {
     async 'value.jobRelationships.length'(neu, old) {
       // If there are MORE jobs ensure we go out and fetch them (changes and removals are tracked by watches)
@@ -348,7 +305,7 @@ export default {
           {{ t('workload.detail.cannotViewServices') }}
         </p>
         <p
-          v-else-if="value.relatedServices.length === 0"
+          v-else-if="relatedServices.length === 0"
           class="caption"
         >
           {{ t('workload.detail.cannotFindServices') }}
@@ -360,8 +317,8 @@ export default {
           {{ t('workload.detail.serviceListCaption') }}
         </p>
         <ResourceTable
-          v-if="serviceSchema && value.relatedServices.length > 0"
-          :rows="value.relatedServices"
+          v-if="serviceSchema && relatedServices.length > 0"
+          :rows="relatedServices"
           :headers="serviceHeaders"
           key-field="id"
           :schema="serviceSchema"
@@ -390,7 +347,7 @@ export default {
           {{ t('workload.detail.cannotViewIngresses') }}
         </p>
         <p
-          v-else-if="matchingIngresses.length === 0"
+          v-else-if="value.matchingIngresses.length === 0"
           class="caption"
         >
           {{ t('workload.detail.cannotFindIngresses') }}
@@ -402,8 +359,8 @@ export default {
           {{ t('workload.detail.ingressListCaption') }}
         </p>
         <ResourceTable
-          v-if="ingressSchema && matchingIngresses.length > 0"
-          :rows="matchingIngresses"
+          v-if="ingressSchema && value.matchingIngresses.length > 0"
+          :rows="value.matchingIngresses"
           :headers="ingressHeaders"
           key-field="id"
           :schema="ingressSchema"

package/edit/__tests__/catalog.cattle.io.clusterrepo.test.ts

@@ -0,0 +1,248 @@
+import { shallowMount, VueWrapper } from '@vue/test-utils';
+import CruCatalogRepo from '@shell/edit/catalog.cattle.io.clusterrepo.vue';
+import { _CREATE, _EDIT } from '@shell/config/query-params';
+
+const createEditViewMock = {
+  props: {
+    value: {
+      type:    Object,
+      default: () => ({}),
+    },
+    realMode: {
+      type:    String,
+      default: _CREATE,
+    },
+  },
+  data() {
+    return { errors: [] };
+  },
+  computed: {
+    isCreate:     () => false,
+    isEdit:       () => true,
+    isView:       () => false,
+    schema:       () => ({}),
+    isNamespaced: () => false,
+    labels:       {
+      get: jest.fn(() => ({})),
+      set: jest.fn(),
+    },
+    annotations: {
+      get: jest.fn(() => ({})),
+      set: jest.fn(),
+    },
+    doneRoute:  () => 'mockedRoute',
+    doneParams: () => ({}),
+  },
+  methods: {
+    done:               jest.fn(),
+    conflict:           jest.fn(() => Promise.resolve([])),
+    save:               jest.fn(() => Promise.resolve()),
+    actuallySave:       jest.fn(() => Promise.resolve()),
+    setErrors:          jest.fn(),
+    registerBeforeHook: jest.fn(),
+  }
+};
+
+jest.mock('@shell/config/version', () => ({ getVersionData: () => ({ RancherPrime: 'false' }) }));
+jest.mock('@shell/utils/require-asset', () => ({ requireAsset: (path: string) => path }));
+
+const defaultGlobalMocks = {
+  $store: {
+    getters: {
+      'i18n/t':       (key: string) => key,
+      currentProduct: { inStore: 'cluster' },
+      'cluster/byId': () => null,
+      'cluster/all':  () => [],
+    },
+    dispatch: jest.fn(),
+  },
+  $route: {
+    name:  'test-route',
+    query: {},
+  },
+  $fetchState: { pending: false },
+};
+
+const createWrapper = (specOverrides = {}, mode = _EDIT): VueWrapper<any> => {
+  return shallowMount(CruCatalogRepo, {
+    props: {
+      value: {
+        spec:                      { url: 'https://test.com', ...specOverrides },
+        isOciType:                 false,
+        isSuseAppCollectionFromUI: false,
+        metadata:                  { name: 'test-repo', annotations: {} },
+      },
+      realMode: mode,
+    },
+    mixins: [createEditViewMock],
+    global: {
+      mocks: defaultGlobalMocks,
+      stubs: {
+        AsyncButton:              true,
+        Footer:                   true,
+        NameNsDescription:        true,
+        Labels:                   true,
+        SelectOrCreateAuthSecret: true,
+        Banner:                   true,
+        RcItemCard:               true,
+        UnitInput:                true,
+      },
+    },
+  });
+};
+
+describe('CruCatalogRepo - refresh interval', () => {
+  describe('initial state', () => {
+    it('defaults to enabled with null display value when no refreshInterval is set', () => {
+      const wrapper = createWrapper();
+
+      expect(wrapper.vm.refreshEnabled).toStrictEqual(true);
+      expect(wrapper.vm.refreshDisplayValue).toStrictEqual(null);
+      expect(wrapper.vm.refreshUnit).toStrictEqual(3600);
+    });
+
+    it('parses existing refreshInterval into display value and unit', () => {
+      const wrapper = createWrapper({ refreshInterval: 7200 });
+
+      expect(wrapper.vm.refreshEnabled).toStrictEqual(true);
+      expect(wrapper.vm.refreshDisplayValue).toStrictEqual(2);
+      expect(wrapper.vm.refreshUnit).toStrictEqual(3600);
+    });
+
+    it('parses refreshInterval that maps to minutes', () => {
+      const wrapper = createWrapper({ refreshInterval: 300 });
+
+      expect(wrapper.vm.refreshEnabled).toStrictEqual(true);
+      expect(wrapper.vm.refreshDisplayValue).toStrictEqual(5);
+      expect(wrapper.vm.refreshUnit).toStrictEqual(60);
+    });
+
+    it('parses refreshInterval that maps to days', () => {
+      const wrapper = createWrapper({ refreshInterval: 172800 });
+
+      expect(wrapper.vm.refreshEnabled).toStrictEqual(true);
+      expect(wrapper.vm.refreshDisplayValue).toStrictEqual(2);
+      expect(wrapper.vm.refreshUnit).toStrictEqual(86400);
+    });
+
+    it('parses refreshInterval that maps to seconds', () => {
+      const wrapper = createWrapper({ refreshInterval: 45 });
+
+      expect(wrapper.vm.refreshEnabled).toStrictEqual(true);
+      expect(wrapper.vm.refreshDisplayValue).toStrictEqual(45);
+      expect(wrapper.vm.refreshUnit).toStrictEqual(1);
+    });
+
+    it('sets refreshEnabled to false when refreshInterval is -1', () => {
+      const wrapper = createWrapper({ refreshInterval: -1 });
+
+      expect(wrapper.vm.refreshEnabled).toStrictEqual(false);
+      expect(wrapper.vm.refreshDisplayValue).toStrictEqual(null);
+    });
+  });
+
+  describe('syncRefreshIntervalToSpec', () => {
+    it('sets spec.refreshInterval to -1 when disabled', () => {
+      const wrapper = createWrapper();
+
+      wrapper.vm.onRefreshEnabledChange(false);
+
+      expect(wrapper.vm.value.spec.refreshInterval).toStrictEqual(-1);
+    });
+
+    it('deletes spec.refreshInterval when input is empty', () => {
+      const wrapper = createWrapper({ refreshInterval: 3600 });
+
+      wrapper.vm.onRefreshValueChange('');
+
+      expect(wrapper.vm.value.spec.refreshInterval).toStrictEqual(undefined);
+    });
+
+    it('deletes spec.refreshInterval when input is 0', () => {
+      const wrapper = createWrapper({ refreshInterval: 3600 });
+
+      wrapper.vm.onRefreshValueChange('0');
+
+      expect(wrapper.vm.value.spec.refreshInterval).toStrictEqual(undefined);
+    });
+
+    it('converts display value and unit to seconds on spec', () => {
+      const wrapper = createWrapper();
+
+      wrapper.vm.onRefreshValueChange('5');
+
+      expect(wrapper.vm.value.spec.refreshInterval).toStrictEqual(5 * 3600);
+    });
+
+    it('recalculates when unit changes', () => {
+      const wrapper = createWrapper();
+
+      wrapper.vm.onRefreshValueChange('2');
+      wrapper.vm.onRefreshUnitChange(60);
+
+      expect(wrapper.vm.value.spec.refreshInterval).toStrictEqual(120);
+    });
+
+    it('recalculates when re-enabled', () => {
+      const wrapper = createWrapper();
+
+      wrapper.vm.onRefreshValueChange('10');
+      wrapper.vm.onRefreshEnabledChange(false);
+
+      expect(wrapper.vm.value.spec.refreshInterval).toStrictEqual(-1);
+
+      wrapper.vm.onRefreshEnabledChange(true);
+
+      expect(wrapper.vm.value.spec.refreshInterval).toStrictEqual(10 * 3600);
+    });
+  });
+
+  describe('onRefreshValueChange', () => {
+    it('normalizes empty string to null', () => {
+      const wrapper = createWrapper();
+
+      wrapper.vm.onRefreshValueChange('');
+
+      expect(wrapper.vm.refreshDisplayValue).toStrictEqual(null);
+    });
+
+    it('normalizes null to null', () => {
+      const wrapper = createWrapper();
+
+      wrapper.vm.onRefreshValueChange(null);
+
+      expect(wrapper.vm.refreshDisplayValue).toStrictEqual(null);
+    });
+
+    it('coerces string value to number', () => {
+      const wrapper = createWrapper();
+
+      wrapper.vm.onRefreshValueChange('42');
+
+      expect(wrapper.vm.refreshDisplayValue).toStrictEqual(42);
+    });
+  });
+
+  describe('validation', () => {
+    it('returns error for negative values', () => {
+      const wrapper = createWrapper();
+      const rule = wrapper.vm.refreshIntervalRules[0];
+
+      expect(rule(-1)).toBeDefined();
+    });
+
+    it('returns undefined for zero', () => {
+      const wrapper = createWrapper();
+      const rule = wrapper.vm.refreshIntervalRules[0];
+
+      expect(rule(0)).toStrictEqual(undefined);
+    });
+
+    it('returns undefined for positive values', () => {
+      const wrapper = createWrapper();
+      const rule = wrapper.vm.refreshIntervalRules[0];
+
+      expect(rule(5)).toStrictEqual(undefined);
+    });
+  });
+});

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

@@ -28,12 +28,17 @@ const mocks = {
   $fetchState: { pending: false },
   $route:      {
     query: { AS: '' },
+    hash:  '',
     name:  {
       endsWith: () => {
         return false;
       }
     }
   },
+  $router: {
+    currentRoute: { _value: { hash: '' } },
+    replace:      jest.fn(),
+  },
 };
 
 const mockComputed = {
@@ -152,6 +157,106 @@ describe('helmOp component lifecycle', () => {
   });
 });
 
+describe('onCancel', () => {
+  it('should navigate back to the AppCo chart page with version when isSuseAppCollection is true and mode is CREATE', () => {
+    const routerPush = jest.fn();
+    const appCoMocks = {
+      ...mocks,
+      $route: {
+        ...mocks.$route,
+        query: {
+          AS:      '',
+          type:    'suse-application-collection',
+          chart:   'alertmanager',
+          version: '1.37.0',
+          secret:  'fleet-appco-auth-2n9px',
+        },
+        params: { cluster: 'local' },
+      },
+      $router: {
+        ...mocks.$router,
+        push: routerPush,
+      },
+    };
+
+    const wrapper = mount(HelmOpComponent, {
+      ...initHelmOp({ mode: _CREATE, realMode: _CREATE }),
+      computed: {
+        ...mockComputed,
+        isSuseAppCollection: () => true,
+      },
+      global: { mocks: appCoMocks },
+    });
+
+    wrapper.vm.onCancel();
+
+    expect(routerPush).toHaveBeenCalledWith({
+      name:   'c-cluster-fleet-application-appco-chart',
+      params: { cluster: 'local' },
+      query:  {
+        'repo-type': 'cluster',
+        repo:        'fleet-appco-repo-2n9px',
+        chart:       'alertmanager',
+        version:     '1.37.0',
+        secret:      'fleet-appco-auth-2n9px',
+      },
+    });
+  });
+
+  it('should navigate back to the AppCo chart page without version when version is not in query', () => {
+    const routerPush = jest.fn();
+    const appCoMocks = {
+      ...mocks,
+      $route: {
+        ...mocks.$route,
+        query: {
+          AS:     '',
+          type:   'suse-application-collection',
+          chart:  'alertmanager',
+          secret: 'fleet-appco-auth-2n9px',
+        },
+        params: { cluster: 'local' },
+      },
+      $router: {
+        ...mocks.$router,
+        push: routerPush,
+      },
+    };
+
+    const wrapper = mount(HelmOpComponent, {
+      ...initHelmOp({ mode: _CREATE, realMode: _CREATE }),
+      computed: {
+        ...mockComputed,
+        isSuseAppCollection: () => true,
+      },
+      global: { mocks: appCoMocks },
+    });
+
+    wrapper.vm.onCancel();
+
+    expect(routerPush).toHaveBeenCalledWith({
+      name:   'c-cluster-fleet-application-appco-chart',
+      params: { cluster: 'local' },
+      query:  {
+        'repo-type': 'cluster',
+        repo:        'fleet-appco-repo-2n9px',
+        chart:       'alertmanager',
+        version:     undefined,
+        secret:      'fleet-appco-auth-2n9px',
+      },
+    });
+  });
+
+  it('should call done() when not a SuseAppCollection', () => {
+    const wrapper = mount(HelmOpComponent, initHelmOp({ mode: _CREATE, realMode: _CREATE }));
+
+    jest.spyOn(wrapper.vm, 'done').mockImplementation(jest.fn());
+    wrapper.vm.onCancel();
+
+    expect(wrapper.vm.done).toHaveBeenCalledWith();
+  });
+});
+
 describe.each([
   _CREATE,
   _EDIT,

package/edit/auditlog.cattle.io.auditpolicy/__tests__/__snapshots__/General.test.ts.snap

@@ -21,6 +21,7 @@ exports[`component: General rendering & initial state should render with default
           labelkey="auditPolicy.general.enabled.checkbox"
           mode="create"
           primary="false"
+          usebodytextcolor="false"
           value="false"
           valuewhentrue="true"
         />
@@ -71,6 +72,7 @@ exports[`component: General rendering & initial state should render with default
               label="auditPolicy.general.verbosity.level.label"
               loading="false"
               localizedlabel="false"
+              lockedoptions=""
               mode="create"
               nooptionslabelkey="labelSelect.noOptions.empty"
               optionlabel="label"
@@ -112,6 +114,7 @@ exports[`component: General rendering & initial state should render with default
                 label="auditPolicy.general.verbosity.request.requestHeaders"
                 mode="create"
                 primary="false"
+                usebodytextcolor="false"
                 value="false"
                 valuewhentrue="true"
               />
@@ -127,6 +130,7 @@ exports[`component: General rendering & initial state should render with default
                 label="auditPolicy.general.verbosity.request.requestBody"
                 mode="create"
                 primary="false"
+                usebodytextcolor="false"
                 value="false"
                 valuewhentrue="true"
               />
@@ -152,6 +156,7 @@ exports[`component: General rendering & initial state should render with default
                 label="auditPolicy.general.verbosity.response.responseHeaders"
                 mode="create"
                 primary="false"
+                usebodytextcolor="false"
                 value="false"
                 valuewhentrue="true"
               />
@@ -167,6 +172,7 @@ exports[`component: General rendering & initial state should render with default
                 label="auditPolicy.general.verbosity.response.responseBody"
                 mode="create"
                 primary="false"
+                usebodytextcolor="false"
                 value="false"
                 valuewhentrue="true"
               />

package/edit/auditlog.cattle.io.auditpolicy/__tests__/__snapshots__/index.test.ts.snap

@@ -19,6 +19,7 @@ exports[`component: CRUAuditPolicy (index) rendering & initial state should rend
     prevententersubmit="false"
     resource="[object Object]"
     showcancel="true"
+    showtoc="false"
     steps=""
     stepsoptions="[object Object]"
     subtypes=""