diff --git a/src/hooks/useProjects.js b/src/hooks/useProjects.js index fd7320ae..aa5fa3f6 100644 --- a/src/hooks/useProjects.js +++ b/src/hooks/useProjects.js @@ -7,6 +7,7 @@ import { setProjectId } from "../slices/localVariablesSlice"; export const useProjects = () => { + const {profile} = useProfile() const dispatch = useDispatch(); const [projects, setProjects] = useState([]); const [loading, setLoading] = useState(false); @@ -48,9 +49,19 @@ export const useProjects = () => fetchData(); }, []); - useEffect(() => { - dispatch(setProjectId(projects[0]?.id)); - }, [projects]); + useEffect( () => + { + if (projects ) + { + if ( profile?.projects && profile?.projects?.length > 0 ) + { + dispatch(setProjectId(profile?.projects[0])) + } else + { + dispatch(setProjectId(1)) + } + } + }, [profile]); return { projects, loading, error, refetch: fetchData }; }; diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx index 13207bb4..2e0f3bb2 100644 --- a/src/pages/employee/EmployeeList.jsx +++ b/src/pages/employee/EmployeeList.jsx @@ -163,30 +163,32 @@ const EmployeeList = () => { className="dataTables_length text-start" id="DataTables_Table_0_length" > - + diff --git a/src/pages/project/ProjectList.jsx b/src/pages/project/ProjectList.jsx index a0e9ea3e..1f5fd1e5 100644 --- a/src/pages/project/ProjectList.jsx +++ b/src/pages/project/ProjectList.jsx @@ -176,10 +176,13 @@ const ProjectList = () => {loading &&

Loading...

} - {currentItems && - currentItems.map((item) => ( - - ))} + {Array.isArray(currentItems) && loginUser?.projects && ( + currentItems + .filter((item) => loginUser.projects.includes(String(item.id))) + .map((item) => ( + + )) +)} {/* Pagination */} {!loading && (