fix(app): fix blocking LPC on the flex when the protocol does not involve a tip pick up

app/src/local-resources/instruments/utils.ts

@@ -1,3 +1,16 @@
+import { getProtocolUsesGripper } from '/app/transformations/commands'
+
+import type {
+  CompletedProtocolAnalysis,
+  LoadedPipette,
+  ProtocolAnalysisOutput,
+} from '@opentrons/shared-data'
+import type {
+  GripperData,
+  Instruments,
+  PipetteData,
+} from '@opentrons/api-client'
+
 export interface IsPartialTipConfigParams {
   channel: 1 | 8 | 96
   activeNozzleCount: number
@@ -16,3 +29,53 @@ export function isPartialTipConfig({
       return activeNozzleCount !== 96
   }
 }
+
+export function getIncompleteInstrumentCount(
+  analysis: CompletedProtocolAnalysis | ProtocolAnalysisOutput,
+  attachedInstruments: Instruments
+): number {
+  const speccedPipettes = analysis?.pipettes ?? []
+
+  const incompleteInstrumentCount = speccedPipettes.filter(loadedPipette => {
+    const attachedPipetteMatch = getPipetteMatch(
+      loadedPipette,
+      attachedInstruments
+    )
+    return attachedPipetteMatch?.data.calibratedOffset?.last_modified == null
+  }).length
+
+  const isExtensionMountReady = getProtocolUsesGripper(analysis)
+    ? getAttachedGripper(attachedInstruments)?.data.calibratedOffset
+        ?.last_modified != null
+    : true
+
+  return incompleteInstrumentCount + (isExtensionMountReady ? 0 : 1)
+}
+
+export function getAttachedGripper(
+  attachedInstruments: Instruments
+): GripperData | null {
+  return (
+    (attachedInstruments?.data ?? []).find(
+      (i): i is GripperData =>
+        i.instrumentType === 'gripper' &&
+        i.ok &&
+        i.data.calibratedOffset != null
+    ) ?? null
+  )
+}
+
+export function getPipetteMatch(
+  loadedPipette: LoadedPipette,
+  attachedInstruments: Instruments
+): PipetteData | null {
+  return (
+    (attachedInstruments?.data ?? []).find(
+      (i): i is PipetteData =>
+        i.instrumentType === 'pipette' &&
+        i.ok &&
+        i.mount === loadedPipette.mount &&
+        i.instrumentName === loadedPipette.pipetteName
+    ) ?? null
+  )
+}

app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunSetup.tsx

@@ -21,7 +21,10 @@ import {
   OT2_ROBOT_TYPE,
   parseAllRequiredModuleModels,
 } from '@opentrons/shared-data'
-import { useProtocolQuery } from '@opentrons/react-api-client'
+import {
+  useProtocolQuery,
+  useInstrumentsQuery,
+} from '@opentrons/react-api-client'
 
 import { Line } from '/app/atoms/structure'
 import { InfoMessage } from '/app/molecules/InfoMessage'
@@ -65,6 +68,7 @@ import { EmptySetupStep } from './EmptySetupStep'
 import { LearnAboutOffsetsLink } from './LearnAboutOffsetsLink'
 import { useLPCFlows } from '/app/organisms/LabwarePositionCheck'
 import { useUpdateClientLPC } from '/app/resources/client_data'
+import { getIncompleteInstrumentCount } from '/app/local-resources/instruments'
 
 import type { RefObject } from 'react'
 import type { Dispatch, State } from '/app/redux/types'
@@ -181,6 +185,13 @@ export function ProtocolRunSetup({
 
   const isMissingModule = missingModuleIds.length > 0
 
+  const { data: attachedInstruments } = useInstrumentsQuery()
+
+  const incompleteInstrumentCount: number | null =
+    protocolAnalysis != null && attachedInstruments != null
+      ? getIncompleteInstrumentCount(protocolAnalysis, attachedInstruments)
+      : null
+
   const hasModules = protocolAnalysis != null && modules.length > 0
   // need config compatibility (including check for single slot conflicts)
   const requiredDeckConfigCompatibility = getRequiredDeckConfig(
@@ -285,6 +296,10 @@ export function ProtocolRunSetup({
             }
           }}
           offsetsConfirmed={offsetsConfirmed}
+          hasMissingModulesForFlex={isMissingModule}
+          hasMissingCalForFlex={
+            incompleteInstrumentCount != null && incompleteInstrumentCount > 0
+          }
           lpcUtils={lpcUtils}
         />
       ),

app/src/organisms/Desktop/Devices/ProtocolRun/SetupLabwarePositionCheck/FlexSetupLPC/LPCSetupFlexBtns.tsx

@@ -34,10 +34,17 @@ export function LPCSetupFlexBtns({
   launchLPC,
   runId,
   robotName,
+  hasMissingModulesForFlex,
+  hasMissingCalForFlex,
 }: LPCSetupFlexBtnsProps): JSX.Element {
   const { t } = useTranslation('protocol_setup')
   const { makeSnackbar } = useToaster()
-  const lpcDisabledReason = useLPCDisabledReason({ robotName, runId })
+  const lpcDisabledReason = useLPCDisabledReason({
+    robotName,
+    runId,
+    hasMissingCalForFlex: hasMissingCalForFlex,
+    hasMissingModulesForFlex: hasMissingModulesForFlex,
+  })
   const isNecessaryDefaultOffsetMissing = useSelector(
     selectIsAnyNecessaryDefaultOffsetMissing(runId)
   )

app/src/organisms/Desktop/Devices/ProtocolRun/SetupLabwarePositionCheck/index.tsx

@@ -13,6 +13,8 @@ export interface SetupLabwarePositionCheckProps {
   robotType: RobotType
   runId: string
   lpcUtils: UseLPCFlowsResult
+  hasMissingModulesForFlex: boolean
+  hasMissingCalForFlex: boolean
 }
 
 export function SetupLabwarePositionCheck(

app/src/organisms/ODD/ProtocolSetup/ProtocolSetupInstruments/utils.ts

@@ -1,42 +1,11 @@
-import type {
-  CompletedProtocolAnalysis,
-  LoadedPipette,
-} from '@opentrons/shared-data'
-import type {
-  GripperData,
-  Instruments,
-  PipetteData,
-} from '@opentrons/api-client'
+import type { CompletedProtocolAnalysis } from '@opentrons/shared-data'
+import type { Instruments } from '@opentrons/api-client'
 
 import { getProtocolUsesGripper } from '/app/transformations/commands'
-
-export function getAttachedGripper(
-  attachedInstruments: Instruments
-): GripperData | null {
-  return (
-    (attachedInstruments?.data ?? []).find(
-      (i): i is GripperData =>
-        i.instrumentType === 'gripper' &&
-        i.ok &&
-        i.data.calibratedOffset != null
-    ) ?? null
-  )
-}
-
-export function getPipetteMatch(
-  loadedPipette: LoadedPipette,
-  attachedInstruments: Instruments
-): PipetteData | null {
-  return (
-    (attachedInstruments?.data ?? []).find(
-      (i): i is PipetteData =>
-        i.instrumentType === 'pipette' &&
-        i.ok &&
-        i.mount === loadedPipette.mount &&
-        i.instrumentName === loadedPipette.pipetteName
-    ) ?? null
-  )
-}
+import {
+  getAttachedGripper,
+  getPipetteMatch,
+} from '/app/local-resources/instruments'
 
 export function getAreInstrumentsReady(
   analysis: CompletedProtocolAnalysis,
@@ -57,25 +26,3 @@ export function getAreInstrumentsReady(
 
   return allSpeccedPipettesReady && isExtensionMountReady
 }
-
-export function getIncompleteInstrumentCount(
-  analysis: CompletedProtocolAnalysis,
-  attachedInstruments: Instruments
-): number {
-  const speccedPipettes = analysis?.pipettes ?? []
-
-  const incompleteInstrumentCount = speccedPipettes.filter(loadedPipette => {
-    const attachedPipetteMatch = getPipetteMatch(
-      loadedPipette,
-      attachedInstruments
-    )
-    return attachedPipetteMatch?.data.calibratedOffset?.last_modified == null
-  }).length
-
-  const isExtensionMountReady = getProtocolUsesGripper(analysis)
-    ? getAttachedGripper(attachedInstruments)?.data.calibratedOffset
-        ?.last_modified != null
-    : true
-
-  return incompleteInstrumentCount + (isExtensionMountReady ? 0 : 1)
-}

app/src/pages/ODD/ProtocolSetup/__tests__/ProtocolSetup.test.tsx

@@ -38,7 +38,6 @@ import {
   ProtocolSetupTitleSkeleton,
   ProtocolSetupStepSkeleton,
   getUnmatchedModulesForProtocol,
-  getIncompleteInstrumentCount,
 } from '/app/organisms/ODD/ProtocolSetup'
 import { ConfirmCancelRunModal } from '/app/organisms/ODD/RunningProtocol'
 import { mockProtocolModuleInfo } from '/app/organisms/ODD/ProtocolSetup/ProtocolSetupInstruments/__fixtures__'
@@ -72,6 +71,7 @@ import {
   selectOffsetSource,
 } from '/app/redux/protocol-runs'
 import { useNotifyCurrentMaintenanceRun } from '/app/resources/maintenance_runs'
+import { getIncompleteInstrumentCount } from '/app/local-resources/instruments'
 
 import type { UseQueryResult } from 'react-query'
 import type * as SharedData from '@opentrons/shared-data'
@@ -125,6 +125,7 @@ vi.mock('/app/local-resources/dom-utils')
 vi.mock('/app/organisms/LabwarePositionCheck')
 vi.mock('/app/redux/protocol-runs')
 vi.mock('/app/resources/maintenance_runs')
+vi.mock('/app/local-resources/instruments')
 
 const render = (path = '/') => {
   return renderWithProviders(

app/src/pages/ODD/ProtocolSetup/index.tsx

@@ -53,7 +53,6 @@ import {
   ProtocolSetupStepSkeleton,
   ProtocolSetupTitleSkeleton,
   getUnmatchedModulesForProtocol,
-  getIncompleteInstrumentCount,
   ViewOnlyParameters,
 } from '/app/organisms/ODD/ProtocolSetup'
 import { ConfirmCancelRunModal } from '/app/organisms/ODD/RunningProtocol'
@@ -97,6 +96,7 @@ import {
 } from '/app/redux/protocol-runs'
 import { LabwareOffsetsConflictModal } from '/app/organisms/LabwareOffsetsConflictModal'
 import { useNotifyCurrentMaintenanceRun } from '/app/resources/maintenance_runs'
+import { getIncompleteInstrumentCount } from '/app/local-resources/instruments'
 
 import type { Dispatch, SetStateAction } from 'react'
 import type { FlattenSimpleInterpolation } from 'styled-components'
@@ -753,8 +753,9 @@ export function ProtocolSetup(): JSX.Element {
       : null
   const lpcDisabledReason = useLPCDisabledReason({
     runId,
-    hasMissingModulesForOdd: isMissingModules,
-    hasMissingCalForOdd:
+    robotName,
+    hasMissingModulesForFlex: isMissingModules,
+    hasMissingCalForFlex:
       incompleteInstrumentCount != null && incompleteInstrumentCount > 0,
   })
   const protocolName =

app/src/resources/runs/__tests__/useLPCDisabledReason.test.tsx

@@ -90,8 +90,8 @@ describe('useLPCDisabledReason', () => {
       () =>
         useLPCDisabledReason({
           runId: RUN_ID_1,
-          hasMissingModulesForOdd: false,
-          hasMissingCalForOdd: false,
+          hasMissingModulesForFlex: false,
+          hasMissingCalForFlex: false,
         }),
       { wrapper }
     )
@@ -102,8 +102,8 @@ describe('useLPCDisabledReason', () => {
       () =>
         useLPCDisabledReason({
           runId: RUN_ID_1,
-          hasMissingModulesForOdd: true,
-          hasMissingCalForOdd: true,
+          hasMissingModulesForFlex: true,
+          hasMissingCalForFlex: true,
         }),
       { wrapper }
     )
@@ -130,8 +130,8 @@ describe('useLPCDisabledReason', () => {
       () =>
         useLPCDisabledReason({
           runId: RUN_ID_1,
-          hasMissingModulesForOdd: false,
-          hasMissingCalForOdd: true,
+          hasMissingModulesForFlex: false,
+          hasMissingCalForFlex: true,
         }),
       { wrapper }
     )
@@ -152,8 +152,8 @@ describe('useLPCDisabledReason', () => {
       () =>
         useLPCDisabledReason({
           runId: RUN_ID_1,
-          hasMissingModulesForOdd: true,
-          hasMissingCalForOdd: false,
+          hasMissingModulesForFlex: true,
+          hasMissingCalForFlex: false,
         }),
       { wrapper }
     )
@@ -189,8 +189,8 @@ describe('useLPCDisabledReason', () => {
       () =>
         useLPCDisabledReason({
           runId: RUN_ID_1,
-          hasMissingModulesForOdd: false,
-          hasMissingCalForOdd: false,
+          hasMissingModulesForFlex: false,
+          hasMissingCalForFlex: false,
         }),
       { wrapper }
     )
@@ -213,8 +213,8 @@ describe('useLPCDisabledReason', () => {
       () =>
         useLPCDisabledReason({
           runId: RUN_ID_1,
-          hasMissingModulesForOdd: false,
-          hasMissingCalForOdd: false,
+          hasMissingModulesForFlex: false,
+          hasMissingCalForFlex: false,
         }),
       { wrapper }
     )
@@ -239,8 +239,8 @@ describe('useLPCDisabledReason', () => {
       () =>
         useLPCDisabledReason({
           runId: RUN_ID_1,
-          hasMissingModulesForOdd: false,
-          hasMissingCalForOdd: false,
+          hasMissingModulesForFlex: false,
+          hasMissingCalForFlex: false,
         }),
       { wrapper }
     )
@@ -268,8 +268,8 @@ describe('useLPCDisabledReason', () => {
       () =>
         useLPCDisabledReason({
           runId: RUN_ID_1,
-          hasMissingModulesForOdd: false,
-          hasMissingCalForOdd: false,
+          hasMissingModulesForFlex: false,
+          hasMissingCalForFlex: false,
         }),
       { wrapper }
     )
@@ -305,8 +305,8 @@ describe('useLPCDisabledReason', () => {
       () =>
         useLPCDisabledReason({
           runId: RUN_ID_1,
-          hasMissingModulesForOdd: false,
-          hasMissingCalForOdd: false,
+          hasMissingModulesForFlex: false,
+          hasMissingCalForFlex: false,
         }),
       { wrapper }
     )