feat: add service type fitler

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

@@ -130,6 +130,15 @@ export default function BookingRequestsPage() {
     [yardRefs],
   );
 
+  // Service-type options — same reference-data payload the booking form uses.
+  const { data: refData } = useQuery(
+    api.bookings.referenceData.queryOptions({ staleTime: 5 * 60_000 }),
+  );
+  const serviceTypeOptions = useMemo(
+    () => (refData?.service ?? []).map((s) => ({ value: s.id, label: s.name })),
+    [refData],
+  );
+
   // Deep links land here pre-filtered (?statuses=A,B&tradeDirection=IMPORT) —
   // the header's document-review alarm opens exactly the undecided requests
   // it is counting down for. No sync effect needed any more: controls.values
@@ -147,6 +156,7 @@ export default function BookingRequestsPage() {
         options: filterOptions(TRADE_DIRECTION_OPTIONS),
       },
       { key: "freightType", label: "Freight", type: "enum", multiple: false, options: FREIGHT_TYPE_OPTIONS },
+      { key: "serviceTypeId", label: "Service", type: "enum", multiple: false, options: serviceTypeOptions },
       { key: "paymentStatus", label: "Payment", type: "enum", multiple: false, options: PAYMENT_STATUS_OPTIONS, secondary: true },
       {
         // Wins over the `paymentStatus` filter above — the queue is by
@@ -172,7 +182,7 @@ export default function BookingRequestsPage() {
         toParams: dateRangeParams("scheduledFrom", "scheduledTo"),
       },
     ],
-    [filterOptions, yardOptions],
+    [filterOptions, yardOptions, serviceTypeOptions],
   );
 
   const controls = useFilters(bookingFilterDefs, { defaultSort: "createdAt:DESC", pageSize: 10 });

apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestsPage.tsx

@@ -115,6 +115,15 @@ export default function ContractRequestsPage() {
     [yardRefs],
   );
 
+  // Service-type options — same reference-data payload the booking form uses.
+  const { data: refData } = useQuery(
+    api.bookings.referenceData.queryOptions({ staleTime: 5 * 60_000 }),
+  );
+  const serviceTypeOptions = useMemo(
+    () => (refData?.service ?? []).map((s) => ({ value: s.id, label: s.name })),
+    [refData],
+  );
+
   // Static shape only (no facet counts) — this is what useFilters needs to
   // parse the URL and build API params. Counts are attached separately below,
   // for rendering only, once the summary query (which itself depends on
@@ -143,6 +152,13 @@ export default function ContractRequestsPage() {
         multiple: false,
         options: FREIGHT_TYPE_OPTIONS,
       },
+      {
+        key: "serviceTypeId",
+        label: "Service",
+        type: "enum",
+        multiple: false,
+        options: serviceTypeOptions,
+      },
       {
         key: "paymentCurrency",
         label: "Currency",
@@ -170,7 +186,7 @@ export default function ContractRequestsPage() {
         toParams: ({ v }) => ({ originYardId: v[0], destinationYardId: v[1] }),
       },
     ],
-    [filterOptions, yardOptions],
+    [filterOptions, yardOptions, serviceTypeOptions],
   );
 
   const controls = useFilters(filterDefs, {

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

@@ -2741,6 +2741,13 @@ export const api = {
       ({ id }) => QUERY_KEYS.BOOKINGS.byId(id),
     ),
 
+    referenceData: endpoint<void, Freight.BookingReferenceData>(
+      "bookings",
+      "referenceData",
+      () => bookingsService.getReferenceData() as Promise<Freight.BookingReferenceData>,
+      () => ["bookings", "reference-data"],
+    ),
+
     remove: endpoint<{ id: string }, void>("bookings", "remove", ({ id }) =>
       bookingsService.remove(id),
     ),

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

@@ -19,6 +19,8 @@ export interface BookingListFilter {
   /** Bookings drawn down under this contract (contract detail's Shipments tab). */
   contractId?: string;
   freightType?: string;
+  /** Service type (rule-engine service_types.id). */
+  serviceTypeId?: string;
   /** ONE_TIME | GENERAL_CONTRACT — the booking-kind tab filter. */
   bookingType?: string;
   /** 'true' → customs bookings, 'false' → self-clearance (non-customs). */
@@ -142,6 +144,7 @@ export const bookingsService = {
       if (filter.pageSize != null) params.pageSize = filter.pageSize;
       if (filter.companyId) params.companyId = filter.companyId;
       if (filter.freightType) params.freightType = filter.freightType;
+      if (filter.serviceTypeId) params.serviceTypeId = filter.serviceTypeId;
       if (filter.bookingType) params.bookingType = filter.bookingType;
       if (filter.tradeDirection) params.tradeDirection = filter.tradeDirection;
       if (filter.paymentCurrency) params.paymentCurrency = filter.paymentCurrency;
@@ -176,6 +179,7 @@ export const bookingsService = {
       if (filter.companyId) params.companyId = filter.companyId;
       if (filter.contractId) params.contractId = filter.contractId;
       if (filter.freightType) params.freightType = filter.freightType;
+      if (filter.serviceTypeId) params.serviceTypeId = filter.serviceTypeId;
       if (filter.bookingType) params.bookingType = filter.bookingType;
       if (filter.tradeDirection) params.tradeDirection = filter.tradeDirection;
       if (filter.paymentCurrency) params.paymentCurrency = filter.paymentCurrency;

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

@@ -13,6 +13,8 @@ export interface ContractListFilter {
   tab?: string;
   companyId?: string;
   freightType?: string;
+  /** Service type (rule-engine service_types.id). */
+  serviceTypeId?: string;
   tradeDirection?: string;
   contractKind?: string;
   paymentCurrency?: string;
@@ -171,6 +173,7 @@ function buildListParams(filter?: ContractListFilter) {
     if (filter.sortOrder) params.sortOrder = filter.sortOrder;
     if (filter.companyId) params.companyId = filter.companyId;
     if (filter.freightType) params.freightType = filter.freightType;
+    if (filter.serviceTypeId) params.serviceTypeId = filter.serviceTypeId;
     if (filter.tradeDirection) params.tradeDirection = filter.tradeDirection;
     if (filter.contractKind) params.contractKind = filter.contractKind;
     if (filter.paymentCurrency) params.paymentCurrency = filter.paymentCurrency;