From 79e56cb187a4c1901026db283c0671597f120355 Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Wed, 27 Apr 2022 15:58:36 +0300
Subject: [PATCH] Fix error about multiple states for React Router being
 present at once

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

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 src/renderer/bootstrap.tsx                                  | 2 +-
 src/renderer/components/cluster-manager/cluster-manager.tsx | 2 +-
 src/renderer/components/layout/tab-layout.tsx               | 2 +-
 .../components/test-utils/get-application-builder.tsx       | 6 ++++--
 src/renderer/frames/cluster-frame/cluster-frame.tsx         | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/renderer/bootstrap.tsx b/src/renderer/bootstrap.tsx
index 326150b2b1..d824b8f52d 100644
--- a/src/renderer/bootstrap.tsx
+++ b/src/renderer/bootstrap.tsx
@@ -34,7 +34,7 @@ import userStoreInjectable from "../common/user-store/user-store.injectable";
 import initRootFrameInjectable from "./frames/root-frame/init-root-frame/init-root-frame.injectable";
 import initClusterFrameInjectable from "./frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable";
 import commandOverlayInjectable from "./components/command-palette/command-overlay.injectable";
-import { Router } from "react-router";
+import { Router } from "react-router-dom";
 import historyInjectable from "./navigation/history.injectable";
 import themeStoreInjectable from "./theme-store.injectable";
 import navigateToAddClusterInjectable  from "../common/front-end-routing/routes/add-cluster/navigate-to-add-cluster.injectable";
diff --git a/src/renderer/components/cluster-manager/cluster-manager.tsx b/src/renderer/components/cluster-manager/cluster-manager.tsx
index 7758b11b66..f421444885 100644
--- a/src/renderer/components/cluster-manager/cluster-manager.tsx
+++ b/src/renderer/components/cluster-manager/cluster-manager.tsx
@@ -6,7 +6,7 @@
 import "./cluster-manager.scss";
 
 import React from "react";
-import { Redirect } from "react-router";
+import { Redirect } from "react-router-dom";
 import { disposeOnUnmount, observer } from "mobx-react";
 import { StatusBar } from "../status-bar/status-bar";
 import { HotbarMenu } from "../hotbar/hotbar-menu";
diff --git a/src/renderer/components/layout/tab-layout.tsx b/src/renderer/components/layout/tab-layout.tsx
index 4af490e1f2..d1edd4d161 100644
--- a/src/renderer/components/layout/tab-layout.tsx
+++ b/src/renderer/components/layout/tab-layout.tsx
@@ -7,7 +7,7 @@ import "./tab-layout.scss";
 
 import type { ReactNode } from "react";
 import React from "react";
-import { matchPath, Redirect, Route, Switch } from "react-router";
+import { matchPath, Redirect, Route, Switch } from "react-router-dom";
 import { observer } from "mobx-react";
 import type { IClassName } from "../../utils";
 import { cssNames } from "../../utils";
diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx
index a17a9cc0c5..fee3ed4695 100644
--- a/src/renderer/components/test-utils/get-application-builder.tsx
+++ b/src/renderer/components/test-utils/get-application-builder.tsx
@@ -11,7 +11,7 @@ import { computed, observable, runInAction } from "mobx";
 import { renderFor } from "./renderFor";
 import observableHistoryInjectable from "../../navigation/observable-history.injectable";
 import React from "react";
-import { Router } from "react-router";
+import { Router } from "react-router-dom";
 import { Observer } from "mobx-react";
 import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable";
 import allowedResourcesInjectable from "../../../common/cluster-store/allowed-resources.injectable";
@@ -43,7 +43,9 @@ type Callback = (dis: DiContainers) => void | Promise<void>;
 export interface ApplicationBuilder {
   dis: DiContainers;
   setEnvironmentToClusterFrame: () => ApplicationBuilder;
-  addExtensions: (...extensions: LensRendererExtension[]) => Promise<ApplicationBuilder>;
+  addExtensions: (
+    ...extensions: LensRendererExtension[]
+  ) => Promise<ApplicationBuilder>;
   allowKubeResource: (resourceName: KubeResource) => ApplicationBuilder;
   beforeSetups: (callback: Callback) => ApplicationBuilder;
   beforeRender: (callback: Callback) => ApplicationBuilder;
diff --git a/src/renderer/frames/cluster-frame/cluster-frame.tsx b/src/renderer/frames/cluster-frame/cluster-frame.tsx
index e2fe33bacc..64fe973b11 100755
--- a/src/renderer/frames/cluster-frame/cluster-frame.tsx
+++ b/src/renderer/frames/cluster-frame/cluster-frame.tsx
@@ -5,7 +5,7 @@
 import React from "react";
 import type { IComputedValue } from "mobx";
 import { disposeOnUnmount, observer } from "mobx-react";
-import { Redirect } from "react-router";
+import { Redirect } from "react-router-dom";
 import { ConfirmDialog } from "../../components/confirm-dialog";
 import { DeploymentScaleDialog } from "../../components/+workloads-deployments/deployment-scale-dialog";
 import { CronJobTriggerDialog } from "../../components/+workloads-cronjobs/cronjob-trigger-dialog";