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

Merge branch 'beta.3.integration-frontend' into main

sunguroku 5 лет назад
Родитель
Сommit
d77dde5f77

+ 3 - 1
dashboard/src/main/home/Home.tsx

@@ -73,8 +73,10 @@ export default class Home extends Component<PropsType, StateType> {
                   });
                 }
               });
-
+              
+              console.log('infras viewdata: ', viewData);
               if (viewData.length > 0) {
+                console.log('setting to provisioner...');
                 this.setState({ currentView: 'provisioner', viewData});
               }
             }

+ 2 - 1
dashboard/src/main/home/new-project/Provisioner.tsx

@@ -219,7 +219,8 @@ export default class Provisioner extends Component<PropsType, StateType> {
     }
 
     if (maxStep !== 0 && currentStep === maxStep) {
-      console.log('Provisioning complete.')
+      console.log('Thinks provisioning complete.')
+      console.log(currentStep, maxStep);
       this.props.setCurrentView('dashboard');
     }
 

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

@@ -13,6 +13,7 @@ type PropsType = {
   releaseDrawer: () => void,
   setWelcome: (x: boolean) => void,
   setCurrentView: (x: string) => void,
+  currentView: string,
   isSelected: boolean,
   forceRefreshClusters: boolean,
   setRefreshClusters: (x: boolean) => void,
@@ -74,7 +75,7 @@ export default class ClusterSection extends Component<PropsType, StateType> {
     if (prevProps !== this.props) {
 
       // Refresh clusters on project change 
-      if (this.state.prevProjectId !== this.context.currentProject.id) {
+      if (this.state.prevProjectId !== this.context.currentProject.id && this.props.currentView !== 'provisioner') {
         this.updateClusters();
         this.setState({ prevProjectId: this.context.currentProject.id });
       } else if (this.props.forceRefreshClusters === true) {

+ 1 - 0
dashboard/src/main/home/sidebar/Sidebar.tsx

@@ -132,6 +132,7 @@ export default class Sidebar extends Component<PropsType, StateType> {
             forceCloseDrawer={this.state.forceCloseDrawer} 
             releaseDrawer={() => this.setState({ forceCloseDrawer: false })}
             setWelcome={this.props.setWelcome}
+            currentView={this.props.currentView}
             setCurrentView={this.props.setCurrentView}
             isSelected={this.props.currentView === 'cluster-dashboard'}
             forceRefreshClusters={this.props.forceRefreshClusters}