@rancher/shell 3.0.2-rc.5 → 3.0.2

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>

package/edit/auth/oidc.vue

@@ -11,6 +11,7 @@ import AdvancedSection from '@shell/components/AdvancedSection.vue';
 import ArrayList from '@shell/components/form/ArrayList';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import { RadioGroup } from '@components/Form/Radio';
+import { Checkbox } from '@components/Form/Checkbox';
 
 export default {
   components: {
@@ -23,7 +24,8 @@ export default {
     AdvancedSection,
     ArrayList,
     LabeledInput,
-    RadioGroup
+    RadioGroup,
+    Checkbox,
   },
 
   mixins: [CreateEditView, AuthConfig],
@@ -134,7 +136,7 @@ export default {
       const isKeycloak = this.model.id === 'keycloakoidc';
 
       const url = this.oidcUrls.url.replaceAll(' ', '');
-      const realmsPath = isKeycloak ? 'auth/realms' : 'realms';
+      const realmsPath = 'realms';
 
       this.model.issuer = `${ url }/${ realmsPath }/${ this.oidcUrls.realm || '' }`;
 
@@ -253,6 +255,18 @@ export default {
           </div>
         </div>
 
+        <div class="row mb-20">
+          <div class="col span-6">
+            <Checkbox
+              v-model:value="model.groupSearchEnabled"
+              data-testid="input-group-search"
+              :label="t('authConfig.oidc.groupSearch.label')"
+              :tooltip="t('authConfig.oidc.groupSearch.tooltip')"
+              :mode="mode"
+            />
+          </div>
+        </div>
+
         <div class="row mb-20">
           <div class="col span-6">
             <ArrayList

package/edit/catalog.cattle.io.clusterrepo.vue

@@ -6,7 +6,7 @@ import { RadioGroup } from '@components/Form/Radio';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import Labels from '@shell/components/form/Labels';
 import SelectOrCreateAuthSecret from '@shell/components/form/SelectOrCreateAuthSecret';
-import InfoBox from '@shell/components/InfoBox';
+import Banner from '@components/Banner/Banner.vue';
 import { Checkbox } from '@components/Form/Checkbox';
 import { MANAGEMENT, NAMESPACE, CLUSTER_REPO_TYPES } from '@shell/config/types';
 import UnitInput from '@shell/components/form/UnitInput.vue';
@@ -23,7 +23,7 @@ export default {
     NameNsDescription,
     Labels,
     SelectOrCreateAuthSecret,
-    InfoBox,
+    Banner,
     Checkbox,
     UnitInput
   },
@@ -153,12 +153,16 @@ export default {
       </div>
     </div>
 
-    <InfoBox
-      v-if="clusterRepoType === CLUSTER_REPO_TYPES.OCI_URL"
-      class="p-10"
-    >
-      {{ t('catalog.repo.oci.info', null, true) }}
-    </InfoBox>
+    <template v-if="clusterRepoType === CLUSTER_REPO_TYPES.OCI_URL">
+      <Banner
+        label-key="catalog.repo.oci.warning"
+        color="warning"
+      />
+      <Banner
+        :label="t('catalog.repo.oci.info', null, true)"
+        color="info"
+      />
+    </template>
 
     <div class="row mb-10">
       <template v-if="clusterRepoType === CLUSTER_REPO_TYPES.GIT_REPO">

package/edit/cis.cattle.io.clusterscan.vue

@@ -192,7 +192,19 @@ export default {
         if (!schedule) {
           return false;
         } else {
-          return isValidCron(schedule) && !!this.value.spec.scanProfileName;
+          // TODO - #13202: This is required due use of 2 libraries and 3 different libraries through the code.
+          const predefined = [
+            '@yearly',
+            '@annually',
+            '@monthly',
+            '@weekly',
+            '@daily',
+            '@midnight',
+            '@hourly'
+          ];
+          const isPredefined = predefined.includes(schedule);
+
+          return (isPredefined || isValidCron(schedule)) && !!this.value.spec.scanProfileName;
         }
       }