Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(app): Add missing usp hub port to a few module display locations #17396

Merged
merged 2 commits into from
Jan 31, 2025
+32 −15
Merged

feat(app): Add missing usp hub port to a few module display locations #17396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebb9fc4
feat(app): Add missing usp hub port to a few fixture locations
smb2268 Jan 31, 2025
6158d14
A few more usb port display locations
smb2268 Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/src/molecules/ModuleInfo/ModuleInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ export const ModuleInfo = (props: ModuleInfoProps): JSX.Element => {
if (physicalPort === null && isAttached) {
connectionStatus = t('usb_connected_no_port_info')
} else if (physicalPort != null && isAttached) {
connectionStatus = t('usb_port_connected', { port: physicalPort.port })
const portDisplay =
physicalPort?.hubPort != null
? `${physicalPort.port}.${physicalPort.hubPort}`
: physicalPort?.port
connectionStatus = t('usb_port_connected', { port: portDisplay })
}

return (
Expand Down
9 changes: 7 additions & 2 deletions app/src/organisms/Desktop/Devices/ProtocolRun/SetupModuleAndDeck/SetupModulesList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,11 @@ export function ModulesListItem({
// convert slot name to cutout id
const cutoutIdForSlotName = getCutoutIdForSlotName(slotName, deckDef)

const portDisplay =
attachedModuleMatch?.usbPort?.hubPort != null
? `${attachedModuleMatch.usbPort.port}.${attachedModuleMatch.usbPort.hubPort}`
: attachedModuleMatch?.usbPort?.port

return (
<>
{showLocationConflictModal && cutoutIdForSlotName != null ? (
Expand Down Expand Up @@ -369,10 +374,10 @@ export function ModulesListItem({
: TC_MODULE_LOCATION_OT2
: slotName}
</LegacyStyledText>
{attachedModuleMatch?.usbPort.port != null ? (
{portDisplay != null ? (
<LegacyStyledText as="p">
{t('usb_port_number', {
port: attachedModuleMatch.usbPort.port,
port: portDisplay,
})}
</LegacyStyledText>
) : null}
Expand Down
14 changes: 8 additions & 6 deletions app/src/organisms/DeviceDetailsDeckConfiguration/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,14 @@ export function DeviceDetailsDeckConfiguration({
) {
return acc
}
const displayName = getFixtureDisplayName(
cutoutFixtureId,
modulesData?.data.find(
m => m.serialNumber === opentronsModuleSerialNumber
)?.usbPort.port
)
const usbPort = modulesData?.data.find(
m => m.serialNumber === opentronsModuleSerialNumber
)?.usbPort
const portDisplay =
usbPort?.hubPort != null
? `${usbPort.port}.${usbPort.hubPort}`
: usbPort?.port
const displayName = getFixtureDisplayName(cutoutFixtureId, portDisplay)
const fixtureGroup =
deckDef.cutoutFixtures.find(cf => cf.id === cutoutFixtureId)
?.fixtureGroup ?? {}
Expand Down
18 changes: 12 additions & 6 deletions app/src/organisms/LocationConflictModal/ChooseModuleToConfigureModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import type { AttachedModule } from '@opentrons/api-client'
const EQUIPMENT_POLL_MS = 5000
interface ModuleFixtureOption {
moduleModel: ModuleModel
usbPort?: number
usbPort?: number | string
serialNumber?: string
}
interface ChooseModuleToConfigureModalProps {
Expand Down Expand Up @@ -82,11 +82,17 @@ export const ChooseModuleToConfigureModal = (
) ?? []

const connectedOptions: ModuleFixtureOption[] = unconfiguredModuleMatches.map(
attachedMod => ({
moduleModel: attachedMod.moduleModel,
usbPort: attachedMod.usbPort.port,
serialNumber: attachedMod.serialNumber,
})
attachedMod => {
const portDisplay =
attachedMod.usbPort.hubPort != null
? `${attachedMod.usbPort.port}.${attachedMod.usbPort.hubPort}`
: attachedMod.usbPort.port
return {
moduleModel: attachedMod.moduleModel,
usbPort: portDisplay,
serialNumber: attachedMod.serialNumber,
}
}
)
const passiveOptions: ModuleFixtureOption[] =
requiredModuleModel === MAGNETIC_BLOCK_V1
Expand Down
Loading