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

Refactored to use observable field

Browse Source 
Signed-off-by: Steve Richards <srichards@mirantis.com>
This commit is contained in:
Steve Richards 2020-10-13 16:55:21 +01:00
parent d8f972a02e
commit 8adf683056
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,9 +146,8 @@ export class AddCluster extends React.Component {
clusterStore.addCluster(...newClusters); clusterStore.addCluster(...newClusters);
if (newClusters.length === 1) { if (newClusters.length === 1) {
const clusterId = newClusters[0].id; const clusterId = newClusters[0].id;
const wsId = workspaceStore.currentWorkspace.id;
clusterStore.setActive(clusterId); clusterStore.setActive(clusterId);
workspaceStore.setLastActiveClusterId(wsId, clusterStore.activeClusterId); workspaceStore.setLastActiveClusterId(workspaceStore.currentWorkspaceId, clusterStore.activeClusterId);
navigate(clusterViewURL({ params: { clusterId } })); navigate(clusterViewURL({ params: { clusterId } }));
} else { } else {
Notifications.ok( Notifications.ok(

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

@ -20,7 +20,7 @@ export class WorkspaceMenu extends React.Component<Props> {
activateWorkspace = (id: WorkspaceId) => { activateWorkspace = (id: WorkspaceId) => {
if (clusterStore.activeClusterId) { if (clusterStore.activeClusterId) {
workspaceStore.setLastActiveClusterId(workspaceStore.currentWorkspace.id, clusterStore.activeClusterId); workspaceStore.setLastActiveClusterId(workspaceStore.currentWorkspaceId, clusterStore.activeClusterId);
} }
workspaceStore.setActive(id); workspaceStore.setActive(id);
} }

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

@ -29,9 +29,8 @@ interface Props {
@observer @observer
export class ClustersMenu extends React.Component<Props> { export class ClustersMenu extends React.Component<Props> {
showCluster = (clusterId: ClusterId) => { showCluster = (clusterId: ClusterId) => {
const wsId = workspaceStore.currentWorkspace.id;
if(clusterId) { if(clusterId) {
workspaceStore.setLastActiveClusterId(wsId, clusterId); workspaceStore.setLastActiveClusterId(workspaceStore.currentWorkspaceId, clusterId);
} }
clusterStore.setActive(clusterId); clusterStore.setActive(clusterId);
navigate(clusterViewURL({ params: { clusterId } })); navigate(clusterViewURL({ params: { clusterId } }));
@ -61,11 +60,10 @@ export class ClustersMenu extends React.Component<Props> {
menu.append(new MenuItem({ menu.append(new MenuItem({
label: _i18n._(t`Disconnect`), label: _i18n._(t`Disconnect`),
click: async () => { click: async () => {
const wsId = workspaceStore.currentWorkspace.id;
const wsLastActiveClusterId = workspaceStore.currentWorkspace.lastActiveClusterId const wsLastActiveClusterId = workspaceStore.currentWorkspace.lastActiveClusterId
if (clusterStore.isActive(cluster.id)) { if (clusterStore.isActive(cluster.id)) {
if (wsLastActiveClusterId === cluster.id) { if (wsLastActiveClusterId === cluster.id) {
workspaceStore.setLastActiveClusterId(wsId, ""); workspaceStore.setLastActiveClusterId(workspaceStore.currentWorkspaceId, "");
} }
navigate(landingURL()); navigate(landingURL());
clusterStore.setActive(null); clusterStore.setActive(null);
@ -84,11 +82,10 @@ export class ClustersMenu extends React.Component<Props> {
label: _i18n._(t`Remove`), label: _i18n._(t`Remove`),
}, },
ok: () => { ok: () => {
const wsId = workspaceStore.currentWorkspace.id;
const wsLastActiveClusterId = workspaceStore.currentWorkspace.lastActiveClusterId const wsLastActiveClusterId = workspaceStore.currentWorkspace.lastActiveClusterId
if (wsLastActiveClusterId === cluster.id) { if (wsLastActiveClusterId === cluster.id) {
workspaceStore.setLastActiveClusterId(wsId, ""); workspaceStore.setLastActiveClusterId(workspaceStore.currentWorkspaceId, "");
} }
if (clusterStore.activeClusterId === cluster.id) { if (clusterStore.activeClusterId === cluster.id) {
navigate(landingURL()); navigate(landingURL());