From 2921e116a97297062dfbfe2b3aadfb9e393791a7 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Wed, 1 Oct 2025 10:31:46 +0530
Subject: [PATCH] Same Employee Displayed in Both Active and Inactive Lists in
 Project > Teams

---
 src/components/Project/Team/Teams.jsx | 33 ++++++++++++++++-----------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/components/Project/Team/Teams.jsx b/src/components/Project/Team/Teams.jsx
index 1f58971c..e46eda99 100644
--- a/src/components/Project/Team/Teams.jsx
+++ b/src/components/Project/Team/Teams.jsx
@@ -93,20 +93,27 @@ const Teams = () => {
   };
 
   const filteredEmployees = useMemo(() => {
-    if (!projectEmployees || !searchTerm?.trim()) return projectEmployees;
+    if (!projectEmployees) return [];
 
-    const lower = searchTerm.toLowerCase();
+    let filtered = projectEmployees;
 
-    return projectEmployees?.filter((emp) => {
-      const fullName = `${emp.firstName ?? ""} ${
-        emp.lastName ?? ""
-      }`.toLowerCase();
+    if (activeEmployee) {
+      filtered = projectEmployees.filter((emp) => !emp.isActive);
+    }
 
-      const joberole = getJobRole(emp?.jobRoleId)?.toLowerCase();
+    // Apply search filter if present
+    if (searchTerm?.trim()) {
+      const lower = searchTerm.toLowerCase();
+      filtered = filtered.filter((emp) => {
+        const fullName = `${emp.firstName ?? ""} ${emp.lastName ?? ""}`.toLowerCase();
+        const jobRole = getJobRole(emp?.jobRoleId)?.toLowerCase();
+        return fullName.includes(lower) || jobRole.includes(lower);
+      });
+    }
+
+    return filtered;
+  }, [projectEmployees, searchTerm, activeEmployee]);
 
-      return fullName?.includes(lower) || joberole?.includes(lower);
-    });
-  }, [projectEmployees, searchTerm]);
   const handleSearch = (e) => setSearchTerm(e.target.value);
   const employeeHandler = useCallback(
     (msg) => {
@@ -284,8 +291,8 @@ const Teams = () => {
                             <td>
                               {emp.reAllocationDate
                                 ? moment(emp.reAllocationDate).format(
-                                    "DD-MMM-YYYY"
-                                  )
+                                  "DD-MMM-YYYY"
+                                )
                                 : "Present"}
                             </td>
                           )}
@@ -317,7 +324,7 @@ const Teams = () => {
             {!employeeLodaing && filteredEmployees.length === 0 && (
               <div className="text-center text-muted py-3  d-flex justify-content-center align-items-center py-12">
                 <p>
-                  {!activeEmployee
+                  {activeEmployee
                     ? "No active employees assigned to the project"
                     : "No inactive employees assigned to the project"}
                 </p>
-- 
2.43.0