@rancher/shell 0.3.25 → 0.3.26

package/assets/translations/en-us.yaml

@@ -653,6 +653,10 @@ asyncButton:
     action: Save
     success: Saved
     waiting: Saving…
+  editAndContinue:
+    action: Save and Continue
+    success: Saved
+    waiting: Saving…
   enable:
     action: Enable
     success: Enabled
@@ -1841,6 +1845,9 @@ cluster:
       pspChange:
         title: Pod Security Policy deprecation
         body: <p>Kubernetes has removed support for Pod Security Policies (PSPs) starting with version 1.25. If your cluster has PodSecurityPolicy admission controller enabled via "kube-apiserver-arg.enable-admission-plugins" in Cluster YAML, it has to be <i>manually</i> removed before proceeding with the upgrade. Additionally, any PSPs that may be present in the cluster will no longer be available/enforced. Do you want to proceed?</p>
+      editYamlMachinePool:
+        title: Save Machine Configurations
+        body: Machine Configurations define how machines in Pools are deployed.<br><br> They will be saved upfront to ensure valid Cluster YAML can be saved.
     snapshots:
       suffix: Snapshots per node
     systemService:

package/components/CruResource.vue

@@ -327,10 +327,13 @@ export default {
 
     async showPreviewYaml() {
       if ( this.applyHooks ) {
-        await this.applyHooks(
-          BEFORE_SAVE_HOOKS,
-          CONTEXT_HOOK_EDIT_YAML,
-        );
+        try {
+          await this.applyHooks(BEFORE_SAVE_HOOKS, CONTEXT_HOOK_EDIT_YAML);
+        } catch (e) {
+          console.warn('Unable to show yaml: ', e); // eslint-disable-line no-console
+
+          return;
+        }
       }
 
       const resourceYaml = this.createResourceYaml(this.yamlModifiers);

package/components/__tests__/ProjectRow.test.ts

@@ -0,0 +1,63 @@
+import ProjectRow from '@shell/components/form/ResourceQuota/ProjectRow.vue';
+import { RANCHER_TYPES } from '@shell/components/form/ResourceQuota/shared';
+import { shallowMount } from '@vue/test-utils';
+import Vue from 'vue';
+
+const CONFIGMAP_STRING = RANCHER_TYPES[0].value;
+
+describe('component: ProjectRow.vue', () => {
+  const wrapper = shallowMount(ProjectRow,
+    {
+      propsData: {
+        mode:  'edit',
+        types: RANCHER_TYPES,
+        type:  CONFIGMAP_STRING,
+        value: {
+          spec: {
+            namespaceDefaultResourceQuota: { limit: {} },
+            resourceQuota:                 { limit: {} }
+          }
+        }
+      }
+    });
+
+  it('should render the correct input fields and set the correct computed values, based on the provided data', () => {
+    const typeInput = wrapper.find(`[data-testid="projectrow-type-input"]`);
+    const projectQuotaInput = wrapper.find(`[data-testid="projectrow-project-quota-input"]`);
+    const namespaceQuotaInput = wrapper.find(`[data-testid="projectrow-namespace-quota-input"]`);
+
+    expect(typeInput.exists()).toBe(true);
+    expect(projectQuotaInput.exists()).toBe(true);
+    expect(namespaceQuotaInput.exists()).toBe(true);
+    expect(wrapper.vm.resourceQuotaLimit).toStrictEqual({});
+    expect(wrapper.vm.namespaceDefaultResourceQuotaLimit).toStrictEqual({});
+  });
+
+  it('triggering "updateQuotaLimit" should trigger Vue.set with the correct data', () => {
+    const vueSet = jest.spyOn(Vue, 'set');
+
+    wrapper.vm.updateQuotaLimit('resourceQuota', CONFIGMAP_STRING, 10);
+
+    expect(vueSet).toHaveBeenCalledTimes(1);
+    expect(wrapper.vm.value).toStrictEqual({
+      spec: {
+        namespaceDefaultResourceQuota: { limit: {} },
+        resourceQuota:                 { limit: { [`${ CONFIGMAP_STRING }`]: 10 } }
+      }
+    });
+  });
+
+  it('triggering "updateType" with the same type that existed should clear limits and trigger emit', () => {
+    wrapper.vm.updateType(CONFIGMAP_STRING);
+
+    expect(wrapper.vm.value).toStrictEqual({
+      spec: {
+        namespaceDefaultResourceQuota: { limit: {} },
+        resourceQuota:                 { limit: {} }
+      }
+    });
+
+    expect(wrapper.emitted('type-change')).toBeTruthy();
+    expect(wrapper.emitted('type-change')[0]).toStrictEqual([CONFIGMAP_STRING]);
+  });
+});

package/components/auth/RoleDetailEdit.vue

@@ -152,6 +152,10 @@ export default {
       });
     }
 
+    if (this.value?.metadata?.name && !this.value.displayName) {
+      this.$set(this.value, 'displayName', this.value.metadata.name);
+    }
+
     this.$nextTick(() => {
       this.$emit('set-subtype', this.label);
     });

package/components/auth/__tests__/RoleDetailEdit.test.ts

