address comments

Opentrons · Dec 19, 2024 · 1d27951 · 1d27951
1 parent 016020b
commit 1d27951
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/protocol-designer/src/ui/labware/utils.ts b/protocol-designer/src/ui/labware/utils.ts
@@ -2,6 +2,8 @@ import { getHasWasteChute } from '@opentrons/step-generation'
 import { WASTE_CHUTE_DISPLAY_NAME } from '@opentrons/components'
 import {
   FLEX_ROBOT_TYPE,
+  TC_MODULE_LOCATION_OT2,
+  TC_MODULE_LOCATION_OT3,
   THERMOCYCLER_MODULE_TYPE,
 } from '@opentrons/shared-data'
 import type { RobotType } from '@opentrons/shared-data'
@@ -13,7 +15,10 @@ function resolveSlotLocation(
   location: string,
   robotType: RobotType
 ): string {
-  const TCSlot = robotType === FLEX_ROBOT_TYPE ? 'A1+B1' : '8,9,10,11'
+  const TCSlot =
+    robotType === FLEX_ROBOT_TYPE
+      ? TC_MODULE_LOCATION_OT3
+      : TC_MODULE_LOCATION_OT2
   if (location === 'offDeck') {
     return 'offDeck'
   } else if (modules[location] != null) {

diff --git a/protocol-designer/src/ui/modules/utils.ts b/protocol-designer/src/ui/modules/utils.ts
@@ -1,7 +1,13 @@
 import values from 'lodash/values'
 import {
-  MAGNETIC_MODULE_V1,
+  ABSORBANCE_READER_TYPE,
   getLabwareDefaultEngageHeight,
+  HEATERSHAKER_MODULE_TYPE,
+  MAGNETIC_BLOCK_TYPE,
+  MAGNETIC_MODULE_TYPE,
+  MAGNETIC_MODULE_V1,
+  TEMPERATURE_MODULE_TYPE,
+  THERMOCYCLER_MODULE_TYPE,
 } from '@opentrons/shared-data'
 import type { DropdownOption } from '@opentrons/components'
 import type { ModuleType } from '@opentrons/shared-data'
@@ -76,17 +82,17 @@ export function getModuleUnderLabware(
 
 export const getModuleShortNames = (type: ModuleType): string => {
   switch (type) {
-    case 'heaterShakerModuleType':
+    case HEATERSHAKER_MODULE_TYPE:
       return 'Heater-Shaker Module'
-    case 'magneticBlockType':
+    case MAGNETIC_BLOCK_TYPE:
       return 'Magnetic Block'
-    case 'magneticModuleType':
+    case MAGNETIC_MODULE_TYPE:
       return 'Magnetic Module'
-    case 'temperatureModuleType':
+    case TEMPERATURE_MODULE_TYPE:
       return 'Temperature Module'
-    case 'thermocyclerModuleType':
+    case THERMOCYCLER_MODULE_TYPE:
       return 'Thermocycler'
-    case 'absorbanceReaderType':
+    case ABSORBANCE_READER_TYPE:
       return 'Absorbance Reader'
   }
 }