prevent bundle unlocking before completion

Author: CollinBeczak

src/components/HOCs/WithTaskBundle/WithTaskBundle.jsx

@@ -33,6 +33,7 @@ export function WithTaskBundle(WrappedComponent) {
       loading: false,
       updateTaskBundleError: false,
       isDeletingBundle: false,
+      isSubmittingTasks: false,
     };
 
     refreshLockInterval = null;
@@ -71,15 +72,15 @@ export function WithTaskBundle(WrappedComponent) {
 
     componentWillUnmount() {
       this.stopLockRefresh();
-      if (!this.state.isDeletingBundle) {
+      if (!this.state.isDeletingBundle && !this.state.isSubmittingTasks) {
         this.unlockBundleTasks();
       }
       window.removeEventListener("beforeunload", this.handleBeforeUnload);
     }
 
     handleBeforeUnload = () => {
       this.stopLockRefresh();
-      if (!this.state.isDeletingBundle) {
+      if (!this.state.isDeletingBundle && !this.state.isSubmittingTasks) {
         this.unlockBundleTasks();
       }
     };
@@ -474,6 +475,14 @@ export function WithTaskBundle(WrappedComponent) {
       }
     };
 
+    setSubmittingTasks = (isSubmitting) => {
+      this.setState({ isSubmittingTasks: isSubmitting });
+    };
+
+    clearSubmissionState = () => {
+      this.setState({ isSubmittingTasks: false });
+    };
+
     render() {
       return (
         <WrappedComponent
@@ -499,6 +508,9 @@ export function WithTaskBundle(WrappedComponent) {
           resetSelectedTasks={this.resetSelectedTasks}
           error={this.state.error}
           bundlingDisabledReason={this.state.bundlingDisabledReason}
+          setSubmittingTasks={this.setSubmittingTasks}
+          clearSubmissionState={this.clearSubmissionState}
+          isSubmittingTasks={this.state.isSubmittingTasks}
         />
       );
     }

src/components/TaskPane/ActiveTaskDetails/ActiveTaskControls/ActiveTaskControls.jsx

@@ -132,6 +132,12 @@ export class ActiveTaskControls extends Component {
   /** Mark the task as complete with the given status */
   complete = async (taskStatus) => {
     this.setState({ completingTask: true });
+
+    // Notify WithTaskBundle that task submission is starting
+    if (this.props.setSubmittingTasks) {
+      this.props.setSubmittingTasks(true);
+    }
+
     try {
       const taskBundle = await this.props.updateTaskBundle();
 
@@ -179,9 +185,16 @@ export class ActiveTaskControls extends Component {
       }
     } catch (error) {
       this.setState({ completingTask: false });
+      // Clear submission state on error
+      if (this.props.clearSubmissionState) {
+        this.props.clearSubmissionState();
+      }
       throw error;
     } finally {
       this.setState({ completingTask: false });
+      if (this.props.clearSubmissionState) {
+        this.props.clearSubmissionState();
+      }
     }
   };