fix(app): do not gate /runCommandErrors on the run being current

Opentrons · Jan 9, 2025 · 2dc62af · 2dc62af
1 parent 9b10793
commit 2dc62af
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/...ces/ProtocolRun/ProtocolRunHeader/RunHeaderBannerContainer/TerminalRunBannerContainer.tsx b/...ces/ProtocolRun/ProtocolRunHeader/RunHeaderBannerContainer/TerminalRunBannerContainer.tsx
@@ -118,14 +118,10 @@ function ProtocolRunErrorBanner({
 
   const { closeCurrentRun } = useCloseCurrentRun()
 
-  const { highestPriorityError, commandErrorList } = runErrors
+  const { highestPriorityError } = runErrors
 
   const handleFailedRunClick = (): void => {
-    // TODO(jh, 08-15-24): Revisit the control flow here here after
-    //  commandErrorList may be fetched for a non-current run.
-    if (commandErrorList == null) {
-      closeCurrentRun()
-    }
+    closeCurrentRun()
     runHeaderModalContainerUtils.runFailedModalUtils.toggleModal()
   }
 

diff --git a/...evices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/hooks/useRunHeaderDropTip.ts b/...evices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/hooks/useRunHeaderDropTip.ts
@@ -111,17 +111,13 @@ export function useRunHeaderDropTip({
     }
   }, [runStatus, robotType, isRunCurrent])
 
-  // TODO(jh, 08-15-24): The enteredER condition is a hack, because errorCommands are only returned when a run is current.
-  // Ideally the run should not need to be current to view errorCommands.
-
   // If the run terminates with a "stopped" status, close the run if no tips are attached after running tip check at least once.
   // This marks the robot as "not busy" if drop tip CTAs are unnecessary.
   useEffect(() => {
     if (
       runStatus === RUN_STATUS_STOPPED &&
       isRunCurrent &&
-      (initialPipettesWithTipsCount === 0 || robotType === OT2_ROBOT_TYPE) &&
-      !enteredER
+      (initialPipettesWithTipsCount === 0 || robotType === OT2_ROBOT_TYPE)
     ) {
       closeCurrentRun()
     }

diff --git a/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/hooks/useRunErrors.ts b/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/hooks/useRunErrors.ts
@@ -1,7 +1,6 @@
 import { useRunCommandErrors } from '@opentrons/react-api-client'
 
 import { isTerminalRunStatus } from '../utils'
-import { useMostRecentRunId } from '/app/resources/runs'
 import { getHighestPriorityError } from '/app/transformations/runs'
 
 import type { RunStatus, Run } from '@opentrons/api-client'
@@ -27,14 +26,11 @@ export function useRunErrors({
   runRecord,
   runStatus,
 }: UseRunErrorsProps): UseRunErrorsResult {
-  const mostRecentRunId = useMostRecentRunId()
-  const isMostRecentRun = mostRecentRunId === runId
-
   const { data: commandErrorList } = useRunCommandErrors(
     runId,
     { cursor: 0, pageLength: ALL_COMMANDS_PAGE_LENGTH },
     {
-      enabled: isTerminalRunStatus(runStatus) && isMostRecentRun,
+      enabled: isTerminalRunStatus(runStatus),
     }
   )