feat(warehouses): filters, pagination and charts on container returns

Returned-containers list now uses the shared DataTable + useListControls (search, inclusive date range, status select, pagination) instead of a hand-rolled table. Adds two charts below the list — returns per day by truck type and returns by status — driven by the same filtered rows. Series colors validated for CVD separation and surface contrast.
2026-08-29 17:38:12 +00:00 · 2026-08-04 09:54:15 +00:00
parent 87b04973d8
commit 50fab52b1c
3 changed files with 287 additions and 79 deletions
--- a/apps/edr-freight-web/backoffice/src/pages/warehouses/ContainerReturnsPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/warehouses/ContainerReturnsPage.tsx
@@ -5,10 +5,12 @@ import {
  Alert,
  Badge,
  Button,
+  Card,
  Group,
  Loader,
  Modal,
  SegmentedControl,
+  SimpleGrid,
  Stack,
  Table,
  Text,
@@ -18,16 +20,23 @@ import {
  Checkbox,
 } from "@mantine/core";
 import { ChevronDown, ChevronRight, History } from "lucide-react";
+import { DataTable, type ColumnDef } from "@edr/ui-common";

 import { PageContainer, PageHeader } from "@/components/page";
+import ListControls from "@/components/common/ListControls";
 import RuleEngineListFooter from "@/components/ruleEngine/RuleEngineListFooter";
-import { useListControls } from "@/hooks/useListControls";
+import { OverviewHorizontalBarChart } from "@/components/overview/OverviewHorizontalBarChart";
+import { OverviewStackedBarChart } from "@/components/overview/OverviewStackedBarChart";
+import { useListControls, toDayString } from "@/hooks/useListControls";
 import { useToast } from "@/hooks/use-toast";
 import { useWarehouseYards, useWarehouseZones } from "@/hooks/useWarehouses";
 import { api } from "@/services/api";
 import { warehouseService } from "@/services/warehouse.service";
 import { importOperationsService } from "@/services/importOperations.service";
-import type { EmptyContainerReturnStatus } from "@/types/importOperations";
+import type {
+  EmptyContainerReturn,
+  EmptyContainerReturnStatus,
+} from "@/types/importOperations";

 type ReturnType = "all" | "edr" | "customer";

@@ -51,6 +60,13 @@ const RETURN_STATUS_LABEL: Record<EmptyContainerReturnStatus, string> = {
  COMPLETED: "Completed",
 };

+// Fixed series colors (colors follow the entity, never the rank) — pair
+// validated for CVD separation + surface contrast.
+const RETURNED_BY_SERIES = [
+  { key: "edr", label: "EDR Last Mile", color: "#0d9488" },
+  { key: "customer", label: "Customer Self-Haul", color: "#b45309" },
+];
+
 interface ContainerReturnRow {
  key: string;
  containerNumber: string;
@@ -186,10 +202,47 @@ export default function ContainerReturnsPage() {
    enabled: bookingIds.length > 0 && !queueLoading,
  });

+  const [statusFilter, setStatusFilter] = useState<string | null>(null);
+
  const filteredReturnedContainers = useMemo(() => {
-    if (filterType === "all") return returnedContainers;
-    return returnedContainers.filter((ret: any) => ret.returnedBy === filterType.toUpperCase());
-  }, [returnedContainers, filterType]);
+    let rows = returnedContainers as EmptyContainerReturn[];
+    if (filterType !== "all") {
+      rows = rows.filter((ret) => ret.returnedBy === filterType.toUpperCase());
+    }
+    if (statusFilter) {
+      rows = rows.filter((ret) => ret.status === statusFilter);
+    }
+    return rows;
+  }, [returnedContainers, filterType, statusFilter]);
+
+  const returnedControls = useListControls(filteredReturnedContainers, {
+    dateKey: "returnDate",
+    searchValue: (ret) =>
+      `${ret.containerNumber} ${ret.facility ?? ""} ${ret.yard ?? ""} ${ret.condition ?? ""}`,
+  });
+
+  // Charts read the filtered set, so the controls above drive them too.
+  const returnsPerDay = useMemo(() => {
+    const byDay = new Map<string, { date: string; edr: number; customer: number }>();
+    for (const ret of returnedControls.filteredRows) {
+      const day = toDayString(ret.returnDate);
+      if (!day) continue;
+      const entry = byDay.get(day) ?? { date: day, edr: 0, customer: 0 };
+      if (ret.returnedBy === "CUSTOMER") entry.customer += 1;
+      else entry.edr += 1;
+      byDay.set(day, entry);
+    }
+    return [...byDay.values()].sort((a, b) => a.date.localeCompare(b.date));
+  }, [returnedControls.filteredRows]);
+
+  const returnsByStatus = useMemo(
+    () =>
+      RETURN_STATUS_ORDER.map((status) => ({
+        label: RETURN_STATUS_LABEL[status],
+        value: returnedControls.filteredRows.filter((ret) => ret.status === status).length,
+      })),
+    [returnedControls.filteredRows],
+  );

  const allGroups = useMemo(() => containerReturnsQuery.data ?? [], [containerReturnsQuery.data]);
  const filteredGroups = useMemo(() => {
@@ -271,6 +324,103 @@ export default function ContainerReturnsPage() {
    },
  });

