@djb25/digit-ui-module-ekyc 1.0.23 → 1.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@djb25/digit-ui-module-ekyc",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "description": "Digit UI Module for Ekyc",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",
@@ -23,6 +23,8 @@
     "microbundle-crl": "^0.13.11",
     "react": "17.0.2",
     "react-dom": "17.0.2",
+    "jspdf": "^2.5.1",
+    "jspdf-autotable": "^3.8.2",
     "react-i18next": "11.16.2",
     "react-icons": "^5.6.0",
     "react-router-dom": "5.3.0",

package/src/Module.js

@@ -12,7 +12,6 @@ import CitizenApp from "./pages/citizen";
 import PropertyInfo from "./components/PropertyInfo";
 import MeterDetails from "./components/MeterDetails";
 import AadhaarVerification from "./components/AadhaarVerification";
-import AddressDetails from "./components/AddressDetails";
 
 export const EkycModule = ({ stateCode, userType, tenants }) => {
   const { path, url } = useRouteMatch();
@@ -66,7 +65,6 @@ const componentsToRegister = {
   EKYC_INBOX_FILTER: (props) => <Filter {...props} />,
   EkycLinks,
   AadhaarVerification,
-  AddressDetails,
   PropertyInfo,
   MeterDetails,
 };

package/src/components/AadhaarVerification.js

@@ -1,17 +1,6 @@
-
 import React, { useState, Fragment, useEffect } from "react";
 import { useLocation } from "react-router-dom";
-import {
-  CardLabel,
-  TextInput,
-  Dropdown,
-  UploadFile,
-  RadioButtons,
-  Toast,
-  FormStep,
-  Loader,
-  CheckBox
-} from "@djb25/digit-ui-react-components";
+import { CardLabel, TextInput, Dropdown, UploadFile, RadioButtons, Toast, FormStep, Loader, CheckBox } from "@djb25/digit-ui-react-components";
 const AadhaarVerification = ({ config, onSelect, formData }) => {
   const location = useLocation();
   const flowState = location.state || {};
@@ -122,30 +111,13 @@ const AadhaarVerification = ({ config, onSelect, formData }) => {
   }, [searchData, formData?.connectionDetails, searchKno]);
 
   // 🔹 OPTIONS
-  const consumerTypeOptions = [
-    { name: "Individual" },
-    { name: "Govt" },
-    { name: "Company_Society_Org" },
-  ];
-
-  const occupantOptions = [
-    { name: "Self" },
-    { name: "Tenanted" },
-  ];
-
-  const genderOptions = [
-    { name: "Male" },
-    { name: "Female" },
-    { name: "Others" },
-    { name: "Not prefer to say" },
-  ];
-
-  const identityTypeOptions = [
-    { name: "Aadhaar Card" },
-    { name: "Driving License" },
-    { name: "Passport" },
-    { name: "Voter ID" },
-  ];
+  const consumerTypeOptions = [{ name: "Individual" }, { name: "Govt" }, { name: "Company_Society_Org" }];
+
+  const occupantOptions = [{ name: "Self" }, { name: "Tenanted" }];
+
+  const genderOptions = [{ name: "Male" }, { name: "Female" }, { name: "Others" }, { name: "Not prefer to say" }];
+
+  const identityTypeOptions = [{ name: "Aadhaar Card" }, { name: "Driving License" }, { name: "Passport" }, { name: "Voter ID" }];
 
   const yesNo = [{ name: "Yes" }, { name: "No" }];
 
@@ -176,8 +148,7 @@ const AadhaarVerification = ({ config, onSelect, formData }) => {
     if (!mobile) return false;
     if (!residents || Number(residents) <= 0) return false;
 
-    if (occupantType?.name === "Tenanted" && !documentId && !ownerMobile)
-      return false;
+    if (occupantType?.name === "Tenanted" && !documentId && !ownerMobile) return false;
 
     return consent; // consent must be true
   };
@@ -230,7 +201,7 @@ const AadhaarVerification = ({ config, onSelect, formData }) => {
       await updateMutation.mutateAsync({
         RequestInfo: {},
         updateType: "CONSUMER",
-        ...data
+        ...data,
       });
       setToast({ type: "success", message: "Data updated successfully!" });
       onSelect(config.key, data);
@@ -246,7 +217,6 @@ const AadhaarVerification = ({ config, onSelect, formData }) => {
   return (
     <Fragment>
       <FormStep onSelect={onStepSelect} config={config} isDisabled={!isValid()}>
-
         <div>
           <CardLabel>Consumer Type *</CardLabel>
           <Dropdown option={consumerTypeOptions} selected={consumerType} select={setConsumerType} />
@@ -306,8 +276,7 @@ const AadhaarVerification = ({ config, onSelect, formData }) => {
           <CardLabel>No. of Residents *</CardLabel>
           <TextInput value={residents} onChange={(e) => setResidents(e.target.value)} />
         </div>
-<div>
-  {console.log("identityType",identityType)}
+        <div>
           <CardLabel>Type of Identity *</CardLabel>
           <Dropdown option={identityTypeOptions} selected={identityType} select={setIdentityType} />
         </div>
@@ -322,10 +291,10 @@ const AadhaarVerification = ({ config, onSelect, formData }) => {
 
         <div>
           <CardLabel>Informant Is Consumer</CardLabel>
-          <CheckBox 
-            label="Yes, the informant is the consumer" 
-            checked={informantIsConsumer} 
-            onChange={(e) => setInformantIsConsumer(e.target.checked)} 
+          <CheckBox
+            label="Yes, the informant is the consumer"
+            checked={informantIsConsumer}
+            onChange={(e) => setInformantIsConsumer(e.target.checked)}
           />
         </div>
 
@@ -401,15 +370,9 @@ const AadhaarVerification = ({ config, onSelect, formData }) => {
           </Fragment>
         )}
       </FormStep>
-      {toast && (
-        <Toast
-          error={toast.type === "error"}
-          label={toast.message}
-          onClose={() => setToast(null)}
-        />
-      )}
+      {toast && <Toast error={toast.type === "error"} label={toast.message} onClose={() => setToast(null)} />}
     </Fragment>
   );
 };
 
-export default AadhaarVerification;
+export default AadhaarVerification;

package/src/components/AssignEkyc.js

@@ -1,27 +1,18 @@
-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
 
 const AssignEkyc = () => {
-  const tenantId = Digit.ULBService.getCurrentTenantId();
-  const location = useLocation();
-  const formInitValue = {
-    filterForm: {},
-    searchForm: {},
-    tableForm: {
-      limit: 10,
-      offset: 0,
-      sortBy: "createdTime",
-      sortOrder: "DESC",
-    },
-  };
+  let tenantId = Digit.ULBService.getCurrentTenantId();
+  if (!tenantId || tenantId === "dl") {
+    tenantId = "dl.djb"; // Force tenantId to dl.djb for EKYC APIs in citizen portal
+  }
 
   const [formState, dispatch] = useReducer(formReducer, formInitValue);
-  const userDetails = Digit.SessionStorage.get("User");
 
   let paginationParms = {
     limit: formState?.tableForm?.limit || 10,
@@ -30,84 +21,49 @@ const AssignEkyc = () => {
     sortOrder: formState?.tableForm?.sortOrder || "DESC",
   };
 
-  const { data: dashboardData, isLoading } = Digit.Hooks.fsm.useSurveyorSearch(
-    tenantId,
-    { ...paginationParms, status: "ACTIVE,DISABLED", vendorId: userDetails?.info?.uuid },
-    { enabled: !!tenantId, keepPreviousData: true }
-  );
+  const mobileNumber = formState?.searchForm?.mobileNumber || "";
+  const isSearchActive = !!mobileNumber;
 
-  const searchDetails = useMemo(
-    () => ({
-      kno: formState?.searchForm?.kNumber || "",
-      name: formState?.searchForm?.kName || "",
-    }),
-    [formState?.searchForm?.kNumber, formState?.searchForm?.kName]
-  );
+  const filters = {
+    ...paginationParms,
+    status: "ACTIVE,DISABLED",
+  };
 
-  const isSearchActive = !!(searchDetails.kno || searchDetails.name);
+  if (isSearchActive) {
+    filters.mobileNumber = mobileNumber;
+  }
 
-  const { isLoading: isSearchLoading, data: searchData } = Digit.Hooks.ekyc.useSearchConnection(
-    {
-      tenantId,
-      details: searchDetails,
-    },
-    {
-      enabled: !!tenantId && !!searchDetails.kno, // 🔥 important
-      keepPreviousData: true,
-    }
-  );
-  const { isLoading: isDataSearchLoading, data } = Digit.Hooks.ekyc.useEkycAssignmentProgress(
-    {},
-    {
-      enabled: !!tenantId && !!searchDetails.kno, // 🔥 important
-      keepPreviousData: true,
-    }
-  );
+  const { data: dashboardData, isLoading } = Digit.Hooks.fsm.useSurveyorSearch(tenantId, filters, { enabled: !!tenantId, keepPreviousData: true });
 
-  const sourceData = useMemo(() => {
-    if (isSearchActive) {
-      if (!searchData) return [];
-      return [searchData];
-    }
+  const { isLoading: isDataSearchLoading, data } = Digit.Hooks.ekyc.useEkycAssignmentProgress({
+    enabled: !!tenantId,
+    keepPreviousData: true,
+  });
 
+  const sourceData = useMemo(() => {
     return dashboardData?.surveyors || [];
-  }, [isSearchActive, searchData, dashboardData]);
+  }, [dashboardData]);
 
   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,
       };
     });
@@ -115,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(
@@ -136,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 = {
@@ -169,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);
 
@@ -207,7 +140,6 @@ const AssignEkyc = () => {
         limit: newLimit,
         offset: 0, // reset page
       },
-      checkPathName,
     });
   };
 
