devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Groups stuff

Browse Source
This commit is contained in:
Tiago Ribeiro
2024-12-12 15:19:44 +00:00
parent 858e29eb93
commit 3b6836c15a
2 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pages/classrooms/[id].tsx
View File

@@ -10,12 +10,12 @@ import {sessionOptions} from "@/lib/session";
import { USER_TYPE_LABELS } from "@/resources/user"; import { USER_TYPE_LABELS } from "@/resources/user";
import { filterBy, mapBy, redirect, serialize } from "@/utils"; import { filterBy, mapBy, redirect, serialize } from "@/utils";
import { requestUser } from "@/utils/api"; import { requestUser } from "@/utils/api";
import { getEntitiesWithRoles, getEntityWithRoles } from "@/utils/entities.be"; import { getEntityWithRoles } from "@/utils/entities.be";
import { convertToUsers, getGroup } from "@/utils/groups.be"; import { convertToUsers, getGroup } from "@/utils/groups.be";
import { shouldRedirectHome } from "@/utils/navigation.disabled"; import { shouldRedirectHome } from "@/utils/navigation.disabled";
import {checkAccess, doesEntityAllow, findAllowedEntities, getTypesOfUser} from "@/utils/permissions"; import { doesEntityAllow } from "@/utils/permissions";
import {getUserName} from "@/utils/users"; import { getUserName, isAdmin } from "@/utils/users";
import {getEntityUsers, getLinkedUsers, getSpecificUsers} from "@/utils/users.be"; import { getEntityUsers, getSpecificUsers } from "@/utils/users.be";
import axios from "axios"; import axios from "axios";
import clsx from "clsx"; import clsx from "clsx";
import { withIronSessionSsr } from "iron-session/next"; import { withIronSessionSsr } from "iron-session/next";
@@ -51,7 +51,7 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res, params})
const groupWithUser = convertToUsers(group, users); const groupWithUser = convertToUsers(group, users);
return { return {
props: serialize({user, group: groupWithUser, users: linkedUsers, entity}), props: serialize({ user, group: groupWithUser, users: linkedUsers.filter(x => isAdmin(user) ? true : !isAdmin(x)), entity }),
}; };
}, sessionOptions); }, sessionOptions);

2
src/pages/classrooms/index.tsx
View File

@@ -35,7 +35,7 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
const groups = await getGroupsForEntities(mapBy(allowedEntities, 'id')); const groups = await getGroupsForEntities(mapBy(allowedEntities, 'id'));
const users = await getSpecificUsers(uniq(groups.flatMap((g) => [...g.participants, g.admin]))); const users = await getSpecificUsers(uniq(groups.flatMap((g) => [...g.participants, g.admin])));
const groupsWithUsers: GroupWithUsers[] = groups.map((g) => convertToUsers(g, users)); const groupsWithUsers: GroupWithUsers[] = groups.map((g) => convertToUsers(g, users.filter(x => isAdmin(user) ? true : !isAdmin(x))));
return { return {
props: serialize({ user, groups: groupsWithUsers, entities: allowedEntities }), props: serialize({ user, groups: groupsWithUsers, entities: allowedEntities }),