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

package/detail/provisioning.cattle.io.cluster.vue

@@ -9,7 +9,7 @@ import Tab from '@shell/components/Tabbed/Tab';
 import { allHash } from '@shell/utils/promise';
 import { CAPI, MANAGEMENT, NORMAN, SNAPSHOT } from '@shell/config/types';
 import {
-  STATE, NAME as NAME_COL, AGE, AGE_NORMAN, INTERNAL_EXTERNAL_IP, STATE_NORMAN, ROLES, MACHINE_NODE_OS, MANAGEMENT_NODE_OS, NAME,
+  STATE, NAME as NAME_COL, AGE, INTERNAL_EXTERNAL_IP, STATE_NORMAN, ROLES, MACHINE_NODE_OS, MANAGEMENT_NODE_OS, NAME,
 } from '@shell/config/table-headers';
 import { STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
 import CustomCommand from '@shell/edit/provisioning.cattle.io.cluster/CustomCommand';
@@ -137,8 +137,6 @@ export default {
     }
 
     if ( this.value.isRke1 && this.$store.getters['isRancher'] ) {
-      fetchOne.etcdBackups = this.$store.dispatch('rancher/findAll', { type: NORMAN.ETCD_BACKUP });
-
       fetchOne.normanNodePools = this.$store.dispatch('rancher/findAll', { type: NORMAN.NODE_POOL });
     }
 
@@ -149,7 +147,6 @@ export default {
     this.haveMachines = !!fetchOneRes.machines;
     this.haveDeployments = !!fetchOneRes.machineDeployments;
     this.clusterToken = fetchOneRes.clusterToken;
-    this.etcdBackups = fetchOneRes.etcdBackups;
 
     if (fetchOneRes.normanClusters) {
       // Does the user have access to the local cluster? Need to in order to be able to show the 'Related Resources' tab
@@ -267,7 +264,6 @@ export default {
       machineSchema:  this.$store.getters[`management/schemaFor`](CAPI.MACHINE),
 
       clusterToken: null,
-      etcdBackups:  null,
 
       logOpen:   false,
       logSocket: null,
@@ -529,50 +525,10 @@ export default {
       return headers;
     },
 
-    rke1Snapshots() {
-      const mgmtId = this.value.mgmt?.id;
-
-      if ( !mgmtId ) {
-        return [];
-      }
-
-      return (this.etcdBackups || []).filter((x) => x.clusterId === mgmtId);
-    },
-
     rke2Snapshots() {
       return this.value.etcdSnapshots;
     },
 
-    rke1SnapshotHeaders() {
-      return [
-        STATE_NORMAN,
-        {
-          name:          'name',
-          labelKey:      'tableHeaders.name',
-          value:         'nameDisplay',
-          sort:          ['nameSort'],
-          canBeVariable: true,
-        },
-        {
-          name:     'version',
-          labelKey: 'tableHeaders.version',
-          value:    'status.kubernetesVersion',
-          sort:     'status.kubernetesVersion',
-          width:    150,
-        },
-        { ...AGE_NORMAN, canBeVariable: true },
-        {
-          name:      'manual',
-          labelKey:  'tableHeaders.manual',
-          value:     'manual',
-          formatter: 'Checked',
-          sort:      ['manual'],
-          align:     'center',
-          width:     50,
-        },
-      ];
-    },
-
     rke2SnapshotHeaders() {
       return [
         {
@@ -1113,10 +1069,10 @@ export default {
         <SortableTable
           class="snapshots"
           :data-testid="'cluster-snapshots-list'"
-          :headers="value.isRke1 ? rke1SnapshotHeaders : rke2SnapshotHeaders"
+          :headers="rke2SnapshotHeaders"
           default-sort-by="age"
           :table-actions="value.isRke1"
-          :rows="value.isRke1 ? rke1Snapshots : rke2Snapshots"
+          :rows="rke2Snapshots"
           :search="false"
           :groupable="true"
           :group-by="snapshotsGroupBy"

package/detail/service.vue

@@ -37,7 +37,15 @@ export default {
   },
 
   async fetch() {
-    await this.value.fetchPods();
+    if (this.podSchema) {
+      await this.value.fetchPods();
+    }
+  },
+
+  async unmounted() {
+    if (this.podSchema) {
+      await this.value.unWatchPods();
+    }
   },
 
   data() {
@@ -149,6 +157,7 @@ export default {
     @input="$emit('input', $event)"
   >
     <Tab
+      v-if="podSchema"
       name="pods"
       :label="t('servicesPage.pods.label')"
       :weight="4"

package/detail/workload/index.vue

@@ -89,6 +89,12 @@ export default {
     this.findMatchingIngresses();
   },
 
+  async unmounted() {
+    if (this.podSchema) {
+      await this.value.unWatchPods();
+    }
+  },
+
   data() {
     return {
       servicesInNamespace:             [],
@@ -401,7 +407,7 @@ export default {
             :detail-url="WORKLOAD_METRICS_DETAIL_URL"
             :summary-url="WORKLOAD_METRICS_SUMMARY_URL"
             :vars="graphVars"
-            graph-height="550px"
+            graph-height="600px"
           />
         </template>
       </Tab>
@@ -417,7 +423,7 @@ export default {
             :detail-url="WORKLOAD_PROJECT_METRICS_DETAIL_URL"
             :summary-url="WORKLOAD_PROJECT_METRICS_SUMMARY_URL"
             :vars="graphVars"
-            graph-height="550px"
+            graph-height="600px"
           />
         </template>
       </Tab>

package/dialog/ExtensionCatalogUninstallDialog.vue

@@ -127,21 +127,24 @@ export default {
         const hash = await allHash({
           deployment: this.$store.dispatch('management/findLabelSelector', {
             type:     WORKLOAD_TYPES.DEPLOYMENT,
-            matching: { namespace, labelSelector }
+            matching: { namespace, labelSelector },
+            opt:      { transient: true }
           }),
           service: this.$store.dispatch('management/findLabelSelector', {
             type:     SERVICE,
-            matching: { namespace, labelSelector }
+            matching: { namespace, labelSelector },
+            opt:      { transient: true }
           }),
           repo: this.$store.dispatch('management/findLabelSelector', {
             type:     CATALOG.CLUSTER_REPO,
-            matching: { labelSelector }
+            matching: { labelSelector },
+            opt:      { transient: true }
           })
         });
 
         for ( const resource of Object.keys(hash) ) {
           if ( hash[resource] ) {
-            hash[resource].forEach((r) => r.remove());
+            hash[resource].data.forEach((r) => r.remove());
           }
         }
       }

package/dialog/GenericPrompt.vue

@@ -54,7 +54,7 @@ export default {
       try {
         await this.applyAction(buttonDone);
         this.confirm(true);
-        this.$emit('close', true);
+        this.$emit('close');
       } catch (err) {
         console.error(err); // eslint-disable-line
         this.errors = exceptionToErrorsArray(err);

package/dialog/ImportDialog.vue

@@ -38,11 +38,12 @@ export default {
 
   data() {
     return {
-      currentYaml:   '',
-      allNamespaces: [],
-      errors:        null,
-      rows:          null,
-      done:          false,
+      currentYaml:       '',
+      allNamespaces:     [],
+      errors:            null,
+      rows:              null,
+      done:              false,
+      selectedNamespace: this.defaultNamespace,
     };
   },
 
@@ -90,7 +91,7 @@ export default {
 
         const res = await this.currentCluster.doAction('apply', {
           yaml:             this.currentYaml,
-          defaultNamespace: this.defaultNamespace,
+          defaultNamespace: this.selectedNamespace,
         });
 
         btnCb(true);
@@ -143,11 +144,10 @@ export default {
             </div>
             <div class="col span-6">
               <LabeledSelect
-                :value="defaultNamespace"
+                v-model:value="selectedNamespace"
                 :options="namespaceOptions"
                 label-key="import.defaultNamespace.label"
                 mode="edit"
-                @update:value="newValue => defaultNamespace = newValue"
               />
             </div>
           </div>

package/dialog/OidcClientSecretDialog.vue

@@ -0,0 +1,117 @@
+<script>
+import { Card } from '@components/Card';
+import { OIDC_CLIENT_SECRET_ACTION } from '@shell/detail/management.cattle.io.oidcclient.vue';
+
+export default {
+  name: 'PromptRemove',
+
+  emits: ['disable', 'close'],
+
+  components: { Card },
+  props:      {
+    /**
+     * Inherited global identifier prefix for tests
+     * Define a term based on the parent component to avoid conflicts on multiple components
+     */
+    componentTestid: {
+      type:    String,
+      default: 'oidc-client-secret'
+    },
+    actionCb: {
+      type:    Function,
+      default: () => {}
+    },
+    type: {
+      type:    String,
+      default: ''
+    }
+  },
+  computed: {
+    translationKey() {
+      if (this.type === OIDC_CLIENT_SECRET_ACTION.REGEN) {
+        return 'regenModal';
+      } else if (this.type === OIDC_CLIENT_SECRET_ACTION.REMOVE) {
+        return 'deleteModal';
+      }
+
+      return '';
+    }
+  },
+  methods: {
+    close() {
+      this.$emit('close');
+    },
+    action() {
+      this.actionCb();
+      this.$emit('close');
+    }
+  }
+};
+</script>
+
+<template>
+  <Card
+    class="oidc-secret-modal"
+    :show-highlight-border="false"
+  >
+    <template #title>
+      <h4 class="text-default-text">
+        {{ t(`oidcclient.${ translationKey }.title`) }}
+      </h4>
+    </template>
+    <template #body>
+      <div class="mb-10">
+        <p v-clean-html="t(`oidcclient.${ translationKey }.content`)" />
+      </div>
+    </template>
+    <template #actions>
+      <button
+        class="btn role-secondary"
+        @click="close"
+      >
+        {{ t('generic.cancel') }}
+      </button>
+      <div class="spacer" />
+      <button
+        class="btn role-primary bg-error ml-10"
+        :data-testid="componentTestid + '-confirm-button'"
+        @click="action"
+      >
+        {{ t(`oidcclient.${ translationKey }.action`) }}
+      </button>
+    </template>
+  </Card>
+</template>
+
+<style lang='scss'>
+  .oidc-secret-modal {
+    &.card-container {
+      box-shadow: none;
+    }
+    #confirm {
+      width: 90%;
+      margin-left: 3px;
+    }
+
+    .remove-modal {
+        border-radius: var(--border-radius);
+        overflow: scroll;
+        max-height: 100vh;
+        & ::-webkit-scrollbar-corner {
+          background: rgba(0,0,0,0);
+        }
+    }
+
+    .actions {
+      text-align: right;
+    }
+
+    .card-actions {
+      display: flex;
+
+      .spacer {
+        flex: 1;
+      }
+    }
+  }
+</style>

package/dialog/RotateEncryptionKeyDialog.vue

@@ -1,5 +1,5 @@
 <script>
-import { SNAPSHOT, NORMAN } from '@shell/config/types';
+import { SNAPSHOT } from '@shell/config/types';
 import AsyncButton from '@shell/components/AsyncButton';
 import { Card } from '@components/Card';
 import { Banner } from '@components/Banner';
@@ -64,23 +64,11 @@ export default {
     },
 
     async getEtcdBackups() {
-      if ( this.cluster.isRke1) {
-        let etcdBackups = await this.$store.dispatch('rancher/findAll', { type: NORMAN.ETCD_BACKUP });
+      let etcdBackups = await this.$store.dispatch('management/findAll', { type: SNAPSHOT });
 
-        etcdBackups = etcdBackups.filter((backup) => backup.clusterId === this.cluster.metadata.name);
+      etcdBackups = etcdBackups.filter((backup) => backup.clusterId === this.cluster.id);
 
-        return etcdBackups;
-      }
-
-      if (this.cluster.isRke2) {
-        let etcdBackups = await this.$store.dispatch('management/findAll', { type: SNAPSHOT });
-
-        etcdBackups = etcdBackups.filter((backup) => backup.clusterId === this.cluster.id);
-
-        return etcdBackups;
-      }
-
-      return [];
+      return etcdBackups;
     },
 
     getFormattedCreatedDate(createdDate) {
@@ -93,23 +81,15 @@ export default {
     },
 
     async apply(buttonDone) {
-      const isRke2 = this.cluster.isRke2;
-
       try {
-        if (isRke2) {
-          const currentGeneration = this.cluster.spec?.rkeConfig?.rotateEncryptionKeys?.generation || 0;
-
-          // To rotate the encryption keys, increment
-          // rkeConfig.rotateEncyrptionKeys.generation in the YAML.
-          set(this.cluster, 'spec.rkeConfig.rotateEncryptionKeys.generation', currentGeneration + 1);
-          await this.cluster.save();
+        const currentGeneration = this.cluster.spec?.rkeConfig?.rotateEncryptionKeys?.generation || 0;
 
-          this.close(buttonDone);
-        } else {
-          await this.cluster.mgmt.doAction('rotateEncryptionKey');
+        // To rotate the encryption keys, increment
+        // rkeConfig.rotateEncyrptionKeys.generation in the YAML.
+        set(this.cluster, 'spec.rkeConfig.rotateEncryptionKeys.generation', currentGeneration + 1);
+        await this.cluster.save();
 
-          this.close(buttonDone);
-        }
+        this.close(buttonDone);
       } catch (err) {
         this.errors = exceptionToErrorsArray(err);
         buttonDone(false);

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

@@ -1,11 +1,11 @@
 import { mount, type VueWrapper } from '@vue/test-utils';
-import cisEditor from '@shell/edit/cis.cattle.io.clusterscan.vue';
+import complianceEditor from '@shell/edit/compliance.cattle.io.clusterscan.vue';
 
-describe('view: cisEditor', () => {
+describe('view: complianceEditor', () => {
   let wrapper: VueWrapper<any, any>;
 
   beforeEach(() => {
-    wrapper = mount(cisEditor, {
+    wrapper = mount(complianceEditor, {
       props: {
         value: {
           spec:           { scanProfileName: null, canBeScheduled: () => true },

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

@@ -13,7 +13,7 @@ const mockStore = {
     currentStore:              () => 'current_store',
     'current_store/schemaFor': jest.fn(),
     'current_store/all':       jest.fn(),
-    workspace:                 jest.fn(),
+    workspace:                 '',
   },
   rootGetters: { 'i18n/t': jest.fn() },
 };
@@ -58,7 +58,8 @@ const mockRepo = {
       { clusterName: `fleet-local` }
     ],
   },
-  status: {}
+  status:       {},
+  currentRoute: () => {},
 };
 
 const initGitRepo = (props: any, value?: any) => {
@@ -232,4 +233,6 @@ describe.each([
 
     expect(pollingIntervalWebhookWarning.exists()).toBe(visible);
   });
+
+  it.todo('test paths and subpaths');
 });

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

@@ -41,4 +41,18 @@ describe('lDAP config', () => {
     expect(userLoginFilter.element.value).toBe(expectedValue);
     expect(wrapper.vm.model.userLoginFilter).toBeUndefined();
   });
+
+  it.each([
+    'openldap', 'freeipa'
+  ])('should display searchUsingServiceAccount checkbox if type %p', (type) => {
+    const wrapper = mount(LDAPConfig, {
+      propsData: {
+        value: {},
+        type,
+      }
+    });
+    const checkbox = wrapper.find('[data-testid="searchUsingServiceAccount"]');
+
+    expect(checkbox).toBeDefined();
+  });
 });

package/edit/auth/ldap/config.vue

@@ -11,6 +11,8 @@ const DEFAULT_TLS_PORT = 636;
 
 export const SHIBBOLETH = 'shibboleth';
 export const OKTA = 'okta';
+export const OPEN_LDAP = 'openldap';
+export const FREE_IPA = 'freeipa';
 
 export default {
   emits: ['update:value'],
@@ -64,6 +66,11 @@ export default {
     // Does the auth provider support LDAP for search in addition to SAML?
     isSamlProvider() {
       return this.type === SHIBBOLETH || this.type === OKTA;
+    },
+
+    // Allow to enable user search just for these providers
+    isSearchAllowed() {
+      return this.type === OPEN_LDAP || this.type === FREE_IPA;
     }
   },
 
@@ -226,6 +233,23 @@ export default {
         />
       </div>
     </div>
+
+    <div
+      v-if="isSearchAllowed"
+      class="row mb-20"
+    >
+      <div class="col">
+        <Checkbox
+          v-model:value="model.searchUsingServiceAccount"
+          :mode="mode"
+          data-testid="searchUsingServiceAccount"
+          class="full-height"
+          :label="t('authConfig.ldap.searchUsingServiceAccount.label')"
+          :tooltip="t('authConfig.ldap.searchUsingServiceAccount.tip')"
+        />
+      </div>
+    </div>
+
     <div class="row mb-20">
       <div class="col span-6">
         <LabeledInput

package/edit/autoscaling.horizontalpodautoscaler/index.vue

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