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

package/src/config/PropertyInfoConfig.js

@@ -0,0 +1,145 @@
+import React from "react";
+import { UploadFile, Dropdown } from "@djb25/digit-ui-react-components";
+
+const PropertyInfoConfig = (t, formData = {}, uploadFile, buildingImage, buildingImageId, setBuildingImage, setBuildingImageId) => {
+  const propertyType = formData?.propertyType?.name || formData?.propertyType;
+  const isHotel = propertyType === "Hotel";
+  const isHospitalOrNursing = propertyType === "Hospital" || propertyType === "Nursing Home";
+
+  const fields = [
+    {
+      label: t("PID Number"),
+      isMandatory: false,
+      type: "text",
+      populators: {
+        name: "pidNumber",
+      },
+    },
+    {
+      label: t("Property Type"),
+      isMandatory: false,
+      type: "custom",
+      key: "propertyType",
+      populators: {
+        name: "propertyType",
+        component: (props) => (
+          <Dropdown
+            option={[
+              { name: "Residential" },
+              { name: "Commercial" },
+              { name: "Hotel" },
+              { name: "Hospital" },
+              { name: "Nursing Home" },
+            ]}
+            optionKey="name"
+            selected={props.value}
+            select={props.onChange}
+          />
+        ),
+      },
+    },
+    {
+      label: t("Sub Property Category"),
+      isMandatory: false,
+      type: "custom",
+      key: "subPropertyCategory",
+      populators: {
+        name: "subPropertyCategory",
+        component: (props) => (
+          <Dropdown
+            option={[]}
+            optionKey="name"
+            selected={props.value}
+            select={props.onChange}
+          />
+        ),
+      },
+    },
+    {
+      label: t("No. of Floors"),
+      isMandatory: true,
+      type: "number",
+      populators: {
+        name: "noOfFloors",
+        validation: {
+          required: true,
+          min: 1,
+        },
+      },
+    },
+    {
+      label: t("Floor No. of this KNO"),
+      isMandatory: false,
+      type: "text",
+      populators: {
+        name: "floorNo",
+      },
+    },
+    {
+      label: isHospitalOrNursing ? t("No of Beds") : t("No of Beds"),
+      isMandatory: isHospitalOrNursing,
+      type: "number",
+      populators: {
+        name: "noOfBeds",
+        validation: isHospitalOrNursing ? { required: true, min: 1 } : {},
+      },
+    },
+    {
+      label: isHotel ? t("No. of Rooms") : t("No. of Rooms"),
+      isMandatory: isHotel,
+      type: "number",
+      populators: {
+        name: "noOfRooms",
+        validation: isHotel ? { required: true, min: 1 } : {},
+      },
+    },
+    {
+      label: t("Number of Dwelling Units"),
+      isMandatory: false,
+      type: "number",
+      populators: {
+        name: "dwellingUnits",
+      },
+    },
+    {
+      label: t("Building Image"),
+      isMandatory: true,
+      type: "custom",
+      key: "buildingImage",
+      populators: {
+        name: "buildingImage",
+        component: (props) => (
+          <div>
+            <UploadFile
+              onUpload={(e) => uploadFile(e, props.onChange)}
+              onDelete={() => {
+                props.onChange(null);
+                setBuildingImage(null);
+                setBuildingImageId(null);
+              }}
+              message={buildingImageId ? t("Uploaded") : t("No file selected")}
+            />
+            {buildingImage && (
+              <div style={{ marginTop: "10px" }}>
+                <img
+                  src={buildingImage}
+                  alt="preview"
+                  style={{ maxWidth: "100%", maxHeight: "200px", objectFit: "contain" }}
+                />
+              </div>
+            )}
+          </div>
+        ),
+      },
+    },
+  ];
+
+  return [
+    {
+      head: t("EKYC_PROPERTY_DETAILS"),
+      body: fields,
+    },
+  ];
+};
+
+export default PropertyInfoConfig;

package/src/config/config.js

