Przeglądaj źródła

Merge branch 'sean-testing' of https://github.com/porter-dev/porter into beta.3.integration-frontend

jusrhee 5 lat temu
rodzic
commit
2928ea9111

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

@@ -56,9 +56,7 @@ export default class ClusterSection extends Component<PropsType, StateType> {
           clusters.sort((a, b) => a.id - b.id);
           if (clusters.length > 0) {
             this.setState({ clusters });
-            setCurrentCluster(clusters[(
-              localStorage.getItem('currentCluster') ? localStorage.getItem('currentCluster') : 0
-            )]);
+            setCurrentCluster(clusters[0]);
           } else if (this.props.currentView !== 'provisioner') {
             this.setState({ clusters: [] });
             setCurrentCluster(null);
@@ -79,7 +77,6 @@ export default class ClusterSection extends Component<PropsType, StateType> {
 
       // Refresh clusters on project change 
       if (this.state.prevProjectId !== this.context.currentProject.id) {
-        localStorage.setItem('currentCluster', this.context.currentProject.id);
         this.updateClusters();
         this.setState({ prevProjectId: this.context.currentProject.id });
       } else if (this.props.forceRefreshClusters === true) {

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

@@ -20,9 +20,10 @@ export default class Drawer extends Component<PropsType, StateType> {
   renderClusterList = (): JSX.Element[] | JSX.Element => {
     let { clusters, setCurrentView } = this.props;
     let { currentCluster, setCurrentCluster } = this.context;
+    
+    clusters.sort((a, b) => a.id - b.id);
 
     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 &&
@@ -33,11 +34,7 @@ export default class Drawer extends Component<PropsType, StateType> {
           <ClusterOption
             key={i}
             active={cluster.name === currentCluster.name}
-            onClick={() => {
-              localStorage.setItem('currentCluster', cluster.id);
-              setCurrentCluster(cluster);
-              setCurrentView('cluster-dashboard');
-            }}
+            onClick={() => { setCurrentCluster(cluster); setCurrentView('cluster-dashboard') }}
           >
             <ClusterIcon><i className="material-icons">device_hub</i></ClusterIcon>
             <ClusterName>{cluster.name}</ClusterName>