@rancher/shell 0.3.14 → 0.3.16

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

@@ -1,4 +1,6 @@
-import { CAPI, MANAGEMENT, NORMAN, SNAPSHOT } from '@shell/config/types';
+import {
+  CAPI, MANAGEMENT, NORMAN, SNAPSHOT, HCI
+} from '@shell/config/types';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { findBy } from '@shell/utils/array';
 import { get, set } from '@shell/utils/object';
@@ -6,6 +8,7 @@ import { sortBy } from '@shell/utils/sort';
 import { ucFirst } from '@shell/utils/string';
 import { compare } from '@shell/utils/version';
 import { AS, MODE, _VIEW, _YAML } from '@shell/config/query-params';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 
 /**
  * Class representing Cluster resource.
@@ -34,7 +37,7 @@ export default class ProvCluster extends SteveModel {
         label:   this.t('cluster.detail.machines'),
         content: this.desired,
       },
-    ].filter(x => !!x.content);
+    ].filter((x) => !!x.content);
 
     // RKE Template details
     const rkeTemplate = this.rkeTemplate;
@@ -88,7 +91,7 @@ export default class ProvCluster extends SteveModel {
 
     // Don't let the user delete the local cluster from the UI
     if (isLocal) {
-      const remove = out.findIndex(a => a.action === 'promptRemove');
+      const remove = out.findIndex((a) => a.action === 'promptRemove');
 
       if (remove > -1) {
         out.splice(remove, 1);
@@ -185,6 +188,18 @@ export default class ProvCluster extends SteveModel {
     this.currentRouter().push(location);
   }
 
+  async goToHarvesterCluster() {
+    const harvesterCluster = await this.$dispatch('create', {
+      ...this,
+      type: HCI.CLUSTER
+    });
+
+    try {
+      await harvesterCluster.goToCluster();
+    } catch {
+    }
+  }
+
   goToViewYaml() {
     let location;
 
@@ -317,7 +332,7 @@ export default class ProvCluster extends SteveModel {
   get provisioner() {
     if ( this.isRke2 ) {
       const allKeys = Object.keys(this.spec);
-      const configKey = allKeys.find( k => k.endsWith('Config'));
+      const configKey = allKeys.find( (k) => k.endsWith('Config'));
 
       if ( configKey === 'rkeConfig') {
         return 'rke2';
@@ -346,6 +361,10 @@ export default class ProvCluster extends SteveModel {
     return this.$rootGetters['i18n/withFallback'](`cluster.provider."${ provisioner }"`, null, ucFirst(provisioner));
   }
 
+  get providerLogo() {
+    return this.mgmt?.providerLogo;
+  }
+
   get kubernetesVersion() {
     const unknown = this.$rootGetters['i18n/t']('generic.unknown');
 
@@ -362,7 +381,9 @@ export default class ProvCluster extends SteveModel {
   }
 
   get machineProvider() {
-    if ( this.isImported ) {
+    if (this.isHarvester) {
+      return HARVESTER;
+    } else if ( this.isImported ) {
       return null;
     } else if ( this.isRke2 ) {
       const kind = this.spec?.rkeConfig?.machinePools?.[0]?.machineConfigRef?.kind?.toLowerCase();
@@ -418,7 +439,7 @@ export default class ProvCluster extends SteveModel {
   }
 
   get nodes() {
-    return this.$rootGetters['management/all'](MANAGEMENT.NODE).filter(node => node.id.startsWith(this.mgmtClusterId));
+    return this.$rootGetters['management/all'](MANAGEMENT.NODE).filter((node) => node.id.startsWith(this.mgmtClusterId));
   }
 
   get machines() {
@@ -440,13 +461,13 @@ export default class ProvCluster extends SteveModel {
   }
 
   get pools() {
-    const deployments = this.$rootGetters['management/all'](CAPI.MACHINE_DEPLOYMENT).filter(pool => pool.spec?.clusterName === this.metadata.name);
+    const deployments = this.$rootGetters['management/all'](CAPI.MACHINE_DEPLOYMENT).filter((pool) => pool.spec?.clusterName === this.metadata.name);
 
     if (!!deployments.length) {
       return deployments;
     }
 
-    return this.$rootGetters['management/all'](MANAGEMENT.NODE_POOL).filter(pool => pool.spec.clusterName === this.status?.clusterName);
+    return this.$rootGetters['management/all'](MANAGEMENT.NODE_POOL).filter((pool) => pool.spec.clusterName === this.status?.clusterName);
   }
 
   get desired() {
@@ -473,7 +494,7 @@ export default class ProvCluster extends SteveModel {
     if (this.isReady) {
       if (this.isRke1) {
         const names = this.nodes.filter((node) => {
-          return node.status.conditions.find(c => c.error && c.type === 'Ready');
+          return node.status.conditions.find((c) => c.error && c.type === 'Ready');
         }).map((node) => {
           const name = node.status.nodeName || node.metadata.name;
 
@@ -483,7 +504,7 @@ export default class ProvCluster extends SteveModel {
         return names.join('<br>');
       } else {
         const names = this.machines.filter((machine) => {
-          return machine.status?.conditions?.find(c => c.error && c.type === 'NodeHealthy');
+          return machine.status?.conditions?.find((c) => c.error && c.type === 'NodeHealthy');
         }).map((machine) => {
           if (machine.status?.nodeRef?.name) {
             return this.t('cluster.availabilityWarnings.node', { name: machine.status.nodeRef.name });
@@ -529,7 +550,7 @@ export default class ProvCluster extends SteveModel {
         value:     this.ready,
         sort:      4,
       },
-    ].filter(x => x.value > 0);
+    ].filter((x) => x.value > 0);
 
     return sortBy(out, 'sort:desc');
   }
@@ -606,7 +627,7 @@ export default class ProvCluster extends SteveModel {
       return row.takeSnapshot();
     }));
 
-    const successful = res.filter( x => x.status === 'fulfilled').length;
+    const successful = res.filter( (x) => x.status === 'fulfilled').length;
 
     if ( successful ) {
       this.$dispatch('growl/success', {
@@ -649,7 +670,7 @@ export default class ProvCluster extends SteveModel {
     const allSnapshots = this.$rootGetters['management/all']({ type: SNAPSHOT });
 
     return allSnapshots
-      .filter(s => s.metadata.namespace === this.namespace && s.clusterName === this.name );
+      .filter((s) => s.metadata.namespace === this.namespace && s.clusterName === this.name );
   }
 
   restoreSnapshotAction(resource = this) {
@@ -679,15 +700,6 @@ export default class ProvCluster extends SteveModel {
   }
 
   get stateObj() {
-    if ( this.isHarvester) {
-      return {
-        error:         true,
-        message:       this.$rootGetters['i18n/t']('cluster.harvester.warning.label'),
-        name:          this.$rootGetters['i18n/t']('cluster.harvester.warning.state'),
-        transitioning: false
-      };
-    }
-
     return this._stateObj;
   }
 
@@ -704,8 +716,8 @@ export default class ProvCluster extends SteveModel {
 
     const clusterTemplateName = this.mgmt.spec.clusterTemplateName.replace(':', '/');
     const clusterTemplateRevisionName = this.mgmt.spec.clusterTemplateRevisionName.replace(':', '/');
-    const template = this.$rootGetters['management/all'](MANAGEMENT.RKE_TEMPLATE).find(t => t.id === clusterTemplateName);
-    const revision = this.$rootGetters['management/all'](MANAGEMENT.RKE_TEMPLATE_REVISION).find(t => t.spec.enabled && t.id === clusterTemplateRevisionName);
+    const template = this.$rootGetters['management/all'](MANAGEMENT.RKE_TEMPLATE).find((t) => t.id === clusterTemplateName);
+    const revision = this.$rootGetters['management/all'](MANAGEMENT.RKE_TEMPLATE_REVISION).find((t) => t.spec.enabled && t.id === clusterTemplateRevisionName);
 
     if (!template || !revision) {
       return false;
@@ -733,7 +745,7 @@ export default class ProvCluster extends SteveModel {
     const clusterTemplateRevisionName = this.mgmt.spec.clusterTemplateRevisionName.replace(':', '/');
 
     // Get all of the template revisions for this template
-    const revisions = this.$rootGetters['management/all'](MANAGEMENT.RKE_TEMPLATE_REVISION).filter(t => t.spec.enabled && t.spec.clusterTemplateName === this.mgmt.spec.clusterTemplateName);
+    const revisions = this.$rootGetters['management/all'](MANAGEMENT.RKE_TEMPLATE_REVISION).filter((t) => t.spec.enabled && t.spec.clusterTemplateName === this.mgmt.spec.clusterTemplateName);
 
     if (revisions.length <= 1) {
       // Only one template revision
@@ -795,7 +807,7 @@ export default class ProvCluster extends SteveModel {
   get agentConfig() {
     // The one we want is the first one with no selector.
     // If there are multiple with no selector, that will fall under the unsupported message below.
-    return this.spec.rkeConfig.machineSelectorConfig.find(x => !x.machineLabelSelector).config;
+    return this.spec.rkeConfig.machineSelectorConfig.find((x) => !x.machineLabelSelector).config;
   }
 
   get cloudProvider() {
@@ -849,6 +861,6 @@ export default class ProvCluster extends SteveModel {
   }
 
   get hasError() {
-    return this.status?.conditions?.some(condition => condition.error === true);
+    return this.status?.conditions?.some((condition) => condition.error === true);
   }
 }

package/models/rbac.authorization.k8s.io.clusterrole.js

@@ -8,10 +8,10 @@ export default class ClusterRole extends Role {
   }
 
   get namespaceResources() {
-    return this.allResources.filter(r => r.attributes.namespaced && !r.attributes.group.includes(CATTLE_API_GROUP));
+    return this.allResources.filter((r) => r.attributes.namespaced && !r.attributes.group.includes(CATTLE_API_GROUP));
   }
 
   get resources() {
-    return uniq(this.namespaceResources.map(r => r.attributes?.kind)).sort();
+    return uniq(this.namespaceResources.map((r) => r.attributes?.kind)).sort();
   }
 }

package/models/rbac.authorization.k8s.io.role.js

@@ -31,15 +31,15 @@ export default class Role extends SteveModel {
   }
 
   get allResources() {
-    return this.$getters['all'](SCHEMA).filter(r => r.attributes?.kind);
+    return this.$getters['all'](SCHEMA).filter((r) => r.attributes?.kind);
   }
 
   get clusterResources() {
-    return this.allResources.filter(r => !r.attributes.namespaced && !r.attributes.group.includes(CATTLE_API_GROUP));
+    return this.allResources.filter((r) => !r.attributes.namespaced && !r.attributes.group.includes(CATTLE_API_GROUP));
   }
 
   get resources() {
-    return uniq(this.clusterResources.map(r => r.attributes?.kind)).sort();
+    return uniq(this.clusterResources.map((r) => r.attributes?.kind)).sort();
   }
 
   set displayName(v) {

package/models/secret.js

@@ -293,7 +293,7 @@ export default class Secret extends SteveModel {
   get unrepeatedSans() {
     if (this._type === TYPES.TLS ) {
       if (this.certInfo?.sans?.filter) {
-        const commonBases = this.certInfo?.sans.filter(name => name.indexOf('*.') === 0 || name.indexOf('www.') === 0).map(name => name.substr(name.indexOf('.')));
+        const commonBases = this.certInfo?.sans.filter((name) => name.indexOf('*.') === 0 || name.indexOf('www.') === 0).map((name) => name.substr(name.indexOf('.')));
         const displaySans = removeObjects(this.certInfo?.sans, commonBases);
 
         return displaySans;

package/models/service.js

@@ -99,7 +99,7 @@ export default class extends SteveModel {
     }
 
     if (this.serviceType === 'LoadBalancer') {
-      const statusIps = this.status.loadBalancer?.ingress?.map(ingress => ingress.hostname || ingress.ip).join(', ');
+      const statusIps = this.status.loadBalancer?.ingress?.map((ingress) => ingress.hostname || ingress.ip).join(', ');
 
       const loadbalancerInfo = loadBalancerIP || statusIps || '';
 
@@ -131,7 +131,7 @@ export default class extends SteveModel {
   get podRelationship() {
     const { metadata:{ relationships = [] } } = this;
 
-    return (relationships || []).filter(relationship => relationship.toType === POD)[0];
+    return (relationships || []).filter((relationship) => relationship.toType === POD)[0];
   }
 
   async fetchPods() {

package/models/storage.k8s.io.storageclass.js

@@ -83,7 +83,7 @@ export const PROVISIONER_OPTIONS = [
 
 export default class extends SteveModel {
   get provisionerDisplay() {
-    const option = PROVISIONER_OPTIONS.find(o => o.value === this.provisioner);
+    const option = PROVISIONER_OPTIONS.find((o) => o.value === this.provisioner);
     const fallback = `${ this.provisioner } ${ this.t('persistentVolume.csi.drivers.suffix') }`;
 
     return option ? this.t(option.labelKey) : this.$rootGetters['i18n/withFallback'](`persistentVolume.csi.drivers.${ this.provisioner.replaceAll('.', '-') }`, null, fallback);
@@ -115,7 +115,7 @@ export default class extends SteveModel {
   setDefault() {
     const allStorageClasses = this.$rootGetters['cluster/all'](STORAGE_CLASS) || [];
 
-    allStorageClasses.forEach(storageClass => storageClass.resetDefault());
+    allStorageClasses.forEach((storageClass) => storageClass.resetDefault());
     this.updateDefault(true);
   }
 

package/models/token.js

@@ -3,7 +3,7 @@ import NormanModel from '@shell/plugins/steve/norman-class';
 
 export default class extends NormanModel {
   get _availableActions() {
-    return super._availableActions.filter(a => ['viewInApi', 'promptRemove'].includes(a.action));
+    return super._availableActions.filter((a) => ['viewInApi', 'promptRemove'].includes(a.action));
   }
 
   get state() {

package/models/workload.js

@@ -452,8 +452,8 @@ export default class Workload extends WorkloadService {
   async getPortsWithServiceType() {
     const ports = [];
 
-    this.containers.forEach(container => ports.push(...(container.ports || [])));
-    (this.initContainers || []).forEach(container => ports.push(...(container.ports || [])));
+    this.containers.forEach((container) => ports.push(...(container.ports || [])));
+    (this.initContainers || []).forEach((container) => ports.push(...(container.ports || [])));
 
     // Only get services owned if we can access the service resource
     const canAccessServices = this.$getters['schemaFor'](SERVICE);
@@ -548,7 +548,7 @@ export default class Workload extends WorkloadService {
 
   get pods() {
     const relationships = this.metadata?.relationships || [];
-    const podRelationship = relationships.filter(relationship => relationship.toType === POD)[0];
+    const podRelationship = relationships.filter((relationship) => relationship.toType === POD)[0];
 
     if (podRelationship) {
       const pods = this.$getters['podsByNamespace'](this.metadata.namespace);
@@ -590,7 +590,7 @@ export default class Workload extends WorkloadService {
       return undefined;
     }
 
-    return (get(this, 'metadata.relationships') || []).filter(relationship => relationship.toType === WORKLOAD_TYPES.JOB);
+    return (get(this, 'metadata.relationships') || []).filter((relationship) => relationship.toType === WORKLOAD_TYPES.JOB);
   }
 
   get jobs() {
@@ -600,7 +600,7 @@ export default class Workload extends WorkloadService {
 
     return this.jobRelationships.map((obj) => {
       return this.$getters['byId'](WORKLOAD_TYPES.JOB, obj.toId );
-    }).filter(x => !!x);
+    }).filter((x) => !!x);
   }
 
   get jobGauges() {
@@ -643,7 +643,7 @@ export default class Workload extends WorkloadService {
 
   async matchingPods() {
     const all = await this.$dispatch('findAll', { type: POD });
-    const allInNamespace = all.filter(pod => pod.metadata.namespace === this.metadata.namespace);
+    const allInNamespace = all.filter((pod) => pod.metadata.namespace === this.metadata.namespace);
 
     const selector = convertSelectorObj(this.spec.selector);
 

package/models/workload.service.js

@@ -1,7 +1,7 @@
 
 import { findBy } from '@shell/utils/array';
 import { TARGET_WORKLOADS, UI_MANAGED, HCI as HCI_LABELS_ANNOTATIONS } from '@shell/config/labels-annotations';
-import { WORKLOAD_TYPES, SERVICE, CAPI, HCI } from '@shell/config/types';
+import { WORKLOAD_TYPES, SERVICE } from '@shell/config/types';
 import { clone, get } from '@shell/utils/object';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { shortenedImage } from '@shell/utils/string';
@@ -10,8 +10,8 @@ export default class WorkloadService extends SteveModel {
   async getPortsWithServiceType() {
     const ports = [];
 
-    this.containers.forEach(container => ports.push(...(container.ports || [])));
-    (this.initContainers || []).forEach(container => ports.push(...(container.ports || [])));
+    this.containers.forEach((container) => ports.push(...(container.ports || [])));
+    (this.initContainers || []).forEach((container) => ports.push(...(container.ports || [])));
 
     // Only get services owned if we can access the service resource
     const canAccessServices = this.$getters['schemaFor'](SERVICE);
@@ -93,7 +93,7 @@ export default class WorkloadService extends SteveModel {
     const steveSelectorValue = this.workloadSelector[selectorKey];
     const allSvc = await this.$dispatch('cluster/findAll', { type: SERVICE, opt: { force } }, { root: true });
 
-    return (allSvc || []).filter(svc => (svc.spec?.selector || {})[selectorKey] === steveSelectorValue || (svc.spec?.selector || {})[selectorKey] === normanSelectorValue );
+    return (allSvc || []).filter((svc) => (svc.spec?.selector || {})[selectorKey] === steveSelectorValue || (svc.spec?.selector || {})[selectorKey] === normanSelectorValue );
   }
 
   get imageNames() {
@@ -307,26 +307,10 @@ export default class WorkloadService extends SteveModel {
         loadBalancerProxy = await this.$dispatch(`cluster/create`, loadBalancer, { root: true });
       }
 
-      const portsWithIpam = ports.filter(p => p._ipam) || [];
+      const portsWithIpam = ports.filter((p) => p._ipam) || [];
 
       if (portsWithIpam.length > 0) {
         loadBalancerProxy.metadata.annotations[HCI_LABELS_ANNOTATIONS.CLOUD_PROVIDER_IPAM] = portsWithIpam[0]._ipam;
-
-        const clusters = this.$rootGetters['management/all'](CAPI.RANCHER_CLUSTER);
-        const configs = this.$rootGetters['management/all'](HCI.HARVESTER_CONFIG);
-        const currentCluster = this.$rootGetters['currentCluster'];
-        const cluster = clusters.find(c => c.status.clusterName === currentCluster.id);
-
-        const machinePools = cluster?.spec?.rkeConfig?.machinePools || [];
-        const machineConfigName = machinePools[0]?.machineConfigRef?.name;
-        const config = configs.find(c => c.id === `fleet-default/${ machineConfigName }`);
-
-        if (config) {
-          const { vmNamespace, networkName } = config;
-
-          loadBalancerProxy.metadata.annotations[HCI_LABELS_ANNOTATIONS.CLOUD_PROVIDER_NAMESPACE] = vmNamespace;
-          loadBalancerProxy.metadata.annotations[HCI_LABELS_ANNOTATIONS.CLOUD_PROVIDER_NETWORK] = networkName;
-        }
       }
 
       toSave.push(loadBalancerProxy);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "0.3.14",
+  "version": "0.3.16",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -36,6 +36,7 @@
     "@babel/preset-typescript": "7.16.7",
     "@innologica/vue-dropdown-menu": "0.1.3",
     "@novnc/novnc": "1.2.0",
+    "@nuxt/types": "2.14.6",
     "@nuxt/typescript-build": "2.1.0",
     "@nuxtjs/axios": "5.12.0",
     "@nuxtjs/eslint-config-typescript": "6.0.1",
@@ -105,7 +106,7 @@
     "nyc": "15.1.0",
     "papaparse": "5.3.0",
     "portal-vue": "2.1.7",
-    "rancher-icons": "rancher/icons#v2.0.14",
+    "rancher-icons": "rancher/icons#v2.0.16",
     "require-extension-hooks": "0.3.3",
     "require-extension-hooks-babel": "1.0.0",
     "require-extension-hooks-vue": "3.0.0",

package/pages/about.vue

@@ -23,32 +23,32 @@ export default {
   },
   computed: {
     rancherVersion() {
-      return this.settings.find(s => s.id === SETTING.VERSION_RANCHER);
+      return this.settings.find((s) => s.id === SETTING.VERSION_RANCHER);
     },
     appName() {
       return getVendor();
     },
     cliVersion() {
-      return this.settings.find(s => s.id === SETTING.VERSION_CLI);
+      return this.settings.find((s) => s.id === SETTING.VERSION_CLI);
     },
     helmVersion() {
-      return this.settings.find(s => s.id === SETTING.VERSION_HELM);
+      return this.settings.find((s) => s.id === SETTING.VERSION_HELM);
     },
     dockerMachineVersion() {
-      return this.settings.find(s => s.id === SETTING.VERSION_MACHINE);
+      return this.settings.find((s) => s.id === SETTING.VERSION_MACHINE);
     },
     downloads() {
       return [
-        this.createOSOption('about.os.mac', 'icon-apple', this.settings?.find(s => s.id === SETTING.CLI_URL.DARWIN)?.value, null),
-        this.createOSOption('about.os.linux', 'icon-linux', this.settings?.find(s => s.id === SETTING.CLI_URL.LINUX)?.value, this.downloadLinuxImages),
-        this.createOSOption('about.os.windows', 'icon-windows', this.settings?.find(s => s.id === SETTING.CLI_URL.WINDOWS)?.value, this.downloadWindowsImages)
+        this.createOSOption('about.os.mac', 'icon-apple', this.settings?.find((s) => s.id === SETTING.CLI_URL.DARWIN)?.value, null),
+        this.createOSOption('about.os.linux', 'icon-linux', this.settings?.find((s) => s.id === SETTING.CLI_URL.LINUX)?.value, this.downloadLinuxImages),
+        this.createOSOption('about.os.windows', 'icon-windows', this.settings?.find((s) => s.id === SETTING.CLI_URL.WINDOWS)?.value, this.downloadWindowsImages)
       ];
     },
     downloadImageList() {
-      return this.downloads.filter(d => !!d.imageList);
+      return this.downloads.filter((d) => !!d.imageList);
     },
     downloadCli() {
-      return this.downloads.filter(d => !!d.cliLink);
+      return this.downloads.filter((d) => !!d.cliLink);
     }
   },
   methods: {

package/pages/account/index.vue

@@ -29,8 +29,8 @@ export default {
 
     // Get all settings - the API host setting may not be set, so this avoids a 404 request if we look for the specific setting
     const allSettings = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.SETTING });
-    const apiHostSetting = allSettings.find(i => i.id === SETTING.API_HOST);
-    const serverUrlSetting = allSettings.find(i => i.id === SETTING.SERVER_URL);
+    const apiHostSetting = allSettings.find((i) => i.id === SETTING.API_HOST);
+    const serverUrlSetting = allSettings.find((i) => i.id === SETTING.SERVER_URL);
 
     this.apiHostSetting = apiHostSetting?.value;
     this.serverUrlSetting = serverUrlSetting?.value;

package/pages/auth/login.vue

@@ -14,7 +14,6 @@ import Password from '@shell/components/form/Password';
 import { sortBy } from '@shell/utils/sort';
 import { configType } from '@shell/models/management.cattle.io.authconfig';
 import { mapGetters } from 'vuex';
-import { importLogin } from '@shell/utils/dynamic-importer';
 import { _ALL_IF_AUTHED, _MULTI } from '@shell/plugins/dashboard-store/actions';
 import { MANAGEMENT, NORMAN } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
@@ -37,10 +36,10 @@ export default {
 
   async asyncData({ route, redirect, store }) {
     const drivers = await store.dispatch('auth/getAuthProviders');
-    const providers = sortBy(drivers.map(x => x.id), ['id']);
+    const providers = sortBy(drivers.map((x) => x.id), ['id']);
 
     const hasLocal = providers.includes('local');
-    const hasOthers = hasLocal && !!providers.find(x => x !== 'local');
+    const hasOthers = hasLocal && !!providers.find((x) => x !== 'local');
 
     if ( hasLocal ) {
       // Local is special and handled here so that it can be toggled
@@ -99,13 +98,14 @@ export default {
     }
 
     return {
-      vendor:     getVendor(),
+      vendor:             getVendor(),
       providers,
       hasOthers,
       hasLocal,
-      showLocal:  !hasOthers || (route.query[LOCAL] === _FLAGGED),
-      firstLogin: firstLoginSetting?.value === 'true',
-      singleProvider
+      showLocal:          !hasOthers || (route.query[LOCAL] === _FLAGGED),
+      firstLogin:         firstLoginSetting?.value === 'true',
+      singleProvider,
+      showLocaleSelector: !process.env.loginLocaleSelector || process.env.loginLocaleSelector === 'true'
     };
   },
 
@@ -176,7 +176,7 @@ export default {
 
   created() {
     this.providerComponents = this.providers.map((name) => {
-      return importLogin(configType[name]);
+      return this.$store.getters['type-map/importLogin'](configType[name] || name);
     });
   },
 
@@ -254,7 +254,7 @@ export default {
 
         if ( this.remember ) {
           this.$cookies.set(USERNAME, this.username, {
-            encode:   x => x,
+            encode:   (x) => x,
             maxAge:   86400 * 365,
             path:     '/',
             sameSite: true,
@@ -474,10 +474,13 @@ export default {
               {{ nonLocalPrompt }}
             </a>
           </div>
-          <div class="locale-elector">
-            <LocaleSelector mode="login" />
-          </div>
         </template>
+        <div
+          v-if="showLocaleSelector"
+          class="locale-elector"
+        >
+          <LocaleSelector mode="login" />
+        </div>
       </div>
 
       <BrandImage
@@ -539,6 +542,16 @@ export default {
     }
   }
 
+  .gutless {
+    height: 100vh;
+    .span-6 {
+      overflow-y: auto;
+      display: flex;
+      flex-direction: column;
+      height: 100%;
+      place-content: center;
+    }
+  }
   .locale-elector {
     position: absolute;
     bottom: 30px;

package/pages/auth/setup.vue

@@ -478,6 +478,10 @@ export default {
     .form-col {
       display: flex;
       flex-direction: column;
+      overflow-y: auto;
+      position: relative;
+      height: 100vh;
+
       & > div:first-of-type {
         flex:3;
       }

package/pages/auth/verify.vue

@@ -43,6 +43,12 @@ export default {
     try {
       parsed = JSON.parse(base64Decode((stateStr)));
     } catch (err) {
+      const out = store.getters['i18n/t'](`login.error`);
+
+      console.error('Failed to parse nonce'); // eslint-disable-line no-console
+
+      redirect(`/auth/login?err=${ escape(out) }`);
+
       return;
     }
 

package/pages/c/_cluster/apps/charts/index.vue

@@ -113,18 +113,18 @@ export default {
     },
 
     flattenedRepoNames() {
-      const allChecked = this.repoOptionsForDropdown.find(repo => repo.all && repo.enabled);
+      const allChecked = this.repoOptionsForDropdown.find((repo) => repo.all && repo.enabled);
 
       if (allChecked) {
         return allChecked.label;
       }
 
       // None checked
-      if (!this.repoOptionsForDropdown.find(repo => repo.enabled)) {
+      if (!this.repoOptionsForDropdown.find((repo) => repo.enabled)) {
         return this.t('generic.none');
       }
 
-      const shownRepos = this.repoOptions.filter(repo => !this.hideRepos.includes(repo._key));
+      const shownRepos = this.repoOptions.filter((repo) => !this.hideRepos.includes(repo._key));
       const reducedRepos = shownRepos.reduce((acc, c, i) => {
         acc += c.label;
         const length = shownRepos.length;
@@ -180,7 +180,7 @@ export default {
     getFeaturedCharts() {
       const allCharts = (this.filteredCharts || []);
 
-      const featuredCharts = allCharts.filter(value => value.featured).sort((a, b) => a.featured - b.featured);
+      const featuredCharts = allCharts.filter((value) => value.featured).sort((a, b) => a.featured - b.featured);
 
       return featuredCharts.slice(0, 5);
     },