2
0
Sean Rhee 5 жил өмнө
parent
commit
71b8dedf11

+ 1 - 1
dashboard/src/main/home/sidebar/ClusterSection.tsx

@@ -53,7 +53,7 @@ export default class ClusterSection extends Component<PropsType, StateType> {
         // TODO: handle uninitialized kubeconfig
         if (res.data) {
           let clusters = res.data;
-          clusters.sort((a, b) => a - b);
+          clusters.sort((a, b) => a.id - b.id);
           if (clusters.length > 0) {
             this.setState({ clusters });
             setCurrentCluster(clusters[(

+ 6 - 1
dashboard/src/main/home/sidebar/Drawer.tsx

@@ -22,6 +22,7 @@ export default class Drawer extends Component<PropsType, StateType> {
     let { currentCluster, setCurrentCluster } = this.context;
 
     if (clusters.length > 0 && currentCluster) {
+      clusters.sort((a, b) => a.id - b.id);
       return clusters.map((cluster: ClusterType, i: number) => {
         /*
         let active = this.context.activeProject &&
@@ -32,7 +33,11 @@ export default class Drawer extends Component<PropsType, StateType> {
           <ClusterOption
             key={i}
             active={cluster.name === currentCluster.name}
-            onClick={() => { setCurrentCluster(cluster); setCurrentView('cluster-dashboard') }}
+            onClick={() => {
+              localStorage.setItem('currentCluster', cluster.id);
+              setCurrentCluster(cluster);
+              setCurrentView('cluster-dashboard');
+            }}
           >
             <ClusterIcon><i className="material-icons">device_hub</i></ClusterIcon>
             <ClusterName>{cluster.name}</ClusterName>