@rancher/shell 0.3.14 → 0.3.15

package/detail/helm.cattle.io.projecthelmchart.vue

@@ -5,7 +5,6 @@ import Tab from '@shell/components/Tabbed/Tab';
 import DashboardMetrics from '@shell/components/DashboardMetrics';
 import AlertTable from '@shell/components/AlertTable';
 import { Banner } from '@components/Banner';
-import { parse as parseUrl } from '@shell/utils/url';
 import { ENDPOINTS } from '@shell/config/types';
 import { allHash } from '@shell/utils/promise';
 
@@ -33,33 +32,34 @@ export default {
     };
   },
   computed: {
-    relativeDashboardValues() {
-      const { alertmanagerURL, grafanaURL, prometheusURL } = this?.value?.status?.dashboardValues;
+    // there is a since-fixed bug in some versions of prom federator where this url is missing the trailing slash, which causes a redirect to an invalid grafana url
+    grafanaURL() {
+      const { grafanaURL } = this.value.status.dashboardValues;
 
-      return {
-        alertmanagerURL: this.makeRelativeURL(alertmanagerURL),
-        grafanaURL:      this.makeRelativeURL(grafanaURL),
-        prometheusURL:   this.makeRelativeURL(prometheusURL)
-      };
+      if (!grafanaURL.endsWith('/')) {
+        return `${ grafanaURL }/`;
+      }
+
+      return grafanaURL;
     },
     monitoringNamespace() {
       // picking the prometheusURL here, they're all going to be the same, but alertmanager and grafana can be deactivated
-      return this.pullKeyFromUrl(this.relativeDashboardValues.prometheusURL, 'namespaces');
+      return this.pullKeyFromUrl(this.value.status.dashboardValues.prometheusURL, 'namespaces');
     },
     alertServiceEndpoint() {
-      return this.pullServiceEndpointFromUrl(this.relativeDashboardValues.alertmanagerURL);
+      return this.pullServiceEndpointFromUrl(this.value.status.dashboardValues.alertmanagerURL);
     },
     alertServiceEndpointEnabled() {
       return this.checkEndpointEnabled(this.alertServiceEndpoint);
     },
     grafanaServiceEndpoint() {
-      return this.pullServiceEndpointFromUrl(this.relativeDashboardValues.grafanaURL);
+      return this.pullServiceEndpointFromUrl(this.value.status.dashboardValues.grafanaURL);
     },
     grafanaServiceEndpointEnabled() {
       return this.checkEndpointEnabled(this.grafanaServiceEndpoint);
     },
     prometheusServiceEndpoint() {
-      return this.pullServiceEndpointFromUrl(this.relativeDashboardValues.prometheusURL);
+      return this.pullServiceEndpointFromUrl(this.value.status.dashboardValues.prometheusURL);
     },
     prometheusServiceEndpointEnabled() {
       return this.checkEndpointEnabled(this.prometheusServiceEndpoint);
@@ -83,21 +83,7 @@ export default {
 
       return !isEmpty(endpoint) && !isEmpty(endpoint?.subsets);
     },
-    makeRelativeURL(url) {
-      if (!url) {
-        return '';
-      }
 
-      // most of the downstream components that use these URL expect the everything before and including the clusterid stripped out of the URL
-      const parsedUrl = parseUrl(url);
-      // we really just need the remaining bit of the url but the destructure makes it clear what we're leaving behind
-      // eslint-disable-next-line no-unused-vars
-      const [_empty, _k8s, _clusters, _clusterId, ...restUrl] = parsedUrl.relative.split('/');
-      // the above processing strips out the leading '/' which we need
-      const relativeUrl = `/${ restUrl.join('/') }`;
-
-      return relativeUrl;
-    },
     pullKeyFromUrl(url = '', key) {
       const splitUrl = url.split('/');
       const keyIndex = splitUrl.indexOf(key);
@@ -138,10 +124,11 @@ export default {
         <template #default="props">
           <DashboardMetrics
             v-if="props.active && grafanaServiceEndpointEnabled"
-            :detail-url="`${relativeDashboardValues.grafanaURL}/d/rancher-pod-1/rancher-pod?orgId=1&kiosk`"
-            :summary-url="`${relativeDashboardValues.grafanaURL}/d/rancher-workload-1/rancher-workload?orgId=1&kiosk`"
+            :detail-url="`${value.status.dashboardValues.grafanaURL}/d/rancher-pod-1/rancher-pod?orgId=1&kiosk`"
+            :summary-url="`${value.status.dashboardValues.grafanaURL}/d/rancher-workload-1/rancher-workload?orgId=1&kiosk`"
             graph-height="825px"
             project
+            :modify-prefix="false"
           />
         </template>
       </Tab>
@@ -211,7 +198,7 @@ export default {
           </div>
           <a
             :class="{disabled: !grafanaServiceEndpointEnabled}"
-            :href="value.status.dashboardValues.grafanaURL"
+            :href="grafanaURL"
             target="_blank"
           > {{ t('monitoring.overview.linkedList.grafana.label') }} <i class="icon icon-external-link" /></a>
           <a

package/detail/management.cattle.io.user.vue

@@ -123,8 +123,8 @@ export default {
         const roles = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.GLOBAL_ROLE });
 
         const out = await Promise.all(roles
-          .filter(r => !r.isSpecial)
-          .map(r => this.$store.dispatch(`rancher/clone`, { resource: r }))
+          .filter((r) => !r.isSpecial)
+          .map((r) => this.$store.dispatch(`rancher/clone`, { resource: r }))
         );
 
         out.forEach((r) => {
@@ -134,9 +134,9 @@ export default {
         const globalRoleBindings = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.GLOBAL_ROLE_BINDING });
 
         globalRoleBindings
-          .filter(binding => binding.userName === userId)
+          .filter((binding) => binding.userName === userId)
           .forEach((binding) => {
-            const globalRole = roles.find(r => r.id === binding.globalRoleName);
+            const globalRole = roles.find((r) => r.id === binding.globalRoleName);
 
             if (globalRole.id === 'admin') {
               this.isAdmin = true;
@@ -148,7 +148,7 @@ export default {
                 r.bound = binding?.metadata.creationTimestamp;
               });
             } else {
-              const entry = out.find(o => o.id === binding.globalRoleName);
+              const entry = out.find((o) => o.id === binding.globalRoleName);
 
               if (entry) {
                 entry.hasBound = true;
@@ -166,20 +166,20 @@ export default {
 
     fetchClusterRoles(userId) {
       const templateBindings = this.$store.getters['management/all'](MANAGEMENT.CLUSTER_ROLE_TEMPLATE_BINDING);
-      const userTemplateBindings = templateBindings.filter(binding => binding.userName === userId);
+      const userTemplateBindings = templateBindings.filter((binding) => binding.userName === userId);
 
       // Upfront load clusters
-      userTemplateBindings.map(b => this.$store.dispatch('management/find', { type: MANAGEMENT.CLUSTER, id: b.clusterName }));
+      userTemplateBindings.map((b) => this.$store.dispatch('management/find', { type: MANAGEMENT.CLUSTER, id: b.clusterName }));
 
       return userTemplateBindings;
     },
 
     fetchProjectRoles(userId) {
       const templateBindings = this.$store.getters['management/all'](MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING );
-      const userTemplateBindings = templateBindings.filter(binding => binding.userName === userId);
+      const userTemplateBindings = templateBindings.filter((binding) => binding.userName === userId);
 
       // Upfront load projects
-      userTemplateBindings.map(b => this.$store.dispatch('management/find', { type: MANAGEMENT.PROJECT, id: b.projectId }));
+      userTemplateBindings.map((b) => this.$store.dispatch('management/find', { type: MANAGEMENT.PROJECT, id: b.projectId }));
 
       return userTemplateBindings;
     },
@@ -199,13 +199,13 @@ export default {
       const verbs = (rule.verbs || []);
       const permissions = [];
 
-      apiGroups.forEach(apiGroup => resources.forEach(resource => verbs.forEach(verb => permissions.push({
+      apiGroups.forEach((apiGroup) => resources.forEach((resource) => verbs.forEach((verb) => permissions.push({
         apiGroup,
         resource,
         verb
       }))));
 
-      return permissions.every(permission => this.hasPermission(globalRoleRules, permission));
+      return permissions.every((permission) => this.hasPermission(globalRoleRules, permission));
     },
     getEnabledRoles(globalRole, out) {
       const globalRoleRules = globalRole.rules || [];
@@ -216,7 +216,7 @@ export default {
           return false;
         }
 
-        return r.rules.every(rule => this.containsRule(globalRoleRules, rule));
+        return r.rules.every((rule) => this.containsRule(globalRoleRules, rule));
       });
     },
 

package/detail/namespace.vue

@@ -156,7 +156,7 @@ export default {
     workloadRows() {
       const params = this.$route.params;
       const { id } = params;
-      const rows = flatten(compact(this.allWorkloads)).filter(row => !row.ownedByWorkload);
+      const rows = flatten(compact(this.allWorkloads)).filter((row) => !row.ownedByWorkload);
       const namespacedRows = filter(rows, ({ metadata: { namespace } }) => namespace === id);
 
       return namespacedRows;
@@ -175,7 +175,7 @@ export default {
         } else {
           const genericStateKey = findKey(
             this.statesByType,
-            stateNames => stateNames.includes(state)
+            (stateNames) => stateNames.includes(state)
           );
 
           if (genericStateKey) {
@@ -195,8 +195,8 @@ export default {
     getAllWorkloads() {
       return Promise.all(values(WORKLOAD_TYPES)
         // You may not have RBAC to see some of the types
-        .filter(type => Boolean(this.schemaFor(type)))
-        .map(type => this.$store.dispatch('cluster/findAll', { type }))
+        .filter((type) => Boolean(this.schemaFor(type)))
+        .map((type) => this.$store.dispatch('cluster/findAll', { type }))
       );
     },
 

package/detail/networking.k8s.io.ingress.vue

@@ -30,17 +30,17 @@ export default {
   computed: {
     serviceTargets() {
       return this.filterByCurrentResourceNamespace(this.allServices)
-        .map(service => ({
+        .map((service) => ({
           label: service.metadata.name,
           value: service.metadata.name,
-          ports: service.spec.ports?.map(p => p.port)
+          ports: service.spec.ports?.map((p) => p.port)
         }));
     },
     firstTabLabel() {
       return this.isView ? this.t('ingress.rulesAndCertificates.title') : this.t('ingress.rules.title');
     },
     certificates() {
-      return this.filterByCurrentResourceNamespace(this.allSecrets.filter(secret => secret._type === TYPES.TLS)).map((secret) => {
+      return this.filterByCurrentResourceNamespace(this.allSecrets.filter((secret) => secret._type === TYPES.TLS)).map((secret) => {
         const { id } = secret;
 
         return id.slice(id.indexOf('/') + 1);

package/detail/node.vue

@@ -139,7 +139,7 @@ export default {
 
     infoTableRows() {
       return Object.keys(this.value.status.nodeInfo)
-        .map(key => ({
+        .map((key) => ({
           key:   this.t(`node.detail.tab.info.key.${ key }`),
           value: this.value.status.nodeInfo[key]
         }));
@@ -148,7 +148,7 @@ export default {
     imageTableRows() {
       const images = this.value.status.images || [];
 
-      return images.map(image => ({
+      return images.map((image) => ({
         // image.names[1] typically has the user friendly name but on occasion there's only one name and we should use that
         name:      image.names ? (image.names[1] || image.names[0]) : '---',
         sizeBytes: image.sizeBytes

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

@@ -1,7 +1,7 @@
 <script>
 import Loading from '@shell/components/Loading';
 import { Banner } from '@components/Banner';
-import ResourceTable from '@shell/components/ResourceTable';
+import ResourceTable, { defaultTableSortGenerationFn } from '@shell/components/ResourceTable';
 import ResourceTabs from '@shell/components/form/ResourceTabs';
 import SortableTable from '@shell/components/SortableTable';
 import CopyCode from '@shell/components/CopyCode';
@@ -31,7 +31,6 @@ import Socket, {
 import { get } from '@shell/utils/object';
 import CapiMachineDeployment from '@shell/models/cluster.x-k8s.io.machinedeployment';
 import { isAlternate } from '@shell/utils/platform';
-import { defaultTableSortGenerationFn } from '@shell/components/ResourceTable.vue';
 
 let lastId = 1;
 const ansiup = new AnsiUp();
@@ -122,7 +121,7 @@ export default {
 
     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
-      this.hasLocalAccess = !!fetchOneRes.normanClusters.find(c => c.internal);
+      this.hasLocalAccess = !!fetchOneRes.normanClusters.find((c) => c.internal);
     }
 
     const fetchTwo = {};
@@ -303,7 +302,7 @@ export default {
         const templateNamePrefix = `${ pool.metadata.name }-`;
 
         // All of these properties are needed to ensure the pool displays correctly and that we can scale up and down
-        pool._template = this.machineTemplates.find(t => t.metadata.name.startsWith(templateNamePrefix));
+        pool._template = this.machineTemplates.find((t) => t.metadata.name.startsWith(templateNamePrefix));
         pool._cluster = this.value;
         pool._clusterSpec = mp;
 
@@ -320,16 +319,16 @@ export default {
     },
 
     nodes() {
-      const nodes = this.allNodes.filter(x => x.mgmtClusterId === this.value.mgmtClusterId);
+      const nodes = this.allNodes.filter((x) => x.mgmtClusterId === this.value.mgmtClusterId);
 
       return [...nodes, ...this.fakeNodes];
     },
 
     fakeNodes() {
       // When a pool has no nodes it's not shown.... so add a fake node to it
-      const emptyNodePools = this.allNodePools.filter(x => x.spec.clusterName === this.value.mgmtClusterId && x.spec.quantity === 0);
+      const emptyNodePools = this.allNodePools.filter((x) => x.spec.clusterName === this.value.mgmtClusterId && x.spec.quantity === 0);
 
-      return emptyNodePools.map(np => ({
+      return emptyNodePools.map((np) => ({
         spec:       { nodePoolName: np.id.replace('/', ':') },
         mainRowKey: 'isFake',
         pool:       np,
@@ -356,7 +355,7 @@ export default {
 
     showEksNodeGroupWarning() {
       if ( this.value.provisioner === 'EKS' && this.value.state !== STATES_ENUM.ACTIVE) {
-        const desiredTotal = this.value.eksNodeGroups.filter(g => g.desiredSize === 0);
+        const desiredTotal = this.value.eksNodeGroups.filter((g) => g.desiredSize === 0);
 
         if ( desiredTotal.length === this.value.eksNodeGroups.length ) {
           return true;
@@ -412,7 +411,7 @@ export default {
         return [];
       }
 
-      return (this.etcdBackups || []).filter(x => x.clusterId === mgmtId);
+      return (this.etcdBackups || []).filter((x) => x.clusterId === mgmtId);
     },
 
     rke2Snapshots() {
@@ -510,7 +509,7 @@ export default {
     },
 
     hasWindowsMachine() {
-      return this.machines.some(machine => get(machine, 'status.nodeInfo.operatingSystem') === 'windows');
+      return this.machines.some((machine) => get(machine, 'status.nodeInfo.operatingSystem') === 'windows');
     },
 
     snapshotsGroupBy() {

package/detail/service.vue

@@ -132,7 +132,7 @@ export default {
       return this.$store.getters['cluster/schemaFor'](POD);
     },
     selectorTableRows() {
-      return Object.keys(this.value.spec?.selector || {}).map(key => ({
+      return Object.keys(this.value.spec?.selector || {}).map((key) => ({
         key,
         value: this.value.spec.selector[key],
       }));

package/detail/workload/index.vue

@@ -200,7 +200,7 @@ export default {
     },
 
     podHeaders() {
-      return this.$store.getters['type-map/headersFor'](this.podSchema).filter(h => h !== NAMESPACE_COL);
+      return this.$store.getters['type-map/headersFor'](this.podSchema).filter((h) => h !== NAMESPACE_COL);
     },
 
     graphVarsWorkload() {
@@ -219,14 +219,14 @@ export default {
       const podGauges = Object.values(this.value.podGauges);
       const total = this.value.pods.length;
 
-      return !podGauges.find(pg => pg.count === total);
+      return !podGauges.find((pg) => pg.count === total);
     },
 
     showJobGaugeCircles() {
       const jobGauges = Object.values(this.value.jobGauges);
       const total = this.isCronJob ? this.totalRuns : this.value.pods.length;
 
-      return !jobGauges.find(jg => jg.count === total);
+      return !jobGauges.find((jg) => jg.count === total);
     },
 
     canScale() {

package/dialog/AddProjectMemberDialog.vue

@@ -77,7 +77,7 @@ export default {
 
     async createBindings() {
       const principalProperty = await this.principalProperty();
-      const promises = this.member.roleTemplateIds.map(roleTemplateId => this.$store.dispatch(`rancher/create`, {
+      const promises = this.member.roleTemplateIds.map((roleTemplateId) => this.$store.dispatch(`rancher/create`, {
         type:                NORMAN.PROJECT_ROLE_TEMPLATE_BINDING,
         roleTemplateId,
         [principalProperty]: this.member.principalId,
@@ -91,7 +91,7 @@ export default {
       this.error = null;
       this.createBindings()
         .then((bindings) => {
-          return Promise.all(bindings.map(b => b.save()));
+          return Promise.all(bindings.map((b) => b.save()));
         })
         .then(() => {
           btnCB(true);

package/dialog/DrainNode.vue

@@ -114,7 +114,7 @@ export default {
       }
 
       try {
-        await Promise.all(this.kubeNodes.map(node => node.norman?.doAction('drain', parsedBody)));
+        await Promise.all(this.kubeNodes.map((node) => node.norman?.doAction('drain', parsedBody)));
         this.close();
       } catch (e) {
         this.errors = exceptionToErrorsArray(e);

package/dialog/GenericPrompt.vue

@@ -68,11 +68,15 @@ export default {
     class="prompt-restore"
     :show-highlight-border="false"
   >
-    <h4
-      slot="title"
-      v-clean-html="title"
-      class="text-default-text"
-    />
+    <template slot="title">
+      <slot name="title">
+        <h4
+          slot="title"
+          v-clean-html="title"
+          class="text-default-text"
+        />
+      </slot>
+    </template>
 
     <template slot="body">
       <slot name="body">

package/dialog/RotateEncryptionKeyDialog.vue

@@ -65,7 +65,7 @@ export default {
       if ( this.cluster.isRke1) {
         let etcdBackups = await this.$store.dispatch('rancher/findAll', { type: NORMAN.ETCD_BACKUP });
 
-        etcdBackups = etcdBackups.filter(backup => backup.clusterId === this.cluster.metadata.name);
+        etcdBackups = etcdBackups.filter((backup) => backup.clusterId === this.cluster.metadata.name);
 
         return etcdBackups;
       }
@@ -73,7 +73,7 @@ export default {
       if (this.cluster.isRke2) {
         let etcdBackups = await this.$store.dispatch('management/findAll', { type: SNAPSHOT });
 
-        etcdBackups = etcdBackups.filter(backup => backup.clusterId === this.cluster.id);
+        etcdBackups = etcdBackups.filter((backup) => backup.clusterId === this.cluster.id);
 
         return etcdBackups;
       }

package/dialog/ScaleMachineDownDialog.vue

@@ -29,7 +29,7 @@ export default {
     // This isn't optimisied, there may be cases that retaining a single machine with both roles would be better than retaining two with single roles
     const [ignoredControlPlane, safeControlePlaneMachinesToDelete] = this.deleteType('isControlPlane', allToDelete, cluster);
     const [ignoredEtcd, safeMachinesToDelete] = this.deleteType('isEtcd', safeControlePlaneMachinesToDelete, cluster);
-    const ignored = [ignoredControlPlane, ignoredEtcd].filter(i => !!i);
+    const ignored = [ignoredControlPlane, ignoredEtcd].filter((i) => !!i);
 
     return {
       cluster,
@@ -57,7 +57,7 @@ export default {
         return res;
       }, { typed: [], others: [] });
 
-      const totalTypes = cluster.machines.filter(m => m[type]).length;
+      const totalTypes = cluster.machines.filter((m) => m[type]).length;
       const typesToDelete = allToDeleteByType.typed.length;
       // If we're attempting to remove all control plan machines.... ignore one
       const ignoredType = totalTypes - typesToDelete === 0 ? allToDeleteByType.typed.pop() : undefined;

package/edit/auth/azuread.vue

@@ -179,7 +179,7 @@ export default {
 
     setInitialEndpoint(endpoint) {
       const newEndpointKey = this.determineEndpointKeyType(ENDPOINT_MAPPING);
-      const oldEndpointKey = Object.keys(OLD_ENDPOINTS).find(key => OLD_ENDPOINTS[key].graphEndpoint === endpoint);
+      const oldEndpointKey = Object.keys(OLD_ENDPOINTS).find((key) => OLD_ENDPOINTS[key].graphEndpoint === endpoint);
 
       if ( oldEndpointKey ) {
         this.endpoint = this.determineEndpointKeyType(OLD_ENDPOINTS);
@@ -193,8 +193,8 @@ export default {
       let out = 'custom';
 
       for ( const [endpointKey, endpointKeyValues] of Object.entries(endpointTypes) ) {
-        const mappedValues = Object.values(endpointKeyValues).map(endpoint => endpoint.replace(TENANT_ID_TOKEN, this.model?.tenantId));
-        const valuesToCheck = Object.keys(endpointKeyValues).map(key => this.value[key]);
+        const mappedValues = Object.values(endpointKeyValues).map((endpoint) => endpoint.replace(TENANT_ID_TOKEN, this.model?.tenantId));
+        const valuesToCheck = Object.keys(endpointKeyValues).map((key) => this.value[key]);
 
         if ( isEqual(mappedValues, valuesToCheck) ) {
           out = endpointKey;

package/edit/autoscaling.horizontalpodautoscaler/index.vue

@@ -68,19 +68,19 @@ export default {
     allWorkloadsFiltered() {
       return (
         Object.values(SCALABLE_WORKLOAD_TYPES)
-          .flatMap(type => this.$store.getters['cluster/all'](type))
+          .flatMap((type) => this.$store.getters['cluster/all'](type))
           .filter(
             // Filter out anything that has an owner, which should probably be the one with the HPA
             // For example ReplicaSets can be associated with a HPA (https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/#replicaset-as-a-horizontal-pod-autoscaler-target)
             // but wouldn't make sense if it's owned by a deployment
-            wl => wl.metadata.namespace === this.value.metadata.namespace && !wl.ownedByWorkload
+            (wl) => wl.metadata.namespace === this.value.metadata.namespace && !wl.ownedByWorkload
           )
       );
     },
     allWorkloadsMapped() {
       return this.allWorkloadsFiltered
       // Update to type OBJECT_REFERENCE which can be stored directly as scaleTargetRef
-        .map(workload => ({
+        .map((workload) => ({
           kind:       workload.kind,
           name:       workload.metadata.name,
           apiVersion: workload.apiVersion,
@@ -95,7 +95,7 @@ export default {
       return !isEmpty(
         find(
           allServices,
-          api => api.name.split('.').length === 4 &&
+          (api) => api.name.split('.').length === 4 &&
             endsWith(api.name, RESOURCE_METRICS_API_GROUP)
         )
       );
@@ -133,7 +133,7 @@ export default {
     },
     async loadWorkloads() {
       await Promise.all(
-        Object.values(SCALABLE_WORKLOAD_TYPES).map(type => this.$store.dispatch('cluster/findAll', { type })
+        Object.values(SCALABLE_WORKLOAD_TYPES).map((type) => this.$store.dispatch('cluster/findAll', { type })
         )
       );
     },

package/edit/cis.cattle.io.clusterscan.vue

@@ -53,7 +53,7 @@ export default {
     // if mode is _CREATE and scanProfileName is defined, this is a clone
     // check if the profile referred to in the original spec still exists
     if (scanProfileName && this.mode === _CREATE) {
-      const proxyObj = this.allProfiles.filter(profile => profile.id === scanProfileName)[0];
+      const proxyObj = this.allProfiles.filter((profile) => profile.id === scanProfileName)[0];
 
       if (!proxyObj) {
         this.$set(this.value.spec, 'scanProfileName', '');
@@ -134,7 +134,7 @@ export default {
           });
         }
         if (name) {
-          const profile = this.allProfiles.find(profile => profile.id === name);
+          const profile = this.allProfiles.find((profile) => profile.id === name);
           const benchmarkVersion = profile?.spec?.benchmarkVersion;
           const benchmark = this.$store.getters['cluster/byId'](CIS.BENCHMARK, benchmarkVersion);
 
@@ -142,12 +142,12 @@ export default {
             return profile;
           }
         }
-        const cis16 = this.validProfiles.find(profile => profile.value === 'cis-1.6-profile');
+        const cis16 = this.validProfiles.find((profile) => profile.value === 'cis-1.6-profile');
 
         if (cis16) {
-          return this.allProfiles.find(profile => profile.id === 'cis-1.6-profile');
+          return this.allProfiles.find((profile) => profile.id === 'cis-1.6-profile');
         } else {
-          return this.allProfiles.find(profile => profile.id === 'cis-1.5-profile');
+          return this.allProfiles.find((profile) => profile.id === 'cis-1.5-profile');
         }
       }
 

package/edit/cloudcredential.vue

@@ -106,13 +106,13 @@ export default {
       const out = [];
 
       const drivers = [...this.nodeDrivers, ...this.kontainerDrivers]
-        .filter(x => x.spec.active && x.id !== 'rancherkubernetesengine')
-        .map(x => x.spec.displayName || x.id);
+        .filter((x) => x.spec.active && x.id !== 'rancherkubernetesengine')
+        .map((x) => x.spec.displayName || x.id);
 
-      let types = uniq(drivers.map(x => this.$store.getters['plugins/credentialDriverFor'](x)));
+      let types = uniq(drivers.map((x) => this.$store.getters['plugins/credentialDriverFor'](x)));
 
       if ( !this.rke2Enabled ) {
-        types = types.filter(x => rke1Supports.includes(x));
+        types = types.filter((x) => rke1Supports.includes(x));
       }
 
       const schema = this.$store.getters['rancher/schemaFor'](NORMAN.CLOUD_CREDENTIAL);

package/edit/constraints.gatekeeper.sh.constraint/NamespaceList.vue

@@ -24,7 +24,7 @@ export default {
     },
     namespaceFilter: {
       type:    Function,
-      default: namespace => true
+      default: (namespace) => true
     },
     addLabel: {
       type:    String,

package/edit/constraints.gatekeeper.sh.constraint/index.vue

@@ -21,12 +21,12 @@ import Scope, { SCOPE_OPTIONS } from './Scope';
 
 function findConstraintTypes(schemas) {
   return schemas
-    .filter(schema => schema?.attributes?.group === 'constraints.gatekeeper.sh');
+    .filter((schema) => schema?.attributes?.group === 'constraints.gatekeeper.sh');
 }
 
 function findConstraintTypesIds(schemas) {
   return findConstraintTypes(schemas)
-    .map(schema => schema.id);
+    .map((schema) => schema.id);
 }
 
 const CONSTRAINT_PREFIX = 'constraints.gatekeeper.sh.';
@@ -145,8 +145,8 @@ export default {
     },
     systemNamespaceIds() {
       return this.$store.getters['cluster/all'](NAMESPACE)
-        .filter(namespace => namespace.isSystem)
-        .map(namespace => namespace.id);
+        .filter((namespace) => namespace.isSystem)
+        .map((namespace) => namespace.id);
     },
     emptyDefaults() {
       return {

package/edit/fleet.cattle.io.gitrepo.vue

@@ -185,7 +185,7 @@ export default {
         .filter((x) => {
           return x.metadata.namespace === this.value.metadata.namespace;
         })
-        .filter(x => !isHarvesterCluster(x))
+        .filter((x) => !isHarvesterCluster(x))
         .map((x) => {
           return { label: x.nameDisplay, value: `cluster://${ x.metadata.name }` };
         });
@@ -202,7 +202,7 @@ export default {
       }
 
       const groups = this.allClusterGroups
-        .filter(x => x.metadata.namespace === this.value.metadata.namespace)
+        .filter((x) => x.metadata.namespace === this.value.metadata.namespace)
         .map((x) => {
           return { label: x.nameDisplay, value: `group://${ x.metadata.name }` };
         });
@@ -223,16 +223,16 @@ export default {
 
     clusterNames() {
       const out = this.allClusters
-        .filter(x => x.metadata.namespace === this.value.metadata.namespace)
-        .map(x => x.metadata.name);
+        .filter((x) => x.metadata.namespace === this.value.metadata.namespace)
+        .map((x) => x.metadata.name);
 
       return out;
     },
 
     clusterGroupNames() {
       const out = this.allClusterGroups
-        .filter(x => x.metadata.namespace === this.value.metadata.namespace)
-        .map(x => x.metadata.name);
+        .filter((x) => x.metadata.namespace === this.value.metadata.namespace)
+        .map((x) => x.metadata.name);
 
       return out;
     },