@@ -23,6 +23,7 @@ export const ekycConfig = [
         component: "AddressDetails",
         key: "addressDetails",
         doorImage: true,
+        showMapActualLocation: false,
         texts: {
           header: "EKYC_ADDRESS_DETAILS",
           submitBarLabel: "COMMON_SAVE_NEXT",

package/src/hook/useInboxTableConfig.js

@@ -70,7 +70,7 @@ const useInboxTableConfig = ({
       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/pages/citizen/Inbox.js

@@ -32,7 +32,15 @@ const Inbox = ({ parentRoute }) => {
     };
   }, [tenantId, formState?.tableForm?.offset, formState?.tableForm?.limit, formState?.searchForm]);
 
-  const { isLoading, data: dashboardData = {} } = Digit.Hooks.ekyc.useEkycSurveyorDashboard({}, queryParams, {
+  const filters = useMemo(() => {
+    const searchForm = formState?.searchForm || {};
+    return {
+      ...searchForm,
+      ...(searchForm.kNumber && { kno: searchForm.kNumber }),
+    };
+  }, [formState?.searchForm]);
+
+  const { isLoading, data: dashboardData = {} } = Digit.Hooks.ekyc.useEkycApplicationList(filters, queryParams, {
     enabled: !!tenantId,
     keepPreviousData: true,
   });
@@ -64,7 +72,7 @@ const Inbox = ({ parentRoute }) => {
       return [searchData];
     }
 
-    return dashboardData?.dashboardInfo?.consumerList || [];
+    return dashboardData?.consumerList || [];
   }, [isSearchActive, searchData, dashboardData]);
 
   const filteredData = useMemo(() => {
@@ -80,6 +88,7 @@ const Inbox = ({ parentRoute }) => {
           applicationNumber: item.propertyInfo?.kno || "",
           citizenName: item.connectionDetails?.consumerName || "",
           status: item.connectionDetails?.statusflag || "",
+          ekycStatus: item.connectionDetails?.ekycStatus || item.connectionDetails?.ekycstatus || item.ekycStatus || item.ekycstatus || "NA",
           sla: 0,
         };
       }
@@ -93,6 +102,7 @@ const Inbox = ({ parentRoute }) => {
         applicationNumber: item.kno || item.applicationNumber || "",
         citizenName: item.consumerName || item.citizenName || "",
         status: item.status || "",
+        ekycStatus: item.ekycStatus || item.ekycstatus || "NA",
         sla: item.sla ?? 0,
       };
     });
@@ -126,13 +136,13 @@ const Inbox = ({ parentRoute }) => {
   };
 
   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 });

package/src/pages/employee/ConsumerDetails.js

