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

package/dist/index.modern.js

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useMemo, useCallback } from 'react';
 import { useLocation, Switch, useHistory, useParams, Link, useRouteMatch, Redirect, Route } from 'react-router-dom';
-import { AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, HomeIcon, PropertyHouse, EmployeeModuleCard, VerticalTimeline, FormStep, LabelFieldPair, CardLabel, CustomTooltip, TextInput, MobileNumber, Dropdown as Dropdown$2, UploadFile, Toast, Loader, Card, ActionBar, SubmitBar, RadioOrSelect, Header, SearchForm, SearchField, CardLabelError, DatePicker as DatePicker$4, Table, ShippingTruck, CheckBox, RadioButtons, CloseSvg, Localities, RemoveableTag, ApplyFilterBar, AddIcon, Menu, LinkLabel, ViewsIcon, ToggleSwitch, Modal, MdClose, MultiSelectDropdown, CitizenHomeCard, CardSectionHeader, Row, EditIcon, DeleteIcon, CardText, FormComposer, CardHeader, CardSubHeader, StatusTable, LinkButton, Banner, InfoIcon } from '@djb25/digit-ui-react-components';
+import { AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, HomeIcon, PropertyHouse, EmployeeModuleCard, VerticalTimeline, FormStep, LabelFieldPair, CardLabel, CustomTooltip, TextInput, MobileNumber, Dropdown as Dropdown$1, UploadFile, Toast, Loader, Card, ActionBar, SubmitBar, RadioOrSelect, Header, SearchForm, SearchField, CardLabelError, DatePicker as DatePicker$4, Table, ShippingTruck, CheckBox, RadioButtons, CloseSvg, Localities, RemoveableTag, ApplyFilterBar, AddIcon, Menu, LinkLabel, ViewsIcon, ToggleSwitch, Modal, MdClose, MultiSelectDropdown, CitizenHomeCard, CardSectionHeader, Row, EditIcon, DeleteIcon, CardText, FormComposer, CardHeader, CardSubHeader, StatusTable, LinkButton, Banner, InfoIcon } from '@djb25/digit-ui-react-components';
 import { useTranslation } from 'react-i18next';
 import { useForm, Controller } from 'react-hook-form';
 import { useQueryClient } from 'react-query';
