Merge pull request #638 from porter-dev/master

persist provisioning msg + disable deploy button when loading

dashboard/src/components/values-form/FormWrapper.tsx

@@ -258,6 +258,10 @@ export default class FormWrapper extends Component<PropsType, StateType> {
   };
 
   isDisabled = () => {
+    if (this.props.saveValuesStatus == "loading") {
+      return true;
+    }
+
     let requiredMissing = false;
     this.state.requiredFields.forEach((requiredKey: string, i: number) => {
       if (!this.isSet(this.state.metaState[requiredKey]?.value)) {
@@ -371,7 +375,7 @@ export default class FormWrapper extends Component<PropsType, StateType> {
             text="Deploy"
             onClick={this.handleSubmit}
             status={
-              this.isDisabled()
+              this.isDisabled() && this.props.saveValuesStatus != "loading"
                 ? "Missing required fields"
                 : this.props.saveValuesStatus
             }

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

@@ -46,18 +46,18 @@ class ProvisionerLogs extends Component<PropsType, StateType> {
       return <Message>Please select a resource.</Message>;
     }
 
-    if (selectedInfra.status == "destroyed") {
-      return (
-        <Message>
-          This resource has been auto-destroyed due to an error during
-          provisioning.
-          <div>
-            Please check with your cloud provider to make sure all resources
-            have been properly destroyed.
-          </div>
-        </Message>
-      );
-    }
+    // if (selectedInfra.status == "destroyed") {
+    //   return (
+    //     <Message>
+    //       This resource has been auto-destroyed due to an error during
+    //       provisioning.
+    //       <div>
+    //         Please check with your cloud provider to make sure all resources
+    //         have been properly destroyed.
+    //       </div>
+    //     </Message>
+    //   );
+    // }
 
     if (logs.length == 0) {
       switch (selectedInfra.status) {