Merge pull request #734 from Tria-plc/freight_feature/usermanagement

fix u=issue

apps/edr-freight-web/backoffice/src/pages/trainBuilder/TrainBuilderListPage.tsx

@@ -31,8 +31,6 @@ import { ruleEngineTable } from "@/components/ruleEngine/ruleEngineStyles";
 import BuildTrainModal from "@/components/trainBuilder/BuildTrainModal";
 import EditTrainDetailsModal from "@/components/trainBuilder/EditTrainDetailsModal";
 import {
-  directionColor,
-  directionRowStyle,
   trainStatusColor,
   trainStatusLabel,
 } from "@/components/trainBuilder/trainStatus";
@@ -164,14 +162,9 @@ export default function TrainBuilderListPage() {
           return (
             <Stack gap={2}>
               {active?.trainNumber ? (
-                <Group gap={6} wrap="nowrap">
-                  <Text size="sm" fw={700} ff="monospace" lh={1.2}>
-                    {active.trainNumber}
-                  </Text>
-                  <Badge size="xs" variant="light" color={directionColor(active.direction)}>
-                    {active.direction ?? "—"}
-                  </Badge>
-                </Group>
+                <Text size="sm" fw={700} ff="monospace" lh={1.2}>
+                  {active.trainNumber}
+                </Text>
               ) : null}
               <Text size="xs" c="dimmed" ff="monospace" lh={1.2}>
                 IMP {row.original.importTrainNumber ?? "—"} · EXP{" "}
@@ -348,7 +341,6 @@ export default function TrainBuilderListPage() {
             data={trains}
             status={tableStatus}
             onRowClick={(train) => navigate(`/dashboard/train-builder/${train.id}`)}
-            rowStyle={(train) => directionRowStyle(train.activeSchedule?.direction)}
             error={
               trainsQuery.isError
                 ? {

apps/edr-freight-web/backoffice/src/pages/trainScheduling/TrainScheduleV2ListPage.tsx

@@ -1,6 +1,7 @@
 import type { ColumnDef } from "@edr/ui-common";
 import {
   ActionIcon,
+  Badge,
   Box,
   Button,
   Card,
@@ -38,6 +39,10 @@ import { KpiStrip, PageContainer, PageHeader } from "@/components/page";
 import RuleEngineListFooter from "@/components/ruleEngine/RuleEngineListFooter";
 import { ruleEngineTable } from "@/components/ruleEngine/ruleEngineStyles";
 import { FreightTypeBadge } from "@/components/trainScheduling/ScheduleStatusBadge";
+import {
+  directionColor,
+  directionRowStyle,
+} from "@/components/trainBuilder/trainStatus";
 import BookingWindowSettingsModal from "@/components/trainScheduling/BookingWindowSettingsModal";
 import EditScheduleDateModal from "@/components/trainScheduling/EditScheduleDateModal";
 import { showScheduleWarnings } from "@/components/trainScheduling/locomotiveOptions";
@@ -303,9 +308,20 @@ export default function TrainScheduleV2ListPage() {
         meta: { headerClassName, cellClassName },
         cell: ({ row }) => (
           <Stack gap={4}>
-            <Text size="sm" fw={600} lh={1.2}>
-              {row.original.routeName ?? "—"}
-            </Text>
+            <Group gap={6} wrap="nowrap">
+              <Text size="sm" fw={600} lh={1.2}>
+                {row.original.routeName ?? "—"}
+              </Text>
+              {row.original.direction ? (
+                <Badge
+                  size="xs"
+                  variant="light"
+                  color={directionColor(row.original.direction)}
+                >
+                  {row.original.direction}
+                </Badge>
+              ) : null}
+            </Group>
             <Box maw={220}>
               <RouteCorridor
                 origin={row.original.origin}
@@ -660,6 +676,7 @@ export default function TrainScheduleV2ListPage() {
               onRowClick={(schedule) =>
                 navigate(`/dashboard/operations/train-scheduling-v2/${schedule.id}`)
               }
+              rowStyle={(schedule) => directionRowStyle(schedule.direction)}
               error={
                 schedulesQuery.isError
                   ? {
@@ -909,7 +926,18 @@ function ScheduleCard({
         </Box>
 
         <Group justify="space-between" align="center">
-          <FreightTypeBadge freightType={schedule.freightType} />
+          <Group gap={6} wrap="nowrap">
+            <FreightTypeBadge freightType={schedule.freightType} />
+            {schedule.direction ? (
+              <Badge
+                size="xs"
+                variant="light"
+                color={directionColor(schedule.direction)}
+              >
+                {schedule.direction}
+              </Badge>
+            ) : null}
+          </Group>
           <Group gap={6} wrap="nowrap">
             <MetricChip value={schedule.bookingsCount} label="bkg" />
             <MetricChip value={schedule.wagonCount} label="wgn" />