@rancher/shell 3.0.2-rc.4 → 3.0.2-rc.6

package/edit/__tests__/cis.cattle.io.clusterscan.test.ts

@@ -0,0 +1,87 @@
+import { mount, type VueWrapper } from '@vue/test-utils';
+import cisEditor from '@shell/edit/cis.cattle.io.clusterscan.vue';
+
+describe('view: cisEditor', () => {
+  let wrapper: VueWrapper<any, any>;
+
+  beforeEach(() => {
+    wrapper = mount(cisEditor, {
+      props: {
+        value: {
+          spec:           { scanProfileName: null, canBeScheduled: () => true },
+          canBeScheduled: () => true,
+        }
+      },
+      global: {
+        mocks: {
+          $fetchState: { pending: false },
+          $route:      {
+            name:  'whatever',
+            query: { AS: 'whatever' },
+          },
+          $store: {
+            getters: {
+              'i18n/t':             (text: string) => text,
+              currentStore:         () => 'whatever',
+              'whatever/schemaFor': jest.fn(),
+            },
+            dispatch: jest.fn(),
+          },
+        },
+        stubs: { AsyncButton: true }
+      }
+    });
+  });
+
+  it('renders the component', () => {
+    expect(wrapper.exists()).toBe(true);
+  });
+
+  describe('should prevent to save', () => {
+    it('given no Profile name', () => {
+      const saveButton = wrapper.find('[data-testid="form-save"]');
+
+      expect(saveButton.attributes().disabled).toStrictEqual('true');
+    });
+
+    it('given a wrong schedule format', async() => {
+      wrapper.vm.value.spec.scanProfileName = 'this is valid';
+      wrapper.vm.value.spec.scheduledScanConfig = { cronSchedule: 'this is not', scanAlertRule: { } };
+      wrapper.vm.isScheduled = true; // Not assigned by fetch()
+      wrapper.vm.scheduledScanConfig = { cronSchedule: 'this is not', scanAlertRule: { } }; // Not assigned by fetch()
+      wrapper.vm.scanAlertRule = {}; // Not assigned by fetch()
+      await wrapper.vm.$nextTick();
+
+      const saveButton = wrapper.find('[data-testid="form-save"]');
+
+      expect(saveButton.attributes().disabled).toStrictEqual('true');
+    });
+  });
+
+  describe('should allow to save', () => {
+    it('given a scanProfileName', async() => {
+      wrapper.vm.value.spec.scanProfileName = 'this is valid';
+      await wrapper.vm.$nextTick();
+
+      const saveButton = wrapper.find('[data-testid="form-save"]');
+
+      expect(saveButton.attributes().disabled).toStrictEqual('false');
+    });
+
+    it.each([
+      '0 * * * *',
+      '@daily'
+    ])('given a scanProfileName and a schedule %p', async(cronSchedule) => {
+      wrapper.vm.value.spec.scanProfileName = 'this is valid';
+      wrapper.vm.value.spec.scheduledScanConfig = { cronSchedule, scanAlertRule: { } };
+      wrapper.vm.scheduledScanConfig = { cronSchedule, scanAlertRule: {} }; // Not assigned by fetch()
+      wrapper.vm.scanAlertRule = {}; // Not assigned by fetch()
+      wrapper.vm.isScheduled = true; // Not assigned by fetch()
+      await wrapper.vm.$nextTick();
+
+      const saveButton = wrapper.find('[data-testid="form-save"]');
+
+      expect(saveButton.attributes().disabled).toStrictEqual('false');
+    });
+  });
+});

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

@@ -1,59 +1,104 @@
 import { mount } from '@vue/test-utils';
+import { _CREATE, _EDIT, _VIEW } from '@shell/config/query-params';
 import GitRepo from '@shell/edit/fleet.cattle.io.gitrepo.vue';
 
