@djb25/digit-ui-module-ekyc 1.0.3 → 1.0.5

package/src/pages/employee/Create.js

@@ -17,25 +17,13 @@ const Create = () => {
 
     const tenantId = Digit.ULBService.getCurrentTenantId();
 
-    const { isLoading: isSearching, data: connectionDetails, error, revalidate } = Digit.Hooks.ekyc.useGetConnection({
+    const { isLoading: isSearching, data: connectionDetails, error, revalidate } = Digit.Hooks.ekyc.useSearchConnection({
         tenantId,
-        details: { kno: searchParams.kNumber }
+        details: { kno: searchParams.kNumber, name: searchParams.kName }
     }, {
-        enabled: searchPerformed && !!searchParams.kNumber
-    });
-
-    const { mutate: validateUser, isLoading: isValidating } = Digit.Hooks.ekyc.useValidateUser(tenantId, {
-        onSuccess: (data) => {
-            if (data?.responseInfo?.status === "successful") {
-                // Keep the flow: first validate, then search details is implied by the new UI
-            } else {
-                setShowToast({ error: true, label: data?.message || t("EKYC_VALIDATION_FAILED") });
-                setSearchPerformed(false);
-                sessionStorage.removeItem("EKYC_CREATE_SEARCH_PERFORMED");
-            }
-        },
+        enabled: searchPerformed && !!searchParams.kNumber && !!searchParams.kName,
         onError: (error) => {
-            setShowToast({ error: true, label: error?.response?.data?.Errors?.[0]?.message || t("EKYC_VALIDATION_ERROR_PLEASE_ENTER_THE_CORRECT_CREDENTIALS") });
+            setShowToast({ error: true, label: error?.response?.data?.Errors?.[0]?.message || t("EKYC_SEARCH_ERROR_PLEASE_ENTER_THE_CORRECT_CREDENTIALS") });
             setSearchPerformed(false);
             sessionStorage.removeItem("EKYC_CREATE_SEARCH_PERFORMED");
         }
@@ -59,8 +47,6 @@ const Create = () => {
         setSearchPerformed(true);
         sessionStorage.setItem("EKYC_CREATE_SEARCH_PARAMS", JSON.stringify(params));
         sessionStorage.setItem("EKYC_CREATE_SEARCH_PERFORMED", "true");
-        // We validate first as per original logic, then the hook useGetConnection will fetch details
-        validateUser({ kno: params.kNumber, name: params.kName });
     };
 
     const closeToast = () => {
@@ -77,7 +63,7 @@ const Create = () => {
                     kNumber={searchParams.kNumber}
                     kName={searchParams.kName}
                     connectionDetails={connectionDetails}
-                    isLoading={isSearching || isValidating}
+                    isLoading={isSearching}
                 />
             )}
 

package/src/pages/employee/Inbox.js

@@ -4,13 +4,7 @@ import DesktopInbox from "../../components/DesktopInbox";
 import MobileInbox from "../../components/MobileInbox";
 import Filter from "../../components/Filter";
 
-const MOCK_DATA_ITEMS = [
-    { applicationNumber: "EKYC-2024-001", citizenName: "Rahul Sharma", mobileNumber: "9876543210", status: "COMPLETED" },
-    { applicationNumber: "EKYC-2024-002", citizenName: "Anjali Devi", mobileNumber: "9123456789", status: "PENDING" },
-    { applicationNumber: "EKYC-2024-003", citizenName: "Amit Kumar", mobileNumber: "8888888888", status: "REJECTED" },
-    { applicationNumber: "EKYC-2024-004", citizenName: "Priya Singh", mobileNumber: "7777777777", status: "COMPLETED" },
-    { applicationNumber: "EKYC-2024-005", citizenName: "Suresh Gupta", mobileNumber: "6666666666", status: "PENDING" },
-];
+// Mock data removed in favor of API integration
 
 const Inbox = ({
     parentRoute,
@@ -33,28 +27,40 @@ const Inbox = ({
     // Maintain the full search objects for the Search component
     const [searchParams, setSearchParams] = useState(initialStates.searchParams || { status: defaultStatusOption });
 
-    // 2. Local Filtering Logic for Static Data
-    const filteredStaticData = useMemo(() => {
-        return MOCK_DATA_ITEMS.filter((item) => {
-            let match = true;
-            // Extract the string value from the status object if it exists
-            const currentStatus = searchParams.status?.value !== undefined ? searchParams.status.value : searchParams.status;
-
-            if (currentStatus && item.status !== currentStatus) {
-                match = false;
-            }
-            return match;
-        });
-    }, [searchParams]);
-
-    const staticCountData = useMemo(() => {
+    // 2. API Data Fetching
+    const { isLoading, data: dashboardData, isFetching } = Digit.Hooks.ekyc.useEkycSurveyorDashboard(
+        {}, 
+        { 
+            tenantId, 
+            offset: pageOffset, 
+            limit: pageSize,
+            status: searchParams.status?.value || ""
+        },
+        {
+            enabled: !!tenantId,
+        }
+    );
+
+    const filteredData = useMemo(() => {
+        const items = dashboardData?.dashboardInfo?.consumerList || [];
+        return items.map(item => ({
+            ...item,
+            applicationNumber: item.kno || item.applicationNumber,
+            citizenName: item.consumerName || item.citizenName,
+        }));
+    }, [dashboardData]);
+
+    const countData = useMemo(() => {
+        const info = dashboardData?.dashboardInfo || {};
         return {
-            total: MOCK_DATA_ITEMS.length,
-            completed: MOCK_DATA_ITEMS.filter(i => i.status === "COMPLETED").length,
-            pending: MOCK_DATA_ITEMS.filter(i => i.status === "PENDING").length,
-            rejected: MOCK_DATA_ITEMS.filter(i => i.status === "REJECTED").length
+            total: info.total || 0,
+            completed: info.completed || 0,
+            pending: info.pending || 0,
+            rejected: info.rejected || 0
         };
-    }, []);
+    }, [dashboardData]);
+
+    const totalRecords = dashboardData?.dashboardInfo?.totalRecords || dashboardData?.totalCount || 0;
 
     // 3. Handlers
     const handleSearch = useCallback((filterParam) => {
@@ -98,19 +104,19 @@ const Inbox = ({
             <div className="inbox-main-container">
                 {Digit.Utils.browser.isMobile() ? (
                     <MobileInbox
-                        data={{ items: filteredStaticData, totalCount: filteredStaticData.length }}
-                        isLoading={false}
+                        data={{ items: filteredData, totalCount: totalRecords }}
+                        isLoading={isLoading || isFetching}
                         onSearch={handleSearch}
                         searchFields={searchFields}
                         searchParams={searchParams}
                         parentRoute={parentRoute}
-                        countData={staticCountData}
+                        countData={countData}
                     />
                 ) : (
                     <DesktopInbox
                         businessService={businessService}
-                        data={{ items: filteredStaticData, totalCount: filteredStaticData.length }}
-                        isLoading={false}
+                        data={{ items: filteredData, totalCount: totalRecords }}
+                        isLoading={isLoading || isFetching}
                         searchFields={searchFields}
                         onSearch={handleSearch}
                         onSort={handleSort}
@@ -122,8 +128,8 @@ const Inbox = ({
                         parentRoute={parentRoute}
                         searchParams={searchParams}
                         sortParams={sortParams}
-                        totalRecords={filteredStaticData.length}
-                        countData={staticCountData}
+                        totalRecords={totalRecords}
+                        countData={countData}
                         filterComponent="EKYC_INBOX_FILTER"
                     />
                 )}