@rancher/shell 0.3.24 → 0.3.25

package/edit/workload/storage/__tests__/Storage.test.ts

@@ -33,7 +33,7 @@ describe('component: Storage', () => {
           t:      (text: string) => text, // Mock i18n global function used as alternative to the getter
           $store: {
             getters: {
-              'i18n/t':      jest.fn(),
+              'i18n/t':      jest.fn().mockImplementation((key: string) => key),
               'i18n/exists': jest.fn()
             }
           }
@@ -63,7 +63,7 @@ describe('component: Storage', () => {
           t:      (text: string) => text, // Mock i18n global function used as alternative to the getter
           $store: {
             getters: {
-              'i18n/t':      jest.fn(),
+              'i18n/t':      jest.fn().mockImplementation((key: string) => key),
               'i18n/exists': jest.fn()
             }
           }

package/edit/workload/storage/persistentVolumeClaim/__tests__/persistentvolumeclaim.test.ts

@@ -0,0 +1,36 @@
+import { createLocalVue, mount } from '@vue/test-utils';
+import PVC from '@shell/edit/workload/storage/persistentVolumeClaim/persistentvolumeclaim.vue';
+
+describe('component: PVC', () => {
+  // TODO: Enable test after allowing to test async data with either #9711 or #9322
+  // eslint-disable-next-line jest/no-disabled-tests
+  it.skip('should initialize storage class on create mode', async() => {
+    const localVue = createLocalVue();
+    const name = 'test';
+    const wrapper = mount(PVC, {
+      localVue,
+      propsData: {
+        savePvcHookName: '',
+        value:           { spec: { resources: { requests: {} } } }
+      },
+      mocks: {
+        $store: {
+          getters: {
+            'cluster/findAll': [{
+              metadata: {
+                name,
+                annotations: { 'storageclass.beta.kubernetes.io/is-default-class': true }
+              }
+            }],
+            'i18n/t': jest.fn()
+          }
+        }
+      },
+      stubs: { LabeledSelect: { template: '<input />' } }
+    });
+
+    const inputElement = wrapper.find('[data-testid="storage-class-name"]').element as HTMLInputElement;
+
+    expect(inputElement.value).toBe(name);
+  });
+});

package/edit/workload/storage/persistentVolumeClaim/persistentvolumeclaim.vue

@@ -48,6 +48,7 @@ export default {
 
     this.storageClasses = hash.storageClasses;
     this.persistentVolumes = hash.persistentVolumes;
+    this.$set(this.spec, 'storageClassName', (this.spec.storageClassName || this.defaultStorageClassName));
   },
 
   data() {
@@ -62,7 +63,7 @@ export default {
     return {
       storageClasses:    [],
       persistentVolumes: [],
-      createPV:          true,
+      isCreatePV:        true,
       spec,
       uniqueId:          new Date().getTime() // Allows form state to be individually deleted
     };
@@ -73,6 +74,13 @@ export default {
       return this.storageClasses.map((sc) => sc.metadata.name);
     },
 
+    /**
+     * Required to initialize with default SC on creation
+     */
+    defaultStorageClassName() {
+      return this.storageClasses.find((sc) => sc.metadata?.annotations?.['storageclass.beta.kubernetes.io/is-default-class'] || sc.metadata?.annotations?.['storageclass.kubernetes.io/is-default-class'])?.metadata.name;
+    },
+
     availablePVs() {
       return this.persistentVolumes.reduce((total, each) => {
         if (each?.status?.phase === 'Available') {
@@ -91,12 +99,11 @@ export default {
   },
 
   watch: {
-    createPV(neu, old) {
+    isCreatePV(neu) {
       if (neu) {
         delete this.spec.volumeName;
         this.spec.resources.requests.storage = null;
       } else {
-        this.spec.storageClassName = '';
         this.spec.resources.requests.storage = null;
       }
     },
@@ -161,8 +168,8 @@ export default {
     <div class="row mb-10">
       <div class="col span-6">
         <RadioGroup
-          v-model="createPV"
-          name="createPV"
+          v-model="isCreatePV"
+          name="isCreatePV"
           :options="[true, false]"
           :labels="[t('persistentVolumeClaim.source.options.new'), t('persistentVolumeClaim.source.options.existing')]"
           :mode="mode"
@@ -170,8 +177,9 @@ export default {
       </div>
       <div class="col span-6">
         <LabeledSelect
-          v-if="createPV"
+          v-if="isCreatePV"
           v-model="spec.storageClassName"
+          data-testid="storage-class-name"
           :mode="mode"
           :required="true"
           :label="t('persistentVolumeClaim.storageClass')"
@@ -221,7 +229,7 @@ export default {
         </div>
       </div>
       <div
-        v-if="createPV"
+        v-if="isCreatePV"
         class="col span-6"
       >
         <UnitInput

package/initialize/index.js

@@ -36,8 +36,8 @@ import '../plugins/global-formatters';
 import '../plugins/trim-whitespace';
 import '../plugins/extend-router';
 
-import consolePlugin from '../plugins/console';
 import intNumber from '../plugins/int-number';
+import positiveIntNumber from '../plugins/positive-int-number.js';
 import nuxtClientInit from '../plugins/nuxt-client-init';
 import replaceAll from '../plugins/replaceall';
 import backButton from '../plugins/back-button';
@@ -274,14 +274,14 @@ async function createApp(ssrContext, config = {}) {
     await axiosShell(app.context, inject);
   }
 
-  if (process.client && typeof consolePlugin === 'function') {
-    await consolePlugin(app.context, inject);
-  }
-
   if (process.client && typeof intNumber === 'function') {
     await intNumber(app.context, inject);
   }
 
+  if (process.client && typeof positiveIntNumber === 'function') {
+    await positiveIntNumber(app.context, inject);
+  }
+
   if (process.client && typeof nuxtClientInit === 'function') {
     await nuxtClientInit(app.context, inject);
   }

package/layouts/default.vue

@@ -70,7 +70,7 @@ export default {
 
   computed: {
     ...mapState(['managementReady', 'clusterReady']),
-    ...mapGetters(['clusterId', 'currentProduct', 'isRancherInHarvester']),
+    ...mapGetters(['clusterId', 'currentProduct', 'isRancherInHarvester', 'showTopLevelMenu']),
 
     afterLoginRoute: mapPref(AFTER_LOGIN_ROUTE),
 
@@ -237,7 +237,7 @@ export default {
     <div
       v-if="managementReady"
       class="dashboard-content"
-      :class="{[pinClass]: true}"
+      :class="{[pinClass]: true, 'dashboard-padding-left': showTopLevelMenu}"
     >
       <Header />
       <SideNav
@@ -318,12 +318,12 @@ export default {
     overflow-y: auto;
     min-height: 0px;
 
-    &:has(.side-menu) {
+    &.dashboard-padding-left {
     padding-left: $app-bar-collapsed-width;
 
-    .overlay-content-mode {
-      left: calc(var(--nav-width) + $app-bar-collapsed-width);
-    }
+      .overlay-content-mode {
+        left: calc(var(--nav-width) + $app-bar-collapsed-width);
+      }
    }
 
     &.pin-right {

package/layouts/home.vue

@@ -8,7 +8,7 @@ import AwsComplianceBanner from '@shell/components/AwsComplianceBanner';
 import AzureWarning from '@shell/components/auth/AzureWarning';
 import BrowserTabVisibility from '@shell/mixins/browser-tab-visibility';
 import Inactivity from '@shell/components/Inactivity';
-import { mapState } from 'vuex';
+import { mapState, mapGetters } from 'vuex';
 
 export default {
 
@@ -36,6 +36,7 @@ export default {
   computed: {
     themeShortcut: mapPref(THEME_SHORTCUT),
     ...mapState(['managementReady']),
+    ...mapGetters(['showTopLevelMenu']),
   },
 
   methods: {
@@ -57,7 +58,10 @@ export default {
     <AwsComplianceBanner />
     <AzureWarning />
 
-    <div class="dashboard-content">
+    <div
+      class="dashboard-content"
+      :class="{'dashboard-padding-left': showTopLevelMenu}"
+    >
       <Header
         v-if="managementReady"
         :simple="true"

package/layouts/plain.vue

@@ -12,6 +12,7 @@ import AwsComplianceBanner from '@shell/components/AwsComplianceBanner';
 import AzureWarning from '@shell/components/auth/AzureWarning';
 import BrowserTabVisibility from '@shell/mixins/browser-tab-visibility';
 import Inactivity from '@shell/components/Inactivity';
+import { mapGetters } from 'vuex';
 
 export default {
 
@@ -40,7 +41,10 @@ export default {
     };
   },
 
-  computed: { themeShortcut: mapPref(THEME_SHORTCUT) },
+  computed: {
+    themeShortcut: mapPref(THEME_SHORTCUT),
+    ...mapGetters(['showTopLevelMenu']),
+  },
 
   methods: {
     toggleTheme() {
@@ -59,7 +63,10 @@ export default {
     <AwsComplianceBanner />
     <AzureWarning />
 
-    <div class="dashboard-content">
+    <div
+      class="dashboard-content"
+      :class="{'dashboard-padding-left': showTopLevelMenu}"
+    >
       <Header :simple="true" />
       <main class="main-layout">
         <IndentedPanel class="pt-20">

package/list/fleet.cattle.io.cluster.vue

@@ -1,7 +1,7 @@
 <script>
 import FleetClusters from '@shell/components/fleet/FleetClusters';
 import { FLEET, MANAGEMENT } from '@shell/config/types';
-import { isHarvesterCluster } from '@shell/utils/cluster';
+import { filterOnlyKubernetesClusters } from '@shell/utils/cluster';
 import { Banner } from '@components/Banner';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 
@@ -56,7 +56,7 @@ export default {
     },
 
     filteredRows() {
-      return this.fleetClusters.filter((c) => !isHarvesterCluster(c));
+      return filterOnlyKubernetesClusters(this.fleetClusters, this.$store);
     },
 
     fleetClusters() {

package/list/management.cattle.io.feature.vue

@@ -82,7 +82,7 @@ export default {
     },
 
     enableRowActions() {
-      const schema = this.$store.getters[`management/schemaFor`](MANAGEMENT.SETTING);
+      const schema = this.$store.getters[`management/schemaFor`](MANAGEMENT.FEATURE);
 
       return schema?.resourceMethods?.includes('PUT');
     },

package/machine-config/vmwarevsphere.vue

@@ -14,7 +14,7 @@ import ArrayListSelect from '@shell/components/form/ArrayListSelect';
 import YamlEditor from '@shell/components/YamlEditor';
 import { get, set } from '@shell/utils/object';
 import { integerString, keyValueStrings } from '@shell/utils/computed';
-import { _CREATE } from '@shell/config/query-params';
+import { _CREATE, _EDIT, _VIEW } from '@shell/config/query-params';
 
 const SENTINEL = '__SENTINEL__';
 const VAPP_MODE = {
@@ -136,6 +136,11 @@ function createOptionHelpers(name) {
   };
 }
 
+const errorActions = Object.freeze({
+  CREATE: 'create',
+  DELETE: 'delete',
+});
+
 export default {
   components: {
     ArrayListSelect, Card, KeyValue, Loading, LabeledInput, LabeledSelect, Banner, UnitInput, RadioGroup, YamlEditor
@@ -144,6 +149,10 @@ export default {
   mixins: [CreateEditView],
 
   props: {
+    poolId: {
+      type:    String,
+      default: '',
+    },
     credentialId: {
       type:     String,
       required: true,
@@ -246,6 +255,7 @@ export default {
       vAppOptions,
       vappMode:                 getInitialVappMode(this.value),
       osOptions:                OS_OPTIONS,
+      validationErrors:         {},
     };
   },
 
@@ -347,6 +357,9 @@ export default {
       }
 
       this.updateVappOptions(INITIAL_VAPP_OPTIONS);
+    },
+    validationErrors(value) {
+      this.$emit('error', value);
     }
   },
 
@@ -384,9 +397,17 @@ export default {
       const valueInContent = content.find((c) => c.value === this.value.datacenter );
 
       if (!valueInContent) {
-        set(this.value, 'datacenter', options[0]);
-        set(this.value, 'cloneFrom', undefined);
-        set(this.value, 'useDataStoreCluster', false);
+        if (this.mode === _CREATE) {
+          set(this.value, 'datacenter', options[0]);
+          set(this.value, 'cloneFrom', undefined);
+          set(this.value, 'useDataStoreCluster', false);
+        }
+
+        if ([_EDIT, _VIEW].includes(this.mode)) {
+          this.manageErrors(errorActions.CREATE, 'datacenter');
+        }
+      } else {
+        this.manageErrors(errorActions.DELETE, 'datacenter');
       }
 
       set(this, 'dataCentersResults', content);
@@ -582,11 +603,19 @@ export default {
       };
 
       if (!isValueInContent()) {
-        const value = isArray ? [] : content[0]?.value;
+        if (this.mode === _CREATE) {
+          const value = isArray ? [] : content[0]?.value;
+
+          if (value !== SENTINEL) {
+            set(this.value, key, value);
+          }
+        }
 
-        if (value !== SENTINEL) {
-          set(this.value, key, value);
+        if ([_EDIT, _VIEW].includes(this.mode)) {
+          this.manageErrors(errorActions.CREATE, key);
         }
+      } else {
+        this.manageErrors(errorActions.DELETE, key);
       }
     },
 
@@ -654,6 +683,18 @@ export default {
       set(this.value, 'vappProperty', opts.vappProperty);
       this.initKeyValueParams('value.vappProperty', 'initVappArray');
     },
+
+    manageErrors(action = errorActions.CREATE, key) {
+      if (action === errorActions.CREATE) {
+        const keys = [key, ...(this.validationErrors[this.poolId] || [])];
+
+        this.validationErrors = Object.assign({}, this.validationErrors, { [this.poolId]: keys });
+      }
+
+      if (action === errorActions.DELETE && this.validationErrors[this.poolId]) {
+        this.validationErrors = Object.assign({}, this.validationErrors, { [this.poolId]: this.validationErrors[this.poolId].filter((x) => x === key) }) ;
+      }
+    },
   }
 };
 </script>

package/mixins/brand.js

@@ -141,14 +141,6 @@ export default {
             }).then((setting) => setting.save());
           }
         }
-      } else if (!neu) {
-        const brandSetting = findBy(this.globalSettings, 'id', SETTING.BRAND);
-
-        if (brandSetting && brandSetting.value !== '') {
-          // 2) There should not be a brand... but there is a brand setting
-          brandSetting.value = '';
-          brandSetting.save();
-        }
       }
     }
   },

package/mixins/child-hook.js

@@ -25,14 +25,14 @@ export default {
     },
 
     async applyHooks(key, ...args) {
-      if ( !key ) {
+      if (!key) {
         throw new Error('Must specify key');
       }
 
       const hooks = sortBy(this[key] || [], ['priority', 'name']);
       const out = {};
 
-      for ( const x of hooks ) {
+      for (const x of hooks) {
         console.debug('Applying hook', x.name); // eslint-disable-line no-console
         out[x.name] = await x.fn.apply(x.fnContext || this, args);
       }

package/mixins/create-edit-view/impl.js

@@ -114,8 +114,8 @@ export default {
     // Detect and resolve conflicts from a 409 response.
     // 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.
-    conflict() {
-      return handleConflict(this.initialValue.toJSON(), this.value, this.liveValue, this.$store.getters, this.$store);
+    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));
     },
 
     async save(buttonDone, url, depth = 0) {
@@ -159,7 +159,7 @@ export default {
       } catch (err) {
         // Conflict, the resource being edited has changed since starting editing
         if ( err.status === 409 && depth === 0 && this.isEdit) {
-          const errors = this.conflict();
+          const errors = await this.conflict();
 
           if ( errors === false ) {
             // It was automatically figured out, save again

package/models/__tests__/management.cattle.io.node.ts

@@ -0,0 +1,96 @@
+import MgmtNode from '@shell/models/management.cattle.io.node';
+
+describe('class MgmtNode', () => {
+  const foo = 'foo';
+  const bar = 'bar';
+  const t = jest.fn(() => bar);
+  const ctx = { rootGetters: { 'i18n/t': t } };
+
+  const resetMocks = () => {
+    // Clear all mock function calls:
+    jest.clearAllMocks();
+  };
+
+  it('should not return addresses if they are not present in the resource status, the internalNodeStatus, or the rkeNode key in status', () => {
+    const mgmtNode = new MgmtNode({ status: {} });
+
+    expect(mgmtNode.addresses).toStrictEqual([]);
+    resetMocks();
+  });
+
+  describe('should return addresses', () => {
+    const addresses = [foo];
+
+    it('if they are present directly on the resource status', () => {
+      const mgmtNode = new MgmtNode({ status: { addresses } });
+
+      expect(mgmtNode.addresses).toStrictEqual(addresses);
+    });
+    it('if they are not present directly on the resource status but are on "status.internalNodeStatus"', () => {
+      const mgmtNode = new MgmtNode({ status: { internalNodeStatus: { addresses } } });
+
+      expect(mgmtNode.addresses).toStrictEqual(addresses);
+    });
+  });
+
+  describe('should return an internalIp', () => {
+    const addresses = [{ type: 'InternalIP', address: foo }];
+    const internalAddress = foo;
+
+    it('if addresses includes an object with an appropriate type and address', () => {
+      const mgmtNode = new MgmtNode({ status: { addresses } });
+
+      expect(mgmtNode.internalIp).toStrictEqual(foo);
+    });
+    it('if internalNodeStatus.addresses includes an object with an appropriate type and address', () => {
+      const mgmtNode = new MgmtNode({ status: { internalNodeStatus: { addresses } } });
+
+      expect(mgmtNode.internalIp).toStrictEqual(foo);
+    });
+    it('if addresses and internalNodeStatus.addresses do not provide an internal ip and the status includes an rkeNode key with an appropriate type and address', () => {
+      const mgmtNode = new MgmtNode({ status: { rkeNode: { internalAddress } } });
+
+      expect(mgmtNode.internalIp).toStrictEqual(internalAddress);
+    });
+  });
+
+  describe('should return an externalIp', () => {
+    const addresses = [{ type: 'ExternalIP', address: foo }];
+    const address = foo;
+
+    it('if addresses includes an object with an appropriate type and address', () => {
+      const mgmtNode = new MgmtNode({ status: { addresses } });
+
+      expect(mgmtNode.externalIp).toStrictEqual(foo);
+    });
+    it('if internalNodeStatus.addresses includes an object with an appropriate type and address', () => {
+      const mgmtNode = new MgmtNode({ status: { internalNodeStatus: { addresses } } });
+
+      expect(mgmtNode.externalIp).toStrictEqual(foo);
+    });
+    it('if addresses and internalNodeStatus.addresses do not provide an external ip and the status includes an rkeNode key with an appropriate type and address', () => {
+      const mgmtNode = new MgmtNode({ status: { rkeNode: { address } } });
+
+      expect(mgmtNode.externalIp).toStrictEqual(address);
+    });
+  });
+
+  describe('should return an appropriate message', () => {
+    it('if there is no internalIp to display', () => {
+      const mgmtNode = new MgmtNode({ status: {} }, ctx);
+
+      expect(mgmtNode.internalIp).toStrictEqual(bar);
+      expect(t).toHaveBeenCalledTimes(1);
+      expect(t).toHaveBeenCalledWith('generic.none');
+      resetMocks();
+    });
+    it('if there is no externalIp to display', () => {
+      const mgmtNode = new MgmtNode({ status: {} }, ctx);
+
+      expect(mgmtNode.externalIp).toStrictEqual(bar);
+      expect(t).toHaveBeenCalledTimes(1);
+      expect(t).toHaveBeenCalledWith('generic.none');
+      resetMocks();
+    });
+  });
+});

package/models/__tests__/node.ts

@@ -0,0 +1,74 @@
+import Node from '@shell/models/management.cattle.io.node';
+
+describe('class Node', () => {
+  const foo = 'foo';
+  const bar = 'bar';
+  const t = jest.fn(() => bar);
+  const ctx = { rootGetters: { 'i18n/t': t } };
+
+  const resetMocks = () => {
+    // Clear all mock function calls:
+    jest.clearAllMocks();
+  };
+
+  it('should not return addresses if they are not present in the resource status', () => {
+    const node = new Node({ status: {} });
+
+    expect(node.addresses).toStrictEqual([]);
+    resetMocks();
+  });
+
+  describe('should return addresses', () => {
+    const addresses = [foo];
+
+    it('if they are present directly on the resource status', () => {
+      const node = new Node({ status: { addresses } });
+
+      expect(node.addresses).toStrictEqual(addresses);
+    });
+  });
+
+  describe('should return an internalIp', () => {
+    const addresses = [{ type: 'InternalIP', address: foo }];
+
+    it('if addresses includes an object with an appropriate type and address', () => {
+      const node = new Node({ status: { addresses } });
+
+      expect(node.internalIp).toStrictEqual(foo);
+    });
+  });
+
+  describe('should return an externalIp', () => {
+    const addresses = [{ type: 'ExternalIP', address: foo }];
+
+    it('if addresses includes an object with an appropriate type and address', () => {
+      const node = new Node({ status: { addresses } });
+
+      expect(node.externalIp).toStrictEqual(foo);
+    });
+    it('if internalNodeStatus.addresses includes an object with an appropriate type and address', () => {
+      const node = new Node({ status: { internalNodeStatus: { addresses } } });
+
+      expect(node.externalIp).toStrictEqual(foo);
+    });
+  });
+
+  describe('should return an appropriate message', () => {
+    it('if there is no internalIp to display', () => {
+      const node = new Node({ status: {} }, ctx);
+
+      expect(node.internalIp).toStrictEqual(bar);
+      expect(t).toHaveBeenCalledTimes(1);
+      expect(t).toHaveBeenCalledWith('generic.none');
+      resetMocks();
+    });
+    it('if there is no externalIp to display', () => {
+      const node = new Node({ status: {} }, ctx);
+
+      expect(node.externalIp).toStrictEqual(bar);
+      expect(t).toHaveBeenCalledTimes(1);
+      expect(t).toHaveBeenCalledWith('generic.none');
+      resetMocks();
+    });
+  });
+});

package/models/cluster/node.js

@@ -92,16 +92,17 @@ export default class ClusterNode extends SteveModel {
     return this.metadata.name;
   }
 
-  get internalIp() {
-    const addresses = this.status?.addresses || [];
+  get addresses() {
+    return this.status?.addresses || [];
+  }
 
-    return findLast(addresses, (address) => address.type === 'InternalIP')?.address;
+  get internalIp() {
+    return findLast(this.addresses, (address) => address.type === 'InternalIP')?.address;
   }
 
   get externalIp() {
-    const addresses = this.status?.addresses || [];
     const annotationAddress = this.metadata.annotations[RKE.EXTERNAL_IP];
-    const statusAddress = findLast(addresses, (address) => address.type === 'ExternalIP')?.address;
+    const statusAddress = findLast(this.addresses, (address) => address.type === 'ExternalIP')?.address;
 
     return statusAddress || annotationAddress;
   }

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

@@ -127,11 +127,11 @@ export default class CapiMachineDeployment extends SteveModel {
     }
 
     this.scaleTimer = setTimeout(() => {
-      this.cluster.save().catch((err) => {
+      this.cluster.save().catch(async(err) => {
         let errors = exceptionToErrorsArray(err);
 
         if ( err.status === 409 && depth < 2 ) {
-          const conflicts = handleConflict(initialValue, value, liveModel, this.$rootGetters, this.$store);
+          const conflicts = await handleConflict(initialValue, value, liveModel, this.$rootGetters, { dispatch: this.$dispatch }, 'management');
 
           if ( conflicts === false ) {
             // It was automatically figured out, save again