Move all RouteParam's and URL builders to src/common (#2778)

- Prevents some circular dependencies

- Allowed main to use them as needed

Signed-off-by: Sebastian Malton <sebastian@malton.name>

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

@@ -19,5 +19,4 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-export * from "./storage.route";
 export * from "./storage";

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

@@ -1,36 +0,0 @@
-/**
- * Copyright (c) 2021 OpenLens Authors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-import type { RouteProps } from "react-router";
-import { storageClassesRoute } from "../+storage-classes";
-import { volumeClaimsRoute, volumeClaimsURL } from "../+storage-volume-claims";
-import { volumesRoute } from "../+storage-volumes";
-import type { IURLParams } from "../../../common/utils/buildUrl";
-
-export const storageRoute: RouteProps = {
-  path: [
-    volumeClaimsRoute,
-    volumesRoute,
-    storageClassesRoute
-  ].map(route => route.path.toString())
-};
-
-export const storageURL = (params?: IURLParams) => volumeClaimsURL(params);

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

@@ -24,44 +24,45 @@ import "./storage.scss";
 import React from "react";
 import { observer } from "mobx-react";
 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 { PersistentVolumes } from "../+storage-volumes";
+import { StorageClasses } from "../+storage-classes";
+import { PersistentVolumeClaims } from "../+storage-volume-claims";
 import { isAllowedResource } from "../../../common/rbac";
+import * as routes from "../../../common/routes";
 
 @observer
 export class Storage extends React.Component {
   static get tabRoutes() {
-    const tabRoutes: TabLayoutRoute[] = [];
+    const tabs: TabLayoutRoute[] = [];
 
     if (isAllowedResource("persistentvolumeclaims")) {
-      tabRoutes.push({
+      tabs.push({
         title: "Persistent Volume Claims",
         component: PersistentVolumeClaims,
-        url: volumeClaimsURL(),
-        routePath: volumeClaimsRoute.path.toString(),
+        url: routes.volumeClaimsURL(),
+        routePath: routes.volumeClaimsRoute.path.toString(),
       });
     }
 
     if (isAllowedResource("persistentvolumes")) {
-      tabRoutes.push({
+      tabs.push({
         title: "Persistent Volumes",
         component: PersistentVolumes,
-        url: volumesURL(),
-        routePath: volumesRoute.path.toString(),
+        url: routes.volumesURL(),
+        routePath: routes.volumesRoute.path.toString(),
       });
     }
 
     if (isAllowedResource("storageclasses")) {
-      tabRoutes.push({
+      tabs.push({
         title: "Storage Classes",
         component: StorageClasses,
-        url: storageClassesURL(),
-        routePath: storageClassesRoute.path.toString(),
+        url: routes.storageClassesURL(),
+        routePath: routes.storageClassesRoute.path.toString(),
       });
     }
 
-    return tabRoutes;
+    return tabs;
   }
 
   render() {