@rancher/shell 3.0.5-rc.5 → 3.0.5-rc.6

package/edit/provisioning.cattle.io.cluster/tabs/Basics.vue

@@ -16,7 +16,7 @@ import { _CREATE, _EDIT } from '@shell/config/query-params';
 const HARVESTER = 'harvester';
 
 export default {
-  emits: ['enabled-system-services-changed', 'cilium-values-changed', 'kubernetes-changed', 'show-deprecated-patch-versions-changed', 'cis-changed', 'psa-default-changed'],
+  emits: ['enabled-system-services-changed', 'cilium-values-changed', 'kubernetes-changed', 'show-deprecated-patch-versions-changed', 'compliance-changed', 'psa-default-changed'],
 
   components: {
     Banner,
@@ -53,7 +53,7 @@ export default {
       type:     Object,
       required: true
     },
-    cisOverride: {
+    complianceOverride: {
       type:     Boolean,
       required: true
     },
@@ -157,7 +157,7 @@ export default {
       });
 
       out.unshift({
-        label: this.$store.getters['i18n/t']('cluster.rke2.cisProfile.option'),
+        label: this.$store.getters['i18n/t']('cluster.rke2.complianceProfile.option'),
         value: ''
       });
 
@@ -167,19 +167,19 @@ export default {
     /**
      * Allow to display override if PSA is needed and profile is set
      */
-    hasCisOverride() {
+    hasComplianceOverride() {
       return (this.serverConfig?.profile || this.agentConfig?.profile) &&
         // Also check other cases on when to display the override
-        this.showCisProfile && this.isCisSupported;
+        this.showComplianceProfile && this.isComplianceSupported;
     },
 
     /**
-     * Disable PSA if CIS hardening is enabled, except override
+     * Disable PSA if Compliance hardening is enabled, except override
      */
     isPsaDisabled() {
-      const cisValue = this.agentConfig?.profile || this.serverConfig?.profile;
+      const complianceValue = this.agentConfig?.profile || this.serverConfig?.profile;
 
-      return !(!cisValue || this.cisOverride) && this.isCisSupported;
+      return !(!complianceValue || this.complianceOverride) && this.isComplianceSupported;
     },
 
     /**
@@ -218,12 +218,12 @@ export default {
     },
 
     /**
-     * Check if current CIS profile is required and listed in the options
+     * Check if current compliance profile is required and listed in the options
      */
-    isCisSupported() {
-      const cisProfile = this.serverConfig?.profile || this.agentConfig?.profile;
+    isComplianceSupported() {
+      const complianceProfile = this.serverConfig?.profile || this.agentConfig?.profile;
 
-      return !cisProfile || this.profileOptions.map((option) => option.value).includes(cisProfile);
+      return !complianceProfile || this.profileOptions.map((option) => option.value).includes(complianceProfile);
     },
 
     disableOptions() {
@@ -252,7 +252,7 @@ export default {
       return this.selectedVersion?.charts || {};
     },
 
-    showCisProfile() {
+    showComplianceProfile() {
       return (this.provider === 'custom' || this.isElementalCluster) && ( this.serverArgs?.profile || this.agentArgs?.profile );
     },
 
@@ -573,15 +573,15 @@ export default {
     </h3>
 
     <Banner
-      v-if="showCisProfile && !isCisSupported && isEdit"
+      v-if="showComplianceProfile && !isComplianceSupported && isEdit"
       color="info"
     >
-      <p v-clean-html="t('cluster.rke2.banner.cisUnsupported', {cisProfile: serverConfig.profile || agentConfig.profile}, true)" />
+      <p v-clean-html="t('cluster.rke2.banner.complianceUnsupported', {profile: serverConfig.profile || agentConfig.profile}, true)" />
     </Banner>
 
     <div class="row mb-10">
       <div
-        v-if="showCisProfile"
+        v-if="showComplianceProfile"
         class="col span-6"
       >
         <LabeledSelect
@@ -589,36 +589,36 @@ export default {
           v-model:value="serverConfig.profile"
           :mode="mode"
           :options="profileOptions"
-          :label="t('cluster.rke2.cis.sever')"
-          @update:value="$emit('cis-changed')"
+          :label="t('cluster.rke2.compliance.sever')"
+          @update:value="$emit('compliance-changed')"
         />
         <LabeledSelect
           v-else-if="agentArgs && agentArgs.profile && agentConfig"
           v-model:value="agentConfig.profile"
-          data-testid="rke2-custom-edit-cis-agent"
+          data-testid="rke2-custom-edit-compliance-agent"
           :mode="mode"
           :options="profileOptions"
-          :label="t('cluster.rke2.cis.agent')"
-          @update:value="$emit('cis-changed')"
+          :label="t('cluster.rke2.compliance.agent')"
+          @update:value="$emit('compliance-changed')"
         />
       </div>
     </div>
 
-    <template v-if="hasCisOverride">
+    <template v-if="hasComplianceOverride">
       <Checkbox
-        :value="cisOverride"
+        :value="complianceOverride"
         :mode="mode"
-        :label="t('cluster.rke2.cis.override')"
+        :label="t('cluster.rke2.compliance.override')"
         @update:value="$emit('psa-default-changed')"
       />
 
       <Banner
-        v-if="cisOverride"
+        v-if="complianceOverride"
         color="warning"
-        :label="t('cluster.rke2.banner.cisOverride')"
+        :label="t('cluster.rke2.banner.complianceOverride')"
       />
       <Banner
-        v-if="!cisOverride"
+        v-if="!complianceOverride"
         color="info"
         :label="t('cluster.rke2.banner.psaChange')"
       />

package/edit/provisioning.cattle.io.cluster/tabs/MachinePool.vue

@@ -45,6 +45,10 @@ export default {
       type:    String,
       default: null
     },
+    projectId: {
+      type:    String,
+      default: null
+    },
 
     mode: {
       type:    String,
@@ -306,6 +310,7 @@ export default {
       :value="value.config"
       :provider="provider"
       :credential-id="credentialId"
+      :project-id="projectId"
       :pool-index="idx"
       :pool-id="poolId"
       :pool-create-mode="value.create"

package/edit/resources.cattle.io.restore.vue

@@ -48,7 +48,7 @@ export default {
   async fetch() {
     const hash = await allHash({
       catalog:     this.$store.dispatch('catalog/load'),
-      resourceSet: this.$store.dispatch('cluster/find', { type: BACKUP_RESTORE.RESOURCE_SET, id: this.value?.spec?.resourceSetName || 'rancher-resource-set' }),
+      resourceSet: this.$store.dispatch('cluster/find', { type: BACKUP_RESTORE.RESOURCE_SET, id: this.value?.spec?.resourceSetName || 'rancher-resource-set-full' }),
       apps:        this.$store.dispatch('cluster/findAll', { type: CATALOG.APP })
     });
 

package/edit/secret/index.vue

@@ -373,6 +373,7 @@ export default {
       <Tabbed
         v-else
         :side-tabs="true"
+        :use-hash="useTabbedHash"
         default-tab="data"
       >
         <Tab

package/edit/service.vue

@@ -344,7 +344,10 @@ export default {
       :rules="{ name: fvGetAndReportPathRules('metadata.name'), namespace: [], description: [] }"
     />
 
-    <Tabbed :side-tabs="true">
+    <Tabbed
+      :side-tabs="true"
+      :use-hash="useTabbedHash"
+    >
       <Tab
         v-if="checkTypeIs('ExternalName')"
         name="define-external-name"

package/edit/serviceaccount.vue

@@ -142,7 +142,10 @@ export default {
       :mode="mode"
     />
 
-    <Tabbed :side-tabs="true">
+    <Tabbed
+      :side-tabs="true"
+      :use-hash="useTabbedHash"
+    >
       <Tab
         name="data"
         :label="t('serviceAccount.tabs.serviceAccount.label')"

package/edit/storage.k8s.io.storageclass/index.vue

@@ -237,7 +237,10 @@ export default {
         :provisioner="provisionerLabel(value.provisioner)"
       />
     </Banner>
-    <Tabbed :side-tabs="true">
+    <Tabbed
+      :side-tabs="true"
+      :use-hash="useTabbedHash"
+    >
       <Tab
         name="parameters"
         :label="t('storageClass.parameters.label')"

package/edit/workload/index.vue

@@ -163,6 +163,7 @@ export default {
         :show-tabs-add-remove="true"
         :default-tab="defaultTab"
         :flat="true"
+        :use-hash="useTabbedHash"
         data-testid="workload-horizontal-tabs"
         @changed="changed"
       >
@@ -178,6 +179,7 @@ export default {
             :side-tabs="true"
             :weight="99"
             :data-testid="`workload-container-tabs-${i}`"
+            :use-hash="useTabbedHash"
           >
             <Tab
               :label="t('workload.container.titles.general')"
@@ -266,6 +268,7 @@ export default {
                     v-stripped-aria-label="t('workload.container.ports.toolTip')"
                     class="icon icon-info"
                     tabindex="0"
+                    role="tooltip"
                   />
                 </h3>
                 <p class="padded">
@@ -373,6 +376,7 @@ export default {
           <Tabbed
             data-testid="workload-general-tabs"
             :side-tabs="true"
+            :use-hash="useTabbedHash"
           >
             <Tab
               name="labels"
@@ -414,6 +418,7 @@ export default {
           <Tabbed
             data-testid="workload-pod-tabs"
             :side-tabs="true"
+            :use-hash="useTabbedHash"
           >
             <Tab
               :label="t('workload.storage.title')"

package/list/{cis.cattle.io.clusterscan.vue → compliance.cattle.io.clusterscan.vue}

@@ -3,7 +3,7 @@ import ResourceTable from '@shell/components/ResourceTable';
 import { AGE } from '@shell/config/table-headers';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import { allHash } from '@shell/utils/promise';
-import { fetchSpecsScheduledScanConfig } from '@shell/models/cis.cattle.io.clusterscan';
+import { fetchSpecsScheduledScanConfig } from '@shell/models/compliance.cattle.io.clusterscan';
 
 export default {
   components: { ResourceTable },
@@ -40,7 +40,7 @@ export default {
   },
 
   computed: {
-    // warning state and scheduling added in the same version of cis so a check for one is a check for the other
+    // warning state and scheduling added in the same version of compliance so a check for one is a check for the other
     hasWarningState() {
       return this.hasScheduledScanConfig;
     },

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

@@ -0,0 +1,108 @@
+<script>
+import { MANAGEMENT } from '@shell/config/types';
+import { SETTING } from '@shell/config/settings';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
+import CopyToClipboardText from '@shell/components/CopyToClipboardText';
+
+export default {
+  name:       'ListOidcClients',
+  components: {
+    CopyToClipboardText,
+    PaginatedResourceTable,
+  },
+
+  props: {
+    resource: {
+      type:     String,
+      required: true,
+    },
+
+    schema: {
+      type:     Object,
+      required: true,
+    },
+    useQueryParamsForSimpleFiltering: {
+      type:    Boolean,
+      default: false
+    }
+  },
+
+  data() {
+    const baseUrl = this.$store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.SERVER_URL)?.value;
+
+    return {
+      issuerURL:         `${ baseUrl }/oidc`,
+      discoveryDocument: `${ baseUrl }/oidc/.well-known/openid-configuration`,
+      jwksURI:           `${ baseUrl }/oidc/.well-known/jwks.json`
+    };
+  },
+};
+</script>
+
+<template>
+  <div>
+    <div class="oidc-application-list-header-data">
+      <h3>{{ t('oidcclient.oidcEndpoints') }}</h3>
+      <div>
+        <label>{{ t('oidcclient.issuerURL') }}: </label>
+        <CopyToClipboardText
+          :aria-label="t('oidcclient.a11y.copyText.issuerURL')"
+          :text="issuerURL"
+          data-testid="oidc-clients-copy-clipboard-issuer-url"
+        />
+      </div>
+      <div>
+        <label>{{ t('oidcclient.discoveryDocument') }}: </label>
+        <CopyToClipboardText
+          :aria-label="t('oidcclient.a11y.copyText.discoveryDocument')"
+          :text="discoveryDocument"
+          data-testid="oidc-clients-copy-clipboard-discovery-document"
+        />
+      </div>
+      <div>
+        <label>{{ t('oidcclient.jwksUri') }}: </label>
+        <CopyToClipboardText
+          :aria-label="t('oidcclient.a11y.copyText.jwksUri')"
+          :text="jwksURI"
+          data-testid="oidc-clients-copy-clipboard-jwks-uri"
+        />
+      </div>
+    </div>
+    <PaginatedResourceTable
+      :schema="schema"
+      :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+      data-testid="oidc-clients-list"
+    />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.oidc-application-list-header-data {
+  align-items: center;
+  padding: 10px 0px;
+  display: flex;
+  margin-bottom: 24px;
+  flex-direction: column;
+  align-items: start;
+
+  > div:not(:last-child) {
+    margin-bottom: 18px;
+  }
+
+  h3 {
+    margin-bottom: 18px;
+  }
+
+  label {
+    display: block;
+  }
+
+  a {
+    font-weight: bold;
+  }
+
+  &>*:not(:last-child) {
+    margin-right: 40px;
+  }
+}
+</style>

package/list/node.vue

@@ -221,6 +221,8 @@ export default defineComponent({
      * In the paginated world we want to restrict the fetch of those resources to only the one's we need
      *
      * So when we have a page.... use those entries as filters when fetching the other resources
+     *
+     * of type PagTableFetchPageSecondaryResources
      */
     async fetchPageSecondaryResources({ canPaginate, force, page }: PagTableFetchPageSecondaryResourcesOpts) {
       if (!page?.length) {

package/machine-config/amazonec2.vue

@@ -11,6 +11,7 @@ import { Checkbox } from '@components/Form/Checkbox';
 import { NORMAN } from '@shell/config/types';
 import { allHash } from '@shell/utils/promise';
 import { addObject, addObjects, findBy } from '@shell/utils/array';
+import { convertStringToKV, convertKVToString } from '@shell/utils/object';
 import { sortBy } from '@shell/utils/sort';
 import { stringify, exceptionToErrorsArray } from '@shell/utils/error';
 
@@ -348,33 +349,11 @@ export default {
     },
 
     initTags() {
-      const parts = (this.value.tags || '').split(/,/);
-      const out = {};
-
-      let i = 0;
-
-      while ( i + 1 < parts.length ) {
-        const key = `${ parts[i] }`.trim();
-        const value = `${ parts[i + 1] }`.trim();
-
-        if ( key ) {
-          out[key] = value;
-        }
-
-        i += 2;
-      }
-
-      this.tags = out;
+      this.tags = convertStringToKV(this.value.tags);
     },
 
     updateTags(tags) {
-      const ary = [];
-
-      for ( const k in tags ) {
-        ary.push(k, tags[k]);
-      }
-
-      this.value['tags'] = ary.join(',');
+      this.value['tags'] = convertKVToString(tags);
     },
 
     test() {