@rancher/shell 3.0.6 → 3.0.7

package/dialog/__tests__/InstallExtensionDialog.test.ts

@@ -0,0 +1,111 @@
+import { shallowMount, VueWrapper } from '@vue/test-utils';
+import InstallExtensionDialog from '@shell/dialog/InstallExtensionDialog.vue';
+
+jest.mock('@shell/config/uiplugins', () => ({
+  ...jest.requireActual('@shell/config/uiplugins'),
+  isChartVersionHigher: jest.fn((v1: string, v2: string) => v1 > v2),
+}));
+
+const t = (key: string): string => key;
+
+describe('component: InstallExtensionDialog', () => {
+  let wrapper: VueWrapper<any>;
+
+  const mountComponent = (propsData = {}) => {
+    const store = { dispatch: () => Promise.resolve() };
+
+    const defaultProps = {
+      plugin:       { installableVersions: [] },
+      action:       'install',
+      updateStatus: jest.fn(),
+      closed:       jest.fn(),
+    };
+
+    return shallowMount(InstallExtensionDialog, {
+      propsData: {
+        ...defaultProps,
+        ...propsData,
+      },
+      global: {
+        mocks: {
+          $store: store,
+          t,
+        },
+      }
+    });
+  };
+
+  describe('fetch', () => {
+    it('should set currentVersion if plugin is installed', async() => {
+      wrapper = mountComponent({ plugin: { installed: true, installedVersion: '1.0.0' } });
+      await wrapper.vm.$options.fetch.call(wrapper.vm);
+      expect(wrapper.vm.currentVersion).toBe('1.0.0');
+    });
+
+    it('should set version from initialVersion if provided', async() => {
+      wrapper = mountComponent({ initialVersion: '1.2.3', plugin: { installed: false } });
+      await wrapper.vm.$options.fetch.call(wrapper.vm);
+      expect(wrapper.vm.version).toBe('1.2.3');
+    });
+
+    it('should set version to latest for upgrade action', async() => {
+      const plugin = { installableVersions: [{ version: '1.1.0' }, { version: '1.0.0' }] };
+
+      wrapper = mountComponent({ plugin, action: 'upgrade' });
+      await wrapper.vm.$options.fetch.call(wrapper.vm);
+      expect(wrapper.vm.version).toBe('1.1.0');
+    });
+
+    it('should set version to next oldest for downgrade action', async() => {
+      const plugin = {
+        installed:           true,
+        installedVersion:    '1.1.0',
+        installableVersions: [{ version: '1.1.0' }, { version: '1.0.0' }]
+      };
+
+      wrapper = mountComponent({ plugin, action: 'downgrade' });
+      await wrapper.vm.$options.fetch.call(wrapper.vm);
+      expect(wrapper.vm.version).toBe('1.0.0');
+    });
+  });
+
+  describe('versionOptions', () => {
+    it('should include and disable the current version', () => {
+      const plugin = {
+        installableVersions: [
+          { version: '1.1.0' },
+          { version: '1.0.0' },
+        ]
+      };
+
+      wrapper = mountComponent({ plugin });
+      wrapper.vm.currentVersion = '1.0.0';
+
+      const options = wrapper.vm.versionOptions;
+      const currentOption = options.find((o: any) => o.value === '1.0.0');
+
+      expect(currentOption).toBeDefined();
+      expect(currentOption.disabled).toBe(true);
+      expect(currentOption.label).toContain('(plugins.labels.current)');
+    });
+  });
+
+  describe('buttonMode', () => {
+    beforeEach(() => {
+      wrapper = mountComponent({ action: 'upgrade' });
+      wrapper.vm.currentVersion = '1.0.0';
+    });
+
+    it('should be "upgrade" if selected version is higher', async() => {
+      wrapper.vm.version = '1.1.0';
+      await wrapper.vm.$nextTick();
+      expect(wrapper.vm.buttonMode).toBe('upgrade');
+    });
+
+    it('should be "downgrade" if selected version is lower', async() => {
+      wrapper.vm.version = '0.9.0';
+      await wrapper.vm.$nextTick();
+      expect(wrapper.vm.buttonMode).toBe('downgrade');
+    });
+  });
+});

