@djb25/digit-ui-module-vendor 1.0.42 → 1.0.44

package/dist/index.modern.js

@@ -1061,11 +1061,21 @@ const VendorSelectAddress = ({
   } = Digit.Hooks.useBoundaryLocalities(selectedCity === null || selectedCity === void 0 ? void 0 : selectedCity.code, "revenue", {
     enabled: !!selectedCity
   }, t);
+  const {
+    data: fetchedWards
+  } = Digit.Hooks.useBoundaryLocalities(selectedCity === null || selectedCity === void 0 ? void 0 : selectedCity.code, "admin", {
+    enabled: !!selectedCity
+  }, t);
   const [localities, setLocalities] = useState();
   const [selectedLocality, setSelectedLocality] = useState(() => {
     var _property2, _property2$propertyDe, _property2$propertyDe2, _formData$cpt, _formData$cpt$details, _formData$cpt$details2, _formData$address2;
     return ((_property2 = property) === null || _property2 === void 0 ? void 0 : (_property2$propertyDe = _property2.propertyDetails) === null || _property2$propertyDe === void 0 ? void 0 : (_property2$propertyDe2 = _property2$propertyDe.address) === null || _property2$propertyDe2 === void 0 ? void 0 : _property2$propertyDe2.locality) || (formData === null || formData === void 0 ? void 0 : (_formData$cpt = formData.cpt) === null || _formData$cpt === void 0 ? void 0 : (_formData$cpt$details = _formData$cpt.details) === null || _formData$cpt$details === void 0 ? void 0 : (_formData$cpt$details2 = _formData$cpt$details.address) === null || _formData$cpt$details2 === void 0 ? void 0 : _formData$cpt$details2.locality) || (formData === null || formData === void 0 ? void 0 : (_formData$address2 = formData.address) === null || _formData$address2 === void 0 ? void 0 : _formData$address2.locality);
   });
+  const [wards, setWards] = useState();
+  const [selectedWard, setSelectedWard] = useState(() => {
+    var _formData$address3;
+    return formData === null || formData === void 0 ? void 0 : (_formData$address3 = formData.address) === null || _formData$address3 === void 0 ? void 0 : _formData$address3.ward;
+  });
   useEffect(() => {
     if (cities) {
       if (cities.length === 1) {
@@ -1075,10 +1085,10 @@ const VendorSelectAddress = ({
   }, [cities]);
   useEffect(() => {
     if (selectedCity && fetchedLocalities) {
-      var _formData$address3, _formData$cpt2, _formData$cpt2$detail, _formData$cpt2$detail2, _property3, _property3$propertyDe, _property3$propertyDe2, _formData$address4;
+      var _formData$address4, _formData$cpt2, _formData$cpt2$detail, _formData$cpt2$detail2, _property3, _property3$propertyDe, _property3$propertyDe2, _formData$address5;
       let __localityList = fetchedLocalities;
       let filteredLocalityList = [];
-      if (formData !== null && formData !== void 0 && (_formData$address3 = formData.address) !== null && _formData$address3 !== void 0 && _formData$address3.locality) {
+      if (formData !== null && formData !== void 0 && (_formData$address4 = formData.address) !== null && _formData$address4 !== void 0 && _formData$address4.locality) {
         setSelectedLocality(formData.address.locality);
       } else if (formData !== null && formData !== void 0 && (_formData$cpt2 = formData.cpt) !== null && _formData$cpt2 !== void 0 && (_formData$cpt2$detail = _formData$cpt2.details) !== null && _formData$cpt2$detail !== void 0 && (_formData$cpt2$detail2 = _formData$cpt2$detail.address) !== null && _formData$cpt2$detail2 !== void 0 && _formData$cpt2$detail2.locality) {
         setSelectedLocality(formData.cpt.details.address.locality);
@@ -1086,13 +1096,13 @@ const VendorSelectAddress = ({
         var _property4, _property4$propertyDe, _property4$propertyDe2;
         setSelectedLocality((_property4 = property) === null || _property4 === void 0 ? void 0 : (_property4$propertyDe = _property4.propertyDetails) === null || _property4$propertyDe === void 0 ? void 0 : (_property4$propertyDe2 = _property4$propertyDe.address) === null || _property4$propertyDe2 === void 0 ? void 0 : _property4$propertyDe2.locality);
       }
-      if (formData !== null && formData !== void 0 && (_formData$address4 = formData.address) !== null && _formData$address4 !== void 0 && _formData$address4.pincode) {
-        var _formData$address5;
+      if (formData !== null && formData !== void 0 && (_formData$address5 = formData.address) !== null && _formData$address5 !== void 0 && _formData$address5.pincode) {
+        var _formData$address6;
         filteredLocalityList = __localityList.filter(obj => {
           var _obj$pincode;
           return (_obj$pincode = obj.pincode) === null || _obj$pincode === void 0 ? void 0 : _obj$pincode.find(item => item == formData.address.pincode);
         });
-        if (!(formData !== null && formData !== void 0 && (_formData$address5 = formData.address) !== null && _formData$address5 !== void 0 && _formData$address5.locality)) setSelectedLocality();
+        if (!(formData !== null && formData !== void 0 && (_formData$address6 = formData.address) !== null && _formData$address6 !== void 0 && _formData$address6.locality)) setSelectedLocality();
       }
       if (userType === "employee") {
         onSelect(config.key, {
@@ -1112,9 +1122,20 @@ const VendorSelectAddress = ({
       }
     }
   }, [selectedCity, formData === null || formData === void 0 ? void 0 : (_formData$cpt3 = formData.cpt) === null || _formData$cpt3 === void 0 ? void 0 : (_formData$cpt3$detail = _formData$cpt3.details) === null || _formData$cpt3$detail === void 0 ? void 0 : _formData$cpt3$detail.address, fetchedLocalities]);
+  useEffect(() => {
+    if (selectedCity && fetchedWards) {
+      var _formData$address7;
+      if (formData !== null && formData !== void 0 && (_formData$address7 = formData.address) !== null && _formData$address7 !== void 0 && _formData$address7.ward) {
+        setSelectedWard(formData.address.ward);
+      }
+      setWards(fetchedWards);
+    }
+  }, [selectedCity, fetchedWards]);
   function selectCity(city) {
     setSelectedLocality(null);
     setLocalities(null);
+    setSelectedWard(null);
+    setWards(null);
     Digit.SessionStorage.set("fsm.file.address.city", city);
     setSelectedCity(city);
   }
@@ -1123,6 +1144,17 @@ const VendorSelectAddress = ({
     if (userType === "employee") {
       onSelect(config.key, {
         ...formData[config.key],
+        locality: selectedLocality,
+        ward: selectedWard
+      });
+    }
+  }
+  function selectWard(ward) {
+    setSelectedWard(ward);
+    if (userType === "employee") {
+      onSelect(config.key, {
+        ...formData[config.key],
+        ward: ward,
         locality: selectedLocality
       });
     }
@@ -1130,7 +1162,8 @@ const VendorSelectAddress = ({
   function onSubmit() {
     onSelect(config.key, {
       city: selectedCity,
-      locality: selectedLocality
+      locality: selectedLocality,
+      ward: selectedWard
     });
   }
   if (userType === "employee") {
@@ -1143,6 +1176,14 @@ const VendorSelectAddress = ({
       select: selectCity,
       optionKey: "code",
       t: t
+    })), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("ES_NEW_APPLICATION_LOCATION_WARD"), config.isMandatory ? " * " : null), /*#__PURE__*/React.createElement(Dropdown$2, {
+      className: "",
+      isMandatory: true,
+      selected: selectedWard,
+      option: wards,
+      select: selectWard,
+      optionKey: "name",
+      t: t
     })), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("ES_NEW_APPLICATION_LOCATION_MOHALLA"), config.isMandatory ? " * " : null), /*#__PURE__*/React.createElement(Dropdown$2, {
       className: "",
       isMandatory: true,
@@ -1157,13 +1198,20 @@ const VendorSelectAddress = ({
     config: config,
     onSelect: onSubmit,
     t: t,
-    isDisabled: selectedLocality ? false : true
+    isDisabled: selectedLocality && selectedWard ? false : true
   }, /*#__PURE__*/React.createElement(CardLabel, null, `${t("MYCITY_CODE_LABEL")} *`), /*#__PURE__*/React.createElement(RadioOrSelect, {
     options: cities,
     selectedOption: selectedCity,
     optionKey: "i18nKey",
     onSelect: selectCity,
     t: t
+  }), selectedCity && wards && /*#__PURE__*/React.createElement(CardLabel, null, `${t("ES_NEW_APPLICATION_LOCATION_WARD")} *`), selectedCity && wards && /*#__PURE__*/React.createElement(RadioOrSelect, {
+    isMandatory: config.isMandatory,
+    options: wards,
+    selectedOption: selectedWard,
+    optionKey: "name",
+    onSelect: selectWard,
+    t: t
   }), selectedCity && localities && /*#__PURE__*/React.createElement(CardLabel, null, `${t("CS_CREATECOMPLAINT_MOHALLA")} *`), selectedCity && localities && /*#__PURE__*/React.createElement(RadioOrSelect, {
     isMandatory: config.isMandatory,
     options: localities,
@@ -3865,7 +3913,6 @@ const SelectServiceType = ({
   formData
 }) => {
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const stateId = Digit.ULBService.getStateId();
   const [serviceTypes, setserviceTypes] = useState(formData === null || formData === void 0 ? void 0 : formData.serviceType);
   const [formattedServiceTypes, setFormattedServiceTypes] = useState([]);
   const {
@@ -4349,7 +4396,10 @@ const SupervisorAreaAssignment = ({
     },
     optionsKey: "name",
     t: t,
-    disable: !selectedWard
+    disable: !selectedWard,
+    ServerStyle: {
+      backgroundColor: "#fff"
+    }
   })));
 };
 
@@ -4367,8 +4417,8 @@ const CitizenVendorApp = () => {
       icon: HomeIcon,
       path: "/digit-ui/citizen"
     }, {
-      label: t("WT_MODULE_NAME"),
-      path: `${path}/wt-Vendor`
+      label: t("CITIZEN_VENDOR"),
+      path: `${path}/citizen-Vendor`
     }];
     if (pathname.includes("/inbox")) {
       let label = "ES_COMMON_INBOX";
@@ -4596,8 +4646,8 @@ const CitizenVendorApp = () => {
       to: {
         pathname: `/digit-ui/citizen/login`,
         state: {
-          from: `${path}/wt-Vendor`,
-          role: "WT_VENDOR"
+          from: `${path}`,
+          role: "CITIZEN_VENDOR"
         }
       }
     }),
@@ -5299,12 +5349,6 @@ const VendorConfig = (t, disabled = false, formData = {}) => {
       type: "component",
       key: "zoneIds",
       component: "SelectEkycZones"
-    }, {
-      label: "ES_VENDOR_CLUSTER",
-      isMandatory: true,
-      type: "component",
-      key: "clusterIds",
-      component: "SelectEkycClusters"
     }, {
       label: "ES_FSM_REGISTRY_NEW_OWNER_NAME",
       isMandatory: true,
@@ -5383,7 +5427,6 @@ const AddVendor = ({
   const history = useHistory();
   const [currentStep, setCurrentStep] = useState(1);
   const [showToast, setShowToast] = useState(null);
-  const [canSubmit, setCanSubmit] = useState(false);
   const [, setMutationHappened] = Digit.Hooks.useSessionStorage("FSM_MUTATION_HAPPENED", false);
   const [,, clearError] = Digit.Hooks.useSessionStorage("FSM_ERROR_DATA", false);
   const [,, clearSuccessData] = Digit.Hooks.useSessionStorage("FSM_MUTATION_SUCCESS_DATA", false);
@@ -5410,23 +5453,26 @@ const AddVendor = ({
   const [formData, setFormData] = useState(defaultValues);
   const Config = VendorConfig(t, false, formData);
   const onFormValueChange = (setValue, data) => {
-    var _data$serviceType, _formData$serviceType, _data$serviceType2, _data$serviceType3, _data$address, _data$address2;
-    if ((data === null || data === void 0 ? void 0 : (_data$serviceType = data.serviceType) === null || _data$serviceType === void 0 ? void 0 : _data$serviceType.code) !== (formData === null || formData === void 0 ? void 0 : (_formData$serviceType = formData.serviceType) === null || _formData$serviceType === void 0 ? void 0 : _formData$serviceType.code) || JSON.stringify(data === null || data === void 0 ? void 0 : data.zoneIds) !== JSON.stringify(formData === null || formData === void 0 ? void 0 : formData.zoneIds)) {
-      setFormData(data);
-    }
-    const isEkyc = (data === null || data === void 0 ? void 0 : (_data$serviceType2 = data.serviceType) === null || _data$serviceType2 === void 0 ? void 0 : _data$serviceType2.code) === "EKYC";
-    const isVendorDetailsFilled = (data === null || data === void 0 ? void 0 : data.vendorName) && (data === null || data === void 0 ? void 0 : data.phone) && (data === null || data === void 0 ? void 0 : (_data$serviceType3 = data.serviceType) === null || _data$serviceType3 === void 0 ? void 0 : _data$serviceType3.code);
-    const isAddressFilled = (data === null || data === void 0 ? void 0 : (_data$address = data.address) === null || _data$address === void 0 ? void 0 : _data$address.city) && (data === null || data === void 0 ? void 0 : (_data$address2 = data.address) === null || _data$address2 === void 0 ? void 0 : _data$address2.locality);
-    let isEkycFieldsFilled = true;
-    if (isEkyc) {
-      var _data$zoneIds, _data$clusterIds;
-      isEkycFieldsFilled = (data === null || data === void 0 ? void 0 : data.ownerName) && (data === null || data === void 0 ? void 0 : data.contractStartDate) && (data === null || data === void 0 ? void 0 : data.contractEndDate) && (data === null || data === void 0 ? void 0 : (_data$zoneIds = data.zoneIds) === null || _data$zoneIds === void 0 ? void 0 : _data$zoneIds.length) > 0 && (data === null || data === void 0 ? void 0 : (_data$clusterIds = data.clusterIds) === null || _data$clusterIds === void 0 ? void 0 : _data$clusterIds.length) > 0 && (data === null || data === void 0 ? void 0 : data.fatherOrHusbandName) && (data === null || data === void 0 ? void 0 : data.gender) && (data === null || data === void 0 ? void 0 : data.dob) && (data === null || data === void 0 ? void 0 : data.relationship);
+    var _data$zoneIds, _data$serviceType, _formData$serviceType, _data$serviceType2;
+    const currentZoneCodes = (data === null || data === void 0 ? void 0 : (_data$zoneIds = data.zoneIds) === null || _data$zoneIds === void 0 ? void 0 : _data$zoneIds.map(item => {
+      var _item$;
+      return item === null || item === void 0 ? void 0 : (_item$ = item[1]) === null || _item$ === void 0 ? void 0 : _item$.code;
+    })) || [];
+    const previousZoneCodes = (formData === null || formData === void 0 ? void 0 : formData.zoneIds) || [];
+    const zoneChanged = currentZoneCodes.join(",") !== previousZoneCodes.join(",");
+    if ((data === null || data === void 0 ? void 0 : (_data$serviceType = data.serviceType) === null || _data$serviceType === void 0 ? void 0 : _data$serviceType.code) !== (formData === null || formData === void 0 ? void 0 : (_formData$serviceType = formData.serviceType) === null || _formData$serviceType === void 0 ? void 0 : _formData$serviceType.code) || zoneChanged) {
+      setFormData(prev => ({
+        ...prev,
+        serviceType: data === null || data === void 0 ? void 0 : data.serviceType
+      }));
     }
-    if (isVendorDetailsFilled && isAddressFilled && isEkycFieldsFilled) {
-      setCanSubmit(true);
-    } else {
-      setCanSubmit(false);
+    if (zoneChanged) {
+      setFormData(prev => ({
+        ...prev,
+        zoneIds: currentZoneCodes
+      }));
     }
+    const isVendorDetailsFilled = (data === null || data === void 0 ? void 0 : data.vendorName) && (data === null || data === void 0 ? void 0 : data.phone) && (data === null || data === void 0 ? void 0 : (_data$serviceType2 = data.serviceType) === null || _data$serviceType2 === void 0 ? void 0 : _data$serviceType2.code);
     if (isVendorDetailsFilled) {
       if (currentStep === 1) {
         setCurrentStep(2);
@@ -5461,23 +5507,26 @@ 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$serviceTy, _mergedData$address8, _mergedData$address9, _mergedData$relations, _mergedData$gender, _mergedData$serviceTy2;
+    var _address$city, _address$city2, _address$city3, _address$city4, _address$locality, _address$locality2, _address$ward, _address$ward2, _mergedData$plotNo, _mergedData$buildingN, _mergedData$serviceTy, _mergedData$address, _mergedData$address2, _mergedData$relations, _mergedData$gender, _mergedData$serviceTy2;
+    console.log("-=-=-=-=-=-==-", data);
     const mergedData = data;
-    console.log(mergedData);
+    const address = mergedData === null || mergedData === void 0 ? void 0 : mergedData.propertyAddress;
+    const pincode = address === null || address === void 0 ? void 0 : address.pincode;
+    const street = address === null || address === void 0 ? void 0 : address.streetName;
+    const doorNo = address === null || address === void 0 ? void 0 : address.houseNo;
+    const landmark = address === null || address === void 0 ? void 0 : address.landmark;
+    const city = address === null || address === void 0 ? void 0 : (_address$city = address.city) === null || _address$city === void 0 ? void 0 : _address$city.name;
+    const state = address === null || address === void 0 ? void 0 : (_address$city2 = address.city) === null || _address$city2 === void 0 ? void 0 : _address$city2.name;
+    const district = address === null || address === void 0 ? void 0 : (_address$city3 = address.city) === null || _address$city3 === void 0 ? void 0 : _address$city3.name;
+    const region = address === null || address === void 0 ? void 0 : (_address$city4 = address.city) === null || _address$city4 === void 0 ? void 0 : _address$city4.name;
+    const localityCode = address === null || address === void 0 ? void 0 : (_address$locality = address.locality) === null || _address$locality === void 0 ? void 0 : _address$locality.code;
+    const localityName = address === null || address === void 0 ? void 0 : (_address$locality2 = address.locality) === null || _address$locality2 === void 0 ? void 0 : _address$locality2.name;
+    const localityArea = address === null || address === void 0 ? void 0 : address.subLocality;
+    const wardCode = address === null || address === void 0 ? void 0 : (_address$ward = address.ward) === null || _address$ward === void 0 ? void 0 : _address$ward.code;
+    const wardName = address === null || address === void 0 ? void 0 : (_address$ward2 = address.ward) === null || _address$ward2 === void 0 ? void 0 : _address$ward2.name;
     const name = mergedData === null || mergedData === void 0 ? void 0 : mergedData.vendorName;
-    const pincode = mergedData === null || mergedData === void 0 ? void 0 : mergedData.pincode;
-    const street = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$street = mergedData.street) === null || _mergedData$street === void 0 ? void 0 : _mergedData$street.trim();
-    const doorNo = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$doorNo = mergedData.doorNo) === null || _mergedData$doorNo === void 0 ? void 0 : _mergedData$doorNo.trim();
     const plotNo = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$plotNo = mergedData.plotNo) === null || _mergedData$plotNo === void 0 ? void 0 : _mergedData$plotNo.trim();
-    const landmark = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$landmark = mergedData.landmark) === null || _mergedData$landmark === void 0 ? void 0 : _mergedData$landmark.trim();
-    const city = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$address = mergedData.address) === null || _mergedData$address === void 0 ? void 0 : (_mergedData$address$c = _mergedData$address.city) === null || _mergedData$address$c === void 0 ? void 0 : _mergedData$address$c.name;
-    const state = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$address2 = mergedData.address) === null || _mergedData$address2 === void 0 ? void 0 : (_mergedData$address2$ = _mergedData$address2.city) === null || _mergedData$address2$ === void 0 ? void 0 : _mergedData$address2$.state;
-    const district = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$address3 = mergedData.address) === null || _mergedData$address3 === void 0 ? void 0 : (_mergedData$address3$ = _mergedData$address3.city) === null || _mergedData$address3$ === void 0 ? void 0 : _mergedData$address3$.name;
-    const region = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$address4 = mergedData.address) === null || _mergedData$address4 === void 0 ? void 0 : (_mergedData$address4$ = _mergedData$address4.city) === null || _mergedData$address4$ === void 0 ? void 0 : _mergedData$address4$.name;
     const buildingName = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$buildingN = mergedData.buildingName) === null || _mergedData$buildingN === void 0 ? void 0 : _mergedData$buildingN.trim();
-    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 emailId = mergedData === null || mergedData === void 0 ? void 0 : mergedData.emailId;
     const phone = mergedData === null || mergedData === void 0 ? void 0 : mergedData.phone;
     const isEkyc = (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$serviceTy = mergedData.serviceType) === null || _mergedData$serviceTy === void 0 ? void 0 : _mergedData$serviceTy.code) === "EKYC";
@@ -5505,9 +5554,13 @@ const AddVendor = ({
           label: "Locality",
           area: localityArea || ""
         },
+        ward: wardCode ? {
+          code: wardCode,
+          name: wardName
+        } : undefined,
         geoLocation: {
-          latitude: (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$address8 = mergedData.address) === null || _mergedData$address8 === void 0 ? void 0 : _mergedData$address8.latitude) || 28.6139,
-          longitude: (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$address9 = mergedData.address) === null || _mergedData$address9 === void 0 ? void 0 : _mergedData$address9.longitude) || 77.209
+          latitude: (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$address = mergedData.address) === null || _mergedData$address === void 0 ? void 0 : _mergedData$address.latitude) || 28.6139,
+          longitude: (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$address2 = mergedData.address) === null || _mergedData$address2 === void 0 ? void 0 : _mergedData$address2.longitude) || 77.209
         }
       },
       owner: {
@@ -5516,7 +5569,7 @@ const AddVendor = ({
         fatherOrHusbandName: (mergedData === null || mergedData === void 0 ? void 0 : mergedData.fatherOrHusbandName) || name,
         relationship: (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$relations = mergedData.relationship) === null || _mergedData$relations === void 0 ? void 0 : _mergedData$relations.code) || "OTHER",
         gender: (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$gender = mergedData.gender) === null || _mergedData$gender === void 0 ? void 0 : _mergedData$gender.code) || "MALE",
-        dob: mergedData !== null && mergedData !== void 0 && mergedData.dob ? (new Date(mergedData.dob).getTime() / 1000).toString() : "915148800",
+        dob: mergedData !== null && mergedData !== void 0 && mergedData.dob ? new Date(mergedData.dob).getTime() : new Date(`1/1/1970`).getTime(),
         emailId: emailId || "",
         mobileNumber: phone
       },
@@ -5531,12 +5584,47 @@ const AddVendor = ({
       var _mergedData$zoneIds, _mergedData$clusterId;
       vendorData = {
         ...vendorData,
-        zoneIds: (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$zoneIds = mergedData.zoneIds) === null || _mergedData$zoneIds === void 0 ? void 0 : _mergedData$zoneIds.map(z => z.code)) || [],
-        clusterIds: (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$clusterId = mergedData.clusterIds) === null || _mergedData$clusterId === void 0 ? void 0 : _mergedData$clusterId.map(c => c.code)) || [],
+        zoneIds: (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$zoneIds = mergedData.zoneIds) === null || _mergedData$zoneIds === void 0 ? void 0 : _mergedData$zoneIds.map(z => {
+          var _z$;
+          return z === null || z === void 0 ? void 0 : (_z$ = z[1]) === null || _z$ === void 0 ? void 0 : _z$.code;
+        })) || [],
+        clusterIds: (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$clusterId = mergedData.clusterIds) === null || _mergedData$clusterId === void 0 ? void 0 : _mergedData$clusterId.map(c => {
+          var _c$;
+          return c === null || c === void 0 ? void 0 : (_c$ = c[1]) === null || _c$ === void 0 ? void 0 : _c$.code;
+        })) || [],
         contractStartDate: mergedData.contractStartDate ? new Date(mergedData.contractStartDate).getTime() : null,
         contractEndDate: mergedData.contractEndDate ? new Date(mergedData.contractEndDate).getTime() : null
       };
     }
+    console.log(vendorData);
+    const payload = {
+      vendor: vendorData
+    };
+    if (isEkyc) {
+      payload.RequestInfo = {
+        apiId: "Rainmaker",
+        msgId: "ekyc-vendor-create"
+      };
+    }
+    mutate(payload, {
+      onError: error => {
+        setShowToast({
+          key: "error",
+          action: error
+        });
+        setTimeout(closeToast, 5000);
+      },
+      onSuccess: (data, variables) => {
+        setShowToast({
+          key: "success",
+          action: "ADD_VENDOR"
+        });
+        setTimeout(() => {
+          closeToast();
+          history.push("/digit-ui/employee/vendor/search-vendor");
+        }, 2000);
+      }
+    });
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(VerticalTimeline, {
     config: [{
@@ -5567,8 +5655,7 @@ const AddVendor = ({
     onSubmit: onSubmit,
     defaultValues: defaultValues,
     noCard: true,
-    noBreakLine: true,
-    isDisabled: !canSubmit
+    noBreakLine: true
   }), showToast && /*#__PURE__*/React.createElement(Toast, {
     error: showToast.key === "error",
     label: t(showToast.key === "success" ? `ES_FSM_REGISTRY_${showToast.action}_SUCCESS` : showToast.action),
@@ -5630,18 +5717,6 @@ const SupervisorConfig = (t, agencies = [], reportingManagers = [], disabled = f
         defaultValue: "",
         className: "payment-form-text-input-correction"
       }
-    }, {
-      label: t("ES_VENDOR_SUPERVISOR_EMPLOYEE_ID"),
-      isMandatory: true,
-      type: "text",
-      populators: {
-        name: "employeeId",
-        validation: {
-          required: true
-        },
-        defaultValue: "",
-        className: "payment-form-text-input-correction"
-      }
     }, {
       label: t("ES_VENDOR_SUPERVISOR_GENDER"),
       isMandatory: true,
@@ -5766,7 +5841,6 @@ const AddSupervisor = ({
   } = useLocation();
   const queryParams = new URLSearchParams(search);
   const vendorIdParam = queryParams.get("vendorId");
-  const vendorId = vendorIdParam || (userInfo === null || userInfo === void 0 ? void 0 : userInfo.uuid);
   const Config = SupervisorConfig(t);
   const defaultValues = {
     role: {
@@ -5810,7 +5884,6 @@ const AddSupervisor = ({
       },
       supervisor: {
         tenantId: tenantId,
-        vendorId: vendorId,
         assignedZoneId: (data === null || data === void 0 ? void 0 : (_data$assignedZone = data.assignedZone) === null || _data$assignedZone === void 0 ? void 0 : _data$assignedZone.code) || (data === null || data === void 0 ? void 0 : data.assignedZone) || null,
         description: (data === null || data === void 0 ? void 0 : data.description) || "",
         owner: {
@@ -6566,16 +6639,6 @@ const SurveyorConfig = (t, agencies = [], reportingManagers = [], disabled = fal
         },
         error: t("ES_VENDOR_INVALID_EMAIL")
       }
-    }, {
-      label: "ES_VENDOR_SURVEYOR_STAFF_CODE",
-      isMandatory: true,
-      type: "text",
-      populators: {
-        name: "employeeId",
-        validation: {
-          required: true
-        }
-      }
     }, {
       label: t("ES_VENDOR_SURVEYOR_GENDER"),
       isMandatory: true,
@@ -9483,18 +9546,26 @@ const SelectEkycZones = ({
     }
   }, [boundaryData, isLoading]);
   const handleSelect = value => {
-    setSelectedZones(value);
-    onSelect(config.key, value);
+    const extractedValue = Array.isArray(value) ? value.map(v => Array.isArray(v) ? v[1] : v).filter(Boolean) : value;
+    setSelectedZones(extractedValue);
+    onSelect(config.key, extractedValue);
   };
   if (isLoading) return /*#__PURE__*/React.createElement(Loader, null);
   return /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t(config.label) + (config.isMandatory ? " *" : "")), /*#__PURE__*/React.createElement("div", {
-    className: "field"
+    className: "field",
+    style: {
+      position: "relative",
+      zIndex: 10
+    }
   }, /*#__PURE__*/React.createElement(MultiSelectDropdown, {
     options: zones,
     selected: selectedZones,
     onSelect: handleSelect,
     optionsKey: "name",
-    t: t
+    t: t,
+    ServerStyle: {
+      backgroundColor: "#fff"
+    }
   })));
 };
 
@@ -9577,23 +9648,33 @@ const SelectEkycClusters = ({
         }];
       }
     }
-    setClusters(prev => {
-      const same = JSON.stringify(prev) === JSON.stringify(allClusters);
-      return same ? prev : allClusters;
-    });
-  }, [formData === null || formData === void 0 ? void 0 : formData.zoneIds, boundaryData]);
+    if (allClusters.length > 0) {
+      allClusters = Array.from(new Map(allClusters.map(item => [item.code, item])).values());
+    }
+    setClusters(allClusters);
+  }, [selectedZones, boundaryData]);
   const handleSelect = value => {
-    setSelectedClusters(value);
-    onSelect(config.key, value);
+    const extractedValue = Array.isArray(value) ? value.map(v => Array.isArray(v) ? v[1] : v).filter(Boolean) : value;
+    setSelectedClusters(extractedValue);
+    onSelect(config.key, extractedValue);
   };
+  const isDisabled = selectedZones.length === 0;
   return /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t(config.label) + (config.isMandatory ? " *" : "")), /*#__PURE__*/React.createElement("div", {
-    className: "field"
+    className: "field",
+    style: {
+      position: "relative",
+      zIndex: 9
+    }
   }, /*#__PURE__*/React.createElement(MultiSelectDropdown, {
     options: clusters,
     selected: selectedClusters,
     onSelect: handleSelect,
     optionsKey: "name",
-    t: t
+    t: t,
+    ServerStyle: {
+      backgroundColor: "#fff"
+    },
+    disable: isDisabled
   })));
 };