@djb25/digit-ui-module-ekyc 1.0.24 → 1.0.26

package/src/components/AssignEkyc.js

@@ -1,8 +1,8 @@
-import React, { useMemo, useCallback, useReducer, useState } from "react";
-import { useLocation } from "react-router-dom";
+import React, { useMemo, useCallback, useReducer } from "react";
 import { InboxComposer } from "@djb25/digit-ui-react-components";
 import SupervisorInboxTableConfig from "../hook/SupervisorInboxTableConfig";
 import SearchFormFieldsComponents from "./SearchFormFieldsComponent";
+import { formInitValue, formReducer } from "../../../vendor/src/config/tableConfig";
 
 // Mock data removed in favor of API integration
 
@@ -11,20 +11,8 @@ const AssignEkyc = () => {
   if (!tenantId || tenantId === "dl") {
     tenantId = "dl.djb"; // Force tenantId to dl.djb for EKYC APIs in citizen portal
   }
-  const location = useLocation();
-  const formInitValue = {
-    filterForm: {},
-    searchForm: {},
-    tableForm: {
-      limit: 10,
-      offset: 0,
-      sortBy: "createdTime",
-      sortOrder: "DESC",
-    },
-  };
 
   const [formState, dispatch] = useReducer(formReducer, formInitValue);
-  const userDetails = Digit.SessionStorage.get("User");
 
   let paginationParms = {
     limit: formState?.tableForm?.limit || 10,
@@ -45,11 +33,7 @@ const AssignEkyc = () => {
     filters.mobileNumber = mobileNumber;
   }
 
-  const { data: dashboardData, isLoading } = Digit.Hooks.fsm.useSurveyorSearch(
-    tenantId,
-    filters,
-    { enabled: !!tenantId, keepPreviousData: true }
-  );
+  const { data: dashboardData, isLoading } = Digit.Hooks.fsm.useSurveyorSearch(tenantId, filters, { enabled: !!tenantId, keepPreviousData: true });
 
   const { isLoading: isDataSearchLoading, data } = Digit.Hooks.ekyc.useEkycAssignmentProgress({
     enabled: !!tenantId,
@@ -63,38 +47,23 @@ const AssignEkyc = () => {
   const filteredData = useMemo(() => {
     return (sourceData || []).map((item) => {
       const owner = item?.owner || {};
-
       const roleCodes = owner?.roles?.map((role) => role.code)?.join(", ") || "";
 
       return {
         ...item,
-
         id: item?.id || "",
-
         surveyorName: item?.name || owner?.name || "",
-
         mobileNo: item?.mobileNo || owner?.mobileNumber || "",
-
         email: owner?.emailId || "",
-
         vendorId: item?.vendorId || "",
-
         tenantId: item?.tenantId || "",
-
         supervisorId: item?.supervisorId || "",
-
         status: item?.status || "",
-
         roleCodes,
-
         userName: owner?.userName || "",
-
         gender: owner?.gender || "",
-
         serviceType: item?.additionalDetails?.serviceType || "",
-
         createdTime: item?.auditDetails?.createdTime || 0,
-
         lastModifiedTime: item?.auditDetails?.lastModifiedTime || 0,
       };
     });
@@ -102,9 +71,8 @@ const AssignEkyc = () => {
 
   const totalRecords = dashboardData?.dashboardInfo?.totalRecords || dashboardData?.totalCount || 0;
 
-  const checkPathName = location.pathname.includes("ekyc/inbox");
   const PropsForInboxLinks = {
-    headerText: checkPathName ? "EKYC_MODULE" : "MODULE_SW",
+    headerText: "EKYC_MODULE",
   };
 
   const SearchFormFields = useCallback(
@@ -123,8 +91,8 @@ const AssignEkyc = () => {
 
   const onSearchFormSubmit = (data) => {
     data.hasOwnProperty("") && delete data?.[""];
-    dispatch({ action: "mutateTableForm", data: { ...tableOrderFormDefaultValues }, checkPathName });
-    dispatch({ action: "mutateSearchForm", data, checkPathName });
+    dispatch({ action: "mutateTableForm", data: { ...tableOrderFormDefaultValues } });
+    dispatch({ action: "mutateSearchForm", data });
   };
 
   const searchFormDefaultValues = {
@@ -156,34 +124,12 @@ const AssignEkyc = () => {
 
   const propsForFilterForm = {
     FilterFormFields,
-    onFilterFormSubmit: () => {},
+    onFilterFormSubmit: () => { },
     filterFormDefaultValues: "",
     resetFilterFormDefaultValues: "",
-    onFilterFormReset: () => {},
+    onFilterFormReset: () => { },
   };
 
-  function formReducer(state, payload) {
-    const storageKey = payload.checkPathName ? "EKYC.INBOX" : "EKYC.SW.INBOX";
-
-    // ✅ safety for SLA
-    switch (payload.action) {
-      case "mutateSearchForm":
-        Digit.SessionStorage.set(storageKey, { ...state, searchForm: payload.data });
-        return { ...state, searchForm: payload.data };
-
-      case "mutateFilterForm":
-        Digit.SessionStorage.set(storageKey, { ...state, filterForm: payload.data });
-        return { ...state, filterForm: payload.data };
-
-      case "mutateTableForm":
-        Digit.SessionStorage.set(storageKey, { ...state, tableForm: payload.data });
-        return { ...state, tableForm: payload.data };
-
-      default:
-        return state; // ✅ IMPORTANT
-    }
-  }
-
   const onPageSizeChange = (e) => {
     const newLimit = Number(e.target.value);
 
@@ -194,7 +140,6 @@ const AssignEkyc = () => {
         limit: newLimit,
         offset: 0, // reset page
       },
-      checkPathName,
     });
   };
 
@@ -212,7 +157,6 @@ const AssignEkyc = () => {
             sortBy: id,
             sortOrder: desc ? "DESC" : "ASC",
           },
-          checkPathName,
         });
       }
     }
@@ -227,7 +171,6 @@ const AssignEkyc = () => {
       dispatch,
       onSortingByData,
       tenantId,
-      checkPathName,
       inboxStyles: { overflowX: "scroll", overflowY: "hidden" },
       tableStyle: { width: "70%" },
     },
@@ -274,9 +217,9 @@ const AssignEkyc = () => {
       <InboxComposer
         {...{
           isInboxLoading,
-          PropsForInboxLinks,
+          // PropsForInboxLinks,
           ...propsForSearchForm,
-          ...propsForFilterForm,
+          // ...propsForFilterForm,
           // ...propsForMobileSortForm,
           propsForInboxTable,
           // propsForInboxMobileCards,

package/src/components/AssignEkycModal.js

@@ -1,7 +1,7 @@
 import React, { useMemo, useState, useEffect } from "react";
 import { Modal, Close, Table, Toast } from "@djb25/digit-ui-react-components";
 
-const AssignEkycModal = ({ surveyor, closeModal }) => {
+const AssignEkycModal = ({ surveyor, closeModal, refetchDashboard }) => {
   const [selectedKnos, setSelectedKnos] = useState([]);
   const [isBulkSelection, setIsBulkSelection] = useState(false);
   const [currentPage, setCurrentPage] = useState(0);
@@ -95,7 +95,8 @@ const AssignEkycModal = ({ surveyor, closeModal }) => {
       setShowToast(true);
 
       // optional delay so user can see the success toast
-      setTimeout(() => {
+      setTimeout(async () => {
+        await refetchDashboard();
         closeModal();
       }, 1000);
     },
@@ -255,7 +256,23 @@ const AssignEkycModal = ({ surveyor, closeModal }) => {
             onChange={(e) => handleFilterChange("zoneName", e.target.value)}
           />
 
-          <input className="form-control" placeholder="Ward" value={filters.ward} onChange={(e) => handleFilterChange("ward", e.target.value)} />
+          {/* <SelectEkycZones
+            t={t}
+            isMultiSelect={false}
+            config={{
+              key: "zoneCode",
+            }}
+            formData={{
+              zoneIds: filters.zoneCode ? [{ code: filters.zoneCode, name: filters.zoneName }] : [],
+            }}
+            onSelect={(key, value) => {
+              console.log(value);
+              handleFilterChange("zoneName", value);
+            }}
+            placeHolder="Zones"
+          /> */}
+
+          {/* <input className="form-control" placeholder="Ward" value={filters.ward} onChange={(e) => handleFilterChange("ward", e.target.value)} />
 
           <input
             className="form-control"
@@ -271,7 +288,7 @@ const AssignEkycModal = ({ surveyor, closeModal }) => {
             <option value="PENDING">Pending</option>
             <option value="APPROVED">Approved</option>
             <option value="REJECTED">Rejected</option>
-          </select>
+          </select> */}
         </div>
 
         {/* Table */}

package/src/components/DesktopInbox.js

@@ -80,7 +80,7 @@ const DesktopInbox = ({ tableConfig, filterComponent, ...props }) => {
         Header: t("EKYC_EKYC_STATUS"),
         accessor: "ekycStatus",
         Cell: ({ row }) => {
-          const ekycStatus = row.original?.ekycstatus || "NA";
+          const ekycStatus = row.original?.ekycStatus || row.original?.ekycstatus || "NA";
           return <span className={`ekyc-status-tag ${ekycStatus}`}>{t(`${ekycStatus}`)}</span>
         }
       },

package/src/components/EKYCCard.js

@@ -17,9 +17,13 @@ const EKYCCard = () => {
     ],
     links: [
       {
-        label: t("EKYC_DASHBOARD"),
-        link: `/digit-ui/employee/ekyc/dashboard`,
+        label: t("CEO_M.F_DOR_FINANCE_VIEW"),
+        link: `/digit-ui/employee/ekyc/ceo-dashboard`,
       },
+      // {
+      //   label: t("EKYC_DASHBOARD"),
+      //   link: `/digit-ui/employee/ekyc/dashboard`,
+      // },
       {
         label: t("EKYC_INBOX"),
         link: `/digit-ui/employee/ekyc/inbox`,
@@ -32,16 +36,10 @@ const EKYCCard = () => {
       //     label: t("EKYC_UPDATE_KYC"),
       //     link: `/digit-ui/employee/ekyc/update-kyc`
       // },
-      {
-        label: t("CEO_M.F_DOR_FINANCE_VIEW"),
-        link: `/digit-ui/employee/ekyc/ceo-dashboard`,
-      },
-
       // {
       //   label: t("EKYC_MAPPING"),
       //   link: `/digit-ui/employee/ekyc/mapping`,
       // },
-
       {
         label: t("EKYC_ASSIGN"),
         link: `/digit-ui/employee/ekyc/assign`,