diff --git a/src/components/Activities/AttendcesLogs.jsx b/src/components/Activities/AttendcesLogs.jsx index 3fa620a8..4e2de17d 100644 --- a/src/components/Activities/AttendcesLogs.jsx +++ b/src/components/Activities/AttendcesLogs.jsx @@ -64,7 +64,7 @@ const AttendanceLog = ({ const sortByName = (a, b) => { const nameA = a.firstName.toLowerCase() + a.lastName.toLowerCase(); const nameB = b.firstName.toLowerCase() + b.lastName.toLowerCase(); - return nameA.localeCompare(nameB); + return nameA?.localeCompare(nameB); }; useEffect(() => { diff --git a/src/components/Activities/Regularization.jsx b/src/components/Activities/Regularization.jsx index 5c4fb869..f8d919c0 100644 --- a/src/components/Activities/Regularization.jsx +++ b/src/components/Activities/Regularization.jsx @@ -20,7 +20,7 @@ const Regularization = ({ handleRequest }) => { const sortByName = (a, b) => { const nameA = a.firstName.toLowerCase() + a.lastName.toLowerCase(); const nameB = b.firstName.toLowerCase() + b.lastName.toLowerCase(); - return nameA.localeCompare(nameB); + return nameA?.localeCompare(nameB); }; const filteredData = [...regularizesList]?.sort(sortByName); diff --git a/src/components/Employee/ManageEmployee.jsx b/src/components/Employee/ManageEmployee.jsx index 05a8b50a..00357d16 100644 --- a/src/components/Employee/ManageEmployee.jsx +++ b/src/components/Employee/ManageEmployee.jsx @@ -510,7 +510,7 @@ const ManageEmployee = ({ employeeId, onClosed }) => { Select Role {[...job_role] - .sort((a, b) => a.name.localeCompare(b.name)) + .sort((a, b) => a?.name?.localeCompare(b.name)) .map((item) => ( {selectedFloor.workAreas ?.filter((workArea) => workArea?.areaName) - ?.sort((a, b) => a.areaName.localeCompare(b.areaName)) + ?.sort((a, b) => a.areaName?.localeCompare(b.areaName)) ?.map((workArea) => (