@djb25/digit-ui-module-ekyc 1.0.10 → 1.0.12

package/src/pages/employee/ConsumerDetails.js

@@ -1,255 +1,18 @@
-// import React, { useState, Fragment, useEffect, useRef } from "react";
-// import {
-//   Card,
-//   CardLabel,
-//   TextInput,
-//   SubmitBar,
-//   CardHeader,
-//   RadioButtons,
-//   ActionBar,
-//   Loader,
-//   FormStep,
-// } from "@djb25/digit-ui-react-components";
-// import { useTranslation } from "react-i18next";
-// import { useLocation, useHistory } from "react-router-dom";
-// import { getSavedData } from "../../utils";
-// import AddressDetails from "./AddressDetails";
-
-// const AadhaarVerification = ({ config, onSelect, formData, t: tProps }) => {
-//   const { t } = useTranslation();
-//   const location = useLocation();
-//   const history = useHistory();
-//   const addressSectionRef = useRef(null);
-
-//   const flowState = location.state || {};
-//   const { isEditing, kNumber } = flowState;
-
-//   // Robust data extraction from formData
-//   const activeEdits = formData || {};
-//   const rawReviewData = formData?.reviewData || formData?.connectionDetails || {};
-//   const reviewWrapper = rawReviewData?.applicationReview || rawReviewData;
-//   const applicationData = (Array.isArray(reviewWrapper) ? reviewWrapper[0] : reviewWrapper) || {};
-//   const apiData = applicationData?.newData || applicationData;
-//   const apiConn = apiData?.connectionDetails || apiData || {};
-
-//   const initialData = {
-//     userName: apiConn.consumerName || "",
-//     mobileNumber: apiConn.phoneNumber || apiConn.mobileNo || "",
-//     whatsappNumber: apiConn.phoneNumber || apiConn.mobileNo || "",
-//     email: apiConn.email || "",
-//     noOfPersons: apiConn.noOfPerson || apiConn.noOfPersons || "",
-//   };
-
-//   const aadhaarData = activeEdits?.aadhaarData || {};
-
-//   const [aadhaarNumber, setAadhaarNumber] = useState(aadhaarData.aadhaarNumber || "");
-//   const [isAadhaarVerified, setIsAadhaarVerified] = useState(aadhaarData.isAadhaarVerified === true || isEditing); // Auto-verify if editing
-//   const [showOtpField, setShowOtpField] = useState(false);
-//   const [otp, setOtp] = useState("");
-//   const [otpError, setOtpError] = useState(false);
-//   const [nameCorrect, setNameCorrect] = useState(aadhaarData.nameCorrect || { code: "YES", name: "CORE_COMMON_YES" });
-//   const [userName, setUserName] = useState(aadhaarData.name || initialData.userName);
-//   const [mobileChange, setMobileChange] = useState(aadhaarData.mobileChange || { code: "YES", name: "CORE_COMMON_YES" });
-//   const [mobileNumber, setMobileNumber] = useState(aadhaarData.mobileNumber || initialData.mobileNumber);
-//   const [whatsappNumber, setWhatsappNumber] = useState(aadhaarData.whatsappNumber || initialData.whatsappNumber);
-//   const [email, setEmail] = useState(aadhaarData.email || initialData.email);
-//   const [noOfPersons, setNoOfPersons] = useState(aadhaarData.noOfPersons || initialData.noOfPersons);
-//   const [showAddressSection, setShowAddressSection] = useState(false);
-
-//   const getUpdatedData = () => ({
-//     aadhaarNumber,
-//     isAadhaarVerified,
-//     name: userName,
-//     nameCorrect,
-//     mobileChange,
-//     mobileNumber,
-//     whatsappNumber,
-//     email,
-//     noOfPersons,
-//     gender: "Male",
-//     dob: "01/01/1990",
-//   });
-
-//   const handleVerifyAadhaar = () => {
-//     if (aadhaarNumber.length === 12) setShowOtpField(true);
-//   };
-
-//   const handleVerifyOtp = () => {
-//     if (otp === "123456") {
-//       setIsAadhaarVerified(true);
-//       setShowOtpField(false);
-//       setShowAddressSection(true);
-//       if (onSelect) {
-//         onSelect(config.key, { ...getUpdatedData(), isAadhaarVerified: true });
-//       }
-//     } else {
-//       setOtpError(true);
-//     }
-//   };
-
-//   const onStepSelect = () => {
-//     const updatedData = getUpdatedData();
-//     if (onSelect) {
-//       onSelect(config.key, updatedData);
-//     } else {
-//       if (isEditing) {
-//         history.push("/digit-ui/employee/ekyc/review", { ...location.state, edits: { ...edits, aadhaarData: updatedData } });
-//       } else {
-//         history.push("/digit-ui/employee/ekyc/address-details", {
-//           ...location.state,
-//           edits: { ...edits, aadhaarData: updatedData }
-//         });
-//       }
-//     }
-//   };
-
-//   const handleUpdateAndReturn = () => {
-//     history.push("/digit-ui/employee/ekyc/review", { ...location.state, edits: { ...edits, aadhaarData: getUpdatedData() } });
-//   };
-
-//   const yesNoOptions = [
-//     { code: "YES", name: "CORE_COMMON_YES" },
-//     { code: "NO", name: "CORE_COMMON_NO" },
-//   ];
-
-//   return (
-//     <Fragment>
-//       <FormStep
-//         t={t}
-//         config={config || {}}
-//         onSelect={onStepSelect}
-//         isDisabled={!isAadhaarVerified || !userName || !mobileNumber}
-//         label={t(config?.texts?.submitBarLabel) || (isEditing ? t("EKYC_UPDATE_AND_RETURN") : t("ES_COMMON_CONTINUE"))}
-//       >
-//         <CardLabel>{t("EKYC_AADHAAR_NUMBER")} <span className="astericColor">*</span></CardLabel>
-//         <TextInput
-//           id="aadhaarNumber"
-//           name="aadhaarNumber"
-//           value={aadhaarNumber}
-//           onChange={(e) => setAadhaarNumber(e.target.value)}
-//           placeholder={t("EKYC_ENTER_AADHAAR_NUMBER")}
-//           maxLength={12}
-//           disabled={isAadhaarVerified}
-//         />
-//         {!isAadhaarVerified && !showOtpField && (
-//           <SubmitBar label={t("EKYC_VERIFY")} onSubmit={handleVerifyAadhaar} disabled={aadhaarNumber.length !== 12} />
-//         )}
-
-//         {showOtpField && (
-//           <Fragment>
-//             <CardLabel>{t("EKYC_ENTER_OTP")} <span className="astericColor">*</span></CardLabel>
-//             <TextInput
-//               id="otp"
-//               name="otp"
-//               value={otp}
-//               onChange={(e) => setOtp(e.target.value)}
-//               placeholder="123456"
-//               maxLength={6}
-//             />
-//             {otpError && <div style={{ color: "red", fontSize: "12px" }}>{t("EKYC_INVALID_OTP")}</div>}
-//             <SubmitBar label={t("EKYC_VERIFY_OTP")} onSubmit={handleVerifyOtp} disabled={otp.length !== 6} />
-//           </Fragment>
-//         )}
-
-//         {isAadhaarVerified && (
-//           <Fragment>
-//             <CardLabel>{t("EKYC_IS_NAME_CORRECT")}</CardLabel>
-//             <RadioButtons
-//               options={yesNoOptions}
-//               optionsKey="name"
-//               selectedOption={nameCorrect}
-//               onSelect={setNameCorrect}
-//             />
-//             <CardLabel>{t("EKYC_USER_NAME")} <span className="astericColor">*</span></CardLabel>
-//             <TextInput
-//               id="userName"
-//               name="userName"
-//               value={userName}
-//               onChange={(e) => setUserName(e.target.value)}
-//               disabled={nameCorrect.code === "NO"}
-//             />
-
-//             <CardLabel>{t("EKYC_CHANGE_MOBILE")}</CardLabel>
-//             <RadioButtons
-//               options={yesNoOptions}
-//               optionsKey="name"
-//               selectedOption={mobileChange}
-//               onSelect={setMobileChange}
-//             />
-//             <CardLabel>{t("EKYC_MOBILE_NUMBER")} <span className="astericColor">*</span></CardLabel>
-//             <TextInput
-//               id="mobileNumber"
-//               name="mobileNumber"
-//               value={mobileNumber}
-//               onChange={(e) => setMobileNumber(e.target.value)}
-//               disabled={mobileChange.code === "NO"}
-//             />
-
-//             <CardLabel>{t("EKYC_WHATSAPP_NUMBER")}</CardLabel>
-//             <TextInput
-//               id="whatsappNumber"
-//               name="whatsappNumber"
-//               value={whatsappNumber}
-//               onChange={(e) => setWhatsappNumber(e.target.value)}
-//             />
-
-//             <CardLabel>{t("EKYC_EMAIL_ID")}</CardLabel>
-//             <TextInput
-//               id="email"
-//               name="email"
-//               value={email}
-//               onChange={(e) => setEmail(e.target.value)}
-//             />
-
-//             <CardLabel>{t("EKYC_NO_OF_PERSONS")}</CardLabel>
-//             <TextInput
-//               id="noOfPersons"
-//               name="noOfPersons"
-//               value={noOfPersons}
-//               onChange={(e) => setNoOfPersons(e.target.value)}
-//             />
-//           </Fragment>
-//         )}
-//       </FormStep>
-//       {isEditing && !onSelect && (
-//         <ActionBar style={{ position: "static", marginTop: "20px" }}>
-//           <SubmitBar label={t("EKYC_UPDATE_AND_RETURN")} onSubmit={handleUpdateAndReturn} />
-//         </ActionBar>
-//       )}
-//     </Fragment>
-//   );
-// };
-
-// export default AadhaarVerification;
-
-
-
 import React, { useState, Fragment } from "react";
