@djb25/digit-ui-module-ekyc 1.0.62 → 1.0.64

package/dist/index.modern.js

@@ -1,7 +1,7 @@
 import React, { useState, useRef, useEffect, useMemo, createContext, useContext, isValidElement, cloneElement, createElement, useCallback, useReducer, Fragment } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useHistory, Link, useParams, useLocation, useRouteMatch, Switch, Route, Redirect } from 'react-router-dom';
-import { PersonIcon, EmployeeModuleCard, Loader, Card, InboxLinks, Table, HomeIcon, TextInput, Header, SubmitBar, DetailsCard, FilterForm, FilterFormField, Dropdown, Label, CustomTooltip, CardLabelError, SearchField, RadioButtons, InboxComposer, CardSubHeader, StatusTable, Row, GenericFileIcon, CheckBox, ActionBar, Menu, LinkButton, Toast, EditIcon, UploadFile, FormComposer, VerticalTimeline, Modal, Close, CollapsibleCardPage, DatePicker, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, CardHeader, CardText, CitizenHomeCard, DocumentIcon } from '@djb25/digit-ui-react-components';
+import { PersonIcon, EmployeeModuleCard, FaChartBar, MdDownloadIcon, Loader, InboxLinks, Card, Table, HomeIcon, TextInput, Header, SubmitBar, DetailsCard, FilterForm, FilterFormField, Dropdown, Label, CustomTooltip, CardLabelError, SearchField, RadioButtons, InboxComposer, CardSubHeader, StatusTable, Row, GenericFileIcon, CheckBox, ActionBar, Menu, LinkButton, Toast, EditIcon, UploadFile, FormComposer, VerticalTimeline, Modal, Close, CollapsibleCardPage, DatePicker, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, CardHeader, CardText, CitizenHomeCard, DocumentIcon } from '@djb25/digit-ui-react-components';
 import * as Chartjs from 'chart.js/auto';
 import Chartjs__default, { Chart } from 'chart.js/auto';
 import { FaUsers, FaCheckCircle, FaClock, FaChartLine } from 'react-icons/fa';
