contrat nad booking modification

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

@@ -132,9 +132,7 @@ import { endpoint } from "@/utils/endpoint";
 import {
   BookingListFilter,
   bookingsService,
-  type ApproveStepPayload,
   type PaginatedBookings,
-  type RejectStepPayload,
 } from "./bookings.service";
 import { cargoTypesService } from "./cargo-types.service";
 import {
@@ -2481,18 +2479,6 @@ export const api = {
       bookingsService.reviewOperation(id, decision, { note }),
     ),
 
-    approveStep: endpoint<ApproveStepPayload, BookingDetail>(
-      "bookings",
-      "approveStep",
-      (payload) => bookingsService.approveStep(payload),
-    ),
-
-    rejectStep: endpoint<RejectStepPayload, BookingDetail>(
-      "bookings",
-      "rejectStep",
-      (payload) => bookingsService.rejectStep(payload),
-    ),
-
     generateContract: endpoint<{ id: string }, BookingDetail>(
       "bookings",
       "generateContract",

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

@@ -72,18 +72,6 @@ export interface BookingListSummary {
   tabs: BookingListSummaryTabs;
 }
 
-export interface ApproveStepPayload {
-  id: string;
-  stepId: string;
-  requiredRole: string;
-}
-
-export interface RejectStepPayload {
-  id: string;
-  stepId: string;
-  reason: string;
-}
-
 export interface ContractView {
   bookingId: string;
   reference: string;
@@ -255,12 +243,6 @@ export const bookingsService = {
       ...options,
     }),
 
-  approveStep: ({ id, stepId, requiredRole }: ApproveStepPayload) =>
-    postBooking<BookingDetail>(B.APPROVE_STEP(id, stepId), { requiredRole }),
-
-  rejectStep: ({ id, stepId, reason }: RejectStepPayload) =>
-    postBooking<BookingDetail>(B.REJECT_STEP(id, stepId), { reason }),
-
   generateContract: (id: string) =>
     postBooking<BookingDetail>(B.CONTRACT_GENERATE(id)),
 

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

@@ -196,6 +196,14 @@ export const contractsService = {
     return unwrap(response.data) as Freight.IContractDocumentDraft;
   },
 
+  /** Audit trail of edits to this contract's document, newest first. */
+  getContractDocumentRevisions: async (
+    id: string,
+  ): Promise<Freight.IContractDocumentRevision[]> => {
+    const response = await client.get(C.CONTRACT_DOCUMENT_REVISIONS(id));
+    return unwrap(response.data) as Freight.IContractDocumentRevision[];
+  },
+
   /** Save this contract's edited document articles (never touches the templates). */
   updateContractDocument: async (
     id: string,
@@ -214,18 +222,12 @@ export const contractsService = {
   reject: (id: string, reason: string) =>
     postContract<Freight.IContract>(C.STAFF_REJECT(id), { reason }),
 
-  approveStep: ({
-    id,
-    stepId,
-    requiredRole,
-  }: {
-    id: string;
-    stepId: string;
-    requiredRole: string;
-  }) =>
-    postContract<Freight.IContract>(C.APPROVE_STEP(id, stepId), {
-      requiredRole,
-    }),
+  /**
+   * Approve the next pending step. The server resolves the step's required role
+   * and authorizes against it — the client never declares its own role.
+   */
+  approveStep: ({ id, stepId }: { id: string; stepId: string }) =>
+    postContract<Freight.IContract>(C.APPROVE_STEP(id, stepId)),
 
   rejectStep: ({
     id,

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

@@ -72,6 +72,12 @@ export interface SubmitRateChangePayload {
   update: Record<string, unknown>;
 }
 
+/** One selectable IAM position type, as returned by /approval-rules/position-types. */
+export interface ApprovalPositionType {
+  label: string;
+  value: string;
+}
+
 const RESOURCE_BASE: Record<RuleEngineResourceSlug, string> = {
   "cargo-types": URL_CONSTANTS.RULE_ENGINE.CARGO_TYPES,
   "container-types": URL_CONSTANTS.RULE_ENGINE.CONTAINER_TYPES,
@@ -368,6 +374,28 @@ export const ruleEngineService = {
     return unwrap(response.data) as RateChangeRequest;
   },
 
+  /**
+   * IAM position types that an approval step can require/block. Replaces the
+   * old hardcoded LINE_STAFF/DIRECTOR/CEO triple — the chain is configured from
+   * whatever positions IAM actually defines.
+   */
+  getApprovalPositionTypes: async (): Promise<ApprovalPositionType[]> => {
+    const response = await client.get(
+      URL_CONSTANTS.RULE_ENGINE.APPROVAL_RULES_POSITION_TYPES,
+    );
+    const body = unwrap(response.data) as unknown;
+    if (Array.isArray(body)) return body as ApprovalPositionType[];
+    if (
+      body &&
+      typeof body === "object" &&
+      "data" in body &&
+      Array.isArray((body as { data: unknown }).data)
+    ) {
+      return (body as { data: ApprovalPositionType[] }).data;
+    }
+    return [];
+  },
+
   getApprovalChain: async (
     requiresDirectorApproval = true,
   ): Promise<RuleEngineRecord[]> => {