feat(app): Remove labware logic from deck conflict resolution checker (#18676)

fix EXEC-1470

Author: smb2268

app/src/organisms/Desktop/Devices/ProtocolRun/SetupModuleAndDeck/SetupFixtureList.tsx

@@ -19,12 +19,12 @@ import {
 } from '@opentrons/components'
 import {
   FLEX_ROBOT_TYPE,
+  FLEX_STACKER_ADDRESSABLE_AREAS,
   FLEX_USB_MODULE_ADDRESSABLE_AREAS,
   getCutoutDisplayName,
   getDeckDefFromRobotType,
   getFixtureDisplayName,
   SINGLE_SLOT_FIXTURES,
-  TC_MODULE_LOCATION_OT3,
   THERMOCYCLER_V2_FRONT_FIXTURE,
   THERMOCYCLER_V2_REAR_FIXTURE,
 } from '@opentrons/shared-data'
@@ -54,16 +54,22 @@ export const SetupFixtureList = (props: SetupFixtureListProps): JSX.Element => {
   const { deckConfigCompatibility, robotName } = props
   const deckDef = getDeckDefFromRobotType(FLEX_ROBOT_TYPE)
 
+  // if both A1 and B1 need to be empty but the thermocycler is attached, only
+  // show a conflict for A1 to avoid redundancy
   const hasTwoLabwareThermocyclerConflicts =
     deckConfigCompatibility.some(
-      ({ cutoutFixtureId, missingLabwareDisplayName }) =>
+      ({ cutoutFixtureId, compatibleCutoutFixtureIds }) =>
         cutoutFixtureId === THERMOCYCLER_V2_FRONT_FIXTURE &&
-        missingLabwareDisplayName != null
+        compatibleCutoutFixtureIds.some(fixtureId =>
+          SINGLE_SLOT_FIXTURES.includes(fixtureId)
+        )
     ) &&
     deckConfigCompatibility.some(
-      ({ cutoutFixtureId, missingLabwareDisplayName }) =>
+      ({ cutoutFixtureId, compatibleCutoutFixtureIds }) =>
         cutoutFixtureId === THERMOCYCLER_V2_REAR_FIXTURE &&
-        missingLabwareDisplayName != null
+        compatibleCutoutFixtureIds.some(fixtureId =>
+          SINGLE_SLOT_FIXTURES.includes(fixtureId)
+        )
     )
 
   // if there are two labware conflicts with the thermocycler, don't show the conflict with the thermocycler rear fixture
@@ -84,7 +90,10 @@ export const SetupFixtureList = (props: SetupFixtureListProps): JSX.Element => {
         // as they're handled in the Modules Table
         return cutoutConfigAndCompatibility.requiredAddressableAreas.every(
           raa => FLEX_USB_MODULE_ADDRESSABLE_AREAS.includes(raa)
-        ) ? null : (
+        ) ||
+          cutoutConfigAndCompatibility.requiredAddressableAreas.some(raa =>
+            FLEX_STACKER_ADDRESSABLE_AREAS.includes(raa)
+          ) ? null : (
           <FixtureListItem
             key={cutoutConfigAndCompatibility.cutoutId}
             deckDef={deckDef}
@@ -106,7 +115,6 @@ export function FixtureListItem({
   cutoutId,
   cutoutFixtureId,
   compatibleCutoutFixtureIds,
-  missingLabwareDisplayName,
   deckDef,
   robotName,
 }: FixtureListItemProps): JSX.Element {
@@ -115,14 +123,10 @@ export function FixtureListItem({
   const isCurrentFixtureCompatible =
     cutoutFixtureId != null &&
     compatibleCutoutFixtureIds.includes(cutoutFixtureId)
-  const isRequiredSingleSlotMissing = missingLabwareDisplayName != null
+
   const isConflictingFixtureConfigured =
     cutoutFixtureId != null && !SINGLE_SLOT_FIXTURES.includes(cutoutFixtureId)
 
-  const isThermocyclerCurrentFixture =
-    cutoutFixtureId === THERMOCYCLER_V2_FRONT_FIXTURE ||
-    cutoutFixtureId === THERMOCYCLER_V2_REAR_FIXTURE
-
   let statusLabel
   if (!isCurrentFixtureCompatible) {
     statusLabel = (
@@ -179,7 +183,6 @@ export function FixtureListItem({
           }}
           cutoutId={cutoutId}
           deckDef={deckDef}
-          missingLabwareDisplayName={missingLabwareDisplayName}
           requiredFixtureId={compatibleCutoutFixtureIds[0]}
           robotName={robotName}
         />
@@ -208,8 +211,7 @@ export function FixtureListItem({
                 width="60px"
                 height="54px"
                 src={
-                  // show the current fixture for a missing single slot
-                  isCurrentFixtureCompatible || isRequiredSingleSlotMissing
+                  isCurrentFixtureCompatible
                     ? getFixtureImage(cutoutFixtureId)
                     : getFixtureImage(compatibleCutoutFixtureIds?.[0])
                 }
@@ -223,7 +225,7 @@ export function FixtureListItem({
                 css={TYPOGRAPHY.pSemiBold}
                 marginLeft={SPACING.spacing20}
               >
-                {isCurrentFixtureCompatible || isRequiredSingleSlotMissing
+                {isCurrentFixtureCompatible
                   ? getFixtureDisplayName(cutoutFixtureId)
                   : getFixtureDisplayName(compatibleCutoutFixtureIds?.[0])}
               </LegacyStyledText>
@@ -248,9 +250,7 @@ export function FixtureListItem({
             </Flex>
           </Flex>
           <LegacyStyledText as="p" width="15%">
-            {isThermocyclerCurrentFixture && isRequiredSingleSlotMissing
-              ? TC_MODULE_LOCATION_OT3
-              : getCutoutDisplayName(cutoutId)}
+            {getCutoutDisplayName(cutoutId)}
           </LegacyStyledText>
           <Flex
             width="15%"

app/src/organisms/Desktop/Devices/ProtocolRun/SetupModuleAndDeck/__tests__/SetupFixtureList.test.tsx

@@ -36,7 +36,6 @@ const mockDeckConfigCompatibility: CutoutConfigAndCompatibility[] = [
     compatibleCutoutFixtureIds: [
       STAGING_AREA_SLOT_WITH_WASTE_CHUTE_RIGHT_ADAPTER_NO_COVER_FIXTURE,
     ],
-    missingLabwareDisplayName: null,
   },
 ]
 
@@ -48,7 +47,6 @@ const mockNotConfiguredDeckConfigCompatibility: CutoutConfigAndCompatibility[] =
     compatibleCutoutFixtureIds: [
       STAGING_AREA_SLOT_WITH_WASTE_CHUTE_RIGHT_ADAPTER_NO_COVER_FIXTURE,
     ],
-    missingLabwareDisplayName: null,
   },
 ]
 
@@ -60,7 +58,6 @@ const mockConflictDeckConfigCompatibility: CutoutConfigAndCompatibility[] = [
     compatibleCutoutFixtureIds: [
       STAGING_AREA_SLOT_WITH_WASTE_CHUTE_RIGHT_ADAPTER_NO_COVER_FIXTURE,
     ],
-    missingLabwareDisplayName: null,
   },
 ]
 
@@ -135,7 +132,6 @@ describe('SetupFixtureList', () => {
           compatibleCutoutFixtureIds: [
             STAGING_AREA_SLOT_WITH_MAGNETIC_BLOCK_V1_FIXTURE,
           ],
-          missingLabwareDisplayName: null,
         },
       ],
       robotName: 'otie',

app/src/organisms/Desktop/Devices/ProtocolRun/SetupModuleAndDeck/__tests__/SetupModulesAndDeck.test.tsx

@@ -128,7 +128,6 @@ describe('SetupModuleAndDeck', () => {
         cutoutFixtureId: 'trashBinAdapter',
         requiredAddressableAreas: ['movableTrashA1'],
         compatibleCutoutFixtureIds: ['trashBinAdapter'],
-        missingLabwareDisplayName: null,
       },
     ])
     render(props)

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

@@ -67,7 +67,6 @@ export const SetupModuleAndDeck = ({
     robotType,
     protocolAnalysis
   )
-
   const isFixtureMismatch = getIsFixtureMismatch(deckConfigCompatibility)
 
   const requiredDeckConfigCompatibility = getRequiredDeckConfig(

app/src/organisms/Desktop/Devices/ProtocolRun/SetupModuleAndDeck/utils.ts

@@ -1,6 +1,7 @@
 import {
   HEATERSHAKER_MODULE_V1_FIXTURE,
   MAGNETIC_BLOCK_V1_FIXTURE,
+  SINGLE_SLOT_FIXTURES,
   STAGING_AREA_RIGHT_SLOT_FIXTURE,
   STAGING_AREA_SLOT_WITH_MAGNETIC_BLOCK_V1_FIXTURE,
   TEMPERATURE_MODULE_V2_FIXTURE,
@@ -24,7 +25,10 @@ import wasteChute from '/app/assets/images/waste_chute.png'
 import type { CutoutFixtureId } from '@opentrons/shared-data'
 
 export function getFixtureImage(cutoutFixtureId: CutoutFixtureId): string {
-  if (cutoutFixtureId === STAGING_AREA_RIGHT_SLOT_FIXTURE) {
+  if (SINGLE_SLOT_FIXTURES.includes(cutoutFixtureId)) {
+    // TODO: replace with image for single slot fixtures once we get final renders
+    return stagingArea
+  } else if (cutoutFixtureId === STAGING_AREA_RIGHT_SLOT_FIXTURE) {
     return stagingArea
   } else if (WASTE_CHUTE_ONLY_FIXTURES.includes(cutoutFixtureId)) {
     return wasteChute

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

@@ -376,7 +376,6 @@ describe('ProtocolRunSetup', () => {
           compatibleCutoutFixtureIds: [
             STAGING_AREA_SLOT_WITH_WASTE_CHUTE_RIGHT_ADAPTER_NO_COVER_FIXTURE,
           ],
-          missingLabwareDisplayName: null,
         },
       ])
       vi.mocked(getRequiredDeckConfig).mockReturnValue([

app/src/organisms/LocationConflictModal/LocationConflictModal.tsx

@@ -53,7 +53,6 @@ interface LocationConflictModalProps {
   cutoutId: CutoutId
   deckDef: DeckDefinition
   robotName: string
-  missingLabwareDisplayName?: string | null
   requiredFixtureId?: CutoutFixtureId
   requiredModule?: ModuleModel
   isOnDevice?: boolean
@@ -66,7 +65,6 @@ export const LocationConflictModal = (
     onCloseClick,
     cutoutId,
     robotName,
-    missingLabwareDisplayName,
     requiredFixtureId,
     requiredModule,
     deckDef,
@@ -185,9 +183,7 @@ export const LocationConflictModal = (
   }
 
   let protocolSpecifiesDisplayName = ''
-  if (missingLabwareDisplayName != null) {
-    protocolSpecifiesDisplayName = missingLabwareDisplayName
-  } else if (requiredFixtureId != null) {
+  if (requiredFixtureId != null) {
     protocolSpecifiesDisplayName = getFixtureDisplayName(requiredFixtureId)
   } else if (requiredModule != null) {
     protocolSpecifiesDisplayName = getModuleDisplayName(requiredModule)

app/src/organisms/LocationConflictModal/__tests__/LocationConflictModal.test.tsx

@@ -11,7 +11,7 @@ import {
 } from '@opentrons/react-api-client'
 import {
   ot3StandardDeckV5,
-  SINGLE_RIGHT_SLOT_FIXTURE,
+  SINGLE_LEFT_SLOT_FIXTURE,
   STAGING_AREA_RIGHT_SLOT_FIXTURE,
   TRASH_BIN_ADAPTER_FIXTURE,
 } from '@opentrons/shared-data'
@@ -119,8 +119,7 @@ describe('LocationConflictModal', () => {
     props = {
       onCloseClick: vi.fn(),
       cutoutId: 'cutoutB1',
-      requiredFixtureId: SINGLE_RIGHT_SLOT_FIXTURE,
-      missingLabwareDisplayName: 'a tiprack',
+      requiredFixtureId: SINGLE_LEFT_SLOT_FIXTURE,
       deckDef: ot3StandardDeckV5 as any,
       robotName: 'otie',
     }
@@ -130,7 +129,7 @@ describe('LocationConflictModal', () => {
     screen.getByText('Protocol specifies')
     screen.getByText('Currently configured')
     screen.getAllByText('Trash bin')
-    screen.getByText('a tiprack')
+    screen.getByText('Left slot')
     fireEvent.click(screen.getByRole('button', { name: 'Cancel' }))
     expect(props.onCloseClick).toHaveBeenCalled()
     fireEvent.click(screen.getByRole('button', { name: 'Update deck' }))

app/src/organisms/ODD/ProtocolSetup/ProtocolSetupModulesAndDeck/FixtureTable.tsx

@@ -16,6 +16,7 @@ import {
   TYPOGRAPHY,
 } from '@opentrons/components'
 import {
+  FLEX_STACKER_ADDRESSABLE_AREAS,
   FLEX_USB_MODULE_ADDRESSABLE_AREAS,
   getCutoutDisplayName,
   getDeckDefFromRobotType,
@@ -81,14 +82,14 @@ export function FixtureTable({
 
   const hasTwoLabwareThermocyclerConflicts =
     requiredDeckConfigCompatibility.some(
-      ({ cutoutFixtureId, missingLabwareDisplayName }) =>
+      ({ cutoutFixtureId, requiredAddressableAreas }) =>
         cutoutFixtureId === THERMOCYCLER_V2_FRONT_FIXTURE &&
-        missingLabwareDisplayName != null
+        requiredAddressableAreas.includes('B1')
     ) &&
     requiredDeckConfigCompatibility.some(
-      ({ cutoutFixtureId, missingLabwareDisplayName }) =>
+      ({ cutoutFixtureId, requiredAddressableAreas }) =>
         cutoutFixtureId === THERMOCYCLER_V2_REAR_FIXTURE &&
-        missingLabwareDisplayName != null
+        requiredAddressableAreas.includes('A1')
     )
 
   // if there are two labware conflicts with the thermocycler, don't show the conflict with the thermocycler rear fixture
@@ -117,7 +118,10 @@ export function FixtureTable({
         // as they're handled in the Modules Table
         return fixtureCompatibility.requiredAddressableAreas.every(raa =>
           FLEX_USB_MODULE_ADDRESSABLE_AREAS.includes(raa)
-        ) ? null : (
+        ) ||
+          fixtureCompatibility.requiredAddressableAreas.some(raa =>
+            FLEX_STACKER_ADDRESSABLE_AREAS.includes(raa)
+          ) ? null : (
           <FixtureTableItem
             key={`FixtureTableItem_${index}`}
             {...fixtureCompatibility}
@@ -147,7 +151,6 @@ function FixtureTableItem({
   cutoutId,
   cutoutFixtureId,
   compatibleCutoutFixtureIds,
-  missingLabwareDisplayName,
   lastItem,
   setSetupScreen,
   setCutoutId,
@@ -165,7 +168,9 @@ function FixtureTableItem({
   const isCurrentFixtureCompatible =
     cutoutFixtureId != null &&
     compatibleCutoutFixtureIds.includes(cutoutFixtureId)
-  const isRequiredSingleSlotMissing = missingLabwareDisplayName != null
+  const isRequiredSingleSlotMissing = compatibleCutoutFixtureIds.some(
+    fixtureId => SINGLE_SLOT_FIXTURES.includes(fixtureId)
+  )
 
   const isThermocyclerCurrentFixture =
     cutoutFixtureId === THERMOCYCLER_V2_FRONT_FIXTURE ||
@@ -226,7 +231,6 @@ function FixtureTableItem({
           cutoutId={cutoutId}
           requiredFixtureId={compatibleCutoutFixtureIds[0]}
           isOnDevice={true}
-          missingLabwareDisplayName={missingLabwareDisplayName}
           deckDef={deckDef}
           robotName={robotName}
         />

app/src/organisms/ODD/ProtocolSetup/ProtocolSetupModulesAndDeck/__tests__/FixtureTable.test.tsx

@@ -56,7 +56,6 @@ describe('FixtureTable', () => {
         compatibleCutoutFixtureIds: [
           STAGING_AREA_SLOT_WITH_WASTE_CHUTE_RIGHT_ADAPTER_NO_COVER_FIXTURE,
         ],
-        missingLabwareDisplayName: null,
       },
     ])
   })
@@ -76,7 +75,6 @@ describe('FixtureTable', () => {
         cutoutFixtureId: SINGLE_RIGHT_SLOT_FIXTURE,
         requiredAddressableAreas: [MOVABLE_TRASH_D3_ADDRESSABLE_AREA],
         compatibleCutoutFixtureIds: [TRASH_BIN_ADAPTER_FIXTURE],
-        missingLabwareDisplayName: null,
       },
     ])
 
@@ -98,7 +96,6 @@ describe('FixtureTable', () => {
         cutoutFixtureId: STAGING_AREA_SLOT_WITH_WASTE_CHUTE_RIGHT_ADAPTER_NO_COVER_FIXTURE,
         requiredAddressableAreas: [MOVABLE_TRASH_D3_ADDRESSABLE_AREA],
         compatibleCutoutFixtureIds: [TRASH_BIN_ADAPTER_FIXTURE],
-        missingLabwareDisplayName: null,
       },
     ])