@@ -181,28 +181,6 @@ const StatusCards = _ref => {
   }
   const loggedInUser = (_Digit$SessionStorage = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.info;
   const fullName = (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.name) || "Admin";
-  const hasExternalData = countData && typeof countData.total === "number" && typeof countData.submittedCount === "number";
-  const _Digit$Hooks$ekyc$use = Digit.Hooks.ekyc.useEkycSurveyorDashboard({}, {
-      tenantId,
-      offset: 0,
-      limit: 10,
-      ekycStatus: "submitted"
-    }, {
-      enabled: !!tenantId && !hasExternalData
-    }),
-    dashboardData = _Digit$Hooks$ekyc$use.data;
-  const apiCountData = React.useMemo(() => {
-    const info = (dashboardData === null || dashboardData === void 0 ? void 0 : dashboardData.dashboardInfo) || {};
-    return {
-      total: info.total || 0,
-      completed: info.completed || 0,
-      pending: info.pending || 0,
-      submittedCount: info.submittedCount || 0,
-      inProgressCount: info.inProgressCount || 0,
-      rejected: info.rejected || 0,
-      active: info.active || 0
-    };
-  }, [dashboardData]);
   const handleDownloadEkycData = function (fromDate, toDate) {
     try {
       setEkycDownloadLoading(true);
@@ -328,7 +306,6 @@ const StatusCards = _ref => {
               meterPhotoFileStoreId: t("METER_PHOTO_FILESTORE_ID"),
               modifiedBy: t("MODIFIED_BY"),
               emailId: t("EMAIL_ID"),
-              fatherOrHusbandName: t("FATHER_HUSBUND_NAME"),
               dob: t("DOB"),
               consumerType: t("CONSUMER_TYPE"),
               createdTime: t("CREATED_TIME"),
@@ -454,16 +431,7 @@ const StatusCards = _ref => {
   };
   const chartRef1 = useRef(null);
   const chartInstance1 = useRef(null);
-  const total = hasExternalData ? countData.total : (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.total) || (countData === null || countData === void 0 ? void 0 : countData.total) || (countData === null || countData === void 0 ? void 0 : countData.totalCount) || 0;
-  const pending = hasExternalData ? countData.pending : (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.pending) || (countData === null || countData === void 0 ? void 0 : countData.pending) || 0;
-  const active = hasExternalData ? countData.active : (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.active) || (countData === null || countData === void 0 ? void 0 : countData.active) || 0;
-  const completed = hasExternalData ? countData.completed : (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.completed) || (countData === null || countData === void 0 ? void 0 : countData.completed) || 0;
-  const inprocess = hasExternalData ? countData.inProgressCount : (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.inProgressCount) || (countData === null || countData === void 0 ? void 0 : countData.inProgressCount) || 0;
-  const submitted = hasExternalData ? countData.submittedCount : (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.submittedCount) || (countData === null || countData === void 0 ? void 0 : countData.submittedCount) || 0;
-  const actualCompleted = completed;
-  const approved = actualCompleted;
-  const efficiency = total > 0 ? Math.round((submitted + completed) / total * 100) : 0;
-  const healthPct = submitted > 0 ? Math.round(approved / submitted * 100) : 0;
+  const efficiency = (countData === null || countData === void 0 ? void 0 : countData.total) > 0 ? Math.round(((countData === null || countData === void 0 ? void 0 : countData.submittedCount) + (countData === null || countData === void 0 ? void 0 : countData.completed)) / (countData === null || countData === void 0 ? void 0 : countData.total) * 100) : 0;
   const formatNumber = num => new Intl.NumberFormat("en-IN").format(num || 0);
   useEffect(() => {
     if (chartRef1.current) {
@@ -475,7 +443,7 @@ const StatusCards = _ref => {
         data: {
           labels: [t("EKYC_PENDING"), t("EKYC_COMPLETED"), t("EKYC_SUBMITTED"), t("EKYC_INPROCESS")],
           datasets: [{
-            data: [pending, completed, submitted, inprocess],
+            data: [countData === null || countData === void 0 ? void 0 : countData.pending, countData === null || countData === void 0 ? void 0 : countData.completed, countData === null || countData === void 0 ? void 0 : countData.submitted, countData === null || countData === void 0 ? void 0 : countData.inprocess],
             backgroundColor: ["#0c2a52", "#77B6EA", "#c8ddf5", "#49a3fb"],
             borderColor: ["#ffffff", "#ffffff", "#ffffff", "#ffffff"],
             borderWidth: 2,
@@ -497,23 +465,31 @@ const StatusCards = _ref => {
     return () => {
       if (chartInstance1.current) chartInstance1.current.destroy();
     };
-  }, [pending, completed, active, t]);
+  }, [countData, t]);
   const legendItems = [{
+    color: "#77B6EA",
+    label: t("EKYC_TOTAL"),
+    value: countData === null || countData === void 0 ? void 0 : countData.total
+  }, {
     color: "#77B6EA",
     label: t("EKYC_COMPLETED"),
-    value: completed
+    value: countData === null || countData === void 0 ? void 0 : countData.completed
   }, {
     color: "#0c2a52",
     label: t("EKYC_PENDING"),
-    value: pending
+    value: countData === null || countData === void 0 ? void 0 : countData.pending
+  }, {
+    color: "#c8ddf5",
+    label: t("EKYC_SUBMITTED_BY_VENDORS"),
+    value: countData === null || countData === void 0 ? void 0 : countData.submittedCount
   }, {
     color: "#c8ddf5",
-    label: t("EKYC_SUBMITTED"),
-    value: submitted
+    label: t("EKYC_SUBMITTED_BY_CITIZEN"),
+    value: (countData === null || countData === void 0 ? void 0 : countData.selfEkycCount) || 0
   }, {
-    color: "#49a3fb",
-    label: t("EKYC_INPROCESS"),
-    value: inprocess
+    color: "#c8ddf5",
+    label: t("EKYC_REJECTED"),
+    value: (countData === null || countData === void 0 ? void 0 : countData.rejected) || 0
   }];
   return /*#__PURE__*/React.createElement("div", {
     className: "ekyc-employee-container"
@@ -521,49 +497,29 @@ const StatusCards = _ref => {
     className: "status-cards-wrapper"
   }, /*#__PURE__*/React.createElement("div", {
     className: "status-cards-header"
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
-    className: "eyebrow"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "eyebrow-dot"
-  }), t("EKYC_INSTITUTIONAL_OVERVIEW") || "Institutional Performance Overview"), /*#__PURE__*/React.createElement("h1", {
-    className: "status-cards-h1"
-  }, t("EKYC_DASHBOARD_TITLE") || "eKYC Verification Dashboard"), /*#__PURE__*/React.createElement("p", {
-    className: "status-cards-subtitle"
-  }, t("EKYC_DASHBOARD_SUBTITLE") || "Real-time monitoring of consumer verification workflows across all administrative zones.")), /*#__PURE__*/React.createElement("div", {
-    className: "total-applications-card"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "total-label"
-  }, t("EKYC_TOTAL_APPLICATIONS") || "Total Applications Processed"), /*#__PURE__*/React.createElement("div", {
-    className: "total-number"
-  }, formatNumber(total)), /*#__PURE__*/React.createElement("div", {
+    className: "status-card-title"
+  }, /*#__PURE__*/React.createElement(FaChartBar, {
+    size: 32,
+    color: "#fff",
+    backgroundColor: "#065297",
+    style: {
+      paddingInline: "4px",
+      borderRadius: "4px  "
+    }
+  }), /*#__PURE__*/React.createElement("h1", {
+    className: "status-cards-h1"
+  }, t("EKYC_DASHBOARD_TITLE") || "eKYC Verification Dashboard")), /*#__PURE__*/React.createElement("div", {
     className: "report-download",
     ref: reportMenuRef
   }, /*#__PURE__*/React.createElement("button", {
-    className: "download-excel-btn",
+    className: "total-applications-card download-btn",
     disabled: ekycDownloadLoading,
     onClick: () => {
       setShowReportMenu(p => !p);
       setShowCustomPicker(false);
     }
-  }, /*#__PURE__*/React.createElement("svg", {
-    width: "16",
-    height: "16",
-    viewBox: "0 0 24 24",
-    fill: "none",
-    stroke: "currentColor",
-    strokeWidth: "2.5",
-    strokeLinecap: "round",
-    strokeLinejoin: "round"
-  }, /*#__PURE__*/React.createElement("path", {
-    d: "M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"
-  }), /*#__PURE__*/React.createElement("polyline", {
-    points: "7 10 12 15 17 10"
-  }), /*#__PURE__*/React.createElement("line", {
-    x1: "12",
-    y1: "15",
-    x2: "12",
-    y2: "3"
-  })), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"), showReportMenu && /*#__PURE__*/React.createElement("div", {
+  }, t("DOWNLOAD_REPORT") || "Download Report", /*#__PURE__*/React.createElement(MdDownloadIcon, null)), showReportMenu && /*#__PURE__*/React.createElement("div", {
     className: "report-menu"
   }, [{
     label: t("TODAY") || "Today",
@@ -609,7 +565,8 @@ const StatusCards = _ref => {
     }
   }, /*#__PURE__*/React.createElement("button", {
     className: "picker-cancel-btn",
-    onClick: () => {
+    onClick: e => {
+      e.stopPropagation();
       setShowCustomPicker(false);
       setCustomDate({
         from: "",
@@ -618,32 +575,25 @@ const StatusCards = _ref => {
     }
   }, t("CANCEL") || "Cancel"), /*#__PURE__*/React.createElement("button", {
     className: "picker-apply-btn",
-    onClick: handleCustomDownload
-  }, t("APPLY") || "Apply"))))))), /*#__PURE__*/React.createElement("div", {
+    onClick: e => {
+      e.stopPropagation();
+      handleCustomDownload();
+    }
+  }, t("APPLY") || "Apply")))))), /*#__PURE__*/React.createElement("div", {
     className: "status-panels-grid"
   }, /*#__PURE__*/React.createElement("div", {
     className: "status-panel"
   }, /*#__PURE__*/React.createElement("div", {
+    className: "panel-header"
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: "panel-title"
   }, t("EKYC_STATUS_BREAKDOWN") || "Status Breakdown"), /*#__PURE__*/React.createElement("div", {
     className: "panel-subtitle"
-  }, t("EKYC_VERIFICATION_LIFECYCLE") || "Verification lifecycle distribution"), /*#__PURE__*/React.createElement("div", {
-    className: "breakdown-body"
+  }, t("EKYC_VERIFICATION_LIFECYCLE") || "Verification lifecycle")), /*#__PURE__*/React.createElement("div", {
+    className: "completion-badge"
+  }, efficiency, "% Complete")), /*#__PURE__*/React.createElement("div", {
+    className: "status-breakdown-content"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "status-legend"
-  }, legendItems.map(item => /*#__PURE__*/React.createElement("div", {
-    key: item.label,
-    className: "legend-row"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "legend-label"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "indicator-dot",
-    style: {
-      background: item.color
-    }
-  }), item.label), /*#__PURE__*/React.createElement("span", {
-    className: "legend-value"
-  }, formatNumber(item.value))))), /*#__PURE__*/React.createElement("div", {
     className: "chart-wrapper"
   }, /*#__PURE__*/React.createElement("canvas", {
     ref: chartRef1,
@@ -657,38 +607,23 @@ const StatusCards = _ref => {
     className: "chart-percentage"
   }, efficiency, "%"), /*#__PURE__*/React.createElement("div", {
     className: "chart-label"
-  }, t("EKYC_COMPLETE") || "Complete"))))), /*#__PURE__*/React.createElement("div", {
-    className: "status-panel"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "panel-title"
-  }, t("EKYC_SUBMISSION_HEALTH") || "Submission Health"), /*#__PURE__*/React.createElement("div", {
-    className: "panel-subtitle"
-  }, t("EKYC_PLATFORM_EFFICIENCY") || "Platform operational efficiency"), /*#__PURE__*/React.createElement("div", {
-    className: "health-metrics-row"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "health-percentage"
-  }, healthPct, "%")), /*#__PURE__*/React.createElement("div", {
-    className: "status-progress-bar"
+  }, t("EKYC_COMPLETE") || "Complete"))), /*#__PURE__*/React.createElement("div", {
+    className: "status-boxes"
+  }, legendItems.map(item => /*#__PURE__*/React.createElement("div", {
+    className: "status-box",
+    key: item.label
   }, /*#__PURE__*/React.createElement("div", {
-    className: "progress-fill",
+    className: "status-box-top"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "status-indicator",
     style: {
-      width: healthPct + "%"
+      backgroundColor: item.color
     }
-  })), /*#__PURE__*/React.createElement("div", {
-    className: "mini-metrics-grid"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "metric-box"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "metric-label"
-  }, t("EKYC_AVG_LATENCY") || "Avg Latency"), /*#__PURE__*/React.createElement("div", {
-    className: "metric-value"
-  }, "0s")), /*#__PURE__*/React.createElement("div", {
-    className: "metric-box"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "metric-label"
-  }, t("EKYC_ERROR_RATE") || "Error Rate"), /*#__PURE__*/React.createElement("div", {
-    className: "metric-value"
-  }, "0.0%")))))));
+  }), /*#__PURE__*/React.createElement("span", {
+    className: "status-name"
+  }, item.label)), /*#__PURE__*/React.createElement("div", {
+    className: "status-box-value"
+  }, formatNumber(item.value))))))))));
 };
 
 const Dashboard = () => {
@@ -702,23 +637,31 @@ const Dashboard = () => {
     }),
     isLoading = _Digit$Hooks$ekyc$use.isLoading,
     dashboardData = _Digit$Hooks$ekyc$use.data;
