@rancher/shell 3.0.5-rc.8 → 3.0.5

package/edit/provisioning.cattle.io.cluster/tabs/etcd/S3Config.vue

@@ -165,6 +165,7 @@ export default {
       <LabeledInput
         v-if="!config.skipSSLVerify"
         v-model:value="config.endpointCA"
+        :mode="mode"
         type="multiline"
         :label="t('cluster.rke2.etcd.s3config.endpointCA.label')"
         :placeholder="ccData.defaultEndpointCA"

package/edit/provisioning.cattle.io.cluster/tabs/registries/index.vue

@@ -78,6 +78,7 @@ export default {
     <div class="row">
       <Checkbox
         :value="showCustomRegistryInput"
+        :mode="mode"
         :label="t('cluster.privateRegistry.label')"
         data-testid="registries-enable-checkbox"
         @update:value="$emit('custom-registry-changed', $event)"
@@ -90,6 +91,7 @@ export default {
       <div class="col span-6">
         <LabeledInput
           :value="registryHost"
+          :mode="mode"
           label-key="catalog.chart.registry.custom.inputLabel"
           placeholder-key="catalog.chart.registry.custom.placeholder"
           :min-height="30"

package/edit/provisioning.cattle.io.cluster/tabs/upgrade/DrainOptions.vue

@@ -102,6 +102,7 @@ export default {
       <div class="mt-20">
         <Checkbox
           v-model:value="deleteEmptyDirData"
+          :mode="mode"
           label-key="cluster.rke2.drain.deleteEmptyDir.label"
           tooltip-key="cluster.rke2.drain.deleteEmptyDir.tooltip"
           @update:value="update"
@@ -110,6 +111,7 @@ export default {
       <div>
         <Checkbox
           v-model:value="force"
+          :mode="mode"
           label="Delete standalone pods"
           label-key="cluster.rke2.drain.force.label"
           tooltip="Delete standalone pods which are not managed by a Workload controller (Deployment, Job, etc).  Draining will fail if this is not set and there are standalone pods."
@@ -120,12 +122,14 @@ export default {
       <div>
         <Checkbox
           v-model:value="customGracePeriod"
+          :mode="mode"
           label-key="cluster.rke2.drain.gracePeriod.checkboxLabel"
           @update:value="update"
         />
         <UnitInput
           v-if="customGracePeriod"
           v-model:value="gracePeriod"
+          :mode="mode"
           label-key="cluster.rke2.drain.gracePeriod.inputLabel"
           :suffix="t('suffix.seconds', {count: timeout})"
           class="mb-10"
@@ -135,12 +139,14 @@ export default {
       <div>
         <Checkbox
           v-model:value="customTimeout"
+          :mode="mode"
           label-key="cluster.rke2.drain.timeout.checkboxLabel"
           @update:value="update"
         />
         <UnitInput
           v-if="customTimeout"
           v-model:value="timeout"
+          :mode="mode"
           label-key="cluster.rke2.drain.timeout.inputLabel"
           :suffix="t('suffix.seconds', {count: timeout})"
           class="drain-timeout"

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

@@ -159,19 +159,16 @@ export default {
       if (neu === 'useDefault') {
         delete this.value.spec.storageLocation;
         delete this.value.spec.backupFilename;
-      } else if (!this.value.spec.storageLocation && neu === 'configureS3') {
-        this.value.spec['storageLocation'] = { s3: {} };
-        this.s3 = this.value.spec.storageLocation.s3;
-      }
-      if (neu === 'useBackup') {
+        this.s3 = {};
+      } else if (neu === 'configureS3') {
+        this.s3 = this.value.spec.storageLocation?.s3 || {};
+        this.value.spec.storageLocation = { s3: this.s3 };
+      } else if (neu === 'useBackup') {
         delete this.value.spec.storageLocation;
 
         if (this.availableBackups.length === 1) {
           this.updateTargetBackup(this.availableBackups[0]);
         }
-      } else {
-        delete this.value.spec.backupFilename;
-        this.value.spec.storageLocation = { s3: this.s3 };
       }
     },
 

package/initialize/install-plugins.js

@@ -12,7 +12,6 @@ import i18n from '@shell/plugins/i18n';
 import globalFormatters from '@shell/plugins/global-formatters';
 
 import axios from '@shell/utils/axios';
-import cookieUniversal from '@shell/utils/cookie-universal';
 import config from '@shell/utils/config';
 import axiosShell from '@shell/plugins/axios';
 import codeMirror from '@shell/plugins/codemirror-loader';
@@ -47,7 +46,7 @@ export async function installPlugins(vueApp) {
 }
 
 export async function installInjectedPlugins(app, vueApp) {
-  const pluginDefinitions = [config, cookieUniversal, axios, plugins, pluginsLoader, axiosShell, intNumber, codeMirror, nuxtClientInit, replaceAll, plugin, steveCreateWorker, emberCookie, internalApiPlugin];
+  const pluginDefinitions = [config, axios, plugins, pluginsLoader, axiosShell, intNumber, codeMirror, nuxtClientInit, replaceAll, plugin, steveCreateWorker, emberCookie, internalApiPlugin];
 
   const installations = pluginDefinitions.map(async(pluginDefinition) => {
     if (typeof pluginDefinition === 'function') {
@@ -64,7 +63,6 @@ export async function installInjectedPlugins(app, vueApp) {
   // If there's any performance reasons this can be done concurrently with all of the installation promises above but I felt it was organizationally better to keep both i18n items together.
   await app.store.dispatch('i18n/init');
 
-  // Order matters here. This is coming after the other plugins specifically so $cookies can be installed. i18n/init relies on prefs/get which relies on $cookies.
   vueApp.use(i18n, { store: app.store });
 }
 

package/list/__tests__/workload.test.ts

@@ -37,6 +37,7 @@ describe('component: workload', () => {
               'prefs/get':                   () => resource,
               'cluster/schemaFor':           () => {},
               'cluster/all':                 () => [{}],
+              'features/get':                () => false,
             }
           },
           $fetchState: {

package/list/workload.vue

@@ -5,6 +5,7 @@ import {
 } from '@shell/config/types';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
+import { STEVE_CACHE } from '@shell/store/features';
 
 const workloadSchema = {
   id:         'workload',
@@ -84,11 +85,17 @@ export default {
   },
 
   data() {
+    const allTypes = this.$route.params.resource === workloadSchema.id;
+
+    if (allTypes && this.$store.getters['features/get'](STEVE_CACHE)) {
+      this.$store.dispatch('loadingError', new Error(this.t('nav.failWhale.resourceListNotFound', { resource: workloadSchema.id }, true)));
+
+      return;
+    }
     // Ensure these are set on load (to determine if the NS filter is required) rather than too late on `fetch`
     const { loadResources, loadIndeterminate } = $loadingResources(this.$route, this.$store);
 
     const { params:{ resource: type } } = this.$route;
-    const allTypes = this.$route.params.resource === workloadSchema.id;
     const schema = type !== workloadSchema.id ? this.$store.getters['cluster/schemaFor'](type) : workloadSchema;
     const paginationEnabled = !allTypes && this.$store.getters[`cluster/paginationEnabled`]?.({ id: type });
 

package/machine-config/components/GCEImage.vue

@@ -43,6 +43,10 @@ export default {
       type:    String,
       default: _CREATE,
     },
+    poolCreateMode: {
+      type:    Boolean,
+      default: true
+    },
     location: {
       type:     Object,
       required: true
@@ -85,7 +89,7 @@ export default {
   },
   created() {
     this.debouncedLoadFamilies = debounce(this.getFamilies, 500);
-    if (this.mode !== _CREATE) {
+    if (!this.poolCreateMode) {
       this.imageProjects = `${ this.getProjectFromImage() }`;
     }
   },
@@ -111,9 +115,6 @@ export default {
 
       };
     },
-    isCreate() {
-      return this.mode === _CREATE;
-    },
     project() {
       return this.value.project;
     },
@@ -284,7 +285,7 @@ export default {
     async getImages(val) {
       this.loadingImages = true;
       try {
-        const isOriginal = !this.isCreate && this.machineImage === this.getImageNameFromImage(this.originalMachineImage);
+        const isOriginal = !this.poolCreateMode && this.machineImage === this.getImageNameFromImage(this.originalMachineImage);
 
         this.machineImages = await this.getImagesInProject(val, this.showDeprecated);
         // If we had to reload list of images, we need to reset selected image if it is no longer in the list,

package/machine-config/google.vue

@@ -79,7 +79,11 @@ export default {
     disabled: {
       type:    Boolean,
       default: false
-    }
+    },
+    poolCreateMode: {
+      type:    Boolean,
+      default: true
+    },
   },
 
   async fetch() {
@@ -123,7 +127,7 @@ export default {
     };
   },
   created() {
-    if (this.mode === _CREATE) {
+    if (this.poolCreateMode) {
       this.$emit('validationChanged', false);
       this.value.project = this.projectId;
       for (const key in this.defaultConfig) {
@@ -157,7 +161,7 @@ export default {
     'value.setExternalFirewallRulePrefix'(neu) {
       if (!neu) {
         this.value.openPort = [];
-      } else if (this.isCreate) {
+      } else if (this.poolCreateMode) {
         this.value.openPort.push('6443');
       } else {
         this.value.openPort = this.originalOpenPort.length > 0 ? this.originalOpenPort : ['6443'];
@@ -334,7 +338,7 @@ export default {
 
         if (!cur ) {
           // If default is not actually available, reset
-          if (this.isCreate) {
+          if (this.poolCreateMode) {
             this.value.diskType = '';
           }
         } else {
@@ -446,6 +450,7 @@ export default {
         :credentialId="credentialId"
         :projectId="value.project"
         :originalMachineImage="originalMachineImage"
+        :pool-create-mode="poolCreateMode"
         :mode="mode"
         :location="location"
         :rules="{machineImage: fvGetAndReportPathRules('machineImage')}"
@@ -494,7 +499,7 @@ export default {
           label-key="cluster.machineConfig.gce.network.label"
           :mode="mode"
           :options="networkOptions"
-          :disabled="!isCreate"
+          :disabled="!poolCreateMode"
           option-key="name"
           option-label="label"
           :loading="loadingNetworks"
@@ -508,7 +513,7 @@ export default {
           label-key="cluster.machineConfig.gce.subnetwork.label"
           :mode="mode"
           :options="subnetworkOptions"
-          :disabled="!isCreate"
+          :disabled="!poolCreateMode"
           option-key="name"
           option-label="name"
           :loading="loadingNetworks"

package/mixins/__tests__/auth-config.test.ts

@@ -1,6 +1,7 @@
 import { mount } from '@vue/test-utils';
 import authConfigMixin from '@shell/mixins/auth-config';
-
+import childHook from '@shell/mixins/child-hook';
+//
 describe('mixin: authConfigMixin', () => {
   describe('method: save', () => {
     const componentMock = (model: any) => ({
@@ -11,10 +12,7 @@ describe('mixin: authConfigMixin', () => {
       computed: { principal: () => ({ me: {} }) },
       global:   {
         mocks: {
-          $store: {
-            dispatch: () => model,
-            commit:   () => ({ 'auth/loggedInAs': jest.fn() }),
-          },
+          $store: { dispatch: () => model },
           $route: {
             params: { id: '123' },
             query:  { mode: 'edit' },
@@ -24,7 +22,7 @@ describe('mixin: authConfigMixin', () => {
     });
     const FakeComponent = {
       render() {},
-      mixins:  [authConfigMixin],
+      mixins:  [authConfigMixin, childHook],
       methods: { applyHooks: jest.fn() },
     };
 

package/mixins/__tests__/chart.test.ts

@@ -29,7 +29,10 @@ describe('chartMixin', () => {
             return () => 'repo';
           },
           'catalog/chart': () => {
-            return { id: chartId };
+            return {
+              id:                    chartId,
+              matchingInstalledApps: []
+            };
           },
           'i18n/t': () => jest.fn()
         }
@@ -101,4 +104,139 @@ describe('chartMixin', () => {
       expect(warnings).toHaveLength(expected as number);
     }
   );
+
+  describe('fetchChart', () => {
+    it('should call catalog/version with showDeprecated', async() => {
+      const mockStore = {
+        dispatch: jest.fn(() => Promise.resolve()),
+        getters:  {
+          currentCluster: () => {},
+          isRancher:      () => true,
+          'catalog/repo': () => {
+            return () => 'repo';
+          },
+          'catalog/chart': () => {
+            return {
+              id: 'chart-id', versions: [{ version: '1.0.0' }], matchingInstalledApps: []
+            };
+          },
+          'catalog/version': jest.fn(),
+          'prefs/get':       () => {},
+          'i18n/t':          () => jest.fn()
+        }
+      };
+
+      const DummyComponent = {
+        mixins:   [ChartMixin],
+        template: '<div></div>',
+      };
+
+      const wrapper = mount(
+        DummyComponent,
+        {
+          global: {
+            mocks: {
+              $store: mockStore,
+              $route: {
+                query: {
+                  chart:      'chart_name',
+                  deprecated: 'true'
+                }
+              }
+            }
+          }
+        });
+
+      await wrapper.vm.fetchChart();
+
+      expect(mockStore.getters['catalog/version']).toHaveBeenCalledWith(expect.objectContaining({ showDeprecated: true }));
+    });
+  });
+
+  describe('action', () => {
+    const DummyComponent = {
+      mixins:   [ChartMixin],
+      template: '<div></div>',
+    };
+
+    const mockStore = {
+      dispatch: jest.fn(() => Promise.resolve()),
+      getters:  { 'i18n/t': (key: string) => key }
+    };
+
+    it('should return "install" action when not installed', () => {
+      const wrapper = mount(DummyComponent, {
+        data:   () => ({ existing: null }),
+        global: { mocks: { $store: mockStore } }
+      });
+
+      expect(wrapper.vm.action).toStrictEqual({
+        name: 'install',
+        tKey: 'install',
+        icon: 'icon-plus',
+      });
+    });
+
+    it('should return "editVersion" action when installed and on same version', () => {
+      const wrapper = mount(DummyComponent, {
+        data: () => ({
+          existing: { spec: { chart: { metadata: { version: '1.0.0' } } } },
+          version:  { version: '1.0.0' }
+        }),
+        global: {
+          mocks: {
+            $store: mockStore,
+            $route: { query: {} }
+          }
+        }
+      });
+
+      expect(wrapper.vm.action).toStrictEqual({
+        name: 'editVersion',
+        tKey: 'edit',
+        icon: 'icon-edit',
+      });
+    });
+
+    it('should return "upgrade" action when installed and on a newer version', () => {
+      const wrapper = mount(DummyComponent, {
+        data: () => ({
+          existing: { spec: { chart: { metadata: { version: '1.0.0' } } } },
+          version:  { version: '1.0.1' }
+        }),
+        global: {
+          mocks: {
+            $store: mockStore,
+            $route: { query: {} }
+          }
+        }
+      });
+
+      expect(wrapper.vm.action).toStrictEqual({
+        name: 'upgradeVersion',
+        tKey: 'upgrade',
+        icon: 'icon-upgrade-alt',
+      });
+    });
+    it('should return "downgrade" action when installed and on an older version', () => {
+      const wrapper = mount(DummyComponent, {
+        data: () => ({
+          existing: { spec: { chart: { metadata: { version: '1.0.1' } } } },
+          version:  { version: '1.0.0' }
+        }),
+        global: {
+          mocks: {
+            $store: mockStore,
+            $route: { query: {} }
+          }
+        }
+      });
+
+      expect(wrapper.vm.action).toStrictEqual({
+        name: 'downgrade',
+        tKey: 'downgrade',
+        icon: 'icon-downgrade-alt',
+      });
+    });
+  });
 });

package/mixins/auth-config.js

@@ -1,7 +1,7 @@
 import { _EDIT } from '@shell/config/query-params';
 import { NORMAN, MANAGEMENT } from '@shell/config/types';
 import { AFTER_SAVE_HOOKS, BEFORE_SAVE_HOOKS } from '@shell/mixins/child-hook';
-import { BASE_SCOPES } from '@shell/store/auth';
+import { BASE_SCOPES, SLO_AUTH_PROVIDERS } from '@shell/store/auth';
 import { addObject, findBy } from '@shell/utils/array';
 import { exceptionToErrorsArray } from '@shell/utils/error';
 import difference from 'lodash/difference';
@@ -30,6 +30,10 @@ export default {
     }
   },
 
+  created() {
+    this.registerAfterHook(this.updateAuthProviders, 'force-update-auth-providers');
+  },
+
   async fetch() {
     await this.mixinFetch();
   },
@@ -88,6 +92,23 @@ export default {
   },
 
   methods: {
+    updateAuthProviders() {
+      // we need to forcefully re-fetch the authProviders list so that we can update the logout method
+      // this is to satisfy the SLO usecase where after setting an auth provider the logout method
+      // wasn't being updated because the resource is not watchable
+      this.$store.dispatch('auth/getAuthProviders', { force: true });
+    },
+
+    setSloType(selectedModel) {
+      if (!selectedModel.logoutAllEnabled && !selectedModel.logoutAllForced) {
+        this.sloType = SLO_OPTION_VALUES.rancher;
+      } else if (selectedModel.logoutAllEnabled && selectedModel.logoutAllForced) {
+        this.sloType = SLO_OPTION_VALUES.all;
+      } else if (selectedModel.logoutAllEnabled && !selectedModel.logoutAllForced) {
+        this.sloType = SLO_OPTION_VALUES.both;
+      }
+    },
+
     async mixinFetch() {
       this.authConfigName = this.$route.params.id;
 
@@ -115,20 +136,16 @@ export default {
       if (this.model.openLdapConfig) {
         this.showLdap = true;
       }
-      if (this.value.configType === 'saml') {
+
+      // Logic for Single Logout/SLO for auth providers
+      if (this.value?.configType && SLO_AUTH_PROVIDERS.includes(this.value?.configType)) {
         if (!this.model.rancherApiHost || !this.model.rancherApiHost.length) {
           this.model['rancherApiHost'] = this.serverUrl;
         }
 
         // setting data for SLO
         if (this.model && Object.keys(this.model).includes('logoutAllSupported')) {
-          if (!this.model.logoutAllEnabled && !this.model.logoutAllForced) {
-            this.sloType = SLO_OPTION_VALUES.rancher;
-          } else if (this.model.logoutAllEnabled && this.model.logoutAllForced) {
-            this.sloType = SLO_OPTION_VALUES.all;
-          } else if (this.model.logoutAllEnabled && !this.model.logoutAllForced) {
-            this.sloType = SLO_OPTION_VALUES.both;
-          }
+          this.setSloType(this.model);
         }
       }
 
@@ -220,7 +237,7 @@ export default {
               addObject(this.model.allowedPrincipalIds, this.principal.id);
             }
             // Session has switched to new 'me', ensure we react
-            this.$store.commit('auth/loggedInAs', this.principal.id);
+            this.$store.dispatch('auth/loggedInAs', this.principal.id);
           } else {
             console.warn(`Unable to find principal marked as 'me'`); // eslint-disable-line no-console
           }
@@ -292,6 +309,12 @@ export default {
         // must be cancelling edit of an enabled config; reset any changes and return to add users/groups view for that config
         this.$store.dispatch(`rancher/clone`, { resource: this.originalModel }).then((cloned) => {
           this.model = cloned;
+
+          // reset SLO type (radio option)
+          if (cloned && Object.keys(cloned).includes('logoutAllSupported')) {
+            this.setSloType(cloned);
+          }
+
           this.editConfig = false;
         });
       }

package/mixins/chart.js

@@ -1,6 +1,5 @@
 
 import { mapGetters } from 'vuex';
-
 import {
   REPO_TYPE, REPO, CHART, VERSION, NAMESPACE, NAME, DESCRIPTION as DESCRIPTION_QUERY, DEPRECATED as DEPRECATED_QUERY, HIDDEN, _FLAGGED, _CREATE, _EDIT
 } from '@shell/config/query-params';
@@ -9,10 +8,9 @@ import { SHOW_PRE_RELEASE, mapPref } from '@shell/store/prefs';
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import { NAME as MANAGER } from '@shell/config/product/manager';
 import { OPA_GATE_KEEPER_ID } from '@shell/pages/c/_cluster/gatekeeper/index.vue';
-
 import { formatSi, parseSi } from '@shell/utils/units';
 import { CAPI, CATALOG } from '@shell/config/types';
-import { isPrerelease } from '@shell/utils/version';
+import { isPrerelease, compare } from '@shell/utils/version';
 import difference from 'lodash/difference';
 import { LINUX, APP_UPGRADE_STATUS } from '@shell/store/catalog';
 import { clone } from '@shell/utils/object';
@@ -230,11 +228,27 @@ export default {
     },
 
     action() {
-      if (this.existing) {
-        return this.currentVersion === this.targetVersion ? 'update' : 'upgrade';
+      if (!this.existing) {
+        return {
+          name: 'install', tKey: 'install', icon: 'icon-plus'
+        };
+      }
+
+      if (this.currentVersion === this.targetVersion) {
+        return {
+          name: 'editVersion', tKey: 'edit', icon: 'icon-edit'
+        };
+      }
+
+      if (compare(this.currentVersion, this.targetVersion) < 0) {
+        return {
+          name: 'upgradeVersion', tKey: 'upgrade', icon: 'icon-upgrade-alt'
+        };
       }
 
-      return 'install';
+      return {
+        name: 'downgrade', tKey: 'downgrade', icon: 'icon-downgrade-alt'
+      };
     },
 
     isChartTargeted() {
@@ -276,7 +290,10 @@ export default {
     async fetchChart() {
       this.versionInfoError = null;
 
-      await this.$store.dispatch('catalog/load'); // not the problem
+      await Promise.all([
+        this.$store.dispatch('catalog/load'),
+        this.$store.dispatch('cluster/findAll', { type: CATALOG.APP })
+      ]);
 
       this.fetchStoreChart();
 
@@ -316,6 +333,15 @@ export default {
           this.mode = _CREATE;
           this.existing = null;
         }
+      } else if (this.chart) {
+        const matching = this.chart.matchingInstalledApps;
+
+        if (matching.length === 1) {
+          this.existing = matching[0];
+          this.mode = _EDIT;
+        } else {
+          this.mode = _CREATE;
+        }
       } else {
         // Regular create
 
@@ -345,10 +371,11 @@ export default {
 
       try {
         this.version = this.$store.getters['catalog/version']({
-          repoType:    this.query.repoType,
-          repoName:    this.query.repoName,
-          chartName:   this.query.chartName,
-          versionName: this.query.versionName
+          repoType:       this.query.repoType,
+          repoName:       this.query.repoName,
+          chartName:      this.query.chartName,
+          versionName:    this.query.versionName,
+          showDeprecated: this.showDeprecated
         });
       } catch (e) {
         console.error('Unable to fetch Version: ', e); // eslint-disable-line no-console
@@ -503,18 +530,24 @@ export default {
         version:  this.query.versionName,
       };
 
+      const query = {
+        [REPO_TYPE]: provider.repoType,
+        [REPO]:      provider.repoName,
+        [CHART]:     provider.name,
+        [VERSION]:   provider.version,
+      };
+
+      if (this.showDeprecated) {
+        query[DEPRECATED_QUERY] = this.query.deprecated;
+      }
+
       return {
         name:   install ? 'c-cluster-apps-charts-install' : 'c-cluster-apps-charts-chart',
         params: {
           cluster: this.$route.params.cluster,
           product: this.$store.getters['productId'],
         },
-        query: {
-          [REPO_TYPE]: provider.repoType,
-          [REPO]:      provider.repoName,
-          [CHART]:     provider.name,
-          [VERSION]:   provider.version,
-        }
+        query
       };
     },
 
@@ -530,13 +563,20 @@ export default {
     },
 
     clusterToolsLocation() {
+      const query = {};
+
+      if (this.showDeprecated) {
+        query[DEPRECATED_QUERY] = this.query.deprecated;
+      }
+
       return {
         name:   `c-cluster-explorer-tools`,
         params: {
           product:  EXPLORER,
           cluster:  this.$store.getters['clusterId'],
           resource: CATALOG.APP,
-        }
+        },
+        query
       };
     },