refactor(protocol-designer): adapter support for dropdown and update …

…img (#14094) closes RAUT-891
Opentrons · Dec 19, 2023 · 1c6681b · 1c6681b
1 parent 983b5d4
commit 1c6681b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/protocol-designer/src/images/deck_configuration.png b/protocol-designer/src/images/deck_configuration.png
diff --git a/protocol-designer/src/ui/modules/utils.ts b/protocol-designer/src/ui/modules/utils.ts
@@ -45,12 +45,21 @@ export function getModuleUnderLabware(
     .reverse()[0]
   const newLocation = moveLabwareStep?.newLocation
 
-  return values(initialDeckSetup.modules).find(
-    (moduleOnDeck: ModuleOnDeck) =>
-      (newLocation != null
-        ? newLocation
-        : initialDeckSetup.labware[labwareId]?.slot) === moduleOnDeck.id
-  )
+  return values(initialDeckSetup.modules).find((moduleOnDeck: ModuleOnDeck) => {
+    const labwareSlot = initialDeckSetup.labware[labwareId]?.slot
+    let location
+    if (newLocation != null) {
+      location = newLocation
+    } else if (
+      labwareSlot != null &&
+      initialDeckSetup.labware[labwareSlot] != null
+    ) {
+      location = initialDeckSetup.labware[labwareSlot].slot
+    } else {
+      location = labwareSlot
+    }
+    return location === moduleOnDeck.id
+  })
 }
 export function getModuleLabwareOptions(
   initialDeckSetup: InitialDeckSetup,