fix issues

apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineFormDialog.tsx

@@ -179,7 +179,16 @@ const RuleEngineFormDialog = ({
   const formRows = useMemo(() => buildFormRows(visibleFields), [visibleFields]);
 
   const setField = (name: string, value: unknown) => {
-    setValues((current) => ({ ...current, [name]: value }));
+    setValues((current) => {
+      const next = { ...current, [name]: value };
+      // Changing what a rate applies to (or its surcharge trigger) can invalidate
+      // the previously-chosen unit — reset it so the admin re-picks from the new
+      // allowed set instead of submitting a stale, rejected unit.
+      if ((name === "appliesTo" || name === "trigger") && "rateUnit" in current) {
+        next.rateUnit = "";
+      }
+      return next;
+    });
   };
 
   const handleSubmit = (event: React.FormEvent) => {
@@ -250,6 +259,9 @@ const RuleEngineFormDialog = ({
     const label = <FieldLabel label={field.label} required={field.required} />;
 
     if (field.type === "select") {
+      // Dynamic options (e.g. rate unit) resolve from the live form values so
+      // the choices track the other fields the admin has picked.
+      const options = field.optionsFromValues ? field.optionsFromValues(values) : (field.options ?? []);
       return (
         <Select
           key={field.name}
@@ -261,7 +273,7 @@ const RuleEngineFormDialog = ({
           value={resolveSelectValue(field, values)}
           onChange={(v) => setField(field.name, v === RULE_ENGINE_SELECT_NONE ? "" : v)}
           disabled={selectOptionsLoading}
-          data={(field.options ?? [])
+          data={options
             .filter((opt) => opt.value !== "")
             .map((opt) => ({
               label: opt.label,

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

@@ -47,6 +47,14 @@ export interface FormFieldDef {
    * showWhen and not match hideWhen.
    */
   showWhen?: { field: string; equals: string[] };
+  /**
+   * Select options computed from other fields' current values. When set, the
+   * form resolves the option list at render time from the live form state
+   * instead of the static `options` list. Used for the rate unit selector,
+   * whose valid choices depend on `appliesTo` + `trigger`. (Named distinctly
+   * from the fleet config's string-based `dynamicOptions` to avoid a clash.)
+   */
+  optionsFromValues?: (values: Record<string, unknown>) => { label: string; value: string }[];
 }
 
 export interface RuleEngineOrderConfig {
@@ -116,12 +124,54 @@ const RATE_TRIGGERS = [
   { label: "Shipping line extra fee (PIL)", value: "PIL_EXTRA_FEE" },
 ];
 
-const RATE_UNITS =["PER_WAGON", "PER_TON", "PER_CONTAINER", "PER_KM", "PER_INVOICE", "FLAT"].map(
-  (v) => ({
-    label: v.replace(/_/g, " "),
-    value: v,
-  }),
-);
+const unitOption = (value: string) => ({ label: value.replace(/_/g, " "), value });
+
+/**
+ * Valid weighting units for a rate shape — mirrors the API's
+ * `allowedRateUnits`. The unit is driven by the *type* being billed: containers
+ * bill per container, bulk per ton, overweight always per excess ton, etc. Kept
+ * in sync with apps/edr-freight-api/.../entities/rate-unit.util.ts.
+ */
+const allowedRateUnits = (appliesTo: string, trigger: string): string[] => {
+  if (appliesTo === "OTHER") {
+    switch (trigger) {
+      case "OVERWEIGHT":
+        return ["PER_TON"];
+      case "REEFER":
+      case "HAZARDOUS":
+      case "DEMURRAGE":
+        return ["PER_CONTAINER", "PER_TON"];
+      case "CANCELLATION":
+        return ["FLAT", "PER_INVOICE"];
+      case "CONSOLIDATION":
+      case "SHIPPING_LINE":
+      case "PIL_EXTRA_FEE":
+        return ["PER_CONTAINER", "FLAT"];
+      default:
+        return ["FLAT", "PER_TON", "PER_CONTAINER"];
+    }
+  }
+  switch (appliesTo) {
+    case "CONTAINER":
+      return ["PER_CONTAINER", "PER_WAGON"];
+    case "BULK":
+      return ["PER_TON", "PER_WAGON"];
+    case "INTERCITY":
+      return ["PER_CONTAINER", "PER_TON", "PER_WAGON", "PER_KM"];
+    case "FIRST_MILE":
+    case "LAST_MILE":
+      return ["PER_CONTAINER", "PER_TON", "PER_KM", "FLAT"];
+    default:
+      return ["FLAT"];
+  }
+};
+
+const rateUnitOptions = (values: Record<string, unknown>) => {
+  const appliesTo = String(values.appliesTo ?? "");
+  const trigger = appliesTo === "OTHER" ? String(values.trigger ?? "") : "ALWAYS";
+  if (!appliesTo) return [];
+  return allowedRateUnits(appliesTo, trigger).map(unitOption);
+};
 
 const CURRENCIES = [
   { label: "USD", value: "USD" },
@@ -324,8 +374,6 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
       },
       { id: "tradeDirection", header: "Direction", accessorKey: "tradeDirection" },
       { id: "maxVgmTons", header: "Max VGM (t)", accessorKey: "maxVgmTons", format: "number" },
-      { id: "effectiveFrom", header: "From", accessorKey: "effectiveFrom", format: "date" },
-      { id: "effectiveTo", header: "To", accessorKey: "effectiveTo", format: "date" },
     ],
     formFields: [
       {
@@ -343,8 +391,6 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
         options: TRADE_DIRECTIONS,
       },
       { name: "maxVgmTons", label: "Max VGM (tons)", type: "number", required: true },
-      { name: "effectiveFrom", label: "Effective from", type: "date", required: true },
-      { name: "effectiveTo", label: "Effective to", type: "date" },
     ],
   },
   {
@@ -407,7 +453,6 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
       { id: "rateValue", header: "Value", accessorKey: "rateValue", format: "currency" },
       { id: "rateUnit", header: "Unit", accessorKey: "rateUnit" },
       { id: "status", header: "Status", accessorKey: "status", format: "rateStatus" },
-      { id: "effectiveFrom", header: "From", accessorKey: "effectiveFrom", format: "date" },
     ],
     formFields: [
       {
@@ -457,9 +502,18 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
         showWhen: { field: "appliesTo", equals: ["BULK", "INTERCITY"] },
       },
       { name: "rateValue", label: "Rate value", type: "number", required: true, suffix: "USD" },
-      { name: "rateUnit", label: "Rate unit", type: "select", required: true, options: RATE_UNITS },
-      { name: "effectiveFrom", label: "Effective from", type: "date", required: true },
-      { name: "effectiveTo", label: "Effective to", type: "date" },
+      // Unit choices are driven by the rate shape (appliesTo + trigger). Overweight
+      // is always per excess ton, so the unit field is hidden for it — the API
+      // forces PER_TON regardless.
+      {
+        name: "rateUnit",
+        label: "Rate unit",
+        type: "select",
+        required: true,
+        optionsFromValues: rateUnitOptions,
+        description: "Weighting basis — options depend on what the rate applies to.",
+        hideWhen: { field: "trigger", equals: ["OVERWEIGHT"] },
+      },
     ],
   },
   {

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

@@ -15,8 +15,6 @@ export interface Rate {
   proposedByStaffId: string;
   approvedByCeoId: string | null;
   approvedAt: string | null;
-  effectiveFrom: string;
-  effectiveTo: string | null;
   createdAt: string;
   updatedAt: string;
   deletedAt: string | null;