@rancher/shell 0.3.0 → 0.3.1

package/edit/provisioning.cattle.io.cluster/__tests__/rke2.test.ts

@@ -0,0 +1,93 @@
+import { mount } from '@vue/test-utils';
+import rke2 from '@shell/edit/provisioning.cattle.io.cluster/rke2.vue';
+
+describe('component: rke2', () => {
+  it.each([
+    'v1.25.0+rke2r1',
+    'v1.24.0+rke2r1',
+    'v1.23.0+rke2r1',
+  ])('should display PSA option', () => {
+    const label = 'whatever';
+    const option = { label, value: label };
+    const wrapper = mount(rke2, {
+      propsData: {
+        mode:  'create',
+        value: {
+          spec: {
+            rkeConfig:                                            { etcd: { disableSnapshots: false } },
+            chartValues:                                          {},
+            defaultPodSecurityAdmissionConfigurationTemplateName: label,
+            kubernetesVersion:                                    'v1.25.0+rke2r1'
+          }
+        },
+        provider: 'whatever',
+        resource: {}
+      },
+      computed: {
+        showForm() {
+          return true;
+        },
+        hasMachinePools() {
+          return false;
+        },
+        showk8s21LegacyWarning() {
+          return false;
+        },
+      },
+      mocks: {
+        $fetchState: { pending: false },
+        $route:      {
+          name:  'anything',
+          query: { AS: 'yaml' },
+        },
+        $store: {
+          getters: {
+            currentStore:           () => 'current_store',
+            'management/schemaFor': jest.fn(),
+            'current_store/all':    jest.fn(),
+            'i18n/t':               jest.fn(),
+            'i18n/withFallback':    jest.fn(),
+          },
+          dispatch: {
+            'management/find':    jest.fn(),
+            'management/findAll': () => ([option]),
+          }
+        },
+      },
+      stubs: {
+        CruResource:              { template: '<div><slot></slot></div>' }, // Required to render the slot content
+        Banner:                   true,
+        LabeledSelect:            true,
+        ACE:                      true,
+        AgentEnv:                 true,
+        ArrayList:                true,
+        ArrayListGrouped:         true,
+        BadgeState:               true,
+        Checkbox:                 true,
+        ClusterMembershipEditor:  true,
+        DrainOptions:             true,
+        LabeledInput:             true,
+        Labels:                   true,
+        Loading:                  true,
+        MachinePool:              true,
+        MatchExpressions:         true,
+        NameNsDescription:        true,
+        Questions:                true,
+        RadioGroup:               true,
+        RegistryConfigs:          true,
+        RegistryMirrors:          true,
+        S3Config:                 true,
+        SelectCredential:         true,
+        SelectOrCreateAuthSecret: true,
+        Tab:                      true,
+        Tabbed:                   true,
+        UnitInput:                true,
+        YamlEditor:               true,
+      }
+    });
+
+    const select = wrapper.find('[data-testid="rke2-custom-edit-psa"]');
+
+    expect((select.vm as unknown as any).options[0].label).toBe(`${ label } (Current)`);
+  });
+});

package/edit/provisioning.cattle.io.cluster/import.vue

@@ -10,7 +10,7 @@ import { CAPI, HCI } from '@shell/config/types';
 import ClusterMembershipEditor from '@shell/components/form/Members/ClusterMembershipEditor';
 import { Banner } from '@components/Banner';
 import { canViewClusterMembershipEditor } from '@shell/components/form/Members/ClusterMembershipEditor.vue';
-import { NAME as HARVESTER_MANAGER } from '@shell/config/product/harvester-manager';
+import { NAME as HARVESTER_MANAGER } from '@/pkg/harvester-manager/config/harvester-manager';
 import { HARVESTER as HARVESTER_FEATURE, mapFeature } from '@shell/store/features';
 import { addObject } from '@shell/utils/array';
 import { HIDE_DESC, mapPref } from '@shell/store/prefs';

package/edit/provisioning.cattle.io.cluster/index.vue

@@ -18,6 +18,7 @@ import { CAPI, MANAGEMENT, DEFAULT_WORKSPACE } from '@shell/config/types';
 import { mapFeature, RKE2 as RKE2_FEATURE } from '@shell/store/features';
 import { allHash } from '@shell/utils/promise';
 import { BLANK_CLUSTER } from '@shell/store';
+import { ELEMENTAL_PRODUCT_NAME, ELEMENTAL_CLUSTER_PROVIDER } from '../../config/elemental-types';
 import Rke2Config from './rke2';
 import Import from './import';
 
@@ -32,7 +33,7 @@ const SORT_GROUPS = {
   custom2:   5,
 };
 
-// uSed to proxy stylesheets for custom drviers that provide custom UI (RKE1)
+// uSed to proxy stylesheets for custom drivers that provide custom UI (RKE1)
 const PROXY_ENDPOINT = '/meta/proxy';
 
 export default {
@@ -157,6 +158,7 @@ export default {
 
   computed: {
     ...mapGetters({ allCharts: 'catalog/charts' }),
+    ...mapGetters('type-map', ['activeProducts']),
     preferredProvisioner: mapPref(PROVISIONER),
     _RKE1:                () => _RKE1,
     _RKE2:                () => _RKE2,
@@ -205,10 +207,6 @@ export default {
 
     rke2Enabled: mapFeature(RKE2_FEATURE),
 
-    showRkeToggle() {
-      return this.rke2Enabled && !this.isImport;
-    },
-
     provisioner: {
       get() {
         // This can incorrectly return rke1 instead
@@ -246,6 +244,7 @@ export default {
     subTypes() {
       const getters = this.$store.getters;
       const isImport = this.isImport;
+      const isElementalActive = !!this.activeProducts.find(item => item.name === ELEMENTAL_PRODUCT_NAME);
 
       const out = [];
 
@@ -287,6 +286,10 @@ export default {
           });
 
           addType('custom', 'custom2', false);
+
+          if (isElementalActive) {
+            addType(ELEMENTAL_CLUSTER_PROVIDER, 'custom2', false);
+          }
         }
       }
 
@@ -352,9 +355,29 @@ export default {
 
       return sortBy(Object.values(out), 'sort');
     },
+
+    firstNodeDriverItem() {
+      return this.groupedSubTypes.findIndex(obj => [_RKE1, _RKE2].includes(obj.name));
+    },
+
+    firstCustomClusterItem() {
+      return this.groupedSubTypes.findIndex(obj => ['custom', 'custom1', 'custom2'].includes(obj.name));
+    },
   },
 
   methods: {
+    showRkeToggle(i) {
+      if (this.isImport || !this.rke2Enabled) {
+        return false;
+      }
+
+      if (this.firstNodeDriverItem >= 0) {
+        return i === this.firstNodeDriverItem;
+      }
+
+      return i === this.firstCustomClusterItem;
+    },
+
     loadStylesheet(url, id) {
       if ( !id ) {
         console.error('loadStylesheet called without an id'); // eslint-disable-line no-console
@@ -469,7 +492,7 @@ export default {
       >
         <h4>
           <div
-            v-if="showRkeToggle && [_RKE1,_RKE2].includes(obj.name)"
+            v-if="showRkeToggle(i)"
             class="grouped-type"
           >
             <ToggleSwitch