Skip to content

Commit

Permalink
Add hubPort to usbport display for selecting a module
Browse files Browse the repository at this point in the history
  • Loading branch information
smb2268 committed Jan 29, 2025
1 parent b46ecfe commit 444b197
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 17 deletions.
1 change: 1 addition & 0 deletions api-client/src/modules/api-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ interface PhysicalPort {
port: number
hub: boolean
portGroup: PortGroup
hubPort?: number
}

type ModuleOffsetSource =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -358,22 +358,30 @@ export function AddFixtureModal({
closeModal()
}

const fixtureOptions = availableOptions.map(cutoutConfigs => (
<FixtureOption
key={cutoutConfigs[0].cutoutFixtureId}
optionName={getFixtureDisplayName(
cutoutConfigs[0].cutoutFixtureId,
(modulesData?.data ?? []).find(
m => m.serialNumber === cutoutConfigs[0].opentronsModuleSerialNumber
)?.usbPort.port
)}
buttonText={t('add')}
onClickHandler={() => {
handleAddFixture(cutoutConfigs)
}}
isOnDevice={isOnDevice}
/>
))
const fixtureOptions = availableOptions.map(cutoutConfigs => {
const usbPort = (modulesData?.data ?? []).find(
m => m.serialNumber === cutoutConfigs[0].opentronsModuleSerialNumber
)?.usbPort
const portDisplay =
usbPort?.hubPort != null
? `${usbPort.port}.${usbPort.hubPort}`
: usbPort?.port

return (
<FixtureOption
key={cutoutConfigs[0].cutoutFixtureId}
optionName={getFixtureDisplayName(
cutoutConfigs[0].cutoutFixtureId,
portDisplay
)}
buttonText={t('add')}
onClickHandler={() => {
handleAddFixture(cutoutConfigs)
}}
isOnDevice={isOnDevice}
/>
)
})

return (
<>
Expand Down
2 changes: 1 addition & 1 deletion shared-data/js/fixtures.ts
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ export function getAddressableAreaNamesFromLoadedModule(
// note: we've decided not to translate these strings
export function getFixtureDisplayName(
cutoutFixtureId: CutoutFixtureId | null,
usbPortNumber?: number
usbPortNumber?: number | string
): string {
switch (cutoutFixtureId) {
case STAGING_AREA_RIGHT_SLOT_FIXTURE:
Expand Down

0 comments on commit 444b197

Please sign in to comment.