+  const _Digit$Hooks$ekyc$use2 = Digit.Hooks.ekyc.useEkycAssignmentProgress({
+      tenantId,
+      allVendorsDetailed: true
+    }, {
+      enabled: true,
+      keepPreviousData: true
+    }),
+    progressData = _Digit$Hooks$ekyc$use2.data,
+    isProgressLoading = _Digit$Hooks$ekyc$use2.isLoading;
   const countData = useMemo(() => {
     const info = (dashboardData === null || dashboardData === void 0 ? void 0 : dashboardData.dashboardInfo) || {};
     return {
       total: info.total || 0,
-      completed: info.completed || 0,
-      pending: info.pending || 0,
-      rejected: info.rejected || 0,
-      active: info.active || 0,
-      submittedCount: info.submittedCount || 0,
-      inProgressCount: info.inProgressCount || 0
+      completed: (progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnos) + (progressData === null || progressData === void 0 ? void 0 : progressData.selfEkycCount) || 0,
+      pending: info.total - (progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnos) - (progressData === null || progressData === void 0 ? void 0 : progressData.selfEkycCount) || 0,
+      rejected: (progressData === null || progressData === void 0 ? void 0 : progressData.rejectedKnos) || 0,
+      active: (progressData === null || progressData === void 0 ? void 0 : progressData.active) || 0,
+      submittedCount: (progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnos) || 0,
+      selfEkycCount: (progressData === null || progressData === void 0 ? void 0 : progressData.selfEkycCount) || 0,
+      overallProgressPercent: (progressData === null || progressData === void 0 ? void 0 : progressData.overallProgressPercent) || 0
     };
-  }, [dashboardData]);
-  return isLoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement(Card, {
-    className: "min-width-full"
-  }, /*#__PURE__*/React.createElement(StatusCards, {
+  }, [dashboardData, progressData]);
+  return isProgressLoading || isLoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement(StatusCards, {
     countData: countData
-  }));
+  });
 };
 
 const _excluded = ["tableConfig", "filterComponent"];
