Merge pull request #962 from Tria-plc/freight_feature/usermanagement

Freight feature/usermanagement

apps/edr-freight-web/backoffice/src/services/api.ts

@@ -57,6 +57,7 @@ import type {
   EligibleContainerBookingsResponse,
   FreightType,
   ImportLoadingBookingsResponse,
+  DocReviewAlert,
   LoadingStatus,
   LocomotiveRecord,
   PinWagonsPayload,
@@ -276,6 +277,13 @@ export const api = {
       () => ["train-scheduling", "all-booking-windows"],
     ),
 
+    docReviewAlert: endpoint<void, DocReviewAlert | null>(
+      "train-scheduling",
+      "doc-review-alert",
+      () => trainSchedulingService.getDocReviewAlert(),
+      () => ["train-scheduling", "doc-review-alert"],
+    ),
+
     batchBoardDetail: endpoint<
       { scheduleId: string },
       BatchBoardScheduleDetail
@@ -1660,15 +1668,6 @@ export const api = {
       () => [["wagons"]],
     ),
 
-    reorder: endpoint<{ trainId: string; wagonIds: string[] }, Wagon[]>(
-      "wagons",
-      "reorder",
-      ({ trainId, wagonIds }) =>
-        wagonService.reorder(trainId, wagonIds).then((r) => r.data),
-      undefined,
-      () => [["wagons"]],
-    ),
-
     create: endpoint<Partial<Wagon>, Wagon>(
       "wagons",
       "create",
@@ -2534,6 +2533,13 @@ export const api = {
       bookingsService.reviewOperation(id, decision, { note }),
     ),
 
+    proceedToOperation: endpoint<
+      { id: string; scheduledDate: string },
+      BookingDetail
+    >("bookings", "proceedToOperation", ({ id, scheduledDate }) =>
+      bookingsService.proceedToOperation(id, scheduledDate),
+    ),
+
     generateContract: endpoint<{ id: string }, BookingDetail>(
       "bookings",
       "generateContract",

apps/edr-freight-web/backoffice/src/services/bookings.service.ts

@@ -243,6 +243,14 @@ export const bookingsService = {
       ...options,
     }),
 
+  /**
+   * Re-request operation on a booking Operations sent back for changes. The
+   * customer path uses the same endpoint from the portal; GL needs it here
+   * because a customs booking is GL's to fix, not the customer's.
+   */
+  proceedToOperation: (id: string, scheduledDate: string) =>
+    postBooking<BookingDetail>(B.CLEARANCE_PROCEED(id), { scheduledDate }),
+
   generateContract: (id: string) =>
     postBooking<BookingDetail>(B.CONTRACT_GENERATE(id)),
 

apps/edr-freight-web/backoffice/src/services/contracts.service.ts

@@ -109,6 +109,7 @@ export interface ContractView {
     signerDisplayName: string;
     signedAt: string;
     signatureImageUrl?: string | null;
+    stampImageUrl?: string | null;
   }>;
   savedSignature?: {
     signerDisplayName: string;
@@ -119,6 +120,8 @@ export interface ContractView {
 export interface SignContractPayload {
   role: "CUSTOMER" | "STAFF";
   signatureImageBase64: string;
+  /** Company stamp/seal image; required to sign a contract. */
+  stampImageBase64?: string;
   signerDisplayName: string;
   consentText?: string;
 }

apps/edr-freight-web/backoffice/src/services/locomotives.service.ts

@@ -35,9 +35,6 @@ export interface Locomotive {
   overageToleranceTons?: number | null;
   /** Metres a train may exceed maxTrainLengthMeters by before scheduling blocks it. */
   overageToleranceMeters?: number | null;
-  powerKw?: number | null;
-  tractionForceKn?: number | null;
-  maxSpeedKmh?: number | null;
   createdAt: string;
   updatedAt: string;
 }

apps/edr-freight-web/backoffice/src/services/trainScheduling.service.ts

@@ -12,6 +12,7 @@ import type {
   BookingLoadResult,
   BookingUnloadResult,
   CompositionRemovalEntry,
+  DocReviewAlert,
   UnassignedBookingsResponse,
   CreateTrainSchedulePayload,
   EligibleContainerBookingsResponse,
@@ -709,6 +710,15 @@ export const trainSchedulingService = {
     return unwrap(response.data);
   },
 
+  getDocReviewAlert: async (): Promise<DocReviewAlert | null> => {
+    const response = await client.get<DocReviewAlert | null>(
+      URL_CONSTANTS.TRAIN_SCHEDULING.DOC_REVIEW_ALERT,
+    );
+    // "No alert" comes back as null — which Nest sends as an empty body, so
+    // coerce anything falsy to null (react-query rejects undefined).
+    return unwrap(response.data) || null;
+  },
+
   updateGlobalRules: async (
     payload: Partial<Omit<TrainSchedulingGlobalRules, "id">>,
   ): Promise<TrainSchedulingGlobalRules> => {

apps/edr-freight-web/backoffice/src/services/wagon.service.ts

@@ -88,8 +88,6 @@ export const wagonService = {
   assignToTrain: (wagonId: string, trainId: string, sequenceNumber?: number) =>
     apiClient.post(`/wagons/${wagonId}/assign-train`, { trainId, sequenceNumber }),
   unassign: (wagonId: string) => apiClient.post(`/wagons/${wagonId}/unassign-train`),
-  reorder: (trainId: string, wagonIds: string[]) =>
-    apiClient.post(`/trains/${trainId}/reorder-wagons`, { wagonIds }),
   create: (data: Partial<Wagon>) => apiClient.post('/wagons', data),
   update: (id: string, data: Partial<Wagon>) => apiClient.patch(`/wagons/${id}`, data),
   delete: (id: string) => apiClient.delete(`/wagons/${id}`),