@rancher/shell 3.0.7 → 3.0.8-rc.10

package/components/templates/home.vue

@@ -12,6 +12,8 @@ import BrowserTabVisibility from '@shell/mixins/browser-tab-visibility';
 import Inactivity from '@shell/components/Inactivity';
 import { mapState, mapGetters } from 'vuex';
 import PromptModal from '@shell/components/PromptModal';
+import WindowManager from '@shell/components/nav/WindowManager';
+import { Layout } from '@shell/types/window-manager';
 
 export default {
 
@@ -24,16 +26,18 @@ export default {
     AzureWarning,
     AwsComplianceBanner,
     Inactivity,
-    PromptModal
+    PromptModal,
+    WindowManager
   },
 
   mixins: [Brand, BrowserTabVisibility],
 
   data() {
     return {
+      layout:           Layout.home,
       // Assume home pages have routes where the name is the key to use for string lookup
       name:             this.$route.name,
-      noLocaleShortcut: process.env.dev || false
+      noLocaleShortcut: process.env.dev || false,
     };
   },
 
@@ -81,6 +85,7 @@ export default {
           class="outlet"
         />
       </main>
+      <WindowManager :layout="layout" />
     </div>
     <FixedBanner :footer="true" />
     <GrowlManager />
@@ -112,10 +117,10 @@ export default {
     flex-grow:1;
 
     grid-template-areas:
-      "header"
-      "main";
+      "header header header"
+      "wm-vl  main    wm-vr";
 
-    grid-template-columns: auto;
+    grid-template-columns: var(--wm-vl-width, 0px) auto var(--wm-vr-width, 0px);
     grid-template-rows:    var(--header-height) auto;
 
     > HEADER {
@@ -123,6 +128,27 @@ export default {
     }
   }
 
+  .wm {
+    grid-area: wm;
+    overflow-y: hidden;
+    z-index: z-index('windowsManager');
+    position: relative;
+  }
+
+  .wm-vr {
+    grid-area: wm-vr;
+    overflow-y: hidden;
+    z-index: z-index('windowsManager');
+    position: relative;
+  }
+
+  .wm-vl {
+    grid-area: wm-vl;
+    overflow-y: hidden;
+    z-index: z-index('windowsManager');
+    position: relative;
+  }
+
   MAIN {
     grid-area: main;
     overflow: auto;

package/components/templates/plain.vue

@@ -15,6 +15,8 @@ import BrowserTabVisibility from '@shell/mixins/browser-tab-visibility';
 import Inactivity from '@shell/components/Inactivity';
 import { mapGetters } from 'vuex';
 import PromptModal from '@shell/components/PromptModal';
+import WindowManager from '@shell/components/nav/WindowManager';
+import { Layout } from '@shell/types/window-manager';
 
 export default {
 
@@ -30,7 +32,8 @@ export default {
     SlideInPanelManager,
     AwsComplianceBanner,
     AzureWarning,
-    Inactivity
+    Inactivity,
+    WindowManager
   },
 
   mixins: [Brand, BrowserTabVisibility],
@@ -40,6 +43,7 @@ export default {
       // Assume home pages have routes where the name is the key to use for string lookup
       name:             this.$route.name,
       noLocaleShortcut: process.env.dev || false,
+      layout:           Layout.plain,
     };
   },
 
@@ -97,6 +101,7 @@ export default {
           @shortkey="toggleNoneLocale()"
         />
       </main>
+      <WindowManager :layout="layout" />
     </div>
 
     <FixedBanner :footer="true" />
@@ -117,10 +122,10 @@ export default {
     flex-grow: 1;
 
     grid-template-areas:
-      "header"
-      "main";
+      "header header header"
+      "wm-vl  main   wm-vr";
 
-    grid-template-columns: auto;
+    grid-template-columns: var(--wm-vl-width, 0px) auto var(--wm-vr-width, 0px);
     grid-template-rows:    var(--header-height) auto;
 
     > HEADER {
@@ -128,6 +133,27 @@ export default {
     }
   }
 
+  .wm {
+    grid-area: wm;
+    overflow-y: hidden;
+    z-index: z-index('windowsManager');
+    position: relative;
+  }
+
+  .wm-vr {
+    grid-area: wm-vr;
+    overflow-y: hidden;
+    z-index: z-index('windowsManager');
+    position: relative;
+  }
+
+  .wm-vl {
+    grid-area: wm-vl;
+    overflow-y: hidden;
+    z-index: z-index('windowsManager');
+    position: relative;
+  }
+
   MAIN {
     grid-area: main;
     overflow: auto;

package/components/templates/standalone.vue

@@ -3,7 +3,7 @@
 </template>
 
 <style lang="scss">
-body, #__nuxt, #__layout {
+body, #__root, #__layout {
   height: 100%;
 }
 </style>

package/composables/useI18n.ts

@@ -11,7 +11,16 @@ let store: Store<any> | null = null;
  * @returns A translated string or the raw value if the raw parameter is set to true.
  */
 const t = (key: string, args?: unknown, raw?: boolean): string => {
-  return stringFor(store, key, args, raw);
+  if (!store) {
+    if (!!process.env.dev) {
+      // eslint-disable-next-line no-console
+      console.warn('useI18n: store not available');
+    }
+
+    return key;
+  }
+
+  return stringFor(store, key, args as any, raw);
 };
 
 export type I18n = { t: typeof t };

package/composables/useInterval.ts

@@ -0,0 +1,15 @@
+import { onBeforeUnmount, onMounted, ref } from 'vue';
+
+export const useInterval = (fn: Function, delay: number) => {
+  const interval = ref<any>(null);
+
+  onMounted(() => {
+    interval.value = setInterval(fn, delay);
+  });
+
+  onBeforeUnmount(() => {
+    if (interval.value) {
+      clearInterval(interval.value);
+    }
+  });
+};

package/config/__test__/uiplugins.test.ts

@@ -0,0 +1,309 @@
+import {
+  UI_PLUGIN_ANNOTATION,
+  UI_PLUGIN_CHART_ANNOTATIONS,
+  EXTENSIONS_INCOMPATIBILITY_TYPES,
+  isUIPlugin,
+  uiPluginHasAnnotation,
+  parseRancherVersion,
+  // shouldNotLoadPlugin, this is required per test so that we can mock semver.coerce
+  isSupportedChartVersion,
+  isChartVersionHigher
+} from '@shell/config/uiplugins';
+
+import * as VersionModule from '@shell/config/version';
+
+let semver;
+let originalCoerce: any;
+const MOCK_API_VERSION = '33.33.33';
+
+describe('uiPlugins Config methods', () => {
+  describe('fx: isUIPlugin', () => {
+    const pluginChart = { versions: [{ annotations: { [UI_PLUGIN_ANNOTATION.NAME]: UI_PLUGIN_ANNOTATION.VALUE } }, { annotations: {} }] };
+
+    it('should return true if any version has the UI plugin annotation', () => {
+      expect(isUIPlugin(pluginChart)).toBe(true);
+    });
+    it('should return false if chart is null/undefined', () => {
+      expect(isUIPlugin(null)).toBe(false);
+    });
+  });
+
+  describe('fx: uiPluginHasAnnotation', () => {
+    const version1 = { annotations: { [UI_PLUGIN_ANNOTATION.NAME]: UI_PLUGIN_ANNOTATION.VALUE } };
+    const chart = { versions: [version1] };
+
+    it('should return true if it finds version with annotation and its corresponding value', () => {
+      expect(uiPluginHasAnnotation(chart, UI_PLUGIN_ANNOTATION.NAME, UI_PLUGIN_ANNOTATION.VALUE)).toBe(true);
+    });
+    it('should return false if chart has no version with a given pair of annotation/value', () => {
+      expect(uiPluginHasAnnotation(chart, 'bananas', UI_PLUGIN_ANNOTATION.VALUE)).toBe(false);
+    });
+  });
+
+  describe('fx: parseRancherVersion', () => {
+    it('should handle standard version strings', () => {
+      expect(parseRancherVersion('v2.8.1')).toBe('2.8.1');
+    });
+    it('should apply .999 patch for RC versions', () => {
+      expect(parseRancherVersion('v2.8.1-rc1')).toBe('2.8.999');
+    });
+    it('should apply .999 patch for "head" versions', () => {
+      expect(parseRancherVersion('2.8.0-head')).toBe('2.8.999');
+    });
+  });
+
+  const PLUGIN_NAME = 'test-plugin';
+
+  const basePluginResource = {
+    name:     PLUGIN_NAME,
+    version:  '1.0.0',
+    endpoint: '/some/path',
+    metadata: { [UI_PLUGIN_CHART_ANNOTATIONS.EXTENSIONS_VERSION]: '>=1.0.0' }
+  };
+  const compatibleEnv = {
+    rancherVersion: '2.7.5',
+    kubeVersion:    'v1.25.10',
+  };
+
+  describe('fx: shouldNotLoadPlugin', () => {
+    beforeEach(() => {
+      jest.resetModules();
+      process.env.UI_EXTENSIONS_API_VERSION = MOCK_API_VERSION;
+
+      semver = require('semver');
+      originalCoerce = semver.coerce;
+
+      jest.spyOn(semver, 'coerce').mockImplementation((v) => {
+        if (v === MOCK_API_VERSION) {
+          return { version: '3.0.0' };
+        }
+
+        // Use the original for all other inputs (Rancher, Kube)
+        return originalCoerce(v);
+      });
+    });
+
+    afterEach(() => {
+      jest.restoreAllMocks();
+    });
+
+    it('should return false when compatible', () => {
+      const { shouldNotLoadPlugin } = require('./../uiplugins');
+
+      expect(shouldNotLoadPlugin(basePluginResource, compatibleEnv, [])).toBe(false);
+    });
+
+    it('should return "plugins.error.api" if Extensions API version is incompatible', () => {
+      const { shouldNotLoadPlugin } = require('./../uiplugins');
+
+      const incompatibleApiPlugin = {
+        ...basePluginResource,
+        metadata: { [UI_PLUGIN_CHART_ANNOTATIONS.EXTENSIONS_VERSION]: '>=4.0.0' }
+      };
+
+      expect(shouldNotLoadPlugin(incompatibleApiPlugin, compatibleEnv, [])).toBe('plugins.error.api');
+    });
+
+    it('should return "plugins.error.primeOnly" if extension is Prime-only and Rancher is not Prime', () => {
+      const { shouldNotLoadPlugin } = require('./../uiplugins');
+
+      jest.spyOn(VersionModule, 'isRancherPrime').mockReturnValue(false);
+
+      const incompatibleApiPlugin = {
+        ...basePluginResource,
+        metadata: {
+          [UI_PLUGIN_CHART_ANNOTATIONS.EXTENSIONS_VERSION]: '>=1.0.0',
+          [UI_PLUGIN_CHART_ANNOTATIONS.PRIME_ONLY]:         'true'
+        }
+      };
+
+      expect(shouldNotLoadPlugin(incompatibleApiPlugin, compatibleEnv, [])).toBe('plugins.error.primeOnly');
+    });
+
+    it('should return "plugins.error.host" if HOST application value is incompatible', () => {
+      const { shouldNotLoadPlugin } = require('./../uiplugins');
+
+      const incompatibleApiPlugin = {
+        ...basePluginResource,
+        metadata: {
+          [UI_PLUGIN_CHART_ANNOTATIONS.EXTENSIONS_VERSION]: '>=1.0.0',
+          [UI_PLUGIN_CHART_ANNOTATIONS.EXTENSIONS_HOST]:    'rancher-dummy-host'
+        }
+      };
+
+      expect(shouldNotLoadPlugin(incompatibleApiPlugin, compatibleEnv, [])).toBe('plugins.error.host');
+    });
+
+    it('should return "plugins.error.kubeVersion" if incompatible', () => {
+      const { shouldNotLoadPlugin } = require('./../uiplugins');
+
+      const incompatibleApiPlugin = {
+        ...basePluginResource,
+        metadata: {
+          [UI_PLUGIN_CHART_ANNOTATIONS.EXTENSIONS_VERSION]: '>=1.0.0',
+          [UI_PLUGIN_CHART_ANNOTATIONS.KUBE_VERSION]:       '>= 2.0.0'
+        }
+      };
+
+      expect(shouldNotLoadPlugin(incompatibleApiPlugin, compatibleEnv, [])).toBe('plugins.error.kubeVersion');
+    });
+
+    it('should return "plugins.error.version" if incompatible', () => {
+      const { shouldNotLoadPlugin } = require('./../uiplugins');
+
+      const incompatibleApiPlugin = {
+        ...basePluginResource,
+        metadata: {
+          [UI_PLUGIN_CHART_ANNOTATIONS.EXTENSIONS_VERSION]: '>=1.0.0',
+          [UI_PLUGIN_CHART_ANNOTATIONS.RANCHER_VERSION]:    '>= 3.0.0'
+        }
+      };
+
+      expect(shouldNotLoadPlugin(incompatibleApiPlugin, compatibleEnv, [])).toBe('plugins.error.version');
+    });
+
+    it('should return "plugins.error.developerPkg" if a builtin extension with the same name was loaded first', () => {
+      const { shouldNotLoadPlugin } = require('./../uiplugins');
+
+      const incompatibleApiPlugin = {
+        ...basePluginResource,
+        metadata: { [UI_PLUGIN_CHART_ANNOTATIONS.EXTENSIONS_VERSION]: '>=1.0.0' }
+      };
+
+      expect(shouldNotLoadPlugin(incompatibleApiPlugin, compatibleEnv, [{ name: PLUGIN_NAME, builtin: true }])).toBe('plugins.error.developerPkg');
+    });
+  });
+
+  describe('fx: isSupportedChartVersion', () => {
+    beforeEach(() => {
+      jest.resetModules();
+      process.env.UI_EXTENSIONS_API_VERSION = MOCK_API_VERSION;
+
+      semver = require('semver');
+      originalCoerce = semver.coerce;
+
+      jest.spyOn(semver, 'coerce').mockImplementation((v) => {
+        if (v === MOCK_API_VERSION) {
+          return { version: '3.0.0' };
+        }
+
+        // Use the original for all other inputs (Rancher, Kube)
+        return originalCoerce(v);
+      });
+    });
+
+    afterEach(() => {
+      jest.restoreAllMocks();
+    });
+
+    const versionData = {
+      rancherVersion: 'v2.7.5',
+      kubeVersion:    'v1.25.10',
+      version:        '1.0.0'
+    };
+
+    it('should return "isVersionCompatible" true when compatible', () => {
+      const { isSupportedChartVersion } = require('./../uiplugins');
+
+      const annotations = {
+        [UI_PLUGIN_CHART_ANNOTATIONS.KUBE_VERSION]:       '>=1.0.0',
+        [UI_PLUGIN_CHART_ANNOTATIONS.RANCHER_VERSION]:    '>=2.0.0',
+        [UI_PLUGIN_CHART_ANNOTATIONS.EXTENSIONS_VERSION]: '>=2.0.0'
+      };
+      const data = { ...versionData, version: { annotations } };
+      const result = isSupportedChartVersion(data, true);
+
+      expect(result.isVersionCompatible).toBe(true);
+      expect(result.versionIncompatibilityData).toStrictEqual({});
+    });
+
+    it('should return incompatibility object for kube version mismatch', () => {
+      const annotations = { [UI_PLUGIN_CHART_ANNOTATIONS.KUBE_VERSION]: '>=2.0.0' };
+      const data = { ...versionData, version: { annotations } };
+      const result = isSupportedChartVersion(data, true);
+
+      expect(result.isVersionCompatible).toBe(false);
+      expect(result.versionIncompatibilityData.type).toBe(EXTENSIONS_INCOMPATIBILITY_TYPES.KUBE);
+      expect(result.versionIncompatibilityData.required).toBe('>=2.0.0');
+    });
+
+    it('should return incompatibility object for Rancher version mismatch', () => {
+      const annotations = { [UI_PLUGIN_CHART_ANNOTATIONS.RANCHER_VERSION]: '>=3.0.0' };
+      const data = { ...versionData, version: { annotations } };
+      const result = isSupportedChartVersion(data, true);
+
+      expect(result.isVersionCompatible).toBe(false);
+      expect(result.versionIncompatibilityData.type).toBe(EXTENSIONS_INCOMPATIBILITY_TYPES.UI);
+      expect(result.versionIncompatibilityData.required).toBe('>=3.0.0');
+    });
+
+    it('should return incompatibility object for UI version mismatch', () => {
+      const annotations = { [UI_PLUGIN_CHART_ANNOTATIONS.UI_VERSION]: '>=3.0.0' };
+      const data = { ...versionData, version: { annotations } };
+      const result = isSupportedChartVersion(data, true);
+
+      expect(result.isVersionCompatible).toBe(false);
+      expect(result.versionIncompatibilityData.type).toBe(EXTENSIONS_INCOMPATIBILITY_TYPES.UI);
+      expect(result.versionIncompatibilityData.required).toBe('>=3.0.0');
+    });
+
+    it('should return incompatibility object for extensions api missing', () => {
+      const annotations = {};
+      const data = { ...versionData, version: { annotations } };
+      const result = isSupportedChartVersion(data, true);
+
+      expect(result.isVersionCompatible).toBe(false);
+      expect(result.versionIncompatibilityData.type).toBe(EXTENSIONS_INCOMPATIBILITY_TYPES.EXTENSIONS_API_MISSING);
+      expect(result.versionIncompatibilityData.required).toBeUndefined();
+    });
+
+    it('should return incompatibility object for extensions API version mismatch', () => {
+      const { isSupportedChartVersion } = require('./../uiplugins');
+
+      const annotations = { [UI_PLUGIN_CHART_ANNOTATIONS.EXTENSIONS_VERSION]: '>=4.0.0' };
+      const data = { ...versionData, version: { annotations } };
+      const result = isSupportedChartVersion(data, true);
+
+      expect(result.isVersionCompatible).toBe(false);
+      expect(result.versionIncompatibilityData.type).toBe(EXTENSIONS_INCOMPATIBILITY_TYPES.EXTENSIONS_API);
+      expect(result.versionIncompatibilityData.required).toBe('>=4.0.0');
+    });
+
+    it('should return incompatibility object for HOST_APP mismatch', () => {
+      const { isSupportedChartVersion } = require('./../uiplugins');
+
+      const annotations = { [UI_PLUGIN_CHART_ANNOTATIONS.EXTENSIONS_VERSION]: '>=1.0.0 < 5.0.0', [UI_PLUGIN_CHART_ANNOTATIONS.EXTENSIONS_HOST]: 'rancher-dummy-host' };
+      const data = { ...versionData, version: { annotations } };
+      const result = isSupportedChartVersion(data, true);
+
+      expect(result.isVersionCompatible).toBe(false);
+      expect(result.versionIncompatibilityData.type).toBe(EXTENSIONS_INCOMPATIBILITY_TYPES.HOST);
+      expect(result.versionIncompatibilityData.required).toBe('rancher-dummy-host');
+    });
+
+    it('should return incompatibility object for Prime only extension running in non-prime env', () => {
+      const { isSupportedChartVersion } = require('./../uiplugins');
+
+      jest.spyOn(VersionModule, 'isRancherPrime').mockReturnValue(false);
+
+      const annotations = { [UI_PLUGIN_CHART_ANNOTATIONS.EXTENSIONS_VERSION]: '>=1.0.0 < 5.0.0', [UI_PLUGIN_CHART_ANNOTATIONS.PRIME_ONLY]: 'true' };
+      const data = { ...versionData, version: { annotations } };
+      const result = isSupportedChartVersion(data, true);
+
+      expect(result.isVersionCompatible).toBe(false);
+      expect(result.versionIncompatibilityData.type).toBe(EXTENSIONS_INCOMPATIBILITY_TYPES.PRIME_ONLY);
+      expect(result.versionIncompatibilityData.required).toBe(true);
+    });
+  });
+
+  describe('fx: isChartVersionHigher', () => {
+    // Tests now rely on the actual semver.gt implementation
+    it('should return true when version A is higher', () => {
+      expect(isChartVersionHigher('2.1.0', '2.0.0')).toBe(true);
+    });
+    it('should return false when version A is lower or equal', () => {
+      expect(isChartVersionHigher('2.0.0', '2.1.0')).toBe(false);
+      expect(isChartVersionHigher('2.0.0', '2.0.0')).toBe(false);
+    });
+  });
+});

package/config/labels-annotations.js

@@ -69,7 +69,14 @@ export const CAPI = {
   /**
    * Annotation for overriding the cluster provider,
    */
-  UI_CUSTOM_PROVIDER:   'ui.rancher/provider'
+  UI_CUSTOM_PROVIDER:   'ui.rancher/provider',
+
+  /**
+   * Annotations for autoscaler
+   */
+  AUTOSCALER_CLUSTER_PAUSE:         'provisioning.cattle.io/cluster-autoscaler-paused',
+  AUTOSCALER_MACHINE_POOL_MIN_SIZE: 'cluster.x-k8s.io/cluster-api-autoscaler-node-group-min-size',
+  AUTOSCALER_MACHINE_POOL_MAX_SIZE: 'cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size'
 };
 
 export const CATALOG = {
@@ -78,6 +85,7 @@ export const CATALOG = {
   _PARTNER:  'partner',
   _OTHER:    'other',
 
+  PRIME_ONLY:   'catalog.cattle.io/prime-only',
   EXPERIMENTAL: 'catalog.cattle.io/experimental',
   NAMESPACE:    'catalog.cattle.io/namespace',
   RELEASE_NAME: 'catalog.cattle.io/release-name',

package/config/product/auth.js

@@ -177,6 +177,7 @@ export function init(store) {
   });
 
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/github`, 'auth/github');
+  componentForType(`${ MANAGEMENT.AUTH_CONFIG }/githubapp`, 'auth/github');
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/openldap`, 'auth/ldap/index');
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/freeipa`, 'auth/ldap/index');
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/activedirectory`, 'auth/ldap/index');

package/config/product/explorer.js

@@ -180,7 +180,8 @@ export function init(store) {
   mapGroup(/^(.*\.)?(scc)\.cattle\.io$/, 'SCC');
 
   const dePaginateBindings = configureConditionalDepaginate({ maxResourceCount: 5000 });
-  const dePaginateNormanBindings = configureConditionalDepaginate({ maxResourceCount: 5000, isNorman: true }) ;
+  const dePaginateNormanBindings = configureConditionalDepaginate({ maxResourceCount: 5000, isNorman: true });
+  const dePaginateNormanUsers = configureConditionalDepaginate({ maxResourceCount: 5000, isNorman: true });
 
   configureType(NODE, { isCreatable: false, isEditable: true });
   configureType(WORKLOAD_TYPES.JOB, { isEditable: false, match: WORKLOAD_TYPES.JOB });
@@ -189,6 +190,7 @@ export function init(store) {
   configureType(MANAGEMENT.PROJECT, { displayName: store.getters['i18n/t']('namespace.project.label') });
   configureType(NORMAN.CLUSTER_ROLE_TEMPLATE_BINDING, { depaginate: dePaginateNormanBindings });
   configureType(NORMAN.PROJECT_ROLE_TEMPLATE_BINDING, { depaginate: dePaginateNormanBindings });
+  configureType(NORMAN.USER, { depaginate: dePaginateNormanUsers });
   configureType(SNAPSHOT, { depaginate: true });
 
   configureType(SECRET, { showListMasthead: false });

package/config/product/manager.js

@@ -6,12 +6,12 @@ import {
   HCI,
   MANAGEMENT,
   SNAPSHOT,
-  VIRTUAL_TYPES
+  VIRTUAL_TYPES,
+  HOSTED_PROVIDER
 } from '@shell/config/types';
 import { MULTI_CLUSTER } from '@shell/store/features';
 import { DSL } from '@shell/store/type-map';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
-
 export const NAME = 'manager';
 
 export function init(store) {
@@ -63,7 +63,7 @@ export function init(store) {
   basicType([
     CAPI.RANCHER_CLUSTER,
     'cloud-credentials',
-    'drivers',
+    'providers',
   ]);
 
   configureType(SNAPSHOT, { depaginate: true });
@@ -73,12 +73,22 @@ export function init(store) {
   });
   weightType(CAPI.RANCHER_CLUSTER, 100, true);
   weightType('cloud-credentials', 99, true);
-  weightType('drivers', 98, true);
+  weightType('providers', 98, true);
   weightType(CATALOG.CLUSTER_REPO, 97, true);
+  virtualType({
+    labelKey:   'providers.hosted.title',
+    name:       HOSTED_PROVIDER,
+    group:      'Root',
+    weight:     1,
+    namespaced: false,
+    icon:       'globe',
+    route:      { name: 'c-cluster-manager-hostedprovider' },
+    exact:      true
+  });
 
   virtualType({
     labelKey:   'drivers.kontainer.title',
-    name:       'rke-kontainer-drivers',
+    name:       'rke-kontainer-providers',
     group:      'Root',
     namespaced: false,
     icon:       'globe',
@@ -87,7 +97,7 @@ export function init(store) {
   });
   virtualType({
     labelKey:   'drivers.node.title',
-    name:       'rke-node-drivers',
+    name:       'rke-node-providers',
     group:      'Root',
     namespaced: false,
     icon:       'globe',
@@ -107,9 +117,10 @@ export function init(store) {
   });
 
   basicType([
-    'rke-kontainer-drivers',
-    'rke-node-drivers',
-  ], 'drivers');
+    HOSTED_PROVIDER,
+    'rke-kontainer-providers',
+    'rke-node-providers',
+  ], 'providers');
 
   weightType(CAPI.MACHINE_DEPLOYMENT, 4, true);
   weightType(CAPI.MACHINE_SET, 3, true);

package/config/query-params.js

@@ -8,6 +8,7 @@ export const STEP = 'step';
 export const LOGGED_OUT = 'logged-out';
 export const IS_SSO = 'is-sso';
 export const IS_SLO = 'is-slo';
+export const IS_SESSION_IDLE = 'is-session-idle';
 export const UPGRADED = 'upgraded';
 export const TIMED_OUT = 'timed-out';
 export const AUTH_TEST = 'test';

package/config/router/routes.js

@@ -81,9 +81,13 @@ export default [
       {
         path:      '/c/:cluster/uiplugins',
         name:      'c-cluster-uiplugins',
-        component: () => interopDefault(import('@shell/pages/c/_cluster/uiplugins/index.vue')),
+        component: () => interopDefault(import('@shell/pages/c/_cluster/uiplugins/index.vue'))
+      },
+      {
+        path:      '/c/:cluster/uiplugins/catalogs',
+        component: () => interopDefault(import('@shell/pages/c/_cluster/uiplugins/catalogs.vue')),
+        name:      'c-cluster-uiplugins-catalogs'
       },
-
       {
         path:      '/diagnostic',
         component: () => interopDefault(import('@shell/pages/diagnostic.vue')),
@@ -363,6 +367,10 @@ export default [
         path:      '/c/:cluster/manager/nodeDriver',
         component: () => interopDefault(import('@shell/pages/c/_cluster/manager/drivers/nodeDriver/index.vue')),
         name:      'c-cluster-manager-driver-nodedriver'
+      }, {
+        path:      '/c/:cluster/manager/hostedprovider',
+        component: () => interopDefault(import('@shell/pages/c/_cluster/manager/hostedprovider/index.vue')),
+        name:      'c-cluster-manager-hostedprovider'
       }, {
         path:      '/c/:cluster/monitoring/alertmanagerconfig',
         component: () => interopDefault(import('@shell/pages/c/_cluster/monitoring/alertmanagerconfig/index.vue')),