admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Enhance email validation and fix spelling errors in address fields

Browse Source
This commit is contained in:
Vaibhav Surve 2025-04-08 17:33:26 +05:30 committed by Gitea Admin
parent 079dfb8861
commit 9d9569460a
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/components/Employee/ManageEmployee.jsx
View File

@ -36,7 +36,30 @@ const ManageEmployee = () => {
FirstName: z.string().min(1, { message: "First Name is required" }), FirstName: z.string().min(1, { message: "First Name is required" }),
MiddleName: z.string().optional(), MiddleName: z.string().optional(),
LastName: z.string().min(1, { message: "Last Name is required" }), LastName: z.string().min(1, { message: "Last Name is required" }),
Email: z.string().optional(), Email: z
.string()
.optional()
.refine(
(val) =>
!val || /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(val),
{
message: "Invalid email format",
}
)
.refine(
(val) => {
if (!val) return true;
const [local, domain] = val.split("@");
return (
val.length <= 320 &&
local?.length <= 64 &&
domain?.length <= 255
);
},
{
message: "Email local or domain part is too long",
}
),
CurrentAddress: z CurrentAddress: z
.string() .string()
.min(1, { message: "Current Address is required" }) .min(1, { message: "Current Address is required" })
@ -86,7 +109,7 @@ const ManageEmployee = () => {
.refine((val) => !val || /^[A-Z]{5}[0-9]{4}[A-Z]{1}$/.test(val), { .refine((val) => !val || /^[A-Z]{5}[0-9]{4}[A-Z]{1}$/.test(val), {
message: "Invalid PAN number", message: "Invalid PAN number",
}), }),
PeramnentAddress: z PermanentAddress: z
.string() .string()
.min(1, { message: "Permanent Address is required" }) .min(1, { message: "Permanent Address is required" })
.max(150, { message: "Address cannot exceed 150 characters" }), .max(150, { message: "Address cannot exceed 150 characters" }),
@ -120,7 +143,7 @@ const ManageEmployee = () => {
AadharNumber: currentEmployee?.aadharNumber || "", AadharNumber: currentEmployee?.aadharNumber || "",
Gender: currentEmployee?.gender || "", Gender: currentEmployee?.gender || "",
PanNumber: currentEmployee?.panNumber || "", PanNumber: currentEmployee?.panNumber || "",
PeramnentAddress: currentEmployee?.peramnentAddress || "", PermanentAddress: currentEmployee?.permanentAddress || "",
PhoneNumber: currentEmployee?.phoneNumber || "", PhoneNumber: currentEmployee?.phoneNumber || "",
JobRoleId: currentEmployee?.jobRoleId || "", JobRoleId: currentEmployee?.jobRoleId || "",
}, },
@ -191,7 +214,7 @@ const ManageEmployee = () => {
AadharNumber: currentEmployee.aadharNumber || "", AadharNumber: currentEmployee.aadharNumber || "",
Gender: currentEmployee.gender || "", Gender: currentEmployee.gender || "",
PanNumber: currentEmployee.panNumber || "", PanNumber: currentEmployee.panNumber || "",
PeramnentAddress: currentEmployee.peramnentAddress || "", PermanentAddress: currentEmployee.permanentAddress || "",
PhoneNumber: currentEmployee.phoneNumber || "", PhoneNumber: currentEmployee.phoneNumber || "",
JobRoleId: currentEmployee.jobRoleId?.toString() || "", JobRoleId: currentEmployee.jobRoleId?.toString() || "",
} }
@ -421,22 +444,22 @@ const ManageEmployee = () => {
)} )}
</div> </div>
<div className="col-sm-6"> <div className="col-sm-6">
<div className="form-text text-start">Permnant Address</div> <div className="form-text text-start">Permanent Address</div>
<textarea <textarea
id="PeramnentAddress" id="PermanentAddress"
className="form-control form-control-sm" className="form-control form-control-sm"
placeholder="Permnant Address" placeholder="Permanent Address"
aria-label="Permnant Address" aria-label="Permanent Address"
aria-describedby="basic-icon-default-message2" aria-describedby="basic-icon-default-message2"
{...register("PeramnentAddress")} {...register("PermanentAddress")}
></textarea> ></textarea>
{errors.PeramnentAddress && ( {errors.PermanentAddress && (
<div <div
className="danger-text text-start" className="danger-text text-start"
style={{ fontSize: "12px" }} style={{ fontSize: "12px" }}
> >
{errors.PeramnentAddress.message} {errors.PermanentAddress.message}
</div> </div>
)} )}
</div> </div>

2
src/pages/employee/EmployeeProfile.jsx
View File

@ -174,7 +174,7 @@ const EmployeeProfile = () => {
</li> </li>
<li className="d-flex align-items-start test-start mb-2"> <li className="d-flex align-items-start test-start mb-2">
<span className={`${currentEmployee?.permanentAddress ? "" : "ms-4"}`}> <span className={`${currentEmployee?.permanentAddress ? "" : "ms-4"}`}>
{currentEmployee?.peramnentAddress} {currentEmployee?.permanentAddress}
</span> </span>
</li> </li>