@@ -12,6 +12,8 @@ import {
12
12
MOVABLE_TRASH_ADDRESSABLE_AREAS ,
13
13
FLEX_MODULE_ADDRESSABLE_AREAS ,
14
14
FLEX_STACKER_ADDRESSABLE_AREAS ,
15
+ TC_MODULE_LOCATION_OT2 ,
16
+ TC_MODULE_LOCATION_OT3 ,
15
17
} from '@opentrons/shared-data'
16
18
import { COLUMN_4_SLOTS , getHasWasteChute } from '@opentrons/step-generation'
17
19
import {
@@ -160,14 +162,13 @@ export const getUnoccupiedLabwareLocationOptions: Selector<
160
162
: 'unknown module'
161
163
const moduleSlotInfo = modSlot ?? 'unknown slot'
162
164
const adapterSlotInfo = adapterSlot ?? 'unknown adapter'
163
-
164
165
return labwareOnAdapter == null && isAdapter
165
166
? [
166
167
...acc ,
167
168
{
168
169
name :
169
170
modIdWithAdapter != null
170
- ? `${ moduleSlotInfo } on ${ moduleUnderAdapter } with ${ adapterDisplayName } `
171
+ ? `${ moduleUnderAdapter } on ${ moduleSlotInfo } with ${ adapterDisplayName } `
171
172
: `${ adapterSlotInfo } with ${ adapterDisplayName } ` ,
172
173
value : labwareId ,
173
174
} ,
@@ -182,14 +183,21 @@ export const getUnoccupiedLabwareLocationOptions: Selector<
182
183
const moduleHasLabware = Object . entries ( labware ) . some (
183
184
( [ lwId , lwOnDeck ] ) => lwOnDeck . slot === modId
184
185
)
186
+ const type = moduleEntities [ modId ] . type
187
+ const slot = modOnDeck . slot
188
+ let tcLocations
189
+ if ( type === THERMOCYCLER_MODULE_TYPE ) {
190
+ tcLocations =
191
+ slot === '7' ? TC_MODULE_LOCATION_OT2 : TC_MODULE_LOCATION_OT3
192
+ }
185
193
return moduleHasLabware
186
194
? acc
187
195
: [
188
196
...acc ,
189
197
{
190
- name : `${ modOnDeck . slot } on ${ getModuleDisplayName (
198
+ name : `${ getModuleDisplayName (
191
199
moduleEntities [ modId ] . model
192
- ) } `,
200
+ ) } on ${ tcLocations != null ? tcLocations : slot } `,
193
201
value : modId ,
194
202
} ,
195
203
]
0 commit comments