protocol detail module location

Author: ahiuchingau

app/src/organisms/Desktop/ProtocolDetails/RobotConfigurationDetails.tsx

@@ -17,20 +17,19 @@ import {
   FLEX_USB_MODULE_FIXTURES,
   getCutoutDisplayName,
   getFixtureDisplayName,
+  getModuleDeckLabel,
   getModuleDisplayName,
   getModuleType,
   getPipetteNameSpecs,
   MAGNETIC_BLOCK_FIXTURES,
   MAGNETIC_BLOCK_TYPE,
   SINGLE_SLOT_FIXTURES,
-  THERMOCYCLER_MODULE_TYPE,
 } from '@opentrons/shared-data'
 
 import { InstrumentContainer } from '/app/atoms/InstrumentContainer'
 import { Divider } from '/app/atoms/structure'
 
 import { getRobotTypeDisplayName } from '../ProtocolsLanding/utils'
-import { getSlotsForThermocycler } from './utils'
 
 import type { TFunction } from 'i18next'
 import type { ReactNode } from 'react'
@@ -167,12 +166,10 @@ export const RobotConfigurationDetails = (
             <Fragment key={`module_${index}`}>
               <Divider marginY={SPACING.spacing12} width="100%" />
               <RobotConfigurationDetailsItem
-                label={`${t('slot')} ${
-                  getModuleType(module.params.model) ===
-                  THERMOCYCLER_MODULE_TYPE
-                    ? getSlotsForThermocycler(robotType)
-                    : module.params.location.slotName
-                }`}
+                label={`${t('slot')} ${getModuleDeckLabel(
+                  getModuleType(module.params.model),
+                  module.params.location.slotName
+                )}`}
                 item={
                   <>
                     <ModuleIcon

app/src/pages/Desktop/Protocols/ProtocolPreview/SlotDetails.tsx

@@ -6,10 +6,7 @@ import {
   Icon,
   StyledText,
 } from '@opentrons/components'
-import {
-  FLEX_ROBOT_TYPE,
-  THERMOCYCLER_MODULE_TYPE,
-} from '@opentrons/shared-data'
+import { getModuleDeckLabel } from '@opentrons/shared-data'
 import { getFullStackFromLabwares } from '@opentrons/step-generation'
 
 import { LabwareSlotDetails } from './LabwareSlotDetails'
@@ -74,7 +71,6 @@ export function SlotDetails(props: SlotDetailsProps): JSX.Element {
     Object.values(wasteChuteEntities).some(
       trash => trash.location.split('cutout')[1] === slotId
     )
-  const tcSlot = robotType === FLEX_ROBOT_TYPE ? 'A1+B1' : '7,8,10,11'
   return (
     <div className={styles.slot_container}>
       <div className={styles.command_step}>
@@ -105,10 +101,8 @@ export function SlotDetails(props: SlotDetailsProps): JSX.Element {
             <StyledText desktopStyle="bodyLargeSemiBold">Slot</StyledText>
             <DeckInfoLabel
               deckLabel={
-                moduleOnSlot != null &&
-                moduleEntities[moduleOnSlot[0]].type ===
-                  THERMOCYCLER_MODULE_TYPE
-                  ? tcSlot
+                moduleOnSlot != null
+                  ? getModuleDeckLabel(moduleEntities[moduleOnSlot[0]].type, slotId)
                   : slotId
               }
             />
@@ -140,8 +134,8 @@ export function SlotDetails(props: SlotDetailsProps): JSX.Element {
           <TrashSlotDetails trashBinEntities={trashBinEntities} />
         ) : null}
         {moduleOnSlot == null &&
-        topMostLabwareOnSlot == null &&
-        !isTrashOnSlot ? (
+          topMostLabwareOnSlot == null &&
+          !isTrashOnSlot ? (
           <SlotDetailsEmptyState />
         ) : null}
       </div>