From 30b048e2649dba5b3c85b9045c3a897569de30b0 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Mon, 18 Aug 2025 15:21:31 +0530
Subject: [PATCH] In Employee page when user show Inactive Employee then Action
 Column will be hide.

---
 src/pages/employee/EmployeeList.jsx | 42 +++++++++++++----------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx
index ad54ce20..0a25e7b3 100644
--- a/src/pages/employee/EmployeeList.jsx
+++ b/src/pages/employee/EmployeeList.jsx
@@ -176,12 +176,10 @@ const EmployeeList = () => {
   useEffect(() => {
     if (!loading && Array.isArray(employees)) {
       const sorted = [...employees].sort((a, b) => {
-        const nameA = `${a.firstName || ""}${a.middleName || ""}${
-          a.lastName || ""
-        }`.toLowerCase();
-        const nameB = `${b.firstName || ""}${b.middleName || ""}${
-          b.lastName || ""
-        }`.toLowerCase();
+        const nameA = `${a.firstName || ""}${a.middleName || ""}${a.lastName || ""
+          }`.toLowerCase();
+        const nameB = `${b.firstName || ""}${b.middleName || ""}${b.lastName || ""
+          }`.toLowerCase();
         return nameA?.localeCompare(nameB);
       });
 
@@ -503,9 +501,7 @@ const EmployeeList = () => {
                         Status
                       </th>
                       <th
-                        className={`sorting_disabled  ${
-                          !Manage_Employee && "d-none"
-                        }`}
+                        className={`sorting_disabled ${(!Manage_Employee || showInactive) && "d-none"}`}
                         rowSpan="1"
                         colSpan="1"
                         style={{ width: "50px" }}
@@ -513,6 +509,7 @@ const EmployeeList = () => {
                       >
                         Actions
                       </th>
+
                     </tr>
                   </thead>
                   <tbody>
@@ -525,9 +522,9 @@ const EmployeeList = () => {
                     )}
                     {/* Conditional messages for no data or no search results */}
                     {!loading &&
-                    displayData?.length === 0 &&
-                    searchText &&
-                    !showAllEmployees ? (
+                      displayData?.length === 0 &&
+                      searchText &&
+                      !showAllEmployees ? (
                       <tr>
                         <td colSpan={8}>
                           <small className="muted">
@@ -537,8 +534,8 @@ const EmployeeList = () => {
                       </tr>
                     ) : null}
                     {!loading &&
-                    displayData?.length === 0 &&
-                    (!searchText || showAllEmployees) ? (
+                      displayData?.length === 0 &&
+                      (!searchText || showAllEmployees) ? (
                       <tr>
                         <td
                           colSpan={8}
@@ -620,7 +617,7 @@ const EmployeeList = () => {
                               </span>
                             )}
                           </td>
-                          {Manage_Employee && (
+                          {Manage_Employee && !showInactive && (
                             <td className="text-end">
                               <div className="dropdown">
                                 <button
@@ -687,9 +684,8 @@ const EmployeeList = () => {
                   <nav aria-label="Page">
                     <ul className="pagination pagination-sm justify-content-end py-1">
                       <li
-                        className={`page-item ${
-                          currentPage === 1 ? "disabled" : ""
-                        }`}
+                        className={`page-item ${currentPage === 1 ? "disabled" : ""
+                          }`}
                       >
                         <button
                           className="page-link btn-xs"
@@ -702,9 +698,8 @@ const EmployeeList = () => {
                       {[...Array(totalPages)]?.map((_, index) => (
                         <li
                           key={index}
-                          className={`page-item ${
-                            currentPage === index + 1 ? "active" : ""
-                          }`}
+                          className={`page-item ${currentPage === index + 1 ? "active" : ""
+                            }`}
                         >
                           <button
                             className="page-link"
@@ -716,9 +711,8 @@ const EmployeeList = () => {
                       ))}
 
                       <li
-                        className={`page-item ${
-                          currentPage === totalPages ? "disabled" : ""
-                        }`}
+                        className={`page-item ${currentPage === totalPages ? "disabled" : ""
+                          }`}
                       >
                         <button
                           className="page-link"