From a65243f45d81f0f8490cb3460bcfcdc05438b8a3 Mon Sep 17 00:00:00 2001 From: pramod mahajan Date: Wed, 16 Jul 2025 17:44:35 +0530 Subject: [PATCH 1/3] Fiixedd: Regularization pagination not reflecting current page data --- src/components/Activities/Regularization.jsx | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/components/Activities/Regularization.jsx b/src/components/Activities/Regularization.jsx index a192f51b..03f75e32 100644 --- a/src/components/Activities/Regularization.jsx +++ b/src/components/Activities/Regularization.jsx @@ -8,6 +8,7 @@ import moment from "moment"; import usePagination from "../../hooks/usePagination"; import eventBus from "../../services/eventBus"; import { cacheData, clearCacheKey } from "../../slices/apiDataManager"; +import { ITEMS_PER_PAGE } from "../../utils/constants"; const Regularization = ({ handleRequest }) => { var selectedProject = useSelector((store) => store.localVariables.projectId); @@ -44,7 +45,7 @@ const Regularization = ({ handleRequest }) => { const { currentPage, totalPages, currentItems, paginate } = usePagination( filteredData, - 20 + ITEMS_PER_PAGE ); useEffect(() => { eventBus.on("regularization", handler); @@ -85,15 +86,10 @@ const Regularization = ({ handleRequest }) => { - {/* {loading && ( - - Loading... - - )} */} {!loading && - (regularizes?.length > 0 ? ( - regularizes?.map((att, index) => ( + (currentItems?.length > 0 ? ( + currentItems?.map((att, index) => (
@@ -118,7 +114,6 @@ const Regularization = ({ handleRequest }) => { : "--"} - {/*
*/} Date: Wed, 16 Jul 2025 16:34:20 +0530 Subject: [PATCH 2/3] roject detail view showing incorrect default project --- src/components/Project/ProjectCard.jsx | 5 ++++- src/pages/project/ProjectListView.jsx | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/Project/ProjectCard.jsx b/src/components/Project/ProjectCard.jsx index 17b19572..9a18186c 100644 --- a/src/components/Project/ProjectCard.jsx +++ b/src/components/Project/ProjectCard.jsx @@ -14,6 +14,8 @@ import { getProjectStatusName, } from "../../utils/projectStatus"; import GlobalModel from "../common/GlobalModel"; +import { useDispatch } from "react-redux"; +import { setProjectId } from "../../slices/localVariablesSlice"; const ProjectCard = ({ projectData, recall }) => { const [ projectInfo, setProjectInfo ] = useState( projectData ); @@ -22,6 +24,7 @@ const ProjectCard = ({ projectData, recall }) => { ); const [showModal, setShowModal] = useState(false); const navigate = useNavigate(); + const dispatch = useDispatch() const ManageProject = useHasUserPermission(MANAGE_PROJECT); const { mutate: updateProject, @@ -57,6 +60,7 @@ const ProjectCard = ({ projectData, recall }) => { const handleClose = () => setShowModal(false); const handleViewProject = () => { + dispatch(setProjectId(projectInfo.id)) navigate(`/projects/details`); }; @@ -71,7 +75,6 @@ const ProjectCard = ({ projectData, recall }) => { return ( <> - {showModal && projects_Details && ( { + const dispatch = useDispatch() const [projectInfo, setProjectInfo] = useState(projectData); const { projects_Details, loading, error, refetch } = useProjectDetails( projectInfo?.id,false @@ -89,7 +92,10 @@ const ProjectListView = ({ projectData, recall }) => { navigate(`/projects/details`)} + onClick={() => { + dispatch(setProjectId(projectInfo.id)) + navigate(`/projects/details`) + }} > {projectInfo.shortName ? `${projectInfo.name} (${projectInfo.shortName})` -- 2.43.0 From 8ef1e932968fda55d1e190f35d86976df022c7b9 Mon Sep 17 00:00:00 2001 From: pramod mahajan Date: Wed, 16 Jul 2025 17:26:52 +0530 Subject: [PATCH 3/3] fixed : (employee-list display active or inactive and projectwise correctly --- src/hooks/useEmployees.js | 16 +++++++++------- src/pages/employee/EmployeeList.jsx | 12 +++--------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/hooks/useEmployees.js b/src/hooks/useEmployees.js index 3978ac81..5f1967cd 100644 --- a/src/hooks/useEmployees.js +++ b/src/hooks/useEmployees.js @@ -112,18 +112,20 @@ export const useEmployeesByProject = (projectId) => { }; // EmployeeList.jsx -export const useEmployeesAllOrByProjectId = (projectId, showInactive) => { - const isAllEmployees = !projectId && projectId !== undefined; +export const useEmployeesAllOrByProjectId = (showAllEmployees ,projectId, + showInactive) => { - const queryKey = isAllEmployees - ? ['allEmployees', showInactive] - : ['projectEmployees', projectId]; + +const queryKey = showAllEmployees + ? ['allEmployees', showInactive] + : ['projectEmployees', projectId, showInactive]; const queryFn = async () => { - if (isAllEmployees) { + if (showAllEmployees) { const res = await EmployeeRepository.getAllEmployeeList(showInactive); return res.data; } else { + if (!projectId) return []; const res = await EmployeeRepository.getEmployeeListByproject(projectId); return res.data; } @@ -137,7 +139,7 @@ export const useEmployeesAllOrByProjectId = (projectId, showInactive) => { } = useQuery({ queryKey, queryFn, - enabled: isAllEmployees || !!projectId, + enabled:typeof showInactive === "boolean" && (showAllEmployees || !!projectId), }); return { diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx index 09a820da..e091676f 100644 --- a/src/pages/employee/EmployeeList.jsx +++ b/src/pages/employee/EmployeeList.jsx @@ -51,7 +51,7 @@ const EmployeeList = () => { const { employees, loading, setLoading, error, recallEmployeeData } = useEmployeesAllOrByProjectId( - showAllEmployees ? null : selectedProjectId, + showAllEmployees ,selectedProjectId, showInactive ); @@ -153,13 +153,7 @@ const EmployeeList = () => { } }; - const handleToggle = (e) => { - setShowInactive(e.target.checked); - recallEmployeeData( - e.target.checked, - showAllEmployees ? null : selectedProjectId - ); // Use selectedProjectId here - }; + const handleAllEmployeesToggle = (e) => { const isChecked = e.target.checked; @@ -340,7 +334,7 @@ const EmployeeList = () => { role="switch" id="inactiveEmployeesCheckbox" checked={showInactive} - onChange={handleToggle} + onChange={()=> setShowInactive(e.target.checked)} />