From c4ebf6262fc3166c6db15d13973b010bf33ad003 Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Tue, 6 May 2025 16:33:04 +0530 Subject: [PATCH 1/2] Tiggeer Toast with valide message --- src/pages/employee/EmployeeList.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx index 25db4eb8..6a294293 100644 --- a/src/pages/employee/EmployeeList.jsx +++ b/src/pages/employee/EmployeeList.jsx @@ -114,7 +114,7 @@ const EmployeeList = () => { recallEmployeeData() }) .catch((error) => { - showToast(error.message, "error"); + showToast(error.response.data.message, "error"); }); }; -- 2.43.0 From fc0edabaeceb5992661fa67fc4a158f3fae16daa Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Tue, 6 May 2025 16:37:06 +0530 Subject: [PATCH 2/2] Add fallback error message handling with server response support --- src/pages/employee/EmployeeList.jsx | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx index 6a294293..369816d6 100644 --- a/src/pages/employee/EmployeeList.jsx +++ b/src/pages/employee/EmployeeList.jsx @@ -27,7 +27,7 @@ const EmployeeList = () => { const { projects, loading: projectLoading } = useProjects(); const ManageEmployee = useHasUserPermission(MANAGE_EMPLOYEES); - const { employees, loading, setLoading, error,recallEmployeeData } = + const { employees, loading, setLoading, error, recallEmployeeData } = useEmployeesAllOrByProjectId(selectedProject); const [projectsList, setProjectsList] = useState(projects || []); @@ -110,11 +110,15 @@ const EmployeeList = () => { clearCacheKey("employeeListByProject"); clearCacheKey("allEmployeeList"); clearCacheKey("employeeProfile"); - setEmployeeList([]) - recallEmployeeData() + setEmployeeList([]); + recallEmployeeData(); }) .catch((error) => { - showToast(error.response.data.message, "error"); + const message = + error.response?.data?.message || + error.message || + "An unexpected error occurred"; + showToast(message, "error"); }); }; @@ -127,7 +131,7 @@ const EmployeeList = () => { openModal(); } }, [modelConfig, isCreateModalOpen]); - + const tableRef = useRef(null); const handleExport = (type) => { if (!currentItems || currentItems.length === 0) return; @@ -449,7 +453,8 @@ const EmployeeList = () => { className="text-heading text-truncate cursor-pointer" > - {item.firstName} {item.middleName} {item.lastName} + {item.firstName} {item.middleName}{" "} + {item.lastName} @@ -520,7 +525,8 @@ const EmployeeList = () => { className="dropdown-item py-1" onClick={() => suspendEmployee(item.id)} > - Suspend + {" "} + Suspend -- 2.43.0