@burdenoff/microfe-movethewheels 2026.920.3 → 2026.921.1

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;
 }