@burdenoff/microfe-movethewheels 2026.920.3 → 2026.923.1

package/src/movethewheels/hooks/useFleet.ts

@@ -5,6 +5,7 @@ import { executeGraphQL } from '../utils/graphqlClient';
 
 interface UseFleetOptions {
   filters?: FleetFilter;
+  limit?: number;
 }
 
 export interface CreateVehicleInput {
@@ -39,7 +40,7 @@ interface UseFleetResult {
   updateDriver: (id: string, input: CreateDriverInput) => Promise<Driver>;
 }
 
-interface ApiVehicle {
+export interface ApiVehicle {
   id: string;
   vehicleNumber: string;
   type: string;
@@ -60,7 +61,7 @@ interface ApiVehicle {
   updatedAt?: string;
 }
 
-interface ApiDriver {
+export interface ApiDriver {
   id: string;
   userId?: string | null;
   firstName: string;
@@ -100,6 +101,7 @@ const LIST_VEHICLES_QUERY = `
       createdAt
       updatedAt
     }
+    vehiclesCount(filter: $filter)
   }
 `;
 
@@ -122,6 +124,7 @@ const LIST_DRIVERS_QUERY = `
       vehicleId
       createdAt
     }
+    driversCount(filter: $filter)
   }
 `;
 
@@ -408,7 +411,7 @@ function toApiDriverStatus(status: DriverStatus): string {
   }
 }
 
-function mapVehicle(vehicle: ApiVehicle): Vehicle {
+export function mapVehicle(vehicle: ApiVehicle): Vehicle {
   return {
     id: vehicle.id,
     vehicleNumber: vehicle.vehicleNumber,
@@ -443,7 +446,7 @@ function mapVehicle(vehicle: ApiVehicle): Vehicle {
   };
 }
 
-function mapDriver(driver: ApiDriver): Driver {
+export function mapDriver(driver: ApiDriver): Driver {
   return {
     id: driver.id,
     userId: driver.userId ?? driver.id,
@@ -524,13 +527,19 @@ function useGraphqlOptions() {
 }
 
 export function useFleet(options: UseFleetOptions = {}): UseFleetResult {
-  const { filters: rawFilters } = options;
+  const { filters: rawFilters, limit = 20 } = options;
   // Stabilize the filters reference by its primitive fields so React Compiler's
   // inferred `filters` dependency stays stable and `load` is not recreated (and
   // refetched) every render when the caller passes an inline filters object.
   const filters = useMemo(
     () => rawFilters,
-    [rawFilters?.driverId, rawFilters?.status, rawFilters?.vehicleType]
+    [
+      rawFilters?.driverId,
+      rawFilters?.search,
+      rawFilters?.status,
+      rawFilters?.vehicleId,
+      rawFilters?.vehicleType,
+    ]
   );
   const graphQLOptions = useGraphqlOptions();
   const [vehicles, setVehicles] = useState<Vehicle[]>([]);
@@ -545,16 +554,19 @@ export function useFleet(options: UseFleetOptions = {}): UseFleetResult {
       const [vehicleData, driverData] = await Promise.all([
         executeGraphQL<{ vehicles: ApiVehicle[] }>(graphQLOptions, LIST_VEHICLES_QUERY, {
           filter: {
+            search: filters?.search,
             type: filters?.vehicleType?.toUpperCase(),
             status: filters?.status ? toApiVehicleStatus(filters.status) : undefined,
+            driverId: filters?.driverId,
           },
-          pagination: { limit: 200, offset: 0 },
+          pagination: { limit, offset: 0 },
         }),
         executeGraphQL<{ drivers: ApiDriver[] }>(graphQLOptions, LIST_DRIVERS_QUERY, {
           filter: {
-            vehicleId: filters?.driverId,
+            search: filters?.search,
+            vehicleId: filters?.vehicleId,
           },
-          pagination: { limit: 200, offset: 0 },
+          pagination: { limit, offset: 0 },
         }),
       ]);
 
@@ -565,7 +577,7 @@ export function useFleet(options: UseFleetOptions = {}): UseFleetResult {
     } finally {
       setIsLoading(false);
     }
-  }, [filters, graphQLOptions]);
+  }, [filters, graphQLOptions, limit]);
 
   useEffect(() => {
     void load();
@@ -686,6 +698,12 @@ interface UseListOptions {
   offset?: number;
 }
 
+interface UseVehiclesOptions extends UseListOptions {
+  search?: string;
+  status?: VehicleStatus;
+  vehicleType?: Vehicle['type'];
+}
+
 interface UseVehiclesResult {
   vehicles: Vehicle[];
   totalVehicles: number;
@@ -698,10 +716,11 @@ interface UseVehiclesResult {
   assignDriver: (vehicleId: string, driverId: string) => Promise<Vehicle>;
 }
 
-export function useVehicles(options: UseListOptions = {}): UseVehiclesResult {
-  const { limit = 200, offset = 0 } = options;
+export function useVehicles(options: UseVehiclesOptions = {}): UseVehiclesResult {
+  const { limit = 20, offset = 0, search, status, vehicleType } = options;
   const graphQLOptions = useGraphqlOptions();
   const [vehicles, setVehicles] = useState<Vehicle[]>([]);
+  const [totalVehicles, setTotalVehicles] = useState(0);
   const [hasMore, setHasMore] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState<Error | null>(null);
@@ -710,21 +729,26 @@ export function useVehicles(options: UseListOptions = {}): UseVehiclesResult {
     setIsLoading(true);
     setError(null);
     try {
-      const data = await executeGraphQL<{ vehicles: ApiVehicle[] }>(
-        graphQLOptions,
-        LIST_VEHICLES_QUERY,
-        {
-          pagination: { limit, offset },
-        }
-      );
-      setHasMore(data.vehicles.length === limit);
+      const data = await executeGraphQL<{
+        vehicles: ApiVehicle[];
+        vehiclesCount: number;
+      }>(graphQLOptions, LIST_VEHICLES_QUERY, {
+        filter: {
+          search: search || undefined,
+          status: status ? toApiVehicleStatus(status) : undefined,
+          type: vehicleType?.toUpperCase(),
+        },
+        pagination: { limit, offset },
+      });
+      setHasMore(offset + data.vehicles.length < data.vehiclesCount);
+      setTotalVehicles(data.vehiclesCount);
       setVehicles(data.vehicles.map(mapVehicle));
     } catch (fetchError) {
       setError(fetchError instanceof Error ? fetchError : new Error('Failed to load vehicles'));
     } finally {
       setIsLoading(false);
     }
-  }, [graphQLOptions, limit, offset]);
+  }, [graphQLOptions, limit, offset, search, status, vehicleType]);
 
   useEffect(() => {
     void load();
@@ -774,7 +798,7 @@ export function useVehicles(options: UseListOptions = {}): UseVehiclesResult {
 
   return {
     vehicles,
-    totalVehicles: vehicles.length,
+    totalVehicles,
     hasMore,
     isLoading,
     error,
@@ -838,17 +862,17 @@ interface UseDriversResult {
 }
 
 interface UseDriversOptions extends UseListOptions {
-  /**
-   * Narrows the roster server-side via `DriverFilterInput.status` so the pager
-   * still counts whole result sets rather than filtering one fetched page.
-   */
+  /** Narrows the roster server-side via DriverFilterInput.status. */
   status?: DriverStatus;
+  search?: string;
+  licenseClass?: string;
 }
 
 export function useDrivers(options: UseDriversOptions = {}): UseDriversResult {
-  const { limit = 200, offset = 0, status } = options;
+  const { limit = 20, offset = 0, status, search, licenseClass } = options;
   const graphQLOptions = useGraphqlOptions();
   const [drivers, setDrivers] = useState<Driver[]>([]);
+  const [totalDrivers, setTotalDrivers] = useState(0);
   const [hasMore, setHasMore] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState<Error | null>(null);
@@ -857,22 +881,26 @@ export function useDrivers(options: UseDriversOptions = {}): UseDriversResult {
     setIsLoading(true);
     setError(null);
     try {
-      const data = await executeGraphQL<{ drivers: ApiDriver[] }>(
-        graphQLOptions,
-        LIST_DRIVERS_QUERY,
-        {
-          filter: status ? { status: toApiDriverStatus(status) } : undefined,
-          pagination: { limit, offset },
-        }
-      );
-      setHasMore(data.drivers.length === limit);
+      const data = await executeGraphQL<{
+        drivers: ApiDriver[];
+        driversCount: number;
+      }>(graphQLOptions, LIST_DRIVERS_QUERY, {
+        filter: {
+          status: status ? toApiDriverStatus(status) : undefined,
+          search: search || undefined,
+          licenseClass: licenseClass || undefined,
+        },
+        pagination: { limit, offset },
+      });
+      setHasMore(offset + data.drivers.length < data.driversCount);
+      setTotalDrivers(data.driversCount);
       setDrivers(data.drivers.map(mapDriver));
     } catch (fetchError) {
       setError(fetchError instanceof Error ? fetchError : new Error('Failed to load drivers'));
     } finally {
       setIsLoading(false);
     }
-  }, [graphQLOptions, limit, offset, status]);
+  }, [graphQLOptions, limit, offset, status, search, licenseClass]);
 
   useEffect(() => {
     void load();
@@ -918,7 +946,7 @@ export function useDrivers(options: UseDriversOptions = {}): UseDriversResult {
 
   return {
     drivers,
-    totalDrivers: drivers.length,
+    totalDrivers,
     hasMore,
     isLoading,
     error,

package/src/movethewheels/hooks/useFleetIntelligence.ts

@@ -11,10 +11,7 @@ import { useMoveTheWheels } from '../providers/MoveTheWheelsProvider';
 import { executeGraphQL } from '../utils/graphqlClient';
 
 export type FleetAlertType =
-  | 'LICENSE_EXPIRED'
-  | 'LICENSE_EXPIRING'
-  | 'MAINTENANCE_OVERDUE'
-  | 'MAINTENANCE_DUE_SOON';
+  'LICENSE_EXPIRED' | 'LICENSE_EXPIRING' | 'MAINTENANCE_OVERDUE' | 'MAINTENANCE_DUE_SOON';
 export type FleetAlertSeverity = 'CRITICAL' | 'WARNING';
 export type FleetAlertSubjectType = 'VEHICLE' | 'DRIVER';