From 1c420781ea7dc922d1bdd98f0de1ae6e33bffa7f Mon Sep 17 00:00:00 2001
From: natib21 <yaschalew10@gmail.com>
Date: Fri, 19 Jun 2026 13:58:33 +0000
Subject: [PATCH] vehicle

---
 .../src/components/fleet/FleetFormDialog.tsx  | 23 +++++++++++++++++++
 .../src/pages/fleet/config/resources.ts       |  2 +-
 .../src/pages/ruleEngine/config/resources.ts  |  2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/apps/edr-freight-web/backoffice/src/components/fleet/FleetFormDialog.tsx b/apps/edr-freight-web/backoffice/src/components/fleet/FleetFormDialog.tsx
index 0f996ab7c..85a4df985 100644
--- a/apps/edr-freight-web/backoffice/src/components/fleet/FleetFormDialog.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/fleet/FleetFormDialog.tsx
@@ -6,6 +6,7 @@ import {
   Modal,
   NumberInput,
   Select,
+  MultiSelect,
   SimpleGrid,
   Stack,
   Text,
@@ -144,6 +145,28 @@ const FleetFormDialog = ({
       );
     }
 
+    if (field.type === "multiselect") {
+      const arrayValue = Array.isArray(value) ? value : (typeof value === "string" && value ? [value] : []);
+
+      return (
+        <MultiSelect
+          key={field.name}
+          label={field.label}
+          placeholder={field.placeholder || "Select options"}
+          data={field.options ?? []}
+          value={arrayValue.map(String)}
+          onChange={(next) =>
+            setValues((current) => ({ ...current, [field.name]: next }))
+          }
+          error={error}
+          searchable
+          clearable
+          disabled={selectOptionsLoading}
+          rightSection={selectOptionsLoading ? <Loader2 size={14} className="animate-spin" /> : undefined}
+        />
+      );
+    }
+
     if (field.type === "number") {
       return (
         <NumberInput
diff --git a/apps/edr-freight-web/backoffice/src/pages/fleet/config/resources.ts b/apps/edr-freight-web/backoffice/src/pages/fleet/config/resources.ts
index ad46ad277..b318006c1 100644
--- a/apps/edr-freight-web/backoffice/src/pages/fleet/config/resources.ts
+++ b/apps/edr-freight-web/backoffice/src/pages/fleet/config/resources.ts
@@ -473,7 +473,7 @@ export const FLEET_RESOURCES: FleetResourceConfig[] = [
       { name: "dateOfBirth", label: "Date of Birth", type: "date", required: true },
       { name: "licenseExpiryDate", label: "License Expiry Date", type: "date", required: true },
       { name: "status", label: "Status", type: "select", required: true, options: DRIVER_STATUS_OPTIONS },
-      { name: "vehicleTypesAuthorized", label: "Authorized Vehicle Types", type: "text" },
+      { name: "vehicleTypesAuthorized", label: "Authorized Vehicle Types", type: "multiselect", options: VEHICLE_TYPE_OPTIONS },
       { name: "address", label: "Address", type: "textarea" },
       { name: "emergencyContact", label: "Emergency Contact", type: "text" },
       { name: "notes", label: "Notes", type: "textarea" },
diff --git a/apps/edr-freight-web/backoffice/src/pages/ruleEngine/config/resources.ts b/apps/edr-freight-web/backoffice/src/pages/ruleEngine/config/resources.ts
index 151871541..2eac411c2 100644
--- a/apps/edr-freight-web/backoffice/src/pages/ruleEngine/config/resources.ts
+++ b/apps/edr-freight-web/backoffice/src/pages/ruleEngine/config/resources.ts
@@ -14,7 +14,7 @@ export type ColumnFormat =
   | "entityLabel"
   | "rateLabel";
 
-export type FormFieldType = "text" | "number" | "boolean" | "date" | "select" | "textarea";
+export type FormFieldType = "text" | "number" | "boolean" | "date" | "email" | "select" | "multiselect" | "textarea";
 
 export interface ResourceColumn {
   id: string;