@djb25/digit-ui-module-wt 1.0.14 → 1.0.16

package/dist/index.modern.js

@@ -3142,26 +3142,26 @@ const AddTripModal = ({
     defaultValues: initialValues || {}
   });
   const dayOptions = [{
-    label: t("MON"),
-    value: "Mon"
+    label: t("MONDAY"),
+    value: "MONDAY"
   }, {
-    label: t("TUE"),
-    value: "Tue"
+    label: t("TUESDAY"),
+    value: "TUESDAY"
   }, {
-    label: t("WED"),
-    value: "Wed"
+    label: t("WEDNESDAY"),
+    value: "WEDNESDAY"
   }, {
-    label: t("THU"),
-    value: "Thu"
+    label: t("THURSDAY"),
+    value: "THURSDAY"
   }, {
-    label: t("FRI"),
-    value: "Fri"
+    label: t("FRIDAY"),
+    value: "FRIDAY"
   }, {
-    label: t("SAT"),
-    value: "Sat"
+    label: t("SATURDAY"),
+    value: "SATURDAY"
   }, {
-    label: t("SUN"),
-    value: "Sun"
+    label: t("SUNDAY"),
+    value: "SUNDAY"
   }];
   const activeOptions = [{
     label: t("YES"),
@@ -3245,16 +3245,6 @@ const AddTripModal = ({
       marginBottom: "8px",
       fontWeight: "500"
     }
-  }, t("WT_SCHEDULE_ID")), /*#__PURE__*/React.createElement(TextInput, {
-    name: "scheduleId",
-    inputRef: register()
-  })), /*#__PURE__*/React.createElement("div", {
-    className: "field-group"
-  }, /*#__PURE__*/React.createElement(CardLabel, {
-    style: {
-      marginBottom: "8px",
-      fontWeight: "500"
-    }
   }, t("WT_FIXED_POINT_CODE")), /*#__PURE__*/React.createElement(TextInput, {
     name: "fixedPointCode",
     inputRef: register()
@@ -3427,7 +3417,9 @@ const FixedPointScheduleManagement = () => {
   const {
     t
   } = useTranslation();
+  const tenantId = Digit.ULBService.getCurrentTenantId();
   const [showModal, setShowModal] = useState(false);
+  const [toast, setToast] = useState(null);
   const [selectedDay, setSelectedDay] = useState("Mon");
   const [year, setYear] = useState({
     label: "Year 2026",
@@ -3450,6 +3442,18 @@ const FixedPointScheduleManagement = () => {
     value: "DL1LAG7729"
   });
   const [editingRowIndex, setEditingRowIndex] = useState(null);
+  const [filters, setFilters] = useState({});
+  const {
+    isLoading,
+    data: scheduleData,
+    refetch: reSearch
+  } = Digit.Hooks.wt.useFixedPointScheduleSearch(tenantId, filters);
+  const {
+    mutate: createSchedule
+  } = Digit.Hooks.wt.useCreateFixedPointSchedule(tenantId);
+  const closeToast = () => {
+    setToast(null);
+  };
   const handleDelete = index => {
     const updatedData = data.filter((_, i) => i !== index);
     setData(updatedData);
@@ -3460,14 +3464,16 @@ const FixedPointScheduleManagement = () => {
       window.Digit.Download.Excel(data, filename);
     } else {
       const csvRows = [];
-      const headers = Object.keys(data[0]);
-      csvRows.push(headers.join(","));
-      for (const row of data) {
-        const values = headers.map(header => {
-          const escaped = ("" + row[header]).replace(/"/g, '\\"');
-          return `"${escaped}"`;
-        });
-        csvRows.push(values.join(","));
+      if (data.length > 0) {
+        const headers = Object.keys(data[0]);
+        csvRows.push(headers.join(","));
+        for (const row of data) {
+          const values = headers.map(header => {
+            const escaped = ("" + row[header]).replace(/"/g, '\\"');
+            return `"${escaped}"`;
+          });
+          csvRows.push(values.join(","));
+        }
       }
       const blob = new Blob([csvRows.join("\n")], {
         type: "text/csv"
@@ -3482,76 +3488,34 @@ const FixedPointScheduleManagement = () => {
       document.body.removeChild(a);
     }
   };
-  const [data, setData] = useState([{
-    scheduleId: "SASID-0001",
-    fixedPoint: "FP01",
-    day: "Mon",
-    freq: "1",
-    arrToFpl: "06:00",
-    depFromFpl: "06:10",
-    arrAtFixedPoint: "06:40",
-    depAtFixedPoint: "06:55",
-    returnToFpl: "07:20",
-    volume: "3 KL",
-    vehicle: "DL1LAG7729",
-    active: "Y"
-  }, {
-    scheduleId: "SASID-0002",
-    fixedPoint: "FP01",
-    day: "Mon",
-    freq: "2",
-    arrToFpl: "07:20",
-    depFromFpl: "07:30",
-    arrAtFixedPoint: "08:00",
-    depAtFixedPoint: "08:15",
-    returnToFpl: "08:40",
-    volume: "3 KL",
-    vehicle: "DL1LAG7729",
-    active: "Y"
-  }, {
-    scheduleId: "SASID-0003",
-    fixedPoint: "FP02",
-    day: "Tue",
-    freq: "3",
-    arrToFpl: "08:40",
-    depFromFpl: "08:50",
-    arrAtFixedPoint: "09:20",
-    depAtFixedPoint: "09:35",
-    returnToFpl: "10:00",
-    volume: "3 KL",
-    vehicle: "DL1LAG7730",
-    active: "Y"
-  }, {
-    scheduleId: "SASID-0004",
-    fixedPoint: "FP03",
-    day: "Wed",
-    freq: "1",
-    arrToFpl: "09:00",
-    depFromFpl: "09:10",
-    arrAtFixedPoint: "09:40",
-    depAtFixedPoint: "09:55",
-    returnToFpl: "10:20",
-    volume: "5 KL",
-    vehicle: "DL1LAG7731",
-    active: "N"
-  }]);
-  const [masterData] = useState(data);
-  const handleSearch = () => {
-    let filteredData = [...masterData];
-    if (fixedPoint !== null && fixedPoint !== void 0 && fixedPoint.value && fixedPoint.value !== "all") {
-      filteredData = filteredData.filter(item => item.fixedPoint === fixedPoint.value);
-    }
-    if (day !== null && day !== void 0 && day.value && day.value !== "all") {
-      filteredData = filteredData.filter(item => item.day === day.value);
-    }
-    if (status !== null && status !== void 0 && status.value && status.value !== "all") {
-      const activeStatus = status.value === "Active" ? "Y" : "N";
-      filteredData = filteredData.filter(item => item.active === activeStatus);
-    }
-    if (vehicle !== null && vehicle !== void 0 && vehicle.value && vehicle.value !== "all") {
-      filteredData = filteredData.filter(item => item.vehicle === vehicle.value);
+  const [data, setData] = useState([]);
+  React.useEffect(() => {
+    if (scheduleData !== null && scheduleData !== void 0 && scheduleData.fixedPointTimeTableDetails) {
+      const mappedData = scheduleData.fixedPointTimeTableDetails.map(item => ({
+        scheduleId: item.systemAssignedScheduleId,
+        fixedPoint: item.fixedPointCode,
+        day: item.day,
+        freq: item.tripNo,
+        arrToFpl: item.arrivalTimeToFpl,
+        depFromFpl: item.departureTimeFromFpl,
+        arrAtFixedPoint: item.arrivalTimeDeliveryPoint,
+        depAtFixedPoint: item.departureTimeDeliveryPoint,
+        returnToFpl: item.timeOfArrivingBackFplAfterDelivery,
+        volume: item.volumeWaterTobeDelivery,
+        vehicle: item.vehicleId,
+        active: item.isEnable ? "Y" : "N"
+      }));
+      setData(mappedData);
     }
-    setData(filteredData);
+  }, [scheduleData]);
+  const handleSearch = () => {
+    var _day$value;
+    setFilters({
+      fixedPointCode: (fixedPoint === null || fixedPoint === void 0 ? void 0 : fixedPoint.value) === "all" ? "" : fixedPoint === null || fixedPoint === void 0 ? void 0 : fixedPoint.value,
+      day: (day === null || day === void 0 ? void 0 : day.value) === "all" ? "" : day === null || day === void 0 ? void 0 : (_day$value = day.value) === null || _day$value === void 0 ? void 0 : _day$value.toUpperCase(),
+      status: (status === null || status === void 0 ? void 0 : status.value) === "all" ? "" : status === null || status === void 0 ? void 0 : status.value,
+      vehicleId: (vehicle === null || vehicle === void 0 ? void 0 : vehicle.value) === "all" ? "" : vehicle === null || vehicle === void 0 ? void 0 : vehicle.value
+    });
   };
   const columns = React.useMemo(() => [{
     Header: t("WT_SCHEDULE_ID"),
@@ -3809,7 +3773,8 @@ const FixedPointScheduleManagement = () => {
     },
     inboxStyles: {
       overflowX: "auto"
-    }
+    },
+    isLoading: isLoading
   }), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("button", {
     onClick: () => {
       setEditingRowIndex(null);
@@ -3837,7 +3802,7 @@ const FixedPointScheduleManagement = () => {
       scheduleId: data[editingRowIndex].scheduleId,
       fixedPointCode: data[editingRowIndex].fixedPoint,
       day: {
-        label: t(data[editingRowIndex].day.toUpperCase()),
+        label: t(data[editingRowIndex].day),
         value: data[editingRowIndex].day
       },
       frequencyNo: data[editingRowIndex].freq,
@@ -3854,31 +3819,49 @@ const FixedPointScheduleManagement = () => {
       }
     } : null,
     onSubmit: formData => {
-      var _formData$day, _formData$active;
-      const rowData = {
-        scheduleId: formData.scheduleId || `SASID-000${data.length + 1}`,
-        fixedPoint: formData.fixedPointCode || "FP01",
-        day: ((_formData$day = formData.day) === null || _formData$day === void 0 ? void 0 : _formData$day.value) || "Mon",
-        freq: formData.frequencyNo || "1",
-        arrToFpl: formData.arrivalTimeFpl || "--:--",
-        depFromFpl: formData.departureTimeFpl || "--:--",
-        arrAtFixedPoint: formData.arrivalFixedPoint || "--:--",
-        depAtFixedPoint: formData.departureFixedPoint || "--:--",
-        returnToFpl: formData.returnFpl || "--:--",
-        volume: formData.volume || "0 KL",
-        vehicle: formData.vehicleId || "NA",
-        active: ((_formData$active = formData.active) === null || _formData$active === void 0 ? void 0 : _formData$active.value) === "Yes" ? "Y" : "N"
+      var _formData$day, _formData$day$value, _formData$active, _formData$active2;
+      const payload = {
+        fixedPointDetails: {
+          system_assigned_schedule_id: formData.scheduleId,
+          fixed_point_code: formData.fixedPointCode,
+          day: (_formData$day = formData.day) === null || _formData$day === void 0 ? void 0 : (_formData$day$value = _formData$day.value) === null || _formData$day$value === void 0 ? void 0 : _formData$day$value.toUpperCase(),
+          trip_no: formData.frequencyNo,
+          arrival_time_to_fpl: formData.arrivalTimeFpl,
+          departure_time_from_fpl: formData.departureTimeFpl,
+          arrival_time_delivery_point: formData.arrivalFixedPoint,
+          departure_time_delivery_point: formData.departureFixedPoint,
+          time_of_arriving_back_fpl_after_delivery: formData.returnFpl,
+          volume_water_tobe_delivery: formData.volume,
+          active: ((_formData$active = formData.active) === null || _formData$active === void 0 ? void 0 : _formData$active.value) === "Yes",
+          is_enable: ((_formData$active2 = formData.active) === null || _formData$active2 === void 0 ? void 0 : _formData$active2.value) === "Yes",
+          remarks: formData.remarks,
+          vehicle_id: formData.vehicleId
+        }
       };
-      if (editingRowIndex !== null) {
-        const updatedData = [...data];
-        updatedData[editingRowIndex] = rowData;
-        setData(updatedData);
-      } else {
-        setData([...data, rowData]);
-      }
-      setShowModal(false);
-      setEditingRowIndex(null);
+      createSchedule(payload, {
+        onError: (error, variables) => {
+          var _error$response, _error$response$data, _error$response$data$, _error$response$data$2;
+          setToast({
+            key: "error",
+            label: (error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : (_error$response$data$ = _error$response$data.Errors) === null || _error$response$data$ === void 0 ? void 0 : (_error$response$data$2 = _error$response$data$[0]) === null || _error$response$data$2 === void 0 ? void 0 : _error$response$data$2.message) || "ERROR_WHILE_CREATING_SCHEDULE"
+          });
+          setTimeout(closeToast, 5000);
+        },
+        onSuccess: (data, variables) => {
+          setToast({
+            label: t("WT_SCHEDULE_CREATE_SUCCESS")
+          });
+          setTimeout(closeToast, 5000);
+          setShowModal(false);
+          setEditingRowIndex(null);
+          reSearch();
+        }
+      });
     }
+  }), toast && /*#__PURE__*/React.createElement(Toast, {
+    error: toast.key === "error",
+    label: toast.label,
+    onClose: closeToast
   }));
 };
 
@@ -5034,13 +5017,6 @@ const AddFillingPointMetaData = ({
 }) => {
   const sectionKey = (_config === null || _config === void 0 ? void 0 : _config.key) || "metaData";
   const inputs = [{
-    label: "WT_FILLING_POINT_NAME",
-    name: "fillingPointName",
-    isMandatory: true
-  }, {
-    label: "WT_EMERGENCY_NAME",
-    name: "emergencyName"
-  }, {
     label: "WT_AE_NAME",
     name: "aeName",
     validation: {
@@ -5216,7 +5192,6 @@ const AddFixFillAddress = ({
     }
     if (formData !== null && formData !== void 0 && formData.address && !isInitialized.current && allCities) {
       const addressData = formData.address;
-      console.log("AddFixFillAddress: Initialization Phase 1 - Setting basic fields", addressData);
       const cityObj = allCities.find(c => c.code === addressData.cityCode || c.code === addressData.city || c.name === addressData.city) || addressData.city;
       if (cityObj && (!city || city.code !== cityObj.code && city !== cityObj)) {
         setCity(cityObj || null);
@@ -5440,16 +5415,13 @@ const AddFillingPointAddress = () => {
   const {
     mutate: createFillingPoint
   } = Digit.Hooks.wt.useCreateFillPoint(tenantId);
-  const {
-    mutate: updateFillingPoint
-  } = Digit.Hooks.wt.useUpdateFillPoint(tenantId);
   const handleSubmit = e => {
     if (e && e.preventDefault) e.preventDefault();
     const payload = fillingPointPayload({
       ...formData,
       tenantId
     });
-    const mutation = editId ? updateFillingPoint : createFillingPoint;
+    const mutation = createFillingPoint;
     mutation(payload, {
       onSuccess: () => {
         setShowToast({
@@ -5472,7 +5444,6 @@ const AddFillingPointAddress = () => {
   return /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
-      gap: "24px",
       flexDirection: isMobile ? "column" : "row"
     }
   }, /*#__PURE__*/React.createElement(Timeline, {
@@ -5640,7 +5611,7 @@ const AddFixPointAddress = () => {
       display: "flex",
       flexDirection: "column"
     }
-  }, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WT_AE_NAME")}`, " ", /*#__PURE__*/React.createElement("span", {
+  }, /*#__PURE__*/React.createElement(CardLabel, null, `${t("COMMON_APPLICANT_NAME")}`, " ", /*#__PURE__*/React.createElement("span", {
     className: "astericColor"
   }, "*")), /*#__PURE__*/React.createElement(TextInput, {
     t: t,
@@ -5659,7 +5630,7 @@ const AddFixPointAddress = () => {
       display: "flex",
       flexDirection: "column"
     }
-  }, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WT_AE_MOBILE_NUMBER")}`, " ", /*#__PURE__*/React.createElement("span", {
+  }, /*#__PURE__*/React.createElement(CardLabel, null, `${t("COMMON_MOBILE_NUMBER")}`, " ", /*#__PURE__*/React.createElement("span", {
     className: "astericColor"
   }, "*")), /*#__PURE__*/React.createElement(MobileNumber, {
     value: formData === null || formData === void 0 ? void 0 : (_formData$owner2 = formData.owner) === null || _formData$owner2 === void 0 ? void 0 : _formData$owner2.mobileNumber,
@@ -5675,7 +5646,7 @@ const AddFixPointAddress = () => {
       display: "flex",
       flexDirection: "column"
     }
-  }, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WT_AE_EMAIL_ID")}`, " ", /*#__PURE__*/React.createElement("span", {
+  }, /*#__PURE__*/React.createElement(CardLabel, null, `${t("COMMON_EMAIL_ID")}`, " ", /*#__PURE__*/React.createElement("span", {
     className: "astericColor"
   }, "*")), /*#__PURE__*/React.createElement(TextInput, {
     t: t,
@@ -5694,7 +5665,7 @@ const AddFixPointAddress = () => {
       display: "flex",
       flexDirection: "column"
     }
-  }, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WT_EE_ALT_MOBILE_NUMBER")}`), /*#__PURE__*/React.createElement(MobileNumber, {
+  }, /*#__PURE__*/React.createElement(CardLabel, null, `${t("COMMON_ALT_MOBILE_NUMBER")}`), /*#__PURE__*/React.createElement(MobileNumber, {
     value: formData === null || formData === void 0 ? void 0 : (_formData$owner4 = formData.owner) === null || _formData$owner4 === void 0 ? void 0 : _formData$owner4.alternateNumber,
     name: "alternateNumber",
     onChange: value => handleSelect("owner", {
@@ -5751,14 +5722,14 @@ const SearchFillingPointAddress = () => {
     isLoading: isFillingLoading,
     data: fillingPointData,
     refetch: refetchFilling
-  } = Digit.Hooks.wt.useTankerSearchAPI({
+  } = Digit.Hooks.wt.useFillPointSearch({
     tenantId,
     filters: searchParams
   }, {
     enabled: selectedTab === "FILLING_POINT"
   });
   const isLoading = selectedTab === "FIXED_POINT" ? isFixedLoading : isFillingLoading;
-  const tableData = (selectedTab === "FIXED_POINT" ? fixedPointData === null || fixedPointData === void 0 ? void 0 : fixedPointData.waterTankerBookingDetail : fillingPointData === null || fillingPointData === void 0 ? void 0 : fillingPointData.waterTankerBookingDetail) || [];
+  const tableData = (selectedTab === "FIXED_POINT" ? fixedPointData === null || fixedPointData === void 0 ? void 0 : fixedPointData.waterTankerBookingDetail : fillingPointData === null || fillingPointData === void 0 ? void 0 : fillingPointData.fillingPoints) || [];
   const searchConfig = {
     FIXED_POINT: {
       label: "WT_FIXED_POINT_NAME",
@@ -5798,6 +5769,7 @@ const SearchFillingPointAddress = () => {
   const onTabChange = tab => {
     setSelectedTab(tab);
     clearSearch();
+    setSearchParams({});
   };
   const onAddClick = () => {
     setShowAddMenu(prev => !prev);
@@ -5811,11 +5783,16 @@ const SearchFillingPointAddress = () => {
     setShowAddMenu(false);
   };
   const onSearch = () => {
-    setSearchParams({
+    const filters = {
       name: searchValue,
-      mobileNumber: mobileNumber,
+      ...(selectedTab === "FILLING_POINT" ? {
+        mobileNo: mobileNumber
+      } : {
+        mobileNumber: mobileNumber
+      }),
       status: status === null || status === void 0 ? void 0 : status.code
-    });
+    };
+    setSearchParams(filters);
   };
   const columns = React.useMemo(() => {
     if (selectedTab === "FIXED_POINT") {
@@ -5854,27 +5831,18 @@ const SearchFillingPointAddress = () => {
     } else {
       return [{
         Header: t("WT_FILLING_POINT_NAME"),
-        accessor: row => {
-          var _row$fillingpointmeta;
-          return (row === null || row === void 0 ? void 0 : (_row$fillingpointmeta = row.fillingpointmetadata) === null || _row$fillingpointmeta === void 0 ? void 0 : _row$fillingpointmeta.name) || "NA";
-        },
+        accessor: row => (row === null || row === void 0 ? void 0 : row.fillingPointName) || "NA",
         id: "fillingPointName",
         Cell: ({
           row
-        }) => {
-          var _row$original$filling;
-          return /*#__PURE__*/React.createElement("span", {
-            className: "link"
-          }, /*#__PURE__*/React.createElement(Link, {
-            to: `/digit-ui/employee/wt/add-filling-point-address?id=${row.original.bookingId}`
-          }, ((_row$original$filling = row.original.fillingpointmetadata) === null || _row$original$filling === void 0 ? void 0 : _row$original$filling.name) || "NA"));
-        }
+        }) => /*#__PURE__*/React.createElement("span", {
+          className: "link"
+        }, /*#__PURE__*/React.createElement(Link, {
+          to: `/digit-ui/employee/wt/add-filling-point-address?id=${row.original.id}`
+        }, row.original.fillingPointName || "NA"))
       }, {
         Header: t("WT_JE_NAME"),
-        accessor: row => {
-          var _row$fillingpointmeta2;
-          return (row === null || row === void 0 ? void 0 : (_row$fillingpointmeta2 = row.fillingpointmetadata) === null || _row$fillingpointmeta2 === void 0 ? void 0 : _row$fillingpointmeta2.jeName) || "NA";
-        },
+        accessor: row => (row === null || row === void 0 ? void 0 : row.jeName) || "NA",
         id: "jeName"
       }, {
         Header: t("WT_LOCALITY"),
@@ -17303,7 +17271,7 @@ const configWTApproverApplication = ({
             required: true
           }
         }
-      }, (action === null || action === void 0 ? void 0 : action.state) === "PENDING_FOR_VEHICLE_DRIVER_ASSIGN" ? {
+      }, (action === null || action === void 0 ? void 0 : action.state) === "PENDING_FOR_VEHICLE_DRIVER_ASSIGN" && (action === null || action === void 0 ? void 0 : action.action) !== "ASSIGN_VEHICLE_DRIVER" ? {
         label: t("RS_ASSIGN"),
         type: "dropdown",
         populators: /*#__PURE__*/React.createElement(Dropdown, {
@@ -17313,7 +17281,7 @@ const configWTApproverApplication = ({
           select: setSelectedVendor,
           selected: selectedVendor
         })
-      } : "null", (action === null || action === void 0 ? void 0 : action.state) === "DELIVERY_PENDING" ? {
+      } : "null", (action === null || action === void 0 ? void 0 : action.state) === "DELIVERY_PENDING" || (action === null || action === void 0 ? void 0 : action.action) === "ASSIGN_VEHICLE_DRIVER" ? {
         label: t("RS_REGISTRATION_NUMBER"),
         type: "dropdown",
         populators: /*#__PURE__*/React.createElement(Dropdown, {
@@ -17376,7 +17344,7 @@ const ActionModal$b = ({
   cardFormClassName,
   formClassName
 }) => {
-  var _action$assigneeRoles, _action$assigneeRoles2, _dsoData$vendor, _vehicleData$vehicle;
+  var _action$assigneeRoles, _action$assigneeRoles2, _dsoData$vendor, _vehicleData$vehicle, _vehicleData$vehicle$;
   const {
     data: approverData,
     isLoading: PTALoading
@@ -17397,7 +17365,7 @@ const ActionModal$b = ({
   } = Digit.Hooks.fsm.useVendorSearch({
     tenantId,
     config: {
-      enabled: (action === null || action === void 0 ? void 0 : action.state) === "PENDING_FOR_VEHICLE_DRIVER_ASSIGN"
+      enabled: (action === null || action === void 0 ? void 0 : action.state) === "PENDING_FOR_VEHICLE_DRIVER_ASSIGN" || (action === null || action === void 0 ? void 0 : action.action) === "ASSIGN_VEHICLE_DRIVER"
     }
   });
   let vendorDescription = [];
@@ -17420,17 +17388,22 @@ const ActionModal$b = ({
   } = Digit.Hooks.fsm.useVehiclesSearch({
     tenantId,
     config: {
-      enabled: (action === null || action === void 0 ? void 0 : action.state) === "DELIVERY_PENDING"
+      enabled: (action === null || action === void 0 ? void 0 : action.state) === "DELIVERY_PENDING" || (action === null || action === void 0 ? void 0 : action.action) === "ASSIGN_VEHICLE_DRIVER"
     }
   });
   let vehicleDescription = [];
-  vehicleData === null || vehicleData === void 0 ? void 0 : (_vehicleData$vehicle = vehicleData.vehicle) === null || _vehicleData$vehicle === void 0 ? void 0 : _vehicleData$vehicle.map(item => {
+  vehicleData === null || vehicleData === void 0 ? void 0 : (_vehicleData$vehicle = vehicleData.vehicle) === null || _vehicleData$vehicle === void 0 ? void 0 : (_vehicleData$vehicle$ = _vehicleData$vehicle.filter(item => {
+    var _item$driverData, _item$driver;
+    return (item === null || item === void 0 ? void 0 : (_item$driverData = item.driverData) === null || _item$driverData === void 0 ? void 0 : _item$driverData.id) || (item === null || item === void 0 ? void 0 : (_item$driver = item.driver) === null || _item$driver === void 0 ? void 0 : _item$driver.id);
+  })) === null || _vehicleData$vehicle$ === void 0 ? void 0 : _vehicleData$vehicle$.map(item => {
+    var _item$driverData2, _item$driver2;
     vehicleDescription.push({
       code: item === null || item === void 0 ? void 0 : item.registrationNumber,
       name: item === null || item === void 0 ? void 0 : item.registrationNumber,
       i18nKey: item === null || item === void 0 ? void 0 : item.registrationNumber,
       tankerCapacity: item === null || item === void 0 ? void 0 : item.tankCapacity,
-      vehicleId: item === null || item === void 0 ? void 0 : item.id
+      vehicleId: item === null || item === void 0 ? void 0 : item.id,
+      driverId: (item === null || item === void 0 ? void 0 : (_item$driverData2 = item.driverData) === null || _item$driverData2 === void 0 ? void 0 : _item$driverData2.ownerId) || (item === null || item === void 0 ? void 0 : (_item$driver2 = item.driver) === null || _item$driver2 === void 0 ? void 0 : _item$driver2.ownerId)
     });
   });
   const [config, setConfig] = useState({});
@@ -17495,6 +17468,10 @@ const ActionModal$b = ({
     if ((action === null || action === void 0 ? void 0 : action.state) === "DELIVERY_PENDING") {
       applicationData.vehicleId = selectVehicle === null || selectVehicle === void 0 ? void 0 : selectVehicle.vehicleId;
     }
+    if ((action === null || action === void 0 ? void 0 : action.action) === "ASSIGN_VEHICLE_DRIVER") {
+      applicationData.vehicleId = selectVehicle === null || selectVehicle === void 0 ? void 0 : selectVehicle.vehicleId;
+      applicationData.driverId = selectVehicle === null || selectVehicle === void 0 ? void 0 : selectVehicle.driverId;
+    }
     let requestPayload = businessService === "watertanker" ? {
       waterTankerBookingDetail: {
         ...applicationData,
@@ -17519,7 +17496,7 @@ const ActionModal$b = ({
         selectedVendor,
         setSelectedVendor,
         vendorDescription: dsoData ? vendorDescription : undefined,
-        vehicleDescription: vehicleData ? vehicleDescription : undefined,
+        vehicleDescription: vehicleData || (action === null || action === void 0 ? void 0 : action.action) === "ASSIGN_VEHICLE_DRIVER" ? vehicleDescription : undefined,
         selectVehicle,
         setSelectVehicle
       }));