@djb25/digit-ui-module-vendor 1.0.63 → 1.0.65

package/dist/index.modern.js

@@ -1,7 +1,7 @@
-import React, { useState, useEffect, useCallback, useReducer, useMemo, useRef } from 'react';
+import React, { useState, useMemo, useEffect, useCallback, useReducer, useRef } from 'react';
 import { useHistory, Link, useLocation, useParams, useRouteMatch, Switch, Route, Redirect } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import { VerticalTimeline, FormComposer, Toast, Card, ShippingTruck, Table, CheckBox, Loader, RadioButtons, CloseSvg, Localities, RemoveableTag, ActionBar, ApplyFilterBar, Dropdown, AddIcon, Menu, LinkLabel, SubmitBar, TextInput, DatePicker as DatePicker$4, ViewsIcon, ToggleSwitch, Modal, MdClose, CardSectionHeader, CardText, Row, EditIcon, DeleteIcon, Header, SearchForm, SearchField, MobileNumber, CardLabelError, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, HomeIcon, PropertyHouse, EmployeeModuleCard, FormStep, LabelFieldPair, CardLabel, UploadFile, RadioOrSelect, MultiSelectDropdown, CitizenHomeCard, CardHeader, CardSubHeader, StatusTable, LinkButton, Banner, InfoIcon, CustomTooltip } from '@djb25/digit-ui-react-components';
+import { Loader, VerticalTimeline, FormComposer, Toast, Card, ShippingTruck, Table, CheckBox, RadioButtons, CloseSvg, Localities, RemoveableTag, ActionBar, ApplyFilterBar, Dropdown, AddIcon, Menu, LinkLabel, SubmitBar, TextInput, DatePicker as DatePicker$4, ViewsIcon, ToggleSwitch, Modal, MdClose, CardSectionHeader, CardText, Row, EditIcon, DeleteIcon, Header, SearchForm, SearchField, MobileNumber, CardLabelError, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, HomeIcon, PropertyHouse, EmployeeModuleCard, FormStep, LabelFieldPair, CardLabel, UploadFile, RadioOrSelect, MultiSelectDropdown, CitizenHomeCard, CardHeader, CardSubHeader, StatusTable, LinkButton, Banner, InfoIcon, CustomTooltip } from '@djb25/digit-ui-react-components';
 import { useQueryClient } from 'react-query';
 import { useForm, Controller } from 'react-hook-form';
 
@@ -50,10 +50,20 @@ const SurveyorConfig = function (t, agencies, reportingManagers, disabled) {
       populators: {
         name: "fullName",
         validation: {
-          required: true,
-          pattern: /^[A-Za-z\s]+$/
+          required: {
+            value: true,
+            message: t("ES_VENDOR_INVALID_NAME")
+          },
+          maxLength: {
+            value: 49,
+            message: t("ES_VENDOR_NAME_MAX_50_CHARACTERS")
+          },
+          pattern: {
+            value: /^[A-Za-z\s]+$/,
+            message: t("ES_VENDOR_INVALID_NAME")
+          }
         },
-        error: t("ES_VENDOR_INVALID_NAME")
+        maxlength: 50
       }
     }, {
       label: "ES_VENDOR_SURVEYOR_MOBILE_NUMBER",
@@ -113,6 +123,22 @@ const SurveyorConfig = function (t, agencies, reportingManagers, disabled) {
         },
         className: "payment-form-text-input-correction"
       }
