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/+network/index.ts

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

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

@@ -21,35 +21,32 @@
 
 import { navigate } from "../../navigation";
 import { commandRegistry } from "../../../extensions/registries/command-registry";
-import { servicesURL } from "../+network-services";
-import { endpointURL } from "../+network-endpoints";
-import { ingressURL } from "../+network-ingresses";
-import { networkPoliciesURL } from "../+network-policies";
+import * as routes from "../../../common/routes";
 
 commandRegistry.add({
   id: "cluster.viewServices",
   title: "Cluster: View Services",
   scope: "entity",
-  action: () => navigate(servicesURL())
+  action: () => navigate(routes.servicesURL())
 });
 
 commandRegistry.add({
   id: "cluster.viewEndpoints",
   title: "Cluster: View Endpoints",
   scope: "entity",
-  action: () => navigate(endpointURL())
+  action: () => navigate(routes.endpointURL())
 });
 
 commandRegistry.add({
   id: "cluster.viewIngresses",
   title: "Cluster: View Ingresses",
   scope: "entity",
-  action: () => navigate(ingressURL())
+  action: () => navigate(routes.ingressURL())
 });
 
 commandRegistry.add({
   id: "cluster.viewNetworkPolicies",
   title: "Cluster: View NetworkPolicies",
   scope: "entity",
-  action: () => navigate(networkPoliciesURL())
+  action: () => navigate(routes.networkPoliciesURL())
 });

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

@@ -1,38 +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 { endpointRoute } from "../+network-endpoints";
-import { ingressRoute } from "../+network-ingresses";
-import { networkPoliciesRoute } from "../+network-policies";
-import { servicesRoute, servicesURL } from "../+network-services";
-import type { IURLParams } from "../../../common/utils/buildUrl";
-
-export const networkRoute: RouteProps = {
-  path: [
-    servicesRoute,
-    endpointRoute,
-    ingressRoute,
-    networkPoliciesRoute
-  ].map(route => route.path.toString())
-};
-
-export const networkURL = (params?: IURLParams) => servicesURL(params);

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

@@ -24,54 +24,55 @@ import "./network.scss";
 import React from "react";
 import { observer } from "mobx-react";
 import { TabLayout, TabLayoutRoute } from "../layout/tab-layout";
-import { Services, servicesRoute, servicesURL } from "../+network-services";
-import { endpointRoute, Endpoints, endpointURL } from "../+network-endpoints";
-import { Ingresses, ingressRoute, ingressURL } from "../+network-ingresses";
-import { NetworkPolicies, networkPoliciesRoute, networkPoliciesURL } from "../+network-policies";
+import { Services } from "../+network-services";
+import { Endpoints } from "../+network-endpoints";
+import { Ingresses } from "../+network-ingresses";
+import { NetworkPolicies } from "../+network-policies";
 import { isAllowedResource } from "../../../common/rbac";
+import * as routes from "../../../common/routes";
 
 @observer
 export class Network extends React.Component {
   static get tabRoutes(): TabLayoutRoute[] {
-    const routes: TabLayoutRoute[] = [];
+    const tabs: TabLayoutRoute[] = [];
 
     if (isAllowedResource("services")) {
-      routes.push({
+      tabs.push({
         title: "Services",
         component: Services,
-        url: servicesURL(),
-        routePath: servicesRoute.path.toString(),
+        url: routes.servicesURL(),
+        routePath: routes.servicesRoute.path.toString(),
       });
     }
 
     if (isAllowedResource("endpoints")) {
-      routes.push({
+      tabs.push({
         title: "Endpoints",
         component: Endpoints,
-        url: endpointURL(),
-        routePath: endpointRoute.path.toString(),
+        url: routes.endpointURL(),
+        routePath: routes.endpointRoute.path.toString(),
       });
     }
 
     if (isAllowedResource("ingresses")) {
-      routes.push({
+      tabs.push({
         title: "Ingresses",
         component: Ingresses,
-        url: ingressURL(),
-        routePath: ingressRoute.path.toString(),
+        url: routes.ingressURL(),
+        routePath: routes.ingressRoute.path.toString(),
       });
     }
 
     if (isAllowedResource("networkpolicies")) {
-      routes.push({
+      tabs.push({
         title: "Network Policies",
         component: NetworkPolicies,
-        url: networkPoliciesURL(),
-        routePath: networkPoliciesRoute.path.toString(),
+        url: routes.networkPoliciesURL(),
+        routePath: routes.networkPoliciesRoute.path.toString(),
       });
     }
 
-    return routes;
+    return tabs;
   }
 
   render() {