+  const returnedColumns: ColumnDef<EmptyContainerReturn>[] = [
+    {
+      id: "containerNumber",
+      header: "Container Number",
+      cell: ({ row }) => (
+        <Text fw={600} size="sm">
+          {row.original.containerNumber}
+        </Text>
+      ),
+    },
+    {
+      id: "bookingRef",
+      header: "Booking Ref",
+      cell: ({ row }) => (row.original.bookingId ? "Associated" : "—"),
+    },
+    {
+      id: "returnedBy",
+      header: "Returned By",
+      cell: ({ row }) =>
+        row.original.returnedBy ? (
+          <Badge size="sm" color={row.original.returnedBy === "EDR" ? "edr-green" : "orange"}>
+            {row.original.returnedBy === "EDR" ? "EDR Last Mile" : "Customer Self-Haul"}
+          </Badge>
+        ) : (
+          "—"
+        ),
+    },
+    {
+      id: "returnDate",
+      header: "Returned Date",
+      cell: ({ row }) =>
+        row.original.returnDate ? new Date(row.original.returnDate).toLocaleDateString() : "—",
+    },
+    {
+      id: "facility",
+      header: "Facility",
+      cell: ({ row }) => row.original.facility || "—",
+    },
+    {
+      id: "yard",
+      header: "Yard",
+      cell: ({ row }) => row.original.yard || "—",
+    },
+    {
+      id: "condition",
+      header: "Condition",
+      cell: ({ row }) => (
+        <Text size="sm" lineClamp={2}>
+          {row.original.condition || "—"}
+        </Text>
+      ),
+    },
+    {
+      id: "status",
+      header: "Status",
+      cell: ({ row }) => (
+        <Badge size="sm">
+          {RETURN_STATUS_LABEL[row.original.status] ?? row.original.status}
+        </Badge>
+      ),
+    },
+    {
+      id: "action",
+      header: "Action",
+      cell: ({ row }) => {
+        const ret = row.original;
+        const nextStatus = RETURN_STATUS_ORDER[RETURN_STATUS_ORDER.indexOf(ret.status) + 1];
+        return (
+          <Group gap="xs" justify="flex-end" wrap="nowrap">
+            <ActionIcon
+              variant="subtle"
+              color="gray"
+              onClick={() => setHistoryRow(ret)}
+              title="View status history"
+            >
+              <History size={14} />
+            </ActionIcon>
+            {nextStatus ? (
+              <Button
+                size="xs"
+                variant="light"
+                loading={advanceStatusMutation.isPending && advanceStatusMutation.variables === ret.id}
+                onClick={() => advanceStatusMutation.mutate(ret.id)}
+              >
+                Advance to {RETURN_STATUS_LABEL[nextStatus]}
+              </Button>
+            ) : (
+              <Text size="xs" c="dimmed">
+                Done
+              </Text>
+            )}
+          </Group>
+        );
+      },
+    },
+  ];
+
  const activeGroup = activeKey ? (filteredGroups.find((g) => `${g.returnType.toLowerCase()}-${g.bookingId}` === activeKey) ?? null) : null;

  if (queueLoading || containerReturnsQuery.isLoading) {
@@ -305,73 +455,45 @@ export default function ContainerReturnsPage() {
        </Button>
      </Group>

-      {filteredReturnedContainers.length > 0 && (
-        <>
-          <Text fw={600} mb="xs">Returned Containers</Text>
-          <Table.ScrollContainer minWidth={1000} mb="lg">
-            <Table striped highlightOnHover verticalSpacing="xs">
-              <Table.Thead>
-                <Table.Tr>
-                  <Table.Th>Container Number</Table.Th>
-                  <Table.Th>Booking Ref</Table.Th>
-                  <Table.Th>Returned By</Table.Th>
-                  <Table.Th>Returned Date</Table.Th>
-                  <Table.Th>Facility</Table.Th>
-                  <Table.Th>Yard</Table.Th>
-                  <Table.Th>Condition</Table.Th>
-                  <Table.Th>Status</Table.Th>
-                  <Table.Th ta="right">Action</Table.Th>
-                </Table.Tr>
-              </Table.Thead>
-              <Table.Tbody>
-                {filteredReturnedContainers.map((ret: any) => {
-                  const nextStatus = RETURN_STATUS_ORDER[RETURN_STATUS_ORDER.indexOf(ret.status) + 1];
-                  return (
-                    <Table.Tr key={ret.id}>
-                      <Table.Td>{ret.containerNumber}</Table.Td>
-                      <Table.Td>{ret.bookingId ? "Associated" : "—"}</Table.Td>
-                      <Table.Td>
-                        {ret.returnedBy ? (
-                          <Badge size="sm" color={ret.returnedBy === "EDR" ? "edr-green" : "blue"}>
-                            {ret.returnedBy === "EDR" ? "EDR Last Mile" : "Customer Self-Haul"}
-                          </Badge>
-                        ) : (
-                          "—"
-                        )}
-                      </Table.Td>
-                      <Table.Td>{ret.returnDate ? new Date(ret.returnDate).toLocaleDateString() : "—"}</Table.Td>
-                      <Table.Td>{ret.facility || "—"}</Table.Td>
-                      <Table.Td>{ret.yard || "—"}</Table.Td>
-                      <Table.Td>{ret.condition || "—"}</Table.Td>
-                      <Table.Td>
-                        <Badge size="sm">{RETURN_STATUS_LABEL[ret.status as EmptyContainerReturnStatus] ?? ret.status}</Badge>
-                      </Table.Td>
-                      <Table.Td ta="right">
-                        <Group gap="xs" justify="flex-end" wrap="nowrap">
-                          <ActionIcon variant="subtle" color="gray" onClick={() => setHistoryRow(ret)} title="View status history">
-                            <History size={14} />
-                          </ActionIcon>
-                          {nextStatus ? (
-                            <Button
-                              size="xs"
-                              variant="light"
-                              loading={advanceStatusMutation.isPending && advanceStatusMutation.variables === ret.id}
-                              onClick={() => advanceStatusMutation.mutate(ret.id)}
-                            >
-                              Advance to {RETURN_STATUS_LABEL[nextStatus]}
-                            </Button>
-                          ) : (
-                            <Text size="xs" c="dimmed">Done</Text>
-                          )}
-                        </Group>
-                      </Table.Td>
-                    </Table.Tr>
-                  );
-                })}
-              </Table.Tbody>
-            </Table>
-          </Table.ScrollContainer>
-        </>
+      {returnedContainers.length > 0 && (
+        <Card withBorder radius="lg" p="md" mb="lg">
+          <Stack gap="md">
+            <Text fw={600}>Returned Containers</Text>
+            <ListControls
+              search={returnedControls.search}
+              onSearchChange={returnedControls.setSearch}
+              searchPlaceholder="Search container, facility, condition…"
+              dateFrom={returnedControls.dateFrom}
+              onDateFromChange={returnedControls.setDateFrom}
+              dateTo={returnedControls.dateTo}
+              onDateToChange={returnedControls.setDateTo}
+              dateLabel="Returned"
+              hasFilters={returnedControls.hasFilters || Boolean(statusFilter)}
+              onReset={() => {
+                returnedControls.reset();
+                setStatusFilter(null);
+              }}
+            >
+              <Select
+                placeholder="Status"
+                value={statusFilter}
+                onChange={setStatusFilter}
+                data={RETURN_STATUS_ORDER.map((status) => ({
+                  value: status,
+                  label: RETURN_STATUS_LABEL[status],
+                }))}
+                clearable
+                w={200}
+              />
+            </ListControls>
+            <DataTable
+              columns={returnedColumns}
+              data={returnedControls.pagedRows}
+              containerClassName="border-0 shadow-none"
+              {...returnedControls.tableProps}
+            />
+          </Stack>
+        </Card>
      )}

      {filteredGroups.length === 0 ? (
@@ -471,6 +593,26 @@ export default function ContainerReturnsPage() {
        </>
      )}

+      {returnedContainers.length > 0 && (
+        <SimpleGrid cols={{ base: 1, lg: 2 }} spacing="md" mt="lg">
+          <OverviewStackedBarChart
+            title="Returns per day by truck type"
+            data={returnsPerDay}
+            series={RETURNED_BY_SERIES}
+            formatXLabel={(value) =>
+              new Date(value).toLocaleDateString(undefined, { day: "numeric", month: "short" })
+            }
+            emptyMessage="No returns in this range"
+          />
+          <OverviewHorizontalBarChart
+            title="Returns by status"
+            data={returnsByStatus}
+            valueLabel="Containers"
+            emptyMessage="No returns in this range"
+          />
+        </SimpleGrid>
+      )}
+
      <ContainerReturnModal
        opened={returnModalOpen}
        onClose={() => setReturnModalOpen(false)}