From 3b6836c15a3c0fdaf125572d7c54a51699f304d0 Mon Sep 17 00:00:00 2001 From: Tiago Ribeiro Date: Thu, 12 Dec 2024 15:19:44 +0000 Subject: [PATCH] Groups stuff --- src/pages/classrooms/[id].tsx | 72 +++++++++++++++++----------------- src/pages/classrooms/index.tsx | 2 +- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/pages/classrooms/[id].tsx b/src/pages/classrooms/[id].tsx index a12b3286..38babb7a 100644 --- a/src/pages/classrooms/[id].tsx +++ b/src/pages/classrooms/[id].tsx @@ -2,40 +2,40 @@ import Layout from "@/components/High/Layout"; import Tooltip from "@/components/Low/Tooltip"; import { useEntityPermission } from "@/hooks/useEntityPermissions"; -import {useListSearch} from "@/hooks/useListSearch"; +import { useListSearch } from "@/hooks/useListSearch"; import usePagination from "@/hooks/usePagination"; import { EntityWithRoles } from "@/interfaces/entity"; -import {GroupWithUsers, User} from "@/interfaces/user"; -import {sessionOptions} from "@/lib/session"; -import {USER_TYPE_LABELS} from "@/resources/user"; +import { GroupWithUsers, User } from "@/interfaces/user"; +import { sessionOptions } from "@/lib/session"; +import { USER_TYPE_LABELS } from "@/resources/user"; import { filterBy, mapBy, redirect, serialize } from "@/utils"; import { requestUser } from "@/utils/api"; -import { getEntitiesWithRoles, getEntityWithRoles } from "@/utils/entities.be"; -import {convertToUsers, getGroup} from "@/utils/groups.be"; -import {shouldRedirectHome} from "@/utils/navigation.disabled"; -import {checkAccess, doesEntityAllow, findAllowedEntities, getTypesOfUser} from "@/utils/permissions"; -import {getUserName} from "@/utils/users"; -import {getEntityUsers, getLinkedUsers, getSpecificUsers} from "@/utils/users.be"; +import { getEntityWithRoles } from "@/utils/entities.be"; +import { convertToUsers, getGroup } from "@/utils/groups.be"; +import { shouldRedirectHome } from "@/utils/navigation.disabled"; +import { doesEntityAllow } from "@/utils/permissions"; +import { getUserName, isAdmin } from "@/utils/users"; +import { getEntityUsers, getSpecificUsers } from "@/utils/users.be"; import axios from "axios"; import clsx from "clsx"; -import {withIronSessionSsr} from "iron-session/next"; +import { withIronSessionSsr } from "iron-session/next"; import { capitalize } from "lodash"; import moment from "moment"; import Head from "next/head"; import Link from "next/link"; -import {useRouter} from "next/router"; -import {Divider} from "primereact/divider"; -import {useEffect, useMemo, useState} from "react"; -import {BsBuilding, BsChevronLeft, BsClockFill, BsEnvelopeFill, BsFillPersonVcardFill, BsPlus, BsStopwatchFill, BsTag, BsTrash, BsX} from "react-icons/bs"; -import {toast, ToastContainer} from "react-toastify"; +import { useRouter } from "next/router"; +import { Divider } from "primereact/divider"; +import { useEffect, useMemo, useState } from "react"; +import { BsBuilding, BsChevronLeft, BsClockFill, BsEnvelopeFill, BsFillPersonVcardFill, BsPlus, BsStopwatchFill, BsTag, BsTrash, BsX } from "react-icons/bs"; +import { toast, ToastContainer } from "react-toastify"; -export const getServerSideProps = withIronSessionSsr(async ({req, res, params}) => { +export const getServerSideProps = withIronSessionSsr(async ({ req, res, params }) => { const user = await requestUser(req, res) if (!user) return redirect("/login") if (shouldRedirectHome(user)) return redirect("/") - const {id} = params as {id: string}; + const { id } = params as { id: string }; const group = await getGroup(id); if (!group || !group.entity) return redirect("/classrooms") @@ -51,7 +51,7 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res, params}) const groupWithUser = convertToUsers(group, users); 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); @@ -62,7 +62,7 @@ interface Props { entity: EntityWithRoles } -export default function Home({user, group, users, entity}: Props) { +export default function Home({ user, group, users, entity }: Props) { const [isAdding, setIsAdding] = useState(false); const [isLoading, setIsLoading] = useState(false); const [selectedUsers, setSelectedUsers] = useState([]); @@ -77,11 +77,11 @@ export default function Home({user, group, users, entity}: Props) { [users, group.participants, group.admin.id, user.id], ); - const {rows, renderSearch} = useListSearch( + const { rows, renderSearch } = useListSearch( [["name"], ["corporateInformation", "companyInformation", "name"]], isAdding ? nonParticipantUsers : group.participants, ); - const {items, renderMinimal} = usePagination(rows, 20); + const { items, renderMinimal } = usePagination(rows, 20); const router = useRouter(); @@ -96,7 +96,7 @@ export default function Home({user, group, users, entity}: Props) { setIsLoading(true); axios - .patch(`/api/groups/${group.id}`, {participants: group.participants.map((x) => x.id).filter((x) => !selectedUsers.includes(x))}) + .patch(`/api/groups/${group.id}`, { participants: group.participants.map((x) => x.id).filter((x) => !selectedUsers.includes(x)) }) .then(() => { toast.success("The group has been updated successfully!"); router.replace(router.asPath); @@ -117,7 +117,7 @@ export default function Home({user, group, users, entity}: Props) { setIsLoading(true); axios - .patch(`/api/groups/${group.id}`, {participants: [...group.participants.map((x) => x.id), ...selectedUsers]}) + .patch(`/api/groups/${group.id}`, { participants: [...group.participants.map((x) => x.id), ...selectedUsers] }) .then(() => { toast.success("The group has been updated successfully!"); router.replace(router.asPath); @@ -137,7 +137,7 @@ export default function Home({user, group, users, entity}: Props) { setIsLoading(true); axios - .patch(`/api/groups/${group.id}`, {name}) + .patch(`/api/groups/${group.id}`, { name }) .then(() => { toast.success("The classroom has been updated successfully!"); router.replace(router.asPath); @@ -187,14 +187,14 @@ export default function Home({user, group, users, entity}: Props) {
-
- - - -

{group.name}

-
+
+ + + +

{group.name}

+
{!isAdding && (
@@ -216,9 +216,9 @@ export default function Home({user, group, users, entity}: Props) { )}
- - {entity.label} - + + {entity.label} + {getUserName(group.admin)} diff --git a/src/pages/classrooms/index.tsx b/src/pages/classrooms/index.tsx index 3ffb6a18..482524bf 100644 --- a/src/pages/classrooms/index.tsx +++ b/src/pages/classrooms/index.tsx @@ -35,7 +35,7 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => { const groups = await getGroupsForEntities(mapBy(allowedEntities, 'id')); 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 { props: serialize({ user, groups: groupsWithUsers, entities: allowedEntities }),