Merge pull request #459 from porter-dev/master

Merge selected infra fix into staging

dashboard/src/main/home/provisioner/Provisioner.tsx

@@ -97,11 +97,17 @@ class Provisioner extends Component<PropsType, StateType> {
           return b.id - a.id;
         });
 
+        let selectedInfra = this.state.selectedInfra
+
+        if (!selectedInfra) {
+          selectedInfra = infras[0]
+        }
+
         this.setState({
           error: false,
           infras,
           loading: false,
-          selectedInfra: infras[0]
+          selectedInfra
         });
       })
       .catch();

dashboard/src/main/home/provisioner/ProvisionerLogs.tsx

@@ -168,16 +168,10 @@ class ProvisionerLogs extends Component<PropsType, StateType> {
           maxStep: validEvents[validEvents.length - 1]["total_resources"]
         },
         () => {
+          this.props.updateInfras();
           this.scrollToBottom();
         }
       );
-
-      if (
-        parseInt(validEvents[validEvents.length - 1]["created_resources"]) >=
-        parseInt(validEvents[validEvents.length - 1]["total_resources"])
-      ) {
-        this.props.updateInfras();
-      }
     };
 
     this.ws.onerror = (err: ErrorEvent) => {