+    }, {
+      label: t("ES_VENDOR_ZONE"),
+      isMandatory: true,
+      type: "component",
+      key: "zoneIds",
+      populators: {
+        name: "zoneIds",
+        validation: {
+          required: true
+        },
+        className: "mb-16"
+      },
+      props: {
+        isMultiSelect: false
+      },
+      component: "SelectEkycZones"
     }, {
       label: t("ES_VENDOR_SURVEYOR_DESCRIPTION"),
       isMandatory: false,
@@ -126,7 +152,7 @@ const SurveyorConfig = function (t, agencies, reportingManagers, disabled) {
 };
 
 const AddSurveyor = _ref => {
-  var _Digit$UserService$ge;
+  var _Digit$UserService$ge, _userInfo$roles;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const history = useHistory();
@@ -143,14 +169,63 @@ const AddSurveyor = _ref => {
     setCanSubmit = _useState2[1];
   const _Digit$Hooks$fsm$useS = Digit.Hooks.fsm.useSurveyorCreate(tenantId),
     mutateAsync = _Digit$Hooks$fsm$useS.mutateAsync;
-  const Config = SurveyorConfig(t);
-  const defaultValues = {
-    role: {
-      code: "SURVEYOR",
-      name: "Surveyor"
-    },
-    mobileNumber: ""
-  };
+  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 _Digit$Hooks$fsm$useS2 = Digit.Hooks.fsm.useSupervisorSearch(tenantId, {
+      status: "ACTIVE"
+    }, {
+      enabled: isSupervisor,
+      staleTime: Infinity
+    }),
+    supervisorSearchResponse = _Digit$Hooks$fsm$useS2.data,
+    isSupervisorSearchLoading = _Digit$Hooks$fsm$useS2.isLoading;
+  const matchedSupervisor = useMemo(() => {
+    if (!(supervisorSearchResponse !== null && supervisorSearchResponse !== void 0 && supervisorSearchResponse.supervisors)) return null;
+    return supervisorSearchResponse.supervisors.find(s => {
+      var _s$id, _userInfo$uuid, _s$owner, _s$owner$uuid, _userInfo$uuid2, _s$owner2;
+      return ((_s$id = s.id) === null || _s$id === void 0 ? void 0 : _s$id.toLowerCase()) === (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$uuid = userInfo.uuid) === null || _userInfo$uuid === void 0 ? void 0 : _userInfo$uuid.toLowerCase()) || ((_s$owner = s.owner) === null || _s$owner === void 0 ? void 0 : (_s$owner$uuid = _s$owner.uuid) === null || _s$owner$uuid === void 0 ? void 0 : _s$owner$uuid.toLowerCase()) === (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$uuid2 = userInfo.uuid) === null || _userInfo$uuid2 === void 0 ? void 0 : _userInfo$uuid2.toLowerCase()) || ((_s$owner2 = s.owner) === null || _s$owner2 === void 0 ? void 0 : _s$owner2.mobileNumber) === (userInfo === null || userInfo === void 0 ? void 0 : userInfo.mobileNumber) || s.mobileNo === (userInfo === null || userInfo === void 0 ? void 0 : userInfo.mobileNumber);
+    });
+  }, [supervisorSearchResponse, userInfo]);
+  const _useState3 = useState(null),
+    defaultValues = _useState3[0],
+    setDefaultValues = _useState3[1];
+  useEffect(() => {
+    if (!isSupervisor) {
+      setDefaultValues({
+        role: {
+          code: "SURVEYOR",
+          name: "Surveyor"
+        },
+        mobileNumber: ""
+      });
+    } else if (supervisorSearchResponse && !isSupervisorSearchLoading) {
+      setDefaultValues({
+        role: {
+          code: "SURVEYOR",
+          name: "Surveyor"
+        },
+        mobileNumber: "",
+        zoneIds: (matchedSupervisor === null || matchedSupervisor === void 0 ? void 0 : matchedSupervisor.assignedZoneId) || ""
+      });
+    }
+  }, [isSupervisor, supervisorSearchResponse, isSupervisorSearchLoading, matchedSupervisor]);
+  const Config = useMemo(() => {
+    const baseConfig = SurveyorConfig(t);
+    if (isSupervisor) {
+      return baseConfig.map(section => _extends({}, section, {
+        body: section.body.map(field => {
+          if (field.key === "zoneIds") {
+            return _extends({}, field, {
+              props: _extends({}, field.props, {
+                disable: true
+              })
+            });
+          }
+          return field;
+        })
+      }));
+    }
+    return baseConfig;
+  }, [t, isSupervisor]);
   const isValidAge = dateStr => {
     if (!dateStr) return false;
     const today = new Date();
@@ -175,8 +250,8 @@ const AddSurveyor = _ref => {
   };
   const onSubmit = function (data) {
     try {
-      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");
+      var _data$zoneIds, _Digit$UserService$ge2, _data$gender;
+      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: _extends({
           apiId: "Rainmaker",
@@ -198,6 +273,9 @@ const AddSurveyor = _ref => {
         }),
         surveyor: {
           tenantId: tenantId,
+          vendorId: isSupervisor ? matchedSupervisor === null || matchedSupervisor === void 0 ? void 0 : matchedSupervisor.vendorId : undefined,
+          supervisorId: isSupervisor ? matchedSupervisor === null || matchedSupervisor === void 0 ? void 0 : matchedSupervisor.id : undefined,
+          assignedZoneId: assignedZone,
           description: (data === null || data === void 0 ? void 0 : data.description) || "",
           correspondenceAddress: data === null || data === void 0 ? void 0 : data.correspondenceAddress,
           additionalDetails: {
@@ -240,6 +318,9 @@ const AddSurveyor = _ref => {
       return Promise.reject(e);
     }
   };
+  if (isSupervisor && (isSupervisorSearchLoading || !defaultValues)) {
+    return /*#__PURE__*/React.createElement(Loader, null);
+  }
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(VerticalTimeline, {
     config: [{
       route: "surveyor-details",
@@ -632,7 +713,7 @@ const DropdownStatus = _ref => {
 };
 
 const RegisteredVendorSearch = _ref => {
-  var _matchedRoles$wt, _matchedRoles$wt2, _matchedRoles$ekyc, _matchedRoles$ekyc2, _matchedRoles$wt3, _matchedRoles$wt4, _matchedRoles$wt5, _matchedRoles$ekyc3, _matchedRoles$ekyc4, _matchedRoles$ekyc5, _matchedRoles$ekyc6, _matchedRoles$ekyc7;
+  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, _matchedRoles$ekyc8;
   let onSearch = _ref.onSearch,
     type = _ref.type,
     onClose = _ref.onClose,
@@ -778,7 +859,7 @@ const RegisteredVendorSearch = _ref => {
     onClick: onClose
   }, /*#__PURE__*/React.createElement(CloseSvg, null))), /*#__PURE__*/React.createElement("div", {
     className: "search-tabs-container"
-  }, /*#__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")) && /*#__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();
@@ -796,13 +877,13 @@ const RegisteredVendorSearch = _ref => {
       clearSearch();
       onTabChange("DRIVER");
     }
-  }, t("ES_FSM_REGISTRY_INBOX_TAB_DRIVER")), ((matchedRoles === null || matchedRoles === void 0 ? void 0 : (_matchedRoles$ekyc3 = matchedRoles.ekyc) === null || _matchedRoles$ekyc3 === void 0 ? void 0 : _matchedRoles$ekyc3.includes("EKYC_VENDOR")) || (matchedRoles === null || matchedRoles === void 0 ? void 0 : (_matchedRoles$ekyc4 = matchedRoles.ekyc) === null || _matchedRoles$ekyc4 === void 0 ? void 0 : _matchedRoles$ekyc4.includes("EMPLOYEE"))) && /*#__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("EMPLOYEE"))) && /*#__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")) || (matchedRoles === null || matchedRoles === void 0 ? void 0 : (_matchedRoles$ekyc7 = matchedRoles.ekyc) === null || _matchedRoles$ekyc7 === void 0 ? void 0 : _matchedRoles$ekyc7.includes("EMPLOYEE"))) && /*#__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")) || (matchedRoles === null || matchedRoles === void 0 ? void 0 : (_matchedRoles$ekyc8 = matchedRoles.ekyc) === null || _matchedRoles$ekyc8 === void 0 ? void 0 : _matchedRoles$ekyc8.includes("EMPLOYEE"))) && /*#__PURE__*/React.createElement("button", {
     className: selectedTab === "SURVEYOR" ? "search-tab-head-selected" : "search-tab-head",
     onClick: () => {
       clearSearch();
@@ -1007,7 +1088,7 @@ 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 EKYC_ROLES = ["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);
@@ -1332,9 +1413,11 @@ const VendorInbox = props => {
         });
       },
       onSuccess: (data, variables) => {
+        console.log("newStatus:", newStatus, "isDisable:", newStatus === "DISABLED");
         setShowToast({
           key: "success",
-          action: "SUPERVISOR"
+          action: "SUPERVISOR",
+          isDisable: newStatus === "DISABLED"
         });
         queryClient.invalidateQueries("FSM_SUPERVISOR_SEARCH");
         queryClient.invalidateQueries("SUPERVISOR_SEARCH");
@@ -1368,9 +1451,11 @@ const VendorInbox = props => {
         });
       },
       onSuccess: (data, variables) => {
+        console.log("newStatus:", newStatus, "isDisable:", newStatus === "DISABLED");
         setShowToast({
           key: "success",
-          action: "SURVEYOR"
+          action: "SURVEYOR",
+          isDisable: newStatus === "DISABLED"
         });
         queryClient.invalidateQueries("FSM_SURVEYOR_SEARCH");
         queryClient.invalidateQueries("SURVEYOR_SEARCH");
@@ -2524,7 +2609,7 @@ const SearchVendor = () => {
   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.code)) || [];
   const location = useLocation();
-  const initialPage = roles.includes("WT_VENDOR") ? "VENDOR" : roles.includes("EKYC_VENDOR") ? "SUPERVISOR" : roles.includes("EKYC_SUPERVISOR") ? "SURVEYOR" : roles.includes("EKYC_SURVEYOR") ? "SURVEYOR" : roles.includes("EMPLOYEE") ? "SUPERVISOR" : "";
+  const initialPage = roles.includes("EKYC_VENDOR") || roles.includes("WT_VENDOR") ? "VENDOR" : roles.includes("EKYC_SUPERVISOR") ? "SURVEYOR" : roles.includes("EKYC_SURVEYOR") ? "SURVEYOR" : roles.includes("EMPLOYEE") ? "SUPERVISOR" : "";
   const _Digit$Hooks$useQuery = Digit.Hooks.useQueryParams(),
     selectedTabs = _Digit$Hooks$useQuery.selectedTabs;
   const _useState = useState(selectedTabs || initialPage),
@@ -3353,15 +3438,22 @@ const SupervisorConfig = function (t, agencies, reportingManagers, disabled) {
       populators: {
         name: "fullName",
         validation: {
-          required: true,
+          required: {
+            value: true,
+            message: t("ES_VENDOR_INVALID_NAME")
+          },
+          maxLength: {
+            value: 49,
+            message: t("ES_VENDOR_NAME_MAX_50_CHARACTERS")
+          },
           pattern: {
             value: /^[A-Za-z\s]+$/,
             message: t("ES_VENDOR_INVALID_NAME")
           }
         },
-        error: t("ES_VENDOR_INVALID_NAME"),
         defaultValue: "",
-        className: "payment-form-text-input-correction"
+        className: "payment-form-text-input-correction",
+        maxlength: 50
       }
     }, {
       label: t("ES_VENDOR_SUPERVISOR_MOBILE_NUMBER"),
@@ -3894,7 +3986,7 @@ const formatLabel = key => {
   return result.charAt(0).toUpperCase() + result.slice(1);
 };
 const VendorDetails = () => {
-  var _dsoData$, _dsoData$$dsoDetails, _vendorAdditionalData, _vendorAdditionalData2, _vendorAdditionalData3, _parsedAdditionalDeta, _userInfo$info$type, _dsoData$5, _dsoData$5$employeeRe, _supervisorData$super, _surveyorData$surveyo;
+  var _dsoData$, _dsoData$$dsoDetails, _vendorAdditionalData, _vendorAdditionalData2, _vendorAdditionalData3, _parsedAdditionalDeta, _userInfo$info$type, _userInfo$info, _userInfo$info$roles, _dsoData$5, _dsoData$5$employeeRe, _supervisorData$super, _surveyorData$surveyo;
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
@@ -4000,6 +4092,8 @@ const VendorDetails = () => {
   }
   const userInfo = Digit.SessionStorage.get("User");
   const userType = (_userInfo$info$type = userInfo.info.type) === null || _userInfo$info$type === void 0 ? void 0 : _userInfo$info$type.toLowerCase();
+  const userRoles = (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info = userInfo.info) === null || _userInfo$info === void 0 ? void 0 : (_userInfo$info$roles = _userInfo$info.roles) === null || _userInfo$info$roles === void 0 ? void 0 : _userInfo$info$roles.map(r => r.code)) || [];
+  const isEkycVendor = userRoles.includes("EKYC_VENDOR");
   useEffect(() => {
     switch (selectedAction) {
       case "DELETE":
@@ -4375,7 +4469,7 @@ const VendorDetails = () => {
     manualPagination: false,
     pageSizeLimit: 10,
     t: t
-  }), /*#__PURE__*/React.createElement("div", {
+  }), isEkycVendor && /*#__PURE__*/React.createElement("div", {
     className: "add-details-link hover-button",
     onClick: () => history.push("/digit-ui/" + userType + "/vendor/registry/new-supervisor?vendorId=" + (dsoId || vendorId))
   }, t("ES_VENDOR_ADD_SUPERVISOR"))), /*#__PURE__*/React.createElement(CardSectionHeader, {
@@ -4391,7 +4485,10 @@ const VendorDetails = () => {
     manualPagination: false,
     pageSizeLimit: 10,
     t: t
-  })))), showModal && /*#__PURE__*/React.createElement(Modal, {
+  }), isEkycVendor && /*#__PURE__*/React.createElement("div", {
+    className: "add-details-link hover-button",
+    onClick: () => history.push("/digit-ui/" + userType + "/vendor/registry/new-surveyor?vendorId=" + (dsoId || vendorId))
+  }, t("ES_VENDOR_ADD_SURVEYOR"))))), showModal && /*#__PURE__*/React.createElement(Modal, {
     headerBarMain: /*#__PURE__*/React.createElement("h1", {
       className: "heading-m"
     }, t(selectedAction === "DELETE" ? "ES_FSM_REGISTRY_DELETE_POPUP_HEADER" : selectedAction === "ADD_VEHICLE" ? "ES_FSM_REGISTRY_ADD_VEHICLE_POPUP_HEADER" : "ES_FSM_REGISTRY_ADD_DRIVER_POPUP_HEADER")),
@@ -4617,7 +4714,8 @@ const VendorConfig = function (t, module, genderMenu, update) {
       isMandatory: true,
       type: "component",
       key: "zoneIds",
-      component: "SelectEkycZones"
+      component: "SelectEkycZones",
+      disable: update
     }, {
       label: "ES_FSM_REGISTRY_NEW_OWNER_NAME",
       isMandatory: true,
@@ -4650,13 +4748,26 @@ const VendorConfig = function (t, module, genderMenu, update) {
       populators: {
         name: "dob",
         validation: {
-          required: true
+          required: true,
+          validate: value => {
+            if (!value) return true;
+            const dob = new Date(value);
+            const today = new Date();
+            let age = today.getFullYear() - dob.getFullYear();
+            const m = today.getMonth() - dob.getMonth();
+            if (m < 0 || m === 0 && today.getDate() < dob.getDate()) {
+              age--;
+            }
+            return age >= 18 || t("ES_VENDOR_DOB_MIN_AGE_ERROR") || "Vendor must be 18 years or older";
+          }
         },
         component: (props, customProps) => /*#__PURE__*/React.createElement(DatePicker$4, _extends({
           onChange: props.onChange,
           date: props.value
         }, customProps, {
-          max: convertEpochToDate(new Date().setFullYear(new Date().getFullYear()))
+          isDOB: true,
+          minAge: 18,
+          max: convertEpochToDate(new Date().setFullYear(new Date().getFullYear() - 18))
         }))
       }
     }] : [])]
@@ -5663,12 +5774,19 @@ const VENDORCreate = _ref => {
   React.useEffect(() => {
     const searchParams = new URLSearchParams(search || window.location.search);
     const vendorId = searchParams.get("vendorId");
-    if (vendorId && params.vendor_id !== vendorId) {
-      setParams(_extends({}, params, {
-        vendor_id: vendorId
-      }));
+    if (vendorId) {
+      if (params.vendor_id !== vendorId) {
+        setParams(_extends({}, params, {
+          vendor_id: vendorId
+        }));
+      }
+    } else {
+      if (params && Object.keys(params).length > 0 && window.location.href.includes("/info") && sessionStorage.getItem("docReqScreenByBack") !== "true") {
+        clearParams();
+        queryClient.invalidateQueries("VENDOR_CREATE");
+      }
     }
-  }, [search, window.location.search, params, setParams]);
+  }, [search, pathname, params, setParams, clearParams, queryClient]);
   const goNext = (skipStep, index, isAddMultiple, key) => {
     let currentPath = pathname.split("/").pop(),
       lastchar = currentPath.charAt(currentPath.length - 1),
@@ -5710,10 +5828,6 @@ const VENDORCreate = _ref => {
     }
     redirectWithHistory(nextPage);
   };
-  if (params && Object.keys(params).length > 0 && window.location.href.includes("/info") && sessionStorage.getItem("docReqScreenByBack") !== "true") {
-    clearParams();
-    queryClient.invalidateQueries("VENDOR_CREATE");
-  }
   const vendorcreate = function () {
     try {
       history.push(match.path + "/acknowledgement");
@@ -9438,12 +9552,15 @@ const VehicleDetails = props => {
 };
 
 const SelectEkycZones = _ref => {
+  var _Digit$SessionStorage, _loggedInUser$roles, _config$props;
   let config = _ref.config,
     onSelect = _ref.onSelect,
     t = _ref.t,
     formData = _ref.formData,
     _ref$isMultiSelect = _ref.isMultiSelect,
-    isMultiSelect = _ref$isMultiSelect === void 0 ? true : _ref$isMultiSelect;
+    isMultiSelect = _ref$isMultiSelect === void 0 ? true : _ref$isMultiSelect,
+    _ref$disable = _ref.disable,
+    disable = _ref$disable === void 0 ? false : _ref$disable;
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const _useState = useState([]),
     zones = _useState[0],
@@ -9452,6 +9569,45 @@ const SelectEkycZones = _ref => {
     selectedZones = _useState2[0],
     setSelectedZones = _useState2[1];
   const initialized = useRef(false);
+  const isVendorPage = window.location.pathname.includes("/new-vendor") || window.location.pathname.includes("/modify-vendor") || window.location.href.includes("/new-vendor") || window.location.href.includes("/modify-vendor");
+  const loggedInUser = (_Digit$SessionStorage = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.info;
+  const roles = (loggedInUser === null || loggedInUser === void 0 ? void 0 : (_loggedInUser$roles = loggedInUser.roles) === null || _loggedInUser$roles === void 0 ? void 0 : _loggedInUser$roles.map(r => r.code)) || [];
+  const isEkycVendor = roles.includes("EKYC_VENDOR");
+  const isEkycSupervisor = roles.includes("EKYC_SUPERVISOR");
+  const _Digit$Hooks$fsm$useD = Digit.Hooks.fsm.useDsoSearch(tenantId, {
+      status: "ACTIVE"
+    }, {
+      enabled: isEkycVendor && !isVendorPage
+    }),
+    vendorSearchResponse = _Digit$Hooks$fsm$useD.data,
+    isVendorSearchLoading = _Digit$Hooks$fsm$useD.isLoading;
+  const _Digit$Hooks$fsm$useS = Digit.Hooks.fsm.useSupervisorSearch(tenantId, {
+      status: "ACTIVE"
+    }, {
+      enabled: isEkycSupervisor
+    }),
+    supervisorSearchResponse = _Digit$Hooks$fsm$useS.data,
+    isSupervisorSearchLoading = _Digit$Hooks$fsm$useS.isLoading;
+  const matchedVendor = React.useMemo(() => {
+    var _vendorSearchResponse, _vendorSearchResponse2;
+    if (!vendorSearchResponse) return null;
+    const userUuid = loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.uuid;
+    const userMobile = loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.mobileNumber;
+    return ((_vendorSearchResponse = vendorSearchResponse.find(v => {
+      var _actualVendor$owner, _actualVendor$owner2, _actualVendor$owner3;
+      const actualVendor = v.dsoDetails || v;
+      const ownerUuid = ((_actualVendor$owner = actualVendor.owner) === null || _actualVendor$owner === void 0 ? void 0 : _actualVendor$owner.uuid) || ((_actualVendor$owner2 = actualVendor.owner) === null || _actualVendor$owner2 === void 0 ? void 0 : _actualVendor$owner2.id);
+      const ownerMobile = ((_actualVendor$owner3 = actualVendor.owner) === null || _actualVendor$owner3 === void 0 ? void 0 : _actualVendor$owner3.mobileNumber) || actualVendor.mobileNumber;
+      return userUuid && ownerUuid === userUuid || userMobile && ownerMobile === userMobile;
+    })) === null || _vendorSearchResponse === void 0 ? void 0 : _vendorSearchResponse.dsoDetails) || ((_vendorSearchResponse2 = vendorSearchResponse[0]) === null || _vendorSearchResponse2 === void 0 ? void 0 : _vendorSearchResponse2.dsoDetails) || vendorSearchResponse[0];
+  }, [vendorSearchResponse, loggedInUser]);
+  const matchedSupervisor = React.useMemo(() => {
+    if (!(supervisorSearchResponse !== null && supervisorSearchResponse !== void 0 && supervisorSearchResponse.supervisors)) return null;
+    return supervisorSearchResponse.supervisors.find(s => {
+      var _s$id, _loggedInUser$uuid, _s$owner, _s$owner$uuid, _loggedInUser$uuid2, _s$owner2;
+      return ((_s$id = s.id) === null || _s$id === void 0 ? void 0 : _s$id.toLowerCase()) === (loggedInUser === null || loggedInUser === void 0 ? void 0 : (_loggedInUser$uuid = loggedInUser.uuid) === null || _loggedInUser$uuid === void 0 ? void 0 : _loggedInUser$uuid.toLowerCase()) || ((_s$owner = s.owner) === null || _s$owner === void 0 ? void 0 : (_s$owner$uuid = _s$owner.uuid) === null || _s$owner$uuid === void 0 ? void 0 : _s$owner$uuid.toLowerCase()) === (loggedInUser === null || loggedInUser === void 0 ? void 0 : (_loggedInUser$uuid2 = loggedInUser.uuid) === null || _loggedInUser$uuid2 === void 0 ? void 0 : _loggedInUser$uuid2.toLowerCase()) || ((_s$owner2 = s.owner) === null || _s$owner2 === void 0 ? void 0 : _s$owner2.mobileNumber) === (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.mobileNumber) || s.mobileNo === (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.mobileNumber);
+    });
+  }, [supervisorSearchResponse, loggedInUser]);
   const _Digit$Hooks$useCommo = Digit.Hooks.useCommonMDMS(tenantId, "egov-location", ["TenantBoundary"]),
     boundaryData = _Digit$Hooks$useCommo.data,
     isLoading = _Digit$Hooks$useCommo.isLoading;
@@ -9464,19 +9620,19 @@ const SelectEkycZones = _ref => {
         code: zone.code,
         name: zone.name
       })));
-      const zonesList = [...new Map(allZones.map(z => [z.code, z])).values()];
+      let zonesList = [...new Map(allZones.map(z => [z.code, z])).values()];
       setZones(zonesList);
     }
-  }, [boundaryData]);
+  }, [boundaryData, isEkycVendor, matchedVendor, isEkycSupervisor, matchedSupervisor, isVendorPage]);
   useEffect(() => {
     if (!zones.length || !(formData !== null && formData !== void 0 && formData.zoneIds)) return;
     if (isMultiSelect) {
       if (!Array.isArray(formData.zoneIds)) return;
-      if (formData.zoneIds.length && typeof formData.zoneIds[0] === "object") {
-        setSelectedZones(formData.zoneIds);
+      if (formData.zoneIds.length && typeof formData.zoneIds[0] === "object" && formData.zoneIds[0] !== null) {
+        setSelectedZones(formData.zoneIds.filter(Boolean));
         return;
       }
-      const selected = zones.filter(zone => formData.zoneIds.includes(zone.name) || formData.zoneIds.includes(zone.code));
+      const selected = zones.filter(zone => zone && (formData.zoneIds.includes(zone.name) || formData.zoneIds.includes(zone.code)));
       setSelectedZones(selected);
       if (!initialized.current) {
         initialized.current = true;
@@ -9488,10 +9644,10 @@ const SelectEkycZones = _ref => {
         var _selectedVal$, _selectedVal$2;
         selectedVal = ((_selectedVal$ = selectedVal[0]) === null || _selectedVal$ === void 0 ? void 0 : _selectedVal$.name) || ((_selectedVal$2 = selectedVal[0]) === null || _selectedVal$2 === void 0 ? void 0 : _selectedVal$2.code) || selectedVal[0] || "";
       }
-      if (typeof selectedVal === "object") {
+      if (selectedVal && typeof selectedVal === "object") {
         selectedVal = selectedVal.name || selectedVal.code || "";
       }
-      const selected = zones.find(zone => zone.name === selectedVal || zone.code === selectedVal);
+      const selected = zones.find(zone => zone && (zone.name === selectedVal || zone.code === selectedVal));
       setSelectedZones(selected ? [selected] : []);
       if (!initialized.current && selected) {
         initialized.current = true;
@@ -9499,6 +9655,13 @@ const SelectEkycZones = _ref => {
       }
     }
   }, [zones, formData === null || formData === void 0 ? void 0 : formData.zoneIds, config.key, onSelect, isMultiSelect]);
+  useEffect(() => {
+    if (isEkycSupervisor && zones.length > 0 && !(formData !== null && formData !== void 0 && formData.zoneIds) && !initialized.current) {
+      initialized.current = true;
+      setSelectedZones([zones[0]]);
+      onSelect(config.key, zones[0].name || "");
+    }
+  }, [isEkycSupervisor, zones, formData === null || formData === void 0 ? void 0 : formData.zoneIds, config.key, onSelect]);
   const handleSelect = value => {
     if (isMultiSelect) {
       const selected = Array.isArray(value) ? value.map(v => Array.isArray(v) ? v[1] : v).filter(Boolean) : [];
@@ -9510,7 +9673,7 @@ const SelectEkycZones = _ref => {
       onSelect(config.key, (selectedZone === null || selectedZone === void 0 ? void 0 : selectedZone.name) || "");
     }
   };
-  if (isLoading) return /*#__PURE__*/React.createElement(Loader, null);
+  if (isLoading || isEkycVendor && !isVendorPage && isVendorSearchLoading || isEkycSupervisor && isSupervisorSearchLoading) 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("span", {
     className: "check-page-link-button"
   }, " * ") : ""), /*#__PURE__*/React.createElement("div", {
@@ -9531,10 +9694,11 @@ const SelectEkycZones = _ref => {
     ServerStyle: {
       backgroundColor: "#fff"
     },
-    defaultLabel: isMultiSelect ? selectedZones.length + " Selected" : ""
+    defaultLabel: isMultiSelect ? selectedZones.length + " Selected" : "",
+    disable: disable || isEkycSupervisor || ((_config$props = config.props) === null || _config$props === void 0 ? void 0 : _config$props.disable) || config.disable
   })), isMultiSelect && selectedZones.length > 0 && /*#__PURE__*/React.createElement("div", {
     className: "selected-zones"
-  }, selectedZones.map(zone => /*#__PURE__*/React.createElement("span", {
+  }, selectedZones.filter(zone => zone && zone.code).map(zone => /*#__PURE__*/React.createElement("span", {
     key: zone.code,
     className: "selected-zone-chip"
   }, zone.name))));