@@ -225,7 +157,6 @@ const AssignEkyc = () => {
             sortBy: id,
             sortOrder: desc ? "DESC" : "ASC",
           },
-          checkPathName,
         });
       }
     }
@@ -240,13 +171,12 @@ const AssignEkyc = () => {
       dispatch,
       onSortingByData,
       tenantId,
-      checkPathName,
       inboxStyles: { overflowX: "scroll", overflowY: "hidden" },
       tableStyle: { width: "70%" },
     },
   });
 
-  const isInboxLoading = isLoading || isSearchLoading;
+  const isInboxLoading = isLoading;
 
   const cards = [
     {
@@ -287,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/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`,

package/src/components/SearchFormFieldsComponent.js

@@ -9,10 +9,10 @@ const SearchFormFieldsComponents = ({ searchFormState, controlSearchForm }) => {
 
   return (
     <React.Fragment>
-      {/* K NUMBER */}
+      {/* MOBILE NUMBER */}
       <span className="mobile-input">
         <Label className="flex-roww flex-gap-2">
-          {t("EKYC_MOBILE_NUMBER") || "Mobile Number"}
+          {t("EKYC_K.NUMBER") || "K Number"}
           <CustomTooltip message={t("EKYC_MOBILE_NUMBER_MESSAGE")} />
         </Label>
 
@@ -22,8 +22,8 @@ const SearchFormFieldsComponents = ({ searchFormState, controlSearchForm }) => {
           defaultValue=""
           rules={{
             pattern: {
-              value: /^[a-zA-Z0-9-_/]*$/,
-              message: t("ERR_INVALID_APPLICATION_NO"),
+              value: /^[0-9]{10}$/,
+              message: t("ERR_INVALID_KNO"),
             },
           }}
           render={({ onChange, value }) => <TextInput value={value || ""} onChange={(e) => onChange(e.target.value)} />}

package/src/components/SelectEkycZones.js

@@ -0,0 +1,71 @@
+import React, { useState, useEffect } from "react";
+import { CardLabel, LabelFieldPair, MultiSelectDropdown, Loader } from "@djb25/digit-ui-react-components";
+
+const SelectEkycZones = ({ config, onSelect, t, formData, isMultiSelect = true, placeHolder }) => {
+  const tenantId = Digit.ULBService.getCurrentTenantId();
+
+  const [zones, setZones] = useState([]);
+
+  const [selectedZones, setSelectedZones] = useState(Array.isArray(formData?.zoneIds) ? formData.zoneIds : []);
+
+  const { data: boundaryData, isLoading } = Digit.Hooks.useCommonMDMS(tenantId, "egov-location", ["TenantBoundary"]);
+
+  useEffect(() => {
+    const tenantBoundary = boundaryData?.["egov-location"]?.TenantBoundary?.[0] || boundaryData?.MdmsRes?.["egov-location"]?.TenantBoundary?.[0];
+
+    const boundaries = tenantBoundary?.boundary || tenantBoundary?.children || [];
+
+    if (Array.isArray(boundaries?.children) && boundaries?.children.length > 0) {
+      const allZones = boundaries.children.flatMap((assembly) =>
+        (assembly?.children || []).map((zone) => ({
+          code: zone.code,
+          name: zone.name,
+        }))
+      );
+
+      const zonesList = [...new Map(allZones.map((zone) => [zone.code, zone])).values()];
+
+      setZones(zonesList);
+    }
+  }, [boundaryData]);
+
+  const handleSelect = (value) => {
+    if (isMultiSelect) {
+      const extractedValue = Array.isArray(value) ? value.map((v) => (Array.isArray(v) ? v[1] : v)).filter(Boolean) : [];
+
+      setSelectedZones(extractedValue);
+      onSelect(config.key, extractedValue);
+    } else {
+      const selectedZone = Array.isArray(value) ? (Array.isArray(value[0]) ? value[0][1] : value[0]) : value;
+
+      setSelectedZones(selectedZone ? [selectedZone] : []);
+
+      onSelect(config.key, selectedZone?.code || "");
+    }
+  };
+
+  if (isLoading) return <Loader />;
+
+  return (
+    <LabelFieldPair>
+      <CardLabel>{t(config.label) + (config.isMandatory ? " *" : "")}</CardLabel>
+
+      <div className="field" style={{ position: "relative", zIndex: 10 }}>
+        <MultiSelectDropdown
+          options={zones}
+          selected={selectedZones}
+          onSelect={handleSelect}
+          optionsKey="name"
+          t={t}
+          multiple={isMultiSelect}
+          ServerStyle={{ backgroundColor: "#fff" }}
+          isMultiSelect={isMultiSelect}
+          placeHolder={placeHolder}
+          showSelectedLabels={true}
+        />
+      </div>
+    </LabelFieldPair>
+  );
+};
+
+export default SelectEkycZones;