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

dashboard/src/main/home/sidebar/ClusterSection.tsx

@@ -56,7 +56,9 @@ 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[0]);
+            setCurrentCluster(clusters[(
+              (localStorage.getItem('currentCluster')) ? localStorage.getItem('currentCluster') : 0
+            )]);
           } else if (this.props.currentView !== 'provisioner') {
             this.setState({ clusters: [] });
             setCurrentCluster(null);

dashboard/src/main/home/sidebar/Drawer.tsx

@@ -20,10 +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 &&

dashboard/src/shared/Context.tsx

@@ -37,6 +37,7 @@ class ContextProvider extends Component {
     },
     currentCluster: null as ClusterType | null,
     setCurrentCluster: (currentCluster: ClusterType) => {
+      localStorage.setItem('currentCluster', currentCluster);
       this.setState({ currentCluster });
     },
     currentProject: null as ProjectType | null,