@@ -1,38 +1,63 @@
-import React, { useState, Fragment } from "react";
-import { CardLabel, TextInput, Dropdown, UploadFile, Toast, FormStep } from "@djb25/digit-ui-react-components";
+import React, { useState, Fragment, useEffect } from "react";
+import { CardLabel, TextInput, Dropdown, UploadFile, Toast, FormStep, Loader } from "@djb25/digit-ui-react-components";
+import { useLocation } from "react-router-dom";
+
+const ConsumerDetails = ({ config, onSelect, formData }) => {
+  const location = useLocation();
+  const flowState = location.state || {};
+  const tenantId = Digit.ULBService.getCurrentTenantId();
+
+  const queryParams = new URLSearchParams(location.search);
+  const urlKno = queryParams.get("kno");
+
+  const searchKno = urlKno || flowState?.kNumber || flowState?.kno || formData?.kNumber || formData?.kno || sessionStorage.getItem("EKYC_K_NUMBER") || "";
+
+  const { isLoading, data: searchData } = Digit.Hooks.ekyc.useSearchConnection(
+    { tenantId, details: { kno: searchKno } },
+    { enabled: !!searchKno, cacheTime: 0 }
+  );
+
+  const savedData = formData?.consumerDetails || {};
 
-const ConsumerDetails = ({ config, onSelect }) => {
   // 🔹 STATES
-  const [kno, setKno] = useState("");
-  const [consumerType, setConsumerType] = useState(null);
-  const [occupantType, setOccupantType] = useState(null);
-  const [categoryType, setCategoryType] = useState(null);
+  const [kno, setKno] = useState(savedData.kno || "");
+  const [consumerType, setConsumerType] = useState(
+    savedData.consumerType ? { name: savedData.consumerType } : null
+  );
+  const [occupantType, setOccupantType] = useState(
+    savedData.occupantType ? { name: savedData.occupantType } : null
+  );
+  const [categoryType, setCategoryType] = useState(
+    savedData.categoryType ? { name: savedData.categoryType } : null
+  );
 
-  const [firstName, setFirstName] = useState("");
-  const [middleName, setMiddleName] = useState("");
-  const [lastName, setLastName] = useState("");
+  const [firstName, setFirstName] = useState(savedData.firstName || "");
+  const [middleName, setMiddleName] = useState(savedData.middleName || "");
+  const [lastName, setLastName] = useState(savedData.lastName || "");
 
-  const [gender, setGender] = useState(null);
+  const [gender, setGender] = useState(
+    savedData.gender ? { name: savedData.gender } : null
+  );
 
-  const [mobile, setMobile] = useState("");
-  const [whatsapp, setWhatsapp] = useState("");
-  const [email, setEmail] = useState("");
-  const [residents, setResidents] = useState("");
+  const [mobile, setMobile] = useState(savedData.mobile || "");
+  const [whatsapp, setWhatsapp] = useState(savedData.whatsapp || "");
+  const [email, setEmail] = useState(savedData.email || "");
+  const [residents, setResidents] = useState(savedData.residents || "");
 
   // Tenant
   const [, setDocumentProof] = useState(null);
-  const [documentId, setDocumentId] = useState(null);
-  const [ownerMobile, setOwnerMobile] = useState("");
-  const [tenantVerification, setTenantVerification] = useState("");
+  const [documentId, setDocumentId] = useState(savedData.documentId || null);
+  const [ownerMobile, setOwnerMobile] = useState(savedData.ownerMobile || "");
+  const [tenantVerification, setTenantVerification] = useState(savedData.tenantVerification || "");
 
   // Govt
-  const [designation, setDesignation] = useState("");
-  const [department, setDepartment] = useState("");
-  const [employeeId, setEmployeeId] = useState("");
+  const [designation, setDesignation] = useState(savedData.designation || "");
+  const [department, setDepartment] = useState(savedData.department || "");
+  const [employeeId, setEmployeeId] = useState(savedData.employeeId || "");
 
   // Other Entity
-  const [contactPerson, setContactPerson] = useState("");
-  const [entityName, setEntityName] = useState("");
+  const [contactPerson, setContactPerson] = useState(savedData.contactPerson || "");
+  const [entityName, setEntityName] = useState(savedData.entityName || "");
 
   // Identity
 
@@ -45,6 +70,35 @@ const ConsumerDetails = ({ config, onSelect }) => {
 
   const genderOptions = [{ name: "Male" }, { name: "Female" }, { name: "Others" }, { name: "Not prefer to say" }];
 
+  // 🔹 PREFILL FROM SEARCH DATA
+  useEffect(() => {
+    const rawData = searchData || formData?.connectionDetails;
+    const details = rawData?.connectionDetails || rawData || {};
+
+    if (searchKno && !kno) {
+      setKno(searchKno);
+    }
+
+    if (details && Object.keys(details).length > 0 && !savedData.firstName) {
+      if (details.consumerName) {
+        const nameParts = details.consumerName.trim().split(/\s+/);
+        if (nameParts.length > 0) setFirstName(nameParts[0]);
+        if (nameParts.length > 2) {
+          setMiddleName(nameParts.slice(1, -1).join(" "));
+          setLastName(nameParts[nameParts.length - 1]);
+        } else if (nameParts.length === 2) {
+          setLastName(nameParts[1]);
+        }
+      }
+      if (details.phoneNumber) {
+        setMobile(details.phoneNumber);
+      }
+      if (details.email) {
+        setEmail(details.email);
+      }
+    }
+  }, [searchData, formData?.connectionDetails, searchKno]);
+
   // 🔹 FILE UPLOAD
   const uploadFile = async (e, setter, idSetter) => {
     const file = e.target.files[0];
@@ -74,7 +128,7 @@ const ConsumerDetails = ({ config, onSelect }) => {
 
     if (occupantType?.name === "Tenanted" && !documentId && !ownerMobile) return false;
 
-    return false;
+    return true;
   };
 
   // 🔹 SUBMIT
@@ -110,6 +164,10 @@ const ConsumerDetails = ({ config, onSelect }) => {
     onSelect(config.key, data);
   };
 
+  if (isLoading) {
+    return <Loader />;
+  }
+
   return (
     <Fragment>
       <FormStep onSelect={onStepSelect} config={config}>

package/src/pages/employee/EKYCForm.js

@@ -98,7 +98,7 @@ const EKYCForm = ({ path: passedPath }) => {
                         onSelect={handleSelect}
                         t={t}
                         formData={params}
-                        // formData={{ ...params, address: params.addressDetails }}
+                      // formData={{ ...params, address: params.addressDetails }}
                       />
                     </div>
                   );

package/src/pages/employee/Inbox.js

@@ -87,6 +87,7 @@ const Inbox = ({ parentRoute, businessService = "EKYC", initialStates = {}, filt
           applicationNumber: item.propertyInfo?.kno || "",
           citizenName: item.connectionDetails?.consumerName || "",
           status: item.connectionDetails?.statusflag || "",
+          ekycStatus: item.connectionDetails?.ekycStatus || item.connectionDetails?.ekycstatus || item.ekycStatus || item.ekycstatus || "NA",
           sla: 0,
         };
       }
@@ -101,6 +102,7 @@ const Inbox = ({ parentRoute, businessService = "EKYC", initialStates = {}, filt
         applicationNumber: item.kno || item.applicationNumber || "",
         citizenName: fullName || item.consumerName || item.citizenName || "",
         status: item.status || "",
+        ekycStatus: item.ekycStatus || item.ekycstatus || "NA",
         sla: item.sla ?? 0,
       };
     });