hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix error about multiple states for React Router being present at once

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

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Janne Savolainen 2022-04-27 15:58:36 +03:00
parent cef683903d
commit 79e56cb187
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer/bootstrap.tsx
View File

@ -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 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 initClusterFrameInjectable from "./frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable";
import commandOverlayInjectable from "./components/command-palette/command-overlay.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 historyInjectable from "./navigation/history.injectable";
import themeStoreInjectable from "./theme-store.injectable"; import themeStoreInjectable from "./theme-store.injectable";
import navigateToAddClusterInjectable from "../common/front-end-routing/routes/add-cluster/navigate-to-add-cluster.injectable"; import navigateToAddClusterInjectable from "../common/front-end-routing/routes/add-cluster/navigate-to-add-cluster.injectable";

2
src/renderer/components/cluster-manager/cluster-manager.tsx
View File

@ -6,7 +6,7 @@
import "./cluster-manager.scss"; import "./cluster-manager.scss";
import React from "react"; import React from "react";
import { Redirect } from "react-router"; import { Redirect } from "react-router-dom";
import { disposeOnUnmount, observer } from "mobx-react"; import { disposeOnUnmount, observer } from "mobx-react";
import { StatusBar } from "../status-bar/status-bar"; import { StatusBar } from "../status-bar/status-bar";
import { HotbarMenu } from "../hotbar/hotbar-menu"; import { HotbarMenu } from "../hotbar/hotbar-menu";

2
src/renderer/components/layout/tab-layout.tsx
View File

@ -7,7 +7,7 @@ import "./tab-layout.scss";
import type { ReactNode } from "react"; import type { ReactNode } from "react";
import React 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 { observer } from "mobx-react";
import type { IClassName } from "../../utils"; import type { IClassName } from "../../utils";
import { cssNames } from "../../utils"; import { cssNames } from "../../utils";

6
src/renderer/components/test-utils/get-application-builder.tsx
View File

@ -11,7 +11,7 @@ import { computed, observable, runInAction } from "mobx";
import { renderFor } from "./renderFor"; import { renderFor } from "./renderFor";
import observableHistoryInjectable from "../../navigation/observable-history.injectable"; import observableHistoryInjectable from "../../navigation/observable-history.injectable";
import React from "react"; import React from "react";
import { Router } from "react-router"; import { Router } from "react-router-dom";
import { Observer } from "mobx-react"; import { Observer } from "mobx-react";
import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable"; import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable";
import allowedResourcesInjectable from "../../../common/cluster-store/allowed-resources.injectable"; import allowedResourcesInjectable from "../../../common/cluster-store/allowed-resources.injectable";
@ -43,7 +43,9 @@ type Callback = (dis: DiContainers) => void | Promise<void>;
export interface ApplicationBuilder { export interface ApplicationBuilder {
dis: DiContainers; dis: DiContainers;
setEnvironmentToClusterFrame: () => ApplicationBuilder; setEnvironmentToClusterFrame: () => ApplicationBuilder;
addExtensions: (...extensions: LensRendererExtension[]) => Promise<ApplicationBuilder>; addExtensions: (
...extensions: LensRendererExtension[]
) => Promise<ApplicationBuilder>;
allowKubeResource: (resourceName: KubeResource) => ApplicationBuilder; allowKubeResource: (resourceName: KubeResource) => ApplicationBuilder;
beforeSetups: (callback: Callback) => ApplicationBuilder; beforeSetups: (callback: Callback) => ApplicationBuilder;
beforeRender: (callback: Callback) => ApplicationBuilder; beforeRender: (callback: Callback) => ApplicationBuilder;

2
src/renderer/frames/cluster-frame/cluster-frame.tsx
View File

@ -5,7 +5,7 @@
import React from "react"; import React from "react";
import type { IComputedValue } from "mobx"; import type { IComputedValue } from "mobx";
import { disposeOnUnmount, observer } from "mobx-react"; import { disposeOnUnmount, observer } from "mobx-react";
import { Redirect } from "react-router"; import { Redirect } from "react-router-dom";
import { ConfirmDialog } from "../../components/confirm-dialog"; import { ConfirmDialog } from "../../components/confirm-dialog";
import { DeploymentScaleDialog } from "../../components/+workloads-deployments/deployment-scale-dialog"; import { DeploymentScaleDialog } from "../../components/+workloads-deployments/deployment-scale-dialog";
import { CronJobTriggerDialog } from "../../components/+workloads-cronjobs/cronjob-trigger-dialog"; import { CronJobTriggerDialog } from "../../components/+workloads-cronjobs/cronjob-trigger-dialog";