diff --git a/src/components/Activities/Attendance.jsx b/src/components/Activities/Attendance.jsx index 808ba466..ba1d53fc 100644 --- a/src/components/Activities/Attendance.jsx +++ b/src/components/Activities/Attendance.jsx @@ -188,7 +188,7 @@ const Attendance = ({ getRole, handleModalData }) => { ))} {!attendance && ( - No employees assigned to the project + No employees assigned to the project! )} diff --git a/src/components/Activities/Regularization.jsx b/src/components/Activities/Regularization.jsx index e4853402..04a546b3 100644 --- a/src/components/Activities/Regularization.jsx +++ b/src/components/Activities/Regularization.jsx @@ -8,8 +8,10 @@ import moment from "moment"; import usePagination from "../../hooks/usePagination"; import eventBus from "../../services/eventBus"; import { cacheData, clearCacheKey } from "../../slices/apiDataManager"; +import { useQueryClient } from "@tanstack/react-query"; const Regularization = ({ handleRequest }) => { + const queryClient = useQueryClient(); var selectedProject = useSelector((store) => store.localVariables.projectId); const [regularizesList, setregularizedList] = useState([]); const { regularizes, loading, error, refetch } = @@ -28,14 +30,25 @@ const Regularization = ({ handleRequest }) => { const handler = useCallback( (msg) => { if (selectedProject == msg.projectId) { - const updatedAttendance = regularizes?.filter( - (item) => item.id !== msg.response.id - ); - cacheData("regularizedList", { - data: updatedAttendance, - projectId: selectedProject, - }); - refetch(); + // const updatedAttendance = regularizes?.filter( + // (item) => item.id !== msg.response.id + // ); + // cacheData("regularizedList", { + // data: updatedAttendance, + // projectId: selectedProject, + // }); + // refetch(); + + queryClient.setQueryData( + ["regularizedList", selectedProject], + (oldData) => { + if (!oldData) { + queryClient.invalidateQueries({ queryKey: ["regularizedList"] }); + } + return oldData.filter((record) => record.id !== msg.response.id); + } + ), + queryClient.invalidateQueries({ queryKey: ["attendanceLogs"] }); } }, [selectedProject, regularizes] @@ -123,7 +136,10 @@ const Regularization = ({ handleRequest }) => { ) : ( -