fix(app): No longer dismiss run if canceled while running on ODD (#16142

) fix RQA-3100, RQA-3098
Opentrons · Aug 27, 2024 · f74aa8a · f74aa8a
1 parent 8a0ca2f
commit f74aa8a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 37 deletions.
diff --git a/app/src/organisms/OnDeviceDisplay/RunningProtocol/ConfirmCancelRunModal.tsx b/app/src/organisms/OnDeviceDisplay/RunningProtocol/ConfirmCancelRunModal.tsx
@@ -55,9 +55,17 @@ export function ConfirmCancelRunModal({
     dismissCurrentRun,
     isLoading: isDismissing,
   } = useDismissCurrentRunMutation({
-    onSuccess: () => {
-      if (isQuickTransfer && !isActiveRun) {
+    onSettled: () => {
+      if (isQuickTransfer && protocolId != null) {
         deleteRun(runId)
+        navigate(`/quick-transfer/${protocolId}`)
+      } else if (isQuickTransfer) {
+        deleteRun(runId)
+        navigate('/quick-transfer')
+      } else if (protocolId != null) {
+        navigate(`/protocols/${protocolId}`)
+      } else {
+        navigate('/protocols')
       }
     },
   })
@@ -87,17 +95,8 @@ export function ConfirmCancelRunModal({
   React.useEffect(() => {
     if (runStatus === RUN_STATUS_STOPPED) {
       trackProtocolRunEvent({ name: ANALYTICS_PROTOCOL_RUN_ACTION.CANCEL })
-      dismissCurrentRun(runId)
       if (!isActiveRun) {
-        if (isQuickTransfer && protocolId != null) {
-          navigate(`/quick-transfer/${protocolId}`)
-        } else if (isQuickTransfer) {
-          navigate('/quick-transfer')
-        } else if (protocolId != null) {
-          navigate(`/protocols/${protocolId}`)
-        } else {
-          navigate('/protocols')
-        }
+        dismissCurrentRun(runId)
       }
     }
   }, [runStatus])

diff --git a/app/src/organisms/OnDeviceDisplay/RunningProtocol/__tests__/ConfirmCancelRunModal.test.tsx b/app/src/organisms/OnDeviceDisplay/RunningProtocol/__tests__/ConfirmCancelRunModal.test.tsx
@@ -138,15 +138,7 @@ describe('ConfirmCancelRunModal', () => {
     expect(mockStopRun).toHaveBeenCalled()
   })
 
-  it('when run is stopped, the run is dismissed and the modal closes', () => {
-    when(useRunStatus).calledWith(RUN_ID).thenReturn(RUN_STATUS_STOPPED)
-    render(props)
-
-    expect(mockDismissCurrentRun).toHaveBeenCalled()
-    expect(mockTrackProtocolRunEvent).toHaveBeenCalled()
-  })
-
-  it('when run is stopped, the run is dismissed and the modal closes - in prepare to run', () => {
+  it('when run is stopped, the run is dismissed and the modal closes if the run is not yet active', () => {
     props = {
       ...props,
       isActiveRun: false,
@@ -156,18 +148,13 @@ describe('ConfirmCancelRunModal', () => {
 
     expect(mockDismissCurrentRun).toHaveBeenCalled()
     expect(mockTrackProtocolRunEvent).toHaveBeenCalled()
-    expect(mockNavigate).toHaveBeenCalledWith('/protocols')
   })
-  it('when quick transfer run is stopped, the run is dismissed and you return to quick transfer', () => {
-    props = {
-      ...props,
-      isActiveRun: false,
-      isQuickTransfer: true,
-    }
+
+  it('when run is stopped, the run is not dismissed if the run is active', () => {
     when(useRunStatus).calledWith(RUN_ID).thenReturn(RUN_STATUS_STOPPED)
     render(props)
 
-    expect(mockDismissCurrentRun).toHaveBeenCalled()
-    expect(mockNavigate).toHaveBeenCalledWith('/quick-transfer')
+    expect(mockDismissCurrentRun).not.toHaveBeenCalled()
+    expect(mockTrackProtocolRunEvent).toHaveBeenCalled()
   })
 })
diff --git a/app/src/pages/RunSummary/index.tsx b/app/src/pages/RunSummary/index.tsx
@@ -251,15 +251,10 @@ export function RunSummary(): JSX.Element {
   }, [isRunCurrent, enteredER])
 
   const returnToQuickTransfer = (): void => {
-    if (!isRunCurrent) {
+    closeCurrentRunIfValid(() => {
       deleteRun(runId)
       navigate('/quick-transfer')
-    } else {
-      closeCurrentRunIfValid(() => {
-        deleteRun(runId)
-        navigate('/quick-transfer')
-      })
-    }
+    })
   }
 
   // TODO(jh, 05-30-24): EXEC-487. Refactor reset() so we can redirect to the setup page, showing the shimmer skeleton instead.