From 7c9607cb780a196f19573d55d13c4c95f547fc37 Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Fri, 13 Jun 2025 18:06:09 +0530
Subject: [PATCH] resolved localCompare error

---
 src/components/Activities/AttendcesLogs.jsx               | 2 +-
 src/components/Activities/Regularization.jsx              | 2 +-
 src/components/Employee/ManageEmployee.jsx                | 2 +-
 .../Project/Infrastructure/EditActivityModal.jsx          | 4 ++--
 src/components/Project/Infrastructure/FloorModel.jsx      | 4 ++--
 src/components/Project/Infrastructure/TaskModel.jsx       | 8 ++++----
 src/components/Project/Infrastructure/WorkAreaModel.jsx   | 4 ++--
 src/hooks/useProjects.js                                  | 2 +-
 src/pages/Directory/Directory.jsx                         | 2 +-
 src/pages/employee/AttendancesEmployeeRecords.jsx         | 2 +-
 src/pages/employee/EmployeeList.jsx                       | 4 ++--
 src/pages/master/MasterTable.jsx                          | 2 +-
 src/pages/project/ProjectList.jsx                         | 2 +-
 13 files changed, 20 insertions(+), 20 deletions(-)

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
                         </option>
                         {[...job_role]
-                          .sort((a, b) => a.name.localeCompare(b.name))
+                          .sort((a, b) => a?.name?.localeCompare(b.name))
                           .map((item) => (
                             <option value={item?.id} key={item.id}>
                               {item?.name}{" "}
diff --git a/src/components/Project/Infrastructure/EditActivityModal.jsx b/src/components/Project/Infrastructure/EditActivityModal.jsx
index e539df96..d4c40b9b 100644
--- a/src/components/Project/Infrastructure/EditActivityModal.jsx
+++ b/src/components/Project/Infrastructure/EditActivityModal.jsx
@@ -273,7 +273,7 @@ const EditActivityModal = ({
                     activities
                       .slice()
                       .sort((a, b) =>
-                        (a.activityName || "").localeCompare(
+                        (a.activityName || "")?.localeCompare(
                           b.activityName || ""
                         )
                       )
@@ -312,7 +312,7 @@ const EditActivityModal = ({
                     categories
                       .slice()
                       .sort((a, b) =>
-                        (a.name || "").localeCompare(
+                        (a.name || "")?.localeCompare(
                           b.name || ""
                         )
                       )
diff --git a/src/components/Project/Infrastructure/FloorModel.jsx b/src/components/Project/Infrastructure/FloorModel.jsx
index 830a4f9c..92772739 100644
--- a/src/components/Project/Infrastructure/FloorModel.jsx
+++ b/src/components/Project/Infrastructure/FloorModel.jsx
@@ -140,7 +140,7 @@ const FloorModel = ({
                     buildings
                       .filter((building) => building?.name)
                       .sort((a, b) =>
-                        (a.name || "").localeCompare(b.name || "")
+                        (a.name || "")?.localeCompare(b.name || "")
                       )
                       .map((building) => (
                         <option key={building.id} value={building.id}>
@@ -172,7 +172,7 @@ const FloorModel = ({
                         [...selectedBuilding.floors]
                           .filter((floor) => floor?.floorName)
                           .sort((a, b) =>
-                            (a.floorName || "").localeCompare(
+                            (a.floorName || "")?.localeCompare(
                               b.floorName || ""
                             )
                           )
diff --git a/src/components/Project/Infrastructure/TaskModel.jsx b/src/components/Project/Infrastructure/TaskModel.jsx
index fa142fa2..0c6fc6ad 100644
--- a/src/components/Project/Infrastructure/TaskModel.jsx
+++ b/src/components/Project/Infrastructure/TaskModel.jsx
@@ -159,7 +159,7 @@ const TaskModel = ({
       const newCategories = categories?.slice()?.sort((a, b) => {
         const nameA = a?.name || "";
         const nameB = b?.name || "";
-        return nameA.localeCompare(nameB);
+        return nameA?.localeCompare(nameB);
       });
       setCategoryData(newCategories);
       setSelectedCategory(newCategories[0])
@@ -230,7 +230,7 @@ const TaskModel = ({
                         (floor) =>
                           floor?.floorName && Array.isArray(floor.workAreas)
                       )
-                      ?.sort((a, b) => a.floorName.localeCompare(b.floorName))
+                      ?.sort((a, b) => a.floorName?.localeCompare(b.floorName))
                       ?.map((floor) => (
                         <option key={floor.id} value={floor.id}>
                           {floor.floorName} - ({floor.workAreas.length} Work
@@ -263,7 +263,7 @@ const TaskModel = ({
                     <option value="0">Select Work Area</option>
                     {selectedFloor.workAreas
                       ?.filter((workArea) => workArea?.areaName)
-                      ?.sort((a, b) => a.areaName.localeCompare(b.areaName))
+                      ?.sort((a, b) => a.areaName?.localeCompare(b.areaName))
                       ?.map((workArea) => (
                         <option key={workArea.id} value={workArea.id}>
                           {workArea.areaName}
@@ -299,7 +299,7 @@ const TaskModel = ({
                         ?.sort((a, b) => {
                           const nameA = a?.activityName || "";
                           const nameB = b?.activityName || "";
-                          return nameA.localeCompare(nameB);
+                          return nameA?.localeCompare(nameB);
                         })
                         ?.map((activity) => (
                           <option key={activity.id} value={activity.id}>
diff --git a/src/components/Project/Infrastructure/WorkAreaModel.jsx b/src/components/Project/Infrastructure/WorkAreaModel.jsx
index 75711372..472c882f 100644
--- a/src/components/Project/Infrastructure/WorkAreaModel.jsx
+++ b/src/components/Project/Infrastructure/WorkAreaModel.jsx
@@ -197,7 +197,7 @@ const WorkAreaModel = ({
                       ?.sort((a, b) => {
                         const nameA = a.floorName || "";
                         const nameB = b.floorName || "";
-                        return nameA.localeCompare(nameB);
+                        return nameA?.localeCompare(nameB);
                       })
                       ?.map((floor) => (
                         <option key={floor.id} value={floor.id}>
@@ -231,7 +231,7 @@ const WorkAreaModel = ({
                         ?.sort((a, b) => {
                           const nameA = a.areaName || "";
                           const nameB = b.areaName || "";
-                          return nameA.localeCompare(nameB);
+                          return nameA?.localeCompare(nameB);
                         })
                         ?.map((workArea) => (
                           <option key={workArea.id} value={workArea.id}>
diff --git a/src/hooks/useProjects.js b/src/hooks/useProjects.js
index 66d4efb0..2ee5a6e3 100644
--- a/src/hooks/useProjects.js
+++ b/src/hooks/useProjects.js
@@ -18,7 +18,7 @@ export const useProjects = () => {
     const filterProjects = (projectsList) => {
       return projectsList
         .filter((proj) => projectIds.includes(String(proj.id)))
-        .sort((a, b) => a.name.localeCompare(b.name));
+        .sort((a, b) => a?.name?.localeCompare(b.name));
     };
 
     const projects_cache = getCachedData("projectslist");
diff --git a/src/pages/Directory/Directory.jsx b/src/pages/Directory/Directory.jsx
index cb167c2b..ff8457e2 100644
--- a/src/pages/Directory/Directory.jsx
+++ b/src/pages/Directory/Directory.jsx
@@ -181,7 +181,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
         (c.bucketIds || []).some((id) => selectedBucketIds.includes(id));
 
       return matchesSearch && matchesCategory && matchesBucket;
-    }).sort((a, b) => a.name.localeCompare(b.name));
+    }).sort((a, b) => a?.name?.localeCompare(b.name));
   }, [
     ContactList,
     searchText,
diff --git a/src/pages/employee/AttendancesEmployeeRecords.jsx b/src/pages/employee/AttendancesEmployeeRecords.jsx
index 45e8ab27..1908ef21 100644
--- a/src/pages/employee/AttendancesEmployeeRecords.jsx
+++ b/src/pages/employee/AttendancesEmployeeRecords.jsx
@@ -42,7 +42,7 @@ const AttendancesEmployeeRecords = ({ employee }) => {
   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 group1 = data
diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx
index 5a72fa8d..2d40ceff 100644
--- a/src/pages/employee/EmployeeList.jsx
+++ b/src/pages/employee/EmployeeList.jsx
@@ -85,7 +85,7 @@ const EmployeeList = () => {
           }`.toLowerCase();
         const nameB = `${b.firstName || ""}${b.middleName || ""}${b.lastName || ""
           }`.toLowerCase();
-        return nameA.localeCompare(nameB);
+        return nameA?.localeCompare(nameB);
       });
 
       setEmployeeList(sorted);
@@ -559,7 +559,7 @@ const EmployeeList = () => {
                           </td>
 
                           <td className=" d-none  d-md-table-cell">
-                            {moment(item.joiningDate).format("DD-MMM-YYYY")}
+                            {moment(item.joiningDate)?.format("DD-MMM-YYYY")}
                           </td>
                           <td>
                             {showInactive ? (
diff --git a/src/pages/master/MasterTable.jsx b/src/pages/master/MasterTable.jsx
index 8c28bd72..0126b339 100644
--- a/src/pages/master/MasterTable.jsx
+++ b/src/pages/master/MasterTable.jsx
@@ -34,7 +34,7 @@ const MasterTable = ({ data, columns, loading, handleModalData }) => {
     if (!sortKey) return 0;
     const aValue = a[sortKey] || "";
     const bValue = b[sortKey] || "";
-    return aValue.localeCompare(bValue);
+    return aValue?.localeCompare(bValue);
   });
 
   // Pagination logic
diff --git a/src/pages/project/ProjectList.jsx b/src/pages/project/ProjectList.jsx
index 99d42ee8..14ddf8df 100644
--- a/src/pages/project/ProjectList.jsx
+++ b/src/pages/project/ProjectList.jsx
@@ -50,7 +50,7 @@ const ProjectList = () => {
         .filter((statusId) => grouped[statusId])
         .flatMap((statusId) =>
           grouped[statusId].sort((a, b) =>
-            a.name.toLowerCase().localeCompare(b.name.toLowerCase())
+            a.name.toLowerCase()?.localeCompare(b.name.toLowerCase())
           )
         );