PageRegistration & BaseRegistry refactoring (#1334)

Signed-off-by: Roman <ixrock@gmail.com>
Co-authored-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

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 { configURL } from "./config.route";
+import { pdbRoute, pdbURL, PodDisruptionBudgets } from "../+config-pod-disruption-budgets";
 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}>
-        <Switch>
-          {tabRoutes.map((route, index) => <Route key={index} {...route}/>)}
-          <Redirect to={configURL({ query: namespaceStore.getContextParams() })}/>
-        </Switch>
-      </TabLayout>
+      <TabLayout className="Config" tabs={Config.tabRoutes}/>
     )
   }
 }