From 3cfbc826722806522a7432b1e09a1cc54c4abf52 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Tue, 19 Aug 2025 11:17:09 +0530
Subject: [PATCH 1/2] Display Only "Re-activate" Button for Inactive Employees
 in Action Column

---
 src/pages/employee/EmployeeList.jsx | 92 +++++++++++++++--------------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx
index ad54ce20..be586d18 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,8 @@ const EmployeeList = () => {
                         Status
                       </th>
                       <th
-                        className={`sorting_disabled  ${
-                          !Manage_Employee && "d-none"
-                        }`}
+                        className={`sorting_disabled  ${!Manage_Employee && "d-none"
+                          }`}
                         rowSpan="1"
                         colSpan="1"
                         style={{ width: "50px" }}
@@ -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}
@@ -630,47 +627,55 @@ const EmployeeList = () => {
                                   <i className="bx bx-dots-vertical-rounded bx-md"></i>
                                 </button>
                                 <div className="dropdown-menu dropdown-menu-end">
+                                  {/* View always visible */}
                                   <button
-                                    onClick={() =>
-                                      navigate(`/employee/${item.id}`)
-                                    }
+                                    onClick={() => navigate(`/employee/${item.id}`)}
                                     className="dropdown-item py-1"
                                   >
                                     <i className="bx bx-detail bx-sm"></i> View
                                   </button>
-                                  <button
-                                    className="dropdown-item py-1"
-                                    onClick={() => {
-                                      handleEmployeeModel(item.id);
-                                    }}
-                                  >
-                                    <i className="bx bx-edit bx-sm"></i> Edit
-                                  </button>
-                                  {!item.isSystem && (
+
+                                  {/* If ACTIVE employee */}
+                                  {item.isActive && (
                                     <>
                                       <button
                                         className="dropdown-item py-1"
-                                        onClick={() =>
-                                          handleOpenDelete(item.id)
-                                        }
+                                        onClick={() => handleEmployeeModel(item.id)}
                                       >
-                                        <i className="bx bx-task-x bx-sm"></i>{" "}
-                                        Suspend
+                                        <i className="bx bx-edit bx-sm"></i> Edit
                                       </button>
+                                      
+                                      {/* Suspend only when active */}
+                                      <button
+                                        className="dropdown-item py-1"
+                                        onClick={() => handleOpenDelete(item.id)}
+                                      >
+                                        <i className="bx bx-task-x bx-sm"></i> Suspend
+                                      </button>
+                                      
                                       <button
                                         className="dropdown-item py-1"
                                         type="button"
                                         data-bs-toggle="modal"
                                         data-bs-target="#managerole-modal"
-                                        onClick={() =>
-                                          setEmpForManageRole(item.id)
-                                        }
+                                        onClick={() => setEmpForManageRole(item.id)}
                                       >
-                                        <i className="bx bx-cog bx-sm"></i>{" "}
-                                        Manage Role
+                                        <i className="bx bx-cog bx-sm"></i> Manage Role
                                       </button>
+
                                     </>
                                   )}
+
+                                  {/* If INACTIVE employee AND inactive toggle is ON */}
+                                  {!item.isActive && showInactive && (
+                                    <button
+                                      className="dropdown-item py-1"
+                                      onClick={() => handleOpenDelete(item.id)}
+                                    >
+                                      <i className="bx bx-refresh bx-sm me-1"></i>
+                                      Re-activate
+                                    </button>
+                                  )}
                                 </div>
                               </div>
                             </td>
@@ -687,9 +692,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 +706,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 +719,8 @@ const EmployeeList = () => {
                       ))}
 
                       <li
-                        className={`page-item ${
-                          currentPage === totalPages ? "disabled" : ""
-                        }`}
+                        className={`page-item ${currentPage === totalPages ? "disabled" : ""
+                          }`}
                       >
                         <button
                           className="page-link"
-- 
2.43.0


From 2a2cfcb12c55d3d68df9e5a0cf0b81be66861ece Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Tue, 19 Aug 2025 11:50:01 +0530
Subject: [PATCH 2/2] Updation in Employee Suspend and Reactivate employee.

---
 src/hooks/useEmployees.js               | 25 +++++++++++-----
 src/pages/employee/EmployeeList.jsx     | 40 +++++++++++++++----------
 src/repositories/EmployeeRepository.jsx |  2 +-
 3 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/src/hooks/useEmployees.js b/src/hooks/useEmployees.js
index a2fae3fd..bbc72502 100644
--- a/src/hooks/useEmployees.js
+++ b/src/hooks/useEmployees.js
@@ -277,27 +277,37 @@ export const useSuspendEmployee = ({
   );
 
   return useMutation({
-    mutationFn: async (employeeId) => {
+    // Expect both employeeId and active status
+    mutationFn: async ({ employeeId, active }) => {
       setemployeeLodaing(true);
-      return await EmployeeRepository.deleteEmployee(employeeId);
+      return await EmployeeRepository.deleteEmployee(employeeId, active);
     },
 
-    onSuccess: (_, employeeId) => {
-      showToast("Employee suspended successfully.", "success");
+    onSuccess: (_, { employeeId, active }) => {
+      const message =
+        active === false
+          ? "Employee suspended successfully."
+          : "Employee reactivated successfully.";
+
+      showToast(message, "success");
       setIsDeleteModalOpen(false);
 
-      // Invalidate only the required employee-related queries
+      // Invalidate relevant queries
       queryClient.invalidateQueries({ queryKey: ["employee", employeeId] });
       queryClient.invalidateQueries({ queryKey: ["allEmployees"] });
 
       if (selectedProjectId) {
-        queryClient.invalidateQueries({ queryKey: ["projectEmployees", selectedProjectId] });
+        queryClient.invalidateQueries({
+          queryKey: ["projectEmployees", selectedProjectId],
+        });
       }
     },
 
     onError: (error) => {
       showToast(
-        error.response?.data?.message || error.message || "An unexpected error occurred",
+        error.response?.data?.message ||
+          error.message ||
+          "An unexpected error occurred",
         "error"
       );
       setIsDeleteModalOpen(false);
@@ -309,6 +319,7 @@ export const useSuspendEmployee = ({
   });
 };
 
+
 export const useUpdateEmployeeRoles = ({
   onClose,
   resetForm,
diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx
index be586d18..ff52a15c 100644
--- a/src/pages/employee/EmployeeList.jsx
+++ b/src/pages/employee/EmployeeList.jsx
@@ -272,12 +272,21 @@ const EmployeeList = () => {
         >
           <ConfirmModal
             type={"delete"}
-            header={"Suspend Employee"}
-            message={"Are you sure you want delete?"}
-            onSubmit={suspendEmployee}
+            header={
+              selectedEmpFordelete?.isActive
+                ? "Suspend Employee"
+                : "Reactivate Employee"
+            }
+            message={`Are you sure you want to ${selectedEmpFordelete?.isActive ? "suspend" : "reactivate"
+              } this employee?`}
+            onSubmit={() =>
+              suspendEmployee({
+                employeeId: selectedEmpFordelete.id,
+                active: !selectedEmpFordelete.isActive,
+              })
+            }
             onClose={() => setIsDeleteModalOpen(false)}
             loading={employeeLodaing}
-            paramData={selectedEmpFordelete}
           />
         </div>
       )}
@@ -644,15 +653,17 @@ const EmployeeList = () => {
                                       >
                                         <i className="bx bx-edit bx-sm"></i> Edit
                                       </button>
-                                      
+
                                       {/* Suspend only when active */}
-                                      <button
-                                        className="dropdown-item py-1"
-                                        onClick={() => handleOpenDelete(item.id)}
-                                      >
-                                        <i className="bx bx-task-x bx-sm"></i> Suspend
-                                      </button>
-                                      
+                                      {item.isActive && (
+                                        <button
+                                          className="dropdown-item py-1"
+                                          onClick={() => handleOpenDelete(item)}
+                                        >
+                                          <i className="bx bx-task-x bx-sm"></i> Suspend
+                                        </button>
+                                      )}
+
                                       <button
                                         className="dropdown-item py-1"
                                         type="button"
@@ -670,10 +681,9 @@ const EmployeeList = () => {
                                   {!item.isActive && showInactive && (
                                     <button
                                       className="dropdown-item py-1"
-                                      onClick={() => handleOpenDelete(item.id)}
+                                      onClick={() => handleOpenDelete(item)}
                                     >
-                                      <i className="bx bx-refresh bx-sm me-1"></i>
-                                      Re-activate
+                                      <i className="bx bx-refresh bx-sm me-1"></i> Re-activate
                                     </button>
                                   )}
                                 </div>
diff --git a/src/repositories/EmployeeRepository.jsx b/src/repositories/EmployeeRepository.jsx
index 5266596c..931c7c51 100644
--- a/src/repositories/EmployeeRepository.jsx
+++ b/src/repositories/EmployeeRepository.jsx
@@ -10,7 +10,7 @@ const EmployeeRepository = {
   updateEmployee: (id, data) => api.put(`/users/${id}`, data),
   // deleteEmployee: ( id ) => api.delete( `/users/${ id }` ),
   getEmployeeProfile: (id) => api.get(`/api/employee/profile/get/${id}`),
-  deleteEmployee: (id) => api.delete(`/api/employee/${id}`),
+  deleteEmployee: (id,active) => api.delete(`/api/employee/${id}?active=${active}`),
  getEmployeeName: (projectId, search) => {
   const params = new URLSearchParams();
 
-- 
2.43.0