Autounload on train arrival

apps/edr-freight-web/backoffice/src/auth/http.ts

@@ -1,6 +1,6 @@
 import axios from "axios";
 
-import { API_BASE_URL } from "@/constants/apiConfig";
+import { API_BASE_URL } from "@/pages/fleet/config/vehicles";
 import {
   AUTH_TOKEN_COOKIE,
   REFRESH_TOKEN_COOKIE,

apps/edr-freight-web/backoffice/src/components/cargoes/CargoFormDialog.tsx

@@ -14,7 +14,7 @@ import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import { Textarea } from '@/components/ui/textarea';
 import { Loader2 } from 'lucide-react';
-import { API_BASE_URL } from '@/constants/apiConfig';
+import { API_BASE_URL } from "@/pages/fleet/config/vehicles";
 
 interface Cargo {
   id: string;

apps/edr-freight-web/backoffice/src/constants/apiConfig.ts

@@ -1,3 +1,3 @@
 export const API_BASE_URL = 'https://edrfreightapi.triaplc.com';
 
-// export const API_BASE_URL = 'http://localhost:3001';
+//export const API_BASE_URL = 'http://localhost:3001';

apps/edr-freight-web/backoffice/src/hooks/bookings/useBookings.ts

@@ -1,4 +1,5 @@
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { isAxiosError } from "axios";
 import toast from "react-hot-toast";
 
 import { QUERY_KEYS } from "@/constants/QUERY_KEYS";
@@ -9,6 +10,16 @@ import {
 } from "@/services/bookings.service";
 import { invalidateBookingDetail } from "@/utils/queryInvalidation";
 
+const parseApiError = (error: unknown, fallback: string) => {
+  if (isAxiosError(error)) {
+    const message = error.response?.data?.message;
+    if (Array.isArray(message)) return message.join(", ");
+    if (typeof message === "string") return message;
+  }
+  if (error instanceof Error && error.message) return error.message;
+  return fallback;
+};
+
 export function useBookingList(filter?: BookingListFilter, enabled = true) {
   return useQuery({
     queryKey: QUERY_KEYS.BOOKINGS.list(filter),
@@ -85,7 +96,7 @@ export function useBookingMutations(bookingId: string) {
         requiredRole,
       }),
     onSuccess: (data) => onSuccess(data, "Approval step completed"),
-    onError: () => toast.error("Failed to approve step"),
+    onError: (error) => toast.error(parseApiError(error, "Failed to approve step")),
   });
 
   const rejectStep = useMutation({
@@ -102,7 +113,7 @@ export function useBookingMutations(bookingId: string) {
         reason,
       }),
     onSuccess: (data) => onSuccess(data, "Booking rejected at approval step"),
-    onError: () => toast.error("Failed to reject step"),
+    onError: (error) => toast.error(parseApiError(error, "Failed to reject step")),
   });
 
   const generateContract = useMutation({

apps/edr-freight-web/backoffice/src/pages/bookings/NewBookingPage.tsx

@@ -42,19 +42,10 @@ import { useEffect, useMemo, useState } from "react";
 import toast from "react-hot-toast";
 import { useNavigate } from "react-router-dom";
 
-import { api } from "@/auth/http";
 import Breadcrumbs from "@/components/ui/Breadcrumbs";
-import { URL_CONSTANTS } from "@/constants/URLS";
 import { api as appApi } from "@/services/api";
 import { bookingsService } from "@/services/bookings.service";
-import { unwrap } from "@/utils/endpoint";
-
-interface CompanyOption {
-  id: string;
-  name?: string | null;
-  tin?: string | null;
-  email?: string | null;
-}
+import { customersService } from "@/services/customers.service";
 
 type FreightType = "CONTAINER" | "BULK";
 
@@ -219,15 +210,12 @@ export default function NewBookingPage() {
     queryFn: () => bookingsService.getReferenceData() as Promise<ReferenceData>,
   });
 
-  const { data: companies, isLoading: companiesLoading } = useQuery({
+  const { data: companiesPage, isLoading: companiesLoading } = useQuery({
     queryKey: ["companies", "list"],
-    queryFn: async () => {
-      const res = await api.get(URL_CONSTANTS.COMPANIES.BASE);
-      return unwrap(res.data) as CompanyOption[];
-    },
+    queryFn: () => customersService.list({ page: 1, pageSize: 1000 }),
   });
 
-  const companyOptions = (companies ?? []).map((c) => ({
+  const companyOptions = (companiesPage?.items ?? []).map((c) => ({
     value: c.id,
     label: c.name || c.email || c.tin || c.id,
   }));

apps/edr-freight-web/backoffice/src/pages/fleet/config/vehicles.ts

@@ -92,3 +92,6 @@ export const vehiclesConfig: FleetResourceConfig = {
 };
 
 export { VEHICLE_TYPE_OPTIONS, FUEL_TYPE_OPTIONS, VEHICLE_STATUS_OPTIONS };
+// export const API_BASE_URL = 'https://edrfreightapi.triaplc.com';
+
+    export const API_BASE_URL = 'http://localhost:3001';