fix: OPTIC-109: Blank draft should not be created when an annotation …

…is submitted (#1562)

* fix: OPTIC-109: Blank draft should not be created when an annotation is submitted

* dont save a draft after the submission has started

* ensure we arent double submitting drafts

* dont need statusCallback

* update cypress

src/components/BottomBar/Controls.js

@@ -48,10 +48,15 @@ export const Controls = controlsInjector(observer(({ store, history, annotation
 
     if (isInProgress) return;
     setIsInProgress(true);
+
+    const selected = store.annotationStore?.selected;
+
     if(addedCommentThisSession){
+      selected?.submissionInProgress();
       callback();
     } else if((currentComment ?? '').trim()) {
       e.preventDefault();
+      selected?.submissionInProgress();
       await commentFormSubmit();
       callback();
     } else {
@@ -74,7 +79,9 @@ export const Controls = controlsInjector(observer(({ store, history, annotation
           if(store.hasInterface('comments:reject') ?? true) {
             buttonHandler(e, () => store.rejectAnnotation({}), 'Please enter a comment before rejecting');
           } else {
-            console.log('rejecting');
+            const selected = store.annotationStore?.selected;
+
+            selected?.submissionInProgress();
             await store.commentStore.commentFormSubmit();
             store.rejectAnnotation({});
           }
@@ -91,6 +98,9 @@ export const Controls = controlsInjector(observer(({ store, history, annotation
     buttons.push(
       <ButtonTooltip key="accept" title="Accept annotation: [ Ctrl+Enter ]">
         <Button aria-label="accept-annotation" disabled={disabled} look="primary" onClick={async () => {
+          const selected = store.annotationStore?.selected;
+
+          selected?.submissionInProgress();
           await store.commentStore.commentFormSubmit();
           store.acceptAnnotation();
         }}>
@@ -106,6 +116,9 @@ export const Controls = controlsInjector(observer(({ store, history, annotation
     buttons.push(
       <ButtonTooltip key="cancel-skip" title="Cancel skip: []">
         <Button aria-label="cancel-skip" disabled={disabled} look="primary" onClick={async () => {
+          const selected = store.annotationStore?.selected;
+
+          selected?.submissionInProgress();
           await store.commentStore.commentFormSubmit();
           store.unskipTask();
         }}>
@@ -121,6 +134,9 @@ export const Controls = controlsInjector(observer(({ store, history, annotation
             if(store.hasInterface('comments:skip') ?? true) {
               buttonHandler(e, () => store.skipTask({}), 'Please enter a comment before skipping');
             } else {
+              const selected = store.annotationStore?.selected;
+
+              selected?.submissionInProgress();
               await store.commentStore.commentFormSubmit();
               store.skipTask({});
             }
@@ -146,6 +162,10 @@ export const Controls = controlsInjector(observer(({ store, history, annotation
             onClick={async (event) => {
               event.preventDefault();
 
+              const selected = store.annotationStore?.selected;
+
+              selected?.submissionInProgress();
+
               if ('URLSearchParams' in window) {
                 const searchParams = new URLSearchParams(window.location.search);
 
@@ -154,6 +174,7 @@ export const Controls = controlsInjector(observer(({ store, history, annotation
 
                 window.history.pushState(null, '', newRelativePathQuery);
               }
+
               await store.commentStore.commentFormSubmit();
               onClickMethod();
             }}
@@ -179,6 +200,9 @@ export const Controls = controlsInjector(observer(({ store, history, annotation
                 mod={{ has_icon: useExitOption, disabled: isDisabled }}
                 onClick={async (event) => {
                   if (event.target.classList.contains('lsf-dropdown__trigger')) return;  
+                  const selected = store.annotationStore?.selected;
+
+                  selected?.submissionInProgress();
                   await store.commentStore.commentFormSubmit();
                   store.submitAnnotation();
                 }}
@@ -211,6 +235,9 @@ export const Controls = controlsInjector(observer(({ store, history, annotation
               mod={{ has_icon: useExitOption, disabled: isDisabled }}
               onClick={async (event) => {
                 if (event.target.classList.contains('lsf-dropdown__trigger')) return;
+                const selected = store.annotationStore?.selected;
+
+                selected?.submissionInProgress();
                 await store.commentStore.commentFormSubmit();
                 store.updateAnnotation();
               }}
@@ -241,6 +268,9 @@ export const Controls = controlsInjector(observer(({ store, history, annotation
           <ButtonTooltip key="submit" title={title}>
             <Elem name="tooltip-wrapper">
               <Button aria-label="submit" disabled={disabled || submitDisabled} look={look} onClick={async () => {
+                const selected = store.annotationStore?.selected;
+
+                selected?.submissionInProgress();
                 await store.commentStore.commentFormSubmit();
                 store.submitAnnotation();
               }}>
@@ -256,6 +286,9 @@ export const Controls = controlsInjector(observer(({ store, history, annotation
         const button = (
           <ButtonTooltip key="update" title="Update this task: [ Alt+Enter ]">
             <Button aria-label="submit" disabled={disabled || submitDisabled} look={look} onClick={async () => {
+              const selected = store.annotationStore?.selected;
+
+              selected?.submissionInProgress();
               await store.commentStore.commentFormSubmit();
               store.updateAnnotation();
             }}>

src/stores/Annotation/Annotation.js

@@ -253,6 +253,7 @@ export const Annotation = types
     draftSelected: false,
     autosaveDelay: 5000,
     isDraftSaving: false,
+    submissionStarted: 0,
     versions: {},
     resultSnapshot: '',
   }))
@@ -666,6 +667,8 @@ export const Annotation = types
     }),
 
     async saveDraft(params) {
+      // There is no draft to save as it was already saved as an annotation
+      if (self.submissionStarted) return;
       // if this is now a history item or prediction don't save it
       if (!self.editable) return;
 
@@ -679,15 +682,23 @@ export const Annotation = types
       self.setDraftSaving(true);
       return self.store.submitDraft(self, params).then((res) => {
         self.onDraftSaved(res);
+
         return res;
       });
     },
 
+    submissionInProgress() {
+      self.submissionStarted = Date.now();
+    },
+
     saveDraftImmediately() {
       if (self.autosave) self.autosave.flush();
     },
 
     async saveDraftImmediatelyWithResults() {
+      // There is no draft to save as it was already saved as an annotation
+      if (self.submissionStarted) return {};
+
       const res = await self.saveDraft(null);
 
       return res;

src/stores/AppStore.js

@@ -500,12 +500,12 @@ export default types
     }
     /* eslint-enable no-unused-vars */
 
-    function submitDraft(c, params = {}, statusCallback) {
+    function submitDraft(c, params = {}) {
       return new Promise(resolve => {
         const events = getEnv(self).events;
 
         if (!events.hasEvent('submitDraft')) return resolve();
-        const res = events.invokeFirst('submitDraft', self, c, params, statusCallback);
+        const res = events.invokeFirst('submitDraft', self, c, params);
 
         if (res && res.then) res.then(resolve);
         else resolve(res);

tests/functional/package.json

@@ -18,7 +18,7 @@
     "cvg:summary": "nyc report --temp-dir=.nyc_output --reporter=text-summary --cwd=. --exclude-after-remap false"
   },
   "dependencies": {
-    "@heartexlabs/ls-test": "git+ssh://[email protected]/heartexlabs/ls-frontend-test#522adf318dce98b535fc8f9646791b3a1a2aeebb"
+    "@heartexlabs/ls-test": "git+ssh://[email protected]/heartexlabs/ls-frontend-test#4c67cf3278d16b39715e55e330d86a5065aca7ba"
   },
   "devDependencies": {
     "ts-loader": "^9.4.2",