-describe('view: fleet.cattle.io.gitrepo should', () => {
-  const mockStore = {
-    dispatch: jest.fn(),
-    getters:  {
-      'i18n/t':                  (text: string) => text,
-      t:                         (text: string) => text,
-      currentStore:              () => 'current_store',
-      'current_store/schemaFor': jest.fn(),
-      'current_store/all':       jest.fn(),
-      workspace:                 jest.fn(),
-    }
-  };
-  const mocks = {
-    $store:      mockStore,
-    $fetchState: { pending: false },
-    $route:      {
-      query: { AS: '' },
-      name:  {
-        endsWith: () => {
-          return false;
-        }
+const mockStore = {
+  dispatch: jest.fn(),
+  getters:  {
+    'i18n/t':                  (text: string) => text,
+    'i18n/exists':             jest.fn(),
+    t:                         (text: string) => text,
+    currentStore:              () => 'current_store',
+    'current_store/schemaFor': jest.fn(),
+    'current_store/all':       jest.fn(),
+    workspace:                 jest.fn(),
+  }
+};
+const mocks = {
+  $store:      mockStore,
+  $fetchState: { pending: false },
+  $route:      {
+    query: { AS: '' },
+    name:  {
+      endsWith: () => {
+        return false;
       }
-    },
-  };
-  const values = {
-    metadata: { namespace: 'test' }, spec: { template: {}, correctDrift: { enabled: false } }, targetInfo: { mode: 'all' },
-  };
+    }
+  },
+};
+const mockComputed = {
+  ...GitRepo.computed,
+  steps: () => [{
+    name:           'stepAdvanced',
+    title:          'title',
+    label:          'label',
+    subtext:        'subtext',
+    descriptionKey: 'description',
+    ready:          true,
+    weight:         1,
+  }],
+};
+
+const values = {
+  metadata: { namespace: 'test' },
+  spec:     {
+    template:     {},
+    correctDrift: { enabled: false },
+  },
+  targetInfo: { mode: 'all' },
+};
+
+describe('view: fleet.cattle.io.gitrepo, mode: view - should', () => {
+  it('hide advanced options banner', () => {
+    const wrapper = mount(GitRepo, {
+      props:    { value: values, mode: _VIEW },
+      computed: mockComputed,
+      global:   { mocks }
+    });
+
+    const advancedInfoBanner = wrapper.find('[data-testid="gitrepo-advanced-info"]');
+
+    expect(advancedInfoBanner.exists()).toBeFalsy();
+  });
+});
+
+describe.each([
+  _CREATE,
+  _EDIT,
+])('view: fleet.cattle.io.gitrepo, mode: %p - should', (mode) => {
   const wrapper = mount(GitRepo, {
-    props:  { value: values },
-    global: { mocks }
+    props:    { value: values, mode },
+    computed: mockComputed,
+    global:   { mocks }
+  });
+
+  it('show advanced options banner', () => {
+    const advancedInfoBanner = wrapper.find('[data-testid="gitrepo-advanced-info"]');
+
+    expect(advancedInfoBanner.exists()).toBeTruthy();
   });
 
-  it('should have self-healing checkbox and tooltip', () => {
-    const correctDriftCheckbox = wrapper.find('[data-testid="GitRepo-correctDrift-checkbox"]');
-    const tooltip = wrapper.find('[data-testid="GitRepo-correctDrift-checkbox"]');
+  it('have self-healing checkbox and tooltip', () => {
+    const correctDriftCheckbox = wrapper.find('[data-testid="gitRepo-correctDrift-checkbox"]');
+    const tooltip = wrapper.find('[data-testid="gitRepo-correctDrift-checkbox"]');
 
     expect(tooltip.element.classList).toContain('v-popper--has-tooltip');
     expect(correctDriftCheckbox.exists()).toBeTruthy();
     expect(correctDriftCheckbox.attributes().value).toBeFalsy();
   });
 
-  it('should have keep-resources checkbox and tooltip', () => {
-    const correctDriftCheckbox = wrapper.find('[data-testid="GitRepo-keepResources-checkbox"]');
-    const tooltip = wrapper.find('[data-testid="GitRepo-keepResources-checkbox"]');
+  it('have keep-resources checkbox and tooltip', () => {
+    const correctDriftCheckbox = wrapper.find('[data-testid="gitRepo-keepResources-checkbox"]');
+    const tooltip = wrapper.find('[data-testid="gitRepo-keepResources-checkbox"]');
 
     expect(tooltip.element.classList).toContain('v-popper--has-tooltip');
     expect(correctDriftCheckbox.exists()).toBeTruthy();
     expect(correctDriftCheckbox.attributes().value).toBeFalsy();
   });
 
-  it('should enable drift if self-healing is checked', async() => {
-    const correctDriftCheckbox = wrapper.findComponent('[data-testid="GitRepo-correctDrift-checkbox"]');
-    const correctDriftContainer = wrapper.find('[data-testid="GitRepo-correctDrift-checkbox"] .checkbox-container');
+  it('enable drift if self-healing is checked', async() => {
+    const correctDriftCheckbox = wrapper.findComponent('[data-testid="gitRepo-correctDrift-checkbox"]') as any;
+    const correctDriftContainer = wrapper.find('[data-testid="gitRepo-correctDrift-checkbox"] .checkbox-container');
 
     expect(correctDriftContainer.exists()).toBeTruthy();
 
@@ -63,4 +108,139 @@ describe('view: fleet.cattle.io.gitrepo should', () => {
     expect(correctDriftCheckbox.emitted('update:value')![0][0]).toBe(true);
     expect(correctDriftCheckbox.props().value).toBeTruthy();
   });
+
+  it.each([
+    ['show Polling Interval and warnings', 'enabled', undefined, true],
+    ['show Polling Interval and warnings', 'enabled', false, true],
+    ['hide Polling Interval and warnings', 'disabled', true, false],
+  ])('show Enable Polling checkbox and %p if %p, with spec.disablePolling: %p', (
+    descr1,
+    descr2,
+    disablePolling,
+    enabled
+  ) => {
+    const wrapper = mount(GitRepo, {
+      props: {
+        value: {
+          ...values,
+          spec: {
+            disablePolling,
+            pollingInterval: 10
+          },
+          status: { webhookCommit: 'sha' },
+        },
+        realMode: mode
+      },
+      computed: mockComputed,
+      global:   { mocks },
+    });
+
+    const pollingCheckbox = wrapper.findComponent('[data-testid="gitRepo-enablePolling-checkbox"]') as any;
+    const pollingIntervalInput = wrapper.find('[data-testid="gitRepo-pollingInterval-input"]');
+    const pollingIntervalMinimumValueWarning = wrapper.find('[data-testid="gitRepo-pollingInterval-minimumValueWarning"]');
+    const pollingIntervalWebhookWarning = wrapper.find('[data-testid="gitRepo-pollingInterval-webhookWarning"]');
+
+    expect(pollingIntervalMinimumValueWarning.exists()).toBe(enabled);
+    expect(pollingIntervalWebhookWarning.exists()).toBe(enabled);
+    expect(pollingCheckbox.exists()).toBeTruthy();
+    expect(pollingCheckbox.vm.value).toBe(enabled);
+    expect(pollingIntervalInput.exists()).toBe(enabled);
+  });
+
+  const defaultPollingInterval = mode === _CREATE ? '60' : '15';
+
+  it.each([
+    ['null', `default ${ defaultPollingInterval } seconds`, null, defaultPollingInterval],
+    ['0', `default ${ defaultPollingInterval } seconds`, 0, defaultPollingInterval],
+    ['1', 'custom 1 second', 1, '1'],
+    ['60', 'custom 60 seconds', 60, '60'],
+    ['15', 'custom 15 seconds', 15, '15'],
+    ['0s', `default ${ defaultPollingInterval } seconds`, 0, defaultPollingInterval],
+    ['1s', 'custom 1 second', '1s', '1'],
+    ['60s', 'custom 60 seconds', '1m', '60'],
+    ['1m3s', 'custom 63 seconds', '1m3s', '63'],
+    ['1h2m3s', 'custom 3723 seconds', '1h2m3s', '3723'],
+    ['15', 'custom 15 seconds', '15s', '15'],
+  ])('show Polling Interval input with source: %p, value: %p', async(
+    descr1,
+    descr2,
+    pollingInterval,
+    unitValue,
+  ) => {
+    const wrapper = mount(GitRepo, {
+      props: {
+        value: {
+          ...values,
+          spec: { pollingInterval }
+        },
+        realMode: mode
+      },
+      computed: mockComputed,
+      global:   { mocks },
+    });
+
+    const pollingIntervalInput = wrapper.find('[data-testid="gitRepo-pollingInterval-input"]').element as any;
+
+    expect(pollingIntervalInput).toBeDefined();
+    expect(pollingIntervalInput.value).toBe(unitValue);
+  });
+
+  it.each([
+    ['hide', 'source: null, value: equal to 60', null, false],
+    ['hide', 'source: 0, value: equal to 60', 0, false],
+    ['hide', 'source: 15, value: equal to 15', 15, false],
+    ['hide', 'source: 60, value: equal to 60', 60, false],
+    ['hide', 'source: 16, value: higher than 15', 16, false],
+    ['show', 'source: 1, value: lower than 15', 1, true],
+  ])('%p Polling Interval warning if %p', async(
+    descr1,
+    descr2,
+    pollingInterval,
+    visible,
+  ) => {
+    const wrapper = mount(GitRepo, {
+      props: {
+        value: {
+          ...values,
+          spec: { pollingInterval }
+        },
+        realMode: mode
+      },
+      computed: mockComputed,
+      global:   { mocks },
+    });
+
+    const pollingIntervalMinimumValueWarning = wrapper.find('[data-testid="gitRepo-pollingInterval-minimumValueWarning"]');
+
+    expect(pollingIntervalMinimumValueWarning.exists()).toBe(visible);
+  });
+
+  it.each([
+    ['hide', 'disabled', null, false],
+    ['hide', 'disabled', false, false],
+    ['hide', 'disabled', '', false],
+    ['show', 'enabled', 'sha', true],
+  ])('%p Webhook configured warning if webhook is %p', (
+    descr1,
+    descr2,
+    webhookCommit,
+    visible
+  ) => {
+    const wrapper = mount(GitRepo, {
+      props: {
+        value: {
+          ...values,
+          spec:   { pollingInterval: 60 },
+          status: { webhookCommit },
+        },
+        realMode: mode
+      },
+      computed: mockComputed,
+      global:   { mocks },
+    });
+
+    const pollingIntervalWebhookWarning = wrapper.find('[data-testid="gitRepo-pollingInterval-webhookWarning"]');
+
+    expect(pollingIntervalWebhookWarning.exists()).toBe(visible);
+  });
 });

package/edit/auth/__tests__/oidc.test.ts

@@ -19,15 +19,16 @@ const validAuthEndpoint = 'http://localhost:8080/realms/rancherrealm/protocol/op
 const validScope = 'openid profile email';
 
 const mockModel = {
-  enabled:      false,
-  id:           'genericoidc',
-  rancherUrl:   validRancherUrl,
-  issuer:       validIssuer,
-  authEndpoint: validAuthEndpoint,
-  scope:        validScope,
-  clientId:     validClientId,
-  clientSecret: validClientSecret,
-  type:         'genericOIDCConfig',
+  enabled:            false,
+  id:                 'genericoidc',
+  rancherUrl:         validRancherUrl,
+  issuer:             validIssuer,
+  authEndpoint:       validAuthEndpoint,
+  scope:              validScope,
+  clientId:           validClientId,
+  clientSecret:       validClientSecret,
+  type:               'genericOIDCConfig',
+  groupSearchEnabled: false,
 };
 
 describe('oidc.vue', () => {
@@ -131,4 +132,20 @@ describe('oidc.vue', () => {
 
     expect(wrapper.vm.model.issuer).toBe(`${ validUrl }/realms/${ validRealm }`);
   });
+
+  it('`groupSearchEnabled` defaults to false', async() => {
+    const groupSearchCheckbox = wrapper.getComponent('[data-testid="input-group-search"]');
+
+    expect(groupSearchCheckbox.isVisible()).toBe(true);
+    expect(wrapper.vm.model.groupSearchEnabled).toBe(false);
+  });
+
+  it('`groupSearchEnabled` updates when checkbox is clicked', async() => {
+    const groupSearchCheckbox = wrapper.getComponent('[data-testid="input-group-search"]');
+
+    await groupSearchCheckbox.find('[role="checkbox"]').trigger('click');
+
+    expect(groupSearchCheckbox.isVisible()).toBe(true);
+    expect(wrapper.vm.model.groupSearchEnabled).toBe(true);
+  });
 });

package/edit/auth/ldap/__tests__/config.test.ts

@@ -15,4 +15,44 @@ describe('lDAP config', () => {
 
     expect(checkbox).toBeDefined();
   });
+
+  it('updates user login filter when value is entered', async() => {
+    const wrapper = mount(
+      LDAPConfig,
+      {
+        props: {
+          value: {},
+          type:  'openldap',
+        }
+      });
+
+    const userLoginFilter = wrapper.find('[data-testid="user-login-filter"]');
+
+    await userLoginFilter.setValue('Test Filter');
+
+    const expectedValue = 'Test Filter';
+
+    expect(userLoginFilter.exists()).toBe(true);
+    expect(userLoginFilter.element.value).toBe(expectedValue);
+    expect(wrapper.vm.model.userLoginFilter).toBe(expectedValue);
+  });
+
+  it('defaults to undefined for user login filter', () => {
+    const wrapper = mount(
+      LDAPConfig,
+      {
+        props: {
+          value: {},
+          type:  'openldap',
+        }
+      });
+
+    const userLoginFilter = wrapper.find('[data-testid="user-login-filter"]');
+
+    const expectedValue = '';
+
+    expect(userLoginFilter.exists()).toBe(true);
+    expect(userLoginFilter.element.value).toBe(expectedValue);
+    expect(wrapper.vm.model.userLoginFilter).toBeUndefined();
+  });
 });

package/edit/auth/ldap/config.vue

@@ -279,147 +279,125 @@ export default {
       color="info"
       label-key="authConfig.ldap.oktaSchema"
     />
-    <div class="row">
-      <div class="col span-6">
+    <div class="schema-container">
+      <div class="schema-column">
         <h4>{{ t('authConfig.ldap.users') }}</h4>
-      </div>
-      <div class="col span-6">
-        <h4>{{ t('authConfig.ldap.groups') }}</h4>
-      </div>
-    </div>
-    <div class="row mb-20">
-      <div class="col span-6">
         <LabeledInput
           v-model:value="model.userObjectClass"
           :mode="mode"
           :label="t('authConfig.ldap.objectClass')"
         />
-      </div>
-      <div class="col span-6">
-        <LabeledInput
-          v-model:value="model.groupObjectClass"
-          :mode="mode"
-          :label="t('authConfig.ldap.objectClass')"
-        />
-      </div>
-    </div>
-    <div class="row mb-20">
-      <div class="col span-6">
         <LabeledInput
           v-model:value="model.userNameAttribute"
           :mode="mode"
           :label="t('authConfig.ldap.usernameAttribute')"
         />
-      </div>
-      <div class="col span-6">
-        <LabeledInput
-          v-model:value="model.groupNameAttribute"
-          :mode="mode"
-          :label="t('authConfig.ldap.nameAttribute')"
-        />
-      </div>
-    </div>
-    <div class="row mb-20">
-      <div class="col span-6">
         <LabeledInput
           v-model:value="model.userLoginAttribute"
           :mode="mode"
           :label="t('authConfig.ldap.loginAttribute')"
         />
-      </div>
-      <div class="col span-6">
-        <LabeledInput
-          v-model:value="model.groupMemberUserAttribute"
-          :mode="mode"
-          :label="t('authConfig.ldap.groupMemberUserAttribute')"
-        />
-      </div>
-    </div>
-    <div class="row mb-20">
-      <div class="col span-6">
         <LabeledInput
           v-model:value="model.userMemberAttribute"
           :mode="mode"
           :label="t('authConfig.ldap.userMemberAttribute')"
         />
-      </div>
-      <div class="col span-6">
         <LabeledInput
-          v-model:value="model.groupSearchAttribute"
+          v-model:value="model.userLoginFilter"
+          data-testid="user-login-filter"
           :mode="mode"
-          :label="t('authConfig.ldap.searchAttribute')"
+          :label="t('authConfig.ldap.userLoginFilter')"
         />
-      </div>
-    </div>
-    <div class="row mb-20">
-      <div class="col span-6">
         <LabeledInput
           v-model:value="model.userSearchAttribute"
           :mode="mode"
           :label="t('authConfig.ldap.searchAttribute')"
         />
-      </div>
-      <div class="col span-6">
         <LabeledInput
-          v-model:value="model.groupSearchFilter"
+          v-model:value="model.userSearchFilter"
           :mode="mode"
           :label="t('authConfig.ldap.searchFilter')"
         />
-      </div>
-    </div>
-    <div class="row mb-20">
-      <div class="col span-6">
         <LabeledInput
-          v-model:value="model.userSearchFilter"
+          v-model:value="model.userEnabledAttribute"
           :mode="mode"
-          :label="t('authConfig.ldap.searchFilter')"
+          :label="t('authConfig.ldap.userEnabledAttribute')"
         />
-      </div>
-      <div class="col span-6">
         <LabeledInput
-          v-model:value="model.groupMemberMappingAttribute"
+          v-model:value="model.disabledStatusBitmask"
           :mode="mode"
-          :label="t('authConfig.ldap.groupMemberMappingAttribute')"
+          :label="t('authConfig.ldap.disabledStatusBitmask')"
         />
       </div>
-    </div>
-    <div class="row mb-20">
-      <div class="col span-6">
+      <div class="schema-column">
+        <h4>{{ t('authConfig.ldap.groups') }}</h4>
         <LabeledInput
-          v-model:value="model.userEnabledAttribute"
+          v-model:value="model.groupObjectClass"
           :mode="mode"
-          :label="t('authConfig.ldap.userEnabledAttribute')"
+          :label="t('authConfig.ldap.objectClass')"
         />
-      </div>
-      <div class="col span-6">
         <LabeledInput
-          v-model:value="model.groupDNAttribute"
+          v-model:value="model.groupNameAttribute"
           :mode="mode"
-          :label="t('authConfig.ldap.groupDNAttribute')"
+          :label="t('authConfig.ldap.nameAttribute')"
         />
-      </div>
-    </div>
-    <div class="row mb-20">
-      <div class="col span-6">
         <LabeledInput
-          v-model:value="model.disabledStatusBitmask"
+          v-model:value="model.groupMemberUserAttribute"
           :mode="mode"
-          :label="t('authConfig.ldap.disabledStatusBitmask')"
+          :label="t('authConfig.ldap.groupMemberUserAttribute')"
         />
-      </div>
-      <div
-        v-if="!isSamlProvider"
-        class=" col span-6"
-      >
-        <RadioGroup
-          v-model:value="model.nestedGroupMembershipEnabled"
+        <LabeledInput
+          v-model:value="model.groupSearchAttribute"
           :mode="mode"
-          name="nested"
-          class="full-height"
-          :options="[true, false]"
-          :labels="[t('authConfig.ldap.nestedGroupMembership.options.nested'), t('authConfig.ldap.nestedGroupMembership.options.direct')]"
+          :label="t('authConfig.ldap.searchAttribute')"
+        />
+        <LabeledInput
+          v-model:value="model.groupSearchFilter"
+          :mode="mode"
+          :label="t('authConfig.ldap.searchFilter')"
         />
+        <LabeledInput
+          v-model:value="model.groupMemberMappingAttribute"
+          :mode="mode"
+          :label="t('authConfig.ldap.groupMemberMappingAttribute')"
+        />
+        <LabeledInput
+          v-model:value="model.groupDNAttribute"
+          :mode="mode"
+          :label="t('authConfig.ldap.groupDNAttribute')"
+        />
+        <template
+          v-if="!isSamlProvider"
+        >
+          <RadioGroup
+            v-model:value="model.nestedGroupMembershipEnabled"
+            :mode="mode"
+            name="nested"
+            class="full-height"
+            :options="[true, false]"
+            :labels="[t('authConfig.ldap.nestedGroupMembership.options.nested'), t('authConfig.ldap.nestedGroupMembership.options.direct')]"
+          />
+        </template>
       </div>
     </div>
   </div>
 </template>
+
+<style lang="scss" scoped>
+  .schema-container {
+    display: flex;
+    gap: 1.75%;
+    flex-wrap: wrap;
+  }
+
+  .schema-column {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    min-width: 16rem;
+
+    > :not(:first-child) {
+      margin-bottom: 20px;
+    }
+  }
+</style>