package/edit/auth/oidc.vue

@@ -59,11 +59,16 @@ export default {
         userInfoEndpoint: null,
       },
       // TODO #13457: this is duplicated due wrong format
-      oidcScope: [],
-      SLO_OPTION_VALUES
+      oidcScope:       [],
+      SLO_OPTION_VALUES,
+      addCustomClaims: false,
     };
   },
 
+  created() {
+    this.registerBeforeHook(this.willSave, 'willSave');
+  },
+
   computed: {
     tArgs() {
       return {
@@ -140,6 +145,10 @@ export default {
       return this.model?.id === 'cognito';
     },
 
+    isGenericOidc() {
+      return this.model?.id === 'genericoidc';
+    },
+
     isLogoutAllSupported() {
       return this.model?.logoutAllSupported;
     },
@@ -220,6 +229,15 @@ export default {
         this.model.logoutAllForced = false;
         break;
       }
+    },
+
+    model: {
+      handler(newVal) {
+        if (newVal?.nameClaim || newVal?.groupsClaim || newVal?.emailClaim) {
+          this.addCustomClaims = true;
+        }
+      },
+      once: true
     }
   },
 
@@ -248,6 +266,14 @@ export default {
 
     updateScope() {
       this.model.scope = this.oidcScope.join(' ');
+    },
+
+    willSave() {
+      if (this.isGenericOidc && !this.addCustomClaims) {
+        this.model.nameClaim = undefined;
+        this.model.groupsClaim = undefined;
+        this.model.emailClaim = undefined;
+      }
     }
   }
 };
@@ -390,21 +416,60 @@ export default {
           </div>
         </div>
 
-        <!-- Allow group search -->
-        <div
-          v-if="supportsGroupSearch"
-          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"
-            />
+        <template v-if="isGenericOidc || supportsGroupSearch">
+          <div
+            class="row mb-20"
+          >
+            <div class="col span-6 checkbox-flex">
+              <!-- Allow group search -->
+              <Checkbox
+                v-if="supportsGroupSearch"
+                v-model:value="model.groupSearchEnabled"
+                data-testid="input-group-search"
+                :label="t('authConfig.oidc.groupSearch.label')"
+                :tooltip="t('authConfig.oidc.groupSearch.tooltip')"
+                :mode="mode"
+              />
+              <Checkbox
+                v-if="isGenericOidc"
+                v-model:value="addCustomClaims"
+                data-testid="input-add-custom-claims"
+                :label="t('authConfig.oidc.customClaims.enable.label')"
+                :tooltip="t('authConfig.oidc.customClaims.enable.tooltip')"
+                :mode="mode"
+              />
+            </div>
           </div>
-        </div>
+        </template>
+
+        <template v-if="addCustomClaims">
+          <h4>{{ t('authConfig.oidc.customClaims.label') }}</h4>
+          <div class="row mb-20">
+            <div class="col span-6">
+              <LabeledInput
+                v-model:value="model.nameClaim"
+                :label="t(`authConfig.oidc.customClaims.nameClaim.label`)"
+                :mode="mode"
+              />
+            </div>
+            <div class="col span-6">
+              <LabeledInput
+                v-model:value="model.groupsClaim"
+                :label="t(`authConfig.oidc.customClaims.groupsClaim.label`)"
+                :mode="mode"
+              />
+            </div>
+          </div>
+          <div class="row mb-20">
+            <div class="col span-6">
+              <LabeledInput
+                v-model:value="model.emailClaim"
+                :label="t(`authConfig.oidc.customClaims.emailClaim.label`)"
+                :mode="mode"
+              />
+            </div>
+          </div>
+        </template>
 
         <!-- Scopes -->
         <div class="row mb-20">
@@ -608,4 +673,9 @@ export default {
       margin: 0 3px;
     }
   }
