Cascade different refactorings to eliminate global shared state from app paths

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

src/renderer/components/cluster-manager/bottom-bar.test.tsx

@@ -26,10 +26,10 @@ import "@testing-library/jest-dom/extend-expect";
 import { BottomBar } from "./bottom-bar";
 import { StatusBarRegistry } from "../../../extensions/registries";
 import { HotbarStore } from "../../../common/hotbar-store";
-import { AppPaths } from "../../../common/app-paths";
 import { CommandOverlay } from "../command-palette";
 import { HotbarSwitchCommand } from "../hotbar/hotbar-switch-command";
 import { ActiveHotbarName } from "./active-hotbar-name";
+import { getDisForUnitTesting } from "../../../test-utils/get-dis-for-unit-testing";
 
 jest.mock("../command-palette", () => ({
   CommandOverlay: {
@@ -37,8 +37,6 @@ jest.mock("../command-palette", () => ({
   },
 }));
 
-AppPaths.init();
-
 jest.mock("electron", () => ({
   app: {
     getName: () => "lens",
@@ -56,7 +54,11 @@ jest.mock("electron", () => ({
 }));
 
 describe("<BottomBar />", () => {
-  beforeEach(() => {
+  beforeEach(async () => {
+    const dis = getDisForUnitTesting({ doGeneralOverrides: true });
+
+    await dis.runSetups();
+
     const mockOpts = {
       "tmp": {
         "test-store.json": JSON.stringify({}),

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

@@ -25,7 +25,7 @@ import React from "react";
 import { Redirect, Route, Switch } from "react-router";
 import { disposeOnUnmount, observer } from "mobx-react";
 import { BottomBar } from "./bottom-bar";
-import { Catalog, previousActiveTab } from "../+catalog";
+import { Catalog } from "../+catalog";
 import { Preferences } from "../+preferences";
 import { AddCluster } from "../+add-cluster";
 import { ClusterView } from "./cluster-view";
@@ -41,9 +41,16 @@ import { navigation } from "../../navigation";
 import { setEntityOnRouteMatch } from "../../../main/catalog-sources/helpers/general-active-sync";
 import { TopBar } from "../layout/topbar";
 import { catalogURL, getPreviousTabUrl } from "../../../common/routes";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import catalogPreviousActiveTabStorageInjectable
+  from "../+catalog/catalog-previous-active-tab-storage/catalog-previous-active-tab-storage.injectable";
+
+interface Dependencies {
+  catalogPreviousActiveTabStorage: { get: () => string }
+}
 
 @observer
-export class ClusterManager extends React.Component {
+class NonInjectedClusterManager extends React.Component<Dependencies> {
   componentDidMount() {
     disposeOnUnmount(this, [
       reaction(() => navigation.location, () => setEntityOnRouteMatch(), { fireImmediately: true }),
@@ -53,11 +60,18 @@ export class ClusterManager extends React.Component {
   render() {
     return (
       <div className="ClusterManager">
-        <TopBar/>
+        <TopBar />
         <main>
-          <div id="lens-views"/>
+          <div id="lens-views" />
           <Switch>
-            <Redirect exact from={catalogURL()} to={getPreviousTabUrl(previousActiveTab.get())}/>
+            <Redirect
+              exact
+              from={catalogURL()}
+              to={getPreviousTabUrl(
+                this.props.catalogPreviousActiveTabStorage.get(),
+              )}
+            />
+
             <Route component={Welcome} {...routes.welcomeRoute} />
             <Route component={Catalog} {...routes.catalogRoute} />
             <Route component={Preferences} {...routes.preferencesRoute} />
@@ -65,19 +79,24 @@ export class ClusterManager extends React.Component {
             <Route component={AddCluster} {...routes.addClusterRoute} />
             <Route component={ClusterView} {...routes.clusterViewRoute} />
             <Route component={EntitySettings} {...routes.entitySettingsRoute} />
-            {
-              GlobalPageRegistry.getInstance().getItems()
-                .map(({ url, components: { Page }}) => (
-                  <Route key={url} path={url} component={Page} />
-                ))
-            }
-            <Redirect exact to={routes.welcomeURL()}/>
+            {GlobalPageRegistry.getInstance()
+              .getItems()
+              .map(({ url, components: { Page }}) => (
+                <Route key={url} path={url} component={Page} />
+              ))}
+            <Redirect exact to={routes.welcomeURL()} />
           </Switch>
         </main>
-        <HotbarMenu/>
-        <BottomBar/>
-        <DeleteClusterDialog/>
+        <HotbarMenu />
+        <BottomBar />
+        <DeleteClusterDialog />
       </div>
     );
   }
 }
+
+export const ClusterManager = withInjectables<Dependencies>(NonInjectedClusterManager, {
+  getProps: di => ({
+    catalogPreviousActiveTabStorage: di.inject(catalogPreviousActiveTabStorageInjectable),
+  }),
+});

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

@@ -26,7 +26,7 @@ import { disposeOnUnmount, observer } from "mobx-react";
 import React from "react";
 import { clusterActivateHandler } from "../../../common/cluster-ipc";
 import { ipcRendererOn, requestMain } from "../../../common/ipc";
-import type { Cluster } from "../../../main/cluster";
+import type { Cluster } from "../../../common/cluster/cluster";
 import { cssNames, IClassName } from "../../utils";
 import { Button } from "../button";
 import { Icon } from "../icon";

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

@@ -26,8 +26,8 @@ import { disposeOnUnmount, observer } from "mobx-react";
 import type { RouteComponentProps } from "react-router";
 import { ClusterStatus } from "./cluster-status";
 import { ClusterFrameHandler } from "./lens-views";
-import type { Cluster } from "../../../main/cluster";
-import { ClusterStore } from "../../../common/cluster-store";
+import type { Cluster } from "../../../common/cluster/cluster";
+import { ClusterStore } from "../../../common/cluster-store/cluster-store";
 import { requestMain } from "../../../common/ipc";
 import { clusterActivateHandler } from "../../../common/cluster-ipc";
 import { catalogEntityRegistry } from "../../api/catalog-entity-registry";

src/renderer/components/cluster-manager/lens-views.ts

@@ -22,7 +22,7 @@
 import { action, IReactionDisposer, makeObservable, observable, when } from "mobx";
 import logger from "../../../main/logger";
 import { clusterVisibilityHandler } from "../../../common/cluster-ipc";
-import { ClusterStore } from "../../../common/cluster-store";
+import { ClusterStore } from "../../../common/cluster-store/cluster-store";
 import type { ClusterId } from "../../../common/cluster-types";
 import { getClusterFrameUrl, Singleton } from "../../utils";
 import { ipcRenderer } from "electron";