contrat nad booking modification

apps/edr-freight-web/backoffice/src/pages/ruleEngine/RuleEngineResourcePage.tsx

@@ -36,6 +36,7 @@ import { ruleEngineTable } from "@/components/ruleEngine/ruleEngineStyles";
 import { useRuleEngineViewMode } from "@/components/ruleEngine/useRuleEngineViewMode";
 import {
     useApprovalChain,
+    useApprovalRoleOptions,
     useCargoLeafOptions,
     useCargoTypeParentOptions,
     useContainerTypeOptions,
@@ -247,6 +248,13 @@ const RuleEngineResourcePage = () => {
   );
   const { data: yardOptions, isLoading: yardOptionsLoading } =
     useYardOptions(usesYardField);
+  const usesApprovalRoleField = Boolean(
+    config?.formFields.some(
+      (f) => f.name === "requiredRole" || f.name === "blocksRole",
+    ),
+  );
+  const { data: approvalRoleOptions, isLoading: approvalRoleOptionsLoading } =
+    useApprovalRoleOptions(usesApprovalRoleField);
 
   // Full rule list backing the auto-filled "min wagon count": the next range
   // always continues the chain for the selected type (per currency), so the
@@ -321,6 +329,20 @@ const RuleEngineResourcePage = () => {
           options: wagonTypeOptions ?? [],
         };
       }
+      // Approval steps are configured against live IAM position types; until
+      // they load, the static legacy list on the field config stands in so an
+      // existing row's role still shows a label.
+      if (field.name === "requiredRole" || field.name === "blocksRole") {
+        if (!approvalRoleOptions) return field;
+        const includeNone = field.name === "blocksRole";
+        return {
+          ...field,
+          type: "select" as const,
+          options: includeNone
+            ? [{ label: "None", value: RULE_ENGINE_SELECT_NONE }, ...approvalRoleOptions]
+            : approvalRoleOptions,
+        };
+      }
       // Each end of the leg only offers yards in the country that end of the
       // trade actually sits in, so an import can't be configured as if it
       // started inland. Resolved per keystroke because the legal set changes
@@ -336,7 +358,7 @@ const RuleEngineResourcePage = () => {
       }
       return field;
     });
-  }, [config, cargoParentOptions, cargoLeafOptions, containerTypeOptions, liveRateOptions, wagonTypeOptions, yardOptions, isPriorityRules, allPriorityRules, editing, editingId]);
+  }, [config, cargoParentOptions, cargoLeafOptions, containerTypeOptions, liveRateOptions, wagonTypeOptions, yardOptions, approvalRoleOptions, isPriorityRules, allPriorityRules, editing, editingId]);
 
   const rows = data?.items ?? [];
   const meta = data?.meta;
@@ -765,7 +787,8 @@ const RuleEngineResourcePage = () => {
           (usesCargoTypeField && cargoLeafOptionsLoading) ||
           (usesLiveRateField && liveRateOptionsLoading) ||
           (usesWagonTypeField && wagonTypeOptionsLoading) ||
-          (usesYardField && yardOptionsLoading)
+          (usesYardField && yardOptionsLoading) ||
+          (usesApprovalRoleField && approvalRoleOptionsLoading)
         }
         positionOptions={!editing ? createPositionOptions : undefined}
         positionLoading={createPositionLoading}

apps/edr-freight-web/backoffice/src/pages/ruleEngine/config/resources.ts

@@ -118,10 +118,16 @@ const YARD_COUNTRIES = [
   { label: "Djibouti", value: "Djibouti" },
 ];
 
-const APPROVAL_ROLES = [
-  { label: "Line staff", value: "LINE_STAFF" },
-  { label: "Director", value: "DIRECTOR" },
-  { label: "CEO", value: "CEO" },
+/**
+ * The three role strings the approval chain was hardcoded to before it was
+ * driven by IAM position types. Kept only so rows still stored against them
+ * render a readable label instead of a blank select — the live options come
+ * from GET /approval-rules/position-types (see `useApprovalRoleOptions`).
+ */
+export const LEGACY_APPROVAL_ROLES = [
+  { label: "Line staff (legacy)", value: "LINE_STAFF" },
+  { label: "Director (legacy)", value: "DIRECTOR" },
+  { label: "CEO (legacy)", value: "CEO" },
 ];
 
 /**
@@ -718,7 +724,8 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
         label: "Required role",
         type: "select",
         required: true,
-        options: APPROVAL_ROLES,
+        // Replaced at render time with live IAM position types (+ legacy values).
+        options: LEGACY_APPROVAL_ROLES,
       },
       { name: "actionLabel", label: "Action label", type: "text", required: true },
       {
@@ -726,7 +733,8 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
         label: "Blocks role",
         type: "select",
         optional: true,
-        options: [{ label: "None", value: RULE_ENGINE_SELECT_NONE }, ...APPROVAL_ROLES],
+        // Replaced at render time with live IAM position types (+ legacy values).
+        options: [{ label: "None", value: RULE_ENGINE_SELECT_NONE }, ...LEGACY_APPROVAL_ROLES],
       },
     ],
   },