|
|
@@ -38,12 +38,15 @@ class ClusterSection extends Component<PropsType, StateType> {
|
|
|
};
|
|
|
|
|
|
updateClusters = () => {
|
|
|
+ console.log("updating clusters...")
|
|
|
let { user, currentProject, setCurrentCluster } = this.context;
|
|
|
|
|
|
// TODO: query with selected filter once implemented
|
|
|
api
|
|
|
.getClusters("<token>", {}, { id: currentProject.id })
|
|
|
.then((res) => {
|
|
|
+ console.log("clusters are..");
|
|
|
+ console.log(res.data);
|
|
|
window.analytics.identify(user.userId, {
|
|
|
currentProject,
|
|
|
clusters: res.data,
|
|
|
@@ -60,19 +63,27 @@ class ClusterSection extends Component<PropsType, StateType> {
|
|
|
localStorage.getItem(currentProject.id + "-cluster")
|
|
|
);
|
|
|
if (saved !== "null") {
|
|
|
- setCurrentCluster(clusters[0]);
|
|
|
+ // Ensures currentCluster isn't prematurely set (causes issues downstream)
|
|
|
+ let loaded = false;
|
|
|
for (let i = 0; i < clusters.length; i++) {
|
|
|
if (
|
|
|
clusters[i].id === saved.id &&
|
|
|
clusters[i].project_id === saved.project_id &&
|
|
|
clusters[i].name === saved.name
|
|
|
) {
|
|
|
+ loaded = true;
|
|
|
setCurrentCluster(clusters[i]);
|
|
|
+ console.log("a: set current to", clusters[i]);
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
+ if (!loaded) {
|
|
|
+ setCurrentCluster(clusters[0]);
|
|
|
+ console.log("b: set current to", clusters[0]);
|
|
|
+ }
|
|
|
} else {
|
|
|
setCurrentCluster(clusters[0]);
|
|
|
+ console.log("c: set current to", clusters[0]);
|
|
|
}
|
|
|
} else if (
|
|
|
this.props.currentView !== "provisioner" &&
|
|
|
@@ -80,6 +91,7 @@ class ClusterSection extends Component<PropsType, StateType> {
|
|
|
) {
|
|
|
this.setState({ clusters: [] });
|
|
|
setCurrentCluster(null);
|
|
|
+ console.log("d set cluster");
|
|
|
// this.props.history.push("dashboard?tab=overview");
|
|
|
}
|
|
|
}
|
|
|
@@ -173,10 +185,10 @@ class ClusterSection extends Component<PropsType, StateType> {
|
|
|
|
|
|
render() {
|
|
|
return (
|
|
|
- <div>
|
|
|
+ <>
|
|
|
{this.renderDrawer()}
|
|
|
{this.renderContents()}
|
|
|
- </div>
|
|
|
+ </>
|
|
|
);
|
|
|
}
|
|
|
}
|