@djb25/digit-ui-module-ekyc 1.0.67 → 1.0.68

package/dist/index.js

@@ -477,17 +477,13 @@ const StatusCards = _ref => {
     label: t("EKYC_TOTAL"),
     value: (countData === null || countData === void 0 ? void 0 : countData.total) || 0
   }, {
-    color: "#4C8BF5",
-    label: t("EKYC_ASSIGNED"),
-    value: (countData === null || countData === void 0 ? void 0 : countData.totalAssignments) || 0
+    color: "#0c2a52",
+    label: t("EKYC_PENDING"),
+    value: (countData === null || countData === void 0 ? void 0 : countData.pending) || 0
   }, {
     color: "#2E8B57",
     label: t("EKYC_COMPLETED"),
     value: (countData === null || countData === void 0 ? void 0 : countData.completed) || 0
-  }, {
-    color: "#0c2a52",
-    label: t("EKYC_PENDING"),
-    value: (countData === null || countData === void 0 ? void 0 : countData.pending) || 0
   }, {
     color: "#8B5CF6",
     label: t("EKYC_SUBMITTED_BY_VENDORS"),
@@ -641,8 +637,8 @@ const Dashboard = () => {
   const countData = React.useMemo(() => {
     return {
       total: (progressData === null || progressData === void 0 ? void 0 : progressData.totalKnosInSystem) || 0,
-      completed: (progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnos) + (progressData === null || progressData === void 0 ? void 0 : progressData.selfEkycCount) || 0,
-      pending: (progressData === null || progressData === void 0 ? void 0 : progressData.pendingKnos) || 0,
+      completed: (progressData === null || progressData === void 0 ? void 0 : progressData.completedKnosInZones) || 0,
+      pending: (progressData === null || progressData === void 0 ? void 0 : progressData.pendingKnosInZones) || 0,
       rejected: (progressData === null || progressData === void 0 ? void 0 : progressData.rejectedKnos) || 0,
       totalAssignments: (progressData === null || progressData === void 0 ? void 0 : progressData.totalAssignments) || 0,
       submittedCount: (progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnos) || 0,
@@ -1222,7 +1218,6 @@ const downloadSupervisorPDF = function (_ref2) {
         mobileNo: row.status || "N/A",
         zoneName: String(row.total || 0),
         ekycStatus: (row.completed || 0) + " / " + (row.pending || 0),
-        submittedAt: 1717171717171,
         progress: row.progress || "0%"
       };
     });
@@ -1320,7 +1315,7 @@ const downloadVendorPDF = function (_ref3) {
         title: t("TOTAL_ASSIGNED") || "Total Assigned",
         value: (dashboardInfo === null || dashboardInfo === void 0 ? void 0 : dashboardInfo.total) || 0
       }, {
-        title: t("COMPLETED") || "Completed",
+        title: t("TOTAL_EKYC_APPLICATIONS") || "Completed",
         value: (dashboardInfo === null || dashboardInfo === void 0 ? void 0 : dashboardInfo.completed) || 0
       }, {
         title: t("PENDING") || "Pending",
@@ -1337,7 +1332,6 @@ const downloadVendorPDF = function (_ref3) {
       mobileNo: row.status || "N/A",
       zoneName: String(row.total || 0),
       ekycStatus: (row.completed || 0) + " / " + (row.pending || 0),
-      submittedAt: 1717171717171,
       progress: row.progress || "0%"
     }));
     const originalToLocaleDateString = Date.prototype.toLocaleDateString;
@@ -1356,7 +1350,6 @@ const downloadVendorPDF = function (_ref3) {
       if (key === "CONSUMER") return t("MOBILE_NUMBER") || "Mobile Number";
       if (key === "MOBILE") return t("STATUS") || "Status";
       if (key === "ZONE") return t("TOTAL_EKYC_APPLICATIONS") || "Total eKYC Applications";
-      if (key === "EKYC_STATUS") return t("COMPLETED_PENDING") || "Completed / Pending";
       if (key === "SUBMITTED_DATE") return t("OVERALL_PROGRESS") || "Overall Progress";
       if (key === "CONSUMER_LIST") return t("CONNECTED_SUPERVISORS") || "Connected Supervisors";
       return t(key);
@@ -1390,7 +1383,7 @@ const downloadVendorPDF = function (_ref3) {
 };
 
 const VendorDetailsCard = () => {
-  var _vendor$owner, _vendor$owner2, _vendorName$charAt;
+  var _vendor$owner, _vendor$owner2, _vendorName$charAt, _progressData$supervi;
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   const history = reactRouterDom.useHistory();
@@ -1414,14 +1407,6 @@ const VendorDetailsCard = () => {
     _Digit$Hooks$fsm$useV5 = _Digit$Hooks$fsm$useV4 === void 0 ? [] : _Digit$Hooks$fsm$useV4,
     vendor = _Digit$Hooks$fsm$useV5[0],
     isVendorSearchLoading = _Digit$Hooks$fsm$useV.isLoading;
-  const _Digit$Hooks$fsm$useS = Digit.Hooks.fsm.useSupervisorSearch(tenantId, {
-      status: "ACTIVE"
-    }, {
-      enabled: !!tenantId,
-      staleTime: 300000
-    }),
-    supervisorSearchResponse = _Digit$Hooks$fsm$useS.data,
-    isSupervisorSearchLoading = _Digit$Hooks$fsm$useS.isLoading;
   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
@@ -1431,50 +1416,6 @@ const VendorDetailsCard = () => {
     }),
     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 = React.useMemo(() => {
-    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 [];
-    }
-    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 => {
-        var _sup$owner;
-        return r.supervisorId === sup.id || r.supervisorId === ((_sup$owner = sup.owner) === null || _sup$owner === void 0 ? void 0 : _sup$owner.uuid);
-      });
-      return {
-        id: sup.id || ((_sup$owner2 = sup.owner) === null || _sup$owner2 === void 0 ? void 0 : _sup$owner2.uuid),
-        name: sup.name || ((_sup$owner3 = sup.owner) === null || _sup$owner3 === void 0 ? void 0 : _sup$owner3.name) || "N/A",
-        mobileNo: ((_sup$owner4 = sup.owner) === null || _sup$owner4 === void 0 ? void 0 : _sup$owner4.mobileNumber) || sup.mobileNo || "N/A",
-        status: sup.status || "ACTIVE",
-        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,
-        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";
@@ -1485,10 +1426,9 @@ const VendorDetailsCard = () => {
   const cards = React.useMemo(() => {
     const totalKnos = (progressData === null || progressData === void 0 ? void 0 : progressData.totalKnosInZones) || 0;
     const totalAssignments = (progressData === null || progressData === void 0 ? void 0 : progressData.totalKnos) || 0;
-    const completedKnos = (progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnos) || 0;
     const selfEkycCount = (progressData === null || progressData === void 0 ? void 0 : progressData.selfEkycCountInZones) || 0;
     const submittedKnos = (progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnosInZones) || 0;
-    const pendingKnos = (progressData === null || progressData === void 0 ? void 0 : progressData.pendingKnos) || 0;
+    const pendingKnos = (progressData === null || progressData === void 0 ? void 0 : progressData.pendingKnosInZones) || 0;
     const progressPercent = (progressData === null || progressData === void 0 ? void 0 : progressData.overallProgressPercent) || 0;
     return [{
       label: "TOTAL_KNOS",
@@ -1502,12 +1442,6 @@ const VendorDetailsCard = () => {
       color: "#0B2559",
       type: "today",
       icon: /*#__PURE__*/React__default.createElement(digitUiReactComponents.FaFileAlt, null)
-    }, {
-      label: "EKYC_COMPLETED",
-      count: completedKnos,
-      color: "#10B981",
-      type: "month",
-      icon: /*#__PURE__*/React__default.createElement(fa.FaCheckCircle, null)
     }, {
       label: "EKYC_SUBMITTED_BY_VENDORS",
       count: submittedKnos,
@@ -1533,7 +1467,7 @@ const VendorDetailsCard = () => {
       type: "progress",
       icon: /*#__PURE__*/React__default.createElement(fa.FaChartLine, null)
     }];
-  }, [vendorSupervisors, vendor, progressData]);
+  }, [vendor, progressData]);
   const _useState = React.useState(0),
     currentPage = _useState[0],
     setCurrentPage = _useState[1];
@@ -1758,19 +1692,17 @@ const VendorDetailsCard = () => {
     }
     return null;
   };
-  const paginatedSupervisors = React.useMemo(() => {
-    const start = currentPage * pageSize;
-    const end = start + pageSize;
-    return vendorSupervisors.slice(start, end);
-  }, [vendorSupervisors, currentPage, pageSize]);
   const supervisorColumns = React.useMemo(() => [{
     Header: t("SUPERVISOR_NAME") || "Supervisor Name",
-    accessor: row => (row === null || row === void 0 ? void 0 : row.name) || "N/A",
+    accessor: row => {
+      var _row$original;
+      return (row === null || row === void 0 ? void 0 : (_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.supervisorName) || "N/A";
+    },
     Cell: _ref => {
-      var _Digit$SessionStorage, _Digit$SessionStorage2, _Digit$SessionStorage3, _row$original;
+      var _Digit$SessionStorage, _Digit$SessionStorage2, _Digit$SessionStorage3, _row$original2, _row$original3;
       let row = _ref.row;
       const userType = ((_Digit$SessionStorage = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage === void 0 ? void 0 : (_Digit$SessionStorage2 = _Digit$SessionStorage.info) === null || _Digit$SessionStorage2 === void 0 ? void 0 : (_Digit$SessionStorage3 = _Digit$SessionStorage2.type) === null || _Digit$SessionStorage3 === void 0 ? void 0 : _Digit$SessionStorage3.toLowerCase()) || "citizen";
-      const targetPath = "/digit-ui/" + userType + "/ekyc/supervisor-dashboard/" + row.original.id;
+      const targetPath = "/digit-ui/" + userType + "/ekyc/supervisor-dashboard/" + (row === null || row === void 0 ? void 0 : (_row$original2 = row.original) === null || _row$original2 === void 0 ? void 0 : _row$original2.supervisorId);
       return /*#__PURE__*/React__default.createElement("a", {
         href: targetPath,
         style: {
@@ -1782,12 +1714,12 @@ const VendorDetailsCard = () => {
           e.preventDefault();
           history.push(targetPath);
         }
-      }, ((_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.name) || "N/A");
+      }, (row === null || row === void 0 ? void 0 : (_row$original3 = row.original) === null || _row$original3 === void 0 ? void 0 : _row$original3.supervisorName) || "N/A");
     }
   }, {
     Header: t("MOBILE_NUMBER") || "Mobile Number",
     accessor: row => (row === null || row === void 0 ? void 0 : row.mobileNo) || "N/A",
-    id: "mobileNumber"
+    id: "mobileNo"
   }, {
     Header: t("STATUS") || "Status",
     accessor: row => (row === null || row === void 0 ? void 0 : row.status) || "ACTIVE",
@@ -1812,7 +1744,7 @@ const VendorDetailsCard = () => {
     id: "pendingApplications"
   }, {
     Header: t("OVERALL_PROGRESS") || "Overall Progress",
-    accessor: row => (row !== null && row !== void 0 && row.progressPercent || (row === null || row === void 0 ? void 0 : row.progressPercent) === 0 ? row.progressPercent : row.progress) + "%",
+    accessor: row => ((row === null || row === void 0 ? void 0 : row.progressPercent) || 0) + "%",
     id: "overallProgress"
   }], [t, history]);
   const _useState4 = React.useState(false),
@@ -1844,27 +1776,24 @@ const VendorDetailsCard = () => {
   const handleDownload = () => {
     setReportLoading(true);
     try {
-      const rowsWithStats = vendorSupervisors.map(s => ({
-        name: s.name,
+      const rowsWithStats = progressData === null || progressData === void 0 ? void 0 : progressData.supervisorReport.map(s => ({
+        name: s.supervisorName,
         mobileNo: s.mobileNo,
-        status: s.status,
         total: s.totalKnos,
         completed: s.submittedKnos,
         pending: s.pendingKnos,
-        progress: s.progressPercent + "%"
+        progress: (s.progressPercent || 0) + "%"
       }));
-      const totalKnos = vendorSupervisors.reduce((acc, s) => acc + (s.totalKnos || 0), 0) || (vendor === null || vendor === void 0 ? void 0 : vendor.assignedConnections) || 0;
-      const completedKnos = vendorSupervisors.reduce((acc, s) => acc + (s.submittedKnos || 0), 0) || (vendor === null || vendor === void 0 ? void 0 : vendor.completedEkyc) || 0;
       downloadVendorPDF({
         rows: rowsWithStats,
         vendorName,
         mobileNumber,
         email,
         dashboardInfo: {
-          total: totalKnos,
-          completed: completedKnos,
-          pending: totalKnos - completedKnos,
-          submittedCount: completedKnos
+          total: progressData === null || progressData === void 0 ? void 0 : progressData.totalKnosInZones,
+          completed: (progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnosInZones) + (progressData === null || progressData === void 0 ? void 0 : progressData.selfEkycCountInZones),
+          pending: progressData === null || progressData === void 0 ? void 0 : progressData.pendingKnosInZones,
+          submittedCount: progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnosInZones
         },
         t
       });
@@ -1922,7 +1851,7 @@ const VendorDetailsCard = () => {
       className: "stat-icon"
     }, icon)));
   };
-  const isPageLoading = isProgressLoading || isVendorSearchLoading || isSupervisorSearchLoading;
+  const isPageLoading = isProgressLoading || isVendorSearchLoading;
   if (isPageLoading && !vendor) {
     return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
   }
@@ -2073,15 +2002,16 @@ const VendorDetailsCard = () => {
     tableTitle: t("CONNECTED_SUPERVISORS") || "Connected Supervisors",
     tableClass: "ekycTable",
     isTableScrollable: true,
-    data: paginatedSupervisors,
+    data: progressData === null || progressData === void 0 ? void 0 : progressData.supervisorReport,
     columns: supervisorColumns,
-    isLoading: isPageLoading,
-    totalRecords: vendorSupervisors.length,
+    isLoading: isProgressLoading,
+    totalRecords: progressData === null || progressData === void 0 ? void 0 : (_progressData$supervi = progressData.supervisorReport) === null || _progressData$supervi === void 0 ? void 0 : _progressData$supervi.length,
     currentPage: currentPage,
     pageSizeLimit: pageSize,
     isPaginationRequired: true,
     onNextPage: () => {
-      if (currentPage < Math.ceil(vendorSupervisors.length / pageSize) - 1) {
+      var _progressData$supervi2;
+      if (currentPage < Math.ceil((progressData === null || progressData === void 0 ? void 0 : (_progressData$supervi2 = progressData.supervisorReport) === null || _progressData$supervi2 === void 0 ? void 0 : _progressData$supervi2.length) / pageSize) - 1) {
         setCurrentPage(prev => prev + 1);
       }
     },
@@ -2091,7 +2021,10 @@ const VendorDetailsCard = () => {
       }
     },
     onFirstPage: () => setCurrentPage(0),
-    onLastPage: () => setCurrentPage(Math.max(Math.ceil(vendorSupervisors.length / pageSize) - 1, 0)),
+    onLastPage: () => {
+      var _progressData$supervi3;
+      return setCurrentPage(Math.max(Math.ceil((progressData === null || progressData === void 0 ? void 0 : (_progressData$supervi3 = progressData.supervisorReport) === null || _progressData$supervi3 === void 0 ? void 0 : _progressData$supervi3.length) / pageSize) - 1, 0));
+    },
     onPageSizeChange: e => {
       setPageSize(Number(e.target.value));
       setCurrentPage(0);
@@ -4883,21 +4816,21 @@ const AdminDashboard = () => {
       className: "stat-value"
     }, vendor.totalKnos), /*#__PURE__*/React__default.createElement("span", {
       className: "stat-label"
-    }, t("TOTAL_KNOS") || "Total KNOs"))), /*#__PURE__*/React__default.createElement("div", {
+    }, t("TOTAL_EKYC_APPLICATIONS") || "Total KNOs"))), /*#__PURE__*/React__default.createElement("div", {
       className: "knos-summary"
     }, /*#__PURE__*/React__default.createElement("div", {
       className: "kno-stat"
     }, /*#__PURE__*/React__default.createElement("span", {
       className: "kno-label"
-    }, t("SUBMITTED") || "Submitted"), /*#__PURE__*/React__default.createElement("strong", null, vendor.submittedKnos)), /*#__PURE__*/React__default.createElement("div", {
+    }, t("SUBMITTED") || "Submitted"), /*#__PURE__*/React__default.createElement("strong", null, vendor.submittedKnosInZones)), /*#__PURE__*/React__default.createElement("div", {
       className: "kno-stat pending"
     }, /*#__PURE__*/React__default.createElement("span", {
       className: "kno-label"
-    }, t("PENDING") || "Pending"), /*#__PURE__*/React__default.createElement("strong", null, vendor.pendingKnos)), /*#__PURE__*/React__default.createElement("div", {
+    }, t("PENDING") || "Pending"), /*#__PURE__*/React__default.createElement("strong", null, vendor.pendingKnosInZones)), /*#__PURE__*/React__default.createElement("div", {
       className: "kno-stat rejected"
     }, /*#__PURE__*/React__default.createElement("span", {
       className: "kno-label"
-    }, t("REJECTED") || "Rejected"), /*#__PURE__*/React__default.createElement("strong", null, vendor.rejectedKnos))));
+    }, t("EKYC_SUBMITTED_BY_CITIZEN") || "SUBMITTED BY CITIZEN"), /*#__PURE__*/React__default.createElement("strong", null, vendor.selfEkycCountInZones))));
   })))));
 };