refactor(app): ensure drop tip post run CTA doesn't display while rel…

…oading run
Opentrons · Nov 19, 2024 · 0cdec49 · 0cdec49
1 parent 412e29f
commit 0cdec49
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/...colRun/ProtocolRunHeader/RunHeaderContent/ActionButton/hooks/useActionButtonProperties.ts b/...colRun/ProtocolRunHeader/RunHeaderContent/ActionButton/hooks/useActionButtonProperties.ts
@@ -132,6 +132,7 @@ export function useActionButtonProperties({
     handleButtonClick = () => {
       isResetRunLoadingRef.current = true
       reset()
+      runHeaderModalContainerUtils.dropTipUtils.resetTipStatus()
       trackEvent({
         name: ANALYTICS_PROTOCOL_PROCEED_TO_RUN,
         properties: { sourceLocation: 'RunRecordDetail', robotSerialNumber },

diff --git a/...evices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/hooks/useRunHeaderDropTip.ts b/...evices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/hooks/useRunHeaderDropTip.ts
@@ -22,6 +22,7 @@ import type { Run, RunStatus } from '@opentrons/api-client'
 import type {
   DropTipWizardFlowsProps,
   PipetteWithTip,
+  TipAttachmentStatusResult,
 } from '/app/organisms/DropTipWizardFlows'
 import type { UseProtocolDropTipModalResult } from '../modals'
 import type { PipetteDetails } from '/app/resources/maintenance_runs'
@@ -40,6 +41,7 @@ export interface UseRunHeaderDropTipParams {
 export interface UseRunHeaderDropTipResult {
   dropTipModalUtils: UseProtocolDropTipModalResult
   dropTipWizardUtils: RunHeaderDropTipWizProps
+  resetTipStatus: TipAttachmentStatusResult['resetTipStatus']
 }
 
 // Handles all the tip related logic during a protocol run on the desktop app.
@@ -111,11 +113,9 @@ export function useRunHeaderDropTip({
     {
       includeFixitCommands: false,
       pageLength: 1,
-      cursor: null,
     },
     { enabled: isTerminalRunStatus(runStatus) }
   )
-
   // Manage tip checking
   useEffect(() => {
     // If a user begins a new run without navigating away from the run page, reset tip status.
@@ -127,7 +127,9 @@ export function useRunHeaderDropTip({
       // have to do it here if done during Error Recovery.
       else if (
         runSummaryNoFixit != null &&
-        !lastRunCommandPromptedErrorRecovery(runSummaryNoFixit)
+        runSummaryNoFixit.length > 0 &&
+        !lastRunCommandPromptedErrorRecovery(runSummaryNoFixit) &&
+        isTerminalRunStatus(runStatus)
       ) {
         void determineTipStatus()
       }
@@ -150,7 +152,11 @@ export function useRunHeaderDropTip({
     }
   }, [runStatus, isRunCurrent, enteredER, initialPipettesWithTipsCount])
 
-  return { dropTipModalUtils, dropTipWizardUtils: buildDTWizUtils() }
+  return {
+    dropTipModalUtils,
+    dropTipWizardUtils: buildDTWizUtils(),
+    resetTipStatus,
+  }
 }
 
 // TODO(jh, 09-12-24): Consolidate this with the same utility that exists elsewhere.

diff --git a/app/src/pages/ODD/RunSummary/index.tsx b/app/src/pages/ODD/RunSummary/index.tsx
@@ -243,15 +243,14 @@ export function RunSummary(): JSX.Element {
   const runSummaryNoFixit = useCurrentRunCommands({
     includeFixitCommands: false,
     pageLength: 1,
-    cursor: null,
   })
   useEffect(() => {
     if (
       isRunCurrent &&
       runSummaryNoFixit != null &&
+      runSummaryNoFixit.length > 0 &&
       !lastRunCommandPromptedErrorRecovery(runSummaryNoFixit)
     ) {
-      console.log('HITTING THIS')
       void determineTipStatus()
     }
   }, [runSummaryNoFixit, isRunCurrent])