Fix Cluster select behavior

Now clicking cluster icon in sidebar
always leads to / dashboard. And
'Settings' submenu switches active
cluster at first and only the showing
Cluster Settings

Signed-off-by: alexfront <alex.andreev.email@gmail.com>
This commit is contained in:
alexfront committed 2020-08-07 14:53:52 +03:00
1 parent fe7f1785f7
commit 6c7f4d7f0c
2 files changed
+9 -5

No files matched your search

+4
View File
@@ -86,6 +86,10 @@ export class ClusterStore extends BaseStore<ClusterStoreModel> {
return Array.from(this.clusters.values());
}
setActive(id: ClusterId) {
this.activeClusterId = id;
}
hasClusters() {
return this.clusters.size > 0;
}
@@ -33,11 +33,8 @@ export class ClustersMenu extends React.Component<Props> {
@observable showHint = true;
showCluster = (clusterId: ClusterId) => {
if (clusterStore.activeClusterId === clusterId) {
clusterStore.setActive(clusterId);
navigate("/"); // redirect to index
} else {
clusterStore.activeClusterId = clusterId;
}
}
addCluster = () => {
@@ -50,7 +47,10 @@ export class ClustersMenu extends React.Component<Props> {
menu.append(new MenuItem({
label: _i18n._(t`Settings`),
click: () => navigate(clusterSettingsURL())
click: () => {
clusterStore.setActive(cluster.id);
navigate(clusterSettingsURL())
}
}));
if (cluster.online) {
menu.append(new MenuItem({