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

package/src/pages/employee/EKYCForm.js

@@ -1,12 +1,12 @@
-import React, { useState, useEffect, useRef } from "react";
+import React, { useEffect, useRef } from "react";
 import { useTranslation } from "react-i18next";
-import { useQueryClient } from "react-query";
+// import { useQueryClient } from "react-query";
 import { Redirect, Route, Switch, useHistory, useLocation, useRouteMatch } from "react-router-dom";
-import { Header, VerticalTimeline } from "@djb25/digit-ui-react-components";
+import { VerticalTimeline } from "@djb25/digit-ui-react-components";
 import { ekycConfig } from "../../config/config";
 
 const EKYCForm = ({ path: passedPath }) => {
-  const queryClient = useQueryClient();
+  // const queryClient = useQueryClient();
   const match = useRouteMatch();
   const { t } = useTranslation();
   const location = useLocation();
@@ -14,9 +14,7 @@ const EKYCForm = ({ path: passedPath }) => {
   const history = useHistory();
 
   let config = [];
-  const [params, setParams, clearParams] = Digit.Hooks.useSessionStorage("EKYC_CREATE", {});
-  const userInfo = Digit.UserService.getUser();
-  const tenantId = Digit.ULBService.getCurrentTenantId();
+  const [params, setParams] = Digit.Hooks.useSessionStorage("EKYC_CREATE", {});
 
   useEffect(() => {
     if (location.state && Object.keys(location.state).length > 0) {
@@ -31,7 +29,7 @@ const EKYCForm = ({ path: passedPath }) => {
     if (!routeObj) routeObj = config.find((routeObj) => routeObj.route === currentPath);
 
     let nextStep = null;
-    const currentIndex = config.findIndex(c => c.route === routeObj.route);
+    const currentIndex = config.findIndex((c) => c.route === routeObj.route);
     if (currentIndex > -1 && currentIndex < config.length - 1) {
       nextStep = config[currentIndex + 1].route;
     }
@@ -41,7 +39,7 @@ const EKYCForm = ({ path: passedPath }) => {
       redirectWithHistory = history.replace;
     }
 
-    const base = passedPath || match.path.split('/').slice(0, -1).join('/');
+    const base = passedPath || match.path.split("/").slice(0, -1).join("/");
     if (nextStep === null) {
       return redirectWithHistory(`${base}/review`, { ...params, edits: params });
     }
@@ -49,15 +47,17 @@ const EKYCForm = ({ path: passedPath }) => {
     redirectWithHistory(`${base}/${nextStep}`, { ...params });
   };
 
-  function handleSelect(key, data, skipStep, index, isAddMultiple = false) {
-    setParams({ ...params, ...{ [key]: { ...params[key], ...data } } });
-    goNext(skipStep, index, isAddMultiple, key);
+  function handleSelect(key, data, skipStep, index, isAddMultiple = false, silent = false) {
+    setParams((prev) => ({ ...prev, [key]: { ...params[key], ...data } }));
+    if (!silent) {
+      goNext(skipStep, index, isAddMultiple, key);
+    }
   }
 
-  const onSuccess = () => {
-    clearParams();
-    queryClient.invalidateQueries("EKYC_CREATE");
-  };
+  // const onSuccess = () => {
+  //   clearParams();
+  //   queryClient.invalidateQueries("EKYC_CREATE");
+  // };
 
   ekycConfig.forEach((obj) => {
     config = config.concat(obj.body);
@@ -65,7 +65,7 @@ const EKYCForm = ({ path: passedPath }) => {
 
   config.indexRoute = "consumer-details";
 
-  const formStepRoutes = config.map(c => c.route);
+  const formStepRoutes = config.map((c) => c.route);
   const isFormStep = formStepRoutes.some((route) => pathname.includes(route));
 
   const sectionRefs = useRef({});
@@ -85,10 +85,10 @@ const EKYCForm = ({ path: passedPath }) => {
         <VerticalTimeline config={config} showFinalStep={true} />
         <div className="employee-form-section">
           <Switch>
-            <Route path={formStepRoutes.map((route) => `${(passedPath || match.path.split('/').slice(0, -1).join('/'))}/${route}`)}>
+            <Route path={formStepRoutes.map((route) => `${passedPath || match.path.split("/").slice(0, -1).join("/")}/${route}`)}>
               <div className="single-page-form-container">
                 {config.map((routeObj, index) => {
-                  const { component, key } = routeObj;
+                  const { component } = routeObj;
                   const Component = typeof component === "string" ? Digit.ComponentRegistryService.getComponent(component) : component;
 
                   return (
@@ -98,6 +98,7 @@ const EKYCForm = ({ path: passedPath }) => {
                         onSelect={handleSelect}
                         t={t}
                         formData={params}
+                        // formData={{ ...params, address: params.addressDetails }}
                       />
                     </div>
                   );
@@ -105,7 +106,7 @@ const EKYCForm = ({ path: passedPath }) => {
               </div>
             </Route>
             <Route>
-              <Redirect to={`${(passedPath || match.path.split('/').slice(0, -1).join('/'))}/${config.indexRoute}`} />
+              <Redirect to={`${passedPath || match.path.split("/").slice(0, -1).join("/")}/${config.indexRoute}`} />
             </Route>
           </Switch>
         </div>

package/src/pages/employee/Inbox.js

@@ -24,7 +24,11 @@ const Inbox = ({ parentRoute, businessService = "EKYC", initialStates = {}, filt
   const [formState, dispatch] = useReducer(formReducer, formInitValue);
 
   const filters = useMemo(() => {
-    return formState?.searchForm || {};
+    const searchForm = formState?.searchForm || {};
+    return {
+      ...searchForm,
+      ...(searchForm.kNumber && { kno: searchForm.kNumber }),
+    };
   }, [formState?.searchForm]);
 
   const queryParams = useMemo(() => {
@@ -130,13 +134,13 @@ const Inbox = ({ parentRoute, businessService = "EKYC", initialStates = {}, filt
   };
 
   const searchFormDefaultValues = {
-    mobileNumber: "",
+    kNumber: "",
     applicationNumber: "",
     consumerNo: "",
   };
 
   const onSearchFormReset = (setSearchFormValue) => {
-    setSearchFormValue("mobileNumber", null);
+    setSearchFormValue("kNumber", null);
     setSearchFormValue("applicationNumber", null);
     setSearchFormValue("consumerNo", null);
     dispatch({ action: "mutateSearchForm", data: searchFormDefaultValues });
@@ -158,10 +162,10 @@ const Inbox = ({ parentRoute, businessService = "EKYC", initialStates = {}, filt
 
   const propsForFilterForm = {
     FilterFormFields,
-    onFilterFormSubmit: () => {},
+    onFilterFormSubmit: () => { },
     filterFormDefaultValues: "",
     resetFilterFormDefaultValues: "",
-    onFilterFormReset: () => {},
+    onFilterFormReset: () => { },
   };
 
   function formReducer(state, payload) {
@@ -243,9 +247,9 @@ const Inbox = ({ parentRoute, businessService = "EKYC", initialStates = {}, filt
       <InboxComposer
         {...{
           isInboxLoading,
-          PropsForInboxLinks,
+          // PropsForInboxLinks,
           ...propsForSearchForm,
-          ...propsForFilterForm,
+          // ...propsForFilterForm,
           // ...propsForMobileSortForm,
           propsForInboxTable,
           // propsForInboxMobileCards,

package/src/pages/employee/index.js

@@ -19,20 +19,49 @@ const EmployeeApp = ({ path }) => {
 
   sessionStorage.removeItem("revalidateddone");
 
-  const getBreadcrumbLabel = () => {
+  const getDynamicBreadcrumbs = () => {
     const pathname = location.pathname;
-    if (pathname.includes("/dashboard")) return "ES_COMMON_INBOX";
-    if (pathname.includes("/create-kyc")) return "EKYC_CREATE_KYC";
-    if (pathname.includes("/k-details")) return "EKYC_K_DETAILS";
-    if (pathname.includes("/consumer-details")) return "EKYC_CONSUMER_DETAILS";
-    if (pathname.includes("/address-details")) return "EKYC_ADDRESS_DETAILS";
-    if (pathname.includes("/property-info")) return "EKYC_PROPERTY_INFO";
-    if (pathname.includes("/meter-details")) return "EKYC_METER_DETAILS";
-    if (pathname.includes("/review")) return "EKYC_REVIEW";
-    return "ES_COMMON_INBOX";
-  };
 
-  const breadcrumbs = [{ icon: HomeIcon, path: "/digit-ui/employee" }, { label: t(getBreadcrumbLabel()) }];
+    // Parent crumb — always present and clickable → redirects to eKYC inbox
+    const crumbs = [
+      { icon: HomeIcon, path: "/digit-ui/employee" },
+      { label: t("ACTION_TEST_EKYC"), path: `/digit-ui/employee/module/details` },
+    ];
+
+    // Child crumb — only appended when on a sub-page (not inbox/dashboard itself)
+    if (pathname.includes("/create-kyc")) {
+      crumbs.push({ label: t("EKYC_CREATE_KYC") });
+    } else if (pathname.includes("/consumer-details")) {
+      crumbs.push({ label: t("EKYC_CONSUMER_DETAILS") });
+    } else if (pathname.includes("/address-details")) {
+      crumbs.push({ label: t("EKYC_ADDRESS_DETAILS") });
+    } else if (pathname.includes("/property-info")) {
+      crumbs.push({ label: t("EKYC_PROPERTY_INFO") });
+    } else if (pathname.includes("/meter-details")) {
+      crumbs.push({ label: t("EKYC_METER_DETAILS") });
+    } else if (pathname.includes("/review")) {
+      crumbs.push({ label: t("EKYC_INBOX"), path: `/digit-ui/employee/ekyc/inbox` });
+      crumbs.push({ label: t("EKYC_REVIEW") });
+    } else if (pathname.includes("/assign/surveyor-details")) {
+      crumbs.push({ label: t("EKYC_ASSIGN"), path: `/digit-ui/employee/ekyc/assign` });
+      crumbs.push({ label: t("EKYC_SURVEYOR_DETAILS") });
+    } else if (pathname.includes("/assign")) {
+      crumbs.push({ label: t("EKYC_ASSIGN") });
+    } else if (pathname.includes("/ceo-dashboard")) {
+      crumbs.push({ label: t("CEO_M.F_DOR_FINANCE_VIEW") });
+    } else if (pathname.includes("/vendors/")) {
+      crumbs.push({ label: t("EKYC_VENDOR_DETAILS") });
+    } else if (pathname.includes("/mapping")) {
+      crumbs.push({ label: t("EKYC_MAPPING") });
+    } else if (pathname.includes("/dashboard")) {
+      crumbs.push({ label: t("EKYC_DASHBOARD") });
+    } else if (pathname.includes("/inbox")) {
+      crumbs.push({ label: t("EKYC_INBOX") });
+    }
+    // dashboard & inbox → no child crumb (only "eKYC Admin" shown)
+
+    return crumbs;
+  };
 
   const formStepRoutes = ["consumer-details", "address-details", "property-info", "meter-details"];
 
@@ -47,7 +76,7 @@ const EmployeeApp = ({ path }) => {
             </React.Fragment>
           }
           onLeftClick={() => window.history.back()}
-          breadcrumbs={breadcrumbs}
+          breadcrumbs={getDynamicBreadcrumbs()}
         />
 
         <div className="employee-form">

package/src/utils/reportDownloader.js

@@ -0,0 +1,75 @@
+export const downloadSurveyorPDF = async ({
+    rows,
+    surveyorName,
+    employeeId,
+    mobileNumber,
+    vendorName,
+    supervisorName,
+    dashboardInfo,
+    t,
+}) => {
+    const tenantId = Digit.ULBService.getCurrentTenantId();
+    const initData = Digit.SessionStorage.get("initData");
+    const tenants = initData?.tenants || [];
+    const tenantInfo = tenants.find((tenant) => tenant.code === tenantId);
+
+    const capitalize = (text) =>
+        text && text.substr(0, 1).toUpperCase() + text.substr(1);
+    const ulbCamel = (ulb) =>
+        ulb &&
+        ulb
+            .toLowerCase()
+            .split(" ")
+            .map(capitalize)
+            .join(" ");
+
+    const name = "Delhi Jal Board";
+    const email = "contact@delhijalboard.nic.in";
+    const phoneNumber = "+91-11-23538416";
+
+    const details = [
+        {
+            title: t("SURVEYOR_DETAILS"),
+            asSectionHeader: true,
+            values: [
+                { title: t("SURVEYOR_NAME"), value: surveyorName },
+                { title: t("EMPLOYEE_ID"), value: employeeId },
+                { title: t("MOBILE_NUMBER"), value: mobileNumber },
+                { title: t("VENDOR_NAME"), value: vendorName },
+                { title: t("SUPERVISOR_NAME"), value: supervisorName }
+            ].filter((item) => item.value),
+        },
+        {
+            title: t("SUMMARY_STATISTICS"),
+            asSectionHeader: true,
+            values: [
+                { title: t("TOTAL_ASSIGNED"), value: dashboardInfo?.total || 0 },
+                { title: t("COMPLETED"), value: dashboardInfo?.completed || 0 },
+                { title: t("PENDING"), value: dashboardInfo?.pending || 0 },
+                { title: t("SUBMITTED"), value: dashboardInfo?.submittedCount || 0 },
+            ].filter((item) => item.value),
+        },
+    ];
+
+    if (
+        window.Digit &&
+        window.Digit.Utils &&
+        window.Digit.Utils.pdf &&
+        window.Digit.Utils.pdf.generateSurveyorReport
+    ) {
+        window.Digit.Utils.pdf.generateSurveyorReport({
+            tenantId,
+            logo: null,
+            name,
+            email,
+            phoneNumber,
+            heading: t("EKYC_SURVEYOR_REPORT"),
+            details,
+            applicationNumber: employeeId,
+            rows,
+            t,
+        });
+    } else {
+        console.error("Digit.Utils.pdf.generateSurveyorReport is not available");
+    }
+};

package/src/components/AddressDetails.js

@@ -1,207 +0,0 @@
-import React, { useState, useEffect, Fragment } from "react";
-import { CardLabel, TextInput, Dropdown, UploadFile, Toast, FormStep, Loader } from "@djb25/digit-ui-react-components";
-import { useTranslation } from "react-i18next";
-
-const AddressDetails = ({ config, onSelect }) => {
-  const { t } = useTranslation();
-
-  const tenantId = Digit.ULBService.getCurrentTenantId();
-
-  // 🔹 STATES
-  const [houseNo, setHouseNo] = useState("");
-  const [street, setStreet] = useState("");
-  const [locality, setLocality] = useState("");
-  const [landmark, setLandmark] = useState("");
-  const [subLocality, setSubLocality] = useState(null);
-
-  const [pinCode, setPinCode] = useState("");
-  const [assembly, setAssembly] = useState(null);
-  const [ward, setWard] = useState(null);
-  const [zone, setZone] = useState(null);
-
-  const [latitude, setLatitude] = useState("");
-  const [longitude, setLongitude] = useState("");
-
-  const [addressType, setAddressType] = useState(null);
-
-  const [doorPhoto, setDoorPhoto] = useState(null);
-  const [doorPhotoFileStoreId, setDoorPhotoFileStoreId] = useState(null);
-
-  const [toast, setToast] = useState(null);
-
-  // 🔹 MDMS DATA
-  const { data: mdmsData, isLoading } = Digit.Hooks.useCommonMDMS(tenantId, "egov-location", ["TenantBoundary"]);
-
-  const assemblies = mdmsData?.MdmsRes?.["egov-location"]?.TenantBoundary?.[0]?.boundary?.children || [];
-
-  // 🔹 AUTO GPS
-  useEffect(() => {
-    let isMounted = true;
-
-    if (navigator.geolocation) {
-      navigator.geolocation.getCurrentPosition(
-        (pos) => {
-          if (!isMounted) return;
-          setLatitude(pos.coords.latitude);
-          setLongitude(pos.coords.longitude);
-        },
-        () => {
-          if (!isMounted) return;
-          setToast({ type: "error", message: "GPS access denied" });
-        }
-      );
-    }
-
-    return () => {
-      isMounted = false;
-    };
-  }, []);
-
-  // 🔹 PIN CODE HANDLER
-  const handlePincodeChange = (e) => {
-    const value = e.target.value;
-    if (/^\d{0,6}$/.test(value)) {
-      setPinCode(value);
-
-      if (value.length === 6) {
-        fetchLocationByPincode(value);
-      }
-    }
-  };
-
-  // 🔹 MOCK PIN API (Replace with real API)
-  const fetchLocationByPincode = (pin) => {
-    // 🔥 Replace this with backend API
-    console.log("Fetching location for PIN:", pin);
-  };
-
-  // 🔹 FILE UPLOAD
-  const selectphoto = async (e) => {
-    let isMounted = true;
-
-    const file = e.target.files[0];
-    if (!file) return;
-
-    if (file.size >= 2000000) {
-      setToast({ type: "error", message: "Max size 2MB exceeded" });
-      return;
-    }
-
-    try {
-      const res = await Digit.UploadServices.Filestorage("EKYC", file, tenantId);
-
-      if (!isMounted) return;
-
-      const fileStoreId = res?.data?.files?.[0]?.fileStoreId;
-
-      if (fileStoreId) {
-        setDoorPhotoFileStoreId(fileStoreId);
-
-        const reader = new FileReader();
-        reader.onloadend = () => {
-          if (!isMounted) return;
-          setDoorPhoto(reader.result);
-        };
-        reader.readAsDataURL(file);
-
-        setToast({ type: "success", message: "Upload successful" });
-      }
-    } catch {
-      if (!isMounted) return;
-      setToast({ type: "error", message: "Upload failed" });
-    }
-
-    return () => {
-      isMounted = false;
-    };
-  };
-
-  const removePhoto = () => {
-    setDoorPhoto(null);
-    setDoorPhotoFileStoreId(null);
-  };
-
-  // 🔹 VALIDATION
-  const isValid = () => {
-    return houseNo && street && pinCode.length === 6 && assembly && ward && zone && latitude && longitude && doorPhotoFileStoreId;
-  };
-
-  // 🔹 SUBMIT
-  const onStepSelect = () => {
-    if (!isValid()) {
-      setToast({ type: "error", message: "Please fill all mandatory fields" });
-      return;
-    }
-
-    const data = {
-      houseNo,
-      street,
-      locality,
-      landmark,
-      subLocality,
-      pinCode,
-      assembly: assembly?.name,
-      ward: ward?.name,
-      zone: zone?.name,
-      latitude,
-      longitude,
-      addressType: addressType?.name,
-      doorPhotoFilestoreId: doorPhotoFileStoreId,
-    };
-
-    onSelect(config.key, data);
-  };
-
-  if (isLoading) return <Loader />;
-
-  return (
-    <Fragment>
-      <FormStep t={t} onSelect={onStepSelect} config={config} label={t("ES_COMMON_CONTINUE")}>
-        <CardLabel>House No / Flat No *</CardLabel>
-        <TextInput value={houseNo} onChange={(e) => setHouseNo(e.target.value)} />
-
-        <CardLabel>Street / Address Line *</CardLabel>
-        <TextInput value={street} onChange={(e) => setStreet(e.target.value)} />
-
-        <CardLabel>Locality</CardLabel>
-        <TextInput value={locality} onChange={(e) => setLocality(e.target.value)} />
-
-        <CardLabel>Landmark</CardLabel>
-        <TextInput value={landmark} onChange={(e) => setLandmark(e.target.value)} />
-
-        <CardLabel>Sub Locality</CardLabel>
-        <Dropdown option={[]} selected={subLocality} select={setSubLocality} />
-
-        <CardLabel>PIN Code *</CardLabel>
-        <TextInput value={pinCode} onChange={handlePincodeChange} maxLength={6} />
-
-        <CardLabel>Assembly *</CardLabel>
-        <Dropdown option={assemblies} selected={assembly} select={setAssembly} />
-
-        <CardLabel>Ward *</CardLabel>
-        <Dropdown option={assembly?.children || []} selected={ward} select={setWard} />
-
-        <CardLabel>Zone *</CardLabel>
-        <Dropdown option={ward?.children || []} selected={zone} select={setZone} />
-
-        <CardLabel>Latitude</CardLabel>
-        <TextInput value={latitude} disabled />
-
-        <CardLabel>Longitude</CardLabel>
-        <TextInput value={longitude} disabled />
-
-        <CardLabel>Address Type</CardLabel>
-        <Dropdown option={[{ name: "Permanent" }, { name: "Correspondence" }, { name: "Other" }]} selected={addressType} select={setAddressType} />
-
-        <CardLabel>Door Image *</CardLabel>
-        <UploadFile onUpload={selectphoto} onDelete={removePhoto} message={doorPhotoFileStoreId ? "Uploaded" : "No file selected"} />
-
-        {doorPhoto && <img src={doorPhoto} alt="preview" style={{ width: "100%", marginTop: "10px" }} />}
-
-        {toast && <Toast label={toast.message} error={toast.type === "error"} onClose={() => setToast(null)} />}
-      </FormStep>
-    </Fragment>
-  );
-};
-
-export default AddressDetails;