@burdenoff/microfe-movethewheels 2026.920.2 → 2026.921.1

package/src/movethewheels/pages/MultiModalShipmentPage.tsx

@@ -7,7 +7,17 @@
  */
 
 import { useState } from 'react';
-import { Ship, Plane, Truck, TrainFront, Plus, Trash2, Calculator } from 'lucide-react';
+import {
+  Ship,
+  Plane,
+  Truck,
+  TrainFront,
+  Plus,
+  Trash2,
+  Calculator,
+  ChevronLeft,
+  ChevronRight,
+} from 'lucide-react';
 import { PageLayout, PageSection, EmptyState, LoadingState } from '../components/PageLayout';
 import { FormError } from '../components/FormError';
 import {
@@ -69,8 +79,20 @@ function formatMoney(
 }
 
 export default function MultiModalShipmentPage() {
-  const { shipments, isLoading, error, calculateFreightRate, planMultiModalShipment } =
-    useMultiModalShipments();
+  const [pageIndex, setPageIndex] = useState(0);
+  const pageSize = 10;
+  const {
+    shipments,
+    totalShipments,
+    hasMore,
+    isLoading,
+    error,
+    calculateFreightRate,
+    planMultiModalShipment,
+  } = useMultiModalShipments({
+    limit: pageSize,
+    offset: pageIndex * pageSize,
+  });
 
   const [shipmentNumber, setShipmentNumber] = useState('');
   const [originAddress, setOriginAddress] = useState('');
@@ -149,6 +171,7 @@ export default function MultiModalShipmentPage() {
       setDestinationAddress('');
       setLegs([emptyLeg()]);
       setQuotes({});
+      setPageIndex(0);
     } catch (submitError) {
       setFormError(submitError instanceof Error ? submitError.message : 'Failed to plan shipment');
     } finally {
@@ -544,6 +567,32 @@ export default function MultiModalShipmentPage() {
                 </CardContent>
               </Card>
             ))}
+            {totalShipments > pageSize && (
+              <div className="flex items-center justify-between border-t border-border-seam pt-4">
+                <span className="text-sm text-text-secondary">
+                  Showing {pageIndex * pageSize + 1}–
+                  {Math.min((pageIndex + 1) * pageSize, totalShipments)} of {totalShipments}
+                </span>
+                <div className="flex gap-2">
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    disabled={pageIndex === 0 || isLoading}
+                    onClick={() => setPageIndex((previous) => Math.max(0, previous - 1))}
+                  >
+                    <ChevronLeft size={16} /> Previous
+                  </Button>
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    disabled={!hasMore || isLoading}
+                    onClick={() => setPageIndex((previous) => previous + 1)}
+                  >
+                    Next <ChevronRight size={16} />
+                  </Button>
+                </div>
+              </div>
+            )}
           </div>
         )}
       </PageSection>

package/src/movethewheels/pages/OrderDetailsPage.tsx

