Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-09-07 15:25:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'yard-name-display' into dev

Browse Source
This commit is contained in:
hager
2026-09-06 20:13:50 +00:00
parent 5753368e33 eeac88f3be
commit 885f473f76
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/edr-freight-web/backoffice/src/components/bookings/detail/BookingRouteCard.tsx
View File

@@ -17,9 +17,8 @@ export function BookingRouteCard({ booking }: BookingRouteCardProps) {
<Text size="xs" c="dimmed" fw={500} tt="uppercase" lts="0.04em"> <Text size="xs" c="dimmed" fw={500} tt="uppercase" lts="0.04em">
Origin Origin
</Text> </Text>
<Text fw={600}>{booking.originYard?.label}</Text> <Text fw={600}>
<Text size="xs" c="dimmed"> {booking.originYard?.label ?? booking.originYard?.code}
{booking.originYard?.code}
</Text> </Text>
</Stack> </Stack>
@@ -57,10 +56,7 @@ export function BookingRouteCard({ booking }: BookingRouteCardProps) {
Destination Destination
</Text> </Text>
<Text fw={600} ta="right"> <Text fw={600} ta="right">
{booking.destinationYard?.label} {booking.destinationYard?.label ?? booking.destinationYard?.code}
</Text>
<Text size="xs" c="dimmed">
{booking.destinationYard?.code}
</Text> </Text>
</Stack> </Stack>
</Group> </Group>

7
apps/edr-freight-web/backoffice/src/pages/fleet/RoutesPage.tsx
View File

@@ -67,8 +67,11 @@ const emptyForm = (): RouteFormState => ({
/** Order-insensitive pair key — yard distances are symmetric. */ /** Order-insensitive pair key — yard distances are symmetric. */
const pairKey = (a: string, b: string) => (a < b ? `${a}|${b}` : `${b}|${a}`); const pairKey = (a: string, b: string) => (a < b ? `${a}|${b}` : `${b}|${a}`);
// Yards are identified to operators by name, not by their internal code: the
// yard coded KALITY is universally called GMP / Gelan Multipurpose Port, and
// showing both read as two different places. The code stays in the data.
const yardLabel = (yard?: YardRef | null) => const yardLabel = (yard?: YardRef | null) =>
yard ? `${yard.label} (${yard.code})` : "—"; yard ? (yard.label ?? yard.code) : "—";
const statusColor = (status: RouteStatus) => { const statusColor = (status: RouteStatus) => {
switch (status) { switch (status) {
@@ -232,7 +235,7 @@ export default function RoutesPage() {
() => () =>
(yardsQuery.data ?? []).map((yard) => ({ (yardsQuery.data ?? []).map((yard) => ({
value: yard.id, value: yard.id,
label: `${yard.label} (${yard.code})`, label: yard.label ?? yard.code,
})), })),
[yardsQuery.data], [yardsQuery.data],
); );

2
apps/edr-freight-web/backoffice/src/pages/ruleEngine/YardDesksModal.tsx
View File

@@ -83,7 +83,7 @@ export function YardDesksModal({
<Modal <Modal
opened={opened} opened={opened}
onClose={onClose} onClose={onClose}
title={yard ? `Desks at ${yard.label} (${yard.code})` : "Desks"} title={yard ? `Desks at ${yard.label ?? yard.code}` : "Desks"}
size="lg" size="lg"
> >
<Stack gap="md"> <Stack gap="md">