@rancher/shell 0.3.14 → 0.3.16

package/plugins/steve/actions.js

@@ -128,6 +128,10 @@ export default {
 
         finishDeferred(key, 'resolve', out);
 
+        if (opt.method === 'post' || opt.method === 'put') {
+          handleValidationWarnings(res);
+        }
+
         return out;
       });
     }
@@ -192,6 +196,24 @@ export default {
 
       return Promise.reject(out);
     }
+
+    function handleValidationWarnings(res) {
+      const warnings = (res.headers?.warning || '').split(',');
+
+      if (!warnings.length || !warnings[0]) {
+        return;
+      }
+
+      const message = warnings.reduce((message, warning) => {
+        return `${ message }\n${ warning.trim() }`;
+      }, `Validation Warnings for ${ opt.url }\n`);
+
+      if (process.env.dev) {
+        console.warn(`${ message }\n\n`, res.data); // eslint-disable-line no-console
+      } else {
+        console.debug(message); // eslint-disable-line no-console
+      }
+    }
   },
 
   promptMove({ commit, state }, resources) {
@@ -224,7 +246,7 @@ export default {
     if ( opt.load !== false && res.type === 'collection' ) {
       await dispatch('loadMulti', res.data);
 
-      return res.data.map(x => getters.byId(x.type, x.id) || x);
+      return res.data.map((x) => getters.byId(x.type, x.id) || x);
     } else if ( opt.load !== false && res.type && res.id ) {
       return dispatch('load', { data: res });
     } else {
@@ -256,7 +278,7 @@ export default {
     if ( opt.load !== false && res.type === 'collection' ) {
       await dispatch('loadMulti', res.data);
 
-      return res.data.map(x => getters.byId(x.type, x.id) || x);
+      return res.data.map((x) => getters.byId(x.type, x.id) || x);
     } else if ( opt.load !== false && res.type && res.id ) {
       return dispatch('load', { data: res });
     } else {
@@ -349,7 +371,7 @@ export default {
 
     dropKeys(obj, rootKeys);
     dropKeys(obj?.metadata, metadataKeys);
-    (obj?.status?.conditions || []).forEach(condition => dropKeys(condition, conditionKeys));
+    (obj?.status?.conditions || []).forEach((condition) => dropKeys(condition, conditionKeys));
 
     return jsyaml.dump(obj);
   }

package/plugins/steve/getters.js

@@ -94,7 +94,7 @@ export default {
     return url;
   },
 
-  defaultModel: state => (obj) => {
+  defaultModel: (state) => (obj) => {
     const which = state.config.modelBaseClass || STEVE_MODEL_TYPES.BY_TYPE.STEVE;
 
     if ( which === STEVE_MODEL_TYPES.BY_TYPE ) {
@@ -154,7 +154,7 @@ export default {
   },
 
   // Return all the pods for a given namespace
-  podsByNamespace: state => (namespace) => {
+  podsByNamespace: (state) => (namespace) => {
     const map = state.podsByNamespace[namespace];
 
     return map?.list || [];
@@ -164,7 +164,7 @@ export default {
     return GC_IGNORE_TYPES;
   },
 
-  currentGeneration: state => (type) => {
+  currentGeneration: (state) => (type) => {
     type = normalizeType(type);
 
     const cache = state.types[type];

package/plugins/steve/hybrid-class.js

@@ -9,7 +9,7 @@ import Resource from '@shell/plugins/dashboard-store/resource-class';
 export function cleanHybridResources(data) {
   const potentialNormanHoldovers = ['state', 'name', 'description', 'labels', 'annotations'];
 
-  potentialNormanHoldovers.forEach(key => delete data[key]);
+  potentialNormanHoldovers.forEach((key) => delete data[key]);
 
   return data;
 }

package/plugins/steve/mutations.js

@@ -66,7 +66,7 @@ function cleanPodsByNamespaceCache(state, resource) {
 
     // Extra defensive check that the cache exists for the namespace being removed
     if (cache) {
-      const inList = cache.list.findIndex(p => p.id === resource.id);
+      const inList = cache.list.findIndex((p) => p.id === resource.id);
 
       if ( inList >= 0 ) {
         cache.list.splice(inList, 1);

package/plugins/steve/performanceTesting.js

@@ -81,7 +81,7 @@ function replicate(data, config) {
   const templates = [];
   let j = 0;
 
-  data.forEach(d => templates.push(JSON.stringify(d)));
+  data.forEach((d) => templates.push(JSON.stringify(d)));
 
   const newData = [...data];
 

package/plugins/steve/resourceWatcher.js

@@ -40,7 +40,7 @@ export const keyForSubscribe = ({
   resourceType, type, namespace, id, selector
 } = {}) => {
   return [(resourceType || type), namespace, id, selector] // each watch param in an array
-    .filter(param => !!param) // filter out all the empty ones // the filter makes these keys neater
+    .filter((param) => !!param) // filter out all the empty ones // the filter makes these keys neater
     .join('/'); // join into a string so we can use it as an object key
 };
 

package/plugins/steve/subscribe.js

@@ -661,7 +661,7 @@ const defaultActions = {
       have = getters['all'](resourceType).slice();
 
       if ( namespace ) {
-        have = have.filter(x => x.metadata?.namespace === namespace);
+        have = have.filter((x) => x.metadata?.namespace === namespace);
       }
 
       want = await dispatch('findAll', {
@@ -1012,7 +1012,7 @@ const defaultMutations = {
   },
 
   setWatchStarted(state, obj) {
-    const existing = state.started.find(entry => equivalentWatch(obj, entry));
+    const existing = state.started.find((entry) => equivalentWatch(obj, entry));
 
     if ( !existing ) {
       addObject(state.started, obj);
@@ -1022,7 +1022,7 @@ const defaultMutations = {
   },
 
   setWatchStopped(state, obj) {
-    const existing = state.started.find(entry => equivalentWatch(obj, entry));
+    const existing = state.started.find((entry) => equivalentWatch(obj, entry));
 
     if ( existing ) {
       removeObject(state.started, existing);
@@ -1066,12 +1066,12 @@ const defaultMutations = {
  * Getters that cover cases 1 & 2 (see file description)
  */
 const defaultGetters = {
-  inError: state => (obj) => {
+  inError: (state) => (obj) => {
     return state.inError[keyForSubscribe(obj)];
   },
 
-  watchStarted: state => (obj) => {
-    return !!state.started.find(entry => equivalentWatch(obj, entry));
+  watchStarted: (state) => (obj) => {
+    return !!state.started.find((entry) => equivalentWatch(obj, entry));
   },
 
   nextResourceVersion: (state, getters) => (type, id) => {

package/plugins/steve/worker/web-worker.basic.js

@@ -105,7 +105,7 @@ const workerActions = {
   // Remove the cached schema
   removeSchema: (id) => {
     // Remove anything in the queue related to the schema - we don't want to send any pending updates later for a schema that has been removed
-    state.queue = state.queue.filter(schema => schema.id !== id);
+    state.queue = state.queue.filter((schema) => schema.id !== id);
 
     // Delete the schema from the map, so if it comes back we don't ignore it if the hash is the same
     delete state.schemas[id];

package/promptRemove/management.cattle.io.project.vue

@@ -52,7 +52,7 @@ export default {
 
     filteredNamespaces() {
       if (this.currentProject) {
-        return this.allNamespaces.filter(n => n.metadata.labels[PROJECT] === this.currentProject.metadata?.name);
+        return this.allNamespaces.filter((n) => n.metadata.labels[PROJECT] === this.currentProject.metadata?.name);
       }
 
       return [];
@@ -69,7 +69,7 @@ export default {
     },
 
     names() {
-      return this.filteredNamespaces.map(obj => obj.nameDisplay).slice(0, 5);
+      return this.filteredNamespaces.map((obj) => obj.nameDisplay).slice(0, 5);
     },
     // Only admins and cluster owners can see namespaces outside of projects
     canSeeProjectlessNamespaces() {
@@ -82,7 +82,7 @@ export default {
       // Delete all of thre namespaces and return false - this tells the prompt remove dialog to continue and delete the project
       // Delete all namespaces if the user wouldn't be able to see them after deleting the project
       if (this.deleteProjectNamespaces || !this.canSeeProjectlessNamespaces) {
-        return Promise.all(this.filteredNamespaces.map(n => n.remove())).then(() => false);
+        return Promise.all(this.filteredNamespaces.map((n) => n.remove())).then(() => false);
       }
 
       // Return false so that the main promptRemoval will continue to remove the project

package/promptRemove/mixin/roleDeletionCheck.js

@@ -17,7 +17,7 @@ export default {
     ...mapGetters({ t: 'i18n/t' }),
 
     names() {
-      return this.toRemove.map(obj => obj.nameDisplay).slice(0, 5);
+      return this.toRemove.map((obj) => obj.nameDisplay).slice(0, 5);
     },
 
     plusMore() {
@@ -82,14 +82,14 @@ export default {
 
         if (request.data && request.data.length) {
           rolesToRemove.forEach((toRemove) => {
-            const usedRoles = request.data.filter(item => item[propToMatch] === toRemove.id);
+            const usedRoles = request.data.filter((item) => item[propToMatch] === toRemove.id);
 
             if (usedRoles.length) {
-              const uniqueUsers = [...new Set(usedRoles.map(item => item.userName).filter(user => userMap[user]))];
+              const uniqueUsers = [...new Set(usedRoles.map((item) => item.userName).filter((user) => userMap[user]))];
 
               if (uniqueUsers.length) {
                 numberOfRolesWithBinds++;
-                uniqueUsers.forEach(user => uniqueUsersWithBinds.add(user));
+                uniqueUsers.forEach((user) => uniqueUsersWithBinds.add(user));
               }
             }
           });

package/promptRemove/pod.vue

@@ -79,7 +79,7 @@ export default {
       }
 
       try {
-        await Promise.all(this.value.map(resource => this.removePod(resource)));
+        await Promise.all(this.value.map((resource) => this.removePod(resource)));
         if ( goTo && !isEmpty(goTo) ) {
           parentComponent.currentRouter.push(goTo);
         }

package/rancher-components/components/Form/Checkbox/Checkbox.test.ts

@@ -1,7 +1,7 @@
 import { shallowMount, Wrapper } from '@vue/test-utils';
 import { Checkbox } from './index';
 
-describe('Checkbox.vue', () => {
+describe('checkbox.vue', () => {
   const event = {
     target:          { tagName: 'input', href: null },
     stopPropagation: () => { },
@@ -63,6 +63,6 @@ describe('Checkbox.vue', () => {
     wrapper.vm.clicked(event);
     await wrapper.vm.$nextTick();
 
-    expect(wrapper.emitted().input?.[0][0]).toBe(null);
+    expect(wrapper.emitted().input?.[0][0]).toBeNull();
   });
 });

package/rancher-components/components/Form/Checkbox/Checkbox.vue

@@ -202,7 +202,7 @@ export default Vue.extend({
      * @param value A collection of values for the checkbox.
      */
     findTrueValues(value: boolean[]): boolean {
-      return value.find(v => v === this.valueWhenTrue) || false;
+      return value.find((v) => v === this.valueWhenTrue) || false;
     }
   }
 });

package/rancher-components/components/Form/Radio/RadioButton.test.ts

@@ -2,7 +2,7 @@ import { shallowMount } from '@vue/test-utils';
 import { RadioButton } from './index';
 import { cleanHtmlDirective } from '@shell/plugins/clean-html-directive';
 
-describe('RadioButton.vue', () => {
+describe('radioButton.vue', () => {
   it('renders label slot contents', () => {
     const wrapper = shallowMount(RadioButton, { slots: { label: 'Test Label' } });
 

package/rancher-components/components/Form/Radio/RadioButton.vue

@@ -17,7 +17,7 @@ export default Vue.extend({
      */
     val: {
       required:  true,
-      validator: x => true
+      validator: () => true
     },
 
     /**
@@ -25,7 +25,7 @@ export default Vue.extend({
      */
     value: {
       required:  true,
-      validator: x => true
+      validator: () => true
     },
 
     /**

package/rancher-components/components/Form/Radio/RadioGroup.vue

@@ -152,7 +152,7 @@ export default Vue.extend({
      */
     clickNext(direction: number): void {
       const opts = this.normalizedOptions;
-      const selected = opts.find(x => x.value === this.value);
+      const selected = opts.find((x) => x.value === this.value);
       let newIndex = (selected ? opts.indexOf(selected) : -1) + direction;
 
       if (newIndex >= opts.length) {
@@ -209,7 +209,7 @@ export default Vue.extend({
         <slot
           :listeners="$listeners"
           :option="option"
-          :isDisabled="isDisabled"
+          :is-disabled="isDisabled"
           :name="i"
         >
           <RadioButton

package/rancher-components/components/Form/TextArea/TextAreaAutoGrow.vue

@@ -155,6 +155,7 @@ export default Vue.extend({
 <template>
   <textarea
     ref="ta"
+    data-testid="text-area-auto-grow"
     :disabled="isDisabled"
     :style="style"
     :placeholder="placeholder"

package/rancher-components/components/Form/ToggleSwitch/ToggleSwitch.test.ts

@@ -1,7 +1,7 @@
 import { shallowMount, Wrapper } from '@vue/test-utils';
 import { ToggleSwitch } from './index';
 
-describe('ToggleSwitch.vue', () => {
+describe('toggleSwitch.vue', () => {
   it('renders falsy by default', () => {
     const wrapper = shallowMount(ToggleSwitch);
 

package/rancher-components/components/Form/ToggleSwitch/ToggleSwitch.vue

@@ -31,13 +31,6 @@ export default Vue.extend({
     return { state: false as boolean | string | number };
   },
 
-  methods: {
-    toggle(neu: boolean | string | number) {
-      this.state = neu === null ? !this.state : neu;
-      this.$emit('input', this.state ? this.onValue : this.offValue);
-    }
-  },
-
   watch: {
     value: {
       handler() {
@@ -45,6 +38,13 @@ export default Vue.extend({
       },
       immediate: true
     }
+  },
+
+  methods: {
+    toggle(neu: boolean | string | number) {
+      this.state = neu === null ? !this.state : neu;
+      this.$emit('input', this.state ? this.onValue : this.offValue);
+    }
   }
 });
 </script>

package/rancher-components/components/StringList/StringList.test.ts

@@ -1,18 +1,19 @@
+/* eslint-disable jest/no-hooks */
 import { mount, Wrapper } from '@vue/test-utils';
 import { StringList } from './index';
 
-describe('StringList.vue', () => {
+describe('stringList.vue', () => {
   let wrapper: Wrapper<InstanceType<typeof StringList>>;
 
   beforeEach(() => {
     wrapper = mount(StringList, { propsData: { items: [] } });
   });
 
-  describe('List box', () => {
+  describe('list box', () => {
     it('is empty', () => {
       const box = wrapper.find('[data-testid="div-string-list-box"]').element as HTMLElement;
 
-      expect(box.children.length).toBe(0);
+      expect(box.children).toHaveLength(0);
     });
 
     it('show multiple items', async() => {
@@ -22,7 +23,7 @@ describe('StringList.vue', () => {
 
       const elements = wrapper.findAll('[data-testid^="div-item"]');
 
-      expect(elements.length).toBe(10);
+      expect(elements).toHaveLength(10);
     });
 
     it('double click triggers inline edit mode', async() => {
@@ -130,7 +131,7 @@ describe('StringList.vue', () => {
     });
   });
 
-  describe('Buttons', () => {
+  describe('buttons', () => {
     it('are visible by default', () => {
       const actionButtons = wrapper.find('[data-testid="div-action-buttons"]');
 
@@ -144,7 +145,7 @@ describe('StringList.vue', () => {
       expect(actionButtons.element).toBeUndefined();
     });
 
-    describe('Add button', () => {
+    describe('add button', () => {
       it('is enabled by default', () => {
         const addButton = wrapper.find('[data-testid="button-add"]')?.element as HTMLButtonElement;
 
@@ -176,7 +177,7 @@ describe('StringList.vue', () => {
       });
     });
 
-    describe('Remove button', () => {
+    describe('remove button', () => {
       it('is disabled by default', () => {
         const removeButton = wrapper.find('[data-testid="button-remove"]');
         const buttonElem = removeButton.element as HTMLButtonElement;
@@ -279,7 +280,7 @@ describe('StringList.vue', () => {
     });
   });
 
-  describe('List edit', () => {
+  describe('list edit', () => {
     const validItem = '    item name   ';
     const emptyItem = '  ';
 
@@ -397,7 +398,7 @@ describe('StringList.vue', () => {
     });
   });
 
-  describe('Errors handling', () => {
+  describe('errors handling', () => {
     it('show duplicate warning icon when errorMessages is defined', async() => {
       const items = ['test'];
 

package/rancher-components/components/StringList/StringList.vue

@@ -30,9 +30,9 @@ const CLASS = {
  * Manage a list of strings
  */
 export default Vue.extend({
-  components: { LabeledInput },
 
-  name: 'StringList',
+  name:       'StringList',
+  components: { LabeledInput },
 
   props: {
     /**
@@ -100,8 +100,8 @@ export default Vue.extend({
      */
     errorMessagesArray(): string[] {
       return (Object.keys(this.errors) as Error[])
-        .filter(f => this.errors[f] && this.errorMessages[f])
-        .map(k => this.errorMessages[k]);
+        .filter((f) => this.errors[f] && this.errorMessages[f])
+        .map((k) => this.errorMessages[k]);
     },
   },
 
@@ -364,7 +364,7 @@ export default Vue.extend({
      * Remove an item from items list
      */
     deleteItem(item?: string) {
-      const items = this.items.filter(f => f !== item);
+      const items = this.items.filter((f) => f !== item);
 
       this.updateItems(items);
     },

package/scripts/extension/helm/charts/ui-plugin-server/Chart.yaml

@@ -1,6 +1,6 @@
 annotations:
   catalog.cattle.io/certified: rancher # Any application we are adding as a helm chart
-  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.26.0-0'
+  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.28.0-0'
   catalog.cattle.io/namespace: cattle-ui-plugin-system # Must prefix with cattle- and suffix with -system=
   catalog.cattle.io/os: linux
   catalog.cattle.io/permits-os: linux, windows

package/store/action-menu.js

@@ -22,10 +22,10 @@ export const state = function() {
 };
 
 export const getters = {
-  showing:   state => state.show,
-  elem:      state => state.elem,
-  event:     state => state.event,
-  resources: state => state.resources,
+  showing:   (state) => state.show,
+  elem:      (state) => state.elem,
+  event:     (state) => state.event,
+  resources: (state) => state.resources,
 
   options(state) {
     let selected = state.resources;

package/store/auth.js

@@ -160,7 +160,10 @@ export const actions = {
     return findBy(authConfigs, 'id', id);
   },
 
-  setNonce({ dispatch }, opt) {
+  /**
+   * Create the basic json object used for the nonce (this includes the random nonce/state)
+   */
+  createNonce(ctx, opt) {
     const out = { nonce: randomStr(16), to: 'vue' };
 
     if ( opt.test ) {
@@ -171,7 +174,15 @@ export const actions = {
       out.provider = opt.provider;
     }
 
-    const strung = JSON.stringify(out);
+    return out;
+  },
+
+  /**
+   * Save nonce details. Information it contains will be used to validate auth requests/responses
+   * Note - this may be structurally different than the nonce we encode and send
+   */
+  saveNonce(ctx, opt) {
+    const strung = JSON.stringify(opt);
 
     this.$cookies.set(KEY, strung, {
       path:     '/',
@@ -182,6 +193,15 @@ export const actions = {
     return strung;
   },
 
+  /**
+   * Convert the nonce into something we can send
+   */
+  encodeNonce(ctx, nonce) {
+    const stringify = JSON.stringify(nonce);
+
+    return base64Encode(stringify, 'url');
+  },
+
   async redirectTo({ state, commit, dispatch }, opt = {}) {
     const provider = opt.provider;
     let redirectUrl = opt.redirectUrl;
@@ -200,10 +220,16 @@ export const actions = {
       returnToUrl = `${ window.location.origin }/verify-auth-azure`;
     }
 
-    const nonce = await dispatch('setNonce', opt);
+    // The base nonce that will be sent server way
+    const baseNonce = opt.nonce || await dispatch('createNonce', opt);
+
+    // Save a possibly expanded nonce
+    await dispatch('saveNonce', opt.persistNonce || baseNonce);
+    // Convert the base nonce in to something we can transmit
+    const encodedNonce = await dispatch('encodeNonce', baseNonce);
 
     const fromQuery = unescape(parseUrl(redirectUrl).query?.[GITHUB_SCOPE] || '');
-    const scopes = fromQuery.split(/[, ]+/).filter(x => !!x);
+    const scopes = fromQuery.split(/[, ]+/).filter((x) => !!x);
 
     if (BASE_SCOPES[provider]) {
       addObjects(scopes, BASE_SCOPES[provider]);
@@ -216,8 +242,8 @@ export const actions = {
     let url = removeParam(redirectUrl, GITHUB_SCOPE);
 
     const params = {
-      [GITHUB_SCOPE]: scopes.join(','),
-      [GITHUB_NONCE]: base64Encode(nonce, 'url')
+      [GITHUB_SCOPE]: scopes.join(opt.scopesJoinChar || ','), // Some providers won't accept comma separated scopes
+      [GITHUB_NONCE]: encodedNonce
     };
 
     if (!url.includes(GITHUB_REDIRECT)) {
@@ -249,9 +275,16 @@ export const actions = {
       return ERR_NONCE;
     }
 
+    const body = { code };
+
+    // If the request came with a pkce code ensure we also sent that in the verify
+    if (parsed.pkceCodeVerifier) {
+      body.code_verifier = parsed.pkceCodeVerifier;
+    }
+
     return dispatch('login', {
       provider,
-      body: { code }
+      body
     });
   },
 

package/store/aws.js

@@ -190,7 +190,7 @@ export const actions = {
       const res = await client[cmd](opt);
 
       if ( !key ) {
-        key = Object.keys(res).find(x => isArray(res[x]));
+        key = Object.keys(res).find((x) => isArray(res[x]));
       }
 
       addObjects(out, res[key]);