@rancher/shell 0.3.29 → 0.5.0

package/edit/__tests__/service.test.ts

@@ -0,0 +1,89 @@
+import { shallowMount, Wrapper } from '@vue/test-utils';
+
+import { _CLONE } from '@shell/config/query-params';
+import { cleanHtmlDirective } from '@shell/plugins/clean-html-directive';
+
+import ServicePage from '@shell/edit/service.vue';
+
+const createEditViewMock = {
+  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()
+  }
+};
+
+const formValidationMock = {};
+
+describe('service edit', () => {
+  let wrapper: Wrapper<InstanceType<typeof ServicePage>>;
+
+  const createComponent = (propsData: any) => {
+    wrapper = shallowMount(ServicePage,
+      {
+        propsData,
+        mixins: [createEditViewMock, formValidationMock],
+        mocks:  {
+          $store: {
+            getters: {
+              'management/all': jest.fn(),
+              'i18n/t':         jest.fn()
+            }
+          }
+        },
+        computed:   { provisioningCluster: jest.fn() },
+        directives: { cleanHtmlDirective },
+      }
+    );
+  };
+
+  it('sets clusterIP to an empty string and deletes clusterIPs when in clone mode', () => {
+    const value = {
+      spec: {
+        clusterIP:  '10.43.1.1',
+        clusterIPs: ['10.43.1.1', '10.43.1.2'],
+      }
+    };
+
+    createComponent({ realMode: _CLONE, value });
+
+    expect(wrapper.vm.value.spec.clusterIP).toBe('');
+    expect(wrapper.vm.value.spec.clusterIPs).toBeUndefined();
+  });
+
+  it('does not change clusterIP and clusterIPs when not in clone mode', () => {
+    const value = {
+      spec: {
+        clusterIP:  '10.43.1.1',
+        clusterIPs: ['10.43.1.1', '10.43.1.2'],
+      }
+    };
+
+    createComponent({ realMode: 'someOtherMode', value });
+
+    expect(wrapper.vm.value.spec.clusterIP).toBe('10.43.1.1');
+    expect(wrapper.vm.value.spec.clusterIPs).toStrictEqual(['10.43.1.1', '10.43.1.2']);
+  });
+});

package/edit/auth/googleoauth.vue