@@ -1991,35 +1934,38 @@ const VendorDetailsCard = () => {
   }, [vendorSearchResponse, vendorId, loggedInUser]);
   const targetVendorId = vendorId || (vendor === null || vendor === void 0 ? void 0 : vendor.id) || (vendor === null || vendor === void 0 ? void 0 : vendor.vendorId);
   const _Digit$Hooks$ekyc$use = Digit.Hooks.ekyc.useEkycAssignmentProgress(targetVendorId ? {
-      vendorId: targetVendorId,
-      vendorIds: [targetVendorId]
+      vendorId: targetVendorId
     } : {}, {
       enabled: !!tenantId,
       keepPreviousData: true
     }),
     isProgressLoading = _Digit$Hooks$ekyc$use.isLoading,
     progressData = _Digit$Hooks$ekyc$use.data;
+  const createDummySupervisors = vendor => {
+    const count = Number(vendor === null || vendor === void 0 ? void 0 : vendor.supervisors) || 5;
+    return Array.from({
+      length: count
+    }, (_, i) => ({
+      id: "SUP_V_" + ((vendor === null || vendor === void 0 ? void 0 : vendor.id) || "DEFAULT") + "_" + (i + 1),
+      name: "Supervisor " + (i + 1),
+      mobileNo: "99999120" + i,
+      status: "ACTIVE",
+      totalKnos: 0,
+      submittedKnos: 0,
+      pendingKnos: 0,
+      progressPercent: 0,
+      isDummy: true
+    }));
+  };
   const vendorSupervisors = useMemo(() => {
-    if (!(supervisorSearchResponse !== null && supervisorSearchResponse !== void 0 && supervisorSearchResponse.supervisors)) {
-      if (vendor && Array.isArray(ekycMockData.vendors)) {
-        const mockSupList = Array.from({
-          length: vendor.supervisors || 5
-        }, (_, i) => ({
-          id: "SUP_V_" + (vendor.id || 1) + "_" + i,
-          name: "Supervisor " + (i + 1) + " (" + vendor.name + ")",
-          mobileNo: "99999120" + i,
-          status: "ACTIVE",
-          totalKnos: Math.round(1000 + Math.random() * 4000),
-          submittedKnos: Math.round(500 + Math.random() * 2000),
-          pendingKnos: Math.round(200 + Math.random() * 1000),
-          progressPercent: Math.round(40 + Math.random() * 50)
-        }));
-        return mockSupList;
-      }
+    const currentVendorId = (vendor === null || vendor === void 0 ? void 0 : vendor.id) || (vendor === null || vendor === void 0 ? void 0 : vendor.vendorId) || vendorId;
+    if (!Array.isArray(supervisorSearchResponse === null || supervisorSearchResponse === void 0 ? void 0 : supervisorSearchResponse.supervisors)) {
+      return vendor ? createDummySupervisors(vendor) : [];
+    }
+    const matchedSups = supervisorSearchResponse.supervisors.filter(s => s.vendorId === currentVendorId || s.vendorId === (vendor === null || vendor === void 0 ? void 0 : vendor.id) || s.vendorId === (vendor === null || vendor === void 0 ? void 0 : vendor.vendorId));
+    if (matchedSups.length === 0) {
       return [];
     }
-    const currentVendorId = (vendor === null || vendor === void 0 ? void 0 : vendor.id) || (vendor === null || vendor === void 0 ? void 0 : vendor.vendorId) || vendorId;
-    const matchedSups = supervisorSearchResponse.supervisors.filter(s => s.vendorId === currentVendorId);
     return matchedSups.map(sup => {
       var _progressData$supervi, _sup$owner2, _sup$owner3, _sup$owner4;
       const report = progressData === null || progressData === void 0 ? void 0 : (_progressData$supervi = progressData.supervisorReport) === null || _progressData$supervi === void 0 ? void 0 : _progressData$supervi.find(r => {
@@ -2034,32 +1980,26 @@ const VendorDetailsCard = () => {
         totalKnos: (report === null || report === void 0 ? void 0 : report.totalKnos) || 0,
         submittedKnos: (report === null || report === void 0 ? void 0 : report.submittedKnos) || 0,
         pendingKnos: (report === null || report === void 0 ? void 0 : report.pendingKnos) || 0,
-        progressPercent: (report === null || report === void 0 ? void 0 : report.progressPercent) || 0
+        progressPercent: (report === null || report === void 0 ? void 0 : report.progressPercent) || 0,
+        isDummy: false
       };
     });
   }, [supervisorSearchResponse, vendor, progressData, vendorId]);
   const vendorName = (vendor === null || vendor === void 0 ? void 0 : vendor.name) || "N/A";
   const mobileNumber = (vendor === null || vendor === void 0 ? void 0 : vendor.mobileNumber) || (vendor === null || vendor === void 0 ? void 0 : (_vendor$owner = vendor.owner) === null || _vendor$owner === void 0 ? void 0 : _vendor$owner.mobileNumber) || "N/A";
   const email = (vendor === null || vendor === void 0 ? void 0 : (_vendor$owner2 = vendor.owner) === null || _vendor$owner2 === void 0 ? void 0 : _vendor$owner2.emailId) || "N/A";
-  const jurisdictions = useMemo(() => {
-    if (Array.isArray(vendor === null || vendor === void 0 ? void 0 : vendor.jurisdictions)) {
-      return vendor.jurisdictions.join(", ");
-    }
-    return "N/A";
-  }, [vendor]);
   const zoneIds = useMemo(() => {
     var _vendor$zoneIds;
     return vendor !== null && vendor !== void 0 && (_vendor$zoneIds = vendor.zoneIds) !== null && _vendor$zoneIds !== void 0 && _vendor$zoneIds.length ? vendor.zoneIds.filter(Boolean).map(zone => String(zone).trim().toUpperCase()) : [];
   }, [vendor]);
   const cards = useMemo(() => {
-    const hasRealData = vendorSupervisors.some(s => s.totalKnos > 0);
-    const totalKnos = hasRealData ? vendorSupervisors.reduce((acc, s) => acc + (s.totalKnos || 0), 0) : (progressData === null || progressData === void 0 ? void 0 : progressData.totalKnos) || (vendor === null || vendor === void 0 ? void 0 : vendor.assignedConnections) || 0;
-    const completedKnos = hasRealData ? vendorSupervisors.reduce((acc, s) => acc + (s.submittedKnos || 0), 0) : (progressData === null || progressData === void 0 ? void 0 : progressData.completedKnos) || (vendor === null || vendor === void 0 ? void 0 : vendor.completedEkyc) || 0;
-    const pendingKnos = hasRealData ? vendorSupervisors.reduce((acc, s) => acc + (s.pendingKnos || 0), 0) : totalKnos - completedKnos;
-    const progressPercent = totalKnos > 0 ? Math.round(completedKnos / totalKnos * 100) : (vendor === null || vendor === void 0 ? void 0 : vendor.progress) || 0;
+    const totalAssignments = (progressData === null || progressData === void 0 ? void 0 : progressData.totalKnos) || 0;
+    const completedKnos = (progressData === null || progressData === void 0 ? void 0 : progressData.completedKnos) || 0;
+    const pendingKnos = (progressData === null || progressData === void 0 ? void 0 : progressData.pendingKnos) || 0;
+    const progressPercent = (progressData === null || progressData === void 0 ? void 0 : progressData.overallProgressPercent) || 0;
     return [{
       label: "TOTAL_EKYC_APPLICATIONS",
-      count: totalKnos,
+      count: totalAssignments,
       color: "#0B2559",
       type: "today",
       icon: /*#__PURE__*/React.createElement(FaUsers, null)
@@ -2101,6 +2041,7 @@ const VendorDetailsCard = () => {
             tenantId: tenantId,
             offset: 0,
             limit: 10000,
+            vendorId: targetVendorId,
             reportDownload: true
           }, fromDate && {
             fromDate
@@ -2217,7 +2158,6 @@ const VendorDetailsCard = () => {
               meterPhotoFileStoreId: t("METER_PHOTO_FILESTORE_ID"),
               modifiedBy: t("MODIFIED_BY"),
               emailId: t("EMAIL_ID"),
-              fatherOrHusbandName: t("FATHER_HUSBUND_NAME"),
               dob: t("DOB"),
               consumerType: t("CONSUMER_TYPE"),
               createdTime: t("CREATED_TIME"),
@@ -2541,25 +2481,7 @@ const VendorDetailsCard = () => {
       setShowReportMenu(p => !p);
       setShowCustomPicker(false);
     }
-  }, /*#__PURE__*/React.createElement("svg", {
-    width: "16",
-    height: "16",
-    viewBox: "0 0 24 24",
-    fill: "none",
-    stroke: "currentColor",
-    strokeWidth: "2.5",
-    strokeLinecap: "round",
-    strokeLinejoin: "round"
-  }, /*#__PURE__*/React.createElement("path", {
-    d: "M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"
-  }), /*#__PURE__*/React.createElement("polyline", {
-    points: "7 10 12 15 17 10"
-  }), /*#__PURE__*/React.createElement("line", {
-    x1: "12",
-    y1: "15",
-    x2: "12",
-    y2: "3"
-  })), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"), showReportMenu && /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(MdDownloadIcon, null), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"), showReportMenu && /*#__PURE__*/React.createElement("div", {
     className: "report-menu"
   }, [{
     label: t("TODAY") || "Today",
@@ -3279,47 +3201,9 @@ const Inbox = _ref2 => {
     isListLoading = _Digit$Hooks$ekyc$use.isLoading,
     _Digit$Hooks$ekyc$use2 = _Digit$Hooks$ekyc$use.data,
     listData = _Digit$Hooks$ekyc$use2 === void 0 ? {} : _Digit$Hooks$ekyc$use2;
-  const _Digit$Hooks$fsm$useD = Digit.Hooks.fsm.useDsoSearch(tenantId, {
-      status: "ACTIVE"
-    }, {
-      enabled: !!tenantId,
-      staleTime: 300000
-    }),
-    vendorSearchResponse = _Digit$Hooks$fsm$useD.data;
-  const _useMemo = useMemo(() => {
-      var _Digit$SessionStorage;
-      if (!vendorSearchResponse || vendorSearchResponse.length === 0) {
-        return {
-          targetVendorId: null,
-          allVendorIds: []
-        };
-      }
-      const loggedInUser = (_Digit$SessionStorage = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.info;
-      const userUuid = loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.uuid;
-      const userMobile = loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.mobileNumber;
-      const matchesUser = v => {
-        var _v$owner, _v$owner2, _v$owner3;
-        const ownerUuid = ((_v$owner = v.owner) === null || _v$owner === void 0 ? void 0 : _v$owner.uuid) || ((_v$owner2 = v.owner) === null || _v$owner2 === void 0 ? void 0 : _v$owner2.id);
-        const ownerMobile = ((_v$owner3 = v.owner) === null || _v$owner3 === void 0 ? void 0 : _v$owner3.mobileNumber) || v.mobileNumber;
-        return userUuid && ownerUuid === userUuid || userMobile && ownerMobile === userMobile;
-      };
-      const allIds = vendorSearchResponse.map(v => {
-        const dso = v.dsoDetails || v;
-        return dso.id || dso.vendorId || v.id || v.vendorId;
-      }).filter(Boolean);
-      const matched = vendorSearchResponse.find(v => matchesUser(v.dsoDetails || v));
-      let matchedId = null;
-      if (matched) {
-        const dso = matched.dsoDetails || matched;
-        matchedId = dso.id || dso.vendorId || matched.id || matched.vendorId;
-      }
-      return {
-        targetVendorId: matchedId,
-        allVendorIds: allIds
-      };
-    }, [vendorSearchResponse]);
   const _Digit$Hooks$ekyc$use3 = Digit.Hooks.ekyc.useEkycAssignmentProgress({
-      tenantId
+      tenantId,
+      allVendorsDetailed: true
     }, {
       enabled: !!tenantId,
       keepPreviousData: true
@@ -3383,7 +3267,7 @@ const Inbox = _ref2 => {
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const progressMetrics = useMemo(() => {
-    var _ref3, _progressData$totalKn, _ref4, _progressData$complet, _progressData$pending, _ref5, _progressData$overall;
+    var _ref3, _progressData$totalKn, _progressData$submitt, _progressData$pending, _ref4, _progressData$overall;
     if (!progressData) return {
       totalKnos: 0,
       submittedKnos: 0,
@@ -3391,9 +3275,9 @@ const Inbox = _ref2 => {
       progressPercent: 0
     };
     const totalKnos = (_ref3 = (_progressData$totalKn = progressData === null || progressData === void 0 ? void 0 : progressData.totalKnos) != null ? _progressData$totalKn : progressData === null || progressData === void 0 ? void 0 : progressData.totalAssignments) != null ? _ref3 : 0;
-    const submittedKnos = (_ref4 = (_progressData$complet = progressData === null || progressData === void 0 ? void 0 : progressData.completedKnos) != null ? _progressData$complet : progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnos) != null ? _ref4 : 0;
+    const submittedKnos = (_progressData$submitt = progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnos) != null ? _progressData$submitt : 0;
     const pendingKnos = (_progressData$pending = progressData === null || progressData === void 0 ? void 0 : progressData.pendingKnos) != null ? _progressData$pending : totalKnos >= submittedKnos ? totalKnos - submittedKnos : 0;
-    const progressPercent = (_ref5 = (_progressData$overall = progressData === null || progressData === void 0 ? void 0 : progressData.overallProgressPercent) != null ? _progressData$overall : progressData === null || progressData === void 0 ? void 0 : progressData.progressPercent) != null ? _ref5 : totalKnos > 0 ? (submittedKnos / totalKnos * 100).toFixed(1) : 0;
+    const progressPercent = (_ref4 = (_progressData$overall = progressData === null || progressData === void 0 ? void 0 : progressData.overallProgressPercent) != null ? _progressData$overall : progressData === null || progressData === void 0 ? void 0 : progressData.progressPercent) != null ? _ref4 : totalKnos > 0 ? (submittedKnos / totalKnos * 100).toFixed(1) : 0;
     return {
       totalKnos,
       submittedKnos,
@@ -3428,10 +3312,10 @@ const Inbox = _ref2 => {
   }], [progressMetrics, t]);
   const totalRecords = (listData === null || listData === void 0 ? void 0 : listData.totalCount) || 0;
   const checkPathName = location.pathname.includes("ekyc/inbox");
-  const SearchFormFields = useCallback(_ref6 => {
-    let registerRef = _ref6.registerRef,
-      searchFormState = _ref6.searchFormState,
-      controlSearchForm = _ref6.controlSearchForm;
+  const SearchFormFields = useCallback(_ref5 => {
+    let registerRef = _ref5.registerRef,
+      searchFormState = _ref5.searchFormState,
+      controlSearchForm = _ref5.controlSearchForm;
     return /*#__PURE__*/React.createElement(SearchFormFieldsComponents, {
       registerRef,
       searchFormState,
@@ -5403,18 +5287,7 @@ const EKYCForm = _ref => {
   }))))));
 };
 
-const parseAdditionalDetails = additionalDetails => {
-  if (!additionalDetails) return {};
-  if (typeof additionalDetails === "object") return additionalDetails;
-  if (typeof additionalDetails !== "string") return {};
-  try {
-    return JSON.parse(additionalDetails);
-  } catch (error) {
-    return {};
-  }
-};
 const AdminDashboard = () => {
-  var _Digit$SessionStorage;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const history = useHistory();
@@ -5422,7 +5295,6 @@ const AdminDashboard = () => {
   if (!tenantId || tenantId === "dl") {
     tenantId = "dl.djb";
   }
-  const loggedInUser = (_Digit$SessionStorage = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.info;
   const _Digit$Hooks$fsm$useD = Digit.Hooks.fsm.useDsoSearch(tenantId, {
       status: "ACTIVE"
     }, {
@@ -5437,54 +5309,15 @@ const AdminDashboard = () => {
       return dso.id || dso.vendorId || v.id || v.vendorId;
     }).filter(Boolean);
   }, [vendorSearchResponse]);
-  const _Digit$Hooks$ekyc$use = Digit.Hooks.ekyc.useEkycAssignmentProgress(allVendorIds.length > 0 ? {
-      vendorId: allVendorIds[0],
-      vendorIds: allVendorIds
-    } : {}, {
+  const _Digit$Hooks$ekyc$use = Digit.Hooks.ekyc.useEkycAssignmentProgress({
+      tenantId,
+      allVendorsDetailed: true
+    }, {
       enabled: !!tenantId && allVendorIds.length > 0,
       keepPreviousData: true
     }),
     progressData = _Digit$Hooks$ekyc$use.data,
     isProgressLoading = _Digit$Hooks$ekyc$use.isLoading;
-  const vendorsList = useMemo(() => {
-    if (vendorSearchResponse && vendorSearchResponse.length > 0) {
-      const filteredVendors = vendorSearchResponse.filter(v => {
-        var _additionalDetails$se;
-        const dso = v.dsoDetails || v;
-        const additionalDetails = parseAdditionalDetails(dso.additionalDetails || v.additionalDetails);
-        return (additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se = additionalDetails.serviceType) === null || _additionalDetails$se === void 0 ? void 0 : _additionalDetails$se.toLowerCase()) === "ekyc";
-      });
-      return filteredVendors.map(v => {
-        var _progressData$supervi, _dso$owner, _v$owner, _dso$owner2;
-        const dso = v.dsoDetails || v;
-        const supervisorsList = dso.supervisors || [];
-        const surveyorsList = dso.surveyors || [];
-        const supervisorIds = supervisorsList.map(s => {
-          var _s$owner;
-          return s.id || ((_s$owner = s.owner) === null || _s$owner === void 0 ? void 0 : _s$owner.uuid);
-        }).filter(Boolean);
-        const matchedReports = (progressData === null || progressData === void 0 ? void 0 : (_progressData$supervi = progressData.supervisorReport) === null || _progressData$supervi === void 0 ? void 0 : _progressData$supervi.filter(r => supervisorIds.includes(r.supervisorId))) || [];
-        const completed = matchedReports.reduce((acc, r) => acc + (r.submittedKnos || 0), 0);
-        const pending = matchedReports.reduce((acc, r) => acc + (r.pendingKnos || 0), 0);
-        const total = matchedReports.reduce((acc, r) => acc + (r.totalKnos || 0), 0);
-        const progress = total > 0 ? Math.round(completed / total * 100) : 0;
-        const rejected = 0;
-        return {
-          id: dso.id || dso.vendorId || v.id || v.vendorId,
-          name: dso.name || dso.displayName || v.name || "N/A",
-          ownerName: ((_dso$owner = dso.owner) === null || _dso$owner === void 0 ? void 0 : _dso$owner.name) || ((_v$owner = v.owner) === null || _v$owner === void 0 ? void 0 : _v$owner.name) || "N/A",
-          mobileNumber: dso.mobileNumber || ((_dso$owner2 = dso.owner) === null || _dso$owner2 === void 0 ? void 0 : _dso$owner2.mobileNumber) || v.mobileNumber || "N/A",
-          supervisors: supervisorsList.length,
-          surveyors: surveyorsList.length,
-          completed: completed,
-          progress: progress,
-          pending: pending,
-          rejected: rejected
-        };
-      });
-    }
-    return [];
-  }, [vendorSearchResponse, progressData]);
   return /*#__PURE__*/React.createElement(Card, {
     className: "surveyor-dashboard"
   }, /*#__PURE__*/React.createElement(Dashboard, null), /*#__PURE__*/React.createElement("div", {
@@ -5493,52 +5326,69 @@ const AdminDashboard = () => {
     className: "section-title"
   }, t("EKYC_VENDORS_PERFORMANCE") || "eKYC Vendors Performance"), isVendorSearchLoading || isProgressLoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement("div", {
     className: "vendors-grid"
-  }, vendorsList.length === 0 ? /*#__PURE__*/React.createElement("div", {
-    className: "no-vendors"
-  }, t("NO_VENDORS_FOUND") || "No vendors found.") : vendorsList.map(vendor => /*#__PURE__*/React.createElement("div", {
-    key: vendor.id,
-    className: "vendor-perf-card",
-    onClick: () => history.push("/digit-ui/employee/ekyc/vendors/" + vendor.id)
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "card-header"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "vendor-info"
-  }, /*#__PURE__*/React.createElement("h4", null, vendor.name), /*#__PURE__*/React.createElement("p", null, t("MOBILE") || "Mobile", ": ", vendor.mobileNumber)), /*#__PURE__*/React.createElement("span", {
-    className: "progress-badge"
-  }, vendor.progress, "%")), /*#__PURE__*/React.createElement("div", {
-    className: "progress-bar-container"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "progress-bar-fill",
-    style: {
-      width: vendor.progress + "%"
-    }
-  })), /*#__PURE__*/React.createElement("div", {
-    className: "stats-grid"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "stat-item"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "value"
-  }, vendor.supervisors), /*#__PURE__*/React.createElement("div", {
-    className: "label"
-  }, t("SUPERVISORS") || "Supervisors")), /*#__PURE__*/React.createElement("div", {
-    className: "stat-item"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "value"
-  }, vendor.surveyors), /*#__PURE__*/React.createElement("div", {
-    className: "label"
-  }, t("SURVEYORS") || "Surveyors")), /*#__PURE__*/React.createElement("div", {
-    className: "stat-item"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "value completed-val"
-  }, vendor.completed), /*#__PURE__*/React.createElement("div", {
-    className: "label"
-  }, t("COMPLETED") || "Completed"))), /*#__PURE__*/React.createElement("div", {
-    className: "card-footer"
-  }, /*#__PURE__*/React.createElement("span", null, t("PENDING") || "Pending", ": ", /*#__PURE__*/React.createElement("span", {
-    className: "pending-count"
-  }, vendor.pending)), /*#__PURE__*/React.createElement("span", null, t("REJECTED") || "Rejected", ": ", /*#__PURE__*/React.createElement("span", {
-    className: "rejected-count"
-  }, vendor.rejected))))))));
+  }, Array.isArray(progressData === null || progressData === void 0 ? void 0 : progressData.vendorReports) && (progressData === null || progressData === void 0 ? void 0 : progressData.vendorReports.length) && (progressData === null || progressData === void 0 ? void 0 : progressData.vendorReports.map(vendor => {
+    var _vendor$vendorName, _vendor$vendorName$;
+    return /*#__PURE__*/React.createElement("div", {
+      key: vendor.vendorId,
+      className: "vendor-perf-card",
+      onClick: () => history.push("/digit-ui/employee/ekyc/vendors/" + vendor.vendorId)
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "vendor-card-header"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "vendor-title"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "vendor-icon"
+    }, /*#__PURE__*/React.createElement("span", null, (_vendor$vendorName = vendor.vendorName) === null || _vendor$vendorName === void 0 ? void 0 : (_vendor$vendorName$ = _vendor$vendorName[0]) === null || _vendor$vendorName$ === void 0 ? void 0 : _vendor$vendorName$.toUpperCase())), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("h4", null, vendor.vendorName), /*#__PURE__*/React.createElement("span", {
+      className: "vendor-subtitle"
+    }, t("EKYC_VENDOR") || "eKYC Vendor"))), /*#__PURE__*/React.createElement("div", {
+      className: "progress-badge"
+    }, vendor.progressPercent, "%")), /*#__PURE__*/React.createElement("div", {
+      className: "progress-section"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "progress-bar-container"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "progress-bar-fill",
+      style: {
+        width: vendor.progressPercent + "%"
+      }
+    })), /*#__PURE__*/React.createElement("div", {
+      className: "progress-label"
+    }, /*#__PURE__*/React.createElement("span", null, t("PROGRESS") || "Progress"), /*#__PURE__*/React.createElement("span", null, vendor.progressPercent, "%"))), /*#__PURE__*/React.createElement("div", {
+      className: "stats-grid"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "stat-item"
+    }, /*#__PURE__*/React.createElement("span", {
+      className: "stat-value"
+    }, vendor.totalSupervisors), /*#__PURE__*/React.createElement("span", {
+      className: "stat-label"
+    }, t("SUPERVISORS") || "Supervisors")), /*#__PURE__*/React.createElement("div", {
+      className: "stat-item"
+    }, /*#__PURE__*/React.createElement("span", {
+      className: "stat-value"
+    }, vendor.totalSurveyors), /*#__PURE__*/React.createElement("span", {
+      className: "stat-label"
+    }, t("SURVEYORS") || "Surveyors")), /*#__PURE__*/React.createElement("div", {
+      className: "stat-item"
+    }, /*#__PURE__*/React.createElement("span", {
+      className: "stat-value"
+    }, vendor.totalKnos), /*#__PURE__*/React.createElement("span", {
+      className: "stat-label"
+    }, t("TOTAL_KNOS") || "Total KNOs"))), /*#__PURE__*/React.createElement("div", {
+      className: "knos-summary"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "kno-stat"
+    }, /*#__PURE__*/React.createElement("span", {
+      className: "kno-label"
+    }, t("SUBMITTED") || "Submitted"), /*#__PURE__*/React.createElement("strong", null, vendor.submittedKnos)), /*#__PURE__*/React.createElement("div", {
+      className: "kno-stat pending"
+    }, /*#__PURE__*/React.createElement("span", {
+      className: "kno-label"
+    }, t("PENDING") || "Pending"), /*#__PURE__*/React.createElement("strong", null, vendor.pendingKnos)), /*#__PURE__*/React.createElement("div", {
+      className: "kno-stat rejected"
+    }, /*#__PURE__*/React.createElement("span", {
+      className: "kno-label"
+    }, t("REJECTED") || "Rejected"), /*#__PURE__*/React.createElement("strong", null, vendor.rejectedKnos))));
+  })))));
 };
 
 const SupervisorDetailsCard = () => {
@@ -5933,6 +5783,7 @@ const SupervisorDetailsCard = () => {
             tenantId: tenantId || "dl.djb",
             offset: 0,
             limit: 10000,
+            supervisorId: (supervisor === null || supervisor === void 0 ? void 0 : supervisor.supervisorId) || supervisorId,
             reportDownload: true
           }, fromDate && {
             fromDate
@@ -6049,7 +5900,6 @@ const SupervisorDetailsCard = () => {
               meterPhotoFileStoreId: t("METER_PHOTO_FILESTORE_ID"),
               modifiedBy: t("MODIFIED_BY"),
               emailId: t("EMAIL_ID"),
-              fatherOrHusbandName: t("FATHER_HUSBUND_NAME"),
               dob: t("DOB"),
               consumerType: t("CONSUMER_TYPE"),
               createdTime: t("CREATED_TIME"),