clean up logic for hard-coded trashBin and wasteChute

Opentrons · Feb 4, 2025 · 1f240e0 · 1f240e0
1 parent c2ce56d
commit 1f240e0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 34 deletions.
diff --git a/protocol-designer/fixtures/protocol/8/thermocyclerOnOt2V7MigratedToV8.json b/protocol-designer/fixtures/protocol/8/thermocyclerOnOt2V7MigratedToV8.json
@@ -96,7 +96,7 @@
             "733ba018-3550-476c-9fa3-0b5259d1a1d6": "left"
           },
           "trashBinLocationUpdate": {
-            "dc2c4599-29b3-4ec8-adff-56677ac0821e:fixedTrash": "cutout12"
+            "dc2c4599-29b3-4ec8-adff-56677ac0821e:trashBin": "cutout12"
           },
           "wasteChuteLocationUpdate": {},
           "stagingAreaLocationUpdate": {},

diff --git a/protocol-designer/src/load-file/migration/utils/getAdditionalEquipmentLocationUpdate.ts b/protocol-designer/src/load-file/migration/utils/getAdditionalEquipmentLocationUpdate.ts
@@ -157,12 +157,6 @@ export const getAdditionalEquipmentLocationUpdate = (
         )
       : null
 
-  if (trashBinCommand == null && robotType === OT2_ROBOT_TYPE) {
-    console.error(
-      'expected to find a fixedTrash command for the OT-2 but could not'
-    )
-  }
-
   const moveLiquidStepWasteChute =
     savedStepForms != null
       ? Object.values(savedStepForms).find(
@@ -211,7 +205,7 @@ export const getAdditionalEquipmentLocationUpdate = (
       }
     : {}
 
-  const hardcodedTrashBinIdOt2 = `${uuid()}:fixedTrash`
+  const hardcodedTrashBinIdOt2 = `${uuid()}:trashBin`
   const hardcodedTrashBinOt2 = {
     [hardcodedTrashBinIdOt2]: getCutoutIdByAddressableArea(
       'fixedTrash' as AddressableAreaName,
@@ -220,30 +214,6 @@ export const getAdditionalEquipmentLocationUpdate = (
     ),
   }
 
-  const hardcodedTrashAddressableAreaName =
-    unoccupiedSlotForTrash === WASTE_CHUTE_CUTOUT
-      ? 'wasteChute'
-      : `movableTrash${unoccupiedSlotForTrash}`
-
-  const hardcodedTrashIdFlex = `${uuid()}:${hardcodedTrashAddressableAreaName}`
-
-  const hardCodedTrashLocation =
-    unoccupiedSlotForTrash === ''
-      ? ''
-      : unoccupiedSlotForTrash === WASTE_CHUTE_CUTOUT
-      ? WASTE_CHUTE_CUTOUT
-      : getCutoutIdByAddressableArea(
-          hardcodedTrashAddressableAreaName as AddressableAreaName,
-          'trashBinAdapter',
-          FLEX_ROBOT_TYPE
-        )
-
-  const hardcodedTrashFlex = {
-    [hardcodedTrashIdFlex]: hasWasteChuteCommands
-      ? WASTE_CHUTE_CUTOUT
-      : hardCodedTrashLocation,
-  }
-
   let trashBinLocationUpdate: LocationUpdate = hasWasteChuteCommands
     ? {}
     : hardcodedTrashBinOt2
@@ -252,11 +222,27 @@ export const getAdditionalEquipmentLocationUpdate = (
     trashBinLocationUpdate = {
       [trashBinId]: trashCutoutId as string,
     }
+    //  in case the user has no pipetting steps, auto-generate a trashBin or wasteChute entity for Flex
   } else if (isFlex && !hasWasteChuteCommands) {
+    const hardCodedTrashIdFlex = `${uuid()}:movableTrash${unoccupiedSlotForTrash}`
+    const hardCodedWasteChuteId = `${uuid()}:wasteChute`
+
     trashBinLocationUpdate =
-      unoccupiedSlotForTrash === WASTE_CHUTE_CUTOUT ? {} : hardcodedTrashFlex
+      unoccupiedSlotForTrash === WASTE_CHUTE_CUTOUT
+        ? {}
+        : {
+            [hardCodedTrashIdFlex]: getCutoutIdByAddressableArea(
+              `movableTrash${unoccupiedSlotForTrash}` as AddressableAreaName,
+              'trashBinAdapter',
+              FLEX_ROBOT_TYPE
+            ),
+          }
     wasteChuteLocationUpdate =
-      unoccupiedSlotForTrash === WASTE_CHUTE_CUTOUT ? hardcodedTrashFlex : {}
+      unoccupiedSlotForTrash === WASTE_CHUTE_CUTOUT
+        ? {
+            [hardCodedWasteChuteId]: WASTE_CHUTE_CUTOUT,
+          }
+        : {}
   }
 
   const stagingAreaLocationUpdate: LocationUpdate = stagingAreaSlotNames.reduce(