@djb25/digit-ui-module-vendor 1.0.36 → 1.0.38

package/dist/index.modern.js

@@ -3264,6 +3264,12 @@ const VendorInbox = props => {
             var _row$owner7;
             return `${(row === null || row === void 0 ? void 0 : row.name) || "NA"} (${(row === null || row === void 0 ? void 0 : (_row$owner7 = row.owner) === null || _row$owner7 === void 0 ? void 0 : _row$owner7.mobileNumber) || "NA"})`;
           }
+        }, {
+          Header: t("ES_FSM_REGISTRY_INBOX_SUPERVISOR_NAME"),
+          exportAccessor: row => {
+            var _row$reportingManager2;
+            return (row === null || row === void 0 ? void 0 : (_row$reportingManager2 = row.reportingManager) === null || _row$reportingManager2 === void 0 ? void 0 : _row$reportingManager2.name) || "NA";
+          }
         }, {
           Header: t("ES_FSM_REGISTRY_INBOX_DATE_DRIVER_CREATION"),
           exportAccessor: row => {
@@ -3306,36 +3312,7 @@ const VendorInbox = props => {
             return `${(row === null || row === void 0 ? void 0 : (_row$vendorData12 = row.vendorData) === null || _row$vendorData12 === void 0 ? void 0 : _row$vendorData12.name) || (row === null || row === void 0 ? void 0 : (_row$vendor12 = row.vendor) === null || _row$vendor12 === void 0 ? void 0 : _row$vendor12.name) || "NA"} ${(row === null || row === void 0 ? void 0 : (_row$vendorData13 = row.vendorData) === null || _row$vendorData13 === void 0 ? void 0 : _row$vendorData13.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendorData14 = row.vendorData) === null || _row$vendorData14 === void 0 ? void 0 : (_row$vendorData14$own = _row$vendorData14.owner) === null || _row$vendorData14$own === void 0 ? void 0 : _row$vendorData14$own.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendor13 = row.vendor) === null || _row$vendor13 === void 0 ? void 0 : _row$vendor13.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendor14 = row.vendor) === null || _row$vendor14 === void 0 ? void 0 : (_row$vendor14$owner = _row$vendor14.owner) === null || _row$vendor14$owner === void 0 ? void 0 : _row$vendor14$owner.mobileNumber) || "NA"}`;
           }
         }, {
-          Header: t("ES_FSM_REGISTRY_INBOX_ENABLED"),
-          exportAccessor: row => (row === null || row === void 0 ? void 0 : row.status) || "NA"
-        }];
-      case "SURVEYOR":
-        return [{
-          Header: t("ES_FSM_REGISTRY_INBOX_USERNAME"),
-          exportAccessor: row => {
-            var _row$owner0;
-            return (row === null || row === void 0 ? void 0 : (_row$owner0 = row.owner) === null || _row$owner0 === void 0 ? void 0 : _row$owner0.userName) || "NA";
-          }
-        }, {
-          Header: t("ES_FSM_REGISTRY_INBOX_DRIVER_NAME"),
-          exportAccessor: row => {
-            var _row$owner1;
-            return `${(row === null || row === void 0 ? void 0 : row.name) || "NA"} (${(row === null || row === void 0 ? void 0 : (_row$owner1 = row.owner) === null || _row$owner1 === void 0 ? void 0 : _row$owner1.mobileNumber) || "NA"})`;
-          }
-        }, {
-          Header: t("ES_FSM_REGISTRY_INBOX_SUPERVISOR_NAME"),
-          exportAccessor: row => {
-            var _row$reportingManager2;
-            return (row === null || row === void 0 ? void 0 : (_row$reportingManager2 = row.reportingManager) === null || _row$reportingManager2 === void 0 ? void 0 : _row$reportingManager2.name) || "NA";
-          }
-        }, {
-          Header: t("ES_FSM_REGISTRY_INBOX_DATE_DRIVER_CREATION"),
-          exportAccessor: row => {
-            var _row$auditDetails1, _row$auditDetails10;
-            return row !== null && row !== void 0 && (_row$auditDetails1 = row.auditDetails) !== null && _row$auditDetails1 !== void 0 && _row$auditDetails1.createdTime ? Digit.DateUtils.ConvertEpochToDate(row === null || row === void 0 ? void 0 : (_row$auditDetails10 = row.auditDetails) === null || _row$auditDetails10 === void 0 ? void 0 : _row$auditDetails10.createdTime) : "";
-          }
-        }, {
-          Header: t("ES_VENDOR_SURVEYOR_AGENCY_NAME"),
+          Header: t("ES_VENDOR_SUPERVISOR_AGENCY_NAME"),
           exportAccessor: row => {
             var _row$vendorData15, _row$vendor15, _row$vendorData16, _row$vendorData17, _row$vendorData17$own, _row$vendor16, _row$vendor17, _row$vendor17$owner;
             return `${(row === null || row === void 0 ? void 0 : (_row$vendorData15 = row.vendorData) === null || _row$vendorData15 === void 0 ? void 0 : _row$vendorData15.name) || (row === null || row === void 0 ? void 0 : (_row$vendor15 = row.vendor) === null || _row$vendor15 === void 0 ? void 0 : _row$vendor15.name) || "NA"} ${(row === null || row === void 0 ? void 0 : (_row$vendorData16 = row.vendorData) === null || _row$vendorData16 === void 0 ? void 0 : _row$vendorData16.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendorData17 = row.vendorData) === null || _row$vendorData17 === void 0 ? void 0 : (_row$vendorData17$own = _row$vendorData17.owner) === null || _row$vendorData17$own === void 0 ? void 0 : _row$vendorData17$own.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendor16 = row.vendor) === null || _row$vendor16 === void 0 ? void 0 : _row$vendor16.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendor17 = row.vendor) === null || _row$vendor17 === void 0 ? void 0 : (_row$vendor17$owner = _row$vendor17.owner) === null || _row$vendor17$owner === void 0 ? void 0 : _row$vendor17$owner.mobileNumber) || "NA"}`;
@@ -3344,35 +3321,6 @@ const VendorInbox = props => {
           Header: t("ES_FSM_REGISTRY_INBOX_ENABLED"),
           exportAccessor: row => (row === null || row === void 0 ? void 0 : row.status) || "NA"
         }];
-      case "SUPERVISOR":
-        return [{
-          Header: t("ES_FSM_REGISTRY_INBOX_USERNAME"),
-          exportAccessor: row => {
-            var _row$owner10;
-            return (row === null || row === void 0 ? void 0 : (_row$owner10 = row.owner) === null || _row$owner10 === void 0 ? void 0 : _row$owner10.userName) || "NA";
-          }
-        }, {
-          Header: t("ES_FSM_REGISTRY_INBOX_DRIVER_NAME"),
-          exportAccessor: row => {
-            var _row$owner11;
-            return `${(row === null || row === void 0 ? void 0 : row.name) || "NA"} (${(row === null || row === void 0 ? void 0 : (_row$owner11 = row.owner) === null || _row$owner11 === void 0 ? void 0 : _row$owner11.mobileNumber) || "NA"})`;
-          }
-        }, {
-          Header: t("ES_FSM_REGISTRY_INBOX_DATE_DRIVER_CREATION"),
-          exportAccessor: row => {
-            var _row$auditDetails11, _row$auditDetails12;
-            return row !== null && row !== void 0 && (_row$auditDetails11 = row.auditDetails) !== null && _row$auditDetails11 !== void 0 && _row$auditDetails11.createdTime ? Digit.DateUtils.ConvertEpochToDate(row === null || row === void 0 ? void 0 : (_row$auditDetails12 = row.auditDetails) === null || _row$auditDetails12 === void 0 ? void 0 : _row$auditDetails12.createdTime) : "";
-          }
-        }, {
-          Header: t("ES_VENDOR_SUPERVISOR_AGENCY_NAME"),
-          exportAccessor: row => {
-            var _row$vendorData18, _row$vendor18, _row$vendorData19, _row$vendorData20, _row$vendorData20$own, _row$vendor19, _row$vendor20, _row$vendor20$owner;
-            return `${(row === null || row === void 0 ? void 0 : (_row$vendorData18 = row.vendorData) === null || _row$vendorData18 === void 0 ? void 0 : _row$vendorData18.name) || (row === null || row === void 0 ? void 0 : (_row$vendor18 = row.vendor) === null || _row$vendor18 === void 0 ? void 0 : _row$vendor18.name) || "NA"} ${(row === null || row === void 0 ? void 0 : (_row$vendorData19 = row.vendorData) === null || _row$vendorData19 === void 0 ? void 0 : _row$vendorData19.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendorData20 = row.vendorData) === null || _row$vendorData20 === void 0 ? void 0 : (_row$vendorData20$own = _row$vendorData20.owner) === null || _row$vendorData20$own === void 0 ? void 0 : _row$vendorData20$own.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendor19 = row.vendor) === null || _row$vendor19 === void 0 ? void 0 : _row$vendor19.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendor20 = row.vendor) === null || _row$vendor20 === void 0 ? void 0 : (_row$vendor20$owner = _row$vendor20.owner) === null || _row$vendor20$owner === void 0 ? void 0 : _row$vendor20$owner.mobileNumber) || "NA"}`;
-          }
-        }, {
-          Header: t("ES_FSM_REGISTRY_INBOX_ENABLED"),
-          exportAccessor: row => (row === null || row === void 0 ? void 0 : row.status) || "NA"
-        }];
       default:
         return [];
     }
@@ -3553,7 +3501,7 @@ const VendorInbox = props => {
 };
 
 const SearchVendor = () => {
-  var _sortParams$, _sortParams$2, _searchParams$vendor, _searchParams$filling, _searchParams$vendor2, _allFillingPoints$fil;
+  var _userInfo$info, _userInfo$info2, _sortParams$, _sortParams$2, _searchParams$vendor, _searchParams$filling, _searchParams$vendor2, _searchParams$vendor3, _searchParams$vendor4, _allFillingPoints$fil;
   const {
     t
   } = useTranslation();
@@ -3572,6 +3520,9 @@ const SearchVendor = () => {
   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 {
     data: allVendors
   } = Digit.Hooks.fsm.useDsoSearch(tenantId, {
@@ -3605,7 +3556,7 @@ const SearchVendor = () => {
       ...paginationParms,
       registrationNumber: searchParams === null || searchParams === void 0 ? void 0 : searchParams.registrationNumber,
       status: "ACTIVE,DISABLED",
-      vendorId: searchParams === null || searchParams === void 0 ? void 0 : (_searchParams$vendor = searchParams.vendor) === null || _searchParams$vendor === void 0 ? void 0 : _searchParams$vendor.id,
+      vendorId: isCitizen ? loggedInVendorId : searchParams === null || searchParams === void 0 ? void 0 : (_searchParams$vendor = searchParams.vendor) === null || _searchParams$vendor === void 0 ? void 0 : _searchParams$vendor.id,
       fillingPointId: searchParams === null || searchParams === void 0 ? void 0 : (_searchParams$filling = searchParams.fillingPoint) === null || _searchParams$filling === void 0 ? void 0 : _searchParams$filling.id
     },
     config: {
@@ -3617,19 +3568,23 @@ const SearchVendor = () => {
       ...paginationParms,
       name: searchParams === null || searchParams === void 0 ? void 0 : searchParams.name,
       status: "ACTIVE,DISABLED",
-      vendorId: searchParams === null || searchParams === void 0 ? void 0 : (_searchParams$vendor2 = searchParams.vendor) === null || _searchParams$vendor2 === void 0 ? void 0 : _searchParams$vendor2.id
+      vendorId: isCitizen ? loggedInVendorId : searchParams === null || searchParams === void 0 ? void 0 : (_searchParams$vendor2 = searchParams.vendor) === null || _searchParams$vendor2 === void 0 ? void 0 : _searchParams$vendor2.id
     },
     config: {
       enabled: false
     }
   }) : tab === "SUPERVISOR" ? Digit.Hooks.fsm.useSupervisorSearch(tenantId, {
     ...paginationParms,
-    status: "ACTIVE,DISABLED"
+    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"
+    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
   }) : Digit.Hooks.fsm.useVendorSearch({
@@ -4602,7 +4557,7 @@ const CitizenVendorApp = () => {
     })))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}`,
-    component: () => Digit.UserService.hasAccess(["WT_VENDOR", "EKYC_VENDOR"]) ? /*#__PURE__*/React.createElement("div", {
+    component: () => Digit.UserService.hasAccess(["WT_VENDOR", "EKYC_VENDOR", "EKYC_SUPERVISOR"]) ? /*#__PURE__*/React.createElement("div", {
       style: {
         display: "flex",
         gap: "24px",
@@ -4667,7 +4622,7 @@ const formatLabel = key => {
   return result.charAt(0).toUpperCase() + result.slice(1);
 };
 const EditVendorDetails = props => {
-  var _userInfo$info$type, _dsoData$4, _dsoData$4$employeeRe;
+  var _dsoData$, _dsoData$$dsoDetails, _vendorAdditionalData, _vendorAdditionalData2, _vendorAdditionalData3, _parsedAdditionalDeta, _userInfo$info$type, _dsoData$5, _dsoData$5$employeeRe, _supervisorData$super, _surveyorData$surveyo;
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const {
     t
@@ -4693,6 +4648,27 @@ const EditVendorDetails = props => {
   }, {
     staleTime: Infinity
   });
+  const {
+    data: vendorAdditionalData,
+    isLoading: isVendorAdditionalLoading
+  } = Digit.Hooks.vendor.useEmpvendorCommonSearch({
+    tenantId,
+    filters: {
+      vendorId: dsoId
+    }
+  }, {
+    enabled: !!dsoId
+  });
+  let parsedAdditionalDetails = dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$ = dsoData[0]) === null || _dsoData$ === void 0 ? void 0 : (_dsoData$$dsoDetails = _dsoData$.dsoDetails) === null || _dsoData$$dsoDetails === void 0 ? void 0 : _dsoData$$dsoDetails.additionalDetails;
+  if (typeof parsedAdditionalDetails === "string") {
+    try {
+      parsedAdditionalDetails = JSON.parse(parsedAdditionalDetails);
+    } catch (e) {
+      console.error("Error parsing additional details", e);
+    }
+  }
+  const serviceType = (vendorAdditionalData === null || vendorAdditionalData === void 0 ? void 0 : (_vendorAdditionalData = vendorAdditionalData.VendorDetails) === null || _vendorAdditionalData === void 0 ? void 0 : (_vendorAdditionalData2 = _vendorAdditionalData[0]) === null || _vendorAdditionalData2 === void 0 ? void 0 : (_vendorAdditionalData3 = _vendorAdditionalData2.vendorAdditionalDetails) === null || _vendorAdditionalData3 === void 0 ? void 0 : _vendorAdditionalData3.serviceType) || ((_parsedAdditionalDeta = parsedAdditionalDetails) === null || _parsedAdditionalDeta === void 0 ? void 0 : _parsedAdditionalDeta.serviceType);
+  const isEkyc = serviceType === "EKYC" || serviceType === "ekyc";
   const {
     data: vehicleData,
     refetch: refetchVehicle
@@ -4703,6 +4679,9 @@ const EditVendorDetails = props => {
       sortBy: "registrationNumber",
       sortOrder: "ASC",
       vehicleWithNoVendor: true
+    },
+    config: {
+      enabled: !isEkyc
     }
   });
   const {
@@ -4715,18 +4694,26 @@ const EditVendorDetails = props => {
       sortOrder: "ASC",
       status: "ACTIVE",
       driverWithNoVendor: true
+    },
+    config: {
+      enabled: !isEkyc
     }
   });
   const {
-    data: vendorAdditionalData,
-    isLoading: isVendorAdditionalLoading
-  } = Digit.Hooks.vendor.useEmpvendorCommonSearch({
-    tenantId,
-    filters: {
-      vendorId: dsoId
-    }
+    data: supervisorData,
+    refetch: refetchSupervisor
+  } = Digit.Hooks.fsm.useSupervisorSearch(tenantId, {
+    vendorId: dsoId
   }, {
-    enabled: !!dsoId
+    enabled: isEkyc
+  });
+  const {
+    data: surveyorData,
+    refetch: refetchSurveyor
+  } = Digit.Hooks.fsm.useSurveyorSearch(tenantId, {
+    vendorId: dsoId
+  }, {
+    enabled: isEkyc
   });
   const {
     mutate
@@ -4764,8 +4751,8 @@ const EditVendorDetails = props => {
     setShowModal(false);
   };
   const handleVendorUpdate = () => {
-    var _dsoData$;
-    let dsoDetails = dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$ = dsoData[0]) === null || _dsoData$ === void 0 ? void 0 : _dsoData$.dsoDetails;
+    var _dsoData$2;
+    let dsoDetails = dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$2 = dsoData[0]) === null || _dsoData$2 === void 0 ? void 0 : _dsoData$2.dsoDetails;
     let formData = {};
     if (selectedAction === "DELETE") {
       formData = {
@@ -4843,8 +4830,8 @@ const EditVendorDetails = props => {
   const onDelete = (details, type, id) => {
     let formData = {};
     if (type === "ES_FSM_REGISTRY_DETAILS_TYPE_DRIVER") {
-      var _dsoData$2, _dsoDetails$owner3;
-      let dsoDetails = dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$2 = dsoData[0]) === null || _dsoData$2 === void 0 ? void 0 : _dsoData$2.dsoDetails;
+      var _dsoData$3, _dsoDetails$owner3;
+      let dsoDetails = dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$3 = dsoData[0]) === null || _dsoData$3 === void 0 ? void 0 : _dsoData$3.dsoDetails;
       let drivers = dsoDetails === null || dsoDetails === void 0 ? void 0 : dsoDetails.drivers;
       drivers = drivers.map(data => {
         if (data.id === id) {
@@ -4863,8 +4850,8 @@ const EditVendorDetails = props => {
         }
       };
     } else {
-      var _dsoData$3, _details$values2, _details$values2$find, _dsoDetails$owner4;
-      let dsoDetails = dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$3 = dsoData[0]) === null || _dsoData$3 === void 0 ? void 0 : _dsoData$3.dsoDetails;
+      var _dsoData$4, _details$values2, _details$values2$find, _dsoDetails$owner4;
+      let dsoDetails = dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$4 = dsoData[0]) === null || _dsoData$4 === void 0 ? void 0 : _dsoData$4.dsoDetails;
       let vehicles = dsoDetails === null || dsoDetails === void 0 ? void 0 : dsoDetails.vehicles;
       let registrationNumber = details === null || details === void 0 ? void 0 : (_details$values2 = details.values) === null || _details$values2 === void 0 ? void 0 : (_details$values2$find = _details$values2.find(ele => ele.title === "ES_FSM_REGISTRY_VEHICLE_NUMBER")) === null || _details$values2$find === void 0 ? void 0 : _details$values2$find.value;
       vehicles = vehicles.map(data => {
@@ -4942,8 +4929,9 @@ const EditVendorDetails = props => {
   const excludedKeys = ["vendorAdditionalDetailsId", "vendorId", "tenantId", "code", "lastModifiedTime", "createdTime", "lastModifiedBy", "createdBy", "active", "status", "vendorType", "vendorGroup", "narration", "documents"];
   return /*#__PURE__*/React.createElement("div", {
     className: "employee-form-content"
-  }, !isLoading ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Card, null, dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$4 = dsoData[0]) === null || _dsoData$4 === void 0 ? void 0 : (_dsoData$4$employeeRe = _dsoData$4.employeeResponse) === null || _dsoData$4$employeeRe === void 0 ? void 0 : _dsoData$4$employeeRe.map((detail, index) => {
+  }, !isLoading ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Card, null, dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$5 = dsoData[0]) === null || _dsoData$5 === void 0 ? void 0 : (_dsoData$5$employeeRe = _dsoData$5.employeeResponse) === null || _dsoData$5$employeeRe === void 0 ? void 0 : _dsoData$5$employeeRe.map((detail, index) => {
     var _detail$values, _detail$child;
+    if (isEkyc && index > 0) return null;
     return /*#__PURE__*/React.createElement(React.Fragment, {
       key: index
     }, index > 0 && /*#__PURE__*/React.createElement(CardSectionHeader, {
@@ -4954,8 +4942,8 @@ const EditVendorDetails = props => {
     }, t(detail.title)), /*#__PURE__*/React.createElement("div", null, detail === null || detail === void 0 ? void 0 : (_detail$values = detail.values) === null || _detail$values === void 0 ? void 0 : _detail$values.map((value, index) => {
       var _detail$values2;
       if (value.title === "ES_FSM_REGISTRY_DETAILS_ADDITIONAL_DETAILS") {
-        var _vendorAdditionalData, _vendorAdditionalData2;
-        const additionalDetails = vendorAdditionalData === null || vendorAdditionalData === void 0 ? void 0 : (_vendorAdditionalData = vendorAdditionalData.VendorDetails) === null || _vendorAdditionalData === void 0 ? void 0 : (_vendorAdditionalData2 = _vendorAdditionalData[0]) === null || _vendorAdditionalData2 === void 0 ? void 0 : _vendorAdditionalData2.vendorAdditionalDetails;
+        var _vendorAdditionalData4, _vendorAdditionalData5;
+        const additionalDetails = vendorAdditionalData === null || vendorAdditionalData === void 0 ? void 0 : (_vendorAdditionalData4 = vendorAdditionalData.VendorDetails) === null || _vendorAdditionalData4 === void 0 ? void 0 : (_vendorAdditionalData5 = _vendorAdditionalData4[0]) === null || _vendorAdditionalData5 === void 0 ? void 0 : _vendorAdditionalData5.vendorAdditionalDetails;
         const entries = Object.entries(additionalDetails || {}).filter(([key]) => !excludedKeys.includes(key));
         return /*#__PURE__*/React.createElement(React.Fragment, {
           key: value.title
@@ -4976,8 +4964,8 @@ const EditVendorDetails = props => {
           const safeKey = String(key);
           let safeVal = val !== null && val !== undefined && val !== "" ? String(val) : "N/A";
           if (key === "name" && (!val || val === "")) {
-            var _dsoData$5, _dsoData$5$dsoDetails;
-            safeVal = (dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$5 = dsoData[0]) === null || _dsoData$5 === void 0 ? void 0 : (_dsoData$5$dsoDetails = _dsoData$5.dsoDetails) === null || _dsoData$5$dsoDetails === void 0 ? void 0 : _dsoData$5$dsoDetails.name) || "N/A";
+            var _dsoData$6, _dsoData$6$dsoDetails;
+            safeVal = (dsoData === null || dsoData === void 0 ? void 0 : (_dsoData$6 = dsoData[0]) === null || _dsoData$6 === void 0 ? void 0 : (_dsoData$6$dsoDetails = _dsoData$6.dsoDetails) === null || _dsoData$6$dsoDetails === void 0 ? void 0 : _dsoData$6$dsoDetails.name) || "N/A";
           }
           return /*#__PURE__*/React.createElement(React.Fragment, {
             key: safeKey
@@ -5049,7 +5037,105 @@ const EditVendorDetails = props => {
       className: "add-details-link hover-button",
       onClick: () => onActionSelect(detail.type === "ES_FSM_REGISTRY_DETAILS_TYPE_DRIVER" ? "ADD_DRIVER" : "ADD_VEHICLE")
     }, t(`${detail.type}_ADD`))));
-  })), showModal && /*#__PURE__*/React.createElement(Modal, {
+  }), isEkyc && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardSectionHeader, {
+    style: {
+      marginBottom: "16px",
+      marginTop: "32px"
+    }
+  }, t("ES_VENDOR_SUPERVISOR_DETAILS")), /*#__PURE__*/React.createElement("div", null, supervisorData === null || supervisorData === void 0 ? void 0 : (_supervisorData$super = supervisorData.supervisor) === null || _supervisorData$super === void 0 ? void 0 : _supervisorData$super.map((supervisor, index) => {
+    var _supervisor$owner, _supervisor$owner2;
+    return /*#__PURE__*/React.createElement(Card, {
+      className: "card-with-background",
+      key: supervisor.id || index
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "card-head"
+    }, /*#__PURE__*/React.createElement("h2", null, t("ES_VENDOR_SUPERVISOR_DETAILS"), " ", index + 1), /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: "flex"
+      }
+    }, /*#__PURE__*/React.createElement("span", {
+      onClick: () => history.push(`/digit-ui/${userType}/vendor/registry/supervisor-details/${supervisor.id}`)
+    }, /*#__PURE__*/React.createElement(EditIcon, {
+      style: {
+        cursor: "pointer",
+        marginRight: "20px"
+      },
+      className: "edit",
+      fill: "#a82227"
+    })))), /*#__PURE__*/React.createElement("div", {
+      className: "additional-grid",
+      style: {
+        padding: "8px 16px"
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "additional-label"
+    }, t("ES_FSM_REGISTRY_NEW_OWNER_NAME")), /*#__PURE__*/React.createElement("div", {
+      className: "additional-value"
+    }, (_supervisor$owner = supervisor.owner) === null || _supervisor$owner === void 0 ? void 0 : _supervisor$owner.name), /*#__PURE__*/React.createElement("div", {
+      className: "additional-label"
+    }, t("ES_FSM_REGISTRY_VENDOR_PHONE")), /*#__PURE__*/React.createElement("div", {
+      className: "additional-value"
+    }, (_supervisor$owner2 = supervisor.owner) === null || _supervisor$owner2 === void 0 ? void 0 : _supervisor$owner2.mobileNumber), /*#__PURE__*/React.createElement("div", {
+      className: "additional-label"
+    }, t("ES_VENDOR_STATUS")), /*#__PURE__*/React.createElement("div", {
+      className: "additional-value",
+      style: supervisor.status === "ACTIVE" ? {
+        color: "green"
+      } : {}
+    }, supervisor.status)));
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "add-details-link hover-button",
+    onClick: () => history.push(`/digit-ui/${userType}/vendor/registry/new-supervisor?vendorId=${dsoId}`)
+  }, t(`ES_VENDOR_ADD_SUPERVISOR`))), /*#__PURE__*/React.createElement(CardSectionHeader, {
+    style: {
+      marginBottom: "16px",
+      marginTop: "32px"
+    }
+  }, t("ES_VENDOR_SURVEYOR_DETAILS")), /*#__PURE__*/React.createElement("div", null, surveyorData === null || surveyorData === void 0 ? void 0 : (_surveyorData$surveyo = surveyorData.surveyor) === null || _surveyorData$surveyo === void 0 ? void 0 : _surveyorData$surveyo.map((surveyor, index) => {
+    var _surveyor$owner, _surveyor$owner2;
+    return /*#__PURE__*/React.createElement(Card, {
+      className: "card-with-background",
+      key: surveyor.id || index
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "card-head"
+    }, /*#__PURE__*/React.createElement("h2", null, t("ES_VENDOR_SURVEYOR_DETAILS"), " ", index + 1), /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: "flex"
+      }
+    }, /*#__PURE__*/React.createElement("span", {
+      onClick: () => history.push(`/digit-ui/${userType}/vendor/registry/surveyor-details/${surveyor.id}`)
+    }, /*#__PURE__*/React.createElement(EditIcon, {
+      style: {
+        cursor: "pointer",
+        marginRight: "20px"
+      },
+      className: "edit",
+      fill: "#a82227"
+    })))), /*#__PURE__*/React.createElement("div", {
+      className: "additional-grid",
+      style: {
+        padding: "8px 16px"
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "additional-label"
+    }, t("ES_FSM_REGISTRY_NEW_OWNER_NAME")), /*#__PURE__*/React.createElement("div", {
+      className: "additional-value"
+    }, (_surveyor$owner = surveyor.owner) === null || _surveyor$owner === void 0 ? void 0 : _surveyor$owner.name), /*#__PURE__*/React.createElement("div", {
+      className: "additional-label"
+    }, t("ES_FSM_REGISTRY_VENDOR_PHONE")), /*#__PURE__*/React.createElement("div", {
+      className: "additional-value"
+    }, (_surveyor$owner2 = surveyor.owner) === null || _surveyor$owner2 === void 0 ? void 0 : _surveyor$owner2.mobileNumber), /*#__PURE__*/React.createElement("div", {
+      className: "additional-label"
+    }, t("ES_VENDOR_STATUS")), /*#__PURE__*/React.createElement("div", {
+      className: "additional-value",
+      style: surveyor.status === "ACTIVE" ? {
+        color: "green"
+      } : {}
+    }, surveyor.status)));
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "add-details-link hover-button",
+    onClick: () => history.push(`/digit-ui/${userType}/vendor/registry/new-surveyor?vendorId=${dsoId}`)
+  }, t(`ES_VENDOR_ADD_SURVEYOR`))))), showModal && /*#__PURE__*/React.createElement(Modal, {
     headerBarMain: /*#__PURE__*/React.createElement(Heading, {
       label: 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")
     }),
@@ -5734,6 +5820,32 @@ const SupervisorConfig = (t, agencies = [], reportingManagers = [], disabled = f
         },
         className: "payment-form-text-input-correction"
       }
+    }, {
+      label: t("ES_VENDOR_SUPERVISOR_ASSIGNED_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"
+      }
     }, {
       label: t("ES_VENDOR_SUPERVISOR_DESCRIPTION"),
       isMandatory: false,
@@ -5750,16 +5862,26 @@ const AddSupervisor = ({
   parentUrl,
   heading
 }) => {
-  const tenantId = Digit.ULBService.getCurrentTenantId();
+  var _Digit$UserService$ge;
   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`;
   const [showToast, setShowToast] = useState(null);
   const queryClient = useQueryClient();
   const [canSubmit, setCanSubmit] = useState(false);
   const {
     mutate
   } = Digit.Hooks.fsm.useSupervisorCreate(tenantId);
+  const {
+    search
+  } = 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: {
@@ -5768,7 +5890,7 @@ 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.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.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 {
@@ -5779,10 +5901,30 @@ const AddSupervisor = ({
     setShowToast(null);
   };
   const onSubmit = data => {
-    var _data$relationship, _data$gender;
+    var _data$assignedZone, _data$relationship, _data$gender;
     const formData = {
+      RequestInfo: {
+        apiId: "Rainmaker",
+        ver: "1.0",
+        ts: null,
+        action: "_create",
+        msgId: `${Date.now()}|en_IN`,
+        authToken: userInfo === null || userInfo === void 0 ? void 0 : userInfo.authToken,
+        userInfo: {
+          id: userInfo === null || userInfo === void 0 ? void 0 : userInfo.id,
+          uuid: userInfo === null || userInfo === void 0 ? void 0 : userInfo.uuid,
+          userName: userInfo === null || userInfo === void 0 ? void 0 : userInfo.userName,
+          name: userInfo === null || userInfo === void 0 ? void 0 : userInfo.name,
+          type: userInfo === null || userInfo === void 0 ? void 0 : userInfo.type,
+          tenantId: tenantId,
+          roles: userInfo === null || userInfo === void 0 ? void 0 : userInfo.roles
+        }
+      },
       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: {
           tenantId: tenantId,
           name: data === null || data === void 0 ? void 0 : data.fullName,
@@ -5794,12 +5936,8 @@ const AddSupervisor = ({
           emailId: data === null || data === void 0 ? void 0 : data.emailId,
           correspondenceAddress: data === null || data === void 0 ? void 0 : data.correspondenceAddress
         }
-      },
-      RequestInfo: {
-        msgId: "ekyc-supervisor-create"
       }
     };
-    console.log("DEBUG: Supervisor create payload:", formData);
     mutate(formData, {
       onError: error => {
         setShowToast({
@@ -5989,16 +6127,24 @@ const AddSurveyor = ({
   parentUrl,
   heading
 }) => {
-  const tenantId = Digit.ULBService.getCurrentTenantId();
+  var _Digit$UserService$ge;
   const {
     t
   } = useTranslation();
+  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`;
   const [showToast, setShowToast] = useState(null);
   const queryClient = useQueryClient();
   const [canSubmit, setCanSubmit] = useState(false);
   const {
     mutate
   } = Digit.Hooks.fsm.useSurveyorCreate(tenantId);
+  const {
+    search
+  } = useLocation();
+  const queryParams = new URLSearchParams(search);
+  const vendorIdParam = queryParams.get("vendorId");
   const Config = SurveyorConfig(t);
   const defaultValues = {
     role: {
@@ -6020,10 +6166,27 @@ const AddSurveyor = ({
   const onSubmit = data => {
     var _data$agencyName, _data$agencyName2, _data$reportingManage, _data$reportingManage2, _data$relationship, _data$gender;
     const formData = {
+      RequestInfo: {
+        apiId: "Rainmaker",
+        ver: "1.0",
+        ts: null,
+        action: "_create",
+        msgId: `${Date.now()}|en_IN`,
+        authToken: userInfo === null || userInfo === void 0 ? void 0 : userInfo.authToken,
+        userInfo: {
+          id: userInfo === null || userInfo === void 0 ? void 0 : userInfo.id,
+          uuid: userInfo === null || userInfo === void 0 ? void 0 : userInfo.uuid,
+          userName: userInfo === null || userInfo === void 0 ? void 0 : userInfo.userName,
+          name: userInfo === null || userInfo === void 0 ? void 0 : userInfo.name,
+          type: userInfo === null || userInfo === void 0 ? void 0 : userInfo.type,
+          tenantId: tenantId,
+          roles: userInfo === null || userInfo === void 0 ? void 0 : userInfo.roles
+        }
+      },
       surveyor: {
         tenantId: tenantId,
-        vendorId: (data === null || data === void 0 ? void 0 : (_data$agencyName = data.agencyName) === null || _data$agencyName === void 0 ? void 0 : _data$agencyName.code) || (data === null || data === void 0 ? void 0 : (_data$agencyName2 = data.agencyName) === null || _data$agencyName2 === void 0 ? void 0 : _data$agencyName2.id) || "DL-DJB-000082",
-        supervisorId: (data === null || data === void 0 ? void 0 : (_data$reportingManage = data.reportingManager) === null || _data$reportingManage === void 0 ? void 0 : _data$reportingManage.code) || (data === null || data === void 0 ? void 0 : (_data$reportingManage2 = data.reportingManager) === null || _data$reportingManage2 === void 0 ? void 0 : _data$reportingManage2.id) || "7fb7ce1d-1054-46c8-9518-ef0049bffcd4",
+        vendorId: vendorIdParam || (data === null || data === void 0 ? void 0 : (_data$agencyName = data.agencyName) === null || _data$agencyName === void 0 ? void 0 : _data$agencyName.code) || (data === null || data === void 0 ? void 0 : (_data$agencyName2 = data.agencyName) === null || _data$agencyName2 === void 0 ? void 0 : _data$agencyName2.id) || (userInfo === null || userInfo === void 0 ? void 0 : userInfo.uuid),
+        supervisorId: (data === null || data === void 0 ? void 0 : (_data$reportingManage = data.reportingManager) === null || _data$reportingManage === void 0 ? void 0 : _data$reportingManage.code) || (data === null || data === void 0 ? void 0 : (_data$reportingManage2 = data.reportingManager) === null || _data$reportingManage2 === void 0 ? void 0 : _data$reportingManage2.id) || null,
         description: (data === null || data === void 0 ? void 0 : data.description) || "",
         additionalDetails: {
           serviceType: "ekyc"
@@ -6039,10 +6202,6 @@ const AddSurveyor = ({
           mobileNumber: data === null || data === void 0 ? void 0 : data.mobileNumber,
           correspondenceAddress: data === null || data === void 0 ? void 0 : data.correspondenceAddress
         }
-      },
-      RequestInfo: {
-        apiId: "Rainmaker",
-        msgId: "ekyc-surveyor-create"
       }
     };
     mutate(formData, {