PageRegistration refactoring #1258 -- part 1

Signed-off-by: Roman <ixrock@gmail.com>

extensions/support-page/renderer.tsx

@@ -4,16 +4,16 @@ import { supportPageRoute, supportPageURL } from "./src/support.route";
 import { Support } from "./src/support";
 
 export default class SupportPageRendererExtension extends LensRendererExtension {
-  globalPages = [
+  // globalPages = [
-    {
+  //   {
-      ...supportPageRoute,
+  //     ...supportPageRoute,
-      url: supportPageURL(),
+  //     url: supportPageURL(),
-      hideInMenu: true,
+  //     hideInMenu: true,
-      components: {
+  //     components: {
-        Page: Support,
+  //       Page: Support,
-      }
+  //     }
-    }
+  //   }
-  ]
+  // ]
 
   statusBarItems = [
     {

src/extensions/dynamic-page.tsx

@@ -1,15 +0,0 @@
-import React from "react";
-import { cssNames } from "../renderer/utils";
-import { TabLayout } from "../renderer/components/layout/tab-layout";
-import { PageRegistration } from "./registries/page-registry"
-
-export class DynamicPage extends React.Component<{ page: PageRegistration }> {
-  render() {
-    const { className, components: { Page }, subPages = [] } = this.props.page;
-    return (
-      <TabLayout className={cssNames("ExtensionPage", className)} tabs={subPages}>
-        <Page/>
-      </TabLayout>
-    )
-  }
-}

src/extensions/extension-loader.ts

@@ -65,6 +65,7 @@ export class ExtensionLoader {
     logger.info('[EXTENSIONS-LOADER]: load on main renderer (cluster manager)')
     this.autoInitExtensions((extension: LensRendererExtension) => [
       registries.globalPageRegistry.add(...extension.globalPages),
+      registries.globalPageMenuRegistry.add(...extension.globalPageMenus),
       registries.appPreferenceRegistry.add(...extension.appPreferences),
       registries.clusterFeatureRegistry.add(...extension.clusterFeatures),
       registries.statusBarRegistry.add(...extension.statusBarItems),
@@ -75,6 +76,7 @@ export class ExtensionLoader {
     logger.info('[EXTENSIONS-LOADER]: load on cluster renderer (dashboard)')
     this.autoInitExtensions((extension: LensRendererExtension) => [
       registries.clusterPageRegistry.add(...extension.clusterPages),
+      registries.clusterPageMenuRegistry.add(...extension.clusterPageMenus),
       registries.kubeObjectMenuRegistry.add(...extension.kubeObjectMenuItems),
       registries.kubeObjectDetailRegistry.add(...extension.kubeObjectDetailItems),
     ]);

src/extensions/lens-renderer-extension.ts

@@ -1,14 +1,16 @@
 import type {
   AppPreferenceRegistration, ClusterFeatureRegistration,
-  KubeObjectMenuRegistration, KubeObjectDetailRegistration,
+  KubeObjectMenuRegistration, KubeObjectDetailRegistration, StatusBarRegistration,
-  PageRegistration, StatusBarRegistration
+  PageRegistration, PageMenuRegistration, PageRegistrationCluster, PageMenuRegistrationCluster,
 } from "./registries"
 import { observable } from "mobx";
 import { LensExtension } from "./lens-extension"
 
 export class LensRendererExtension extends LensExtension {
   @observable.shallow globalPages: PageRegistration[] = []
-  @observable.shallow clusterPages: PageRegistration[] = []
+  @observable.shallow clusterPages: PageRegistrationCluster[] = []
+  @observable.shallow globalPageMenus: PageMenuRegistration[] = []
+  @observable.shallow clusterPageMenus: PageMenuRegistrationCluster[] = []
   @observable.shallow appPreferences: AppPreferenceRegistration[] = []
   @observable.shallow clusterFeatures: ClusterFeatureRegistration[] = []
   @observable.shallow statusBarItems: StatusBarRegistration[] = []

src/extensions/registries/cluster-feature-registry.ts

@@ -1,3 +1,4 @@
+import type React from "react"
 import { BaseRegistry } from "./base-registry";
 import { ClusterFeature } from "../cluster-feature";
 

src/extensions/registries/index.ts

@@ -1,6 +1,7 @@
 // All registries managed by extensions api
 
 export * from "./page-registry"
+export * from "./page-menu-registry"
 export * from "./menu-registry"
 export * from "./app-preference-registry"
 export * from "./status-bar-registry"

src/extensions/registries/page-menu-registry.ts

@@ -0,0 +1,25 @@
+// Extensions-api -> Register page menu items
+
+import type React from "react";
+import type { IconProps } from "../../renderer/components/icon";
+import { BaseRegistry } from "./base-registry";
+
+export interface PageMenuRegistration {
+  url: string;
+  title: React.ReactNode;
+  components: PageMenuComponents;
+}
+
+export interface PageMenuRegistrationCluster extends PageMenuRegistration {
+  subMenus?: Omit<PageMenuRegistration, "components" | "subMenus">[];
+}
+
+export interface PageMenuComponents {
+  Icon: React.ComponentType<IconProps>;
+}
+
+export class PageMenuRegistry<T extends PageMenuRegistration> extends BaseRegistry<T> {
+}
+
+export const globalPageMenuRegistry = new PageMenuRegistry<PageMenuRegistration>();
+export const clusterPageMenuRegistry = new PageMenuRegistry<PageMenuRegistrationCluster>();

src/extensions/registries/page-registry.ts

@@ -1,31 +1,29 @@
 // Extensions-api -> Custom page registration
 
 import type React from "react";
-import type { RouteProps } from "react-router";
-import type { IconProps } from "../../renderer/components/icon";
-import type { IClassName } from "../../renderer/utils";
-import type { TabRoute } from "../../renderer/components/layout/tab-layout";
 import { BaseRegistry } from "./base-registry";
 
-export interface PageRegistration extends RouteProps {
+export interface PageRegistration {
-  className?: IClassName;
+  routePath: string; // react-router's path, e.g. "/page/:id"
-  url?: string; // initial url to be used for building menus and tabs, otherwise "path" applied by default
+  exact?: boolean; // route matching flag, see: https://reactrouter.com/web/api/NavLink/exact-bool
-  title?: React.ReactNode; // used in sidebar's & tabs-layout if provided
-  hideInMenu?: boolean; // hide element within app's navigation menu
-  subPages?: (PageRegistration & TabRoute)[];
   components: PageComponents;
 }
 
+export interface PageRegistrationCluster extends PageRegistration {
+  subPages?: Omit<PageRegistration, "subPages">;
+}
+
 export interface PageComponents {
   Page: React.ComponentType<any>;
-  MenuIcon?: React.ComponentType<IconProps>;
 }
 
-export class GlobalPageRegistry extends BaseRegistry<PageRegistration> {
+export class PageRegistry<T extends PageRegistration> extends BaseRegistry<T> {
+  protected routePrefixPath = "/extensions/:name" // todo: figure out how to provide inside extension
+
+  getItems() {
+    return super.getItems();
+  }
 }
 
-export class ClusterPageRegistry extends BaseRegistry<PageRegistration> {
+export const globalPageRegistry = new PageRegistry<PageRegistration>();
-}
+export const clusterPageRegistry = new PageRegistry<PageRegistrationCluster>();
-
-export const globalPageRegistry = new GlobalPageRegistry();
-export const clusterPageRegistry = new ClusterPageRegistry();

src/extensions/renderer-api/navigation.ts

@@ -1,3 +1,2 @@
 export { navigate, hideDetails, showDetails, getDetailsUrl } from "../../renderer/navigation"
-export { RouteProps } from "react-router"
 export { IURLParams } from "../../common/utils/buildUrl";

src/renderer/components/+apps/apps.tsx

@@ -1,41 +1,34 @@
 import React from "react";
 import { observer } from "mobx-react";
-import { Redirect, Route, Switch } from "react-router";
 import { Trans } from "@lingui/macro";
-import { TabLayout, TabRoute } from "../layout/tab-layout";
+import { TabLayout, TabLayoutRoute } from "../layout/tab-layout";
 import { HelmCharts, helmChartsRoute, helmChartsURL } from "../+apps-helm-charts";
 import { HelmReleases, releaseRoute, releaseURL } from "../+apps-releases";
 import { namespaceStore } from "../+namespaces/namespace.store";
 
 @observer
 export class Apps extends React.Component {
-  static get tabRoutes(): TabRoute[] {
+  static get tabRoutes(): TabLayoutRoute[] {
     const query = namespaceStore.getContextParams();
     return [
       {
         title: <Trans>Charts</Trans>,
         component: HelmCharts,
         url: helmChartsURL(),
-        path: helmChartsRoute.path,
+        routePath: helmChartsRoute.path.toString(),
       },
       {
         title: <Trans>Releases</Trans>,
         component: HelmReleases,
         url: releaseURL({ query }),
-        path: releaseRoute.path,
+        routePath: releaseRoute.path.toString(),
       },
     ]
   }
 
   render() {
-    const tabRoutes = Apps.tabRoutes;
     return (
-      <TabLayout className="Apps" tabs={tabRoutes}>
+      <TabLayout className="Apps" tabs={Apps.tabRoutes}/>
-        <Switch>
-          {tabRoutes.map((route, index) => <Route key={index} {...route}/>)}
-          <Redirect to={tabRoutes[0].url}/>
-        </Switch>
-      </TabLayout>
     )
   }
 }

src/renderer/components/+config/config.route.ts

@@ -5,7 +5,7 @@ import { configMapsURL } from "../+config-maps/config-maps.route";
 
 export const configRoute: RouteProps = {
   get path() {
-    return Config.tabRoutes.map(({ path }) => path).flat()
+    return Config.tabRoutes.map(({ routePath }) => routePath).flat()
   }
 }
 

src/renderer/components/+config/config.tsx

@@ -1,33 +1,26 @@
 import React from "react";
 import { observer } from "mobx-react";
-import { Redirect, Route, Switch } from "react-router";
 import { Trans } from "@lingui/macro";
-import { TabLayout, TabRoute } from "../layout/tab-layout";
+import { TabLayout, TabLayoutRoute } from "../layout/tab-layout";
 import { ConfigMaps, configMapsRoute, configMapsURL } from "../+config-maps";
 import { Secrets, secretsRoute, secretsURL } from "../+config-secrets";
 import { namespaceStore } from "../+namespaces/namespace.store";
 import { resourceQuotaRoute, ResourceQuotas, resourceQuotaURL } from "../+config-resource-quotas";
-import { PodDisruptionBudgets, pdbRoute, pdbURL } from "../+config-pod-disruption-budgets";
+import { pdbRoute, pdbURL, PodDisruptionBudgets } from "../+config-pod-disruption-budgets";
-import { configURL } from "./config.route";
 import { HorizontalPodAutoscalers, hpaRoute, hpaURL } from "../+config-autoscalers";
 import { isAllowedResource } from "../../../common/rbac"
-import { buildURL } from "../../../common/utils/buildUrl";
-
-export const certificatesURL = buildURL("/certificates");
-export const issuersURL = buildURL("/issuers");
-export const clusterIssuersURL = buildURL("/clusterissuers");
 
 @observer
 export class Config extends React.Component {
-  static get tabRoutes(): TabRoute[] {
+  static get tabRoutes(): TabLayoutRoute[] {
     const query = namespaceStore.getContextParams()
-    const routes: TabRoute[] = []
+    const routes: TabLayoutRoute[] = []
     if (isAllowedResource("configmaps")) {
       routes.push({
         title: <Trans>ConfigMaps</Trans>,
         component: ConfigMaps,
         url: configMapsURL({ query }),
-        path: configMapsRoute.path,
+        routePath: configMapsRoute.path.toString(),
       })
     }
     if (isAllowedResource("secrets")) {
@@ -35,7 +28,7 @@ export class Config extends React.Component {
         title: <Trans>Secrets</Trans>,
         component: Secrets,
         url: secretsURL({ query }),
-        path: secretsRoute.path,
+        routePath: secretsRoute.path.toString(),
       })
     }
     if (isAllowedResource("resourcequotas")) {
@@ -43,7 +36,7 @@ export class Config extends React.Component {
         title: <Trans>Resource Quotas</Trans>,
         component: ResourceQuotas,
         url: resourceQuotaURL({ query }),
-        path: resourceQuotaRoute.path,
+        routePath: resourceQuotaRoute.path.toString(),
       })
     }
     if (isAllowedResource("horizontalpodautoscalers")) {
@@ -51,7 +44,7 @@ export class Config extends React.Component {
         title: <Trans>HPA</Trans>,
         component: HorizontalPodAutoscalers,
         url: hpaURL({ query }),
-        path: hpaRoute.path,
+        routePath: hpaRoute.path.toString(),
       })
     }
     if (isAllowedResource("poddisruptionbudgets")) {
@@ -59,21 +52,15 @@ export class Config extends React.Component {
         title: <Trans>Pod Disruption Budgets</Trans>,
         component: PodDisruptionBudgets,
         url: pdbURL({ query }),
-        path: pdbRoute.path,
+        routePath: pdbRoute.path.toString(),
       })
     }
     return routes;
   }
 
   render() {
-    const tabRoutes = Config.tabRoutes;
     return (
-      <TabLayout className="Config" tabs={tabRoutes}>
+      <TabLayout className="Config" tabs={Config.tabRoutes}/>
-        <Switch>
-          {tabRoutes.map((route, index) => <Route key={index} {...route}/>)}
-          <Redirect to={configURL({ query: namespaceStore.getContextParams() })}/>
-        </Switch>
-      </TabLayout>
     )
   }
 }

src/renderer/components/+custom-resources/custom-resources.tsx

@@ -2,23 +2,20 @@ import React from "react";
 import { observer } from "mobx-react";
 import { Redirect, Route, Switch } from "react-router";
 import { Trans } from "@lingui/macro";
-import { TabLayout, TabRoute } from "../layout/tab-layout";
+import { TabLayout, TabLayoutRoute } from "../layout/tab-layout";
 import { crdResourcesRoute, crdRoute, crdURL, crdDefinitionsRoute } from "./crd.route";
 import { CrdList } from "./crd-list";
 import { CrdResources } from "./crd-resources";
 
-// todo: next steps - customization via plugins
-// todo: list views (rows content), full details view and if possible chart/prometheus hooks
-
 @observer
 export class CustomResources extends React.Component {
-  static get tabRoutes(): TabRoute[] {
+  static get tabRoutes(): TabLayoutRoute[] {
     return [
       {
         title: <Trans>Definitions</Trans>,
         component: CustomResources,
         url: crdURL(),
-        path: crdRoute.path,
+        routePath: crdRoute.path.toString(),
       }
     ]
   }

src/renderer/components/+network/network.route.ts

@@ -5,7 +5,7 @@ import { IURLParams } from "../../../common/utils/buildUrl";
 
 export const networkRoute: RouteProps = {
   get path() {
-    return Network.tabRoutes.map(({ path }) => path).flat()
+    return Network.tabRoutes.map(({ routePath }) => routePath).flat()
   }
 }
 

src/renderer/components/+network/network.tsx

@@ -2,32 +2,26 @@ import "./network.scss"
 
 import React from "react";
 import { observer } from "mobx-react";
-import { Redirect, Route, Switch } from "react-router";
-import { RouteComponentProps } from "react-router-dom";
 import { Trans } from "@lingui/macro";
-import { TabLayout, TabRoute } from "../layout/tab-layout";
+import { TabLayout, TabLayoutRoute } from "../layout/tab-layout";
 import { Services, servicesRoute, servicesURL } from "../+network-services";
-import { Endpoints, endpointRoute, endpointURL } from "../+network-endpoints";
+import { endpointRoute, Endpoints, endpointURL } from "../+network-endpoints";
 import { Ingresses, ingressRoute, ingressURL } from "../+network-ingresses";
 import { NetworkPolicies, networkPoliciesRoute, networkPoliciesURL } from "../+network-policies";
 import { namespaceStore } from "../+namespaces/namespace.store";
-import { networkURL } from "./network.route";
 import { isAllowedResource } from "../../../common/rbac";
 
-interface Props extends RouteComponentProps<{}> {
-}
-
 @observer
-export class Network extends React.Component<Props> {
+export class Network extends React.Component {
-  static get tabRoutes(): TabRoute[] {
+  static get tabRoutes(): TabLayoutRoute[] {
     const query = namespaceStore.getContextParams()
-    const routes: TabRoute[] = [];
+    const routes: TabLayoutRoute[] = [];
     if (isAllowedResource("services")) {
       routes.push({
         title: <Trans>Services</Trans>,
         component: Services,
         url: servicesURL({ query }),
-        path: servicesRoute.path,
+        routePath: servicesRoute.path.toString(),
       })
     }
     if (isAllowedResource("endpoints")) {
@@ -35,7 +29,7 @@ export class Network extends React.Component<Props> {
         title: <Trans>Endpoints</Trans>,
         component: Endpoints,
         url: endpointURL({ query }),
-        path: endpointRoute.path,
+        routePath: endpointRoute.path.toString(),
       })
     }
     if (isAllowedResource("ingresses")) {
@@ -43,7 +37,7 @@ export class Network extends React.Component<Props> {
         title: <Trans>Ingresses</Trans>,
         component: Ingresses,
         url: ingressURL({ query }),
-        path: ingressRoute.path,
+        routePath: ingressRoute.path.toString(),
       })
     }
     if (isAllowedResource("networkpolicies")) {
@@ -51,21 +45,15 @@ export class Network extends React.Component<Props> {
         title: <Trans>Network Policies</Trans>,
         component: NetworkPolicies,
         url: networkPoliciesURL({ query }),
-        path: networkPoliciesRoute.path,
+        routePath: networkPoliciesRoute.path.toString(),
       })
     }
     return routes
   }
 
   render() {
-    const tabRoutes = Network.tabRoutes;
     return (
-      <TabLayout className="Network" tabs={tabRoutes}>
+      <TabLayout className="Network" tabs={Network.tabRoutes}/>
-        <Switch>
-          {tabRoutes.map((route, index) => <Route key={index} {...route}/>)}
-          <Redirect to={networkURL({ query: namespaceStore.getContextParams() })}/>
-        </Switch>
-      </TabLayout>
     )
   }
 }

src/renderer/components/+storage/storage.route.ts

@@ -5,7 +5,7 @@ import { IURLParams } from "../../../common/utils/buildUrl";
 
 export const storageRoute: RouteProps = {
   get path() {
-    return Storage.tabRoutes.map(({ path }) => path).flat()
+    return Storage.tabRoutes.map(({ routePath }) => routePath).flat()
   }
 }
 

src/renderer/components/+storage/storage.tsx

@@ -2,31 +2,25 @@ import "./storage.scss"
 
 import React from "react";
 import { observer } from "mobx-react";
-import { Redirect, Route, Switch } from "react-router";
-import { RouteComponentProps } from "react-router-dom";
 import { Trans } from "@lingui/macro";
-import { TabLayout, TabRoute } from "../layout/tab-layout";
+import { TabLayout, TabLayoutRoute } from "../layout/tab-layout";
 import { PersistentVolumes, volumesRoute, volumesURL } from "../+storage-volumes";
 import { StorageClasses, storageClassesRoute, storageClassesURL } from "../+storage-classes";
 import { PersistentVolumeClaims, volumeClaimsRoute, volumeClaimsURL } from "../+storage-volume-claims";
 import { namespaceStore } from "../+namespaces/namespace.store";
-import { storageURL } from "./storage.route";
 import { isAllowedResource } from "../../../common/rbac";
 
-interface Props extends RouteComponentProps<{}> {
-}
-
 @observer
-export class Storage extends React.Component<Props> {
+export class Storage extends React.Component {
   static get tabRoutes() {
-    const tabRoutes: TabRoute[] = [];
+    const tabRoutes: TabLayoutRoute[] = [];
     const query = namespaceStore.getContextParams()
 
     tabRoutes.push({
       title: <Trans>Persistent Volume Claims</Trans>,
       component: PersistentVolumeClaims,
       url: volumeClaimsURL({ query }),
-      path: volumeClaimsRoute.path,
+      routePath: volumeClaimsRoute.path.toString(),
     })
 
     if (isAllowedResource('persistentvolumes')) {
@@ -34,7 +28,7 @@ export class Storage extends React.Component<Props> {
         title: <Trans>Persistent Volumes</Trans>,
         component: PersistentVolumes,
         url: volumesURL(),
-        path: volumesRoute.path,
+        routePath: volumesRoute.path.toString(),
       });
     }
 
@@ -43,21 +37,15 @@ export class Storage extends React.Component<Props> {
         title: <Trans>Storage Classes</Trans>,
         component: StorageClasses,
         url: storageClassesURL(),
-        path: storageClassesRoute.path,
+        routePath: storageClassesRoute.path.toString(),
       })
     }
     return tabRoutes;
   }
 
   render() {
-    const tabRoutes = Storage.tabRoutes;
     return (
-      <TabLayout className="Storage" tabs={tabRoutes}>
+      <TabLayout className="Storage" tabs={Storage.tabRoutes}/>
-        <Switch>
-          {tabRoutes.map((route, index) => <Route key={index} {...route}/>)}
-          <Redirect to={storageURL({ query: namespaceStore.getContextParams() })}/>
-        </Switch>
-      </TabLayout>
     )
   }
 }

src/renderer/components/+user-management/user-management.route.ts

@@ -4,7 +4,7 @@ import { UserManagement } from "./user-management"
 
 export const usersManagementRoute: RouteProps = {
   get path() {
-    return UserManagement.tabRoutes.map(({ path }) => path).flat()
+    return UserManagement.tabRoutes.map(({ routePath }) => routePath).flat()
   }
 }
 

src/renderer/components/+user-management/user-management.tsx

@@ -1,44 +1,39 @@
 import "./user-management.scss"
 import React from "react";
 import { observer } from "mobx-react";
-import { Redirect, Route, Switch } from "react-router";
-import { RouteComponentProps } from "react-router-dom";
 import { Trans } from "@lingui/macro";
-import { TabLayout, TabRoute } from "../layout/tab-layout";
+import { TabLayout, TabLayoutRoute } from "../layout/tab-layout";
 import { Roles } from "../+user-management-roles";
 import { RoleBindings } from "../+user-management-roles-bindings";
 import { ServiceAccounts } from "../+user-management-service-accounts";
-import { roleBindingsRoute, roleBindingsURL, rolesRoute, rolesURL, serviceAccountsRoute, serviceAccountsURL, usersManagementURL } from "./user-management.route";
+import { roleBindingsRoute, roleBindingsURL, rolesRoute, rolesURL, serviceAccountsRoute, serviceAccountsURL } from "./user-management.route";
 import { namespaceStore } from "../+namespaces/namespace.store";
 import { PodSecurityPolicies, podSecurityPoliciesRoute, podSecurityPoliciesURL } from "../+pod-security-policies";
 import { isAllowedResource } from "../../../common/rbac";
 
-interface Props extends RouteComponentProps<{}> {
-}
-
 @observer
-export class UserManagement extends React.Component<Props> {
+export class UserManagement extends React.Component {
   static get tabRoutes() {
-    const tabRoutes: TabRoute[] = [];
+    const tabRoutes: TabLayoutRoute[] = [];
     const query = namespaceStore.getContextParams()
     tabRoutes.push(
       {
         title: <Trans>Service Accounts</Trans>,
         component: ServiceAccounts,
         url: serviceAccountsURL({ query }),
-        path: serviceAccountsRoute.path,
+        routePath: serviceAccountsRoute.path.toString(),
       },
       {
         title: <Trans>Role Bindings</Trans>,
         component: RoleBindings,
         url: roleBindingsURL({ query }),
-        path: roleBindingsRoute.path,
+        routePath: roleBindingsRoute.path.toString(),
       },
       {
         title: <Trans>Roles</Trans>,
         component: Roles,
         url: rolesURL({ query }),
-        path: rolesRoute.path,
+        routePath: rolesRoute.path.toString(),
       },
     )
     if (isAllowedResource("podsecuritypolicies")) {
@@ -46,21 +41,15 @@ export class UserManagement extends React.Component<Props> {
         title: <Trans>Pod Security Policies</Trans>,
         component: PodSecurityPolicies,
         url: podSecurityPoliciesURL(),
-        path: podSecurityPoliciesRoute.path,
+        routePath: podSecurityPoliciesRoute.path.toString(),
       })
     }
     return tabRoutes;
   }
 
   render() {
-    const tabRoutes = UserManagement.tabRoutes;
     return (
-      <TabLayout className="UserManagement" tabs={tabRoutes}>
+      <TabLayout className="UserManagement" tabs={UserManagement.tabRoutes}/>
-        <Switch>
-          {tabRoutes.map((route, index) => <Route key={index} {...route}/>)}
-          <Redirect to={usersManagementURL({ query: namespaceStore.getContextParams() })}/>
-        </Switch>
-      </TabLayout>
     )
   }
 }

src/renderer/components/+workloads/workloads.route.ts

@@ -5,7 +5,7 @@ import { Workloads } from "./workloads";
 
 export const workloadsRoute: RouteProps = {
   get path() {
-    return Workloads.tabRoutes.map(({ path }) => path).flat()
+    return Workloads.tabRoutes.map(({ routePath }) => routePath).flat()
   }
 }
 

src/renderer/components/+workloads/workloads.tsx

@@ -2,12 +2,10 @@ import "./workloads.scss"
 
 import React from "react";
 import { observer } from "mobx-react";
-import { Redirect, Route, Switch } from "react-router";
-import { RouteComponentProps } from "react-router-dom";
 import { Trans } from "@lingui/macro";
-import { TabLayout, TabRoute } from "../layout/tab-layout";
+import { TabLayout, TabLayoutRoute } from "../layout/tab-layout";
 import { WorkloadsOverview } from "../+workloads-overview/overview";
-import { cronJobsRoute, cronJobsURL, daemonSetsRoute, daemonSetsURL, deploymentsRoute, deploymentsURL, jobsRoute, jobsURL, overviewRoute, overviewURL, podsRoute, podsURL, statefulSetsRoute, statefulSetsURL, workloadsURL } from "./workloads.route";
+import { cronJobsRoute, cronJobsURL, daemonSetsRoute, daemonSetsURL, deploymentsRoute, deploymentsURL, jobsRoute, jobsURL, overviewRoute, overviewURL, podsRoute, podsURL, statefulSetsRoute, statefulSetsURL } from "./workloads.route";
 import { namespaceStore } from "../+namespaces/namespace.store";
 import { Pods } from "../+workloads-pods";
 import { Deployments } from "../+workloads-deployments";
@@ -17,19 +15,16 @@ import { Jobs } from "../+workloads-jobs";
 import { CronJobs } from "../+workloads-cronjobs";
 import { isAllowedResource } from "../../../common/rbac"
 
-interface Props extends RouteComponentProps {
-}
-
 @observer
-export class Workloads extends React.Component<Props> {
+export class Workloads extends React.Component {
-  static get tabRoutes(): TabRoute[] {
+  static get tabRoutes(): TabLayoutRoute[] {
     const query = namespaceStore.getContextParams();
-    const routes: TabRoute[] = [
+    const routes: TabLayoutRoute[] = [
       {
         title: <Trans>Overview</Trans>,
         component: WorkloadsOverview,
         url: overviewURL({ query }),
-        path: overviewRoute.path
+        routePath: overviewRoute.path.toString()
       }
     ]
     if (isAllowedResource("pods")) {
@@ -37,7 +32,7 @@ export class Workloads extends React.Component<Props> {
         title: <Trans>Pods</Trans>,
         component: Pods,
         url: podsURL({ query }),
-        path: podsRoute.path
+        routePath: podsRoute.path.toString()
       })
     }
     if (isAllowedResource("deployments")) {
@@ -45,7 +40,7 @@ export class Workloads extends React.Component<Props> {
         title: <Trans>Deployments</Trans>,
         component: Deployments,
         url: deploymentsURL({ query }),
-        path: deploymentsRoute.path,
+        routePath: deploymentsRoute.path.toString(),
       })
     }
     if (isAllowedResource("daemonsets")) {
@@ -53,7 +48,7 @@ export class Workloads extends React.Component<Props> {
         title: <Trans>DaemonSets</Trans>,
         component: DaemonSets,
         url: daemonSetsURL({ query }),
-        path: daemonSetsRoute.path,
+        routePath: daemonSetsRoute.path.toString(),
       })
     }
     if (isAllowedResource("statefulsets")) {
@@ -61,7 +56,7 @@ export class Workloads extends React.Component<Props> {
         title: <Trans>StatefulSets</Trans>,
         component: StatefulSets,
         url: statefulSetsURL({ query }),
-        path: statefulSetsRoute.path,
+        routePath: statefulSetsRoute.path.toString(),
       })
     }
     if (isAllowedResource("jobs")) {
@@ -69,7 +64,7 @@ export class Workloads extends React.Component<Props> {
         title: <Trans>Jobs</Trans>,
         component: Jobs,
         url: jobsURL({ query }),
-        path: jobsRoute.path,
+        routePath: jobsRoute.path.toString(),
       })
     }
     if (isAllowedResource("cronjobs")) {
@@ -77,21 +72,15 @@ export class Workloads extends React.Component<Props> {
         title: <Trans>CronJobs</Trans>,
         component: CronJobs,
         url: cronJobsURL({ query }),
-        path: cronJobsRoute.path,
+        routePath: cronJobsRoute.path.toString(),
       })
     }
     return routes;
   }
 
   render() {
-    const tabRoutes = Workloads.tabRoutes;
     return (
-      <TabLayout className="Workloads" tabs={tabRoutes}>
+      <TabLayout className="Workloads" tabs={Workloads.tabRoutes}/>
-        <Switch>
-          {tabRoutes.map((route, index) => <Route key={index} {...route}/>)}
-          <Redirect to={workloadsURL({ query: namespaceStore.getContextParams() })}/>
-        </Switch>
-      </TabLayout>
     )
   }
 }

src/renderer/components/app.tsx

@@ -29,6 +29,7 @@ import { CustomResources } from "./+custom-resources/custom-resources";
 import { crdRoute } from "./+custom-resources";
 import { isAllowedResource } from "../../common/rbac";
 import { MainLayout } from "./layout/main-layout";
+import { TabLayout, TabLayoutRoute } from "./layout/tab-layout";
 import { ErrorBoundary } from "./error-boundary";
 import { Terminal } from "./dock/terminal";
 import { getHostedCluster, getHostedClusterId } from "../../common/cluster-store";
@@ -36,7 +37,6 @@ import logger from "../../main/logger";
 import { clusterIpc } from "../../common/cluster-ipc";
 import { webFrame } from "electron";
 import { clusterPageRegistry } from "../../extensions/registries/page-registry";
-import { DynamicPage } from "../../extensions/dynamic-page";
 import { extensionLoader } from "../../extensions/extension-loader";
 import { appEventBus } from "../../common/event-bus";
 import whatInput from 'what-input';
@@ -52,9 +52,13 @@ export class App extends React.Component {
     await clusterIpc.setFrameId.invokeFromRenderer(clusterId, frameId);
     await getHostedCluster().whenReady; // cluster.activate() is done at this point
     extensionLoader.loadOnClusterRenderer();
-    appEventBus.emit({name: "cluster", action: "open", params: {
+    appEventBus.emit({
-      clusterId: clusterId
+      name: "cluster",
-    }})
+      action: "open",
+      params: {
+        clusterId: clusterId
+      }
+    })
     window.addEventListener("online", () => {
       window.location.reload()
     })
@@ -86,12 +90,19 @@ export class App extends React.Component {
                 <Route component={CustomResources} {...crdRoute}/>
                 <Route component={UserManagement} {...usersManagementRoute}/>
                 <Route component={Apps} {...appsRoute}/>
-                {clusterPageRegistry.getItems().map(page => {
+                {clusterPageRegistry.getItems().map(({ components: { Page }, subPages = [], exact, routePath }) => {
-                  return <Route {...page} key={String(page.path)} render={() => <DynamicPage page={page}/>}/>
+                  // return (
+                  //   <Route key={routePath} path={routePath} exact={exact} render={() => (
+                  //     <TabLayout tabs={subPages}>
+                  //       <Page/>
+                  //     </TabLayout>
+                  //   )}/>
+                  // )
                 })}
                 <Redirect exact from="/" to={this.startURL}/>
                 <Route component={NotFound}/>
-              </Switch></MainLayout>
+              </Switch>
+            </MainLayout>
             <Notifications/>
             <ConfirmDialog/>
             <KubeObjectDetails/>

src/renderer/components/cluster-manager/cluster-manager.tsx

@@ -69,8 +69,8 @@ export class ClusterManager extends React.Component {
             <Route component={AddCluster} {...addClusterRoute} />
             <Route component={ClusterView} {...clusterViewRoute} />
             <Route component={ClusterSettings} {...clusterSettingsRoute} />
-            {globalPageRegistry.getItems().map(({ path, url = String(path), components: { Page } }) => {
+            {globalPageRegistry.getItems().map(({ routePath, exact, components: { Page } }) => {
-              return <Route key={url} path={path} component={Page}/>
+              return <Route key={routePath} path={routePath} component={Page} exact={exact}/>
             })}
             <Redirect exact to={this.startUrl}/>
           </Switch>

src/renderer/components/cluster-manager/clusters-menu.tsx

@@ -5,6 +5,7 @@ import { remote } from "electron"
 import type { Cluster } from "../../../main/cluster";
 import { DragDropContext, Draggable, DraggableProvided, Droppable, DroppableProvided, DropResult } from "react-beautiful-dnd";
 import { observer } from "mobx-react";
+import { matchPath } from "react-router";
 import { _i18n } from "../../i18n";
 import { t, Trans } from "@lingui/macro";
 import { userStore } from "../../../common/user-store";
@@ -14,7 +15,7 @@ import { ClusterIcon } from "../cluster-icon";
 import { Icon } from "../icon";
 import { autobind, cssNames, IClassName } from "../../utils";
 import { Badge } from "../badge";
-import { navigate } from "../../navigation";
+import { navigate, navigation } from "../../navigation";
 import { addClusterURL } from "../+add-cluster";
 import { clusterSettingsURL } from "../+cluster-settings";
 import { landingURL } from "../+landing-page";
@@ -22,7 +23,7 @@ import { Tooltip } from "../tooltip";
 import { ConfirmDialog } from "../confirm-dialog";
 import { clusterIpc } from "../../../common/cluster-ipc";
 import { clusterViewURL } from "./cluster-view.route";
-import { globalPageRegistry } from "../../../extensions/registries/page-registry";
+import { globalPageMenuRegistry } from "../../../extensions/registries";
 
 interface Props {
   className?: IClassName;
@@ -138,7 +139,7 @@ export class ClustersMenu extends React.Component<Props> {
             </Droppable>
           </DragDropContext>
         </div>
-        <div className="add-cluster" >
+        <div className="add-cluster">
           <Tooltip targetId="add-cluster-icon">
             <Trans>Add Cluster</Trans>
           </Tooltip>
@@ -148,9 +149,17 @@ export class ClustersMenu extends React.Component<Props> {
           )}
         </div>
         <div className="extensions">
-          {globalPageRegistry.getItems().map(({ path, url = String(path), hideInMenu, components: { MenuIcon } }) => {
+          {globalPageMenuRegistry.getItems().map(({ title, url, components: { Icon } }) => {
-            if (!MenuIcon || hideInMenu) return;
+            const routePath = "" // todo: find matching route in page-registry + exact
-            return <MenuIcon key={url} onClick={() => navigate(url)}/>
+            const isActive = !!matchPath(navigation.location.pathname, { path: routePath/*, exact: false*/ });
+            return (
+              <Icon
+                key={routePath}
+                tooltip={title}
+                active={isActive}
+                onClick={() => navigate(url)}
+              />
+            )
           })}
         </div>
       </div>

src/renderer/components/layout/sidebar.tsx

@@ -1,4 +1,4 @@
-import type { TabRoute } from "./tab-layout";
+import type { TabLayoutRoute } from "./tab-layout";
 import "./sidebar.scss";
 
 import React from "react";
@@ -27,9 +27,9 @@ import { crdStore } from "../+custom-resources/crd.store";
 import { CrdList, crdResourcesRoute, crdRoute, crdURL } from "../+custom-resources";
 import { CustomResources } from "../+custom-resources/custom-resources";
 import { navigation } from "../../navigation";
-import { clusterPageRegistry } from "../../../extensions/registries/page-registry";
+import { isAllowedResource } from "../../../common/rbac"
-import { isAllowedResource } from "../../../common/rbac";
 import { Spinner } from "../spinner";
+import { clusterPageMenuRegistry } from "../../../extensions/registries";
 
 const SidebarContext = React.createContext<SidebarContextValue>({ pinned: false });
 type SidebarContextValue = {
@@ -56,18 +56,17 @@ export class Sidebar extends React.Component<Props> {
     }
 
     return Object.entries(crdStore.groups).map(([group, crds]) => {
-      const submenus = crds.map((crd) => {
+      const submenus: TabLayoutRoute[] = crds.map((crd) => {
         return {
           title: crd.getResourceKind(),
           component: CrdList,
           url: crd.getResourceUrl(),
-          path: crdResourcesRoute.path,
+          routePath: String(crdResourcesRoute.path),
         };
       });
       return (
         <SidebarNavItem
           key={group}
-          id={group}
           className="sub-menu-parent"
           url={crdURL({ query: { groups: group } })}
           subMenus={submenus}
@@ -98,21 +97,18 @@ export class Sidebar extends React.Component<Props> {
           </div>
           <div className="sidebar-nav flex column box grow-fixed">
             <SidebarNavItem
-              id="cluster"
               isHidden={!isAllowedResource("nodes")}
               url={clusterURL()}
               text={<Trans>Cluster</Trans>}
               icon={<Icon svg="kube" />}
             />
             <SidebarNavItem
-              id="nodes"
               isHidden={!isAllowedResource("nodes")}
               url={nodesURL()}
               text={<Trans>Nodes</Trans>}
               icon={<Icon svg="nodes" />}
             />
             <SidebarNavItem
-              id="workloads"
               isHidden={Workloads.tabRoutes.length == 0}
               url={workloadsURL({ query })}
               routePath={workloadsRoute.path}
@@ -121,7 +117,6 @@ export class Sidebar extends React.Component<Props> {
               icon={<Icon svg="workloads" />}
             />
             <SidebarNavItem
-              id="config"
               isHidden={Config.tabRoutes.length == 0}
               url={configURL({ query })}
               routePath={configRoute.path}
@@ -130,7 +125,6 @@ export class Sidebar extends React.Component<Props> {
               icon={<Icon material="list" />}
             />
             <SidebarNavItem
-              id="networks"
               isHidden={Network.tabRoutes.length == 0}
               url={networkURL({ query })}
               routePath={networkRoute.path}
@@ -139,7 +133,6 @@ export class Sidebar extends React.Component<Props> {
               icon={<Icon material="device_hub" />}
             />
             <SidebarNavItem
-              id="storage"
               isHidden={Storage.tabRoutes.length == 0}
               url={storageURL({ query })}
               routePath={storageRoute.path}
@@ -148,14 +141,12 @@ export class Sidebar extends React.Component<Props> {
               text={<Trans>Storage</Trans>}
             />
             <SidebarNavItem
-              id="namespaces"
               isHidden={!isAllowedResource("namespaces")}
               url={namespacesURL()}
               icon={<Icon material="layers" />}
               text={<Trans>Namespaces</Trans>}
             />
             <SidebarNavItem
-              id="events"
               isHidden={!isAllowedResource("events")}
               url={eventsURL({ query })}
               routePath={eventRoute.path}
@@ -163,7 +154,6 @@ export class Sidebar extends React.Component<Props> {
               text={<Trans>Events</Trans>}
             />
             <SidebarNavItem
-              id="apps"
               url={appsURL({ query })}
               subMenus={Apps.tabRoutes}
               routePath={appsRoute.path}
@@ -171,7 +161,6 @@ export class Sidebar extends React.Component<Props> {
               text={<Trans>Apps</Trans>}
             />
             <SidebarNavItem
-              id="users"
               url={usersManagementURL({ query })}
               routePath={usersManagementRoute.path}
               subMenus={UserManagement.tabRoutes}
@@ -179,7 +168,6 @@ export class Sidebar extends React.Component<Props> {
               text={<Trans>Access Control</Trans>}
             />
             <SidebarNavItem
-              id="custom-resources"
               isHidden={!isAllowedResource("customresourcedefinitions")}
               url={crdURL()}
               subMenus={CustomResources.tabRoutes}
@@ -189,17 +177,13 @@ export class Sidebar extends React.Component<Props> {
             >
               {this.renderCustomResources()}
             </SidebarNavItem>
-            {clusterPageRegistry.getItems().map(({ path, title, url = String(path), hideInMenu, components: { MenuIcon } }) => {
+            {clusterPageMenuRegistry.getItems().map(({ title, url, components: { Icon } }) => {
-              if (!MenuIcon || hideInMenu) {
+              const routePath = "" // todo: find in page-registry
-                return;
-              }
               return (
                 <SidebarNavItem
-                  key={url} id={`sidebar_item_${url}`}
+                  key={url} url={url}
-                  url={url}
+                  routePath={routePath}
-                  routePath={path}
+                  text={title} icon={<Icon />}
-                  text={title}
-                  icon={<MenuIcon />}
                 />
               )
             })}
@@ -211,46 +195,45 @@ export class Sidebar extends React.Component<Props> {
 }
 
 interface SidebarNavItemProps {
-  id: string;
   url: string;
   text: React.ReactNode | string;
   className?: string;
   icon?: React.ReactNode;
   isHidden?: boolean;
   routePath?: string | string[];
-  subMenus?: TabRoute[];
+  subMenus?: TabLayoutRoute[];
 }
 
 const navItemStorage = createStorage<[string, boolean][]>("sidebar_menu_item", []);
 const navItemState = observable.map<string, boolean>(navItemStorage.get());
-reaction(
+reaction(() => [...navItemState], (value) => navItemStorage.set(value));
-  () => [...navItemState],
-  (value) => navItemStorage.set(value)
-);
 
 @observer
 class SidebarNavItem extends React.Component<SidebarNavItemProps> {
   static contextType = SidebarContext;
   public context: SidebarContextValue;
 
+  get itemId() {
+    return this.props.url;
+  }
+
   @computed get isExpanded() {
-    return navItemState.get(this.props.id);
+    return navItemState.get(this.itemId);
   }
 
   toggleSubMenu = () => {
-    navItemState.set(this.props.id, !this.isExpanded);
+    navItemState.set(this.itemId, !this.isExpanded);
   };
 
   isActive = () => {
-    const { routePath, url } = this.props;
+    const { url, routePath = url } = this.props;
-    const { pathname } = navigation.location;
+    return !!matchPath(navigation.location.pathname, {
-    return !!matchPath(pathname, {
+      path: routePath
-      path: routePath || url,
     });
   };
 
   render() {
-    const { id, isHidden, subMenus = [], icon, text, url, children, className } = this.props;
+    const { isHidden, subMenus = [], icon, text, url, children, className } = this.props;
     if (isHidden) {
       return null;
     }
@@ -258,7 +241,7 @@ class SidebarNavItem extends React.Component<SidebarNavItemProps> {
     if (extendedView) {
       const isActive = this.isActive();
       return (
-        <div id={id} className={cssNames("SidebarNavItem", className)}>
+        <div className={cssNames("SidebarNavItem", className)}>
           <div className={cssNames("nav-item", { active: isActive })} onClick={this.toggleSubMenu}>
             {icon}
             <span className="link-text">{text}</span>

src/renderer/components/layout/tab-layout.tsx

@@ -1,38 +1,55 @@
 import "./tab-layout.scss";
+
 import React, { ReactNode } from "react";
-import { matchPath, RouteProps } from "react-router-dom";
+import { matchPath, Redirect, Route, Switch } from "react-router";
 import { observer } from "mobx-react";
-import { cssNames } from "../../utils";
+import { cssNames, IClassName } from "../../utils";
 import { Tab, Tabs } from "../tabs";
 import { ErrorBoundary } from "../error-boundary";
 import { navigate, navigation } from "../../navigation";
 
-export interface TabRoute extends RouteProps {
-  title: React.ReactNode;
-  url: string;
-}
-
 export interface TabLayoutProps {
-  children: ReactNode;
+  className?: IClassName;
-  className?: any;
+  contentClass?: IClassName;
-  tabs?: TabRoute[];
+  tabs?: TabLayoutRoute[];
-  contentClass?: string;
+  children?: ReactNode;
 }
 
-export const TabLayout = observer(({ className, contentClass, tabs, children }: TabLayoutProps) => {
+export interface TabLayoutRoute {
-  const routePath = navigation.location.pathname;
+  routePath: string;
+  title: React.ReactNode;
+  component: React.ComponentType<any>;
+  url?: string; // page-url, if not provided `routePath` is used (doesn't work when path has some :placeholder(s))
+  exact?: boolean; // route-path matching rule
+  default?: boolean; // initial tab to open with provided `url, by default tabs[0] is used
+}
+
+export const TabLayout = observer(({ className, contentClass, tabs = [], children }: TabLayoutProps) => {
+  const currentLocation = navigation.location.pathname;
+  const hasTabs = tabs.length > 0;
+  const startTabUrl = hasTabs ? (tabs.find(tab => tab.default) || tabs[0])?.url : null;
   return (
     <div className={cssNames("TabLayout", className)}>
-      {tabs && (
+      {hasTabs && (
         <Tabs center onChange={(url) => navigate(url)}>
-          {tabs.map(({ title, path, url, ...routeProps }) => {
+          {tabs.map(({ title, routePath, url = routePath, exact }) => {
-            const isActive = !!matchPath(routePath, { path, ...routeProps });
+            const isActive = !!matchPath(currentLocation, { path: routePath, exact });
             return <Tab key={url} label={title} value={url} active={isActive}/>;
           })}
         </Tabs>
       )}
-      <main className={contentClass}>
+      <main className={cssNames(contentClass)}>
-        <ErrorBoundary>{children}</ErrorBoundary>
+        <ErrorBoundary>
+          {hasTabs && (
+            <Switch>
+              {tabs.map(({ routePath, exact, component }) => {
+                return <Route key={routePath} exact={exact} path={routePath} component={component}/>;
+              })}
+              <Redirect to={startTabUrl}/>
+            </Switch>
+          )}
+          {children}
+        </ErrorBoundary>
       </main>
     </div>
   );