fix(app): fix slot validation on ODD location conflict check to account for thermocycler occupying 2 slots (#15239)

CaseyBatten · web-flow · commit 4dfd60854056 · 2024-05-21T16:44:23.000-04:00
Ensure slot conflict checking accounts for the thermocycler being comprised of two fixtures in the deck config when validating the cutout fixtures.
diff --git a/app/src/pages/Protocols/hooks/index.ts b/app/src/pages/Protocols/hooks/index.ts
@@ -142,7 +142,7 @@ export const useRequiredProtocolHardwareFromAnalysis = (
         hasSlotConflict: deckConfig.some(
           ({ cutoutId, cutoutFixtureId }) =>
             cutoutId === getCutoutIdForSlotName(location.slotName, deckDef) &&
-            cutoutFixtureId !== getCutoutFixtureIdsForModuleModel(model)[0]
+            !getCutoutFixtureIdsForModuleModel(model).includes(cutoutFixtureId)
         ),
       }
     })

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ export const useRequiredProtocolHardwareFromAnalysis = (`
`142`	`142`	`hasSlotConflict: deckConfig.some(`
`143`	`143`	`({ cutoutId, cutoutFixtureId }) =>`
`144`	`144`	`cutoutId === getCutoutIdForSlotName(location.slotName, deckDef) &&`
`145`		`- cutoutFixtureId !== getCutoutFixtureIdsForModuleModel(model)[0]`
	`145`	`+ !getCutoutFixtureIdsForModuleModel(model).includes(cutoutFixtureId)`
`146`	`146`	`),`
`147`	`147`	`}`
`148`	`148`	`})`