allow location conflict to grab serial number of first matching module

app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/LocationConflictModal.tsx

@@ -3,6 +3,7 @@ import { createPortal } from 'react-dom'
 import { Trans, useTranslation } from 'react-i18next'
 import {
   useDeckConfigurationQuery,
+  useModulesQuery,
   useUpdateDeckConfigurationMutation,
 } from '@opentrons/react-api-client'
 import {
@@ -32,6 +33,8 @@ import {
   THERMOCYCLER_MODULE_V2,
   getCutoutFixtureIdsForModuleModel,
   getCutoutFixturesForModuleModel,
+  getAddressableAreaNamesFromLoadedModule,
+  getCutoutIdForSlotName,
 } from '@opentrons/shared-data'
 import { getTopPortalEl } from '../../../../App/portal'
 import { LegacyModal } from '../../../../molecules/LegacyModal'
@@ -46,6 +49,7 @@ import type {
   DeckDefinition,
 } from '@opentrons/shared-data'
 import { replace } from 'lodash'
+import { cs } from 'date-fns/locale'
 
 interface LocationConflictModalProps {
   onCloseClick: () => void
@@ -70,6 +74,7 @@ export const LocationConflictModal = (
     isOnDevice = false,
   } = props
   const { t, i18n } = useTranslation(['protocol_setup', 'shared'])
+  const attachedModules = useModulesQuery().data?.data ?? []
   const deckConfig = useDeckConfigurationQuery().data ?? []
   const { updateDeckConfiguration } = useUpdateDeckConfigurationMutation()
   const deckConfigurationAtLocationFixtureId = deckConfig.find(
@@ -105,15 +110,17 @@ export const LocationConflictModal = (
 
       updateDeckConfiguration(newRequiredFixtureDeckConfig)
     } else if (requiredModule != null) {
+      const addressableAreas = getAddressableAreaNamesFromLoadedModule(requiredModule, cutoutId.replace('cutout', ''), deckDef)
       const cutoutFixtures = getCutoutFixturesForModuleModel(requiredModule, deckDef)
-      const cutoutIdsToReplace = cutoutFixtures.map(cf => cf.mayMountTo[0])
       const newDeckConfig = deckConfig.map(fixture => {
-        const replacementFixture = cutoutFixtures.find(cf => cf.mayMountTo[0] === fixture.cutoutId)
-        return cutoutIdsToReplace.includes(fixture.cutoutId) && replacementFixture != null
-          ? { ...fixture, cutoutFixtureId: replacementFixture?.id }
+        const replacementFixture = cutoutFixtures.find(cf => (
+          cf.mayMountTo.includes(fixture.cutoutId)
+          && addressableAreas.some(aa => cf.providesAddressableAreas[cutoutId].includes(aa))
+        ))
+        return cutoutId === fixture.cutoutId && replacementFixture != null
+          ? { ...fixture, cutoutFixtureId: replacementFixture?.id, opentronsModuleSerialNumber: attachedModules.find(m => m.moduleModel === requiredModule)?.serialNumber }
           : fixture
       })
-
       updateDeckConfiguration(newDeckConfig)
     }
     onCloseClick()

shared-data/js/fixtures.ts

@@ -186,11 +186,12 @@ export function getCutoutIdsFromModuleSlotName(
 }
 
 export function getAddressableAreaNamesFromLoadedModule(
-  params: LoadModuleCreateCommand['params'],
+  moduleModel: ModuleModel,
+  slotName: ModuleLocation['slotName'],
   deckDef: DeckDefinition
 ): AddressableAreaName[] {
-  const moduleFixtures = getCutoutFixturesForModuleModel(params.model, deckDef)
-  const cutoutIds = getCutoutIdsFromModuleSlotName(params.location.slotName, moduleFixtures)
+  const moduleFixtures = getCutoutFixturesForModuleModel(moduleModel, deckDef)
+  const cutoutIds = getCutoutIdsFromModuleSlotName(slotName, moduleFixtures)
   return moduleFixtures.reduce<AddressableAreaName[]>(
     (acc, cutoutFixture) => {
       const providedAddressableAreas =

shared-data/js/helpers/getAddressableAreasInProtocol.ts

@@ -65,7 +65,8 @@ export function getAddressableAreasInProtocol(
         !acc.includes(params.location.slotName as AddressableAreaName)
       ) {
         const addressableAreaNames = getAddressableAreaNamesFromLoadedModule(
-          params,
+          params.model,
+          params.location.slotName,
           deckDef
         )
 

shared-data/js/helpers/getSimplestFlexDeckConfig.ts

@@ -111,7 +111,6 @@ export function getSimplestDeckConfigForProtocol(
     }
     return acc
   }, FLEX_SIMPLEST_DECK_CONFIG_PROTOCOL_SPEC)
-
   return simplestDeckConfig
 }