dashboard-shell-shell 1.0.10000011122 → 1.6.0-alpha.2

package/edit/auth/oidc.vue

@@ -5,6 +5,7 @@ import AuthConfig from '@shell/mixins/auth-config';
 import CruResource from '@shell/components/CruResource';
 import AllowedPrincipals from '@shell/components/auth/AllowedPrincipals';
 import FileSelector from '@shell/components/form/FileSelector';
+import { Banner } from '@components/Banner';
 import AuthBanner from '@shell/components/auth/AuthBanner';
 import AuthProviderWarningBanners from '@shell/edit/auth/AuthProviderWarningBanners';
 import AdvancedSection from '@shell/components/AdvancedSection.vue';
@@ -13,9 +14,11 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import { RadioGroup } from '@components/Form/Radio';
 import { Checkbox } from '@components/Form/Checkbox';
 import { BASE_SCOPES } from '@shell/store/auth';
+import CopyToClipboardText from '@shell/components/CopyToClipboardText.vue';
 
 export default {
   components: {
+    Banner,
     Loading,
     CruResource,
     AllowedPrincipals,
@@ -27,6 +30,7 @@ export default {
     LabeledInput,
     RadioGroup,
     Checkbox,
+    CopyToClipboardText,
   },
 
   mixins: [CreateEditView, AuthConfig],
@@ -85,7 +89,11 @@ export default {
         return false;
       }
 
-      if ( !this.customEndpoint.value ) {
+      if (this.isAmazonCognito) {
+        const { issuer } = this.model;
+
+        return !!(clientId && clientSecret && issuer);
+      } else if ( !this.customEndpoint.value ) {
         const { url, realm } = this.oidcUrls;
 
         return !!(clientId && clientSecret && url && realm);
@@ -107,6 +115,20 @@ export default {
      */
     requiredScopes() {
       return this.model.id ? (BASE_SCOPES[this.model.id] || []) ? (BASE_SCOPES[this.model.id] || [])[0].split(' ') : [] : [];
+    },
+
+    requiresCert() {
+      // We assume all do, apart from the ones here, which do not
+      return !(['cognito'].includes(this.model.id));
+    },
+
+    supportsGroupSearch() {
+      // We assume all do, apart from the ones here, which do not
+      return !(['cognito'].includes(this.model.id));
+    },
+
+    isAmazonCognito() {
+      return this.model?.id === 'cognito';
     }
   },
 
@@ -205,7 +227,9 @@ export default {
             <tr><td>{{ t(`authConfig.oidc.rancherUrl`) }}: </td><td>{{ model.rancherUrl }}</td></tr>
             <tr><td>{{ t(`authConfig.oidc.clientId`) }}: </td><td>{{ model.clientId }}</td></tr>
             <tr><td>{{ t(`authConfig.oidc.issuer`) }}: </td><td>{{ model.issuer }}</td></tr>
-            <tr><td>{{ t(`authConfig.oidc.authEndpoint`) }}: </td><td>{{ model.authEndpoint }}</td></tr>
+            <tr v-if="model.authEndpoint">
+              <td>{{ t(`authConfig.oidc.authEndpoint`) }}: </td><td>{{ model.authEndpoint }}</td>
+            </tr>
           </template>
         </AuthBanner>
 
@@ -226,6 +250,25 @@ export default {
 
         <h3>{{ t(`authConfig.oidc.${NAME}`) }}</h3>
 
+        <Banner
+          v-if="!model.enabled && isAmazonCognito"
+          color="info"
+          class="mb-20 mt-0"
+          data-testid="oidc-cognito-banner"
+        >
+          <div>
+            <div
+              v-clean-html="t('authConfig.oidc.cognitoHelp', {}, true)"
+            />
+            <div class="mt-10">
+              <CopyToClipboardText
+                :plain="true"
+                :text="model.rancherUrl"
+              />
+            </div>
+          </div>
+        </Banner>
+
         <!-- Auth credentials -->
         <div class="row mb-20">
           <div class="col span-6">
@@ -249,7 +292,10 @@ export default {
         </div>
 
         <!-- Key/Certificate -->
-        <div class="row mb-20">
+        <div
+          v-if="requiresCert"
+          class="row mb-20"
+        >
           <div class="col span-6">
             <LabeledInput
               v-model:value="model.privateKey"
@@ -283,7 +329,10 @@ export default {
         </div>
 
         <!-- Allow group search -->
-        <div class="row mb-20">
+        <div
+          v-if="supportsGroupSearch"
+          class="row mb-20"
+        >
           <div class="col span-6">
             <Checkbox
               v-model:value="model.groupSearchEnabled"
@@ -309,102 +358,59 @@ export default {
           </div>
         </div>
 
-        <!-- Generated vs Specific Endpoints -->
-        <div class="row mb-20">
-          <div class="col span-6">
-            <RadioGroup
-              v-model:value="customEndpoint.value"
-              name="customEndpoint"
-              label-key="authConfig.oidc.customEndpoint.label"
-              :labels="customEndpoint.labels"
-              :options="customEndpoint.options"
-              data-testid="oidc-custom-endpoint"
-            >
-              <template #label>
-                <h4>{{ t('authConfig.oidc.customEndpoint.label') }}</h4>
-              </template>
-            </RadioGroup>
-          </div>
-        </div>
-
-        <!-- Generated endpoints -->
-        <div class="row mb-20">
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="oidcUrls.url"
-              :label="t(`authConfig.oidc.url`)"
-              :mode="mode"
-              :required="!customEndpoint.value"
-              :disabled="customEndpoint.value"
-              data-testid="oidc-url"
-            />
-          </div>
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="oidcUrls.realm"
-              :label="t(`authConfig.oidc.realm`)"
-              :mode="mode"
-              :required="!customEndpoint.value"
-              :disabled="customEndpoint.value"
-              data-testid="oidc-realm"
-            />
-          </div>
-        </div>
-
-        <!-- Specific Endpoints -->
-        <div class="row mb-20">
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="model.rancherUrl"
-              :label="t(`authConfig.oidc.rancherUrl`)"
-              :mode="mode"
-              required
-              :disabled="!customEndpoint.value"
-              data-testid="oidc-rancher-url"
-            />
-          </div>
-        </div>
-
-        <div class="row mb-20">
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="model.issuer"
-              :label="t(`authConfig.oidc.issuer`)"
-              :mode="mode"
-              required
-              :disabled="!customEndpoint.value"
-              data-testid="oidc-issuer"
-            />
-          </div>
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="model.authEndpoint"
-              :label="t(`authConfig.oidc.authEndpoint`)"
-              :mode="mode"
-              :disabled="!customEndpoint.value"
-              :required="requiresAuthEndpoint"
-              data-testid="oidc-auth-endpoint"
-            />
+        <template v-if="!isAmazonCognito">
+          <!-- Generated vs Specific Endpoints -->
+          <div class="row mb-20">
+            <div class="col span-6">
+              <RadioGroup
+                v-model:value="customEndpoint.value"
+                name="customEndpoint"
+                label-key="authConfig.oidc.customEndpoint.label"
+                :labels="customEndpoint.labels"
+                :options="customEndpoint.options"
+                data-testid="oidc-custom-endpoint"
+              >
+                <template #label>
+                  <h4>{{ t('authConfig.oidc.customEndpoint.label') }}</h4>
+                </template>
+              </RadioGroup>
+            </div>
           </div>
-        </div>
 
-        <!-- Advanced section -->
-        <AdvancedSection :mode="mode">
+          <!-- Generated endpoints -->
           <div class="row mb-20">
             <div class="col span-6">
               <LabeledInput
-                v-model:value="model.jwksUrl"
-                :label="t(`authConfig.oidc.jwksUrl`)"
+                v-model:value="oidcUrls.url"
+                :label="t(`authConfig.oidc.url`)"
                 :mode="mode"
-                :disabled="!customEndpoint.value"
+                :required="!customEndpoint.value"
+                :disabled="customEndpoint.value"
+                data-testid="oidc-url"
               />
             </div>
             <div class="col span-6">
               <LabeledInput
-                v-model:value="model.tokenEndpoint"
-                :label="t(`authConfig.oidc.tokenEndpoint`)"
+                v-model:value="oidcUrls.realm"
+                :label="t(`authConfig.oidc.realm`)"
                 :mode="mode"
+                :required="!customEndpoint.value"
+                :disabled="customEndpoint.value"
+                data-testid="oidc-realm"
+              />
+            </div>
+          </div>
+
+          <!-- Specific Endpoints -->
+          <div class="row mb-20">
+            <div class="col span-6">
+              <LabeledInput
+                v-model:value="model.rancherUrl"
+                :label="t(`authConfig.oidc.rancherUrl`)"
+                :mode="mode"
+                required
                 :disabled="!customEndpoint.value"
+                data-testid="oidc-rancher-url"
               />
             </div>
           </div>
@@ -412,22 +418,82 @@ export default {
           <div class="row mb-20">
             <div class="col span-6">
               <LabeledInput
-                v-model:value="model.userInfoEndpoint"
-                :label="t(`authConfig.oidc.userInfoEndpoint`)"
+                v-model:value="model.issuer"
+                :label="t(`authConfig.oidc.issuer`)"
                 :mode="mode"
+                required
                 :disabled="!customEndpoint.value"
+                data-testid="oidc-issuer"
               />
             </div>
             <div class="col span-6">
               <LabeledInput
-                v-model:value="model.acrValue"
-                :label="t(`authConfig.oidc.acrValue`)"
+                v-model:value="model.authEndpoint"
+                :label="t(`authConfig.oidc.authEndpoint`)"
                 :mode="mode"
                 :disabled="!customEndpoint.value"
+                :required="requiresAuthEndpoint"
+                data-testid="oidc-auth-endpoint"
+              />
+            </div>
+          </div>
+
+          <!-- Advanced section -->
+          <AdvancedSection :mode="mode">
+            <div class="row mb-20">
+              <div class="col span-6">
+                <LabeledInput
+                  v-model:value="model.jwksUrl"
+                  :label="t(`authConfig.oidc.jwksUrl`)"
+                  :mode="mode"
+                  :disabled="!customEndpoint.value"
+                />
+              </div>
+              <div class="col span-6">
+                <LabeledInput
+                  v-model:value="model.tokenEndpoint"
+                  :label="t(`authConfig.oidc.tokenEndpoint`)"
+                  :mode="mode"
+                  :disabled="!customEndpoint.value"
+                />
+              </div>
+            </div>
+
+            <div class="row mb-20">
+              <div class="col span-6">
+                <LabeledInput
+                  v-model:value="model.userInfoEndpoint"
+                  :label="t(`authConfig.oidc.userInfoEndpoint`)"
+                  :mode="mode"
+                  :disabled="!customEndpoint.value"
+                />
+              </div>
+              <div class="col span-6">
+                <LabeledInput
+                  v-model:value="model.acrValue"
+                  :label="t(`authConfig.oidc.acrValue`)"
+                  :mode="mode"
+                  :disabled="!customEndpoint.value"
+                />
+              </div>
+            </div>
+          </AdvancedSection>
+        </template>
+
+        <template v-if="isAmazonCognito">
+          <h3>{{ t(`authConfig.oidc.cognitoIssuer`) }}</h3>
+          <div class="row mb-20">
+            <div class="col span-6">
+              <LabeledInput
+                v-model:value="model.issuer"
+                :label="t(`authConfig.oidc.issuer`)"
+                :mode="mode"
+                required
+                data-testid="oidc-issuer"
               />
             </div>
           </div>
-        </AdvancedSection>
+        </template>
       </template>
     </CruResource>
   </div>

package/edit/autoscaling.horizontalpodautoscaler/external-metric.vue

@@ -41,7 +41,7 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-20">
+    <div class="row">
       <MetricTarget
         v-model:value="value.target"
         :mode="mode"

package/edit/autoscaling.horizontalpodautoscaler/hpa-scaling-rule.vue

@@ -49,8 +49,8 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-20">
-      <div class="col span-12">
+    <div class="row">
+      <div class="span-12">
         <ArrayListGrouped
           v-model:value="value.spec.behavior[type].policies"
           :add-label="t('hpa.scalingRule.addPolicy')"
@@ -59,7 +59,7 @@ export default {
         >
           <template #default="props">
             <div class="row">
-              <div class="col span-4">
+              <div class="col">
                 <LabeledSelect
                   v-model:value="props.row.value.type"
                   :mode="mode"
@@ -72,7 +72,9 @@ export default {
                   :label="t('hpa.scalingRule.policy.type')"
                 />
               </div>
-              <div class="col span-4">
+            </div>
+            <div class="row">
+              <div class="col">
                 <LabeledInput
                   v-model:value.number="props.row.value.value"
                   :mode="mode"
@@ -83,7 +85,9 @@ export default {
                   :label="t('hpa.scalingRule.policy.value')"
                 />
               </div>
-              <div class="col span-4">
+            </div>
+            <div class="row">
+              <div class="col">
                 <LabeledInput
                   v-model:value.number="props.row.value.periodSeconds"
                   :mode="mode"
@@ -125,6 +129,5 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-40" />
   </div>
 </template>

package/edit/autoscaling.horizontalpodautoscaler/index.vue

@@ -206,13 +206,16 @@ export default {
         :mode="mode"
       />
 
-      <Tabbed :side-tabs="true">
+      <Tabbed
+        :side-tabs="true"
+        :use-hash="useTabbedHash"
+      >
         <Tab
           name="target"
           :label="t('hpa.tabs.target')"
           :weight="10"
         >
-          <div class="row mb-20">
+          <div class="row">
             <div class="col span-6">
               <LabeledSelect
                 v-model:value="value.spec.scaleTargetRef"
@@ -239,6 +242,8 @@ export default {
                 type="number"
               />
             </div>
+          </div>
+          <div class="row">
             <div class="col span-6">
               <LabeledInput
                 v-model:value.number="value.spec.maxReplicas"

package/edit/autoscaling.horizontalpodautoscaler/metric-identifier.vue

@@ -51,8 +51,8 @@ export default {
 
 <template>
   <div class="col span-12">
-    <div class="row mb-20">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.name"
           :mode="mode"

package/edit/autoscaling.horizontalpodautoscaler/metric-object-reference.vue

@@ -21,9 +21,9 @@ export default {
 </script>
 
 <template>
-  <div class="col span-12">
-    <div class="row mb-20">
-      <div class="col span-6">
+  <div class="span-12">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.apiVersion"
           :mode="mode"
@@ -33,7 +33,9 @@ export default {
           type="text"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.kind"
           :mode="mode"
@@ -45,7 +47,7 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-6">
+      <div class="col">
         <LabeledInput
           v-model:value="value.name"
           :mode="mode"

package/edit/autoscaling.horizontalpodautoscaler/metric-target.vue

@@ -149,7 +149,7 @@ export default {
 <template>
   <div class="metric-target">
     <div class="row">
-      <div class="col span-6">
+      <div class="col">
         <LabeledSelect
           v-model:value="value.type"
           :mode="mode"
@@ -157,9 +157,11 @@ export default {
           :options="targetTypes"
         />
       </div>
+    </div>
+    <div class="row">
       <div
         v-if="isResourceMetricType"
-        class="col span-6"
+        class="col"
       >
         <UnitInput
           v-if="value.type === 'Utilization'"
@@ -197,7 +199,7 @@ export default {
       </div>
       <div
         v-else
-        class="col span-6"
+        class="col"
       >
         <LabeledInput
           v-model:value="quantity"

package/edit/autoscaling.horizontalpodautoscaler/metrics-row.vue

@@ -159,8 +159,8 @@ export default {
       :label="t('hpa.warnings.resource')"
       color="warning"
     />
-    <div class="row mb-20">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledSelect
           v-model:value="value.type"
           :reduce="(val) => val.label"

package/edit/autoscaling.horizontalpodautoscaler/object-metric.vue

@@ -48,14 +48,14 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-20">
+    <div class="row">
       <MetricTarget
         v-model:value="value.target"
         :mode="mode"
         metric-resource="object"
       />
     </div>
-    <div class="row mb-20">
+    <div class="row">
       <MetricObjectReference
         v-model:value="value.describedObject"
         :mode="mode"

package/edit/autoscaling.horizontalpodautoscaler/pod-metric.vue

@@ -41,7 +41,7 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-20">
+    <div class="row">
       <MetricTarget
         v-model:value="value.target"
         :mode="mode"

package/edit/autoscaling.horizontalpodautoscaler/resource-metric.vue

@@ -43,8 +43,8 @@ export default {
 
 <template>
   <div class="resource-metric">
-    <div class="row mb-20">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledSelect
           v-model:value="value.name"
           :mode="mode"