@@ -0,0 +1,41 @@
+import { mount } from '@vue/test-utils';
+import RoleDetailEdit from '@shell/components/auth/RoleDetailEdit.vue';
+import { SUBTYPE_MAPPING } from '@shell/models/management.cattle.io.roletemplate';
+
+const role = {
+  apiVersion:            'management.cattle.io/v3',
+  kind:                  'GlobalRole',
+  metadata:              { name: 'global-role-with-inherited' },
+  inheritedClusterRoles: ['cluster-admin'],
+  rules:
+[{
+  verbs:     ['get', 'list'],
+  resources: ['pods'],
+  apiGroups: ['']
+}],
+  subtype: SUBTYPE_MAPPING.GLOBAL.id
+};
+
+describe('component: RoleDetailEdit', () => {
+  it('does not have validation errors when the role has no displayName', () => {
+    const wrapper = mount(RoleDetailEdit, {
+      propsData: { value: role },
+      mocks:     {
+        $fetchState: { pending: false },
+        $route:      { name: 'anything' },
+        $store:      {
+          getters: {
+            currentStore: () => 'store', 'i18n/t': jest.fn(), 'store/schemaFor': jest.fn()
+          }
+        }
+      },
+      stubs: {
+        CruResource: { template: '<div><slot></slot></div>' },
+        // NameNsDescription: true,
+        Tab:         { template: '<div><slot></slot></div>' },
+      }
+    });
+
+    expect((wrapper.vm as any).fvFormIsValid).toBe(true);
+  });
+});

package/components/form/ResourceQuota/ProjectRow.vue

@@ -2,6 +2,7 @@
 import Select from '@shell/components/form/Select';
 import UnitInput from '@shell/components/form/UnitInput';
 import { ROW_COMPUTED } from './shared';
+import Vue from 'vue';
 
 export default {
   components: { Select, UnitInput },
@@ -57,10 +58,10 @@ export default {
 
     updateQuotaLimit(prop, type, val) {
       if (!this.value.spec[prop]) {
-        this.value.spec[prop] = { limit: { } };
+        Vue.set(this.value.spec, prop, { limit: { } });
       }
 
-      this.value.spec[prop].limit[type] = val;
+      Vue.set(this.value.spec[prop].limit, type, val);
     }
   },
 };
@@ -75,6 +76,7 @@ export default {
       :mode="mode"
       :value="type"
       :options="types"
+      data-testid="projectrow-type-input"
       @input="updateType($event)"
     />
     <UnitInput
@@ -86,6 +88,7 @@ export default {
       :input-exponent="typeOption.inputExponent"
       :base-unit="typeOption.baseUnit"
       :output-modifier="true"
+      data-testid="projectrow-project-quota-input"
       @input="updateQuotaLimit('resourceQuota', type, $event)"
     />
     <UnitInput
@@ -96,6 +99,7 @@ export default {
       :input-exponent="typeOption.inputExponent"
       :base-unit="typeOption.baseUnit"
       :output-modifier="true"
+      data-testid="projectrow-namespace-quota-input"
       @input="updateQuotaLimit('namespaceDefaultResourceQuota', type, $event)"
     />
   </div>

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

@@ -864,7 +864,7 @@ export default {
   },
 
   created() {
-    this.registerBeforeHook(this.saveMachinePools, 'save-machine-pools');
+    this.registerBeforeHook(this.saveMachinePools, 'save-machine-pools', 1);
     this.registerBeforeHook(this.setRegistryConfig, 'set-registry-config');
     this.registerAfterHook(this.cleanupMachinePools, 'cleanup-machine-pools');
     this.registerAfterHook(this.saveRoleBindings, 'save-role-bindings');
@@ -1235,7 +1235,23 @@ export default {
 
     async saveMachinePools(hookContext) {
       if (hookContext === CONTEXT_HOOK_EDIT_YAML) {
-        return;
+        await new Promise((resolve, reject) => {
+          this.$store.dispatch('cluster/promptModal', {
+            component:      'GenericPrompt',
+            componentProps: {
+              title:     this.t('cluster.rke2.modal.editYamlMachinePool.title'),
+              body:      this.t('cluster.rke2.modal.editYamlMachinePool.body'),
+              applyMode: 'editAndContinue',
+              confirm:   (confirmed) => {
+                if (confirmed) {
+                  resolve();
+                } else {
+                  reject(new Error('User Cancelled'));
+                }
+              }
+            },
+          });
+        });
       }
 
       const finalPools = [];

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

@@ -144,7 +144,7 @@ export default class GlobalRole extends SteveDescriptionModel {
     const norman = await this.norman;
 
     for (const rule of norman.rules) {
-      if (rule.nonResourceURLs.length) {
+      if (rule.nonResourceURLs && rule.nonResourceURLs.length) {
         delete rule.resources;
         delete rule.apiGroups;
       } else {

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

@@ -192,7 +192,7 @@ export default class RoleTemplate extends SteveDescriptionModel {
     const norman = await this.norman;
 
     for (const rule of norman.rules) {
-      if (rule.nonResourceURLs.length) {
+      if (rule.nonResourceURLs && rule.nonResourceURLs.length) {
         delete rule.resources;
         delete rule.apiGroups;
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "0.3.25",
+  "version": "0.3.26",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/scripts/extension/helm/charts/ui-plugin-server/Chart.yaml

@@ -1,10 +1,10 @@
 annotations:
   catalog.cattle.io/certified: rancher # Any application we are adding as a helm chart
-  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.28.0-0'
+  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.29.0-0'
   catalog.cattle.io/namespace: cattle-ui-plugin-system # Must prefix with cattle- and suffix with -system=
   catalog.cattle.io/os: linux
   catalog.cattle.io/permits-os: linux, windows
-  catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0'
+  catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.9.0-0'
   catalog.cattle.io/scope: management
   catalog.cattle.io/ui-component: plugins
 apiVersion: v2