+
+  .checkbox-flex {
+    display: flex;
+    flex-direction: column;
+  }
 </style>

package/mixins/__tests__/chart.test.ts

@@ -213,7 +213,7 @@ describe('chartMixin', () => {
       });
 
       expect(wrapper.vm.action).toStrictEqual({
-        name: 'upgradeVersion',
+        name: 'upgrade',
         tKey: 'upgrade',
         icon: 'icon-upgrade-alt',
       });

package/mixins/chart.js

@@ -242,7 +242,7 @@ export default {
 
       if (compare(this.currentVersion, this.targetVersion) < 0) {
         return {
-          name: 'upgradeVersion', tKey: 'upgrade', icon: 'icon-upgrade-alt'
+          name: 'upgrade', tKey: 'upgrade', icon: 'icon-upgrade-alt'
         };
       }
 

package/models/event.js

@@ -25,6 +25,13 @@ export default class K8sEvent extends SteveModel {
     return this._type;
   }
 
+  get firstSeen() {
+    const schema = this.$getters['schemaFor'](this.type);
+    const rowValueGetter = this.$rootGetters['type-map/rowValueGetter'];
+
+    return schema && rowValueGetter ? rowValueGetter(schema, 'First Seen')(this) : null;
+  }
+
   get lastSeen() {
     const schema = this.$getters['schemaFor'](this.type);
     const rowValueGetter = this.$rootGetters['type-map/rowValueGetter'];

package/models/provisioning.cattle.io.cluster.js

@@ -391,6 +391,15 @@ export default class ProvCluster extends SteveModel {
       const pCluster = this.$rootGetters['management/byId'](CAPI.RANCHER_CLUSTER, this.id);
       const name = this.status?.clusterName || pCluster?.status?.clusterName;
 
+      try {
+        if (name) {
+          // Just in case we're not generically watching all mgmt clusters and...
+          // thus won't receive new mgmt cluster over socket...
+          // fire and forget a request to fetch it (this won't make multiple requests if one is already running)
+          this.$dispatch('find', { type: MANAGEMENT.CLUSTER, id: name });
+        }
+      } catch {}
+
       return name && !!this.$rootGetters['management/byId'](MANAGEMENT.CLUSTER, name);
     }, this.$rootGetters['i18n/t']('cluster.managementTimeout'), timeout, interval);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/pages/c/_cluster/explorer/EventsTable.vue

@@ -3,7 +3,7 @@
 import { MESSAGE, NAME, OBJECT, REASON } from '@shell/config/table-headers';
 import { EVENT } from '@shell/config/types';
 import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
-import { STEVE_EVENT_OBJECT, STEVE_NAME_COL } from '@shell/config/pagination-table-headers';
+import { STEVE_EVENT_FIRST_SEEN, STEVE_EVENT_LAST_SEEN, STEVE_EVENT_OBJECT, STEVE_NAME_COL } from '@shell/config/pagination-table-headers';
 import { headerFromSchemaColString } from '@shell/store/type-map.utils';
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 
@@ -59,11 +59,8 @@ export default {
         ...STEVE_NAME_COL,
         defaultSort: false,
       },
-      headerFromSchemaColString('First Seen', schema, this.$store.getters, true),
-      {
-        ...headerFromSchemaColString('Last Seen', schema, this.$store.getters, true),
-        defaultSort: true,
-      },
+      STEVE_EVENT_FIRST_SEEN,
+      STEVE_EVENT_LAST_SEEN,
       headerFromSchemaColString('Count', schema, this.$store.getters, true),
     ] : [];
 

package/pages/c/_cluster/settings/performance.vue

@@ -105,7 +105,7 @@ export default {
         if (settings.resources.enableAll) {
           resources.push(this.t('performance.serverPagination.resources.all'));
         } else {
-          settings.resources.enableSome.enabled.forEach((resource) => {
+          settings.resources.enableSome.enabled?.forEach((resource) => {
             resources.push(!!resource.length ? resource : `${ resource.resource } (${ resource.context })`);
           });
           if (settings.resources.enableSome.generic) {