@djb25/digit-ui-module-vendor 1.0.9 → 1.0.11

package/dist/index.modern.js

@@ -545,39 +545,6 @@ const VendorConfig = (t, disabled = false) => {
         defaultValue: "",
         className: "payment-form-text-input-correction"
       }
-    }, {
-      label: "ES_FSM_REGISTRY_NEW_GENDER",
-      isMandatory: true,
-      type: "component",
-      route: "select-gender",
-      hideInEmployee: false,
-      key: "selectGender",
-      component: "SelectGender",
-      disable: disabled,
-      texts: {
-        headerCaption: "",
-        header: "CS_COMMON_CHOOSE_GENDER",
-        cardText: "CS_COMMON_SELECT_GENDER",
-        submitBarLabel: "CS_COMMON_NEXT",
-        skipText: "CORE_COMMON_SKIP_CONTINUE"
-      }
-    }, {
-      label: t("ES_FSM_REGISTRY_NEW_DOB"),
-      isMandatory: false,
-      type: "custom",
-      key: "dob",
-      populators: {
-        name: "dob",
-        validation: {
-          required: true
-        },
-        component: (props, customProps) => /*#__PURE__*/React.createElement(DatePicker, Object.assign({
-          onChange: props.onChange,
-          date: props.value
-        }, customProps, {
-          max: convertEpochToDate(new Date().setFullYear(new Date().getFullYear()))
-        }))
-      }
     }, {
       label: "ES_FSM_REGISTRY_NEW_EMAIL",
       isMandatory: false,
@@ -617,17 +584,20 @@ const VendorConfig = (t, disabled = false) => {
       label: "ES_VENDOR_REGISTRY_SERVICE_TYPE",
       isMandatory: true,
       type: "component",
-      route: "select-gender",
-      hideInEmployee: false,
       key: "serviceType",
       component: "SelectServiceType",
       disable: disabled,
+      populators: {
+        name: "serviceType",
+        defaultValue: {
+          code: "WT",
+          name: "WT",
+          i18nKey: "WT"
+        }
+      },
       texts: {
-        headerCaption: "",
-        header: "CS_COMMON_CHOOSE_GENDER",
-        cardText: "CS_COMMON_SELECT_GENDER",
-        submitBarLabel: "CS_COMMON_NEXT",
-        skipText: "CORE_COMMON_SKIP_CONTINUE"
+        header: "CS_COMMON_CHOOSE_SERVICE_TYPE",
+        submitBarLabel: "CS_COMMON_NEXT"
       }
     }]
   }, {
@@ -744,6 +714,11 @@ const AddVendor = ({
   }, []);
   const Config = VendorConfig(t);
   const defaultValues = {
+    serviceType: {
+      code: "WT",
+      name: "WT",
+      i18nKey: "WT"
+    },
     tripData: {
       noOfTrips: 1,
       amountPerTrip: null,
@@ -758,8 +733,8 @@ const AddVendor = ({
     label: "ES_FSM_REGISTRY_NEW_ADDRESS_DETAILS"
   }];
   const onFormValueChange = (setValue, formData) => {
-    var _formData$selectGende;
-    if (formData !== null && formData !== void 0 && formData.vendorName && formData !== null && formData !== void 0 && formData.phone && formData !== null && formData !== void 0 && (_formData$selectGende = formData.selectGender) !== null && _formData$selectGende !== void 0 && _formData$selectGende.code) {
+    var _formData$serviceType;
+    if (formData !== null && formData !== void 0 && formData.vendorName && formData !== null && formData !== void 0 && formData.phone && formData !== null && formData !== void 0 && (_formData$serviceType = formData.serviceType) !== null && _formData$serviceType !== void 0 && _formData$serviceType.code) {
       setCanSubmit(true);
     } else {
       setCanSubmit(false);
@@ -769,7 +744,7 @@ const AddVendor = ({
     setShowToast(null);
   };
   const onSubmit = data => {
-    var _mergedData$street, _mergedData$doorNo, _mergedData$plotNo, _mergedData$landmark, _mergedData$address, _mergedData$address$c, _mergedData$address2, _mergedData$address2$, _mergedData$address3, _mergedData$address3$, _mergedData$address4, _mergedData$address4$, _mergedData$buildingN, _mergedData$address5, _mergedData$address5$, _mergedData$address6, _mergedData$address6$, _mergedData$address7, _mergedData$address7$, _mergedData$selectGen, _mergedData$serviceTy, _mergedData$address8, _mergedData$address9;
+    var _mergedData$street, _mergedData$doorNo, _mergedData$plotNo, _mergedData$landmark, _mergedData$address, _mergedData$address$c, _mergedData$address2, _mergedData$address2$, _mergedData$address3, _mergedData$address3$, _mergedData$address4, _mergedData$address4$, _mergedData$buildingN, _mergedData$address5, _mergedData$address5$, _mergedData$address6, _mergedData$address6$, _mergedData$address7, _mergedData$address7$, _mergedData$serviceTy, _mergedData$address8, _mergedData$address9;
     if (currentStep === 1) {
       setStep1Data(data);
       setCurrentStep(2);
@@ -793,7 +768,7 @@ const AddVendor = ({
     const localityCode = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$address5 = mergedData.address) === null || _mergedData$address5 === void 0 ? void 0 : (_mergedData$address5$ = _mergedData$address5.locality) === null || _mergedData$address5$ === void 0 ? void 0 : _mergedData$address5$.code;
     const localityName = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$address6 = mergedData.address) === null || _mergedData$address6 === void 0 ? void 0 : (_mergedData$address6$ = _mergedData$address6.locality) === null || _mergedData$address6$ === void 0 ? void 0 : _mergedData$address6$.name;
     const localityArea = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$address7 = mergedData.address) === null || _mergedData$address7 === void 0 ? void 0 : (_mergedData$address7$ = _mergedData$address7.locality) === null || _mergedData$address7$ === void 0 ? void 0 : _mergedData$address7$.area;
-    const gender = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$selectGen = mergedData.selectGender) === null || _mergedData$selectGen === void 0 ? void 0 : _mergedData$selectGen.code;
+    const gender = "MALE";
     const emailId = mergedData === null || mergedData === void 0 ? void 0 : mergedData.emailId;
     const phone = mergedData === null || mergedData === void 0 ? void 0 : mergedData.phone;
     const dob = new Date(`${mergedData.dob}`).getTime() || new Date(`1/1/1970`).getTime();
@@ -834,7 +809,7 @@ const AddVendor = ({
           fatherOrHusbandName: name,
           relationship: "OTHER",
           gender: gender,
-          dob: dob,
+          dob: "915148800",
           emailId: emailId || "abc@egov.com",
           mobileNumber: phone
         },
@@ -874,6 +849,7 @@ const AddVendor = ({
       overflowY: "auto"
     }
   }, currentStep === 1 && /*#__PURE__*/React.createElement(FormComposer, {
+    isDisabled: !canSubmit,
     label: t("CS_COMMON_NEXT"),
     config: vendorStepConfig.filter(i => !i.hideInEmployee).map(config => ({
       ...config,
@@ -894,7 +870,7 @@ const AddVendor = ({
     })),
     onSubmit: onSubmit,
     defaultValues: defaultValues,
-    onFormValueChange: onFormValueChange,
+    onFormValueChange: (setValue, formData) => {},
     noBreakLine: true
   }), showToast && /*#__PURE__*/React.createElement(Toast, {
     error: showToast.key === "error",
@@ -8226,6 +8202,7 @@ const VendorInbox = props => {
   const [tableData, setTableData] = useState([]);
   const [showToast, setShowToast] = useState(null);
   const [vendors, setVendors] = useState([]);
+  const [drivers, setDrivers] = useState([]);
   const queryClient = useQueryClient();
   const [address, setAddress] = useState();
   const {
@@ -8241,6 +8218,18 @@ const VendorInbox = props => {
   }, {
     enabled: false
   });
+  const {
+    data: driverData,
+    refetch: refetchDriver
+  } = Digit.Hooks.fsm.useDriverSearch({
+    tenantId,
+    filters: {
+      sortBy: "name",
+      sortOrder: "ASC",
+      status: "ACTIVE",
+      driverWithNoVendor: true
+    }
+  });
   const {
     isLoading: isUpdateVendorLoading,
     isError: vendorUpdateError,
@@ -8267,7 +8256,10 @@ const VendorInbox = props => {
     setTableData((props === null || props === void 0 ? void 0 : (_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.table) || []);
   }, [props]);
   useEffect(() => {
-    if (props.selectedTab === "DRIVER" || props.selectedTab === "VEHICLE") refetchVendor();
+    if (props.selectedTab === "DRIVER" || props.selectedTab === "VEHICLE") {
+      refetchVendor();
+      refetchDriver();
+    }
   }, [props.selectedTab]);
   useEffect(() => {
     if (vendorData) {
@@ -8275,6 +8267,11 @@ const VendorInbox = props => {
       setVendors(vendors);
     }
   }, [vendorData]);
+  useEffect(() => {
+    if (driverData) {
+      setDrivers(driverData.driver || []);
+    }
+  }, [driverData]);
   const closeToast = () => {
     setShowToast(null);
   };
@@ -8413,6 +8410,34 @@ const VendorInbox = props => {
       }
     });
   };
+  const onDriverSelect = (row, selectedOption) => {
+    let vehicleData = row.original;
+    let selectedDriver = selectedOption;
+    const formData = {
+      vehicle: {
+        ...vehicleData,
+        driverData: selectedDriver
+      }
+    };
+    mutateVehicle(formData, {
+      onError: (error, variables) => {
+        setShowToast({
+          key: "error",
+          action: error
+        });
+        setTimeout(closeToast, 5000);
+      },
+      onSuccess: (data, variables) => {
+        setShowToast({
+          key: "success",
+          action: "VEHICLE"
+        });
+        queryClient.invalidateQueries("FSM_VEICLES_SEARCH");
+        props.refetchData();
+        setTimeout(closeToast, 3000);
+      }
+    });
+  };
   const onSelectAdd = () => {
     switch (props.selectedTab) {
       case "VENDOR":
@@ -8437,18 +8462,12 @@ const VendorInbox = props => {
   } = Digit.Hooks.vendor.useEmpvendorCommonSearch({
     tenantId,
     filters: {
-      vendorIds: vendorIds
+      vendorIds: vendorIds === null || vendorIds === void 0 ? void 0 : vendorIds.join(","),
+      vendorId: vendorIds === null || vendorIds === void 0 ? void 0 : vendorIds.join(",")
     }
   }, {
     enabled: (vendorIds === null || vendorIds === void 0 ? void 0 : vendorIds.length) > 0
   });
-  const hasAdditionalDetails = vendorId => {
-    var _additionalVendorData;
-    return additionalVendorData === null || additionalVendorData === void 0 ? void 0 : (_additionalVendorData = additionalVendorData.VendorDetails) === null || _additionalVendorData === void 0 ? void 0 : _additionalVendorData.some(v => {
-      var _v$vendorAdditionalDe;
-      return ((_v$vendorAdditionalDe = v.vendorAdditionalDetails) === null || _v$vendorAdditionalDe === void 0 ? void 0 : _v$vendorAdditionalDe.vendorId) === vendorId;
-    });
-  };
   const columns = React.useMemo(() => {
     switch (props.selectedTab) {
       case "VENDOR":
@@ -8515,21 +8534,24 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            var _row$original4;
+            var _row$original4, _additionalVendorData;
             const vendorId = (_row$original4 = row.original) === null || _row$original4 === void 0 ? void 0 : _row$original4.id;
-            const hasDetails = hasAdditionalDetails(vendorId);
-            return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
-              className: "link"
-            }, /*#__PURE__*/React.createElement(Link, {
+            if (!additionalVendorData) {
+              return /*#__PURE__*/React.createElement("span", null, "Loading...");
+            }
+            const hasDetails = additionalVendorData === null || additionalVendorData === void 0 ? void 0 : (_additionalVendorData = additionalVendorData.VendorDetails) === null || _additionalVendorData === void 0 ? void 0 : _additionalVendorData.some(item => {
+              var _item$vendorAdditiona;
+              return (item === null || item === void 0 ? void 0 : (_item$vendorAdditiona = item.vendorAdditionalDetails) === null || _item$vendorAdditiona === void 0 ? void 0 : _item$vendorAdditiona.vendorId) === vendorId;
+            });
+            return /*#__PURE__*/React.createElement(Link, {
               to: hasDetails ? "/digit-ui/employee/vendor/registry/additionaldetails/info?vendorId=" + vendorId : "/digit-ui/employee/vendor/registry/additionaldetails/vendor-details?vendorId=" + vendorId
             }, /*#__PURE__*/React.createElement("button", {
               className: "submit-bar",
-              type: "button",
               style: {
-                color: "white",
-                backgroundColor: hasDetails ? "#417505" : "#F47738"
+                backgroundColor: hasDetails ? "#417505" : "#F47738",
+                color: "white"
               }
-            }, hasDetails ? t("ES_VENDOR_VIEW_DETAILS") : t("ES_VENDOR_ADD_DETAILS")))));
+            }, hasDetails ? "View Details" : "Add Details"));
           }
         }];
       case "VEHICLE":
@@ -8582,6 +8604,19 @@ const VendorInbox = props => {
             const serviceType = ((_additionalDetail = additionalDetail) === null || _additionalDetail === void 0 ? void 0 : _additionalDetail.serviceType) || "N/A";
             return /*#__PURE__*/React.createElement("div", null, serviceType);
           }
+        }, {
+          Header: t("ES_FSM_REGISTRY_SELECT_DRIVER"),
+          Cell: ({
+            row
+          }) => {
+            return /*#__PURE__*/React.createElement(Dropdown$2, {
+              selected: row.original.driverData || row.original.driver,
+              option: drivers,
+              select: value => onDriverSelect(row, value),
+              optionKey: "name",
+              t: t
+            });
+          }
         }, {
           Header: t("ES_FSM_REGISTRY_INBOX_ENABLED"),
           disableSortBy: true,
@@ -8671,7 +8706,7 @@ const VendorInbox = props => {
       default:
         return [];
     }
-  }, [props.selectedTab, vendors]);
+  }, [props.selectedTab, vendors, drivers, tableData, additionalVendorData, t]);
   let result;
   if (props.isLoading) {
     result = /*#__PURE__*/React.createElement(Loader, null);
@@ -8925,7 +8960,9 @@ const SearchVendor = () => {
             return (_ele$dsoDetails = ele.dsoDetails) === null || _ele$dsoDetails === void 0 ? void 0 : (_ele$dsoDetails$vehic = _ele$dsoDetails.vehicles) === null || _ele$dsoDetails$vehic === void 0 ? void 0 : _ele$dsoDetails$vehic.find(vehicle => vehicle.id === data.id);
           });
           if (vendor) {
+            var _vendor$dsoDetails, _vendor$dsoDetails$ve, _vendor$dsoDetails$ve2;
             data.vendor = vendor.dsoDetails;
+            data.driverData = (_vendor$dsoDetails = vendor.dsoDetails) === null || _vendor$dsoDetails === void 0 ? void 0 : (_vendor$dsoDetails$ve = _vendor$dsoDetails.vehicles) === null || _vendor$dsoDetails$ve === void 0 ? void 0 : (_vendor$dsoDetails$ve2 = _vendor$dsoDetails$ve.find(vehicle => vehicle.id === data.id)) === null || _vendor$dsoDetails$ve2 === void 0 ? void 0 : _vendor$dsoDetails$ve2.driverData;
           }
           return data;
         });
@@ -9049,6 +9086,15 @@ const SelectServiceType = ({
         value: `${services.name}`
       }));
       setFormattedServiceTypes(transformedData);
+      if (!serviceTypes || serviceTypes.code === "WT") {
+        const defaultWT = transformedData.find(item => item.code === "WT");
+        if (defaultWT) {
+          setserviceTypes(defaultWT);
+          if (userType === "employee") {
+            onSelect(config.key, defaultWT);
+          }
+        }
+      }
     }
   }, [ServiceType]);
   const selectServiceType = value => {
@@ -9177,6 +9223,26 @@ const DriverConfig = (t, disabled = false) => {
         defaultValue: "",
         className: "payment-form-text-input-correction"
       }
+    }, {
+      label: "ES_FSM_REGISTRY_DRIVER_PHONE",
+      isMandatory: true,
+      type: "mobileNumber",
+      key: "phone",
+      disable: disabled,
+      populators: {
+        name: "phone",
+        validation: {
+          required: true,
+          pattern: /^[6-9]\d{9}$/
+        },
+        error: t("FSM_REGISTRY_INVALID_PHONE"),
+        defaultValue: "",
+        className: "payment-form-text-input-correction",
+        labelStyle: {
+          border: "1px solid black",
+          borderRight: "none"
+        }
+      }
     }]
   }];
 };
