PageRegistration & BaseRegistry refactoring (#1334)

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

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}>
-        <Switch>
-          {tabRoutes.map((route, index) => <Route key={index} {...route}/>)}
-          <Redirect to={storageURL({ query: namespaceStore.getContextParams() })}/>
-        </Switch>
-      </TabLayout>
+      <TabLayout className="Storage" tabs={Storage.tabRoutes}/>
     )
   }
 }