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 saving last cluster while jumping from tray

Browse Source 
Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
This commit is contained in:
Alex Andreev 2020-11-19 11:31:36 +03:00
parent cb13079077
commit 07f44f9454
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/cluster-store.ts
View File

@ -1,4 +1,4 @@
import type { WorkspaceId } from "./workspace-store"; import { WorkspaceId, workspaceStore } from "./workspace-store";
import path from "path"; import path from "path";
import { app, ipcRenderer, remote, webFrame } from "electron"; import { app, ipcRenderer, remote, webFrame } from "electron";
import { unlink } from "fs-extra"; import { unlink } from "fs-extra";
@ -138,7 +138,9 @@ export class ClusterStore extends BaseStore<ClusterStoreModel> {
@action @action
setActive(id: ClusterId) { setActive(id: ClusterId) {
this.activeCluster = this.clusters.has(id) ? id : null; const clusterId = this.clusters.has(id) ? id : null;
this.activeCluster = clusterId;
workspaceStore.setLastActiveClusterId(clusterId);
} }
@action @action

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

@ -72,7 +72,8 @@ export class Workspace implements WorkspaceModel, WorkspaceState {
id: this.id, id: this.id,
name: this.name, name: this.name,
description: this.description, description: this.description,
ownerRef: this.ownerRef ownerRef: this.ownerRef,
lastActiveClusterId: this.lastActiveClusterId
}) })
} }
} }
@ -191,6 +192,7 @@ export class WorkspaceStore extends BaseStore<WorkspaceStoreModel> {
@action @action
setLastActiveClusterId(clusterId: ClusterId, workspaceId = this.currentWorkspaceId) { setLastActiveClusterId(clusterId: ClusterId, workspaceId = this.currentWorkspaceId) {
console.log("Passed cluster ID", clusterId, "current workspace id = ", workspaceId)
if (clusterId != null) { if (clusterId != null) {
this.getById(workspaceId).lastActiveClusterId = clusterId; this.getById(workspaceId).lastActiveClusterId = clusterId;
} }

1
src/main/tray.ts
View File

@ -94,7 +94,6 @@ export function createTrayMenu(windowManager: WindowManager): Menu {
toolTip: clusterId, toolTip: clusterId,
async click() { async click() {
workspaceStore.setActive(workspace); workspaceStore.setActive(workspace);
clusterStore.setActive(clusterId);
windowManager.navigate(clusterViewURL({ params: { clusterId } })); windowManager.navigate(clusterViewURL({ params: { clusterId } }));
} }
} }

1
src/renderer/components/+add-cluster/add-cluster.tsx
View File

@ -167,7 +167,6 @@ export class AddCluster extends React.Component {
if (newClusters.length === 1) { if (newClusters.length === 1) {
const clusterId = newClusters[0].id; const clusterId = newClusters[0].id;
clusterStore.setActive(clusterId); clusterStore.setActive(clusterId);
workspaceStore.setLastActiveClusterId(clusterId);
navigate(clusterViewURL({ params: { clusterId } })); navigate(clusterViewURL({ params: { clusterId } }));
} else { } else {
if (newClusters.length > 1) { if (newClusters.length > 1) {

1
src/renderer/components/cluster-manager/clusters-menu.tsx
View File

@ -31,7 +31,6 @@ interface Props {
@observer @observer
export class ClustersMenu extends React.Component<Props> { export class ClustersMenu extends React.Component<Props> {
showCluster = (clusterId: ClusterId) => { showCluster = (clusterId: ClusterId) => {
workspaceStore.setLastActiveClusterId(clusterId);
navigate(clusterViewURL({ params: { clusterId } })); navigate(clusterViewURL({ params: { clusterId } }));
} }