@@ -9235,6 +9301,7 @@ const AddDriver = ({
     const license = data === null || data === void 0 ? void 0 : data.license;
     const gender = data === null || data === void 0 ? void 0 : (_data$selectGender = data.selectGender) === null || _data$selectGender === void 0 ? void 0 : _data$selectGender.code;
     const emailId = data === null || data === void 0 ? void 0 : data.emailId;
+    const phone = data === null || data === void 0 ? void 0 : data.phone;
     const dob = new Date(`${data.dob}`).getTime() || new Date(`1/1/1970`).getTime();
     const additionalDetails = data === null || data === void 0 ? void 0 : (_data$additionalDetai = data.additionalDetails) === null || _data$additionalDetai === void 0 ? void 0 : _data$additionalDetai.code;
     const formData = {
@@ -9250,12 +9317,13 @@ const AddDriver = ({
           relationship: "OTHER",
           gender: gender,
           dob: dob,
-          emailId: emailId || "abc@egov.com"
+          emailId: emailId || "abc@egov.com",
+          mobileNumber: phone
         },
         additionalDetails: {
           serviceType: additionalDetails
         },
-        vendorDriverStatus: "INACTIVE"
+        vendorDriverStatus: "ACTIVE"
       }
     };
     mutate(formData, {
@@ -9411,7 +9479,6 @@ const EditVendorDetails = props => {
   }, {
     enabled: !!dsoId
   });
-  console.log(vendorAdditionalData, "w2e3r4t5yh");
   const {
     mutate
   } = Digit.Hooks.fsm.useVendorUpdate(tenantId);
@@ -9458,21 +9525,31 @@ const EditVendorDetails = props => {
       };
     }
     if (selectedAction === "ADD_VEHICLE") {
+      var _dsoDetails$owner;
       let selectedVehicle = selectedOption;
       selectedVehicle.vendorVehicleStatus = "ACTIVE";
       formData = {
         vendor: {
           ...dsoDetails,
+          owner: {
+            ...dsoDetails.owner,
+            gender: ((_dsoDetails$owner = dsoDetails.owner) === null || _dsoDetails$owner === void 0 ? void 0 : _dsoDetails$owner.gender) || "OTHERS"
+          },
           vehicles: dsoDetails.vehicles ? [...dsoDetails.vehicles, selectedVehicle] : [selectedVehicle]
         }
       };
     }
     if (selectedAction === "ADD_DRIVER") {
+      var _dsoDetails$owner2;
       let selectedDriver = selectedOption;
       selectedDriver.vendorDriverStatus = "ACTIVE";
       formData = {
         vendor: {
           ...dsoDetails,
+          owner: {
+            ...dsoDetails.owner,
+            gender: ((_dsoDetails$owner2 = dsoDetails.owner) === null || _dsoDetails$owner2 === void 0 ? void 0 : _dsoDetails$owner2.gender) || "OTHERS"
+          },
           drivers: dsoDetails.drivers ? [...dsoDetails.drivers, selectedDriver] : [selectedDriver]
         }
       };
@@ -9515,7 +9592,7 @@ const EditVendorDetails = props => {
   const onDelete = (details, type, id) => {
     let formData = {};
     if (type === "ES_FSM_REGISTRY_DETAILS_TYPE_DRIVER") {
-      var _dsoData$2;
+      var _dsoData$2, _dsoDetails$owner3;
       let dsoDetails = dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$2 = dsoData[0]) === null || _dsoData$2 === void 0 ? void 0 : _dsoData$2.dsoDetails;
       let drivers = dsoDetails === null || dsoDetails === void 0 ? void 0 : dsoDetails.drivers;
       drivers = drivers.map(data => {
@@ -9527,11 +9604,15 @@ const EditVendorDetails = props => {
       formData = {
         vendor: {
           ...dsoDetails,
+          owner: {
+            ...dsoDetails.owner,
+            gender: ((_dsoDetails$owner3 = dsoDetails.owner) === null || _dsoDetails$owner3 === void 0 ? void 0 : _dsoDetails$owner3.gender) || "OTHERS"
+          },
           drivers: drivers
         }
       };
     } else {
-      var _dsoData$3, _details$values2, _details$values2$find;
+      var _dsoData$3, _details$values2, _details$values2$find, _dsoDetails$owner4;
       let dsoDetails = dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$3 = dsoData[0]) === null || _dsoData$3 === void 0 ? void 0 : _dsoData$3.dsoDetails;
       let vehicles = dsoDetails === null || dsoDetails === void 0 ? void 0 : dsoDetails.vehicles;
       let registrationNumber = details === null || details === void 0 ? void 0 : (_details$values2 = details.values) === null || _details$values2 === void 0 ? void 0 : (_details$values2$find = _details$values2.find(ele => ele.title === "ES_FSM_REGISTRY_VEHICLE_NUMBER")) === null || _details$values2$find === void 0 ? void 0 : _details$values2$find.value;
@@ -9544,6 +9625,10 @@ const EditVendorDetails = props => {
       formData = {
         vendor: {
           ...dsoDetails,
+          owner: {
+            ...dsoDetails.owner,
+            gender: ((_dsoDetails$owner4 = dsoDetails.owner) === null || _dsoDetails$owner4 === void 0 ? void 0 : _dsoDetails$owner4.gender) || "OTHERS"
+          },
           vehicles: vehicles
         }
       };
@@ -9785,7 +9870,7 @@ const VehicleConfig = (t, disabled = false) => {
         name: "registrationNumber",
         ValidationRequired: true,
         validation: {
-          pattern: `[A-Z]{2}\\s{1}[0-9]{2}\\s{0,1}[A-Z]{1,2}\\s{1}[0-9]{4}`,
+          pattern: `^[A-Z]{2}-[0-9]{2}-[A-Z]{1,2}-[0-9]{4}$`,
           title: t("ES_FSM_VEHICLE_FORMAT_TIP")
         },
         error: t("FSM_REGISTRY_INVALID_REGISTRATION_NUMBER"),
@@ -10012,6 +10097,15 @@ const AddVehicle = ({
   };
   const onFormValueChange = (setValue, formData) => {
     var _formData$vehicle, _formData$vehicle2;
+    if (formData !== null && formData !== void 0 && formData.registrationNumber) {
+      let updatedRegNo = formData.registrationNumber.toUpperCase().replace(/ /g, "-").replace(/[^A-Z0-9-]/g, "");
+      if (updatedRegNo.length > 13) {
+        updatedRegNo = updatedRegNo.slice(0, 13);
+      }
+      if (updatedRegNo !== formData.registrationNumber) {
+        setValue("registrationNumber", updatedRegNo);
+      }
+    }
     if (formData !== null && formData !== void 0 && formData.registrationNumber && formData !== null && formData !== void 0 && formData.ownerName && formData !== null && formData !== void 0 && formData.phone && formData !== null && formData !== void 0 && (_formData$vehicle = formData.vehicle) !== null && _formData$vehicle !== void 0 && _formData$vehicle.modal && formData !== null && formData !== void 0 && (_formData$vehicle2 = formData.vehicle) !== null && _formData$vehicle2 !== void 0 && _formData$vehicle2.type && formData !== null && formData !== void 0 && formData.selectGender) {
       setSubmitValve(true);
     } else {
@@ -10734,7 +10828,7 @@ const DriverDetails = props => {
     setShowModal(false);
   };
   const handleDeleteVendor = () => {
-    var _driverData$2, _driverData$2$vendorD, _driverData$2$vendorD2;
+    var _driverData$2, _driverData$2$vendorD, _driverData$2$vendorD2, _dsoDetails$owner;
     let formData = {};
     let dsoDetails = driverData === null || driverData === void 0 ? void 0 : (_driverData$2 = driverData[0]) === null || _driverData$2 === void 0 ? void 0 : (_driverData$2$vendorD = _driverData$2.vendorDetails) === null || _driverData$2$vendorD === void 0 ? void 0 : (_driverData$2$vendorD2 = _driverData$2$vendorD.vendor) === null || _driverData$2$vendorD2 === void 0 ? void 0 : _driverData$2$vendorD2[0];
     let getDriverVendorDetails = dsoDetails === null || dsoDetails === void 0 ? void 0 : dsoDetails.drivers;
@@ -10747,6 +10841,10 @@ const DriverDetails = props => {
     formData = {
       vendor: {
         ...dsoDetails,
+        owner: {
+          ...dsoDetails.owner,
+          gender: ((_dsoDetails$owner = dsoDetails.owner) === null || _dsoDetails$owner === void 0 ? void 0 : _dsoDetails$owner.gender) || "OTHERS"
+        },
         drivers: getDriverVendorDetails
       }
     };
@@ -10771,13 +10869,17 @@ const DriverDetails = props => {
     setShowModal(false);
   };
   const handleAddVendor = () => {
-    var _driverData$3;
+    var _driverData$3, _dsoDetails$owner2;
     let dsoDetails = selectedOption;
     let driverDetails = driverData === null || driverData === void 0 ? void 0 : (_driverData$3 = driverData[0]) === null || _driverData$3 === void 0 ? void 0 : _driverData$3.driverData;
     driverDetails.vendorDriverStatus = "ACTIVE";
     const formData = {
       vendor: {
         ...dsoDetails,
+        owner: {
+          ...dsoDetails.owner,
+          gender: ((_dsoDetails$owner2 = dsoDetails.owner) === null || _dsoDetails$owner2 === void 0 ? void 0 : _dsoDetails$owner2.gender) || "OTHERS"
+        },
         drivers: dsoDetails.drivers ? [...dsoDetails.drivers, driverDetails] : [driverDetails]
       }
     };
@@ -10804,13 +10906,17 @@ const DriverDetails = props => {
     setSelectedAction(null);
   };
   const handleEditVendor = () => {
-    var _driverData$4;
+    var _driverData$4, _dsoDetails$owner3;
     let dsoDetails = selectedOption;
     let driverDetails = driverData === null || driverData === void 0 ? void 0 : (_driverData$4 = driverData[0]) === null || _driverData$4 === void 0 ? void 0 : _driverData$4.driverData;
     driverDetails.vendorDriverStatus = "ACTIVE";
     const formData = {
       vendor: {
         ...dsoDetails,
+        owner: {
+          ...dsoDetails.owner,
+          gender: ((_dsoDetails$owner3 = dsoDetails.owner) === null || _dsoDetails$owner3 === void 0 ? void 0 : _dsoDetails$owner3.gender) || "OTHERS"
+        },
         drivers: dsoDetails.drivers ? [...dsoDetails.drivers, driverDetails] : [driverDetails]
       }
     };
@@ -11101,13 +11207,17 @@ const VehicleDetails = props => {
     setShowModal(false);
   };
   const handleAddVendor = () => {
-    var _vehicleData$2;
+    var _vehicleData$2, _dsoDetails$owner;
     let dsoDetails = selectedOption;
     let vehicleDetails = vehicleData === null || vehicleData === void 0 ? void 0 : (_vehicleData$2 = vehicleData[0]) === null || _vehicleData$2 === void 0 ? void 0 : _vehicleData$2.vehicleData;
     vehicleDetails.vendorVehicleStatus = "ACTIVE";
     const formData = {
       vendor: {
         ...dsoDetails,
+        owner: {
+          ...dsoDetails.owner,
+          gender: ((_dsoDetails$owner = dsoDetails.owner) === null || _dsoDetails$owner === void 0 ? void 0 : _dsoDetails$owner.gender) || "OTHERS"
+        },
         vehicles: dsoDetails.vehicles ? [...dsoDetails.vehicles, vehicleDetails] : [vehicleDetails]
       }
     };
@@ -11133,13 +11243,17 @@ const VehicleDetails = props => {
     setSelectedAction(null);
   };
   const handleEditVendor = () => {
-    var _vehicleData$3;
+    var _vehicleData$3, _dsoDetails$owner2;
     let dsoDetails = selectedOption;
     let vehicleDetails = vehicleData === null || vehicleData === void 0 ? void 0 : (_vehicleData$3 = vehicleData[0]) === null || _vehicleData$3 === void 0 ? void 0 : _vehicleData$3.vehicleData;
     vehicleDetails.vendorVehicleStatus = "ACTIVE";
     const formData = {
       vendor: {
         ...dsoDetails,
+        owner: {
+          ...dsoDetails.owner,
+          gender: ((_dsoDetails$owner2 = dsoDetails.owner) === null || _dsoDetails$owner2 === void 0 ? void 0 : _dsoDetails$owner2.gender) || "OTHERS"
+        },
         vehicles: dsoDetails.vehicles ? [...dsoDetails.vehicles, vehicleDetails] : [vehicleDetails]
       }
     };
@@ -11165,7 +11279,7 @@ const VehicleDetails = props => {
     setSelectedAction(null);
   };
   const handleDeleteVendor = () => {
-    var _vehicleData$4, _vehicleData$4$vendor, _vehicleData$4$vendor2;
+    var _vehicleData$4, _vehicleData$4$vendor, _vehicleData$4$vendor2, _dsoDetails$owner3;
     let formData = {};
     let dsoDetails = vehicleData === null || vehicleData === void 0 ? void 0 : (_vehicleData$4 = vehicleData[0]) === null || _vehicleData$4 === void 0 ? void 0 : (_vehicleData$4$vendor = _vehicleData$4.vendorDetails) === null || _vehicleData$4$vendor === void 0 ? void 0 : (_vehicleData$4$vendor2 = _vehicleData$4$vendor.vendor) === null || _vehicleData$4$vendor2 === void 0 ? void 0 : _vehicleData$4$vendor2[0];
     let getVehicleVendorDetails = dsoDetails === null || dsoDetails === void 0 ? void 0 : dsoDetails.vehicles;
@@ -11178,6 +11292,10 @@ const VehicleDetails = props => {
     formData = {
       vendor: {
         ...dsoDetails,
+        owner: {
+          ...dsoDetails.owner,
+          gender: ((_dsoDetails$owner3 = dsoDetails.owner) === null || _dsoDetails$owner3 === void 0 ? void 0 : _dsoDetails$owner3.gender) || "OTHERS"
+        },
         vehicles: getVehicleVendorDetails
       }
     };