@@ -697,7 +697,7 @@ const VendorDetails = ({
     rules: {
       required: t("CORE_COMMON_REQUIRED_ERRMSG")
     },
-    render: props => /*#__PURE__*/React.createElement(Dropdown$2, {
+    render: props => /*#__PURE__*/React.createElement(Dropdown$1, {
       selected: VendorType,
       select: setVendorType,
       option: [{
@@ -737,7 +737,7 @@ const VendorDetails = ({
     rules: {
       required: t("CORE_COMMON_REQUIRED_ERRMSG")
     },
-    render: props => /*#__PURE__*/React.createElement(Dropdown$2, {
+    render: props => /*#__PURE__*/React.createElement(Dropdown$1, {
       selected: VendorCategory,
       select: setVendorCategory,
       option: [{
@@ -777,7 +777,7 @@ const VendorDetails = ({
     rules: {
       required: t("CORE_COMMON_REQUIRED_ERRMSG")
     },
-    render: props => /*#__PURE__*/React.createElement(Dropdown$2, {
+    render: props => /*#__PURE__*/React.createElement(Dropdown$1, {
       selected: Status,
       select: setStatus,
       option: [{
@@ -942,7 +942,7 @@ const convertEpochToDate = (dateEpoch, businessService) => {
   }
 };
 const VendorData = data => {
-  var _data$vendordet, _data$vendordet2, _data$vendordet3, _data$vendordet4, _data$vendordet5, _data$vendordet6, _data$vendordet7, _data$vendordet8, _data$vendordet9, _data$vendordet0, _data$vendordet1, _data$vendordet10, _data$vendordet11, _data$vendordet12, _data$vendordet13, _data$vendordet13$Sta, _data$vendordet14, _data$vendordet14$Ven, _data$vendordet15, _data$vendordet16, _data$vendordet17, _data$vendordet17$Ven, _data$documents, _data$vendordet18, _data$vendordet19;
+  var _data$vendordet, _data$vendordet2, _data$vendordet3, _data$vendordet4, _data$vendordet5, _data$vendordet6, _data$vendordet7, _data$vendordet8, _data$vendordet9, _data$vendordet0, _data$vendordet1, _data$vendordet10, _data$vendordet11, _data$vendordet12, _data$vendordet13, _data$vendordet13$Sta, _data$vendordet14, _data$vendordet14$Ven, _data$vendordet15, _data$vendordet16, _data$vendordet16$Ven, _data$documents, _data$vendordet17, _data$vendordet18;
   const formdata = {
     VendorAdditionalDetails: {
       tenantId: Digit.ULBService.getCurrentTenantId(),
@@ -965,14 +965,14 @@ const VendorData = data => {
       registrationNo: data === null || data === void 0 ? void 0 : (_data$vendordet12 = data.vendordet) === null || _data$vendordet12 === void 0 ? void 0 : _data$vendordet12.RegistrationNo,
       status: data === null || data === void 0 ? void 0 : (_data$vendordet13 = data.vendordet) === null || _data$vendordet13 === void 0 ? void 0 : (_data$vendordet13$Sta = _data$vendordet13.Status) === null || _data$vendordet13$Sta === void 0 ? void 0 : _data$vendordet13$Sta.code,
       vendorCategory: data === null || data === void 0 ? void 0 : (_data$vendordet14 = data.vendordet) === null || _data$vendordet14 === void 0 ? void 0 : (_data$vendordet14$Ven = _data$vendordet14.VendorCategory) === null || _data$vendordet14$Ven === void 0 ? void 0 : _data$vendordet14$Ven.code,
-      vendorId: data === null || data === void 0 ? void 0 : (_data$vendordet15 = data.vendordet) === null || _data$vendordet15 === void 0 ? void 0 : _data$vendordet15.VendorId,
-      gstTinNo: data === null || data === void 0 ? void 0 : (_data$vendordet16 = data.vendordet) === null || _data$vendordet16 === void 0 ? void 0 : _data$vendordet16.GstNo,
-      serviceType: data === null || data === void 0 ? void 0 : (_data$vendordet17 = data.vendordet) === null || _data$vendordet17 === void 0 ? void 0 : (_data$vendordet17$Ven = _data$vendordet17.VendorType) === null || _data$vendordet17$Ven === void 0 ? void 0 : _data$vendordet17$Ven.code,
+      vendorId: data === null || data === void 0 ? void 0 : data.vendor_id,
+      gstTinNo: data === null || data === void 0 ? void 0 : (_data$vendordet15 = data.vendordet) === null || _data$vendordet15 === void 0 ? void 0 : _data$vendordet15.GstNo,
+      serviceType: data === null || data === void 0 ? void 0 : (_data$vendordet16 = data.vendordet) === null || _data$vendordet16 === void 0 ? void 0 : (_data$vendordet16$Ven = _data$vendordet16.VendorType) === null || _data$vendordet16$Ven === void 0 ? void 0 : _data$vendordet16$Ven.code,
       documents: data === null || data === void 0 ? void 0 : (_data$documents = data.documents) === null || _data$documents === void 0 ? void 0 : _data$documents.documents,
       active: null,
       vendorAdditionalDetailsId: null,
-      vendorGroup: (data === null || data === void 0 ? void 0 : (_data$vendordet18 = data.vendordet) === null || _data$vendordet18 === void 0 ? void 0 : _data$vendordet18.vendorGroup) || "N/A",
-      vendorType: (data === null || data === void 0 ? void 0 : (_data$vendordet19 = data.vendordet) === null || _data$vendordet19 === void 0 ? void 0 : _data$vendordet19.vendorType) || "N/A"
+      vendorGroup: (data === null || data === void 0 ? void 0 : (_data$vendordet17 = data.vendordet) === null || _data$vendordet17 === void 0 ? void 0 : _data$vendordet17.vendorGroup) || "N/A",
+      vendorType: (data === null || data === void 0 ? void 0 : (_data$vendordet18 = data.vendordet) === null || _data$vendordet18 === void 0 ? void 0 : _data$vendordet18.vendorType) || "N/A"
     }
   };
   return formdata;
@@ -1167,7 +1167,7 @@ const VendorSelectAddress = ({
     });
   }
   if (userType === "employee") {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("MYCITY_CODE_LABEL"), config.isMandatory ? " * " : null), /*#__PURE__*/React.createElement(Dropdown$2, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("MYCITY_CODE_LABEL"), config.isMandatory ? " * " : null), /*#__PURE__*/React.createElement(Dropdown$1, {
       className: "",
       isMandatory: true,
       selected: (cities === null || cities === void 0 ? void 0 : cities.length) === 1 ? cities[0] : selectedCity,
@@ -1176,7 +1176,7 @@ 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, {
+    })), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("ES_NEW_APPLICATION_LOCATION_WARD"), config.isMandatory ? " * " : null), /*#__PURE__*/React.createElement(Dropdown$1, {
       className: "",
       isMandatory: true,
       selected: selectedWard,
@@ -1184,7 +1184,7 @@ const VendorSelectAddress = ({
       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, {
+    })), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("ES_NEW_APPLICATION_LOCATION_MOHALLA"), config.isMandatory ? " * " : null), /*#__PURE__*/React.createElement(Dropdown$1, {
       className: "",
       isMandatory: true,
       selected: selectedLocality,
@@ -1350,7 +1350,7 @@ const VendorSearchApplication = ({
     name: "vendorName",
     render: field => {
       var _vendorData$vendor2;
-      return /*#__PURE__*/React.createElement(Dropdown$2, {
+      return /*#__PURE__*/React.createElement(Dropdown$1, {
         selected: field.value || "",
         select: field.onChange,
         onBlur: field.onBlur,
@@ -1893,7 +1893,7 @@ const DropdownStatus = ({
   applicationStatuses,
   areApplicationStatus
 }) => {
-  return areApplicationStatus ? /*#__PURE__*/React.createElement(Dropdown$2, {
+  return areApplicationStatus ? /*#__PURE__*/React.createElement(Dropdown$1, {
     option: applicationStatuses,
     optionKey: "name",
     selected: value,
@@ -1913,7 +1913,7 @@ const RegisteredVendorSearch = ({
   selectedTab,
   matchedRoles
 }) => {
-  var _matchedRoles$wt, _matchedRoles$wt2, _matchedRoles$ekyc, _matchedRoles$ekyc2, _matchedRoles$ekyc3, _matchedRoles$wt3, _matchedRoles$wt4, _matchedRoles$ekyc4, _matchedRoles$ekyc5, _matchedRoles$ekyc6;
+  var _matchedRoles$wt, _matchedRoles$wt2, _matchedRoles$ekyc, _matchedRoles$ekyc2, _matchedRoles$wt3, _matchedRoles$ekyc3, _matchedRoles$wt4, _matchedRoles$wt5, _matchedRoles$ekyc4, _matchedRoles$ekyc5, _matchedRoles$ekyc6, _matchedRoles$ekyc7;
   const storedSearchParams = isInboxPage ? Digit.SessionStorage.get("vendor/inbox/searchParams") : Digit.SessionStorage.get("vendor/search/searchParams");
   const {
     t
@@ -2010,7 +2010,7 @@ const RegisteredVendorSearch = ({
         });
       case "dropdown":
         return /*#__PURE__*/React.createElement(Controller, {
-          render: props => /*#__PURE__*/React.createElement(Dropdown$2, {
+          render: props => /*#__PURE__*/React.createElement(Dropdown$1, {
             option: input.options,
             optionKey: input.optionsKey,
             value: props.value,
@@ -2037,7 +2037,7 @@ const RegisteredVendorSearch = ({
   };
   const userInfo = Digit.SessionStorage.get("User");
   const userType = userInfo.info.type;
-  const vendorItems = [...(matchedRoles !== null && matchedRoles !== void 0 && (_matchedRoles$wt = matchedRoles.wt) !== null && _matchedRoles$wt !== void 0 && _matchedRoles$wt.includes("WT_VENDOR") ? ["VENDOR"] : []), ...(matchedRoles !== null && matchedRoles !== void 0 && (_matchedRoles$wt2 = matchedRoles.wt) !== null && _matchedRoles$wt2 !== void 0 && _matchedRoles$wt2.includes("WT_VENDOR") ? ["DRIVER", "VEHICLE"] : []), ...(matchedRoles !== null && matchedRoles !== void 0 && (_matchedRoles$ekyc = matchedRoles.ekyc) !== null && _matchedRoles$ekyc !== void 0 && _matchedRoles$ekyc.includes("EKYC_VENDOR") ? ["SUPERVISOR"] : []), ...(matchedRoles !== null && matchedRoles !== void 0 && (_matchedRoles$ekyc2 = matchedRoles.ekyc) !== null && _matchedRoles$ekyc2 !== void 0 && _matchedRoles$ekyc2.includes("EKYC_SUPERVISOR") || matchedRoles !== null && matchedRoles !== void 0 && (_matchedRoles$ekyc3 = matchedRoles.ekyc) !== null && _matchedRoles$ekyc3 !== void 0 && _matchedRoles$ekyc3.includes("EKYC_VENDOR") ? ["SURVEYOR"] : [])];
+  const vendorItems = [...(matchedRoles !== null && matchedRoles !== void 0 && (_matchedRoles$wt = matchedRoles.wt) !== null && _matchedRoles$wt !== void 0 && _matchedRoles$wt.includes("WT_VENDOR") ? ["VENDOR"] : []), ...(matchedRoles !== null && matchedRoles !== void 0 && (_matchedRoles$wt2 = matchedRoles.wt) !== null && _matchedRoles$wt2 !== void 0 && _matchedRoles$wt2.includes("WT_VENDOR") ? ["DRIVER", "VEHICLE"] : []), ...(matchedRoles !== null && matchedRoles !== void 0 && (_matchedRoles$ekyc = matchedRoles.ekyc) !== null && _matchedRoles$ekyc !== void 0 && _matchedRoles$ekyc.includes("EKYC_VENDOR") ? ["SUPERVISOR"] : []), ...(matchedRoles !== null && matchedRoles !== void 0 && (_matchedRoles$ekyc2 = matchedRoles.ekyc) !== null && _matchedRoles$ekyc2 !== void 0 && _matchedRoles$ekyc2.includes("EKYC_SUPERVISOR") ? ["SURVEYOR"] : [])];
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "search-container"
   }, /*#__PURE__*/React.createElement("div", {
@@ -2053,31 +2053,31 @@ const RegisteredVendorSearch = ({
     onClick: onClose
   }, /*#__PURE__*/React.createElement(CloseSvg, null))), /*#__PURE__*/React.createElement("div", {
     className: "search-tabs-container"
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("button", {
+  }, /*#__PURE__*/React.createElement("div", null, ((matchedRoles === null || matchedRoles === void 0 ? void 0 : (_matchedRoles$wt3 = matchedRoles.wt) === null || _matchedRoles$wt3 === void 0 ? void 0 : _matchedRoles$wt3.includes("WT_VENDOR")) || (matchedRoles === null || matchedRoles === void 0 ? void 0 : (_matchedRoles$ekyc3 = matchedRoles.ekyc) === null || _matchedRoles$ekyc3 === void 0 ? void 0 : _matchedRoles$ekyc3.includes("EKYC_VENDOR"))) && /*#__PURE__*/React.createElement("button", {
     className: selectedTab === "VENDOR" ? "search-tab-head-selected" : "search-tab-head",
     onClick: () => {
       clearSearch();
       onTabChange("VENDOR");
     }
-  }, t("ES_FSM_REGISTRY_INBOX_TAB_VENDOR")), (matchedRoles === null || matchedRoles === void 0 ? void 0 : (_matchedRoles$wt3 = matchedRoles.wt) === null || _matchedRoles$wt3 === void 0 ? void 0 : _matchedRoles$wt3.includes("WT_VENDOR")) && /*#__PURE__*/React.createElement("button", {
+  }, t("ES_FSM_REGISTRY_INBOX_TAB_VENDOR")), (matchedRoles === null || matchedRoles === void 0 ? void 0 : (_matchedRoles$wt4 = matchedRoles.wt) === null || _matchedRoles$wt4 === void 0 ? void 0 : _matchedRoles$wt4.includes("WT_VENDOR")) && /*#__PURE__*/React.createElement("button", {
     className: selectedTab === "VEHICLE" ? "search-tab-head-selected" : "search-tab-head",
     onClick: () => {
       clearSearch();
       onTabChange("VEHICLE");
     }
-  }, t("ES_FSM_REGISTRY_INBOX_TAB_VEHICLE")), (matchedRoles === null || matchedRoles === void 0 ? void 0 : (_matchedRoles$wt4 = matchedRoles.wt) === null || _matchedRoles$wt4 === void 0 ? void 0 : _matchedRoles$wt4.includes("WT_VENDOR")) && /*#__PURE__*/React.createElement("button", {
+  }, t("ES_FSM_REGISTRY_INBOX_TAB_VEHICLE")), (matchedRoles === null || matchedRoles === void 0 ? void 0 : (_matchedRoles$wt5 = matchedRoles.wt) === null || _matchedRoles$wt5 === void 0 ? void 0 : _matchedRoles$wt5.includes("WT_VENDOR")) && /*#__PURE__*/React.createElement("button", {
     className: selectedTab === "DRIVER" ? "search-tab-head-selected" : "search-tab-head",
     onClick: () => {
       clearSearch();
       onTabChange("DRIVER");
     }
-  }, t("ES_FSM_REGISTRY_INBOX_TAB_DRIVER")), (matchedRoles === null || matchedRoles === void 0 ? void 0 : (_matchedRoles$ekyc4 = matchedRoles.ekyc) === null || _matchedRoles$ekyc4 === void 0 ? void 0 : _matchedRoles$ekyc4.includes("EKYC_VENDOR")) && /*#__PURE__*/React.createElement("button", {
+  }, t("ES_FSM_REGISTRY_INBOX_TAB_DRIVER")), ((matchedRoles === null || matchedRoles === void 0 ? void 0 : (_matchedRoles$ekyc4 = matchedRoles.ekyc) === null || _matchedRoles$ekyc4 === void 0 ? void 0 : _matchedRoles$ekyc4.includes("EKYC_VENDOR")) || (matchedRoles === null || matchedRoles === void 0 ? void 0 : (_matchedRoles$ekyc5 = matchedRoles.ekyc) === null || _matchedRoles$ekyc5 === void 0 ? void 0 : _matchedRoles$ekyc5.includes("EKYC_SUPERVISOR"))) && /*#__PURE__*/React.createElement("button", {
     className: selectedTab === "SUPERVISOR" ? "search-tab-head-selected" : "search-tab-head",
     onClick: () => {
       clearSearch();
       onTabChange("SUPERVISOR");
     }
-  }, t("ES_FSM_REGISTRY_INBOX_TAB_SUPERVISOR")), ((matchedRoles === null || matchedRoles === void 0 ? void 0 : (_matchedRoles$ekyc5 = matchedRoles.ekyc) === null || _matchedRoles$ekyc5 === void 0 ? void 0 : _matchedRoles$ekyc5.includes("EKYC_SUPERVISOR")) || (matchedRoles === null || matchedRoles === void 0 ? void 0 : (_matchedRoles$ekyc6 = matchedRoles.ekyc) === null || _matchedRoles$ekyc6 === void 0 ? void 0 : _matchedRoles$ekyc6.includes("EKYC_VENDOR"))) && /*#__PURE__*/React.createElement("button", {
+  }, t("ES_FSM_REGISTRY_INBOX_TAB_SUPERVISOR")), ((matchedRoles === null || matchedRoles === void 0 ? void 0 : (_matchedRoles$ekyc6 = matchedRoles.ekyc) === null || _matchedRoles$ekyc6 === void 0 ? void 0 : _matchedRoles$ekyc6.includes("EKYC_SUPERVISOR")) || (matchedRoles === null || matchedRoles === void 0 ? void 0 : (_matchedRoles$ekyc7 = matchedRoles.ekyc) === null || _matchedRoles$ekyc7 === void 0 ? void 0 : _matchedRoles$ekyc7.includes("EKYC_VENDOR"))) && /*#__PURE__*/React.createElement("button", {
     className: selectedTab === "SURVEYOR" ? "search-tab-head-selected" : "search-tab-head",
     onClick: () => {
       clearSearch();
@@ -2231,6 +2231,8 @@ const VendorInbox = props => {
   const userInfo = Digit.SessionStorage.get("User");
   const userRoles = userInfo.info.roles;
   const userType = (_userInfo$info$type = userInfo.info.type) === null || _userInfo$info$type === void 0 ? void 0 : _userInfo$info$type.toLowerCase();
+  const EKYC_ROLES = ["EKYC_VENDOR", "EKYC_SUPERVISOR", "EKYC_SURVEYOR"];
+  const isEkycRole = userRoles === null || userRoles === void 0 ? void 0 : userRoles.some(role => EKYC_ROLES.includes((role === null || role === void 0 ? void 0 : role.code) || role));
   const openWorkOrderModal = vendorDetails => {
     setSelectedVendorForWorkOrder(vendorDetails);
     setShowWorkOrderModal(true);
@@ -2832,7 +2834,7 @@ const VendorInbox = props => {
               }
             }, hasDetails ? "View Details" : "Add Details"));
           }
-        }, {
+        }, ...(!isEkycRole ? [{
           Header: t("VIEW_WORKORDER_DETAILS"),
           disableSortBy: true,
           Cell: ({
@@ -2847,7 +2849,7 @@ const VendorInbox = props => {
               onClick: () => openWorkOrderModal(row.original)
             }, t("VIEW_WORKORDER_DETAILS"));
           }
-        }];
+        }] : [])];
       case "VEHICLE":
         return [{
           Header: t("ES_FSM_REGISTRY_INBOX_VEHICLE_NAME"),
@@ -2889,7 +2891,7 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            return /*#__PURE__*/React.createElement(Dropdown$2, {
+            return /*#__PURE__*/React.createElement(Dropdown$1, {
               className: "fsm-registry-dropdown",
               selected: getSelectedVendorOption(row.original, vendors),
               option: vendors,
@@ -2944,7 +2946,7 @@ const VendorInbox = props => {
           }) => {
             const selectedVendor = getSelectedVendorOption(row.original, vendors);
             const vendorFillingPoints = getVendorFillingPoints(selectedVendor);
-            return /*#__PURE__*/React.createElement(Dropdown$2, {
+            return /*#__PURE__*/React.createElement(Dropdown$1, {
               className: "fsm-registry-dropdown",
               selected: getSelectedFillingPointOption(row.original, vendorFillingPoints),
               option: vendorFillingPoints,
@@ -2973,7 +2975,7 @@ const VendorInbox = props => {
             const selectedVendor = getSelectedVendorOption(row.original, vendors);
             const selectedFillingPoint = getSelectedFillingPointOption(row.original, getVendorFillingPoints(selectedVendor));
             const availableDrivers = getVendorDriversForFillingPoint(selectedVendor, selectedFillingPoint);
-            return /*#__PURE__*/React.createElement(Dropdown$2, {
+            return /*#__PURE__*/React.createElement(Dropdown$1, {
               className: "fsm-registry-dropdown",
               selected: getSelectedDriverOption(row.original, availableDrivers),
               option: availableDrivers,
@@ -3066,7 +3068,7 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            return /*#__PURE__*/React.createElement(Dropdown$2, {
+            return /*#__PURE__*/React.createElement(Dropdown$1, {
               className: "fsm-registry-dropdown",
               selected: (vendors === null || vendors === void 0 ? void 0 : vendors.find(vendor => {
                 var _row$original$vendorD, _row$original$vendor;
@@ -3176,7 +3178,7 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            return /*#__PURE__*/React.createElement(Dropdown$2, {
+            return /*#__PURE__*/React.createElement(Dropdown$1, {
               className: "fsm-registry-dropdown",
               selected: (vendors === null || vendors === void 0 ? void 0 : vendors.find(vendor => {
                 var _row$original$vendorD2, _row$original$vendor2;
@@ -3418,10 +3420,8 @@ const VendorInbox = props => {
       emptyButtonText = "ES_FSM_REGISTRY_EMPTY_BUTTON_VEHICLE";
     } else if (props.selectedTab === "SUPERVISOR") {
       emptyCardText = "ES_FSM_REGISTRY_EMPTY_CARD_SUPERVISOR";
-      emptyButtonText = "ES_FSM_REGISTRY_EMPTY_BUTTON_SUPERVISOR";
     } else if (props.selectedTab === "SURVEYOR") {
       emptyCardText = "ES_FSM_REGISTRY_EMPTY_CARD_SURVEYOR";
-      emptyButtonText = "ES_FSM_REGISTRY_EMPTY_BUTTON_SURVEYOR";
     } else {
       emptyCardText = "ES_FSM_REGISTRY_EMPTY_CARD_DRIVER";
       emptyButtonText = "ES_FSM_REGISTRY_EMPTY_BUTTON_DRIVER";
@@ -3433,7 +3433,7 @@ const VendorInbox = props => {
         marginTop: "50px",
         marginBottom: "25px"
       }
-    }, t(emptyCardText)), /*#__PURE__*/React.createElement(SubmitBar, {
+    }, t(emptyCardText)), emptyButtonText && /*#__PURE__*/React.createElement(SubmitBar, {
       className: "",
       label: t(emptyButtonText),
       onSubmit: onSelectAdd
@@ -3567,14 +3567,18 @@ const VendorInbox = props => {
 };
 
 const SearchVendor = () => {
-  var _userInfo$info, _userInfo$info2, _sortParams$, _sortParams$2, _searchParams$vendor, _searchParams$filling, _searchParams$vendor2, _searchParams$vendor3, _searchParams$vendor4, _allFillingPoints$fil;
+  var _Digit$UserService$ge, _Digit$UserService$ge2, _Digit$UserService$ge3, _userInfo$info, _userInfo$info2, _sortParams$, _sortParams$2, _searchParams$vendor, _searchParams$filling, _searchParams$vendor2, _allFillingPoints$fil;
   const {
     t
   } = useTranslation();
   const tenantId = Digit.ULBService.getCurrentTenantId();
+  const userInfo = Digit.UserService.getUser();
+  const roles = ((_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : (_Digit$UserService$ge2 = _Digit$UserService$ge.info) === null || _Digit$UserService$ge2 === void 0 ? void 0 : (_Digit$UserService$ge3 = _Digit$UserService$ge2.roles) === null || _Digit$UserService$ge3 === void 0 ? void 0 : _Digit$UserService$ge3.map(r => r.name)) || [];
+  const initialPage = roles.includes("EKYC_VENDOR") || roles.includes("WT_VENDOR") ? "VENDOR" : roles.includes("EKYC_SUPERVISOR") ? "SUPERVISOR" : roles.includes("EKYC_SURVEYOR") ? "SURVEYOR" : "";
   const {
     selectedTabs
   } = Digit.Hooks.useQueryParams();
+  const [tab, setTab] = useState(selectedTabs || initialPage);
   const [searchParams, setSearchParams] = useState({});
   const [sortParams, setSortParams] = useState([{
     id: "createdTime",
@@ -3582,11 +3586,9 @@ const SearchVendor = () => {
   }]);
   const [pageOffset, setPageOffset] = useState(0);
   const [pageSize, setPageSize] = useState(10);
-  const [tab, setTab] = useState(selectedTabs || "VENDOR");
   const [vehicleIds, setVehicleIds] = useState("");
   const [driverIds, setDriverIds] = useState("");
   const [tableData, setTableData] = useState([]);
-  const userInfo = Digit.UserService.getUser();
   const isCitizen = (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info = userInfo.info) === null || _userInfo$info === void 0 ? void 0 : _userInfo$info.type) === "CITIZEN";
   const loggedInVendorId = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info2 = userInfo.info) === null || _userInfo$info2 === void 0 ? void 0 : _userInfo$info2.uuid;
   const {
@@ -3642,14 +3644,12 @@ const SearchVendor = () => {
   }) : tab === "SUPERVISOR" ? Digit.Hooks.fsm.useSupervisorSearch(tenantId, {
     ...paginationParms,
     status: "ACTIVE,DISABLED",
-    vendorId: isCitizen ? loggedInVendorId : searchParams === null || searchParams === void 0 ? void 0 : (_searchParams$vendor3 = searchParams.vendor) === null || _searchParams$vendor3 === void 0 ? void 0 : _searchParams$vendor3.id,
     name: searchParams === null || searchParams === void 0 ? void 0 : searchParams.name
   }, {
     enabled: false
   }) : tab === "SURVEYOR" ? Digit.Hooks.fsm.useSurveyorSearch(tenantId, {
     ...paginationParms,
     status: "ACTIVE,DISABLED",
-    vendorId: isCitizen ? loggedInVendorId : searchParams === null || searchParams === void 0 ? void 0 : (_searchParams$vendor4 = searchParams.vendor) === null || _searchParams$vendor4 === void 0 ? void 0 : _searchParams$vendor4.id,
     name: searchParams === null || searchParams === void 0 ? void 0 : searchParams.name
   }, {
     enabled: false
@@ -3746,7 +3746,8 @@ const SearchVendor = () => {
     let mounted = true;
     if (vendorData && mounted) {
       if (tab === "VEHICLE") {
-        const vehicles = dsoData === null || dsoData === void 0 ? void 0 : dsoData.vehicle.map(data => {
+        var _dsoData$vehicle;
+        const vehicles = dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$vehicle = dsoData.vehicle) === null || _dsoData$vehicle === void 0 ? void 0 : _dsoData$vehicle.map(data => {
           let vendor = vendorData.find(ele => {
             var _ele$dsoDetails, _ele$dsoDetails$vehic;
             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);
@@ -3769,7 +3770,8 @@ const SearchVendor = () => {
         setVehicleIds("");
       }
       if (tab === "DRIVER") {
-        const drivers = dsoData === null || dsoData === void 0 ? void 0 : dsoData.driver.map(data => {
+        var _dsoData$driver;
+        const drivers = dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$driver = dsoData.driver) === null || _dsoData$driver === void 0 ? void 0 : _dsoData$driver.map(data => {
           let vendor = vendorData.find(ele => {
             var _ele$dsoDetails2, _ele$dsoDetails2$driv;
             return (_ele$dsoDetails2 = ele.dsoDetails) === null || _ele$dsoDetails2 === void 0 ? void 0 : (_ele$dsoDetails2$driv = _ele$dsoDetails2.drivers) === null || _ele$dsoDetails2$driv === void 0 ? void 0 : _ele$dsoDetails2$driv.find(driver => driver.id === data.id);
@@ -3955,7 +3957,7 @@ const SelectServiceType = ({
     return /*#__PURE__*/React.createElement(Loader, null);
   }
   if (userType === "employee") {
-    return /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t(config.label)), /*#__PURE__*/React.createElement(Dropdown$2, {
+    return /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t(config.label)), /*#__PURE__*/React.createElement(Dropdown$1, {
       className: "payment-form-text-input-correction",
       isMandatory: config.isMandatory,
       selected: serviceTypes,
@@ -4059,14 +4061,14 @@ const SelectVehicleType = ({
   if (!vehicleData || !serviceTypeData) {
     return /*#__PURE__*/React.createElement("div", null, t("ERROR_FETCHING_DATA"));
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("ES_FSM_REGISTRY_VEHICLE_MODEL")), /*#__PURE__*/React.createElement(Dropdown$2, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("ES_FSM_REGISTRY_VEHICLE_MODEL")), /*#__PURE__*/React.createElement(Dropdown$1, {
     className: "form-field",
     selected: selectedModal,
     option: modals,
     select: selectModal,
     optionKey: "name",
     t: t
-  })), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("ES_FSM_REGISTRY_VEHICLE_TYPE")), /*#__PURE__*/React.createElement(Dropdown$2, {
+  })), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("ES_FSM_REGISTRY_VEHICLE_TYPE")), /*#__PURE__*/React.createElement(Dropdown$1, {
     className: "form-field",
     selected: selectedType,
     option: types,
@@ -4358,7 +4360,7 @@ const SupervisorAreaAssignment = ({
     onSelect(config.key, updatedData);
   };
   if (isLoading) return /*#__PURE__*/React.createElement(Loader, null);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("ES_VENDOR_SUPERVISOR_ZONE") + " *"), /*#__PURE__*/React.createElement(Dropdown$2, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("ES_VENDOR_SUPERVISOR_ZONE") + " *"), /*#__PURE__*/React.createElement(Dropdown$1, {
     selected: selectedZone,
     option: zones,
     select: val => {
@@ -4367,7 +4369,7 @@ const SupervisorAreaAssignment = ({
     },
     optionKey: "name",
     t: t
-  })), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("ES_VENDOR_SUPERVISOR_CLUSTER") + " *"), /*#__PURE__*/React.createElement(Dropdown$2, {
+  })), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("ES_VENDOR_SUPERVISOR_CLUSTER") + " *"), /*#__PURE__*/React.createElement(Dropdown$1, {
     selected: selectedCluster,
     option: clusters,
     select: val => {
@@ -4377,7 +4379,7 @@ const SupervisorAreaAssignment = ({
     optionKey: "name",
     t: t,
     disable: !selectedZone
-  })), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("ES_VENDOR_SUPERVISOR_WARD") + " *"), /*#__PURE__*/React.createElement(Dropdown$2, {
+  })), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("ES_VENDOR_SUPERVISOR_WARD") + " *"), /*#__PURE__*/React.createElement(Dropdown$1, {
     selected: selectedWard,
     option: wards,
     select: val => {
@@ -4970,7 +4972,7 @@ const EditVendorDetails = props => {
       });
     }
     if (selectedAction === "ADD_VEHICLE") {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_VEHICLE`)), /*#__PURE__*/React.createElement(Dropdown$2, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_VEHICLE`)), /*#__PURE__*/React.createElement(Dropdown$1, {
         t: t,
         option: vehicles,
         value: selectedOption,
@@ -4980,7 +4982,7 @@ const EditVendorDetails = props => {
       }));
     }
     if (selectedAction === "ADD_DRIVER") {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_DRIVER`)), /*#__PURE__*/React.createElement(Dropdown$2, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_DRIVER`)), /*#__PURE__*/React.createElement(Dropdown$1, {
         t: t,
         option: drivers,
         value: selectedOption,
@@ -5508,7 +5510,6 @@ const AddVendor = ({
   };
   const onSubmit = data => {
     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;
     const address = mergedData === null || mergedData === void 0 ? void 0 : mergedData.propertyAddress;
     const pincode = address === null || address === void 0 ? void 0 : address.pincode;
@@ -5596,7 +5597,6 @@ const AddVendor = ({
         contractEndDate: mergedData.contractEndDate ? new Date(mergedData.contractEndDate).getTime() : null
       };
     }
-    console.log(vendorData);
     const payload = {
       vendor: vendorData
     };
@@ -5664,7 +5664,6 @@ const AddVendor = ({
 };
 
 const {
-  Dropdown,
   DatePicker
 } = require("@djb25/digit-ui-react-components");
 const SupervisorConfig = (t, agencies = [], reportingManagers = [], disabled = false) => {
@@ -5723,37 +5722,6 @@ const SupervisorConfig = (t, agencies = [], reportingManagers = [], disabled = f
       type: "component",
       key: "gender",
       component: "SelectGender"
-    }, {
-      label: t("ES_FSM_REGISTRY_NEW_FATHER_NAME"),
-      isMandatory: true,
-      type: "text",
-      populators: {
-        name: "fatherOrHusbandName",
-        validation: {
-          required: true
-        },
-        className: "payment-form-text-input-correction"
-      }
-    }, {
-      label: t("ES_FSM_REGISTRY_NEW_RELATIONSHIP"),
-      isMandatory: true,
-      type: "component",
-      key: "relationship",
-      component: "SelectEkycDropdown",
-      populators: {
-        name: "relationship",
-        options: [{
-          code: "FATHER",
-          name: "ES_COMMON_RELATION_FATHER"
-        }, {
-          code: "HUSBAND",
-          name: "ES_COMMON_RELATION_HUSBAND"
-        }, {
-          code: "OTHER",
-          name: "ES_COMMON_RELATION_OTHER"
-        }],
-        optionsKey: "name"
-      }
     }, {
       label: t("ES_FSM_REGISTRY_NEW_DOB"),
       isMandatory: true,
@@ -5781,31 +5749,14 @@ const SupervisorConfig = (t, agencies = [], reportingManagers = [], disabled = f
         className: "payment-form-text-input-correction"
       }
     }, {
-      label: t("ES_VENDOR_SUPERVISOR_ASSIGNED_ZONE"),
+      label: "ES_VENDOR_ZONE",
       isMandatory: true,
       type: "component",
-      key: "assignedZone",
-      component: "SelectEkycDropdown",
-      populators: {
-        name: "assignedZone",
-        options: [{
-          code: "ZONE-01",
-          name: "ZONE-01"
-        }, {
-          code: "ZONE-02",
-          name: "ZONE-02"
-        }, {
-          code: "ZONE-03",
-          name: "ZONE-03"
-        }, {
-          code: "ZONE-04",
-          name: "ZONE-04"
-        }, {
-          code: "ZONE-05",
-          name: "ZONE-05"
-        }],
-        optionsKey: "name"
-      }
+      key: "zoneIds",
+      props: {
+        isMultiSelect: false
+      },
+      component: "SelectEkycZones"
     }, {
       label: t("ES_VENDOR_SUPERVISOR_DESCRIPTION"),
       isMandatory: false,
@@ -5826,7 +5777,6 @@ const AddSupervisor = ({
   const {
     t
   } = useTranslation();
-  const history = useHistory();
   const userInfo = (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.info;
   const rawTenantId = Digit.ULBService.getCurrentTenantId();
   const tenantId = rawTenantId !== null && rawTenantId !== void 0 && rawTenantId.includes(".") ? rawTenantId : `${rawTenantId}.djb`;
@@ -5834,13 +5784,9 @@ const AddSupervisor = ({
   const queryClient = useQueryClient();
   const [canSubmit, setCanSubmit] = useState(false);
   const {
-    mutate
+    mutate: mutateAsync
   } = Digit.Hooks.fsm.useSupervisorCreate(tenantId);
-  const {
-    search
-  } = useLocation();
-  const queryParams = new URLSearchParams(search);
-  const vendorIdParam = queryParams.get("vendorId");
+  const history = useHistory();
   const Config = SupervisorConfig(t);
   const defaultValues = {
     role: {
@@ -5849,19 +5795,18 @@ const AddSupervisor = ({
     }
   };
   const onFormValueChange = (setValue, formData) => {
-    const isBasicDetailsFilled = (formData === null || formData === void 0 ? void 0 : formData.fullName) && (formData === null || formData === void 0 ? void 0 : formData.mobileNumber) && (formData === null || formData === void 0 ? void 0 : formData.emailId) && (formData === null || formData === void 0 ? void 0 : formData.fatherOrHusbandName) && (formData === null || formData === void 0 ? void 0 : formData.relationship) && (formData === null || formData === void 0 ? void 0 : formData.dob) && (formData === null || formData === void 0 ? void 0 : formData.gender) && (formData === null || formData === void 0 ? void 0 : formData.correspondenceAddress) && (formData === null || formData === void 0 ? void 0 : formData.assignedZone);
-    if (isBasicDetailsFilled) {
-      setCanSubmit(true);
-    } else {
-      setCanSubmit(false);
-    }
+    var _formData$zoneIds;
+    const requiredFields = [formData === null || formData === void 0 ? void 0 : formData.fullName, formData === null || formData === void 0 ? void 0 : formData.mobileNumber, formData === null || formData === void 0 ? void 0 : formData.emailId, formData === null || formData === void 0 ? void 0 : formData.gender, formData === null || formData === void 0 ? void 0 : formData.dob, formData === null || formData === void 0 ? void 0 : formData.correspondenceAddress];
+    const isBasicDetailsFilled = requiredFields.every(Boolean) && (formData === null || formData === void 0 ? void 0 : (_formData$zoneIds = formData.zoneIds) === null || _formData$zoneIds === void 0 ? void 0 : _formData$zoneIds.length) > 0;
+    setCanSubmit(isBasicDetailsFilled);
   };
   const closeToast = () => {
     setShowToast(null);
   };
-  const onSubmit = data => {
-    var _userInfo$roles, _Digit$UserService$ge2, _data$assignedZone, _data$relationship, _data$gender;
+  const onSubmit = async data => {
+    var _userInfo$roles, _data$zoneIds, _Digit$UserService$ge2, _data$gender;
     const isVendor = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$roles = userInfo.roles) === null || _userInfo$roles === void 0 ? void 0 : _userInfo$roles.some(role => role.code === "EKYC_VENDOR");
+    const assignedZone = Array.isArray(data === null || data === void 0 ? void 0 : data.zoneIds) ? (data === null || data === void 0 ? void 0 : (_data$zoneIds = data.zoneIds) === null || _data$zoneIds === void 0 ? void 0 : _data$zoneIds.map(ele => ele.code).join(",")) || "" : data === null || data === void 0 ? void 0 : data.zoneIds;
     const formData = {
       RequestInfo: {
         apiId: "Rainmaker",
@@ -5884,13 +5829,13 @@ const AddSupervisor = ({
       },
       supervisor: {
         tenantId: tenantId,
-        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,
+        assignedZoneId: assignedZone,
         description: (data === null || data === void 0 ? void 0 : data.description) || "",
         owner: {
           tenantId: tenantId,
           name: data === null || data === void 0 ? void 0 : data.fullName,
-          fatherOrHusbandName: data === null || data === void 0 ? void 0 : data.fatherOrHusbandName,
-          relationship: data === null || data === void 0 ? void 0 : (_data$relationship = data.relationship) === null || _data$relationship === void 0 ? void 0 : _data$relationship.code,
+          fatherOrHusbandName: "Static Father",
+          relationship: "FATHER",
           dob: data !== null && data !== void 0 && data.dob ? new Date(data.dob).getTime() : null,
           gender: (data === null || data === void 0 ? void 0 : (_data$gender = data.gender) === null || _data$gender === void 0 ? void 0 : _data$gender.code) || "OTHERS",
           mobileNumber: data === null || data === void 0 ? void 0 : data.mobileNumber,
@@ -5899,23 +5844,24 @@ const AddSupervisor = ({
         }
       }
     };
-    mutate(formData, {
-      onError: error => {
-        setShowToast({
-          key: "error",
-          action: error
-        });
-        setTimeout(closeToast, 5000);
-      },
-      onSuccess: () => {
-        setShowToast({
-          key: "success",
-          action: "ADD_SUPERVISOR"
-        });
-        queryClient.invalidateQueries("SUPERVISOR_SEARCH");
-        setTimeout(closeToast, 5000);
-      }
-    });
+    try {
+      await mutateAsync(formData);
+      setShowToast({
+        key: "success",
+        action: "ADD_SUPERVISOR"
+      });
+      queryClient.invalidateQueries("SUPERVISOR_SEARCH");
+      setTimeout(() => {
+        closeToast();
+        history.push("/digit-ui/citizen/vendor/search-vendor");
+      }, 3000);
+    } catch (error) {
+      setShowToast({
+        key: "error",
+        action: (error === null || error === void 0 ? void 0 : error.message) || error
+      });
+      setTimeout(closeToast, 5000);
+    }
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(VerticalTimeline, {
     config: [{
@@ -6253,7 +6199,7 @@ const SupervisorDetails = props => {
       });
     }
     if (selectedAction === "ADD_VENDOR" || selectedAction === "EDIT_VENDOR") {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_VENODOR`)), /*#__PURE__*/React.createElement(Dropdown$2, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_VENODOR`)), /*#__PURE__*/React.createElement(Dropdown$1, {
         t: t,
         option: vendors,
         value: selectedOption,
@@ -6597,7 +6543,7 @@ const EditSupervisor = () => {
 };
 
 const {
-  Dropdown: Dropdown$1,
+  Dropdown,
   DatePicker: DatePicker$1
 } = require("@djb25/digit-ui-react-components");
 const SurveyorConfig = (t, agencies = [], reportingManagers = [], disabled = false) => {
@@ -6656,26 +6602,6 @@ const SurveyorConfig = (t, agencies = [], reportingManagers = [], disabled = fal
         },
         className: "payment-form-text-input-correction"
       }
-    }, {
-      label: t("ES_FSM_REGISTRY_NEW_RELATIONSHIP"),
-      isMandatory: true,
-      type: "component",
-      key: "relationship",
-      component: "SelectEkycDropdown",
-      populators: {
-        name: "relationship",
-        options: [{
-          code: "FATHER",
-          name: "ES_COMMON_RELATION_FATHER"
-        }, {
-          code: "HUSBAND",
-          name: "ES_COMMON_RELATION_HUSBAND"
-        }, {
-          code: "OTHER",
-          name: "ES_COMMON_RELATION_OTHER"
-        }],
-        optionsKey: "name"
-      }
     }, {
       label: t("ES_FSM_REGISTRY_NEW_DOB"),
       isMandatory: true,
@@ -6722,6 +6648,7 @@ const AddSurveyor = ({
   const {
     t
   } = useTranslation();
+  const history = useHistory();
   const userInfo = (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.info;
   const rawTenantId = Digit.ULBService.getCurrentTenantId();
   const tenantId = rawTenantId !== null && rawTenantId !== void 0 && rawTenantId.includes(".") ? rawTenantId : `${rawTenantId}.djb`;
@@ -6729,7 +6656,7 @@ const AddSurveyor = ({
   const queryClient = useQueryClient();
   const [canSubmit, setCanSubmit] = useState(false);
   const {
-    mutate
+    mutateAsync
   } = Digit.Hooks.fsm.useSurveyorCreate(tenantId);
   const {
     search
@@ -6744,7 +6671,7 @@ const AddSurveyor = ({
     }
   };
   const onFormValueChange = (setValue, formData) => {
-    const isBasicDetailsFilled = (formData === null || formData === void 0 ? void 0 : formData.fullName) && (formData === null || formData === void 0 ? void 0 : formData.mobileNumber) && (formData === null || formData === void 0 ? void 0 : formData.emailId) && (formData === null || formData === void 0 ? void 0 : formData.employeeId) && (formData === null || formData === void 0 ? void 0 : formData.fatherOrHusbandName) && (formData === null || formData === void 0 ? void 0 : formData.relationship) && (formData === null || formData === void 0 ? void 0 : formData.dob) && (formData === null || formData === void 0 ? void 0 : formData.correspondenceAddress);
+    const isBasicDetailsFilled = (formData === null || formData === void 0 ? void 0 : formData.fullName) && (formData === null || formData === void 0 ? void 0 : formData.mobileNumber) && (formData === null || formData === void 0 ? void 0 : formData.emailId) && (formData === null || formData === void 0 ? void 0 : formData.fatherOrHusbandName) && (formData === null || formData === void 0 ? void 0 : formData.dob) && (formData === null || formData === void 0 ? void 0 : formData.correspondenceAddress);
     if (isBasicDetailsFilled) {
       setCanSubmit(true);
     } else {
@@ -6754,8 +6681,8 @@ const AddSurveyor = ({
   const closeToast = () => {
     setShowToast(null);
   };
-  const onSubmit = data => {
-    var _userInfo$roles, _Digit$UserService$ge2, _data$relationship, _data$gender;
+  const onSubmit = async data => {
+    var _userInfo$roles, _Digit$UserService$ge2, _data$gender;
     const isSupervisor = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$roles = userInfo.roles) === null || _userInfo$roles === void 0 ? void 0 : _userInfo$roles.some(role => role.code === "EKYC_SUPERVISOR");
     const formData = {
       RequestInfo: {
@@ -6787,7 +6714,7 @@ const AddSurveyor = ({
           tenantId: tenantId,
           name: data === null || data === void 0 ? void 0 : data.fullName,
           fatherOrHusbandName: data === null || data === void 0 ? void 0 : data.fatherOrHusbandName,
-          relationship: data === null || data === void 0 ? void 0 : (_data$relationship = data.relationship) === null || _data$relationship === void 0 ? void 0 : _data$relationship.code,
+          relationship: "FATHER",
           gender: (data === null || data === void 0 ? void 0 : (_data$gender = data.gender) === null || _data$gender === void 0 ? void 0 : _data$gender.code) || "OTHERS",
           dob: data !== null && data !== void 0 && data.dob ? new Date(data.dob).getTime() : null,
           emailId: data === null || data === void 0 ? void 0 : data.emailId,
@@ -6796,23 +6723,24 @@ const AddSurveyor = ({
         }
       }
     };
-    mutate(formData, {
-      onError: error => {
-        setShowToast({
-          key: "error",
-          action: error
-        });
-        setTimeout(closeToast, 5000);
-      },
-      onSuccess: () => {
-        setShowToast({
-          key: "success",
-          action: "ADD_SURVEYOR"
-        });
-        queryClient.invalidateQueries("SURVEYOR_SEARCH");
-        setTimeout(closeToast, 5000);
-      }
-    });
+    try {
+      await mutateAsync(formData);
+      setShowToast({
+        key: "success",
+        action: "ADD_SURVEYOR"
+      });
+      queryClient.invalidateQueries("SURVEYOR_SEARCH");
+      setTimeout(() => {
+        closeToast();
+        history.push("/digit-ui/citizen/vendor/search-vendor");
+      }, 3000);
+    } catch (error) {
+      setShowToast({
+        key: "error",
+        action: (error === null || error === void 0 ? void 0 : error.message) || error
+      });
+      setTimeout(closeToast, 5000);
+    }
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(VerticalTimeline, {
     config: [{
@@ -7146,7 +7074,7 @@ const SurveyorDetails = props => {
       });
     }
     if (selectedAction === "ADD_VENDOR" || selectedAction === "EDIT_VENDOR") {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_VENODOR`)), /*#__PURE__*/React.createElement(Dropdown$2, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_VENODOR`)), /*#__PURE__*/React.createElement(Dropdown$1, {
         t: t,
         option: vendors,
         value: selectedOption,
@@ -7739,11 +7667,22 @@ const VENDORCreate = ({
     t
   } = useTranslation();
   const {
-    pathname
+    pathname,
+    search
   } = useLocation();
   const history = useHistory();
   let config = [];
   const [params, setParams, clearParams] = Digit.Hooks.useSessionStorage("VENDOR_Test", {});
+  React.useEffect(() => {
+    const searchParams = new URLSearchParams(search || window.location.search);
+    const vendorId = searchParams.get("vendorId");
+    if (vendorId && params.vendor_id !== vendorId) {
+      setParams({
+        ...params,
+        vendor_id: vendorId
+      });
+    }
+  }, [search, window.location.search, params, setParams]);
   const goNext = (skipStep, index, isAddMultiple, key) => {
     let currentPath = pathname.split("/").pop(),
       lastchar = currentPath.charAt(currentPath.length - 1),
@@ -8494,7 +8433,7 @@ const DriverDetails = () => {
       });
     }
     if (selectedAction === "ADD_VENDOR") {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_VENODOR`)), /*#__PURE__*/React.createElement(Dropdown$2, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_VENODOR`)), /*#__PURE__*/React.createElement(Dropdown$1, {
         t: t,
         option: vendors,
         value: selectedOption,
@@ -8504,7 +8443,7 @@ const DriverDetails = () => {
       }));
     }
     if (selectedAction === "EDIT_VENDOR") {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_VENODOR`)), /*#__PURE__*/React.createElement(Dropdown$2, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_VENODOR`)), /*#__PURE__*/React.createElement(Dropdown$1, {
         t: t,
         option: vendors,
         value: selectedOption,
@@ -9359,7 +9298,7 @@ const VehicleDetails = props => {
       });
     }
     if (selectedAction === "ADD_VENDOR") {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_VENODOR`)), /*#__PURE__*/React.createElement(Dropdown$2, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_VENODOR`)), /*#__PURE__*/React.createElement(Dropdown$1, {
         t: t,
         option: vendors,
         value: selectedOption,
@@ -9369,7 +9308,7 @@ const VehicleDetails = props => {
       }));
     }
     if (selectedAction === "EDIT_VENDOR") {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_VENODOR`)), /*#__PURE__*/React.createElement(Dropdown$2, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardText, null, t(`ES_FSM_REGISTRY_SELECT_VENODOR`)), /*#__PURE__*/React.createElement(Dropdown$1, {
         t: t,
         option: vendors,
         value: selectedOption,
@@ -9507,7 +9446,8 @@ const SelectEkycZones = ({
   config,
   onSelect,
   t,
-  formData
+  formData,
+  isMultiSelect: _isMultiSelect = true
 }) => {
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const [zones, setZones] = useState([]);
@@ -9521,34 +9461,24 @@ const SelectEkycZones = ({
     const tenantBoundary = (boundaryData === null || boundaryData === void 0 ? void 0 : (_boundaryData$egovLo = boundaryData["egov-location"]) === null || _boundaryData$egovLo === void 0 ? void 0 : (_boundaryData$egovLo$ = _boundaryData$egovLo.TenantBoundary) === null || _boundaryData$egovLo$ === void 0 ? void 0 : _boundaryData$egovLo$[0]) || (boundaryData === null || boundaryData === void 0 ? void 0 : (_boundaryData$MdmsRes = boundaryData.MdmsRes) === null || _boundaryData$MdmsRes === void 0 ? void 0 : (_boundaryData$MdmsRes2 = _boundaryData$MdmsRes["egov-location"]) === null || _boundaryData$MdmsRes2 === void 0 ? void 0 : (_boundaryData$MdmsRes3 = _boundaryData$MdmsRes2.TenantBoundary) === null || _boundaryData$MdmsRes3 === void 0 ? void 0 : _boundaryData$MdmsRes3[0]);
     const boundaries = (tenantBoundary === null || tenantBoundary === void 0 ? void 0 : tenantBoundary.boundary) || (tenantBoundary === null || tenantBoundary === void 0 ? void 0 : tenantBoundary.children) || [];
     if (Array.isArray(boundaries === null || boundaries === void 0 ? void 0 : boundaries.children) && (boundaries === null || boundaries === void 0 ? void 0 : boundaries.children.length) > 0) {
-      const zonesList = boundaries === null || boundaries === void 0 ? void 0 : boundaries.children.map(b => ({
-        code: b.code,
-        name: b.name
-      }));
+      const allZones = boundaries.children.flatMap(assembly => ((assembly === null || assembly === void 0 ? void 0 : assembly.children) || []).map(zone => ({
+        code: zone.code,
+        name: zone.name
+      })));
+      const zonesList = [...new Map(allZones.map(zone => [zone.code, zone])).values()];
       setZones(zonesList);
-    } else if (!isLoading) {
-      setZones([{
-        code: "ZONE-01",
-        name: "ZONE-01"
-      }, {
-        code: "ZONE-02",
-        name: "ZONE-02"
-      }, {
-        code: "ZONE-03",
-        name: "ZONE-03"
-      }, {
-        code: "ZONE-04",
-        name: "ZONE-04"
-      }, {
-        code: "ZONE-05",
-        name: "ZONE-05"
-      }]);
     }
-  }, [boundaryData, isLoading]);
+  }, [boundaryData]);
   const handleSelect = 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 (_isMultiSelect) {
+      const extractedValue = Array.isArray(value) ? value.map(v => Array.isArray(v) ? v[1] : v).filter(Boolean) : [];
+      setSelectedZones(extractedValue);
+      onSelect(config.key, extractedValue);
+    } else {
+      const selectedZone = Array.isArray(value) ? Array.isArray(value[0]) ? value[0][1] : value[0] : value;
+      setSelectedZones(selectedZone ? [selectedZone] : []);
+      onSelect(config.key, (selectedZone === null || selectedZone === void 0 ? void 0 : selectedZone.code) || "");
+    }
   };
   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", {
@@ -9563,9 +9493,12 @@ const SelectEkycZones = ({
     onSelect: handleSelect,
     optionsKey: "name",
     t: t,
+    multiple: _isMultiSelect,
     ServerStyle: {
       backgroundColor: "#fff"
-    }
+    },
+    isMultiSelect: _isMultiSelect,
+    showSelectedLabels: true
   })));
 };
 
@@ -9693,7 +9626,7 @@ const SelectEkycDropdown = ({
   };
   return /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t(config.label)), /*#__PURE__*/React.createElement("div", {
     className: "field"
-  }, /*#__PURE__*/React.createElement(Dropdown$2, {
+  }, /*#__PURE__*/React.createElement(Dropdown$1, {
     selected: selected,
     option: options,
     select: handleSelect,