@rancher/shell 0.3.14 → 0.3.15

package/store/type-map.js

@@ -140,13 +140,14 @@ import {
   ensureRegex, escapeHtml, escapeRegex, ucFirst, pluralize
 } from '@shell/utils/string';
 import {
-  importChart, importList, importDetail, importEdit, listProducts, loadProduct, importCustomPromptRemove, resolveList, resolveEdit, resolveWindowComponent, importWindowComponent, resolveChart, resolveDetail, importDialog, importMachineConfig, resolveMachineConfigComponent, resolveCloudCredentialComponent, importCloudCredential
+  importChart, importList, importDetail, importEdit, listProducts, loadProduct, importCustomPromptRemove, resolveList, resolveEdit, resolveWindowComponent, importWindowComponent, importLogin, resolveChart, resolveDetail, importDialog, importMachineConfig, resolveMachineConfigComponent, resolveCloudCredentialComponent, importCloudCredential
 } from '@shell/utils/dynamic-importer';
 
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import isObject from 'lodash/isObject';
 import { normalizeType } from '@shell/plugins/dashboard-store/normalize';
 import { sortBy } from '@shell/utils/sort';
+
 import { haveV1Monitoring, haveV2Monitoring } from '@shell/utils/monitoring';
 import { NEU_VECTOR_NAMESPACE } from '@shell/config/product/neuvector';
 
