@rancher/shell 0.3.14 → 0.3.15

package/models/logging.banzaicloud.io.clusterflow.js

@@ -15,12 +15,12 @@ export default class LogClusterFlow extends Flow {
     }
     const outputRefs = this?.spec?.globalOutputRefs || this?.spec?.outputRefs || [];
 
-    return this.allOutputs.filter(output => outputRefs.includes(output.name));
+    return this.allOutputs.filter((output) => outputRefs.includes(output.name));
   }
 
   get outputProviders() {
     const duplicatedProviders = this.outputs
-      .flatMap(output => output.providers);
+      .flatMap((output) => output.providers);
 
     return uniq(duplicatedProviders) || [];
   }

package/models/logging.banzaicloud.io.flow.js

@@ -64,11 +64,11 @@ export default class LogFlow extends SteveModel {
   get outputs() {
     const localOutputRefs = this.spec?.localOutputRefs || [];
 
-    return this.allOutputs.filter(output => localOutputRefs.includes(output.name));
+    return this.allOutputs.filter((output) => localOutputRefs.includes(output.name));
   }
 
   get outputsSortable() {
-    const displays = this.outputs.map(o => o.nameDisplay);
+    const displays = this.outputs.map((o) => o.nameDisplay);
 
     displays.sort();
 
@@ -79,7 +79,7 @@ export default class LogFlow extends SteveModel {
     const globalOutputRefs = this.spec?.globalOutputRefs || [];
 
     if (this.allClusterOutputs) {
-      return this.allClusterOutputs.filter(output => globalOutputRefs.includes(output.name));
+      return this.allClusterOutputs.filter((output) => globalOutputRefs.includes(output.name));
     } else {
       // Handle the case where the user doesn't have permission
       // to see ClusterOutputs
@@ -88,7 +88,7 @@ export default class LogFlow extends SteveModel {
   }
 
   get clusterOutputsSortable() {
-    const displays = this.clusterOutputs.map(o => o.nameDisplay);
+    const displays = this.clusterOutputs.map((o) => o.nameDisplay);
 
     displays.sort();
 
@@ -98,7 +98,7 @@ export default class LogFlow extends SteveModel {
   get providersDisplay() {
     const combinedOutputs = [...this.outputs, ...this.clusterOutputs];
     const duplicatedProviders = combinedOutputs
-      .flatMap(output => output.providersDisplay);
+      .flatMap((output) => output.providersDisplay);
 
     return uniq(duplicatedProviders) || [];
   }

package/models/logging.banzaicloud.io.output.js

@@ -120,7 +120,7 @@ export default class LogOutput extends SteveModel {
     const spec = this.spec || {};
 
     return Object.keys(spec)
-      .filter(provider => provider !== 'loggingRef');
+      .filter((provider) => provider !== 'loggingRef');
   }
 
   get providersDisplay() {
@@ -132,7 +132,7 @@ export default class LogOutput extends SteveModel {
   }
 
   isSupportedProvider(provider) {
-    return !!PROVIDERS.find(p => p.name === provider);
+    return !!PROVIDERS.find((p) => p.name === provider);
   }
 
   get allProvidersSupported() {

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

@@ -76,7 +76,7 @@ export default class MgmtCluster extends HybridModel {
   get machinePools() {
     const pools = this.$getters['all'](MANAGEMENT.NODE_POOL);
 
-    return pools.filter(x => x.spec?.clusterName === this.id);
+    return pools.filter((x) => x.spec?.clusterName === this.id);
   }
 
   get provisioner() {
@@ -254,7 +254,11 @@ export default class MgmtCluster extends HybridModel {
   }
 
   get providerLogo() {
-    const provider = this.status?.provider || 'kubernetes';
+    let provider = this.status?.provider || 'kubernetes';
+
+    if (this.isHarvester) {
+      provider = HARVESTER;
+    }
     // Only interested in the part before the period
     const prv = provider.split('.')[0];
     // Allow overrides if needed
@@ -274,18 +278,10 @@ export default class MgmtCluster extends HybridModel {
   }
 
   get providerMenuLogo() {
-    if (this?.status?.provider === HARVESTER) {
-      return require(`~shell/assets/images/providers/kubernetes.svg`);
-    }
-
     return this.providerLogo;
   }
 
   get providerNavLogo() {
-    if (this?.status?.provider === HARVESTER && this.$rootGetters['currentProduct'].inStore !== HARVESTER) {
-      return require(`~shell/assets/images/providers/kubernetes.svg`);
-    }
-
     return this.providerLogo;
   }
 
@@ -409,10 +405,10 @@ export default class MgmtCluster extends HybridModel {
     const nodes = await this.$dispatch('cluster/findAll', { type: NODE }, { root: true });
     const nodeMetrics = await this.$dispatch('cluster/findAll', { type: NODE }, { root: true });
 
-    const someNonWorkerRoles = nodes.some(node => node.hasARole && !node.isWorker);
+    const someNonWorkerRoles = nodes.some((node) => node.hasARole && !node.isWorker);
 
     const metrics = nodeMetrics.filter((metric) => {
-      const node = nodes.find(nd => nd.id === metric.id);
+      const node = nodes.find((nd) => nd.id === metric.id);
 
       return node && (!someNonWorkerRoles || node.isWorker);
     });
@@ -434,7 +430,7 @@ export default class MgmtCluster extends HybridModel {
   }
 
   get nodes() {
-    return this.$getters['all'](MANAGEMENT.NODE).filter(node => node.id.startsWith(this.id));
+    return this.$getters['all'](MANAGEMENT.NODE).filter((node) => node.id.startsWith(this.id));
   }
 
   get provClusterId() {
@@ -447,6 +443,6 @@ export default class MgmtCluster extends HybridModel {
     const from = `${ verb }Type`;
     const id = `${ verb }Id`;
 
-    return this.metadata.relationships.find(r => r[from] === CAPI.RANCHER_CLUSTER)?.[id];
+    return this.metadata.relationships.find((r) => r[from] === CAPI.RANCHER_CLUSTER)?.[id];
   }
 }

package/models/management.cattle.io.globalrole.js

@@ -56,15 +56,15 @@ export default class GlobalRole extends SteveDescriptionModel {
   }
 
   get allResources() {
-    return this.$getters['all'](SCHEMA).filter(r => r.attributes?.kind);
+    return this.$getters['all'](SCHEMA).filter((r) => r.attributes?.kind);
   }
 
   get globalResources() {
-    return this.allResources.filter(r => r.attributes.group.includes(CATTLE_API_GROUP));
+    return this.allResources.filter((r) => r.attributes.group.includes(CATTLE_API_GROUP));
   }
 
   get resources() {
-    return uniq(this.globalResources.map(r => r.attributes?.resource)).sort();
+    return uniq(this.globalResources.map((r) => r.attributes?.resource)).sort();
   }
 
   get listLocation() {
@@ -117,7 +117,7 @@ export default class GlobalRole extends SteveDescriptionModel {
   get canCreate() {
     const schema = this.$getters['schemaFor'](this.type);
 
-    return schema?.resourceMethods.find(verb => CREATE_VERBS.has(verb));
+    return schema?.resourceMethods.find((verb) => CREATE_VERBS.has(verb));
   }
 
   goToClone(moreQuery = {}) {

package/models/management.cattle.io.node.js

@@ -114,7 +114,7 @@ export default class MgmtNode extends HybridModel {
   }
 
   get provisioningCluster() {
-    return this.$getters['all'](CAPI.RANCHER_CLUSTER).find(c => c.mgmtClusterId === this.mgmtClusterId);
+    return this.$getters['all'](CAPI.RANCHER_CLUSTER).find((c) => c.mgmtClusterId === this.mgmtClusterId);
   }
 
   get doneOverride() {
@@ -148,7 +148,7 @@ export default class MgmtNode extends HybridModel {
 
   get externalIp() {
     const addresses = this.status?.addresses || [];
-    const statusAddress = findLast(addresses, address => address.type === 'ExternalIP')?.address;
+    const statusAddress = findLast(addresses, (address) => address.type === 'ExternalIP')?.address;
 
     if (statusAddress) {
       return statusAddress;

package/models/management.cattle.io.nodepool.js

@@ -31,7 +31,7 @@ export default class MgmtNodePool extends HybridModel {
   }
 
   get provisioningCluster() {
-    return this.$getters['all'](CAPI.RANCHER_CLUSTER).find(c => c.name === this.spec.clusterName);
+    return this.$getters['all'](CAPI.RANCHER_CLUSTER).find((c) => c.name === this.spec.clusterName);
   }
 
   get doneOverride() {
@@ -71,7 +71,7 @@ export default class MgmtNodePool extends HybridModel {
   get nodes() {
     const nodePoolName = this.id.replace('/', ':');
 
-    return this.$getters['all'](MANAGEMENT.NODE).filter(node => node.spec.nodePoolName === nodePoolName);
+    return this.$getters['all'](MANAGEMENT.NODE).filter((node) => node.spec.nodePoolName === nodePoolName);
   }
 
   get nodeSummary() {
@@ -142,7 +142,7 @@ export default class MgmtNodePool extends HybridModel {
         value:     this.ready,
         sort:      4,
       },
-    ].filter(x => x.value > 0);
+    ].filter((x) => x.value > 0);
 
     return sortBy(out, 'sort:desc');
   }

package/models/management.cattle.io.nodetemplate.js

@@ -79,8 +79,8 @@ export default class NodeTemplate extends HybridModel {
     const allKeys = Object.keys(this);
 
     const configKey = allKeys
-      .filter(k => this[k] !== null)
-      .find(k => k.endsWith('Config'));
+      .filter((k) => this[k] !== null)
+      .find((k) => k.endsWith('Config'));
 
     if ( configKey ) {
       return configKey.replace(/config$/i, '');
@@ -101,7 +101,7 @@ export default class NodeTemplate extends HybridModel {
 
   get providerLocation() {
     if (this.provider) {
-      const config = CONFIG_KEYS.find(k => k.driver === this.provider);
+      const config = CONFIG_KEYS.find((k) => k.driver === this.provider);
 
       if (config?.location) {
         if (config.location.getDisplayProperty) {
@@ -120,7 +120,7 @@ export default class NodeTemplate extends HybridModel {
 
   get providerSize() {
     if (this.provider) {
-      const config = CONFIG_KEYS.find(k => k.driver === this.provider);
+      const config = CONFIG_KEYS.find((k) => k.driver === this.provider);
 
       if (config?.size) {
         if (config.size.getDisplayProperty) {

package/models/management.cattle.io.project.js

@@ -30,7 +30,7 @@ function clearUnusedResourceQuotas(spec, types) {
       spec[type].usedLimit = null;
     }
 
-    if ( spec[type] && !isEmpty(spec[type]) && Object.keys(spec[type]).every( k => spec[type][k] === null ) ) {
+    if ( spec[type] && !isEmpty(spec[type]) && Object.keys(spec[type]).every( (k) => spec[type][k] === null ) ) {
       spec[type] = null;
     }
   });
@@ -205,7 +205,7 @@ export default class Project extends HybridModel {
   }
 
   get canEditYaml() {
-    return this.schema?.resourceMethods?.find(x => x === 'blocked-PUT') ? false : super.canUpdate;
+    return this.schema?.resourceMethods?.find((x) => x === 'blocked-PUT') ? false : super.canUpdate;
   }
 
   get confirmRemove() {

package/models/management.cattle.io.roletemplate.js

@@ -165,7 +165,7 @@ export default class RoleTemplate extends SteveDescriptionModel {
   get canCreate() {
     const schema = this.$getters['schemaFor'](this.type);
 
-    return schema?.resourceMethods.find(verb => CREATE_VERBS.has(verb));
+    return schema?.resourceMethods.find((verb) => CREATE_VERBS.has(verb));
   }
 
   goToClone(moreQuery = {}) {

package/models/management.cattle.io.setting.js

@@ -21,7 +21,7 @@ export default class Setting extends HybridModel {
     });
 
     // Change the label on the first action (edit)
-    const editAction = out.find(action => action.action === 'goToEdit');
+    const editAction = out.find((action) => action.action === 'goToEdit');
 
     if (editAction) {
       editAction.label = this.t('advancedSettings.edit.label');

package/models/management.cattle.io.user.js

@@ -33,13 +33,13 @@ export default class User extends HybridModel {
   get isCurrentUser() {
     const currentPrincipal = this.$rootGetters['auth/principalId'];
 
-    return !!(this.principalIds || []).find(p => p === currentPrincipal);
+    return !!(this.principalIds || []).find((p) => p === currentPrincipal);
   }
 
   get principals() {
     return this.principalIds
-      .map(id => this.$rootGetters['rancher/byId'](NORMAN.PRINCIPAL, id))
-      .filter(p => p);
+      .map((id) => this.$rootGetters['rancher/byId'](NORMAN.PRINCIPAL, id))
+      .filter((p) => p);
   }
 
   get nameDisplay() {
@@ -146,7 +146,7 @@ export default class User extends HybridModel {
   }
 
   async activateBulk(items) {
-    await Promise.all(items.map(item => item.setEnabled(true)));
+    await Promise.all(items.map((item) => item.setEnabled(true)));
   }
 
   async deactivate() {
@@ -154,7 +154,7 @@ export default class User extends HybridModel {
   }
 
   async deactivateBulk(items) {
-    await Promise.all(items.map(item => item.setEnabled(false)));
+    await Promise.all(items.map((item) => item.setEnabled(false)));
   }
 
   async refreshGroupMembership() {

package/models/monitoring.coreos.com.receiver.js

@@ -61,7 +61,7 @@ export default class Receiver extends SteveModel {
 
   remove() {
     return this.updateReceivers((currentReceivers) => {
-      return currentReceivers.filter(r => r.name !== this.spec?.name);
+      return currentReceivers.filter((r) => r.name !== this.spec?.name);
     });
   }
 
@@ -73,7 +73,7 @@ export default class Receiver extends SteveModel {
     }
 
     await this.updateReceivers((currentReceivers) => {
-      const existingReceiver = currentReceivers.find(r => r.name === this.spec?.name);
+      const existingReceiver = currentReceivers.find((r) => r.name === this.spec?.name);
 
       if (existingReceiver) {
         Object.assign(existingReceiver, this.spec);
@@ -129,18 +129,18 @@ export default class Receiver extends SteveModel {
 
   get receiverTypes() {
     const types = RECEIVERS_TYPES
-      .filter(type => type.name !== 'custom' && this.spec[type.key]?.length > 0)
-      .map(type => this.t(type.label));
+      .filter((type) => type.name !== 'custom' && this.spec[type.key]?.length > 0)
+      .map((type) => this.t(type.label));
 
-    const expectedKeys = RECEIVERS_TYPES.map(type => type.key).filter(key => key !== 'custom');
+    const expectedKeys = RECEIVERS_TYPES.map((type) => type.key).filter((key) => key !== 'custom');
 
     expectedKeys.push('name');
 
     const customKeys = Object.keys(this.spec)
-      .filter(key => !expectedKeys.includes(key));
+      .filter((key) => !expectedKeys.includes(key));
 
     if (customKeys.length > 0) {
-      const customLabel = this.t(RECEIVERS_TYPES.find(type => type.name === 'custom').label);
+      const customLabel = this.t(RECEIVERS_TYPES.find((type) => type.name === 'custom').label);
 
       types.push(customLabel);
     }
@@ -149,7 +149,7 @@ export default class Receiver extends SteveModel {
   }
 
   get updateReceivers() {
-    return fn => updateConfig(this.$dispatch, 'receivers', this.type, fn);
+    return (fn) => updateConfig(this.$dispatch, 'receivers', this.type, fn);
   }
 
   saveYaml(yaml) {
@@ -182,7 +182,7 @@ export default class Receiver extends SteveModel {
   }
 
   get hasDependentRoutes() {
-    return !!this.routes.find(route => route.spec.receiver === this.id);
+    return !!this.routes.find((route) => route.spec.receiver === this.id);
   }
 
   get preventDeletionMessage() {

package/models/namespace.js

@@ -105,7 +105,7 @@ export default class Namespace extends SteveModel {
   // These are namespaces that are created by rancher to serve purposes in the background but the user shouldn't have
   // to worry themselves about them.
   get isObscure() {
-    return OBSCURE_NAMESPACE_PREFIX.some(prefix => this.metadata.name.startsWith(prefix)) && this.isSystem;
+    return OBSCURE_NAMESPACE_PREFIX.some((prefix) => this.metadata.name.startsWith(prefix)) && this.isSystem;
   }
 
   get projectId() {

package/models/networking.k8s.io.ingress.js

@@ -7,7 +7,7 @@ import SteveModel from '@shell/plugins/steve/steve-class';
 function tlsHosts(spec) {
   const tls = spec.tls || [];
 
-  return tls.flatMap(tls => tls.hosts || []);
+  return tls.flatMap((tls) => tls.hosts || []);
 }
 
 function isTlsHost(spec, host) {
@@ -33,7 +33,7 @@ export default class Ingress extends SteveModel {
   }
 
   get isTlsHost() {
-    return host => isTlsHost(this.spec, host);
+    return (host) => isTlsHost(this.spec, host);
   }
 
   targetTo(workloads, serviceName) {
@@ -45,7 +45,7 @@ export default class Ingress extends SteveModel {
     const id = `${ this.namespace }/${ serviceName }`;
 
     if ( isTargetsWorkload ) {
-      const workload = workloads.find(w => w.id === (id));
+      const workload = workloads.find((w) => w.id === (id));
 
       return workload?.detailLocation || '';
     } else {
@@ -66,7 +66,7 @@ export default class Ingress extends SteveModel {
     return rules.flatMap((rule) => {
       const paths = rule?.http?.paths || [];
 
-      return paths.map(path => this.createPathForListPage(workloads, rule, path, certificates));
+      return paths.map((path) => this.createPathForListPage(workloads, rule, path, certificates));
     });
   }
 
@@ -120,7 +120,7 @@ export default class Ingress extends SteveModel {
       return hosts.includes(rule.host);
     });
 
-    return matchingCerts.map(cert => this.certLink(cert, certificates));
+    return matchingCerts.map((cert) => this.certLink(cert, certificates));
   }
 
   targetLink(workloads, serviceName) {

package/models/persistentvolume.js

@@ -109,7 +109,7 @@ export const VOLUME_PLUGINS = [
 
 export const LONGHORN_DRIVER = 'driver.longhorn.io';
 
-export const LONGHORN_PLUGIN = VOLUME_PLUGINS.find(plugin => plugin.value === 'longhorn');
+export const LONGHORN_PLUGIN = VOLUME_PLUGINS.find((plugin) => plugin.value === 'longhorn');
 
 export default class PV extends SteveModel {
   // plugin display value table
@@ -120,7 +120,7 @@ export default class PV extends SteveModel {
     if (csiDriver) {
       return this.$rootGetters['i18n/withFallback'](`persistentVolume.csi.drivers.${ csiDriver.replaceAll('.', '-') }`, null, fallback);
     }
-    const pluginDef = VOLUME_PLUGINS.find(plugin => this.spec[plugin.value]);
+    const pluginDef = VOLUME_PLUGINS.find((plugin) => this.spec[plugin.value]);
 
     if (pluginDef) {
       return this.t(pluginDef.labelKey);
@@ -141,7 +141,7 @@ export default class PV extends SteveModel {
 
     const allClaims = this.$rootGetters['cluster/all'](PVC);
 
-    return allClaims.find(claim => claim.spec.volumeName === this.name);
+    return allClaims.find((claim) => claim.spec.volumeName === this.name);
   }
 
   get claimName() {

package/models/pod.js

@@ -57,7 +57,7 @@ export default class Pod extends WorkloadService {
 
   get defaultContainerName() {
     const containers = this.spec.containers;
-    const desirable = containers.filter(c => c.name !== 'istio-proxy');
+    const desirable = containers.filter((c) => c.name !== 'istio-proxy');
 
     if ( desirable.length ) {
       return desirable[0].name;
@@ -111,7 +111,7 @@ export default class Pod extends WorkloadService {
   }
 
   get imageNames() {
-    return this.spec.containers.map(container => shortenedImage(container.image));
+    return this.spec.containers.map((container) => shortenedImage(container.image));
   }
 
   get workloadRef() {
@@ -188,7 +188,7 @@ export default class Pod extends WorkloadService {
   processSaveResponse(res) {
     if (res._headers && res._headers.warning) {
       const warnings = res._headers.warning.split('299') || [];
-      const hasPsaWarnings = warnings.filter(warning => warning.includes('violate PodSecurity')).length;
+      const hasPsaWarnings = warnings.filter((warning) => warning.includes('violate PodSecurity')).length;
 
       if (hasPsaWarnings) {
         this.$dispatch('growl/warning', {