@@ -33,11 +33,7 @@ export default {
 
   computed: {
     tArgs() {
-      let hostname = '';
-
-      if (process.client) {
-        hostname = window.location.hostname;
-      }
+      const hostname = window.location.hostname;
 
       return {
         hostname,

package/edit/cloudcredential.vue

@@ -260,6 +260,8 @@ export default {
         v-model="value"
         name-key="_name"
         description-key="description"
+        name-label="cluster.credential.name.label"
+        name-placeholder="cluster.credential.name.placeholder"
         :mode="mode"
         :namespaced="false"
       />

package/edit/configmap.vue

@@ -40,7 +40,8 @@ export default {
       return {
         data: Object.keys(this.data).reduce((acc, key) => ({
           ...acc,
-          [key]: { chomping: '+' },
+          lineWidth: -1,
+          [key]:     { chomping: '+' },
         }), {}),
       };
     },

package/edit/management.cattle.io.podsecurityadmissionconfigurationtemplate.vue

@@ -1,5 +1,5 @@
 <script lang="ts">
-import Vue, { PropType, VueConstructor } from 'vue';
+import { PropType, defineComponent } from 'vue';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import CruResource from '@shell/components/CruResource.vue';
 import PodSecurityAdmission from '@shell/components/PodSecurityAdmission.vue';
@@ -9,7 +9,7 @@ import { PSA, PSAConfig, PSADefaults, PSAExemptions } from '@shell/types/pod-sec
 import { PSADimensions } from '@shell/config/pod-security-admission';
 import { MANAGEMENT } from '@shell/config/types';
 
-export default (Vue as VueConstructor<Vue & InstanceType<typeof CreateEditView>>).extend({
+export default defineComponent({
   mixins:     [CreateEditView],
   components: {
     CruResource,

package/edit/monitoring.coreos.com.prometheusrule/AlertingRule.vue

@@ -47,9 +47,18 @@ export default {
       selectedSeverityLabel: null,
       ignoredAnnotations:    IGNORED_ANNOTATIONS,
       severityOptions:       [
-        this.t('prometheusRule.alertingRules.labels.severity.choices.critical'),
-        this.t('prometheusRule.alertingRules.labels.severity.choices.warning'),
-        this.t('prometheusRule.alertingRules.labels.severity.choices.none'),
+        {
+          label: this.t('prometheusRule.alertingRules.labels.severity.choices.critical'),
+          value: 'critical'
+        },
+        {
+          label: this.t('prometheusRule.alertingRules.labels.severity.choices.warning'),
+          value: 'warning'
+        },
+        {
+          label: this.t('prometheusRule.alertingRules.labels.severity.choices.none'),
+          value: 'none'
+        },
       ],
     };
   },

package/edit/monitoring.coreos.com.prometheusrule/GroupRules.vue

@@ -6,6 +6,7 @@ import { _VIEW } from '@shell/config/query-params';
 import ArrayListGrouped from '@shell/components/form/ArrayListGrouped';
 import AlertingRule from './AlertingRule';
 import RecordingRule from './RecordingRule';
+import { clone } from '@shell/utils/object';
 
 export default {
   components: {
@@ -105,7 +106,7 @@ export default {
         });
         break;
       case 'alert':
-        value.push(this.defaultAlert);
+        value.push(clone(this.defaultAlert));
         break;
       default:
         break;

package/edit/networking.k8s.io.networkpolicy/__tests__/PolicyRuleTarget.spec.ts

@@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils';
 import PolicyRuleTarget from '@shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget';
 import { cleanHtmlDirective } from '@shell/plugins/clean-html-directive';
 import mock from '@shell/edit/networking.k8s.io.networkpolicy/__tests__/utils/mock.json';
-import { PolicyRuleTargetSelectors } from '@shell/edit/networking.k8s.io.networkpolicy/__tests__/utils/selectors';
+import { PolicyRuleTargetSelectors } from '@shell/edit/networking.k8s.io.networkpolicy/__tests__/utils/selectors.test.ts';
 
 describe.each([
   'view',

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

@@ -31,9 +31,10 @@ export default {
     },
 
     cancel: {
-      type:     Function,
-      required: true,
+      type:    Function,
+      default: null
     },
+
     showingForm: {
       type:     Boolean,
       required: true,
@@ -102,13 +103,18 @@ export default {
     },
 
     options() {
-      const out = this.filteredCredentials.map((obj) => {
-        return {
-          label: obj.nameDisplay,
-          value: obj.id,
-        };
+      const duplicates = {};
+
+      this.filteredCredentials.forEach((cred) => {
+        duplicates[cred.nameDisplay] = duplicates[cred.nameDisplay] === null ? true : null;
       });
 
+      const out = this.filteredCredentials.map((obj) => ({
+        // if credential name is duplicated we add the id to the label
+        label: duplicates[obj.nameDisplay] ? `${ obj.nameDisplay } (${ obj.id })` : obj.nameDisplay,
+        value: obj.id,
+      }));
+
       if ( this.originalId && !out.find((x) => x.value === this.originalId) ) {
         out.unshift({
           label: `${ this.originalId.replace(/^cattle-global-data:/, '') } (current)`,
@@ -265,8 +271,10 @@ export default {
         v-model="credentialId"
         :label="t('cluster.credential.label')"
         :options="options"
+        option-key="value"
         :mode="mode"
         :selectable="option => !option.disabled"
+        data-testid="cluster-prov-select-credential"
       />
     </div>
 

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

@@ -0,0 +1,112 @@
+/* eslint-disable jest/no-hooks */
+import { mount, Wrapper } from '@vue/test-utils';
+import Advanced from '@shell/edit/provisioning.cattle.io.cluster/tabs/Advanced.vue';
+import { _YAML, _VIEW } from '@shell/config/query-params';
+import { clone } from '@shell/utils/object';
+import { PROV_CLUSTER, VERSION_CLUSTER } from '@shell/edit/provisioning.cattle.io.cluster/__tests__/utils/cluster';
+
+describe('component: Advanced', () => {
+  let wrapper: Wrapper<InstanceType<typeof Advanced>>;
+
+  const mountOptions = {
+    propsData: {
+      value:           {},
+      mode:            _VIEW,
+      haveArgInfo:     true,
+      selectedVersion: VERSION_CLUSTER
+    },
+    mocks: {
+      $store: {
+        getters: {
+          currentStore:              () => 'current_store',
+          'current_store/schemaFor': jest.fn(),
+          'current_store/all':       jest.fn(),
+          'i18n/t':                  jest.fn(),
+          'i18n/exists':             jest.fn(),
+        }
+      },
+      $route:  { query: { AS: _YAML } },
+      $router: { applyQuery: jest.fn() },
+    }
+  };
+
+  describe('cluster configurations', () => {
+    it(`should support empty machineSelectorConfig`, () => {
+      const value = clone(PROV_CLUSTER);
+
+      value.spec.rkeConfig.machineSelectorConfig = [];
+
+      mountOptions.propsData.value = value;
+
+      wrapper = mount(
+        Advanced,
+        mountOptions
+      );
+
+      const inputElem = wrapper.find('[data-testid="array-list-box0"]').element as HTMLElement;
+
+      expect(inputElem).toBeUndefined();
+    });
+
+    describe(`'protect-kernel-defaults'`, () => {
+      it(`should show value from machineGlobalConfig`, () => {
+        const value = clone(PROV_CLUSTER);
+
+        value.spec.rkeConfig.machineGlobalConfig['protect-kernel-defaults'] = true;
+        value.spec.rkeConfig.machineSelectorConfig = [{
+          config:               {},
+          machineLabelSelector: {
+            matchExpressions: [{
+              key:      'foo',
+              operator: 'In',
+              values:   ['bar'],
+            }],
+            matchLabels: { foo1: 'bar1' },
+          }
+        }];
+
+        mountOptions.propsData.mode = _VIEW;
+        mountOptions.propsData.value = value;
+
+        wrapper = mount(
+          Advanced,
+          mountOptions
+        );
+
+        const checkbox = wrapper.find('[data-testid="protect-kernel-defaults"]').find('[type="checkbox"]').element as HTMLInputElement;
+
+        expect(checkbox.value).toBe('true');
+      });
+
+      it(`should show value from machineSelectorConfig.config`, () => {
+        const value = clone(PROV_CLUSTER);
+
+        value.spec.rkeConfig.machineGlobalConfig['protect-kernel-defaults'] = false;
+        value.spec.rkeConfig.machineSelectorConfig = [{
+          config:               {},
+          machineLabelSelector: {
+            config:           { 'protect-kernel-defaults': true },
+            matchExpressions: [{
+              key:      'foo',
+              operator: 'In',
+              values:   ['bar'],
+            }],
+            matchLabels: { foo1: 'bar1' },
+          }
+        }];
+
+        mountOptions.propsData.mode = _VIEW;
+        mountOptions.propsData.value = value;
+
+        wrapper = mount(
+          Advanced,
+          mountOptions
+        );
+
+        const checkbox = wrapper.find('[data-testid="protect-kernel-defaults"]').find('[type="checkbox"]').element as HTMLInputElement;
+
+        expect(checkbox.value).toBe('true');
+      });
+    });
+  });
+});