Refactor most getServerProps to fetch independent request in parallel and projected the data only to return the necessary fields and changed some functions
This commit is contained in:
@@ -27,6 +27,7 @@ import { requestUser } from "@/utils/api";
|
||||
import { useAllowedEntities } from "@/hooks/useEntityPermissions";
|
||||
import { getEntitiesUsers } from "@/utils/users.be";
|
||||
import { isAdmin } from "@/utils/users";
|
||||
import { useMemo } from "react";
|
||||
|
||||
interface Props {
|
||||
user: User;
|
||||
@@ -52,29 +53,29 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
|
||||
|
||||
const filteredEntities = findAllowedEntities(user, entities, "view_students");
|
||||
|
||||
const students = await getEntitiesUsers(
|
||||
mapBy(filteredEntities, "id"),
|
||||
{
|
||||
type: "student",
|
||||
},
|
||||
0,
|
||||
{
|
||||
_id: 0,
|
||||
id: 1,
|
||||
name: 1,
|
||||
email: 1,
|
||||
profilePicture: 1,
|
||||
levels: 1,
|
||||
registrationDate: 1,
|
||||
}
|
||||
);
|
||||
|
||||
const assignments = await getEntitiesAssignments(entityIDS);
|
||||
const [students, assignments, groups] = await Promise.all([
|
||||
getEntitiesUsers(
|
||||
mapBy(filteredEntities, "id"),
|
||||
{
|
||||
type: "student",
|
||||
},
|
||||
0,
|
||||
{
|
||||
_id: 0,
|
||||
id: 1,
|
||||
name: 1,
|
||||
email: 1,
|
||||
profilePicture: 1,
|
||||
levels: 1,
|
||||
registrationDate: 1,
|
||||
}
|
||||
),
|
||||
getEntitiesAssignments(entityIDS),
|
||||
getGroupsByEntities(entityIDS),
|
||||
]);
|
||||
|
||||
const stats = await getStatsByUsers(students.map((u) => u.id));
|
||||
|
||||
const groups = await getGroupsByEntities(entityIDS);
|
||||
|
||||
return {
|
||||
props: serialize({ user, students, entities, assignments, stats, groups }),
|
||||
};
|
||||
@@ -100,6 +101,10 @@ export default function Dashboard({
|
||||
entities,
|
||||
"view_student_performance"
|
||||
);
|
||||
const entitiesLabels = useMemo(
|
||||
() => mapBy(entities, "label")?.join(", "),
|
||||
[entities]
|
||||
);
|
||||
|
||||
return (
|
||||
<>
|
||||
@@ -117,7 +122,7 @@ export default function Dashboard({
|
||||
<div className="w-full flex flex-col gap-4">
|
||||
{entities.length > 0 && (
|
||||
<div className="w-fit self-end bg-neutral-200 px-2 rounded-lg py-1">
|
||||
<b>{mapBy(entities, "label")?.join(", ")}</b>
|
||||
<b>{entitiesLabels}</b>
|
||||
</div>
|
||||
)}
|
||||
<section className="grid grid-cols-5 -md:grid-cols-2 place-items-center gap-4 text-center">
|
||||
|
||||
Reference in New Issue
Block a user