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/cluster-manager/bottom-bar.tsx

@@ -25,8 +25,8 @@ import React from "react";
 import { observer } from "mobx-react";
 import { StatusBarRegistration, statusBarRegistry } from "../../../extensions/registries";
 import { navigate } from "../../navigation";
-import { catalogURL } from "../+catalog";
 import { Icon } from "../icon";
+import { catalogURL } from "../../../common/routes";
 
 @observer
 export class BottomBar extends React.Component {

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

@@ -25,16 +25,16 @@ import React from "react";
 import { Redirect, Route, Switch } from "react-router";
 import { observer } from "mobx-react";
 import { BottomBar } from "./bottom-bar";
-import { Catalog, catalogRoute } from "../+catalog";
-import { Preferences, preferencesRoute } from "../+preferences";
-import { AddCluster, addClusterRoute } from "../+add-cluster";
+import { Catalog } from "../+catalog";
+import { Preferences } from "../+preferences";
+import { AddCluster } from "../+add-cluster";
 import { ClusterView } from "./cluster-view";
-import { clusterViewRoute } from "./cluster-view.route";
 import { globalPageRegistry } from "../../../extensions/registries/page-registry";
-import { Extensions, extensionsRoute } from "../+extensions";
+import { Extensions } from "../+extensions";
 import { HotbarMenu } from "../hotbar/hotbar-menu";
-import { EntitySettings, entitySettingsRoute } from "../+entity-settings";
-import { Welcome, welcomeRoute, welcomeURL } from "../+welcome";
+import { EntitySettings } from "../+entity-settings";
+import { Welcome } from "../+welcome";
+import * as routes from "../../../common/routes";
 
 @observer
 export class ClusterManager extends React.Component {
@@ -44,20 +44,20 @@ export class ClusterManager extends React.Component {
         <main>
           <div id="lens-views"/>
           <Switch>
-            <Route component={Welcome} {...welcomeRoute} />
-            <Route component={Catalog} {...catalogRoute} />
-            <Route component={Preferences} {...preferencesRoute} />
-            <Route component={Extensions} {...extensionsRoute} />
-            <Route component={AddCluster} {...addClusterRoute} />
-            <Route component={ClusterView} {...clusterViewRoute} />
-            <Route component={EntitySettings} {...entitySettingsRoute} />
+            <Route component={Welcome} {...routes.welcomeRoute} />
+            <Route component={Catalog} {...routes.catalogRoute} />
+            <Route component={Preferences} {...routes.preferencesRoute} />
+            <Route component={Extensions} {...routes.extensionsRoute} />
+            <Route component={AddCluster} {...routes.addClusterRoute} />
+            <Route component={ClusterView} {...routes.clusterViewRoute} />
+            <Route component={EntitySettings} {...routes.entitySettingsRoute} />
             {
               globalPageRegistry.getItems()
                 .map(({ url, components: { Page } }) => (
                   <Route key={url} path={url} component={Page} />
                 ))
             }
-            <Redirect exact to={welcomeURL()}/>
+            <Redirect exact to={routes.welcomeURL()}/>
           </Switch>
         </main>
         <HotbarMenu/>

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

@@ -35,7 +35,7 @@ import { Icon } from "../icon";
 import { CubeSpinner } from "../spinner";
 import type { KubeAuthProxyLog } from "../../../main/kube-auth-proxy";
 import { navigate } from "../../navigation";
-import { entitySettingsURL } from "../+entity-settings";
+import { entitySettingsURL } from "../../../common/routes";
 
 interface Props {
   className?: IClassName;

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

@@ -20,7 +20,7 @@
  */
 
 import React from "react";
-import { catalogURL } from "../+catalog";
+import { catalogURL } from "../../../common/routes";
 import type { Cluster } from "../../../main/cluster";
 import { navigate } from "../../navigation";
 import { Icon } from "../icon";

src/renderer/components/cluster-manager/cluster-view.route.ts

@@ -1,34 +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 { buildURL } from "../../../common/utils/buildUrl";
-
-export interface IClusterViewRouteParams {
-  clusterId: string;
-}
-
-export const clusterViewRoute: RouteProps = {
-  exact: true,
-  path: "/cluster/:clusterId",
-};
-
-export const clusterViewURL = buildURL<IClusterViewRouteParams>(clusterViewRoute.path);

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

@@ -23,6 +23,7 @@ import "./cluster-view.scss";
 import React from "react";
 import { computed, makeObservable, reaction } from "mobx";
 import { disposeOnUnmount, observer } from "mobx-react";
+import type { RouteComponentProps } from "react-router";
 import { ClusterStatus } from "./cluster-status";
 import { hasLoadedView, initView, refreshViews } from "./lens-views";
 import type { Cluster } from "../../../main/cluster";
@@ -31,12 +32,10 @@ import { requestMain } from "../../../common/ipc";
 import { clusterActivateHandler } from "../../../common/cluster-ipc";
 import { catalogEntityRegistry } from "../../api/catalog-entity-registry";
 import { navigate } from "../../navigation";
-import { catalogURL } from "../+catalog/catalog.route";
 import { ClusterTopbar } from "./cluster-topbar";
-import type { RouteComponentProps } from "react-router-dom";
-import type { IClusterViewRouteParams } from "./cluster-view.route";
+import { catalogURL, ClusterViewRouteParams } from "../../../common/routes";
 
-interface Props extends RouteComponentProps<IClusterViewRouteParams> {
+interface Props extends RouteComponentProps<ClusterViewRouteParams> {
 }
 
 @observer