use new method in module protocol setup

Author: ahiuchingau

app/src/organisms/Desktop/Devices/ProtocolRun/SetupModuleAndDeck/SetupModulesList.tsx

@@ -28,14 +28,12 @@ import {
   getCutoutIdForSlotName,
   getDeckDefFromRobotType,
   getFixtureDisplayName,
-  getModuleType,
+  getModuleDeckLabel,
   HEATERSHAKER_MODULE_TYPE,
   HEATERSHAKER_MODULE_V1,
   MAGNETIC_BLOCK_TYPE,
   MAGNETIC_BLOCK_V1,
   OT2_ROBOT_TYPE,
-  TC_MODULE_LOCATION_OT2,
-  TC_MODULE_LOCATION_OT3,
   WASTE_CHUTE_FLEX_STACKER_FIXTURES,
 } from '@opentrons/shared-data'
 
@@ -68,6 +66,7 @@ import type {
   CutoutFixtureId,
   DeckDefinition,
   ModuleModel,
+  ModuleType,
 } from '@opentrons/shared-data'
 import type { ModulePrepCommandsType } from '/app/local-resources/modules'
 import type { AttachedModule } from '/app/redux/modules/types'
@@ -126,11 +125,11 @@ export const SetupModulesList = (props: SetupModulesListProps): JSX.Element => {
         }) => {
           // filter out the magnetic block here, because it is handled by the SetupFixturesList
           if (moduleDef.moduleType === MAGNETIC_BLOCK_TYPE) return null
-          // if the module is a flex stacker in D4, check if it needs a waste chute
+          // if the module is a flex stacker in row D, check if it needs a waste chute
           // combo fixture
           if (
             moduleDef.moduleType === FLEX_STACKER_MODULE_TYPE &&
-            slotName === 'D4'
+            slotName[0] === 'D'
           ) {
             const deckConfigCompatabilityD3 = deckConfigCompatibility?.find(
               configItem => configItem.cutoutId === 'cutoutD3'
@@ -153,6 +152,7 @@ export const SetupModulesList = (props: SetupModulesListProps): JSX.Element => {
                     moduleDef.model
                   )}_slot_${slotName}`}
                   moduleModel={moduleDef.model}
+                  moduleType={moduleDef.moduleType}
                   displayName={moduleDef.displayName}
                   slotName={slotName}
                   attachedModuleMatch={attachedModuleMatch}
@@ -175,6 +175,7 @@ export const SetupModulesList = (props: SetupModulesListProps): JSX.Element => {
                 moduleDef.model
               )}_slot_${slotName}`}
               moduleModel={moduleDef.model}
+              moduleType={moduleDef.moduleType}
               displayName={moduleDef.displayName}
               slotName={slotName}
               attachedModuleMatch={attachedModuleMatch}
@@ -200,6 +201,7 @@ export const SetupModulesList = (props: SetupModulesListProps): JSX.Element => {
 
 interface ModulesListItemProps {
   moduleModel: ModuleModel
+  moduleType: ModuleType
   displayName: string
   slotName: string
   attachedModuleMatch: AttachedModule | null
@@ -218,6 +220,7 @@ interface ModulesListItemProps {
 
 export function ModulesListItem({
   moduleModel,
+  moduleType,
   displayName,
   slotName,
   attachedModuleMatch,
@@ -470,11 +473,7 @@ export function ModulesListItem({
             justifyContent={JUSTIFY_CENTER}
           >
             <LegacyStyledText as="p">
-              {getModuleType(moduleModel) === 'thermocyclerModuleType'
-                ? isFlex
-                  ? TC_MODULE_LOCATION_OT3
-                  : TC_MODULE_LOCATION_OT2
-                : slotName}
+              {getModuleDeckLabel(moduleType, slotName)}
             </LegacyStyledText>
             {portDisplay != null ? (
               <LegacyStyledText as="p">{portDisplay}</LegacyStyledText>

app/src/organisms/Desktop/Devices/ProtocolRun/SetupModuleAndDeck/__tests__/SetupModulesList.test.tsx

@@ -52,7 +52,7 @@ const MOCK_SECOND_MAGNETIC_MODULE_COORDS = [100, 200, 0]
 const mockMagneticModule = {
   moduleId: 'someMagneticModule',
   model: 'magneticModuleV2' as ModuleModel,
-  type: 'magneticModuleType' as ModuleType,
+  moduleType: 'magneticModuleType' as ModuleType,
   labwareOffset: { x: 5, y: 5, z: 5 },
   cornerOffsetFromSlot: { x: 1, y: 1, z: 1 },
   calibrationPoint: { x: 0, y: 0 },
@@ -65,7 +65,7 @@ const mockTCModule = {
   labwareOffset: { x: 3, y: 3, z: 3 },
   moduleId: 'TCModuleId',
   model: 'thermocyclerModuleV1' as ModuleModel,
-  type: 'thermocyclerModuleType' as ModuleType,
+  moduleType: 'thermocyclerModuleType' as ModuleType,
   displayName: 'Thermocycler Module',
 }
 
@@ -219,7 +219,7 @@ describe('SetupModulesList', () => {
         nestedLabwareDef: null,
         nestedLabwareId: null,
         protocolLoadOrder: 0,
-        slotName: '7',
+        slotName: 'B1',
         attachedModuleMatch: mockThermocycler,
       },
     } as any)
@@ -282,7 +282,7 @@ describe('SetupModulesList', () => {
         nestedLabwareDef: null,
         nestedLabwareId: null,
         protocolLoadOrder: 0,
-        slotName: '7',
+        slotName: 'B1',
         attachedModuleMatch: {
           ...mockThermocycler,
           moduleOffset: mockCalibratedData,

app/src/organisms/ODD/ProtocolSetup/ProtocolSetupModulesAndDeck/ModuleTableItem.tsx

@@ -18,10 +18,8 @@ import {
   ABSORBANCE_READER_TYPE,
   FLEX_STACKER_MODULE_TYPE,
   getFixtureDisplayName,
+  getModuleDeckLabel,
   getModuleDisplayName,
-  getModuleType,
-  TC_MODULE_LOCATION_OT3,
-  THERMOCYCLER_MODULE_TYPE,
 } from '@opentrons/shared-data'
 
 import { SmallButton } from '/app/atoms/buttons'
@@ -285,17 +283,6 @@ export function ModuleTableItem({
     }
   }
 
-  const getModuleLocation = (moduleModel: ModuleModel): string => {
-    const moduleType = getModuleType(moduleModel)
-    if (moduleType === THERMOCYCLER_MODULE_TYPE) {
-      return TC_MODULE_LOCATION_OT3
-    } else if (moduleType === FLEX_STACKER_MODULE_TYPE) {
-      return `${module.slotName.charAt(0)}4`
-    } else {
-      return module.slotName
-    }
-  }
-
   return (
     <>
       {showModuleWizard && module.attachedModuleMatch != null ? (
@@ -340,7 +327,10 @@ export function ModuleTableItem({
         </Flex>
         <Flex alignItems={ALIGN_CENTER} flex="2 0 0">
           <DeckInfoLabel
-            deckLabel={getModuleLocation(module.moduleDef.model)}
+            deckLabel={getModuleDeckLabel(
+              module.moduleDef.moduleType,
+              module.slotName
+            )}
           />
         </Flex>
         <Flex

app/src/resources/runs/useModuleRenderInfoForProtocolById.ts

@@ -1,7 +1,6 @@
 import {
   checkModuleCompatibility,
   FLEX_ROBOT_TYPE,
-  FLEX_STACKER_MODULE_TYPE,
   getCutoutFixturesForModuleModel,
   getCutoutIdsFromModuleSlotName,
   getDeckDefFromRobotType,
@@ -120,10 +119,6 @@ export function useModuleRenderInfoForProtocolById(
         ...acc,
         [moduleInfo.moduleId]: {
           ...moduleInfo,
-          slotName:
-            moduleInfo.moduleDef.moduleType === FLEX_STACKER_MODULE_TYPE
-              ? `${moduleInfo.slotName.charAt(0)}4`
-              : moduleInfo.slotName,
         },
       }),
       {}