@rancher/shell 0.3.14 → 0.3.16

package/components/EmberPage.vue

@@ -252,6 +252,7 @@ export default {
       if (iframeEl === null) {
         iframeEl = document.createElement('iframe');
         iframeEl.setAttribute('id', EMBER_FRAME);
+        iframeEl.setAttribute('data-testid', EMBER_FRAME);
         iframeEl.classList.add(EMBER_FRAME_HIDE_CLASS);
 
         if (this.inline) {

package/components/ExplorerMembers.vue

@@ -70,7 +70,7 @@ export default {
     }
 
     this.$store.dispatch('management/findAll', { type: MANAGEMENT.PROJECT })
-      .then(projects => this.$set(this, 'projects', projects));
+      .then((projects) => this.$set(this, 'projects', projects));
 
     const hydration = {
       normanPrincipals:  this.$store.dispatch('rancher/findAll', { type: NORMAN.PRINCIPAL }),
@@ -123,11 +123,11 @@ export default {
   computed: {
     ...mapGetters(['currentCluster']),
     clusterRoleTemplateBindings() {
-      return this.normanClusterRoleTemplateBindings.map(b => b.clusterroletemplatebinding) ;
+      return this.normanClusterRoleTemplateBindings.map((b) => b.clusterroletemplatebinding) ;
     },
     filteredClusterRoleTemplateBindings() {
       return this.clusterRoleTemplateBindings.filter(
-        b => b?.clusterName === this.$store.getters['currentCluster'].id
+        (b) => b?.clusterName === this.$store.getters['currentCluster'].id
       );
     },
     filteredProjects() {
@@ -222,10 +222,10 @@ export default {
       return this.$store.getters['currentCluster'].isLocal;
     },
     canEditProjectMembers() {
-      return this.normanProjectRTBSchema?.collectionMethods.find(x => x.toLowerCase() === 'post');
+      return this.normanProjectRTBSchema?.collectionMethods.find((x) => x.toLowerCase() === 'post');
     },
     canEditClusterMembers() {
-      return this.normanClusterRTBSchema?.collectionMethods.find(x => x.toLowerCase() === 'post');
+      return this.normanClusterRTBSchema?.collectionMethods.find((x) => x.toLowerCase() === 'post');
     },
   },
   methods: {
@@ -250,12 +250,12 @@ export default {
     },
 
     getProjectRoleBinding(row, role) {
-      // Each row is a combination of user/group and project
-      // So find the specfic roleBindingTemplate corresponding to the specific role + project
+      // Each row is a combination of project, role and user/group
+      // So find the specfic roleBindingTemplate corresponding to the specific project, role + user/group
       const userOrGroupKey = row.userId ? 'userId' : 'groupPrincipalId';
 
       return this.projectRoleTemplateBindings.find((r) => {
-        return r.roleTemplateId === role.id && r[userOrGroupKey] === row[userOrGroupKey];
+        return r.projectId === row.projectId && r.roleTemplateId === role.id && r[userOrGroupKey] === row[userOrGroupKey];
       });
     },
 

package/components/ExplorerProjectsNamespaces.vue

@@ -1,6 +1,6 @@
 <script>
 import { mapGetters } from 'vuex';
-import ResourceTable from '@shell/components/ResourceTable';
+import ResourceTable, { defaultTableSortGenerationFn } from '@shell/components/ResourceTable';
 import { STATE, AGE, NAME } from '@shell/config/table-headers';
 import { uniq } from '@shell/utils/array';
 import { MANAGEMENT, NAMESPACE, VIRTUAL_TYPES } from '@shell/config/types';
@@ -8,7 +8,7 @@ import { PROJECT_ID, FLAT_VIEW } from '@shell/config/query-params';
 import Masthead from '@shell/components/ResourceList/Masthead';
 import { mapPref, GROUP_RESOURCES, ALL_NAMESPACES } from '@shell/store/prefs';
 import MoveModal from '@shell/components/MoveModal';
-import { defaultTableSortGenerationFn } from '@shell/components/ResourceTable.vue';
+
 import { NAMESPACE_FILTER_ALL_ORPHANS } from '@shell/utils/namespace-filter';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import DOMPurify from 'dompurify';
@@ -97,12 +97,12 @@ export default {
         NAME,
         this.groupPreference === 'none' ? project : null,
         AGE
-      ].filter(h => h);
+      ].filter((h) => h);
     },
     projectIdsWithNamespaces() {
       const ids = this.rows
-        .map(row => row.projectId)
-        .filter(id => id);
+        .map((row) => row.projectId)
+        .filter((id) => id);
 
       return uniq(ids);
     },
@@ -117,13 +117,13 @@ export default {
         return this.$store.getters[`${ this.currentProduct.inStore }/filterProject`];
       }
 
-      const clustersInProjects = projectsInAllClusters.filter(project => project.spec.clusterName === clusterId);
+      const clustersInProjects = projectsInAllClusters.filter((project) => project.spec.clusterName === clusterId);
 
       return clustersInProjects;
     },
     projectsWithoutNamespaces() {
       return this.activeProjects.filter((project) => {
-        return !this.projectIdsWithNamespaces.find(item => project?.id?.endsWith(`/${ item }`));
+        return !this.projectIdsWithNamespaces.find((item) => project?.id?.endsWith(`/${ item }`));
       });
     },
     // We're using this because we need to show projects as groups even if the project doesn't have any namespaces.
@@ -226,7 +226,7 @@ export default {
         return false;
       }
 
-      const someNamespacesAreNotInProject = !this.rows.some(row => !row.project);
+      const someNamespacesAreNotInProject = !this.rows.some((row) => !row.project);
 
       // Hide the "Not in a Project" group if the user is filtering
       // for specific namespaces or projects.
@@ -250,7 +250,7 @@ export default {
       const dictionary = row.psaTooltipsDescription;
       const list = Object.values(dictionary)
         .sort()
-        .map(text => `<li>${ text }</li>`).join('');
+        .map((text) => `<li>${ text }</li>`).join('');
       const title = `<p>${ this.t('podSecurityAdmission.name') }: </p>`;
 
       return `${ title }<ul class="psa-tooltip">${ list }</ul>`;

package/components/FixedBanner.vue

@@ -41,7 +41,7 @@ export default {
     handleLineBreaksConsentText(banner) {
       if (banner.text?.length) {
         // split text by newline char
-        const textArray = banner.text.split(/\\n/).filter(element => element);
+        const textArray = banner.text.split(/\\n/).filter((element) => element);
 
         if (textArray.length > 1) {
           textArray.forEach((str, i) => {

package/components/GlobalRoleBindings.vue

@@ -120,7 +120,7 @@ export default {
   },
   methods: {
     getRoleType(role) {
-      if (this.globalPermissions.find(p => p === role.id)) {
+      if (this.globalPermissions.find((p) => p === role.id)) {
         return 'global';
       } else if (role.builtin) {
         return 'builtin';
@@ -159,7 +159,7 @@ export default {
 
         Object.values(this.sortedRoles).forEach((roles) => {
           roles.forEach((mappedRole) => {
-            const boundRole = boundRoles.find(boundRole => boundRole.globalRoleName === mappedRole.id);
+            const boundRole = boundRoles.find((boundRole) => boundRole.globalRoleName === mappedRole.id);
 
             if (!!boundRole) {
               this.selectedRoles.push(mappedRole.id);
@@ -184,10 +184,10 @@ export default {
     },
     checkboxChanged() {
       const addRoles = this.selectedRoles
-        .filter(selected => !this.startingSelectedRoles.find(startingRole => startingRole.roleId === selected));
+        .filter((selected) => !this.startingSelectedRoles.find((startingRole) => startingRole.roleId === selected));
       const removeBindings = this.startingSelectedRoles
-        .filter(startingRole => !this.selectedRoles.find(selected => selected === startingRole.roleId))
-        .map(startingRole => startingRole.bindingId);
+        .filter((startingRole) => !this.selectedRoles.find((selected) => selected === startingRole.roleId))
+        .map((startingRole) => startingRole.bindingId);
 
       this.roleChanges = {
         initialRoles: this.startingSelectedRoles,
@@ -210,22 +210,22 @@ export default {
       } else {
         requestOptions.userName = userId || this.userId;
       }
-      const newBindings = await Promise.all(this.roleChanges.addRoles.map(role => this.$store.dispatch(`management/create`, {
+      const newBindings = await Promise.all(this.roleChanges.addRoles.map((role) => this.$store.dispatch(`management/create`, {
         ...requestOptions,
         globalRoleName: role,
       })));
 
       // Save all changes (and ensure user isn't logged out if they don't have permissions to make a change)
-      await Promise.all(newBindings.map(newBinding => newBinding.save({ redirectUnauthorized: false })));
+      await Promise.all(newBindings.map((newBinding) => newBinding.save({ redirectUnauthorized: false })));
     },
     async saveRemovedRoles() {
-      const existingBindings = await Promise.all(this.roleChanges.removeBindings.map(bindingId => this.$store.dispatch('management/find', {
+      const existingBindings = await Promise.all(this.roleChanges.removeBindings.map((bindingId) => this.$store.dispatch('management/find', {
         type: MANAGEMENT.GLOBAL_ROLE_BINDING,
         id:   bindingId
       })));
 
       // Save all changes (and ensure user isn't logged out if they don't have permissions to make a change)
-      await Promise.all(existingBindings.map(existingBinding => existingBinding.remove({ redirectUnauthorized: false })));
+      await Promise.all(existingBindings.map((existingBinding) => existingBinding.remove({ redirectUnauthorized: false })));
     },
     /**
      * userId is optional, used when a user has just been created
@@ -250,7 +250,7 @@ export default {
         });
       });
 
-      return allRolesRules.some(rule => this.isRuleValid(rule));
+      return allRolesRules.some((rule) => this.isRuleValid(rule));
     },
     isRuleValid(rule) {
       // Brought over from Ember
@@ -281,7 +281,7 @@ export default {
 
         if (isArray(verbs) && verbs.length > 1) {
           // console.log(`verbsRequiredForLogin status 1: `, restrictedTarget.every(rt => verbs.includes(rt)), verbs);
-          return restrictedTarget.every(rt => verbs.includes(rt));
+          return restrictedTarget.every((rt) => verbs.includes(rt));
         }
 
         // console.log(`verbsRequiredForLogin status 2: `, verbsRequiredForLogin.includes(verbs[0]), verbsRequiredForLogin, verbs);

package/components/GrafanaDashboard.vue

@@ -23,6 +23,12 @@ export default {
       type:    String,
       default: null
     },
+    // change the grafana url prefix for local clusters in certain monitoring versions
+    // project monitoring (projectHelmCharts) supply a grafana url that never needs to be modified in this way
+    modifyPrefix: {
+      type:    Boolean,
+      default: true
+    },
     backgroundColor: {
       type:    String,
       default: '#1b1c21'
@@ -138,7 +144,7 @@ export default {
       const clusterId = this.$store.getters['currentCluster'].id;
       const params = this.computeParams();
 
-      return computeDashboardUrl(this.monitoringVersion, embedUrl, clusterId, params);
+      return computeDashboardUrl(this.monitoringVersion, embedUrl, clusterId, params, this.modifyPrefix);
     },
     computeParams() {
       const params = {};
@@ -253,10 +259,16 @@ export default {
       v-if="!loading && !error"
       class="external-link"
     >
+      <!-- https://github.com/harvester/harvester-installer/pull/512/files -->
+      <!-- It is necessary to include the parameter referer when accessing the Grafana page. -->
+      <!-- This parameter is required by the backend to identify the origin of the request from which cluster -->
+      <!-- The matching mechanism as follows: -->
+      <!-- ~.*/k8s/clusters/(c-m-.+)/.* -->
+      <!-- ~.*/dashboard/harvester/c/(c-m-.+)/.* -->
       <a
         :href="grafanaUrl"
         target="_blank"
-        rel="noopener noreferrer nofollow"
+        rel="noopener nofollow"
       >{{ t('grafanaDashboard.grafana') }} <i class="icon icon-external-link" /></a>
     </div>
   </div>

package/components/GrowlManager.vue

@@ -10,7 +10,7 @@ export default {
     ...mapState('growl', ['stack']),
 
     shouldRun() {
-      return this.stack.length && this.stack.find(x => x.timeout > 0);
+      return this.stack.length && this.stack.find((x) => x.timeout > 0);
     }
   },
 

package/components/HarvesterServiceAddOnConfig.vue

@@ -98,7 +98,7 @@ export default {
     portOptions() {
       const ports = this.value?.spec?.ports || [];
 
-      return ports.filter(p => p.port && p.protocol === 'TCP').map(p => p.port) || [];
+      return ports.filter((p) => p.port && p.protocol === 'TCP').map((p) => p.port) || [];
     },
 
     serviceOptions() {
@@ -116,7 +116,7 @@ export default {
                 namespaces[s.metadata.namespace];
       });
 
-      return out.map(s => s.id);
+      return out.map((s) => s.id);
     },
 
     shareIPEnabled() {
@@ -124,7 +124,7 @@ export default {
       const kubernetesVersionExtension = this.currentCluster.kubernetesVersionExtension;
 
       if (kubernetesVersionExtension.startsWith('+rke2')) {
-        const charts = ((this.rke2Versions?.data || []).find(v => v.id === kubernetesVersion) || {}).charts;
+        const charts = ((this.rke2Versions?.data || []).find((v) => v.id === kubernetesVersion) || {}).charts;
         let ccmVersion = charts?.['harvester-cloud-provider']?.version || '';
 
         if (ccmVersion.endsWith('00')) {
@@ -188,6 +188,7 @@ export default {
           :mode="mode"
           :options="ipamOptions"
           :label="t('servicesPage.harvester.ipam.label')"
+          :disabled="mode === 'edit'"
         />
         <div
           v-if="mode === 'create'"

package/components/IconOrSvg.vue

@@ -18,7 +18,7 @@
  */
 import Vue from 'vue';
 import { Solver } from '@shell/utils/svg-filter';
-import { colorToRgb, mapStandardColors } from '@shell/utils/color';
+import { colorToRgb, mapStandardColors, normalizeHex } from '@shell/utils/color';
 
 const filterCache = {};
 const cssCache = {};
@@ -75,11 +75,18 @@ export default {
         if (stylesheet && stylesheet.cssRules) {
           for (let x = 0; x < Object.keys(stylesheet.cssRules).length; x++) {
             const cssRules = stylesheet.cssRules[x];
-            const selectorText = currTheme === 'light' ? 'body, .theme-light' : '.theme-dark';
 
-            if (cssRules.selectorText && cssRules.selectorText === selectorText) {
+            if (cssRules.selectorText && ((currTheme === 'light' && cssRules.selectorText.includes('body') &&
+              cssRules.selectorText.includes('.theme-light') && cssRules.style.cssText.includes('--link:')) ||
+              (currTheme === 'dark' && cssRules.selectorText.includes('.theme-dark')))) {
+              // grab the colors to be used on the icon from the css rules
               uiColor = mapStandardColors(cssRules.style.getPropertyValue(colors[this.color].color).trim());
               hoverColor = mapStandardColors(cssRules.style.getPropertyValue(colors[this.color].hover).trim());
+
+              // normalize hex colors (#xxx to #xxxxxx)
+              uiColor = normalizeHex(uiColor);
+              hoverColor = normalizeHex(hoverColor);
+
               found = true;
               break;
             }

package/components/LandingPagePreference.vue

@@ -35,7 +35,7 @@ export default {
     routeFromDropdown: {
       get() {
         const route = this.customRoute || {};
-        const out = this.routeDropdownOptions.find(opt => opt.value.name === route.name && opt.value.params?.cluster === route.params?.cluster);
+        const out = this.routeDropdownOptions.find((opt) => opt.value.name === route.name && opt.value.params?.cluster === route.params?.cluster);
 
         return out || this.routeDropdownOptions[0];
       },
@@ -72,7 +72,7 @@ export default {
     routeDropdownOptions() {
       // Drop-down shows list of clusters that can ber set as login landing page
       const out = [];
-      const kubeClusters = filterHiddenLocalCluster(filterOnlyKubernetesClusters(this.clusters), this.$store);
+      const kubeClusters = filterHiddenLocalCluster(filterOnlyKubernetesClusters(this.clusters, this.$store), this.$store);
 
       kubeClusters.forEach((c) => {
         if (c.isReady) {

package/components/MoveModal.vue

@@ -27,7 +27,7 @@ export default {
     ...mapGetters(['currentCluster']),
 
     excludedProjects() {
-      return this.toMove.filter(namespace => !!namespace.project).map(namespace => namespace.project.shortId);
+      return this.toMove.filter((namespace) => !!namespace.project).map((namespace) => namespace.project.shortId);
     },
 
     projectOptions() {

package/components/PodSecurityAdmission.vue

@@ -83,7 +83,7 @@ export default Vue.extend({
       // Generate PSA form controls
       psaControls:           toDictionary(PSAModes, getPsaControl) as Record<PSAMode, PSAControl>,
       psaExemptionsControls: toDictionary(PSADimensions, getExemptionControl) as Record<PSADimension, PSAExemptionControl>,
-      options:               PSALevels.map(level => ({
+      options:               PSALevels.map((level) => ({
         value: level,
         label: this.t(`podSecurityAdmission.labels.${ level }`)
       })),
@@ -145,7 +145,7 @@ export default Vue.extend({
      */
     updateExemptions(): void {
       const exemptions = PSADimensions.reduce((acc, dimension) => {
-        const value = this.psaExemptionsControls[dimension].value.split(',').map(value => value.trim());
+        const value = this.psaExemptionsControls[dimension].value.split(',').map((value) => value.trim());
         const active = this.psaExemptionsControls[dimension].active;
 
         return {
@@ -182,7 +182,7 @@ export default Vue.extend({
      */
     getPsaExemptions(): Record<PSADimension, PSAExemptionControl> {
       return PSADimensions.reduce((acc, dimension) => {
-        const values = (this.exemptions[dimension] || []).map(value => value.trim()).join(',');
+        const values = (this.exemptions[dimension] || []).map((value) => value.trim()).join(',');
 
         return {
           ...acc,

package/components/ProgressBarMulti.vue

@@ -68,7 +68,7 @@ export default {
       if ( !this.max ) {
         max = 100;
         if ( out.length ) {
-          max = out.map(x => x.value).reduce((a, b) => a + b);
+          max = out.map((x) => x.value).reduce((a, b) => a + b);
         }
       }
 
@@ -88,7 +88,7 @@ export default {
         obj.style = `width: ${ obj.percent }%`;
       }
 
-      return out.filter(obj => obj.percent);
+      return out.filter((obj) => obj.percent);
     },
   }
 };

package/components/PromptRemove.vue

@@ -9,11 +9,13 @@ import { uniq } from '@shell/utils/array';
 import AsyncButton from '@shell/components/AsyncButton';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
 import { CATALOG } from '@shell/config/types';
+import { LabeledInput } from '@components/Form/LabeledInput';
+
 export default {
   name: 'PromptRemove',
 
   components: {
-    Card, Checkbox, AsyncButton
+    Card, Checkbox, AsyncButton, LabeledInput
   },
   props: {
     /**
@@ -42,7 +44,7 @@ export default {
   },
   computed: {
     names() {
-      return this.toRemove.map(obj => obj.nameDisplay).slice(0, 5);
+      return this.toRemove.map((obj) => obj.nameDisplay).slice(0, 5);
     },
 
     nameToMatchPosition() {
@@ -100,6 +102,11 @@ export default {
       if (this.toRemove.length > 1) {
         return null;
       }
+
+      if (this.toRemove[0].doneLocationRemove) {
+        return this.toRemove[0].doneLocationRemove;
+      }
+
       const currentRoute = this.toRemove[0].currentRoute();
       const out = {};
       const params = { ...currentRoute.params };
@@ -184,7 +191,7 @@ export default {
     // if none found (delete is allowed), then check for any resources with a warning message
     toRemove(neu) {
       let message;
-      const preventDeletionMessages = neu.filter(item => item.preventDeletionMessage);
+      const preventDeletionMessages = neu.filter((item) => item.preventDeletionMessage);
 
       this.preventDelete = false;
 
@@ -192,7 +199,7 @@ export default {
         this.preventDelete = true;
         message = preventDeletionMessages[0].preventDeletionMessage;
       } else {
-        const warnDeletionMessages = neu.filter(item => item.warnDeletionMessage);
+        const warnDeletionMessages = neu.filter((item) => item.warnDeletionMessage);
 
         if (!!warnDeletionMessages.length) {
           message = warnDeletionMessages[0].warnDeletionMessage;
@@ -224,6 +231,7 @@ export default {
         // doneLocation will recompute to undefined when delete request completes
         this.cachedDoneLocation = { ...this.doneLocation };
       }
+
       if (this.hasCustomRemove && this.$refs?.customPrompt?.remove) {
         let handled = this.$refs.customPrompt.remove(btnCB);
 
@@ -247,7 +255,7 @@ export default {
           return;
         }
       }
-      const serialRemove = this.toRemove.some(resource => resource.removeSerially);
+      const serialRemove = this.toRemove.some((resource) => resource.removeSerially);
 
       if (serialRemove) {
         this.serialRemove(btnCB);
@@ -272,10 +280,16 @@ export default {
     },
     async parallelRemove(btnCB) {
       try {
+        if (typeof this.toRemove[0].bulkRemove !== 'undefined') {
+          await this.toRemove[0].bulkRemove(this.toRemove, {});
+        } else {
+          await Promise.all(this.toRemove.map((resource) => resource.remove()));
+        }
+
         const spoofedTypes = this.getSpoofedTypes(this.toRemove);
 
-        await Promise.all(this.toRemove.map(resource => resource.remove()));
         await this.refreshSpoofedTypes(spoofedTypes);
+
         this.done();
       } catch (err) {
         this.error = err.message || err;
@@ -289,7 +303,7 @@ export default {
       this.close();
     },
     getSpoofedTypes(resources) {
-      const uniqueResourceTypes = uniq(this.toRemove.map(resource => resource.type));
+      const uniqueResourceTypes = uniq(this.toRemove.map((resource) => resource.type));
 
       return uniqueResourceTypes.filter(this.$store.getters['type-map/isSpoofed']);
     },
@@ -297,7 +311,7 @@ export default {
     // If spoofed we need to reload the values as the server can't have watchers for them.
     refreshSpoofedTypes(types) {
       const inStore = this.$store.getters['currentProduct'].inStore;
-      const promises = types.map(type => this.$store.dispatch(`${ inStore }/findAll`, { type, opt: { force: true } }, { root: true }));
+      const promises = types.map((type) => this.$store.dispatch(`${ inStore }/findAll`, { type, opt: { force: true } }, { root: true }));
 
       return Promise.all(promises);
     },
@@ -372,32 +386,42 @@ export default {
             </div>
           </template>
         </div>
-        <input
+        <LabeledInput
           v-if="needsConfirm"
           id="confirm"
           v-model="confirmName"
+          v-focus
           :data-testid="componentTestid + '-input'"
           type="text"
         >
-        <div class="text-warning mb-10 mt-10">
-          {{ warning }}
-        </div>
-        <div class="text-error mb-10 mt-10">
-          {{ error }}
-        </div>
-        <div
-          v-if="!needsConfirm"
-          class="text-info mt-20"
-        >
-          {{ protip }}
-        </div>
-        <Checkbox
-          v-if="chartsToRemoveIsApp"
-          v-model="chartsDeleteCrd"
-          label-key="promptRemoveApp.removeCrd"
-          class="mt-10 type"
-          @input="chartAddCrdToRemove"
-        />
+          <div class="text-warning mb-10 mt-10">
+            {{ warning }}
+          </div>
+          <div class="text-error mb-10 mt-10">
+            {{ error }}
+          </div>
+          <div
+            v-if="!needsConfirm"
+            class="text-info mt-20"
+          >
+            {{ protip }}
+          </div>
+          <Checkbox
+            v-if="chartsToRemoveIsApp"
+            v-model="chartsDeleteCrd"
+            label-key="promptRemoveApp.removeCrd"
+            class="mt-10 type"
+            @input="chartAddCrdToRemove"
+          />
+        </labeledinput>
+        <template v-else>
+          <div class="text-warning mb-10 mt-10">
+            {{ warning }}
+          </div>
+          <div class="text-error mb-10 mt-10">
+            {{ error }}
+          </div>
+        </template>
       </div>
       <template #actions>
         <button

package/components/PromptRestore.vue

@@ -70,7 +70,7 @@ export default {
 
     clusterSnapshots() {
       if (this.sortedSnapshots) {
-        return this.sortedSnapshots.map(snapshot => ({ label: this.snapshotLabel(snapshot), value: snapshot.name }));
+        return this.sortedSnapshots.map((snapshot) => ({ label: this.snapshotLabel(snapshot), value: snapshot.name }));
       } else {
         return [];
       }
@@ -115,13 +115,13 @@ export default {
 
       if (!cluster.isRke2) {
         promise = this.$store.dispatch('rancher/findAll', { type: NORMAN.ETCD_BACKUP }).then((snapshots) => {
-          return snapshots.filter(s => s.clusterId === cluster.metadata.name);
+          return snapshots.filter((s) => s.clusterId === cluster.metadata.name);
         });
       } else {
         promise = this.$store.dispatch('management/findAll', { type: SNAPSHOT }).then((snapshots) => {
           const toRestoreClusterName = cluster?.clusterName || cluster?.metadata?.name;
 
-          return snapshots.filter(s => s.clusterName === toRestoreClusterName);
+          return snapshots.filter((s) => s.clusterName === toRestoreClusterName);
         });
       }
 

package/components/Questions/index.vue

@@ -67,9 +67,9 @@ function migrate(expr) {
   let out;
 
   if ( expr.includes('||') ) {
-    out = expr.split('||').map(x => migrate(x)).join(' || ');
+    out = expr.split('||').map((x) => migrate(x)).join(' || ');
   } else if ( expr.includes('&&') ) {
-    out = expr.split('&&').map(x => migrate(x)).join(' && ');
+    out = expr.split('&&').map((x) => migrate(x)).join(' && ');
   } else {
     const parts = expr.match(/^(.*)(!?=)(.*)$/);
 
@@ -311,9 +311,9 @@ export default {
       let result;
 
       if ( get(or, 'length') > 1 ) {
-        result = or.some(showIf => this.calExpression(showIf, allQuestions));
+        result = or.some((showIf) => this.calExpression(showIf, allQuestions));
       } else {
-        result = and.every(showIf => this.calExpression(showIf, allQuestions));
+        result = and.every((showIf) => this.calExpression(showIf, allQuestions));
       }
 
       return result;
@@ -368,7 +368,7 @@ export default {
       return null;
     },
     getAnswer(variable, questions) {
-      const found = questions.find(q => q.variable === variable);
+      const found = questions.find((q) => q.variable === variable);
 
       if ( found ) {
         // Equivalent to finding question.answer in Ember

package/components/RelatedWorkloadsTable.vue

@@ -22,7 +22,7 @@ export default {
       WORKLOAD_TYPES.JOB,
       WORKLOAD_TYPES.STATEFUL_SET
     ];
-    const allWorkloadsNested = await Promise.all(types.map(type => this.$store.dispatch('cluster/findAll', { type })));
+    const allWorkloadsNested = await Promise.all(types.map((type) => this.$store.dispatch('cluster/findAll', { type })));
     const allWorkloads = allWorkloadsNested.flat();
 
     this.relatedWorkloadRows = allWorkloads.filter(this.filter);

package/components/ResourceList/Masthead.vue

@@ -139,7 +139,7 @@ export default {
       }
 
       // blocked-post means you can post through norman, but not through steve.
-      if ( this.schema && !this.schema?.collectionMethods.find(x => ['blocked-post', 'post'].includes(x.toLowerCase())) ) {
+      if ( this.schema && !this.schema?.collectionMethods.find((x) => ['blocked-post', 'post'].includes(x.toLowerCase())) ) {
         return false;
       }