@@ -172,14 +173,16 @@ const graphConfigMap = {};
 const FIELD_REGEX = /^\$\.metadata\.fields\[([0-9]*)\]/;
 
 export const IF_HAVE = {
-  V1_MONITORING:       'v1-monitoring',
-  V2_MONITORING:       'v2-monitoring',
-  PROJECT:             'project',
-  NO_PROJECT:          'no-project',
-  NOT_V1_ISTIO:        'not-v1-istio',
-  MULTI_CLUSTER:       'multi-cluster',
-  NEUVECTOR_NAMESPACE: 'neuvector-namespace',
-  ADMIN:               'admin-user',
+  V1_MONITORING:            'v1-monitoring',
+  V2_MONITORING:            'v2-monitoring',
+  PROJECT:                  'project',
+  NO_PROJECT:               'no-project',
+  NOT_V1_ISTIO:             'not-v1-istio',
+  MULTI_CLUSTER:            'multi-cluster',
+  NEUVECTOR_NAMESPACE:      'neuvector-namespace',
+  ADMIN:                    'admin-user',
+  MCM_DISABLED:             'mcm-disabled',
+  NOT_STANDALONE_HARVESTER: 'not-standalone-harvester',
 };
 
 export function DSL(store, product, module = 'type-map') {
@@ -287,8 +290,8 @@ export function DSL(store, product, module = 'type-map') {
       store.commit(`${ module }/ignoreType`, regexOrString);
     },
 
-    ignoreGroup(regexOrString) {
-      store.commit(`${ module }/ignoreGroup`, regexOrString);
+    ignoreGroup(regexOrString, cb) {
+      store.commit(`${ module }/ignoreGroup`, { regexOrString, cb });
     },
 
     weightGroup(input, weight, forBasic) {
@@ -473,7 +476,7 @@ export const getters = {
         const match = group.match(/^(.*)\.k8s\.io$/);
 
         if ( match ) {
-          return match[1].split(/\./).map(x => ucFirst(x)).join('.');
+          return match[1].split(/\./).map((x) => ucFirst(x)).join('.');
         }
 
         return group;
@@ -775,7 +778,7 @@ export const getters = {
       product = product || rootGetters['productId'];
       const productSpoofedTypes = state.spoofedTypes[product] || [];
 
-      return productSpoofedTypes.some(st => st.type === type);
+      return productSpoofedTypes.some((st) => st.type === type);
     };
   },
 
@@ -808,7 +811,7 @@ export const getters = {
     return async(type, product, id) => {
       const productInstances = await getters.getSpoofedInstances(type, product);
 
-      return productInstances.find( instance => instance.id === id);
+      return productInstances.find( (instance) => instance.id === id);
     };
   },
 
@@ -823,7 +826,7 @@ export const getters = {
       return types.flatMap((type) => {
         const schemas = type.schemas || [];
 
-        return schemas.map(schema => ({
+        return schemas.map((schema) => ({
           ...schema,
           isSpoofed: true
         }));
@@ -835,7 +838,7 @@ export const getters = {
     return getters.allSpoofedTypes.flatMap((type) => {
       const schemas = type.schemas || [];
 
-      return schemas.map(schema => ({
+      return schemas.map((schema) => ({
         ...schema,
         isSpoofed: true
       }));
@@ -918,7 +921,7 @@ export const getters = {
             const targetedSchemas = typeof item.ifHaveType === 'string' ? schemas : rootGetters[`${ item.ifHaveType.store }/all`](SCHEMA);
             const type = typeof item.ifHaveType === 'string' ? item.ifHaveType : item.ifHaveType?.type;
 
-            const haveIds = filterBy(targetedSchemas, 'id', normalizeType(type)).map(s => s.id);
+            const haveIds = filterBy(targetedSchemas, 'id', normalizeType(type)).map((s) => s.id);
 
             if (!haveIds.length) {
               continue;
@@ -1001,7 +1004,7 @@ export const getters = {
           } else {
             return entry;
           }
-        }).filter(col => !!col);
+        }).filter((col) => !!col);
       }
 
       // Otherwise make one up from schema
@@ -1055,7 +1058,7 @@ export const getters = {
           formatter = 'Number';
         }
 
-        const colName = col.name.includes(' ') ? col.name.split(' ').map(word => word.charAt(0).toUpperCase() + word.substring(1) ).join('') : col.name;
+        const colName = col.name.includes(' ') ? col.name.split(' ').map((word) => word.charAt(0).toUpperCase() + word.substring(1) ).join('') : col.name;
 
         const exists = rootGetters['i18n/exists'];
         const t = rootGetters['i18n/t'];
@@ -1089,7 +1092,7 @@ export const getters = {
     return (rawType) => {
       const key = getters.componentFor(rawType);
 
-      return hasCustom(state, rootState, 'list', key, key => resolveList(key));
+      return hasCustom(state, rootState, 'list', key, (key) => resolveList(key));
     };
   },
 
@@ -1097,7 +1100,7 @@ export const getters = {
     return (rawType) => {
       const key = getters.componentFor(rawType);
 
-      return hasCustom(state, rootState, 'chart', key, key => resolveChart(key));
+      return hasCustom(state, rootState, 'chart', key, (key) => resolveChart(key));
     };
   },
 
@@ -1105,7 +1108,7 @@ export const getters = {
     return (rawType, subType) => {
       const key = getters.componentFor(rawType, subType);
 
-      return hasCustom(state, rootState, 'detail', key, key => resolveDetail(key));
+      return hasCustom(state, rootState, 'detail', key, (key) => resolveDetail(key));
     };
   },
 
@@ -1125,13 +1128,13 @@ export const getters = {
     return (rawType, subType) => {
       const key = getters.componentFor(rawType, subType);
 
-      return hasCustom(state, rootState, 'edit', key, key => resolveEdit(key));
+      return hasCustom(state, rootState, 'edit', key, (key) => resolveEdit(key));
     };
   },
 
   hasComponent(state, getters, rootState) {
     return (path) => {
-      return hasCustom(state, rootState, 'edit', path, path => resolveEdit(path));
+      return hasCustom(state, rootState, 'edit', path, (path) => resolveEdit(path));
     };
   },
 
@@ -1147,7 +1150,7 @@ export const getters = {
     return (rawType, subType) => {
       const key = getters.componentFor(rawType, subType);
 
-      return hasCustom(state, rootState, 'windowComponents', key, key => resolveWindowComponent(key));
+      return hasCustom(state, rootState, 'windowComponents', key, (key) => resolveWindowComponent(key));
     };
   },
 
@@ -1155,7 +1158,7 @@ export const getters = {
     return (rawType, subType) => {
       const key = getters.componentFor(rawType, subType);
 
-      return hasCustom(state, rootState, 'machine-config', key, key => resolveMachineConfigComponent(key));
+      return hasCustom(state, rootState, 'machine-config', key, (key) => resolveMachineConfigComponent(key));
     };
   },
 
@@ -1163,7 +1166,7 @@ export const getters = {
     return (rawType, subType) => {
       const key = getters.componentFor(rawType, subType);
 
-      return hasCustom(state, rootState, 'cloud-credential', key, key => resolveCloudCredentialComponent(key));
+      return hasCustom(state, rootState, 'cloud-credential', key, (key) => resolveCloudCredentialComponent(key));
     };
   },
 
@@ -1215,6 +1218,12 @@ export const getters = {
     };
   },
 
+  importLogin(state, getters, rootState) {
+    return (authType) => {
+      return loadExtension(rootState, 'login', authType, importLogin);
+    };
+  },
+
   importMachineConfig(state, getters, rootState) {
     return (rawType, subType) => {
       return loadExtension(rootState, 'machine-config', getters.componentFor(rawType, subType), importMachineConfig);
@@ -1260,18 +1269,19 @@ export const getters = {
     };
   },
 
-  isIgnored(state) {
+  isIgnored(state, getters, rootState, rootGetters) {
     return (schema) => {
-      if ( state.cache.ignore[schema.id] !== undefined ) {
-        return state.cache.ignore[schema.id];
-      }
-
       let out = false;
 
       for ( const rule of state.groupIgnore ) {
         const group = schema?.attributes?.group;
 
-        if ( group && group.match(stringToRegex(rule)) ) {
+        if (group && group.match(stringToRegex(rule.type) && isObject(rule) && rule.type)) {
+          out = rule.cb(rootGetters);
+          break;
+        }
+
+        if ( group && typeof rule === 'string' && group.match(stringToRegex(rule)) ) {
           out = true;
           break;
         }
@@ -1344,7 +1354,7 @@ export const getters = {
       }
 
       if ( p.ifHaveType ) {
-        const haveIds = knownTypes[module].filter(t => t.match(stringToRegex(p.ifHaveType)) );
+        const haveIds = knownTypes[module].filter((t) => t.match(stringToRegex(p.ifHaveType)) );
 
         if ( !haveIds.length ) {
           return false;
@@ -1355,7 +1365,7 @@ export const getters = {
         }
       }
 
-      if ( p.ifHaveGroup && !knownGroups[module].find(t => t.match(stringToRegex(p.ifHaveGroup)) ) ) {
+      if ( p.ifHaveGroup && !knownGroups[module].find((t) => t.match(stringToRegex(p.ifHaveGroup)) ) ) {
         return false;
       }
 
@@ -1389,7 +1399,7 @@ export const mutations = {
 
   // Remove the specified product
   remove(state, { product, plugin }) {
-    const existing = state.products.findIndex(p => p.name === product);
+    const existing = state.products.findIndex((p) => p.name === product);
 
     // Remove the product
     if (existing !== -1) {
@@ -1518,10 +1528,13 @@ export const mutations = {
     }
   },
 
-  ignoreGroup(state, match) {
+  ignoreGroup(state, { regexOrString: match, cb }) {
     match = ensureRegex(match);
     // State shouldn't contain actual RegExp objects, because they don't serialize
-    state.groupIgnore.push(regexToString(match));
+    cb ? state.groupIgnore.push({
+      type: regexToString(match),
+      cb
+    }) : state.groupIgnore.push(regexToString(match));
   },
 
   ignoreType(state, match) {
@@ -1628,7 +1641,7 @@ export const mutations = {
   configureType(state, options) {
     const match = regexToString(ensureRegex(options.match));
 
-    const idx = state.typeOptions.findIndex(obj => obj.match === match);
+    const idx = state.typeOptions.findIndex((obj) => obj.match === match);
     let obj = { ...options, match };
 
     if ( idx >= 0 ) {
@@ -1818,11 +1831,17 @@ function ifHave(getters, option) {
     return getters.isMultiCluster;
   }
   case IF_HAVE.NEUVECTOR_NAMESPACE: {
-    return getters[`cluster/all`](NAMESPACE).find(n => n.metadata.name === NEU_VECTOR_NAMESPACE);
+    return getters[`cluster/all`](NAMESPACE).find((n) => n.metadata.name === NEU_VECTOR_NAMESPACE);
   }
   case IF_HAVE.ADMIN: {
     return isAdminUser(getters);
   }
+  case IF_HAVE.MCM_DISABLED: {
+    return !getters['isRancherInHarvester'];
+  }
+  case IF_HAVE.NOT_STANDALONE_HARVESTER: {
+    return !getters['isStandaloneHarvester'];
+  }
   default:
     return false;
   }
@@ -1858,7 +1877,7 @@ function _rowValueGetter(col) {
     if (found && found.length === 2) {
       const fieldIndex = parseInt(found[1], 10);
 
-      return row => row.metadata?.fields?.[fieldIndex];
+      return (row) => row.metadata?.fields?.[fieldIndex];
     }
   }
 
@@ -1878,7 +1897,7 @@ function ifHaveVerb(rootGetters, module, verb, haveIds) {
     const want = verb.toLowerCase();
     const collectionMethods = schema.collectionMethods || [];
     const resourceMethods = schema.resourceMethods || [];
-    const have = [...collectionMethods, ...resourceMethods].map(x => x.toLowerCase());
+    const have = [...collectionMethods, ...resourceMethods].map((x) => x.toLowerCase());
 
     if ( !have.includes(want) && !have.includes(`blocked-${ want }`) ) {
       return false;

package/store/uiplugins.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 // We already have a 'plugins' store, which is for cluster drivers
 // This store is for the instsall UI plugins
 
@@ -43,7 +44,7 @@ export const mutations = {
   },
 
   removePlugin(state: UIPluginState, pluginName: string) {
-    const index = state.plugins.findIndex(p => p.name === pluginName);
+    const index = state.plugins.findIndex((p) => p.name === pluginName);
 
     if (index !== -1) {
       state.plugins.splice(index, 1);

package/store/wm.js

@@ -12,14 +12,15 @@ export const state = function() {
 };
 
 export const getters = {
-  byId: state => (id) => {
-    return state.tabs.find(x => x.id === id);
-  }
+  byId: (state) => (id) => {
+    return state.tabs.find((x) => x.id === id);
+  },
+  allTabs: (state) => state.tabs,
 };
 
 export const mutations = {
   addTab(state, tab) {
-    const existing = state.tabs.find(x => x.id === tab.id);
+    const existing = state.tabs.find((x) => x.id === tab.id);
 
     if ( !existing ) {
       addObject(state.tabs, tab);

package/tsconfig.default.json

@@ -33,4 +33,14 @@
       "./node_modules/@types"
     ],
   },
+  "exclude": [
+    "node_modules",
+    ".nuxt",
+    "dist",
+    "dist-pkg",
+    "shell/creators",
+    "shell/scripts",
+    "script/standalone",
+    "docusaurus"
+  ]
 }

package/tsconfig.json

@@ -4,20 +4,13 @@
     "types": [
       "@types/node",
       "@types/jest",
+      "@nuxt/types",
     ]
   },
   "exclude": [
-    "node_modules",
-    ".nuxt",
-    "dist",
-    "dist-pkg",
-    "cypress",
-    "shell/creators",
-    "shell/scripts",
     "cypress",
     "./cypress.config.ts",
-    "docusaurus",
-    "script/standalone",
+    "**/*.test.ts",
     "**/*.spec.ts"
   ]
 }

package/types/shell/index.d.ts

@@ -1923,7 +1923,7 @@ export default _default;
 // @shell/mixins/create-edit-view
 
 declare module '@shell/mixins/create-edit-view' {
-declare var _default: import("vue/types/vue").ExtendedVue<Vue, {
+declare var _default: import("vue/types/vue").ExtendedVue<Vue<Record<string, any>, Record<string, any>, never, never, (event: string, ...args: any[]) => Vue<Record<string, any>, Record<string, any>, never, never, any>>, {
     errors: any[];
 }, {
     done(): any;
@@ -1949,7 +1949,7 @@ declare var _default: import("vue/types/vue").ExtendedVue<Vue, {
     initialValue: any;
     liveValue: any;
     doneEvent: boolean;
-}>;
+}, {}, any, import("vue/types/v3-component-options").ComponentOptionsMixin>;
 export default _default;
 import Vue from "vue";
 }
@@ -2356,6 +2356,7 @@ export const RKE2: any;
 export const UNSUPPORTED_STORAGE_DRIVERS: any;
 export const FLEET: any;
 export const HARVESTER: any;
+export const HARVESTER_CONTAINER: any;
 export namespace getters {
     function get(state: any, getters: any, rootState: any, rootGetters: any): (name: any) => any;
 }
@@ -2426,7 +2427,7 @@ export default _default;
 // @shell/utils/cluster
 
 declare module '@shell/utils/cluster' {
-export function filterOnlyKubernetesClusters(mgmtClusters: any): any;
+export function filterOnlyKubernetesClusters(mgmtClusters: any, store: any): any;
 export function isHarvesterCluster(mgmtCluster: any): boolean;
 export function isHarvesterSatisfiesVersion(version?: string): any;
 export function filterHiddenLocalCluster(mgmtClusters: any, store: any): any;
@@ -2460,6 +2461,7 @@ export function colorToRgb(color: any): {
     g: number;
     b: number;
 };
+export function normalizeHex(hex: any): any;
 }
 
 // @shell/utils/computed
@@ -2638,7 +2640,7 @@ export function setFavIcon(store: any): void;
 
 declare module '@shell/utils/grafana' {
 export function getClusterPrefix(monitoringVersion: any, clusterId: any): string;
-export function computeDashboardUrl(monitoringVersion: any, embedUrl: any, clusterId: any, params: any): string;
+export function computeDashboardUrl(monitoringVersion: any, embedUrl: any, clusterId: any, params: any, modifyPrefix?: boolean): any;
 export function dashboardExists(monitoringVersion: any, store: any, clusterId: any, embedUrl: any, storeName?: string): Promise<boolean>;
 export function allDashboardsExist(store: any, clusterId: any, embeddedUrls: any, storeName?: string): Promise<boolean>;
 export function queryGrafana(monitoringVersion: any, dispatch: any, clusterId: any, query: any, range: any, step: any): any;
@@ -2844,35 +2846,35 @@ export namespace KEY {
 }
 }
 
-// @shell/utils/poller-sequential
+// @shell/utils/poller
 
-declare module '@shell/utils/poller-sequential' {
-export default class PollerSequential {
+declare module '@shell/utils/poller' {
+export default class Poller {
     constructor(fn: any, pollRateMs: any, maxRetries?: number);
     fn: any;
     pollRateMs: any;
     maxRetries: number;
-    timeoutId: any;
+    intervalId: any;
     tryCount: number;
     start(): void;
     stop(): void;
-    _poll(): void;
     _intervalMethod(): Promise<void>;
 }
 }
 
-// @shell/utils/poller
+// @shell/utils/poller-sequential
 
-declare module '@shell/utils/poller' {
-export default class Poller {
+declare module '@shell/utils/poller-sequential' {
+export default class PollerSequential {
     constructor(fn: any, pollRateMs: any, maxRetries?: number);
     fn: any;
     pollRateMs: any;
     maxRetries: number;
-    intervalId: any;
+    timeoutId: any;
     tryCount: number;
     start(): void;
     stop(): void;
+    _poll(): void;
     _intervalMethod(): Promise<void>;
 }
 }
@@ -3011,6 +3013,7 @@ export default class Socket extends Socket_base {
     disconnectCallBacks: any[];
     disconnectedAt: number;
     closingId: number;
+    autoReconnectUrl: any;
     setUrl(url: any): void;
     connect(metadata?: {}): void;
     send(data: any): boolean;
@@ -3020,6 +3023,10 @@ export default class Socket extends Socket_base {
     getId(): any;
     isConnected(): boolean;
     setAutoReconnect(autoReconnect: any): void;
+    /**
+     * Supply an async fn that will provide a new url to reconnect to
+     */
+    setAutoReconnectUrl(autoReconnectUrl: any): void;
     _close(): void;
     _opened(): void;
     _onmessage(event: any): void;
@@ -3313,6 +3320,7 @@ export function seenReleaseNotes(store: any): boolean;
 export function markSeenReleaseNotes(store: any): Promise<void>;
 export function readReleaseNotes(store: any): boolean;
 export function markReadReleaseNotes(store: any): Promise<void>;
+export function generateSupportLink(version: any): string;
 }
 
 // @shell/utils/width

package/utils/__tests__/version.test.ts

@@ -0,0 +1,28 @@
+import { generateSupportLink } from '@shell/utils/version';
+
+describe('fx: generateSupportLink', () => {
+  it('should generate support link corresponding to the installed Rancher version', () => {
+    const version = 'v2.7.5';
+    const expectation = 'https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/rancher-v2-7-5';
+
+    const result = generateSupportLink(version);
+
+    expect(result).toStrictEqual(expectation);
+  });
+
+  const latestVersionSupportURL = 'https://rancher.com/support-maintenance-terms';
+  const testCases = [
+    ['v2.7-0bcf068e1237acafd4aca01385c7c6b432e22fd7-head', latestVersionSupportURL],
+    ['v2.7.5-rc4', latestVersionSupportURL],
+    [undefined, latestVersionSupportURL],
+  ];
+
+  it.each(testCases)(
+    'should generate support link corresponding to the latest Rancher version when version is unknown or for dev build',
+    (version, expected) => {
+      const result = generateSupportLink(version);
+
+      expect(result).toBe(expected);
+    }
+  );
+});

package/utils/alertmanagerconfig.js

@@ -71,7 +71,7 @@ export async function updateConfig(dispatch, path, type, updateFn) {
   set(config, path, newValue);
 
   const routes = config.route.routes;
-  const rootIndex = routes.findIndex(route => route.name === ROOT_NAME);
+  const rootIndex = routes.findIndex((route) => route.name === ROOT_NAME);
 
   routes.forEach((route) => {
     if (route.name) {
@@ -97,8 +97,8 @@ export async function getAllReceivers(dispatch) {
   try {
     const { config, secret } = await loadConfig(dispatch);
     const receivers = config.receivers || [];
-    const receiversWithName = receivers.filter(receiver => receiver.name);
-    const mapped = receiversWithName.map(receiver => dispatch('cluster/create', {
+    const receiversWithName = receivers.filter((receiver) => receiver.name);
+    const mapped = receiversWithName.map((receiver) => dispatch('cluster/create', {
       id:   receiver.name,
       spec: receiver,
       type: MONITORING.SPOOFED.RECEIVER,
@@ -123,7 +123,7 @@ export async function getAllRoutes(dispatch) {
 
     routes.push(config.route);
 
-    const mapped = routes.map(route => dispatch('cluster/create', {
+    const mapped = routes.map((route) => dispatch('cluster/create', {
       id:   route.name,
       spec: route,
       type: MONITORING.SPOOFED.ROUTE,

package/utils/array.ts

@@ -160,7 +160,7 @@ export function findStringIndex(items: string[], item: string, trim = true): num
 }
 
 export function hasDuplicatedStrings(items: string[], caseSensitive = true): boolean {
-  const normalizedItems = items.map(i => (caseSensitive ? i : i.toLowerCase()).trim());
+  const normalizedItems = items.map((i) => (caseSensitive ? i : i.toLowerCase()).trim());
 
   for (let i = 0; i < items.length; i++) {
     const index = findStringIndex(
@@ -188,14 +188,14 @@ export function uniq<T>(ary: T[]): T[] {
   return out;
 }
 
-export function concatStrings(a: string[], b: string[]) {
-  return [...a.map(aa => b.map(bb => aa.concat(bb)))].reduce((acc, arr) => [...arr, ...acc], []);
+export function concatStrings(a: string[], b: string[]): string[] {
+  return [...a.map((aa) => b.map((bb) => aa.concat(bb)))].reduce((acc, arr) => [...arr, ...acc], []);
 }
 
 interface KubeResource { metadata: { labels: { [name: string]: string} } } // Migrate to central kube types resource when those are brought in
 export function getUniqueLabelKeys<T extends KubeResource>(aryResources: T[]): string[] {
   const uniqueObj = aryResources.reduce((res, r) => {
-    Object.keys(r.metadata.labels).forEach(l => (res[l] = true));
+    Object.keys(r.metadata.labels).forEach((l) => (res[l] = true));
 
     return res;
   }, {} as {[label: string]: boolean});

package/utils/async.ts

@@ -1,4 +1,4 @@
-export const waitFor = (testFn: Function, msg = '', timeoutMs = 3000000, intervalMs = 500, log = false) => {
+export const waitFor = (testFn: Function, msg = '', timeoutMs = 3000000, intervalMs = 500, log = false): Promise<unknown> => {
   gatedLog('Starting wait for', msg);
 
   return new Promise((resolve, reject) => {

package/utils/auth.js

@@ -63,10 +63,10 @@ export function returnTo(opt, vm) {
  */
 export const authProvidersInfo = async(store) => {
   const rows = await store.dispatch(`management/findAll`, { type: MANAGEMENT.AUTH_CONFIG });
-  const nonLocal = rows.filter(x => x.name !== 'local');
+  const nonLocal = rows.filter((x) => x.name !== 'local');
   // Generic OIDC is returned via API but not supported (and will be removed or fixed in future)
-  const supportedNonLocal = nonLocal.filter(x => x.id !== 'oidc');
-  const enabled = nonLocal.filter(x => x.enabled === true );
+  const supportedNonLocal = nonLocal.filter((x) => x.id !== 'oidc');
+  const enabled = nonLocal.filter((x) => x.enabled === true );
 
   const enabledLocation = enabled.length === 1 ? {
     name:   'c-cluster-auth-config-id',

package/utils/axios.js

@@ -23,16 +23,16 @@ const axiosExtra = {
     this.setHeader('Authorization', value, scopes);
   },
   onRequest(fn) {
-    this.interceptors.request.use(config => fn(config) || config);
+    this.interceptors.request.use((config) => fn(config) || config);
   },
   onResponse(fn) {
-    this.interceptors.response.use(response => fn(response) || response);
+    this.interceptors.response.use((response) => fn(response) || response);
   },
   onRequestError(fn) {
-    this.interceptors.request.use(undefined, error => fn(error) || Promise.reject(error));
+    this.interceptors.request.use(undefined, (error) => fn(error) || Promise.reject(error));
   },
   onResponseError(fn) {
-    this.interceptors.response.use(undefined, error => fn(error) || Promise.reject(error));
+    this.interceptors.response.use(undefined, (error) => fn(error) || Promise.reject(error));
   },
   onError(fn) {
     this.onRequestError(fn);
@@ -46,7 +46,7 @@ const axiosExtra = {
 // Request helpers ($get, $post, ...)
 for (const method of ['request', 'delete', 'get', 'head', 'options', 'post', 'put', 'patch']) {
   axiosExtra[`$${ method }`] = function() {
-    return this[method].apply(this, arguments).then(res => res && res.data);
+    return this[method].apply(this, arguments).then((res) => res && res.data);
   };
 }
 

package/utils/cluster.js

@@ -4,10 +4,11 @@ import { MANAGEMENT, VIRTUAL_HARVESTER_PROVIDER } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
 
 // Filter out any clusters that are not Kubernetes Clusters
-// Currently this removes Harvester clusters
-export function filterOnlyKubernetesClusters(mgmtClusters) {
+export function filterOnlyKubernetesClusters(mgmtClusters, store) {
+  const openHarvesterContainerWorkload = store.getters['features/get']('harvester-baremetal-container-workload');
+
   return mgmtClusters.filter((c) => {
-    return !c.isHarvester;
+    return openHarvesterContainerWorkload ? true : !c.isHarvester;
   });
 }