Просмотр исходного кода

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

jusrhee 5 лет назад
Родитель
Сommit
4e8ed1ed77

+ 7 - 2
dashboard/src/main/home/sidebar/ClusterSection.tsx

@@ -54,10 +54,15 @@ export default class ClusterSection extends Component<PropsType, StateType> {
         if (res.data) {
           let clusters = res.data;
           clusters.sort((a: any, b: any) => a.id - b.id);
-          console.log(clusters);
           if (clusters.length > 0) {
             this.setState({ clusters });
-            setCurrentCluster(clusters[0]);
+            try {
+              setCurrentCluster((localStorage.getItem('currentCluster')) ? 
+                JSON.parse(localStorage.getItem('currentCluster')) : clusters[0]
+              );
+            } catch {
+              setCurrentCluster(clusters[0]);
+            }
           } else if (this.props.currentView !== 'provisioner') {
             this.setState({ clusters: [] });
             setCurrentCluster(null);

+ 1 - 0
dashboard/src/shared/Context.tsx

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