refactor: migrated of the customer hooks for warehouse data fetching

apps/edr-freight-web/backoffice/src/components/warehouses/ActivityTimeline.tsx

@@ -9,7 +9,9 @@ import {
   Warehouse,
 } from 'lucide-react';
 
-import { useInventoryActivity } from '@/hooks/useWarehouses';
+import { useQuery } from '@tanstack/react-query';
+
+import { api } from '@/services/api';
 import type { ActivityType } from '@/types/warehouse';
 import { formatDate, humanizeEnum } from './options';
 
@@ -24,7 +26,12 @@ const activityIcon: Record<ActivityType, React.ReactNode> = {
 };
 
 export function ActivityTimeline({ inventoryId }: { inventoryId: string }) {
-  const { data, isLoading } = useInventoryActivity(inventoryId);
+  const { data, isLoading } = useQuery(
+    api.warehouses.activity.queryOptions({
+      input: { id: inventoryId },
+      enabled: Boolean(inventoryId),
+    }),
+  );
   const items = data ?? [];
 
   if (isLoading) {

apps/edr-freight-web/backoffice/src/components/warehouses/CreateWarehouseModal.tsx

@@ -9,9 +9,11 @@ import {
   TextInput,
 } from '@mantine/core';
 
+import { useMutation } from '@tanstack/react-query';
+
+import { api } from '@/services/api';
 import { useToast } from '@/hooks/use-toast';
 import { useStations } from '@/hooks/useStations';
-import { useCreateWarehouse, useUpdateWarehouse } from '@/hooks/useWarehouses';
 import type { SaveWarehousePayload, Warehouse, WarehouseType } from '@/types/warehouse';
 import { extractErrorMessage, statusOptions, warehouseTypeOptions } from './options';
 
@@ -48,8 +50,8 @@ const emptyForm = (): FormState => ({
 export function CreateWarehouseModal({ opened, onClose, warehouse }: CreateWarehouseModalProps) {
   const isEdit = Boolean(warehouse);
   const { toast } = useToast();
-  const createMutation = useCreateWarehouse();
-  const updateMutation = useUpdateWarehouse();
+  const createMutation = useMutation(api.warehouses.create.mutationOptions());
+  const updateMutation = useMutation(api.warehouses.update.mutationOptions());
   const { data: stations } = useStations();
   const [form, setForm] = useState<FormState>(emptyForm());
 

apps/edr-freight-web/backoffice/src/components/warehouses/CreateYardModal.tsx

@@ -1,8 +1,10 @@
 import { useEffect, useState } from 'react';
 import { Button, Group, Modal, NumberInput, Select, Stack, TextInput } from '@mantine/core';
 
+import { useMutation } from '@tanstack/react-query';
+
+import { api } from '@/services/api';
 import { useToast } from '@/hooks/use-toast';
-import { useCreateYard, useUpdateYard } from '@/hooks/useWarehouses';
 import type { SaveYardPayload, WarehouseYard, WarehouseYardType } from '@/types/warehouse';
 import { extractErrorMessage, statusOptions, yardTypeOptions } from './options';
 
@@ -36,8 +38,8 @@ const emptyForm = (): FormState => ({
 export function CreateYardModal({ opened, onClose, warehouseId, yard }: CreateYardModalProps) {
   const isEdit = Boolean(yard);
   const { toast } = useToast();
-  const createMutation = useCreateYard();
-  const updateMutation = useUpdateYard();
+  const createMutation = useMutation(api.warehouses.createYard.mutationOptions());
+  const updateMutation = useMutation(api.warehouses.updateYard.mutationOptions());
   const [form, setForm] = useState<FormState>(emptyForm());
 
   useEffect(() => {

apps/edr-freight-web/backoffice/src/components/warehouses/CreateZoneModal.tsx

@@ -1,8 +1,10 @@
 import { useEffect, useState } from 'react';
 import { Button, Group, Modal, NumberInput, Select, Stack, TextInput } from '@mantine/core';
 
+import { useMutation } from '@tanstack/react-query';
+
+import { api } from '@/services/api';
 import { useToast } from '@/hooks/use-toast';
-import { useCreateZone, useUpdateZone } from '@/hooks/useWarehouses';
 import type { SaveZonePayload, WarehouseZone, WarehouseZoneType } from '@/types/warehouse';
 import { extractErrorMessage, statusOptions, zoneTypeOptions } from './options';
 
@@ -36,8 +38,8 @@ const emptyForm = (): FormState => ({
 export function CreateZoneModal({ opened, onClose, yardId, zone }: CreateZoneModalProps) {
   const isEdit = Boolean(zone);
   const { toast } = useToast();
-  const createMutation = useCreateZone();
-  const updateMutation = useUpdateZone();
+  const createMutation = useMutation(api.warehouses.createZone.mutationOptions());
+  const updateMutation = useMutation(api.warehouses.updateZone.mutationOptions());
   const [form, setForm] = useState<FormState>(emptyForm());
 
   useEffect(() => {

apps/edr-freight-web/backoffice/src/components/warehouses/DeliverInventoryModal.tsx

@@ -2,8 +2,10 @@ import { useEffect, useState } from 'react';
 import { Alert, Button, Group, Modal, Stack, Text, Textarea, TextInput } from '@mantine/core';
 import { Info } from 'lucide-react';
 
+import { useMutation } from '@tanstack/react-query';
+
+import { api } from '@/services/api';
 import { useToast } from '@/hooks/use-toast';
-import { useDeliverInventory } from '@/hooks/useWarehouses';
 import type { WarehouseInventoryItem } from '@/types/warehouse';
 import { extractErrorMessage } from './options';
 
@@ -15,7 +17,7 @@ interface DeliverInventoryModalProps {
 
 export function DeliverInventoryModal({ opened, onClose, item }: DeliverInventoryModalProps) {
   const { toast } = useToast();
-  const deliverMutation = useDeliverInventory();
+  const deliverMutation = useMutation(api.warehouses.deliver.mutationOptions());
   const [receiverName, setReceiverName] = useState('');
   const [remarks, setRemarks] = useState('');
 

apps/edr-freight-web/backoffice/src/components/warehouses/FeePreviewModal.tsx

@@ -1,13 +1,10 @@
 import { Badge, Button, Card, Divider, Group, Loader, Modal, Stack, Text } from '@mantine/core';
 import { CalendarClock, Coins, DoorOpen, FileText } from 'lucide-react';
 
+import { useMutation, useQuery } from '@tanstack/react-query';
+
+import { api } from '@/services/api';
 import { useToast } from '@/hooks/use-toast';
-import {
-  useFeePreview,
-  useGateClearance,
-  useGenerateInvoice,
-  useInvoicesForInventory,
-} from '@/hooks/useWarehouses';
 import { extractErrorMessage } from './options';
 import type { FeePreview, WarehouseInvoiceStatus } from '@/types/warehouse';
 
@@ -88,10 +85,20 @@ function Row({ label, value }: { label: string; value: string }) {
 export function FeePreviewModal({ opened, onClose, inventoryId }: FeePreviewModalProps) {
   const { toast } = useToast();
   const enabledId = opened ? inventoryId ?? undefined : undefined;
-  const { data, isLoading } = useFeePreview(enabledId);
-  const { data: invoices } = useInvoicesForInventory(enabledId);
-  const generate = useGenerateInvoice();
-  const gateClear = useGateClearance();
+  const { data, isLoading } = useQuery(
+    api.warehouses.feePreview.queryOptions({
+      input: { inventoryId: enabledId ?? '' },
+      enabled: Boolean(enabledId),
+    }),
+  );
+  const { data: invoices } = useQuery(
+    api.warehouses.invoicesForInventory.queryOptions({
+      input: { inventoryId: enabledId ?? '' },
+      enabled: Boolean(enabledId),
+    }),
+  );
+  const generate = useMutation(api.warehouses.generateInvoice.mutationOptions());
+  const gateClear = useMutation(api.warehouses.gateClearance.mutationOptions());
 
   const activeInvoice = (invoices ?? []).find((i) => i.status !== 'CANCELLED');
 

apps/edr-freight-web/backoffice/src/components/warehouses/InspectionReportModal.tsx

@@ -12,8 +12,10 @@ import {
 } from '@mantine/core';
 import { Upload } from 'lucide-react';
 
+import { useMutation } from '@tanstack/react-query';
+
+import { api } from '@/services/api';
 import { useToast } from '@/hooks/use-toast';
-import { useCreateInspectionReport, useUploadInspectionAttachments } from '@/hooks/useWarehouses';
 import {
   INSPECTION_REPORT_TYPES,
   INSPECTION_STATUSES,
@@ -45,8 +47,12 @@ const STATUS_LABELS: Record<InspectionResultStatus, string> = {
 /** Batch 4.5 — record an inspection / damage report with optional image upload. */
 export function InspectionReportModal({ opened, onClose, inventoryId }: InspectionReportModalProps) {
   const { toast } = useToast();
-  const createReport = useCreateInspectionReport();
-  const uploadAttachments = useUploadInspectionAttachments();
+  const createReport = useMutation(
+    api.warehouses.createInspectionReport.mutationOptions(),
+  );
+  const uploadAttachments = useMutation(
+    api.warehouses.uploadInspectionAttachments.mutationOptions(),
+  );
 
   const [reportType, setReportType] = useState<InspectionReportType>('INSPECTION');
   const [inspectionStatus, setInspectionStatus] = useState<InspectionResultStatus>('PASSED');

apps/edr-freight-web/backoffice/src/components/warehouses/InventoryMovementHistoryTable.tsx

@@ -1,12 +1,19 @@
 import { Center, Loader, Table, Text } from '@mantine/core';
 
-import { useInventoryMovements } from '@/hooks/useWarehouses';
+import { useQuery } from '@tanstack/react-query';
+
+import { api } from '@/services/api';
 import { formatDate } from './options';
 
 const shortId = (id?: string | null) => (id ? `${id.slice(0, 8)}…` : '—');
 
 export function InventoryMovementHistoryTable({ inventoryId }: { inventoryId: string }) {
-  const { data, isLoading } = useInventoryMovements(inventoryId);
+  const { data, isLoading } = useQuery(
+    api.warehouses.movements.queryOptions({
+      input: { id: inventoryId },
+      enabled: Boolean(inventoryId),
+    }),
+  );
   const movements = data ?? [];
 
   if (isLoading) {

apps/edr-freight-web/backoffice/src/components/warehouses/InventoryWorkbench.tsx

@@ -2,14 +2,10 @@ import { useState } from 'react';
 import { Button, Center, Group, Loader, Stack, Text } from '@mantine/core';
 import { ClipboardCheck } from 'lucide-react';
 
+import { useMutation } from '@tanstack/react-query';
+
+import { api } from '@/services/api';
 import { useToast } from '@/hooks/use-toast';
-import {
-  useBulkMarkInspected,
-  useDispatchInventory,
-  useMarkReadyForLoading,
-  useMarkReadyForPickup,
-  useStoreInventory,
-} from '@/hooks/useWarehouses';
 import type { InventoryAction, WarehouseInventoryItem } from '@/types/warehouse';
 import { DeliverInventoryModal } from './DeliverInventoryModal';
 import { FeePreviewModal } from './FeePreviewModal';
@@ -42,11 +38,17 @@ export function InventoryWorkbench({ items, isLoading, onLastMile }: InventoryWo
   const [releaseItem, setReleaseItem] = useState<WarehouseInventoryItem | null>(null);
   const [deliverItem, setDeliverItem] = useState<WarehouseInventoryItem | null>(null);
 
-  const storeMutation = useStoreInventory();
-  const readyMutation = useMarkReadyForLoading();
-  const pickupMutation = useMarkReadyForPickup();
-  const dispatchMutation = useDispatchInventory();
-  const inspectMutation = useBulkMarkInspected();
+  const storeMutation = useMutation(api.warehouses.store.mutationOptions());
+  const readyMutation = useMutation(
+    api.warehouses.markReadyForLoading.mutationOptions(),
+  );
+  const pickupMutation = useMutation(
+    api.warehouses.markReadyForPickup.mutationOptions(),
+  );
+  const dispatchMutation = useMutation(api.warehouses.dispatch.mutationOptions());
+  const inspectMutation = useMutation(
+    api.warehouses.bulkMarkInspected.mutationOptions(),
+  );
 
   const [selected, setSelected] = useState<Set<string>>(new Set());
   const allSelected = items.length > 0 && selected.size === items.length;
@@ -66,10 +68,7 @@ export function InventoryWorkbench({ items, isLoading, onLastMile }: InventoryWo
       return;
     }
     try {
-      const res = (await inspectMutation.mutateAsync({ inventoryIds: [...selected] })) as {
-        data: { inspectedCount: number; skippedCount: number };
-      };
-      const r = res.data;
+      const r = await inspectMutation.mutateAsync({ inventoryIds: [...selected] });
       toast({
         title: `${r.inspectedCount} marked inspected`,
         description: r.skippedCount ? `${r.skippedCount} skipped` : undefined,

apps/edr-freight-web/backoffice/src/components/warehouses/LoadInventoryModal.tsx

@@ -2,8 +2,10 @@ import { useEffect, useState } from 'react';
 import { Alert, Button, Group, Modal, NumberInput, Stack, Text, Textarea } from '@mantine/core';
 import { Info } from 'lucide-react';
 
+import { useMutation } from '@tanstack/react-query';
+
+import { api } from '@/services/api';
 import { useToast } from '@/hooks/use-toast';
-import { useLoadInventory } from '@/hooks/useWarehouses';
 import type { WarehouseInventoryItem } from '@/types/warehouse';
 import { WagonSelect } from './WagonSelect';
 import { extractErrorMessage } from './options';
@@ -17,7 +19,7 @@ interface LoadInventoryModalProps {
 /** Load READY_FOR_LOADING inventory onto a wagon (creates a loading record). */
 export function LoadInventoryModal({ opened, onClose, item }: LoadInventoryModalProps) {
   const { toast } = useToast();
-  const loadMutation = useLoadInventory();
+  const loadMutation = useMutation(api.warehouses.load.mutationOptions());
   const [wagonId, setWagonId] = useState('');
   const [loadedWeight, setLoadedWeight] = useState<number | ''>('');
   const [notes, setNotes] = useState('');

apps/edr-freight-web/backoffice/src/components/warehouses/MoveInventoryModal.tsx

@@ -1,8 +1,10 @@
 import { useEffect, useMemo, useState } from 'react';
 import { Button, Group, Modal, Select, Stack, Textarea } from '@mantine/core';
 
+import { useMutation, useQuery } from '@tanstack/react-query';
+
+import { api } from '@/services/api';
 import { useToast } from '@/hooks/use-toast';
-import { useMoveInventory, useWarehouseYards, useWarehouseZones, useWarehouses } from '@/hooks/useWarehouses';
 import type { WarehouseInventoryItem } from '@/types/warehouse';
 import { extractErrorMessage } from './options';
 
@@ -14,7 +16,7 @@ interface MoveInventoryModalProps {
 
 export function MoveInventoryModal({ opened, onClose, item }: MoveInventoryModalProps) {
   const { toast } = useToast();
-  const moveMutation = useMoveInventory();
+  const moveMutation = useMutation(api.warehouses.move.mutationOptions());
   const [warehouseId, setWarehouseId] = useState('');
   const [yardId, setYardId] = useState('');
   const [zoneId, setZoneId] = useState('');
@@ -29,9 +31,21 @@ export function MoveInventoryModal({ opened, onClose, item }: MoveInventoryModal
     }
   }, [opened]);
 
-  const warehousesQuery = useWarehouses({ status: 'ACTIVE' });
-  const yardsQuery = useWarehouseYards(warehouseId || undefined);
-  const zonesQuery = useWarehouseZones(yardId || undefined);
+  const warehousesQuery = useQuery(
+    api.warehouses.list.queryOptions({ input: { filter: { status: 'ACTIVE' } } }),
+  );
+  const yardsQuery = useQuery(
+    api.warehouses.listYards.queryOptions({
+      input: { warehouseId },
+      enabled: Boolean(warehouseId),
+    }),
+  );
+  const zonesQuery = useQuery(
+    api.warehouses.listZones.queryOptions({
+      input: { yardId },
+      enabled: Boolean(yardId),
+    }),
+  );
 
   const warehouseOptions = useMemo(
     () => (warehousesQuery.data ?? []).map((w) => ({ value: w.id, label: `${w.name} (${w.code})` })),

apps/edr-freight-web/backoffice/src/components/warehouses/ReceiveInventoryModal.tsx

@@ -18,34 +18,14 @@ import {
 } from '@mantine/core';
 import { ChevronDown, ChevronRight, ClipboardCheck, Info, PackageSearch, Train, Truck } from 'lucide-react';
 
+import { useMutation, useQuery } from '@tanstack/react-query';
+
+import { api } from '@/services/api';
 import { useToast } from '@/hooks/use-toast';
-import {
-  useAutoUnloadArrivedBookings,
-  useBulkDispatchExport,
-  useBulkMarkInspected,
-  useBulkReceive,
-  useEligibleBookings,
-  useImportArriveQueue,
-  useImportTrainItems,
-  useImportUnloadedQueue,
-  useLoadPassedExport,
-  useLoadedExport,
-  useReadyToLoadExport,
-  useReceiveInventory,
-  useWarehouseInventory,
-  useWarehouseYards,
-  useWarehouseZones,
-  useWarehouses,
-} from '@/hooks/useWarehouses';
 import type {
-  AutoUnloadArrivedResult,
-  BulkDispatchResult,
-  BulkInspectResult,
-  BulkReceiveResult,
   ImportTrain,
   ImportTrainItem,
   ImportUnloadedItem,
-  LoadPassedExportResult,
   ReadyToLoadRow,
   ReceiveInventoryPayload,
 } from '@/types/warehouse';
@@ -77,9 +57,21 @@ function LocationSelects({
   value: Location;
   onChange: (next: Location) => void;
 }) {
-  const warehousesQuery = useWarehouses({ status: 'ACTIVE' });
-  const yardsQuery = useWarehouseYards(value.warehouseId || undefined);
-  const zonesQuery = useWarehouseZones(value.yardId || undefined);
+  const warehousesQuery = useQuery(
+    api.warehouses.list.queryOptions({ input: { filter: { status: 'ACTIVE' } } }),
+  );
+  const yardsQuery = useQuery(
+    api.warehouses.listYards.queryOptions({
+      input: { warehouseId: value.warehouseId ?? '' },
+      enabled: Boolean(value.warehouseId),
+    }),
+  );
+  const zonesQuery = useQuery(
+    api.warehouses.listZones.queryOptions({
+      input: { yardId: value.yardId ?? '' },
+      enabled: Boolean(value.yardId),
+    }),
+  );
 
   const warehouseOptions = useMemo(
     () => (warehousesQuery.data ?? []).map((w) => ({ value: w.id, label: `${w.name} (${w.code})` })),
@@ -148,10 +140,12 @@ function EligibleTab({
   onChanged?: () => void;
 }) {
   const { toast } = useToast();
-  const { data: allRows = [], isLoading } = useEligibleBookings(enabled);
+  const { data: allRows = [], isLoading } = useQuery(
+    api.warehouses.eligibleBookings.queryOptions({ enabled }),
+  );
   const rows = useMemo(() => allRows.filter((r) => r.direction === direction), [allRows, direction]);
-  const bulkReceive = useBulkReceive();
-  const loadPassed = useLoadPassedExport();
+  const bulkReceive = useMutation(api.warehouses.bulkReceive.mutationOptions());
+  const loadPassed = useMutation(api.warehouses.loadPassedExport.mutationOptions());
   const [selected, setSelected] = useState<Set<string>>(new Set());
 
   const locationReady = Boolean(location.warehouseId && location.yardId && location.zoneId);
@@ -177,10 +171,7 @@ function EligibleTab({
       return;
     }
     try {
-      const res = (await bulkReceive.mutateAsync({ direction, ...location, bookingIds })) as {
-        data: BulkReceiveResult;
-      };
-      const r = res.data;
+      const r = await bulkReceive.mutateAsync({ direction, ...location, bookingIds });
       toast({
         title: `${r.receivedCount} received at ${direction === 'EXPORT' ? 'facility' : 'warehouse'}`,
         description: r.skippedCount ? `${r.skippedCount} skipped` : undefined,
@@ -194,8 +185,7 @@ function EligibleTab({
 
   const loadPassedExport = async () => {
     try {
-      const res = (await loadPassed.mutateAsync(undefined)) as { data: LoadPassedExportResult };
-      const r = res.data;
+      const r = await loadPassed.mutateAsync(undefined);
       toast({
         title: `${r.loadedCount} loaded`,
         description: r.skippedCount ? `${r.skippedCount} skipped — inspection not passed` : undefined,
@@ -353,8 +343,10 @@ function EligibleTab({
 /** Export items that passed inspection and are queued to be loaded onto a train. */
 function ReadyToLoadTab({ enabled, onChanged }: { enabled: boolean; onChanged?: () => void }) {
   const { toast } = useToast();
-  const { data: rows = [], isLoading } = useReadyToLoadExport(enabled);
-  const loadPassed = useLoadPassedExport();
+  const { data: rows = [], isLoading } = useQuery(
+    api.warehouses.readyToLoadExport.queryOptions({ enabled }),
+  );
+  const loadPassed = useMutation(api.warehouses.loadPassedExport.mutationOptions());
   const [selected, setSelected] = useState<Set<string>>(new Set());
 
   const allSelected = rows.length > 0 && selected.size === rows.length;
@@ -369,8 +361,7 @@ function ReadyToLoadTab({ enabled, onChanged }: { enabled: boolean; onChanged?:
 
   const autoLoad = async () => {
     try {
-      const res = (await loadPassed.mutateAsync(undefined)) as { data: LoadPassedExportResult };
-      const r = res.data;
+      const r = await loadPassed.mutateAsync(undefined);
       toast({
         title: `${r.loadedCount} items loaded`,
         description: r.skippedCount ? `${r.skippedCount} skipped` : undefined,
@@ -494,8 +485,12 @@ function LoadedExportTab({
   onChanged?: () => void;
 }) {
   const { toast } = useToast();
-  const { data: rows = [], isLoading } = useLoadedExport(enabled);
-  const bulkDispatch = useBulkDispatchExport();
+  const { data: rows = [], isLoading } = useQuery(
+    api.warehouses.loadedExport.queryOptions({ enabled }),
+  );
+  const bulkDispatch = useMutation(
+    api.warehouses.bulkDispatchExport.mutationOptions(),
+  );
   const [selected, setSelected] = useState<Set<string>>(new Set());
 
   const allSelected = rows.length > 0 && selected.size === rows.length;
@@ -514,8 +509,7 @@ function LoadedExportTab({
       return;
     }
     try {
-      const res = (await bulkDispatch.mutateAsync(inventoryIds)) as { data: BulkDispatchResult };
-      const r = res.data;
+      const r = await bulkDispatch.mutateAsync(inventoryIds);
       toast({
         title: `${r.dispatchedCount} dispatched`,
         description: r.skippedCount ? `${r.skippedCount} skipped` : undefined,
@@ -659,7 +653,12 @@ function LoadedExportTab({
 
 /** Assigned bookings/items for an arrived import train (read-only detail view). */
 function ImportTrainDetailTable({ scheduleId }: { scheduleId: string }) {
-  const { data: items = [], isLoading } = useImportTrainItems(scheduleId);
+  const { data: items = [], isLoading } = useQuery(
+    api.warehouses.importTrainItems.queryOptions({
+      input: { scheduleId },
+      enabled: Boolean(scheduleId),
+    }),
+  );
 
   if (isLoading) {
     return (
@@ -735,18 +734,19 @@ function ImportArriveQueueTab({
   onChanged?: () => void;
 }) {
   const { toast } = useToast();
-  const { data: trains = [], isLoading } = useImportArriveQueue(enabled);
-  const autoUnloadMutation = useAutoUnloadArrivedBookings();
+  const { data: trains = [], isLoading } = useQuery(
+    api.warehouses.importArriveQueue.queryOptions({ enabled }),
+  );
+  const autoUnloadMutation = useMutation(
+    api.warehouses.autoUnloadArrivedBookings.mutationOptions(),
+  );
   const [openId, setOpenId] = useState<string | null>(null);
   const [busyId, setBusyId] = useState<string | null>(null);
 
   const autoUnload = async (train: ImportTrain) => {
     setBusyId(train.scheduleId);
     try {
-      const res = (await autoUnloadMutation.mutateAsync(train.scheduleId)) as {
-        data: AutoUnloadArrivedResult;
-      };
-      const r = res.data;
+      const r = await autoUnloadMutation.mutateAsync(train.scheduleId);
       const extra = [
         r.skippedCount ? `${r.skippedCount} skipped` : '',
         r.failedCount ? `${r.failedCount} failed` : '',
@@ -866,8 +866,12 @@ function ImportArriveQueueTab({
  */
 function ImportUnloadedQueueTab({ enabled }: { enabled: boolean }) {
   const { toast } = useToast();
-  const { data: rows = [], isLoading } = useImportUnloadedQueue(enabled);
-  const inspectMutation = useBulkMarkInspected();
+  const { data: rows = [], isLoading } = useQuery(
+    api.warehouses.importUnloadedQueue.queryOptions({ enabled }),
+  );
+  const inspectMutation = useMutation(
+    api.warehouses.bulkMarkInspected.mutationOptions(),
+  );
   const [selected, setSelected] = useState<Set<string>>(new Set());
   const [inspectId, setInspectId] = useState<string | null>(null);
 
@@ -888,10 +892,7 @@ function ImportUnloadedQueueTab({ enabled }: { enabled: boolean }) {
       return;
     }
     try {
-      const res = (await inspectMutation.mutateAsync({ inventoryIds: [...selected] })) as {
-        data: BulkInspectResult;
-      };
-      const r = res.data;
+      const r = await inspectMutation.mutateAsync({ inventoryIds: [...selected] });
       toast({
         title: `${r.inspectedCount} marked inspected`,
         description: r.skippedCount ? `${r.skippedCount} skipped` : undefined,
@@ -1033,8 +1034,10 @@ function ImportUnloadedQueueTab({ enabled }: { enabled: boolean }) {
  */
 function ImportDispatchQueueTab({ enabled }: { enabled: boolean }) {
   const { toast } = useToast();
-  const { data: items = [], isLoading } = useWarehouseInventory(
-    enabled ? { status: 'READY_FOR_PICKUP' } : undefined,
+  const { data: items = [], isLoading } = useQuery(
+    api.warehouses.listInventory.queryOptions({
+      input: { filter: enabled ? { status: 'READY_FOR_PICKUP' } : undefined },
+    }),
   );
 
   return (
@@ -1155,7 +1158,9 @@ function SingleBookingReceiveModal({
   onReceived,
 }: ReceiveInventoryModalProps) {
   const { toast } = useToast();
-  const receiveMutation = useReceiveInventory();
+  const receiveMutation = useMutation(
+    api.warehouses.receiveInventory.mutationOptions(),
+  );
   const [selectedBooking, setSelectedBooking] = useState(bookingId ?? '');
   const [form, setForm] = useState<SingleFormState>({
     warehouseId: '',

apps/edr-freight-web/backoffice/src/components/warehouses/ReleaseOrderModal.tsx

@@ -2,8 +2,10 @@ import { useEffect, useState } from 'react';
 import { Alert, Button, Group, Modal, Stack, Text, TextInput } from '@mantine/core';
 import { Info } from 'lucide-react';
 
+import { useMutation } from '@tanstack/react-query';
+
+import { api } from '@/services/api';
 import { useToast } from '@/hooks/use-toast';
-import { useReleaseInventory } from '@/hooks/useWarehouses';
 import type { WarehouseInventoryItem } from '@/types/warehouse';
 import { extractErrorMessage } from './options';
 
@@ -15,7 +17,7 @@ interface ReleaseOrderModalProps {
 
 export function ReleaseOrderModal({ opened, onClose, item }: ReleaseOrderModalProps) {
   const { toast } = useToast();
-  const releaseMutation = useReleaseInventory();
+  const releaseMutation = useMutation(api.warehouses.release.mutationOptions());
   const [reference, setReference] = useState('');
 
   useEffect(() => {

apps/edr-freight-web/backoffice/src/components/warehouses/ReserveInventoryModal.tsx

@@ -2,8 +2,10 @@ import { useEffect, useState } from 'react';
 import { Alert, Button, Group, Modal, Stack, Text } from '@mantine/core';
 import { Info } from 'lucide-react';
 
+import { useMutation } from '@tanstack/react-query';
+
+import { api } from '@/services/api';
 import { useToast } from '@/hooks/use-toast';
-import { useReserveInventory } from '@/hooks/useWarehouses';
 import type { WarehouseInventoryItem } from '@/types/warehouse';
 import { BookingSelect } from './BookingSelect';
 import { extractErrorMessage } from './options';
@@ -16,7 +18,7 @@ interface ReserveInventoryModalProps {
 
 export function ReserveInventoryModal({ opened, onClose, item }: ReserveInventoryModalProps) {
   const { toast } = useToast();
-  const reserveMutation = useReserveInventory();
+  const reserveMutation = useMutation(api.warehouses.reserve.mutationOptions());
   const [bookingId, setBookingId] = useState('');
 
   useEffect(() => {

apps/edr-freight-web/backoffice/src/components/warehouses/WagonSelect.tsx

@@ -1,6 +1,7 @@
 import { Select } from '@mantine/core';
+import { useQuery } from '@tanstack/react-query';
 
-import { useLoadableWagons } from '@/hooks/useWarehouses';
+import { api } from '@/services/api';
 
 interface WagonSelectProps {
   value: string;
@@ -11,7 +12,9 @@ interface WagonSelectProps {
 
 /** Searchable wagon picker. Lists wagons that are loadable (read-only from scheduling). */
 export function WagonSelect({ value, onChange, label = 'Wagon', required }: WagonSelectProps) {
-  const { data, isLoading } = useLoadableWagons();
+  const { data, isLoading } = useQuery(
+    api.warehouses.loadableWagons.queryOptions(),
+  );
 
   const options = (data ?? []).map((w) => ({
     value: w.id,

apps/edr-freight-web/backoffice/src/components/warehouses/WarehouseDashboardCharts.tsx

@@ -15,7 +15,9 @@ import {
   YAxis,
 } from 'recharts';
 
-import { useWarehouseInventory } from '@/hooks/useWarehouses';
+import { useQuery } from '@tanstack/react-query';
+
+import { api } from '@/services/api';
 import type { WarehouseDashboard, WarehouseInventoryItem } from '@/types/warehouse';
 
 interface WarehouseDashboardChartsProps {
@@ -38,7 +40,9 @@ type Granularity = 'week' | 'month' | 'year';
 
 export function WarehouseDashboardCharts({ data }: WarehouseDashboardChartsProps) {
   const [granularity, setGranularity] = useState<Granularity>('month');
-  const { data: inventory } = useWarehouseInventory();
+  const { data: inventory } = useQuery(
+    api.warehouses.listInventory.queryOptions({ input: {} }),
+  );
 
   const statusData = STATUS_SERIES.map((s) => ({
     name: s.label,

apps/edr-freight-web/backoffice/src/components/warehouses/WarehouseInfoCard.tsx

@@ -2,7 +2,9 @@ import { useState } from 'react';
 import { Badge, Button, Card, Divider, Group, Stack, Text } from '@mantine/core';
 import { PackagePlus, Train as TrainIcon, Warehouse as WarehouseIcon } from 'lucide-react';
 
-import { useBookingSchedule, useWarehouseInventory } from '@/hooks/useWarehouses';
+import { useQuery } from '@tanstack/react-query';
+
+import { api } from '@/services/api';
 import { InventoryStatusBadge } from './badges';
 import { FreightVisual } from './FreightVisual';
 import { formatDate } from './options';
@@ -28,8 +30,15 @@ function Row({ label, value }: { label: string; value: React.ReactNode }) {
 
 export function WarehouseInfoCard({ bookingId, bookingReference }: WarehouseInfoCardProps) {
   const [modalOpen, setModalOpen] = useState(false);
-  const { data, isLoading } = useWarehouseInventory({ bookingId });
-  const { data: scheduleView } = useBookingSchedule(bookingId);
+  const { data, isLoading } = useQuery(
+    api.warehouses.listInventory.queryOptions({ input: { filter: { bookingId } } }),
+  );
+  const { data: scheduleView } = useQuery(
+    api.warehouses.bookingSchedule.queryOptions({
+      input: { bookingId },
+      enabled: Boolean(bookingId),
+    }),
+  );
 
   const items = data ?? [];
   const latest = items[0];