diff --git a/src/pages/entities/index.tsx b/src/pages/entities/index.tsx index 0358ffdf..4674ada8 100644 --- a/src/pages/entities/index.tsx +++ b/src/pages/entities/index.tsx @@ -8,7 +8,7 @@ import { GroupWithUsers, User } from "@/interfaces/user"; import { shouldRedirectHome } from "@/utils/navigation.disabled"; import { getUserName } from "@/utils/users"; import { convertToUsers, getGroupsForUser } from "@/utils/groups.be"; -import { countEntityUsers, getEntityUsers, getSpecificUsers } from "@/utils/users.be"; +import { countEntityUsers, getEntityUsers, getSpecificUsers, getUsers } from "@/utils/users.be"; import { checkAccess, findAllowedEntities, getTypesOfUser } from "@/utils/permissions"; import Link from "next/link"; import { uniq } from "lodash"; @@ -33,7 +33,11 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => { const allowedEntities = findAllowedEntities(user, entities, 'view_entities') const entitiesWithCount = await Promise.all( - allowedEntities.map(async (e) => ({ entity: e, count: await countEntityUsers(e.id), users: await getEntityUsers(e.id, 5) })), + allowedEntities.map(async (e) => ({ + entity: e, + count: await countEntityUsers(e.id, { type: { $in: ["student", "teacher", "corporate", "mastercorporate"] } }), + users: await getEntityUsers(e.id, 5, { type: { $in: ["student", "teacher", "corporate", "mastercorporate"] } }) + })), ); return {