@@ -34,6 +34,7 @@ import {
   Button,
   Badge,
   Separator,
+  Input,
   Label,
   Select,
   SelectContent,
@@ -50,6 +51,7 @@ import {
 import { EmphasisPanel, NextSteps, PagePurpose } from '@burdenoff/fe-libs/ui';
 import { useOrder, useOrders } from '../hooks/useOrders';
 import { useFleet } from '../hooks/useFleet';
+import { useDebouncedValue } from '../hooks/useDebouncedValue';
 import { FormError } from '../components/FormError';
 import { Notice, useNotice } from '../components/Notice';
 import { DocumentsCard } from '../components/DocumentsCard';
@@ -96,7 +98,12 @@ export default function OrderDetailsPage() {
   const { basePath, navigate } = useMoveTheWheels();
   const { order, isLoading, error, refetch } = useOrder(orderId);
   const { updateOrder, updateOrderStatus } = useOrders();
-  const { vehicles, drivers } = useFleet();
+  const [fleetSearch, setFleetSearch] = useState('');
+  const debouncedFleetSearch = useDebouncedValue(fleetSearch);
+  const { vehicles, drivers } = useFleet({
+    limit: 20,
+    filters: { search: debouncedFleetSearch || undefined },
+  });
   const { message: notice, notify } = useNotice();
 
   const [selectedVehicle, setSelectedVehicle] = useState('');
@@ -477,6 +484,15 @@ export default function OrderDetailsPage() {
                 <Separator />
 
                 <div className="space-y-3">
+                  <div className="space-y-1.5">
+                    <Label htmlFor="assign-fleet-search">Search fleet</Label>
+                    <Input
+                      id="assign-fleet-search"
+                      value={fleetSearch}
+                      onChange={(event) => setFleetSearch(event.target.value)}
+                      placeholder="Vehicle number, driver name or ID"
+                    />
+                  </div>
                   <div className="space-y-1.5">
                     <Label htmlFor="assign-vehicle">Vehicle</Label>
                     <Select value={selectedVehicle} onValueChange={setSelectedVehicle}>

package/src/movethewheels/pages/OrdersListPage.tsx

@@ -34,6 +34,7 @@ import {
   Badge,
 } from '../components/ui';
 import { useOrders, useOrderStats } from '../hooks/useOrders';
+import { useDebouncedValue } from '../hooks/useDebouncedValue';
 import { useMoveTheWheels } from '../providers/MoveTheWheelsProvider';
 import { useI18n } from '@burdenoff/fe-libs/shared/providers/shell/I18nProvider';
 import { formatCurrency, formatDate } from '../utils/formatters';
@@ -51,13 +52,23 @@ export default function OrdersListPage() {
   const [unassignedOnly, setUnassignedOnly] = useState(false);
   const [page, setPage] = useState(0);
   const [pageSize, setPageSize] = useState(25);
+  const [search, setSearch] = useState('');
+  const debouncedSearch = useDebouncedValue(search);
 
-  const filtersActive = statusFilter !== 'all' || unassignedOnly;
+  const filtersActive = statusFilter !== 'all' || unassignedOnly || search.length > 0;
 
-  const { orders, hasMore, isLoading, error, refetch } = useOrders({
+  const {
+    orders,
+    totalOrders: totalMatchingOrders,
+    hasMore,
+    isLoading,
+    error,
+    refetch,
+  } = useOrders({
     filters: {
       status: statusFilter === 'all' ? undefined : statusFilter,
       unassigned: unassignedOnly || undefined,
+      search: debouncedSearch || undefined,
     },
     limit: pageSize,
     offset: page * pageSize,
@@ -303,6 +314,7 @@ export default function OrdersListPage() {
                 onClick={() => {
                   setStatusFilter('all');
                   setUnassignedOnly(false);
+                  setSearch('');
                   resetPage();
                 }}
               >
@@ -323,6 +335,11 @@ export default function OrdersListPage() {
         searchable
         searchPlaceholder={t('movethewheels.orders.searchPlaceholder', 'Search orders...')}
         searchFields={['orderNumber', 'customerInfo'] as (keyof Order)[]}
+        searchQuery={search}
+        onSearchQueryChange={(query) => {
+          setSearch(query);
+          setPage(0);
+        }}
         onRowClick={(row) => goTo(`orders/${row.id}`)}
         getRowId={(row) => row.id}
         pageIndex={page}
@@ -332,7 +349,7 @@ export default function OrdersListPage() {
           setPageSize(size);
           setPage(0);
         }}
-        totalItems={filtersActive ? undefined : totalOrders}
+        totalItems={totalMatchingOrders}
         hasNextPage={hasMore}
         emptyMessage={t('movethewheels.orders.empty', 'No orders found')}
         emptyIllustration="empty-data"

package/src/movethewheels/pages/ProductDetailsPage.tsx

@@ -4,7 +4,18 @@
 
 import { useEffect, useState } from 'react';
 import { useLocation, useParams } from 'react-router';
-import { Package, ArrowLeft, Edit, Box, DollarSign, Tag, Save, Warehouse } from 'lucide-react';
+import {
+  Package,
+  ArrowLeft,
+  Edit,
+  Box,
+  DollarSign,
+  Tag,
+  Save,
+  Warehouse,
+  ChevronLeft,
+  ChevronRight,
+} from 'lucide-react';
 import { PageLayout, LoadingState, ErrorState } from '../components/PageLayout';
 import {
   Card,
@@ -192,12 +203,23 @@ export default function ProductDetailsPage() {
   const { product, isLoading, error, refetch } = useProduct(productId);
   const isEditRoute = useLocation().pathname.endsWith('/edit');
   // Where this item is actually stocked — inventoryItems(filter: { cargoItemId }).
+  const [stockPage, setStockPage] = useState(0);
+  const stockPageSize = 20;
   const {
     levels: stockLevels,
+    totalLevels: totalStockLevels,
+    totalAvailable,
+    hasMore: hasMoreStock,
     isLoading: stockLoading,
     error: stockError,
-  } = useProductStockLevels(isEditRoute ? undefined : productId);
-  const totalAvailable = stockLevels.reduce((sum, level) => sum + level.available, 0);
+  } = useProductStockLevels(isEditRoute ? undefined : productId, {
+    limit: stockPageSize,
+    offset: stockPage * stockPageSize,
+  });
+
+  useEffect(() => {
+    setStockPage(0);
+  }, [productId]);
 
   const goBack = () => navigate?.(joinPath(basePath, 'inventory/products'));
   const goTo = (path: string) => navigate?.(joinPath(basePath, path));
@@ -391,6 +413,33 @@ export default function ProductDetailsPage() {
                       </span>
                     </div>
                   ))}
+                  {stockPage > 0 || hasMoreStock ? (
+                    <div className="flex items-center justify-between gap-2 border-t border-border-seam pt-3">
+                      <span className="text-xs text-text-secondary">
+                        {stockPage * stockPageSize + 1}–
+                        {Math.min(stockPage * stockPageSize + stockLevels.length, totalStockLevels)}{' '}
+                        of {totalStockLevels}
+                      </span>
+                      <div className="flex gap-2">
+                        <Button
+                          variant="outline"
+                          size="sm"
+                          disabled={stockPage === 0 || stockLoading}
+                          onClick={() => setStockPage((page) => Math.max(0, page - 1))}
+                        >
+                          <ChevronLeft size={14} /> Previous
+                        </Button>
+                        <Button
+                          variant="outline"
+                          size="sm"
+                          disabled={!hasMoreStock || stockLoading}
+                          onClick={() => setStockPage((page) => page + 1)}
+                        >
+                          Next <ChevronRight size={14} />
+                        </Button>
+                      </div>
+                    </div>
+                  ) : null}
                   <div className="flex items-baseline justify-between gap-3 border-t border-border-seam pt-3">
                     <p className="text-sm text-text-secondary">Available across the network</p>
                     <span className="font-bold">{totalAvailable.toLocaleString()}</span>

package/src/movethewheels/pages/ProductsPage.tsx

@@ -10,6 +10,7 @@ import { DataTable, type Column } from '../components/DataTable';
 import { Badge } from '../components/ui';
 import { CTAOverflowMenu, PagePurpose } from '@burdenoff/fe-libs/ui';
 import { useProducts, useProductStats } from '../hooks/useInventory';
+import { useDebouncedValue } from '../hooks/useDebouncedValue';
 import { useMoveTheWheels } from '../providers/MoveTheWheelsProvider';
 import { formatCurrency } from '../utils/formatters';
 import { joinPath } from '../utils/navigation';
@@ -19,9 +20,12 @@ export default function ProductsPage() {
   const { basePath, navigate } = useMoveTheWheels();
   const [page, setPage] = useState(0);
   const [pageSize, setPageSize] = useState(25);
-  const { products, hasMore, isLoading, error, refetch } = useProducts({
+  const [search, setSearch] = useState('');
+  const debouncedSearch = useDebouncedValue(search);
+  const { products, totalProducts, hasMore, isLoading, error, refetch } = useProducts({
     limit: pageSize,
     offset: page * pageSize,
+    search: debouncedSearch,
   });
   // Bounded aggregate for the tiles + subtitle — not the truncated page.
   const { stats } = useProductStats();
@@ -164,6 +168,11 @@ export default function ProductsPage() {
         searchable
         searchPlaceholder="Search products..."
         searchFields={['name', 'sku', 'category'] as (keyof Product)[]}
+        searchQuery={search}
+        onSearchQueryChange={(query) => {
+          setSearch(query);
+          setPage(0);
+        }}
         onRowClick={(row) => goTo(`inventory/products/${row.id}`)}
         getRowId={(row) => row.id}
         pageIndex={page}
@@ -173,6 +182,7 @@ export default function ProductsPage() {
           setPageSize(size);
           setPage(0);
         }}
+        totalItems={totalProducts}
         hasNextPage={hasMore}
         emptyIllustration="empty-files"
         emptyTitle="No products yet"

package/src/movethewheels/pages/RouteDetailsPage.tsx

@@ -40,17 +40,26 @@ import { EmphasisPanel, NextSteps, PagePurpose } from '@burdenoff/fe-libs/ui';
 import { RouteMap, type RouteStop as MapRouteStop } from '../components/maps';
 import { firstRealLatLng } from '../utils/mapMarkers';
 import { useRoute, useRoutes } from '../hooks/useRoutes';
-import { useFleet } from '../hooks/useFleet';
+import { useFleet, useVehicle, useDriver } from '../hooks/useFleet';
 import { useAssignmentSuggestions } from '../hooks/useFleetIntelligence';
 import { AssignmentSuggestions } from '../components/AssignmentSuggestions';
 import { useI18n } from '@burdenoff/fe-libs/shared/providers/shell/I18nProvider';
 import { useMoveTheWheels } from '../providers/MoveTheWheelsProvider';
+import { useDebouncedValue } from '../hooks/useDebouncedValue';
 import { formatDate, formatAddress, formatCurrency } from '../utils/formatters';
 import { joinPath } from '../utils/navigation';
 import { ROUTE_STATUS_COLORS } from '../constants';
 import { FormError } from '../components/FormError';
 import { Notice, useNotice } from '../components/Notice';
-import type { Route as RouteType, RouteStop } from '../types';
+import type { Route as RouteType, RouteStop, Vehicle, Driver } from '../types';
+
+/** Keeps a currently selected fleet item visible even when it falls outside the current search page. */
+function mergeSelected<T extends { id: string }>(items: T[], selected: T | null | undefined): T[] {
+  if (!selected || items.some((item) => item.id === selected.id)) {
+    return items;
+  }
+  return [selected, ...items];
+}
 
 const ROUTE_STATUS_OPTIONS: { value: RouteType['status']; label: string }[] = [
   { value: 'planned', label: 'Planned' },
@@ -63,7 +72,12 @@ function NewRouteForm({ editId }: { editId?: string }) {
   const { basePath, navigate } = useMoveTheWheels();
   const { createRoute, updateRoute } = useRoutes();
   const { route } = useRoute(editId);
-  const { vehicles, drivers } = useFleet();
+  const [fleetSearch, setFleetSearch] = useState('');
+  const debouncedFleetSearch = useDebouncedValue(fleetSearch);
+  const { vehicles, drivers } = useFleet({
+    limit: 20,
+    filters: { search: debouncedFleetSearch || undefined },
+  });
   const isEditing = !!editId;
   const [form, setForm] = useState<{
     name: string;
@@ -78,6 +92,13 @@ function NewRouteForm({ editId }: { editId?: string }) {
     driverId: '',
     stops: [{ address: '', type: 'delivery' }],
   });
+  // The selected vehicle/driver may fall outside the current search page (e.g. when
+  // editing a route or after the assignee no longer matches the search term); fetch
+  // them directly so the Select can still render the current selection.
+  const { vehicle: selectedVehicle } = useVehicle(form.vehicleId || undefined);
+  const { driver: selectedDriver } = useDriver(form.driverId || undefined);
+  const vehicleOptions: Vehicle[] = mergeSelected(vehicles, selectedVehicle);
+  const driverOptions: Driver[] = mergeSelected(drivers, selectedDriver);
   const [submitting, setSubmitting] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
@@ -253,6 +274,15 @@ function NewRouteForm({ editId }: { editId?: string }) {
                 </Select>
               </div>
             </div>
+            <div className="space-y-2">
+              <Label htmlFor="fleet-search">Search fleet</Label>
+              <Input
+                id="fleet-search"
+                value={fleetSearch}
+                onChange={(e) => setFleetSearch(e.target.value)}
+                placeholder="Vehicle number, driver name or ID"
+              />
+            </div>
             <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
               <div className="space-y-2">
                 <Label htmlFor="vehicle">Vehicle (optional)</Label>
@@ -264,7 +294,7 @@ function NewRouteForm({ editId }: { editId?: string }) {
                     <SelectValue placeholder="Assign later" />
                   </SelectTrigger>
                   <SelectContent>
-                    {vehicles.map((vehicle) => (
+                    {vehicleOptions.map((vehicle) => (
                       <SelectItem key={vehicle.id} value={vehicle.id}>
                         {vehicle.vehicleNumber} ({vehicle.type})
                       </SelectItem>
@@ -282,7 +312,7 @@ function NewRouteForm({ editId }: { editId?: string }) {
                     <SelectValue placeholder="Assign later" />
                   </SelectTrigger>
                   <SelectContent>
-                    {drivers.map((driver) => (
+                    {driverOptions.map((driver) => (
                       <SelectItem key={driver.id} value={driver.id}>
                         {driver.fullName} ({driver.employeeId})
                       </SelectItem>

package/src/movethewheels/pages/RoutesPage.tsx

@@ -10,6 +10,7 @@ import { StatusBadge } from '../components/StatusBadge';
 import { Badge, Button } from '../components/ui';
 import { CTAOverflowMenu, EmphasisPanel, PagePurpose } from '@burdenoff/fe-libs/ui';
 import { useRoutes, useRouteStats } from '../hooks/useRoutes';
+import { useDebouncedValue } from '../hooks/useDebouncedValue';
 import { useMoveTheWheels } from '../providers/MoveTheWheelsProvider';
 import { formatDate } from '../utils/formatters';
 import { joinPath } from '../utils/navigation';
@@ -20,9 +21,12 @@ export default function RoutesPage() {
   const { basePath, navigate } = useMoveTheWheels();
   const [page, setPage] = useState(0);
   const [pageSize, setPageSize] = useState(25);
-  const { routes, hasMore, isLoading, error, refetch } = useRoutes({
+  const [search, setSearch] = useState('');
+  const debouncedSearch = useDebouncedValue(search);
+  const { routes, totalRoutes, hasMore, isLoading, error, refetch } = useRoutes({
     limit: pageSize,
     offset: page * pageSize,
+    search: debouncedSearch || undefined,
   });
   // Bounded aggregate for the tiles + subtitle — not the truncated page.
   const { stats } = useRouteStats();
@@ -131,6 +135,11 @@ export default function RoutesPage() {
         searchable
         searchPlaceholder="Search routes..."
         searchFields={['name'] as (keyof Route)[]}
+        searchQuery={search}
+        onSearchQueryChange={(query) => {
+          setSearch(query);
+          setPage(0);
+        }}
         onRowClick={(row) => goTo(`routes/${row.id}`)}
         getRowId={(row) => row.id}
         pageIndex={page}
@@ -140,6 +149,7 @@ export default function RoutesPage() {
           setPageSize(size);
           setPage(0);
         }}
+        totalItems={totalRoutes}
         hasNextPage={hasMore}
         emptyIllustration="empty-data"
         emptyTitle="No routes yet"

package/src/movethewheels/pages/VehiclesPage.tsx

@@ -19,6 +19,7 @@ import { StatusBadge, VehicleTypeBadge } from '../components/StatusBadge';
 import { Progress } from '../components/ui';
 import { CTAOverflowMenu, PagePurpose } from '@burdenoff/fe-libs/ui';
 import { useVehicles, useFleetStats } from '../hooks/useFleet';
+import { useDebouncedValue } from '../hooks/useDebouncedValue';
 import { useMoveTheWheels } from '../providers/MoveTheWheelsProvider';
 import { joinPath } from '../utils/navigation';
 import type { Vehicle } from '../types';
@@ -27,9 +28,19 @@ export default function VehiclesPage() {
   const { basePath, navigate } = useMoveTheWheels();
   const [page, setPage] = useState(0);
   const [pageSize, setPageSize] = useState(25);
-  const { vehicles, isLoading, error, refetch } = useVehicles({
+  const [search, setSearch] = useState('');
+  const debouncedSearch = useDebouncedValue(search);
+  const {
+    vehicles,
+    totalVehicles: filteredVehicleCount,
+    hasMore,
+    isLoading,
+    error,
+    refetch,
+  } = useVehicles({
     limit: pageSize,
     offset: page * pageSize,
+    search: debouncedSearch || undefined,
   });
   // Fleet totals + tiles from the live aggregate, not the current page.
   const { stats } = useFleetStats();
@@ -176,6 +187,11 @@ export default function VehiclesPage() {
         searchable
         searchPlaceholder="Search vehicles..."
         searchFields={['vehicleNumber', 'make', 'model'] as (keyof Vehicle)[]}
+        searchQuery={search}
+        onSearchQueryChange={(query) => {
+          setSearch(query);
+          setPage(0);
+        }}
         onRowClick={(row) => goTo(`fleet/vehicles/${row.id}`)}
         getRowId={(row) => row.id}
         pageIndex={page}
@@ -185,7 +201,8 @@ export default function VehiclesPage() {
           setPageSize(size);
           setPage(0);
         }}
-        totalItems={totalVehicles}
+        totalItems={filteredVehicleCount}
+        hasNextPage={hasMore}
         emptyIllustration="empty-data"
         emptyTitle="No vehicles yet"
         emptyDescription="Add vehicles to your fleet to start assigning them to deliveries."

package/src/movethewheels/pages/WarehousesPage.tsx

@@ -10,6 +10,7 @@ import { DataTable, type Column } from '../components/DataTable';
 import { Badge, Progress } from '../components/ui';
 import { CTAOverflowMenu, PagePurpose } from '@burdenoff/fe-libs/ui';
 import { useWarehouses, useWarehouseStats } from '../hooks/useInventory';
+import { useDebouncedValue } from '../hooks/useDebouncedValue';
 import { useMoveTheWheels } from '../providers/MoveTheWheelsProvider';
 import { joinPath } from '../utils/navigation';
 import type { Warehouse as WarehouseType } from '../types';
@@ -18,9 +19,12 @@ export default function WarehousesPage() {
   const { basePath, navigate } = useMoveTheWheels();
   const [page, setPage] = useState(0);
   const [pageSize, setPageSize] = useState(25);
-  const { warehouses, hasMore, isLoading, error, refetch } = useWarehouses({
+  const [search, setSearch] = useState('');
+  const debouncedSearch = useDebouncedValue(search);
+  const { warehouses, totalWarehouses, hasMore, isLoading, error, refetch } = useWarehouses({
     limit: pageSize,
     offset: page * pageSize,
+    search: debouncedSearch,
   });
   // Bounded aggregate for the tiles + subtitle — not the truncated page.
   const { stats } = useWarehouseStats();
@@ -157,6 +161,11 @@ export default function WarehousesPage() {
         searchable
         searchPlaceholder="Search warehouses..."
         searchFields={['name', 'code'] as (keyof WarehouseType)[]}
+        searchQuery={search}
+        onSearchQueryChange={(query) => {
+          setSearch(query);
+          setPage(0);
+        }}
         onRowClick={(row) => goTo(`inventory/warehouses/${row.id}`)}
         getRowId={(row) => row.id}
         pageIndex={page}
@@ -166,6 +175,7 @@ export default function WarehousesPage() {
           setPageSize(size);
           setPage(0);
         }}
+        totalItems={totalWarehouses}
         hasNextPage={hasMore}
         emptyIllustration="empty-data"
         emptyTitle="No warehouses yet"

package/src/movethewheels/types/index.ts

@@ -502,7 +502,10 @@ export interface InventoryMovement {
 export interface Inventory {
   id: string;
   productId: string;
+  productName?: string;
+  productSku?: string;
   warehouseId: string;
+  warehouseName?: string;
   zoneId: string;
   quantity: number;
   reservedQuantity: number;
@@ -746,11 +749,8 @@ export interface OrderFilter {
   dateFrom?: Date;
   dateTo?: Date;
   priority?: string;
-  /**
-   * Client-side quick filter for orders that still need a driver assigned
-   * (driverId is null). The backend DeliveryJobFilterInput has no null-driver
-   * predicate, so this is applied to the fetched page after mapping.
-   */
+  search?: string;
+  /** Server-side predicate for orders that still need a driver assigned. */
   unassigned?: boolean;
 }
 
@@ -758,11 +758,13 @@ export interface FleetFilter {
   vehicleType?: VehicleType;
   status?: VehicleStatus;
   driverId?: string;
+  search?: string;
 }
 
 export interface InventoryFilter {
   warehouseId?: string;
   productId?: string;
+  search?: string;
   lowStock?: boolean;
 }
 

package/src/movethewheels/utils/navigation.ts

@@ -68,3 +68,35 @@ export function parseQueryParams(search: string): Record<string, string> {
   });
   return params;
 }
+
+const CUSTOMER_RETURN_PATHS = [/^orders\/new$/, /^orders\/[^/?#]+\/edit$/];
+
+/**
+ * Return only an internal order destination for customer create-and-return flows.
+ * Query strings are intentionally discarded so callers cannot smuggle a second
+ * return target or an open redirect through the customer form.
+ */
+export function getSafeCustomerReturnPath(value: string | null | undefined): string | null {
+  if (!value || value.length > 200 || value.includes('://') || value.startsWith('/')) {
+    return null;
+  }
+
+  const [pathname] = value.split(/[?#]/, 1);
+  return CUSTOMER_RETURN_PATHS.some((pattern) => pattern.test(pathname)) ? pathname : null;
+}
+
+/**
+ * Build an order route with a customer preselected after a customer is created.
+ */
+export function buildOrderCustomerPath(orderPath: string, customerId: string): string {
+  const safeOrderPath = getSafeCustomerReturnPath(orderPath);
+  return safeOrderPath ? buildUrl(safeOrderPath, { customerId }) : orderPath;
+}
+
+/**
+ * Build the local customer creation route while preserving a safe order return path.
+ */
+export function buildCustomerCreatePath(orderPath: string): string {
+  const safeOrderPath = getSafeCustomerReturnPath(orderPath);
+  return safeOrderPath ? buildUrl('customers/new', { returnTo: safeOrderPath }) : 'customers/new';
+}