-import {
-  CardLabel,
-  TextInput,
-  Dropdown,
-  UploadFile,
-  RadioButtons,
-  Toast,
-  FormStep,
-} from "@djb25/digit-ui-react-components";
+import { CardLabel, TextInput, Dropdown, UploadFile, Toast, FormStep } from "@djb25/digit-ui-react-components";
 
 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 [consumerName, setConsumerName] = useState("");
   const [firstName, setFirstName] = useState("");
   const [middleName, setMiddleName] = useState("");
   const [lastName, setLastName] = useState("");
 
   const [gender, setGender] = useState(null);
-  const [relation, setRelation] = useState("");
 
   const [mobile, setMobile] = useState("");
   const [whatsapp, setWhatsapp] = useState("");
@@ -257,7 +20,7 @@ const ConsumerDetails = ({ config, onSelect }) => {
   const [residents, setResidents] = useState("");
 
   // Tenant
-  const [documentProof, setDocumentProof] = useState(null);
+  const [, setDocumentProof] = useState(null);
   const [documentId, setDocumentId] = useState(null);
   const [ownerMobile, setOwnerMobile] = useState("");
   const [tenantVerification, setTenantVerification] = useState("");
@@ -266,41 +29,21 @@ const ConsumerDetails = ({ config, onSelect }) => {
   const [designation, setDesignation] = useState("");
   const [department, setDepartment] = useState("");
   const [employeeId, setEmployeeId] = useState("");
-  const [landline, setLandline] = useState("");
 
   // Other Entity
-  const [entityRelation, setEntityRelation] = useState("");
   const [contactPerson, setContactPerson] = useState("");
   const [entityName, setEntityName] = useState("");
 
   // Identity
-  const [idProof, setIdProof] = useState(null);
-  const [idNumber, setIdNumber] = useState("");
-  const [idFile, setIdFile] = useState(null);
-
 
   const [toast, setToast] = useState(null);
 
   // 🔹 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 yesNo = [{ name: "Yes" }, { name: "No" }];
+  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" }];
 
   // 🔹 FILE UPLOAD
   const uploadFile = async (e, setter, idSetter) => {
@@ -329,10 +72,9 @@ const ConsumerDetails = ({ config, onSelect }) => {
     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;
+    return false;
   };
 
   // 🔹 SUBMIT
@@ -347,12 +89,10 @@ const ConsumerDetails = ({ config, onSelect }) => {
       consumerType: consumerType?.name,
       occupantType: occupantType?.name,
       categoryType: categoryType?.name,
-      consumerName,
       firstName,
       middleName,
       lastName,
       gender: gender?.name,
-      relation,
       mobile,
       whatsapp,
       email,
@@ -363,16 +103,8 @@ const ConsumerDetails = ({ config, onSelect }) => {
       designation,
       department,
       employeeId,
-      landline,
-      entityRelation,
       contactPerson,
       entityName,
-      idProof: idProof?.name,
-      idNumber,
-      consent,
-      informantIsConsumer,
-      informantName,
-      informantRelation,
     };
 
     onSelect(config.key, data);
@@ -500,13 +232,10 @@ const ConsumerDetails = ({ config, onSelect }) => {
           </Fragment>
         )}
 
-        
-
         {toast && <Toast label={toast.message} error={toast.type === "error"} onClose={() => setToast(null)} />}
-
       </FormStep>
     </Fragment>
   );
 };
 
-export default ConsumerDetails;
+export default ConsumerDetails;

package/src/pages/employee/Inbox.js

@@ -85,13 +85,14 @@ const Inbox = ({ parentRoute, businessService = "EKYC", initialStates = {}, filt
       }
 
       // ✅ dashboard mapping
+      const fullName = [item.firstName, item.middleName, item.lastName].filter(Boolean).join(" ");
       return {
         ...item,
         applicationNo: item.kno || item.applicationNumber || "",
-        connectionNo: item.connectionNo || "",
-        owner: item.consumerName || item.citizenName || "",
+        connectionNo: item.kno || "",
+        owner: fullName || item.consumerName || item.citizenName || "",
         applicationNumber: item.kno || item.applicationNumber || "",
-        citizenName: item.consumerName || item.citizenName || "",
+        citizenName: fullName || item.consumerName || item.citizenName || "",
         status: item.status || "",
         sla: item.sla ?? 0,
       };
@@ -102,7 +103,7 @@ const Inbox = ({ parentRoute, businessService = "EKYC", initialStates = {}, filt
 
   const checkPathName = location.pathname.includes("ekyc/inbox");
   const PropsForInboxLinks = {
-    headerText: checkPathName ? "MODULE_WATER" : "MODULE_SW",
+    headerText: checkPathName ? "EKYC_MODULE" : "MODULE_SW",
   };
 
   const SearchFormFields = useCallback(
@@ -246,6 +247,7 @@ const Inbox = ({ parentRoute, businessService = "EKYC", initialStates = {}, filt
           propsForInboxTable,
           // propsForInboxMobileCards,
           formState,
+          countData: dashboardData?.dashboardInfo,
         }}
       />
     </div>

package/src/pages/employee/index.js

@@ -1,4 +1,4 @@
-import { AppContainer, PrivateRoute, ModuleHeader, ArrowLeft, HomeIcon } from "@djb25/digit-ui-react-components";
+import { AppContainer, PrivateRoute, ModuleHeader, ArrowLeft, HomeIcon, LayoutWrapper } from "@djb25/digit-ui-react-components";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { Switch, useLocation } from "react-router-dom";
@@ -7,7 +7,7 @@ import Inbox from "./Inbox";
 import Mapping from "./Mapping";
 import Create from "./Create";
 
-import Review from "./Review";
+import Review from "../../components/Review";
 import EKYCForm from "./EKYCForm";
 
 const EmployeeApp = ({ path }) => {
@@ -52,20 +52,56 @@ const EmployeeApp = ({ path }) => {
             <Switch>
               <PrivateRoute
                 path={`${path}/dashboard`}
-                component={() => <Dashboard parentRoute={path} businessService="EKYC" moduleCode="EKYC" isInbox={true} />}
+                component={() => (
+                  <LayoutWrapper layoutClass="normal">
+                    <Dashboard parentRoute={path} businessService="EKYC" moduleCode="EKYC" isInbox={true} />
+                  </LayoutWrapper>
+                )}
               />
               <PrivateRoute
                 path={`${path}/inbox`}
-                component={() => <Inbox parentRoute={path} businessService="EKYC" moduleCode="EKYC" isInbox={true} />}
+                component={() => (
+                  <LayoutWrapper layoutClass="normal">
+                    <Inbox parentRoute={path} businessService="EKYC" moduleCode="EKYC" isInbox={true} />
+                  </LayoutWrapper>
+                )}
               />
 
-              <PrivateRoute path={`${path}/create-kyc`} component={() => <Create />} />
+              <PrivateRoute
+                path={`${path}/create-kyc`}
+                component={() => (
+                  <LayoutWrapper layoutClass="normal">
+                    <Create />
+                  </LayoutWrapper>
+                )}
+              />
 
-              <PrivateRoute path={`${path}/mapping`} component={() => <Mapping />} />
+              <PrivateRoute
+                path={`${path}/mapping`}
+                component={() => (
+                  <LayoutWrapper layoutClass="normal">
+                    <Mapping />
+                  </LayoutWrapper>
+                )}
+              />
 
-              <PrivateRoute path={formStepRoutes.map((route) => `${path}/${route}`)} component={(props) => <EKYCForm {...props} path={path} />} />
+              <PrivateRoute
+                path={formStepRoutes.map((route) => `${path}/${route}`)}
+                component={(props) => (
+                  <LayoutWrapper layoutClass="normal">
+                    <EKYCForm {...props} path={path} />
+                  </LayoutWrapper>
+                )}
+              />
 
-              <PrivateRoute path={`${path}/review`} component={() => <Review />} />
+              <PrivateRoute
+                path={`${path}/review`}
+                component={() => (
+                  <LayoutWrapper layoutClass="normal">
+                    <Review />
+                  </LayoutWrapper>
+                )}
+              />
 
               {/* <PrivateRoute
                 path={`${path}/`}