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

Moved navigate statement into workspace renderer component

Browse Source 
Signed-off-by: Steve Richards <srichards@mirantis.com>
This commit is contained in:
Steve Richards 2020-10-16 09:08:16 +01:00
parent 8adf683056
commit fbcb656237
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/workspace-store.ts
View File

@ -3,7 +3,6 @@ import { BaseStore } from "./base-store";
import { clusterStore } from "./cluster-store" import { clusterStore } from "./cluster-store"
import { landingURL } from "../renderer/components/+landing-page/landing-page.route"; import { landingURL } from "../renderer/components/+landing-page/landing-page.route";
import { navigate } from "../renderer/navigation"; import { navigate } from "../renderer/navigation";
import { clusterViewURL } from "../renderer/components/cluster-manager/cluster-view.route";
export type WorkspaceId = string; export type WorkspaceId = string;
export type ClusterId = string; export type ClusterId = string;
@ -82,7 +81,6 @@ export class WorkspaceStore extends BaseStore<WorkspaceStoreModel> {
if (resetActiveCluster) { if (resetActiveCluster) {
if (clusterId) { if (clusterId) {
clusterStore.setActive(clusterId) clusterStore.setActive(clusterId)
navigate(clusterViewURL({ params: { clusterId } }));
} else { } else {
clusterStore.setActive(null) clusterStore.setActive(null)
if (redirectToLanding) { if (redirectToLanding) {

4
src/renderer/components/+workspaces/workspace-menu.tsx
View File

@ -10,6 +10,8 @@ import { observable } from "mobx";
import { workspaceStore, WorkspaceId } from "../../../common/workspace-store"; import { workspaceStore, WorkspaceId } from "../../../common/workspace-store";
import { cssNames } from "../../utils"; import { cssNames } from "../../utils";
import { clusterStore } from "../../../common/cluster-store"; import { clusterStore } from "../../../common/cluster-store";
import { navigate } from "../../navigation";
import { clusterViewURL } from "../cluster-manager/cluster-view.route";
interface Props extends Partial<MenuProps> { interface Props extends Partial<MenuProps> {
} }
@ -23,6 +25,8 @@ export class WorkspaceMenu extends React.Component<Props> {
workspaceStore.setLastActiveClusterId(workspaceStore.currentWorkspaceId, clusterStore.activeClusterId); workspaceStore.setLastActiveClusterId(workspaceStore.currentWorkspaceId, clusterStore.activeClusterId);
} }
workspaceStore.setActive(id); workspaceStore.setActive(id);
const clusterId = workspaceStore.currentWorkspace.lastActiveClusterId;
navigate(clusterViewURL({ params: { clusterId } }));
} }
render() { render() {