Merge back 'chore_release-pd-8.5.0' into 'edge' (#19128)

Resolved conflicts:
- protocol-designer/src/components/organisms/LabwareCardOverflowMenu/index.tsx

Author: ddcc4

protocol-designer/src/components/organisms/LabwareCardOverflowMenu/index.tsx

@@ -106,21 +106,15 @@ export function LabwareCardOverflowMenu(
     if (lidId != null) {
       dispatch(deleteContainer({ labwareId: lidId }))
     }
-    if (isAdapter) {
-      dispatch(
-        editSlotInfo({
-          adapterDefURI: null,
-        })
-      )
-    } else {
-      dispatch(
-        editSlotInfo({
-          labwareDefURI: null,
-          lidDefURI: null,
-          amount: 1,
-        })
-      )
+    const module = moduleId != null ? deckSetupModules[moduleId] : null
+    const moduleModel = module?.model ?? null
+    const newSlotInfo = {
+      ...(moduleModel != null ? { moduleModel } : {}),
+      ...(isAdapter === true
+        ? { adapterDefURI: null }
+        : { labwareDefURI: null, lidDefURI: null, amount: 1 }),
     }
+    dispatch(editSlotInfo(newSlotInfo))
   }
   const handleConfirmDeleteEntityInUseModal = (): void => {
     labwareIds.forEach(labwareId => {

step-generation/src/commandCreators/atomic/moveLabware.ts

@@ -36,6 +36,7 @@ import type {
   CommandCreator,
   CommandCreatorError,
   CommandCreatorWarning,
+  ModuleState,
 } from '../../types'
 
 /** Move labware from one location to another, manually or via a gripper. */
@@ -125,10 +126,25 @@ export const moveLabware: CommandCreator<MoveLabwareParams> = (
   const initialSlot =
     initialAdapterSlot != null ? initialAdapterSlot : initialLabwareSlot
 
-  const initialModuleState =
-    initialSlot != null
-      ? prevRobotState.modules[initialSlot]?.moduleState
-      : null
+  const getModuleStateFromSlotOrId = (
+    identifier: string | null
+  ): ModuleState | null => {
+    if (identifier == null) {
+      return null
+    } else if (identifier in prevRobotState.modules) {
+      // identifier is a module id
+      return prevRobotState.modules[identifier].moduleState
+    } else {
+      // identifier is a slot name
+      return (
+        Object.values(prevRobotState.modules).find(
+          ({ slot }) => slot === identifier
+        )?.moduleState ?? null
+      )
+    }
+  }
+
+  const initialModuleState = getModuleStateFromSlotOrId(initialSlot)
   if (initialModuleState != null) {
     if (
       initialModuleState.type === THERMOCYCLER_MODULE_TYPE &&
@@ -181,13 +197,8 @@ export const moveLabware: CommandCreator<MoveLabwareParams> = (
     warnings.push(warningCreators.labwareInWasteChuteHasLiquid())
   }
 
-  if (
-    destinationModuleIdOrSlot != null &&
-    prevRobotState.modules[destinationModuleIdOrSlot] != null
-  ) {
-    const destModuleState =
-      prevRobotState.modules[destinationModuleIdOrSlot].moduleState
-
+  const destModuleState = getModuleStateFromSlotOrId(destinationModuleIdOrSlot)
+  if (destModuleState != null) {
     if (
       destModuleState.type === THERMOCYCLER_MODULE_TYPE &&
       destModuleState.lidOpen !== true