Merge branch 'develop' of bitbucket.org:ecropdev/ielts-ui into workflow-permissions

Fix bug where workflows were being created again after exam edit - and other improvements.

Approved-by: Tiago Ribeiro

.gitignore

@@ -41,3 +41,5 @@ next-env.d.ts
 .yarn/*
 .history*
 __ENV.js
+
+settings.json

package.json

@@ -39,6 +39,7 @@
 		"country-codes-list": "^1.6.11",
 		"currency-symbol-map": "^5.1.0",
 		"daisyui": "^3.1.5",
+		"deep-diff": "^1.0.2",
 		"eslint": "8.33.0",
 		"eslint-config-next": "13.1.6",
 		"exceljs": "^4.4.0",
@@ -97,6 +98,7 @@
 	"devDependencies": {
 		"@simbathesailor/use-what-changed": "^2.0.0",
 		"@types/blob-stream": "^0.1.33",
+		"@types/deep-diff": "^1.0.5",
 		"@types/formidable": "^3.4.0",
 		"@types/howler": "^2.2.11",
 		"@types/lodash": "^4.14.191",

src/components/ApprovalWorkflows/RequestedBy.tsx

@@ -0,0 +1,32 @@
+import Image from "next/image";
+import React from "react";
+import { FaRegUser } from "react-icons/fa";
+
+interface Props {
+    prefix: string;
+    name: string;
+    profileImage: string;
+}
+
+export default function RequestedBy({ prefix, name, profileImage }: Props) {
+    return (
+        <div className="flex items-center space-x-3">
+            <div className="flex items-center justify-center w-12 h-12 bg-gray-100 rounded-lg border border-gray-300">
+                <FaRegUser className="text-mti-purple-dark size-5"/>
+            </div>
+            <div>
+                <p className="text-sm font-medium text-gray-800">Requested by</p>
+                <div className="flex items-center space-x-2">
+                    <p className="text-xs font-medium text-gray-800">{prefix} {name}</p>
+                    <img
+                        src={profileImage ? profileImage : "/defaultAvatar.png"}
+                        alt={name}
+                        width={24}
+                        height={24}
+                        className="w-6 h-6 rounded-full border-[1px] border-gray-400 border-opacity-50"
+                    />
+                </div>
+            </div>
+        </div>
+    );
+};

src/components/ApprovalWorkflows/StartedOn.tsx

@@ -0,0 +1,41 @@
+import React from "react";
+import { PiCalendarDots } from "react-icons/pi";
+
+interface Props {
+    date: number;
+}
+
+export default function StartedOn({ date }: Props) {
+    const formattedDate = new Date(date);
+
+    const yearMonthDay = formattedDate.toISOString().split("T")[0];
+
+    const fullDateTime = formattedDate.toLocaleString("en-US", {
+        year: "numeric",
+        month: "long",
+        day: "numeric",
+        hour: "2-digit",
+        minute: "2-digit",
+        second: "2-digit",
+        hour12: false,
+    });
+
+    return (
+        <div className="flex items-center space-x-3">
+            <div className="flex items-center justify-center w-12 h-12 bg-gray-100 rounded-lg border border-gray-300">
+                <PiCalendarDots className="text-mti-purple-dark size-7" />
+            </div>
+            <div>
+                <p className="pb-1 text-sm font-medium text-gray-800">Started on</p>
+                <div className="flex items-center">
+                    <p
+                        className="text-xs font-medium text-gray-800"
+                        title={fullDateTime}
+                    >
+                        {yearMonthDay}
+                    </p>
+                </div>
+            </div>
+        </div>
+    );
+};

src/components/ApprovalWorkflows/Status.tsx

@@ -0,0 +1,23 @@
+import { ApprovalWorkflowStatus, ApprovalWorkflowStatusLabel } from "@/interfaces/approval.workflow";
+import React from "react";
+import { RiProgress5Line } from "react-icons/ri";
+
+interface Props {
+    status: ApprovalWorkflowStatus;
+}
+
+export default function Status({ status }: Props) {
+    return (
+        <div className="flex items-center space-x-3">
+            <div className="flex items-center justify-center w-12 h-12 bg-gray-100 rounded-lg border border-gray-300">
+                <RiProgress5Line className="text-mti-purple-dark size-7"/>
+            </div>
+            <div>
+                <p className="pb-1 text-sm font-medium text-gray-800">Status</p>
+                <div className="flex items-center">
+                    <p className="text-xs font-medium text-gray-800">{ApprovalWorkflowStatusLabel[status]}</p>
+                </div>
+            </div>
+        </div>
+    );
+};

src/components/ApprovalWorkflows/Tip.tsx

@@ -0,0 +1,14 @@
+import { MdTipsAndUpdates } from "react-icons/md";
+
+interface Props {
+    text: string;
+}
+
+export default function Tip({ text }: Props) {
+    return (
+        <div className="flex flex-row gap-3 text-gray-500 font-medium">
+            <MdTipsAndUpdates size={25} />
+            <p>{text}</p>
+        </div>
+    );
+};

src/components/ApprovalWorkflows/UserWithProfilePic.tsx

@@ -0,0 +1,24 @@
+import Image from "next/image";
+
+interface Props {
+    prefix: string;
+    name: string;
+    profileImage: string;
+    textSize?: string;
+}
+
+export default function UserWithProfilePic({ prefix, name, profileImage, textSize }: Props) {
+    const textClassName = `${textSize ? textSize : "text-xs"} font-medium`
+    return (
+        <div className="flex items-center space-x-2">
+            <p className={textClassName}>{prefix} {name}</p>
+            <img
+                src={profileImage ? profileImage : "/defaultAvatar.png"}
+                alt={name}
+                width={24}
+                height={24}
+                className="rounded-full h-auto border-[1px] border-gray-400 border-opacity-50"
+            />
+        </div>
+    );
+};

src/components/ApprovalWorkflows/WorkflowEditableStepComponent.tsx

@@ -0,0 +1,136 @@
+import { EditableWorkflowStep } from "@/interfaces/approval.workflow";
+import Option from "@/interfaces/option";
+import { CorporateUser, DeveloperUser, MasterCorporateUser, TeacherUser } from "@/interfaces/user";
+import Image from "next/image";
+import { useEffect, useMemo, useState } from "react";
+import { AiOutlineUserAdd } from "react-icons/ai";
+import { BsTrash } from "react-icons/bs";
+import { LuGripHorizontal } from "react-icons/lu";
+import WorkflowStepNumber from "./WorkflowStepNumber";
+import WorkflowStepSelects from "./WorkflowStepSelects";
+
+interface Props extends Pick<EditableWorkflowStep, 'stepNumber' | 'assignees' | 'finalStep' | 'onDelete'> {
+    entityApprovers: (TeacherUser | CorporateUser | MasterCorporateUser | DeveloperUser)[];
+    onSelectChange: (numberOfSelects: number, index: number, value: Option | null) => void;
+    isCompleted: boolean,
+}
+
+export default function WorkflowEditableStepComponent({
+    stepNumber,
+    assignees = [null],
+    finalStep,
+    onDelete,
+    onSelectChange,
+    entityApprovers,
+    isCompleted,
+}: Props) {
+
+    const [selects, setSelects] = useState<(Option | null | undefined)[]>([null]);
+    const [isAdding, setIsAdding] = useState(false);
+
+    const approverOptions: Option[] = useMemo(() => 
+        entityApprovers
+            .map((approver) => ({
+                value: approver.id,
+                label: approver.name,
+                icon: () => <img src={approver.profilePicture} alt={approver.name} />
+            }))
+            .sort((a, b) => a.label.localeCompare(b.label)),
+        [entityApprovers]
+    );
+
+    useEffect(() => {
+        if (assignees && assignees.length > 0) {
+            const initialSelects = assignees.map((assignee) =>
+                typeof assignee === 'string' ? approverOptions.find(option => option.value === assignee) || null : null
+            );
+    
+            setSelects((prevSelects) => {
+                // This is needed to avoid unnecessary re-renders which can cause warning of a child component being re-rendered while parent is in the midle of also re-rendering.
+                const areEqual = initialSelects.length === prevSelects.length && initialSelects.every((option, idx) => option?.value === prevSelects[idx]?.value);
+                
+                if (!areEqual) {
+                    return initialSelects;
+                }
+                return prevSelects;
+            });
+        } 
+    }, [assignees, approverOptions]);
+
+    const selectedValues = useMemo(() => 
+        selects.filter((opt): opt is Option => !!opt).map(opt => opt.value),
+        [selects]
+    );
+
+    const availableApproverOptions = useMemo(() => 
+        approverOptions.filter(opt => !selectedValues.includes(opt.value)),
+        [approverOptions, selectedValues]
+    );
+
+    const handleAddSelectComponent = () => {
+        setIsAdding(true); // I hate to use flags... but it was the only way i was able to prevent onSelectChange to cause parent component from re-rendering in the midle of EditableWorkflowStep rerender.
+        setSelects(prev => [...prev, null]);
+    };
+
+    useEffect(() => {
+        if (isAdding) {
+            onSelectChange(selects.length, selects.length - 1, null);
+            setIsAdding(false); 
+        }
+    }, [selects.length, isAdding, onSelectChange]);
+
+    const handleSelectChangeAt = (numberOfSelects: number, index: number, option: Option | null) => {
+        const updated = [...selects];
+        updated[index] = option;
+        setSelects(updated);
+        onSelectChange(numberOfSelects, index, option);
+    };
+
+    return (
+        <div className="flex w-full">
+            <div className="flex flex-col items-center">
+                <WorkflowStepNumber stepNumber={stepNumber} completed={false} selected={false}  />
+
+                {/* Vertical Bar connecting steps */}
+                {!finalStep && (
+                    <div className="w-1 h-full min-h-10 bg-mti-purple-dark"></div>
+                )}
+            </div>
+
+            {stepNumber !== 1 && !finalStep && !isCompleted
+                ? <LuGripHorizontal className="ml-3 mt-2 cursor-grab active:cursor-grabbing min-w-[25px] min-h-[25px]" />
+                : <div className="ml-3 mt-2" style={{ width: 25, height: 25 }}></div>
+            }
+
+            <div className="ml-10 mb-12">
+                <WorkflowStepSelects
+                    approvers={availableApproverOptions}
+                    selects={selects}
+                    placeholder={stepNumber === 1 ? "Form Intake By:" : "Approval By:"}
+                    onSelectChange={handleSelectChangeAt}
+                    isCompleted={isCompleted}
+                />
+            </div>
+
+            <div className="flex flex-row items-start mt-1.5 ml-3">
+                <button
+                    type="button"
+                    onClick={handleAddSelectComponent}
+                    className="cursor-pointer"
+                >
+                    <AiOutlineUserAdd className="size-7 hover:text-mti-purple-light transition ease-in-out duration-300" />
+                </button>
+                {stepNumber !== 1 && !finalStep && (
+                    <button
+                        className="cursor-pointer"
+                        onClick={onDelete}
+                        type="button"
+                    >
+                        <BsTrash className="size-6 mt-0.5 ml-3 hover:text-mti-purple-light transition ease-in-out duration-300" />
+                    </button>
+                )}
+            </div>
+        </div>
+
+    );
+};

src/components/ApprovalWorkflows/WorkflowForm.tsx

@@ -0,0 +1,203 @@
+import { EditableApprovalWorkflow, EditableWorkflowStep } from "@/interfaces/approval.workflow";
+import Option from "@/interfaces/option";
+import { CorporateUser, DeveloperUser, MasterCorporateUser, TeacherUser } from "@/interfaces/user";
+import { AnimatePresence, Reorder, motion } from "framer-motion";
+import { FaRegCheckCircle, FaSpinner } from "react-icons/fa";
+import { IoIosAddCircleOutline } from "react-icons/io";
+import Button from "../Low/Button";
+import Tip from "./Tip";
+import WorkflowEditableStepComponent from "./WorkflowEditableStepComponent";
+
+interface Props {
+    workflow: EditableApprovalWorkflow;
+    onWorkflowChange: (workflow: EditableApprovalWorkflow) => void;
+    entityApprovers: (TeacherUser | CorporateUser | MasterCorporateUser | DeveloperUser)[];
+    entityAvailableFormIntakers?: (TeacherUser | CorporateUser | MasterCorporateUser | DeveloperUser)[];
+    isLoading: boolean;
+    isRedirecting?: boolean;
+}
+
+export default function WorkflowForm({ workflow, onWorkflowChange, entityApprovers, entityAvailableFormIntakers, isLoading, isRedirecting }: Props) {
+    const lastStep = workflow.steps[workflow.steps.length - 1];
+
+    const renumberSteps = (steps: EditableWorkflowStep[]): EditableWorkflowStep[] => {
+        return steps.map((step, index) => ({
+            ...step,
+            stepNumber: index + 1,
+        }));
+    };
+
+    const addStep = () => {
+        const newStep: EditableWorkflowStep = {
+            key: Date.now(),
+            stepType: "approval-by",
+            stepNumber: workflow.steps.length,
+            completed: false,
+            assignees: [null],
+            firstStep: false,
+            finalStep: false,
+        };
+
+        const updatedSteps = [
+            ...workflow.steps.slice(0, -1),
+            newStep,
+            lastStep
+        ];
+        onWorkflowChange({ ...workflow, steps: renumberSteps(updatedSteps) });
+    };
+
+    const handleDelete = (key: number | undefined) => {
+        if (!key) return;
+
+        const updatedSteps = workflow.steps.filter((step) => step.key !== key);
+        onWorkflowChange({ ...workflow, steps: renumberSteps(updatedSteps) });
+    };
+
+    const handleSelectChange = (key: number | undefined, numberOfSelects: number, index: number, selectedOption: Option | null) => {
+        if (!key) return;
+
+        const updatedSteps = workflow.steps.map((step) => {
+            if (step.key !== key) return step;
+
+            const assignees = step.assignees ?? [];
+            let newAssignees = [...assignees];
+
+            if (numberOfSelects === assignees.length) { // means no new select was added and instead one was changed
+                newAssignees[index] = selectedOption?.value;
+            } else if (numberOfSelects === assignees.length + 1) { // means a new select was added
+                newAssignees.push(selectedOption?.value || null);
+            }
+
+            return { ...step, assignees: newAssignees };
+        });
+        onWorkflowChange({ ...workflow, steps: updatedSteps });
+    };
+
+    const handleReorder = (newOrder: EditableWorkflowStep[]) => {
+        let draggableIndex = 0;
+        const updatedSteps = workflow.steps.map((step) => {
+            if (!step.firstStep && !step.finalStep && !step.completed) {
+                return newOrder[draggableIndex++];
+            }
+            // Keep static steps as-is
+            return step;
+        });
+        onWorkflowChange({ ...workflow, steps: renumberSteps(updatedSteps) });
+    };
+
+
+    return (
+        <>
+            {workflow.entityId && workflow.name &&
+                <div>
+                    <div
+                        className="flex flex-col gap-6"
+                    >
+                        <Tip text="Introduce here all the steps associated with this instance." />
+                        <Button
+                            color="purple"
+                            variant="solid"
+                            onClick={addStep}
+                            type="button"
+                            className="max-w-fit text-lg font-medium flex items-center gap-2 text-left mb-7"
+                        >
+                            <IoIosAddCircleOutline className="size-6" />
+                            Add Step
+                        </Button>
+                    </div>
+
+                    <Reorder.Group
+                        axis="y"
+                        values={workflow.steps}
+                        onReorder={handleReorder}
+                        className="flex flex-col gap-0"
+                    >
+                        <AnimatePresence>
+                            {workflow.steps.map((step, index) =>
+                                step.completed || step.firstStep || step.finalStep ? (
+                                    <motion.div
+                                        key={step.key}
+                                        layout
+                                        initial={{ opacity: 0, y: -30 }}
+                                        animate={{ opacity: 1, y: 0 }}
+                                        exit={{ opacity: 0, x: 30 }}
+                                        transition={{ duration: 0.20 }}
+                                    >
+                                        <WorkflowEditableStepComponent
+                                            stepNumber={index + 1}
+                                            assignees={step.assignees}
+                                            finalStep={step.finalStep}
+                                            onDelete={() => handleDelete(step.key)}
+                                            onSelectChange={(numberOfSelects, idx, option) =>
+                                                handleSelectChange(step.key, numberOfSelects, idx, option)
+                                            }
+                                            entityApprovers={
+                                                step.stepNumber === 1 && entityAvailableFormIntakers
+                                                    ? entityAvailableFormIntakers
+                                                    : entityApprovers
+                                            }
+                                            isCompleted={step.completed}
+                                        />
+                                    </motion.div>
+                                ) : (
+                                    // Render non-completed steps as draggable items
+                                    <Reorder.Item
+                                        key={step.key}
+                                        value={step}
+                                        initial={{ opacity: 0, y: -30 }}
+                                        animate={{ opacity: 1, y: 0 }}
+                                        exit={{ opacity: 0, x: 30 }}
+                                        transition={{ duration: 0.20 }}
+                                        layout
+                                        drag={!step.firstStep && !step.finalStep}
+                                        dragListener={!step.firstStep && !step.finalStep}
+                                    >
+                                        <WorkflowEditableStepComponent
+                                            stepNumber={index + 1}
+                                            assignees={step.assignees}
+                                            finalStep={step.finalStep}
+                                            onDelete={() => handleDelete(step.key)}
+                                            onSelectChange={(numberOfSelects, idx, option) =>
+                                                handleSelectChange(step.key, numberOfSelects, idx, option)
+                                            }
+                                            entityApprovers={
+                                                step.stepNumber === 1 && entityAvailableFormIntakers
+                                                    ? entityAvailableFormIntakers
+                                                    : entityApprovers
+                                            }
+                                            isCompleted={step.completed}
+                                        />
+                                    </Reorder.Item>
+                                )
+                            )}
+                            <Button
+                                type="submit"
+                                color="purple"
+                                variant="solid"
+                                disabled={isLoading}
+                                className="max-w-fit text-lg font-medium flex items-center gap-2 text-left -mt-4"
+                            >
+                                {isRedirecting ? (
+                                    <>
+                                        <FaSpinner className="animate-spin size-5" />
+                                        Redirecting...
+                                    </>
+                                ) : isLoading ? (
+                                    <>
+                                        <FaSpinner className="animate-spin size-5" />
+                                        Loading...
+                                    </>
+                                ) : (
+                                    <>
+                                        <FaRegCheckCircle className="size-5" />
+                                        Confirm Exam Workflow Pipeline
+                                    </>
+                                )}
+                            </Button>
+                        </AnimatePresence>
+                    </Reorder.Group>
+                </div>
+            }
+        </>
+    );
+};

src/components/ApprovalWorkflows/WorkflowStepComponent.tsx

@@ -0,0 +1,101 @@
+import { getUserTypeLabel, getUserTypeLabelShort, WorkflowStep } from "@/interfaces/approval.workflow";
+import WorkflowStepNumber from "./WorkflowStepNumber";
+import clsx from "clsx";
+import { RiThumbUpLine } from "react-icons/ri";
+import { FaWpforms } from "react-icons/fa6";
+import { User } from "@/interfaces/user";
+import UserWithProfilePic from "./UserWithProfilePic";
+
+interface Props extends WorkflowStep {
+    workflowAssignees: User[],
+    currentStep: boolean,
+}
+
+export default function WorkflowStepComponent({
+    workflowAssignees,
+    currentStep,
+    stepType,
+    stepNumber,
+    completed,
+    rejected = false,
+    completedBy,
+    assignees,
+    finalStep,
+    selected = false,
+    onClick,
+}: Props) {
+
+    const completedByUser = workflowAssignees.find((assignee) => assignee.id === completedBy);
+    const assigneesUsers = workflowAssignees.filter(user => assignees.includes(user.id));
+
+    return (
+        <div
+            onClick={onClick}
+            className={clsx("flex flex-row gap-5 w-[600px] p-6 mb-5 rounded-2xl transition ease-in-out duration-300 cursor-pointer", {
+                "bg-mti-red-ultralight": rejected && selected,
+                "bg-mti-purple-ultralight": selected,
+            })}
+        >
+            <div className="relative flex flex-col items-center">
+                <WorkflowStepNumber stepNumber={stepNumber} selected={selected} completed={completed} finalStep={finalStep} rejected={rejected} />
+
+                {/* Vertical Bar connecting steps */}
+                {!finalStep && (
+                    <div className="absolute w-1 bg-mti-purple-dark -bottom-20 top-11"></div>
+                )}
+            </div>
+
+            <div className="mt-1.5">
+                {stepType === "approval-by" ? (
+                    <RiThumbUpLine size={25} />
+                ) : (
+                    <FaWpforms size={25} />
+                )
+                }
+            </div>
+
+            <div className="mt-1 flex flex-col gap-0">
+                {completed && completedBy && rejected ? (
+                    <div className={clsx("text-xs font-medium", { "text-mti-purple-ultradark": selected, "text-gray-800": !selected })}>
+                        <p className="text-sm font-medium text-gray-800">{stepType === "approval-by" ? `Approval: ${getUserTypeLabel(completedByUser!.type)} Approval` : `Form Intake: ${getUserTypeLabel(completedByUser!.type)} Intake`} </p>
+                        <UserWithProfilePic
+                            prefix={`Rejected by: ${getUserTypeLabelShort(completedByUser!.type)}`}
+                            name={completedByUser!.name}
+                            profileImage={completedByUser!.profilePicture}
+                        />
+                    </div>
+                ) : completed && completedBy && !rejected ? (
+                    <div className={clsx("text-xs font-medium", { "text-mti-purple-ultradark": selected, "text-gray-800": !selected })}>
+                        <p className="text-sm font-medium text-gray-800">{stepType === "approval-by" ? `Approval: ${getUserTypeLabel(completedByUser!.type)} Approval` : `Form Intake: ${getUserTypeLabel(completedByUser!.type)} Intake`} </p>
+                        <UserWithProfilePic
+                            prefix={`Completed by: ${getUserTypeLabelShort(completedByUser!.type)}`}
+                            name={completedByUser!.name}
+                            profileImage={completedByUser!.profilePicture}
+                        />
+                    </div>
+                ) : !completed && currentStep ? (
+                    <div className={clsx("text-xs font-medium", { "text-mti-purple-ultradark": selected, "text-gray-800": !selected })}>
+                        <p className="text-sm font-medium text-gray-800">{stepType === "approval-by" ? `Approval:` : `Form Intake:`} </p>
+                        In Progress... Assignees:
+                        <div className="flex flex-row flex-wrap gap-3 items-center">
+                            {assigneesUsers.map(user => (
+                                <span key={user.id}>
+                                    <UserWithProfilePic
+                                        prefix={getUserTypeLabelShort(user.type)}
+                                        name={user.name}
+                                        profileImage={user.profilePicture}
+                                    />
+                                </span>
+                            ))}
+                        </div>
+                    </div>
+                ) : (
+                    <div className={clsx("text-xs font-medium", { "text-mti-purple-ultradark": selected, "text-gray-800": !selected })}>
+                        <p className="text-sm font-medium text-gray-800">{stepType === "approval-by" ? `Approval:` : `Form Intake:`} </p>
+                        Waiting for previous steps...
+                    </div>
+                )}
+            </div>
+        </div>
+    );
+};

src/components/ApprovalWorkflows/WorkflowStepNumber.tsx

@@ -0,0 +1,31 @@
+import { WorkflowStep } from "@/interfaces/approval.workflow";
+import clsx from "clsx";
+import { IoCheckmarkDoneSharp, IoCheckmarkSharp } from "react-icons/io5";
+import { RxCross2 } from "react-icons/rx";
+
+type Props = Pick<WorkflowStep, 'stepNumber' | 'completed' | 'finalStep' | 'selected' | 'rejected'>
+
+export default function WorkflowStepNumber({ stepNumber, selected = false, completed, rejected, finalStep }: Props) {
+    return (
+        <div
+            className={clsx(
+                'flex items-center justify-center min-w-11 min-h-11 rounded-full',
+                {
+                    'bg-mti-red-dark text-mti-red-ultralight': rejected,
+                    'bg-mti-purple-dark text-mti-purple-ultralight': selected,
+                    'bg-mti-purple-ultralight text-gray-500': !selected,
+                }
+            )}
+        >
+            {rejected ? (
+                <RxCross2 className="text-xl font-bold" size={25}/>
+            ) : completed && finalStep ? (
+                <IoCheckmarkDoneSharp className="text-xl font-bold" size={25} />
+            ) : completed && !finalStep ? (
+                <IoCheckmarkSharp className="text-xl font-bold" size={25} />
+            ) : (
+                <span className="text-lg font-semibold">{stepNumber}</span>
+            )}
+        </div>
+    );
+};

src/components/ApprovalWorkflows/WorkflowStepSelects.tsx

@@ -0,0 +1,51 @@
+import Option from "@/interfaces/option";
+import Select from "../Low/Select";
+
+interface Props {
+    approvers: Option[];
+    selects: (Option | null | undefined)[];
+    placeholder: string;
+    onSelectChange: (numberOfSelects: number, index: number, value: Option | null) => void;
+    isCompleted: boolean;
+}
+
+export default function WorkflowStepSelects({
+    approvers,
+    selects,
+    placeholder,
+    onSelectChange,
+    isCompleted,
+}: Props) {
+
+    return (
+        <div
+            className={"flex flex-wrap gap-0"}
+        >
+            {selects.map((option, index) => {
+                let classes = "px-2 rounded-none";
+                if (index === 0 && selects.length === 1) {
+                    classes += " rounded-l-2xl rounded-r-2xl";
+                } else if (index === 0) {
+                    classes += " rounded-l-2xl";
+                } else if (index === selects.length - 1) {
+                    classes += " rounded-r-2xl";
+                }
+
+                return (
+                    <div key={index} className="w-[275px]">
+                        <Select
+                            options={approvers}
+                            value={option}
+                            onChange={(option) => onSelectChange(selects.length, index, option)}
+                            placeholder={placeholder}
+                            flat
+                            isClearable
+                            className={classes}
+                            disabled={isCompleted}
+                        />
+                    </div>
+                );
+            })}
+        </div>
+    );
+}

src/components/ExamEditor/SettingsEditor/index.tsx

@@ -95,7 +95,7 @@ const SettingsEditor: React.FC<SettingsEditorProps> = ({
     }, [updateLocalAndScheduleGlobal]);
 
     return (
-        <div className={`flex flex-col gap-8 border bg-ielts-${module}/20 rounded-3xl p-8 w-1/3 h-fit`}>
+        <div className={`flex flex-col gap-8 border bg-ielts-${module}/20 rounded-3xl p-8 w-1/3 h-fit -2xl:w-full`}>
             <div className={`w-full flex justify-center text-ielts-${module} font-bold text-xl`}>{sectionLabel} Settings</div>
             <div className="flex flex-col gap-4">
                 <Dropdown

src/components/ExamEditor/SettingsEditor/level.tsx

@@ -17,6 +17,7 @@ import ListeningComponents from "./listening/components";
 import ReadingComponents from "./reading/components";
 import SpeakingComponents from "./speaking/components";
 import SectionPicker from "./Shared/SectionPicker";
+import { getExamById } from "@/utils/exams";
 
 
 const LevelSettings: React.FC = () => {
@@ -194,7 +195,7 @@ const LevelSettings: React.FC = () => {
                         category: s.settings.category
                     };
                 }).filter(part => part.exercises.length > 0),
-                isDiagnostic: false,
+                isDiagnostic: true, // using isDiagnostic to keep exam hidden until the respective approval workflow is completed.
                 minTimer,
                 module: "level",
                 id: title,
@@ -204,7 +205,12 @@ const LevelSettings: React.FC = () => {
 
             const result = await axios.post('/api/exam/level', exam);
             playSound("sent");
-            toast.success(`Submitted Exam ID: ${result.data.id}`);
+            // Successfully submitted exam
+            if (result.status === 200) {
+                toast.success(result.data.message);
+            } else if (result.status === 207) {
+                toast.warning(result.data.message);
+            }
 
             Array.from(audioMap.values()).forEach(url => {
                 URL.revokeObjectURL(url);

src/components/ExamEditor/SettingsEditor/listening/components.tsx

@@ -233,7 +233,7 @@ const ListeningComponents: React.FC<Props> = ({ currentSection, localSettings, u
                 setIsOpen={(isOpen: boolean) => updateLocalAndScheduleGlobal({ isAudioContextOpen: isOpen }, false)}
                 contentWrapperClassName={level ? `border border-ielts-listening` : ''}
             >
-                <div className="flex flex-row gap-2 items-center px-2 pb-4">
+                <div className="flex flex-row flex-wrap gap-2 items-center px-2 pb-4">
                     <div className="flex flex-col flex-grow gap-4 px-2">
                         <label className="font-normal text-base text-mti-gray-dim">Topic (Optional)</label>
                         <Input

src/components/ExamEditor/SettingsEditor/listening/index.tsx

@@ -17,6 +17,7 @@ import { usePersistentExamStore } from "@/stores/exam";
 import { playSound } from "@/utils/sound";
 import { toast } from "react-toastify";
 import ListeningComponents from "./components";
+import { getExamById } from "@/utils/exams";
 
 const ListeningSettings: React.FC = () => {
     const router = useRouter();
@@ -137,7 +138,7 @@ const ListeningSettings: React.FC = () => {
                             category: s.settings.category
                         };
                     }),
-                    isDiagnostic: false,
+                    isDiagnostic: true, // using isDiagnostic to keep exam hidden until the respective approval workflow is completed.
                     minTimer,
                     module: "listening",
                     id: title,
@@ -149,7 +150,12 @@ const ListeningSettings: React.FC = () => {
 
                 const result = await axios.post('/api/exam/listening', exam);
                 playSound("sent");
-                toast.success(`Submitted Exam ID: ${result.data.id}`);
+                // Successfully submitted exam
+                if (result.status === 200) {
+                    toast.success(result.data.message);
+                } else if (result.status === 207) {
+                    toast.warning(result.data.message);
+                }
 
             } else {
                 toast.error('No audio sections found in the exam! Please either import them or generate them.');

src/components/ExamEditor/SettingsEditor/reading/components.tsx

@@ -5,24 +5,36 @@ import ExercisePicker from "../../ExercisePicker";
 import { generate } from "../Shared/Generate";
 import GenerateBtn from "../Shared/GenerateBtn";
 import { LevelPart, ReadingPart } from "@/interfaces/exam";
-import { LevelSectionSettings, ReadingSectionSettings } from "@/stores/examEditor/types";
+import {
+  LevelSectionSettings,
+  ReadingSectionSettings,
+} from "@/stores/examEditor/types";
 import useExamEditorStore from "@/stores/examEditor";
 
 interface Props {
   localSettings: ReadingSectionSettings | LevelSectionSettings;
-    updateLocalAndScheduleGlobal: (updates: Partial<ReadingSectionSettings | LevelSectionSettings>, schedule?: boolean) => void;
+  updateLocalAndScheduleGlobal: (
+    updates: Partial<ReadingSectionSettings | LevelSectionSettings>,
+    schedule?: boolean
+  ) => void;
   currentSection: ReadingPart | LevelPart;
   generatePassageDisabled?: boolean;
   levelId?: number;
   level?: boolean;
 }
 
-const ReadingComponents: React.FC<Props> = ({localSettings, updateLocalAndScheduleGlobal, currentSection, levelId, level = false, generatePassageDisabled = false}) => {
+const ReadingComponents: React.FC<Props> = ({
+  localSettings,
+  updateLocalAndScheduleGlobal,
+  currentSection,
+  levelId,
+  level = false,
+  generatePassageDisabled = false,
+}) => {
   const { currentModule } = useExamEditorStore();
-    const {
-        focusedSection,
-        difficulty,
-    } = useExamEditorStore(state => state.modules[currentModule]);
+  const { focusedSection, difficulty } = useExamEditorStore(
+    (state) => state.modules[currentModule]
+  );
 
   const generatePassage = useCallback(() => {
     generate(
@@ -30,25 +42,32 @@ const ReadingComponents: React.FC<Props> = ({localSettings, updateLocalAndSchedu
       "reading",
       "passage",
       {
-                method: 'GET',
+        method: "GET",
         queryParams: {
           difficulty,
-                    ...(localSettings.readingTopic && { topic: localSettings.readingTopic })
-                }
+          ...(localSettings.readingTopic && {
+            topic: localSettings.readingTopic,
+          }),
         },
-            (data: any) => [{
+      },
+      (data: any) => [
+        {
           title: data.title,
-                text: data.text
-            }],
+          text: data.text,
+        },
+      ],
       level ? focusedSection : undefined,
       level
     );
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [localSettings.readingTopic, difficulty, focusedSection, levelId]);
 
-    const onTopicChange = useCallback((readingTopic: string) => {
+  const onTopicChange = useCallback(
+    (readingTopic: string) => {
       updateLocalAndScheduleGlobal({ readingTopic });
-    }, [updateLocalAndScheduleGlobal]);
+    },
+    [updateLocalAndScheduleGlobal]
+  );
 
   return (
     <>
@@ -56,13 +75,19 @@ const ReadingComponents: React.FC<Props> = ({localSettings, updateLocalAndSchedu
         title="Generate Passage"
         module="reading"
         open={localSettings.isPassageOpen}
-                setIsOpen={(isOpen: boolean) => updateLocalAndScheduleGlobal({ isPassageOpen: isOpen }, false)}
-                contentWrapperClassName={level ? `border border-ielts-reading`: ''}
+        setIsOpen={(isOpen: boolean) =>
+          updateLocalAndScheduleGlobal({ isPassageOpen: isOpen }, false)
+        }
+        contentWrapperClassName={level ? `border border-ielts-reading` : ""}
         disabled={generatePassageDisabled}
       >
-                <div className="flex flex-row gap-2 items-center px-2 pb-4">
+        <div
+          className="flex flex-row flex-wrap gap-2 items-center px-2 pb-4 "
+        >
           <div className="flex flex-col flex-grow gap-4 px-2">
-                        <label className="font-normal text-base text-mti-gray-dim">Topic (Optional)</label>
+            <label className="font-normal text-base text-mti-gray-dim">
+              Topic (Optional)
+            </label>
             <Input
               key={`section-${focusedSection}`}
               type="text"
@@ -88,14 +113,26 @@ const ReadingComponents: React.FC<Props> = ({localSettings, updateLocalAndSchedu
         title="Add Exercises"
         module="reading"
         open={localSettings.isReadingTopicOpean}
-                setIsOpen={(isOpen: boolean) => updateLocalAndScheduleGlobal({ isReadingTopicOpean: isOpen })}
-                contentWrapperClassName={level ? `border border-ielts-reading`: ''}
-                disabled={currentSection === undefined || currentSection.text === undefined || currentSection.text.content === "" || currentSection.text.title === ""}
+        setIsOpen={(isOpen: boolean) =>
+          updateLocalAndScheduleGlobal({ isReadingTopicOpean: isOpen })
+        }
+        contentWrapperClassName={level ? `border border-ielts-reading` : ""}
+        disabled={
+          currentSection === undefined ||
+          currentSection.text === undefined ||
+          currentSection.text.content === "" ||
+          currentSection.text.title === ""
+        }
       >
         <ExercisePicker
           module="reading"
           sectionId={levelId !== undefined ? levelId : focusedSection}
-                    extraArgs={{ text: currentSection === undefined || currentSection.text === undefined ? "" : currentSection.text.content }}
+          extraArgs={{
+            text:
+              currentSection === undefined || currentSection.text === undefined
+                ? ""
+                : currentSection.text.content,
+          }}
           levelSectionId={focusedSection}
           level={level}
         />

src/components/ExamEditor/SettingsEditor/reading/index.tsx

@@ -12,6 +12,7 @@ import axios from "axios";
 import { playSound } from "@/utils/sound";
 import { toast } from "react-toastify";
 import ReadingComponents from "./components";
+import { getExamById } from "@/utils/exams";
 
 const ReadingSettings: React.FC = () => {
     const router = useRouter();
@@ -75,7 +76,7 @@ const ReadingSettings: React.FC = () => {
                     category: localSettings.category
                 };
             }),
-            isDiagnostic: false,
+            isDiagnostic: true, // using isDiagnostic to keep exam hidden until the respective approval workflow is completed.
             minTimer,
             module: "reading",
             id: title,
@@ -88,7 +89,12 @@ const ReadingSettings: React.FC = () => {
         axios.post(`/api/exam/reading`, exam)
             .then((result) => {
                 playSound("sent");
-                toast.success(`Submitted Exam ID: ${result.data.id}`);
+                // Successfully submitted exam
+                if (result.status === 200) {
+                    toast.success(result.data.message);
+                } else if (result.status === 207) {
+                    toast.warning(result.data.message);
+                }
             })
             .catch((error) => {
                 console.log(error);

src/components/ExamEditor/SettingsEditor/speaking/index.tsx

@@ -11,6 +11,7 @@ import openDetachedTab from "@/utils/popout";
 import axios from "axios";
 import { playSound } from "@/utils/sound";
 import SpeakingComponents from "./components";
+import { getExamById } from "@/utils/exams";
 
 export interface Avatar {
     name: string;
@@ -180,7 +181,7 @@ const SpeakingSettings: React.FC = () => {
             minTimer,
             module: "speaking",
             id: title,
-            isDiagnostic: false,
+            isDiagnostic: true, // using isDiagnostic to keep exam hidden until the respective approval workflow is completed.
             variant: undefined,
             difficulty,
             instructorGender: "varied",
@@ -189,7 +190,12 @@ const SpeakingSettings: React.FC = () => {
       
           const result = await axios.post('/api/exam/speaking', exam);
           playSound("sent");
-          toast.success(`Submitted Exam ID: ${result.data.id}`);
+          // Successfully submitted exam
+          if (result.status === 200) {
+            toast.success(result.data.message);
+          } else if (result.status === 207) {
+            toast.warning(result.data.message);
+          }
       
           Array.from(urlMap.values()).forEach(url => {
             URL.revokeObjectURL(url);

src/components/ExamEditor/SettingsEditor/writing/index.tsx

@@ -12,6 +12,8 @@ import axios from "axios";
 import { playSound } from "@/utils/sound";
 import { toast } from "react-toastify";
 import WritingComponents from "./components";
+import { getExamById } from "@/utils/exams";
+import { ApprovalWorkflow } from "@/interfaces/approval.workflow";
 
 const WritingSettings: React.FC = () => {
     const router = useRouter();
@@ -129,7 +131,7 @@ const WritingSettings: React.FC = () => {
                 minTimer,
                 module: "writing",
                 id: title,
-                isDiagnostic: false,
+                isDiagnostic: true, // using isDiagnostic to keep exam hidden until the respective approval workflow is completed.
                 variant: undefined,
                 difficulty,
                 private: isPrivate,
@@ -138,7 +140,12 @@ const WritingSettings: React.FC = () => {
 
             const result = await axios.post(`/api/exam/writing`, exam)
             playSound("sent");
-            toast.success(`Submitted Exam ID: ${result.data.id}`);
+            // Successfully submitted exam
+            if (result.status === 200) {
+                toast.success(result.data.message);
+            } else if (result.status === 207) {
+                toast.warning(result.data.message);
+            }
 
         } catch (error: any) {
             console.error('Error submitting exam:', error);

src/components/ExamEditor/Shared/ExerciseLabel.tsx

@@ -19,8 +19,8 @@ const label = (type: string, firstId: string, lastId: string) => {
 const ExerciseLabel: React.FC<Props> = ({type, firstId, lastId, prompt}) => {
     return (
         <div className="flex w-full justify-between items-center mr-4">
-            <span className="font-semibold">{label(type, firstId, lastId)}</span>
-            <div className="text-sm font-light italic">{previewLabel(prompt)}</div>
+            <span className="font-semibold ellipsis-2">{label(type, firstId, lastId)}</span>
+            <div className="text-sm font-light italic ellipsis-2">{previewLabel(prompt)}</div>
         </div>
     );
 }

src/components/ExamEditor/index.tsx

@@ -20,21 +20,18 @@ import { defaultSectionSettings } from "@/stores/examEditor/defaults";
 import Button from "../Low/Button";
 import ResetModule from "./Standalone/ResetModule";
 import ListeningInstructions from "./Standalone/ListeningInstructions";
+import {EntityWithRoles} from "@/interfaces/entity";
 
 const DIFFICULTIES: Difficulty[] = ["A1", "A2", "B1", "B2", "C1", "C2"];
 
-const ExamEditor: React.FC<{ levelParts?: number }> = ({ levelParts = 0 }) => {
+const ExamEditor: React.FC<{levelParts?: number; entitiesAllowEditPrivacy: EntityWithRoles[]}> = ({
+	levelParts = 0,
+	entitiesAllowEditPrivacy = [],
+}) => {
 	const {currentModule, dispatch} = useExamEditorStore();
-    const {
-        sections,
-        minTimer,
-        expandedSections,
-        examLabel,
-        isPrivate,
-        difficulty,
-        sectionLabels,
-        importModule
-    } = useExamEditorStore(state => state.modules[currentModule]);
+	const {sections, minTimer, expandedSections, examLabel, isPrivate, difficulty, sectionLabels, importModule} = useExamEditorStore(
+		(state) => state.modules[currentModule],
+	);
 
 	const [numberOfLevelParts, setNumberOfLevelParts] = useState(levelParts !== 0 ? levelParts : 1);
 	const [isResetModuleOpen, setIsResetModuleOpen] = useState(false);
@@ -44,34 +41,34 @@ const ExamEditor: React.FC<{ levelParts?: number }> = ({ levelParts = 0 }) => {
 		if (levelParts !== 0) {
 			setNumberOfLevelParts(levelParts);
 			dispatch({
-                type: 'UPDATE_MODULE',
+				type: "UPDATE_MODULE",
 				payload: {
 					updates: {
 						sectionLabels: Array.from({length: levelParts}).map((_, i) => ({
 							id: i + 1,
-                            label: `Part ${i + 1}`
-                        }))
+							label: `Part ${i + 1}`,
+						})),
 					},
-                    module: "level"
-                }
-            })
+					module: "level",
+				},
+			});
 		}
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [levelParts])
+	}, [levelParts]);
 
 	useEffect(() => {
 		const currentSections = sections;
 		const currentLabels = sectionLabels;
 		let updatedSections: SectionState[];
 		let updatedLabels: any;
-        if (currentModule === "level" && currentSections.length !== currentLabels.length || numberOfLevelParts !== currentSections.length) {
+		if ((currentModule === "level" && currentSections.length !== currentLabels.length) || numberOfLevelParts !== currentSections.length) {
 			const newSections = [...currentSections];
 			const newLabels = [...currentLabels];
 			for (let i = currentLabels.length; i < numberOfLevelParts; i++) {
 				if (currentSections.length !== numberOfLevelParts) newSections.push(defaultSectionSettings(currentModule, i + 1));
 				newLabels.push({
 					id: i + 1,
-                    label: `Part ${i + 1}`
+					label: `Part ${i + 1}`,
 				});
 			}
 			updatedSections = newSections;
@@ -83,35 +80,36 @@ const ExamEditor: React.FC<{ levelParts?: number }> = ({ levelParts = 0 }) => {
 			return;
 		}
 
-        const updatedExpandedSections = expandedSections.filter(
-            sectionId => updatedSections.some(section => section.sectionId === sectionId)
-        );
+		const updatedExpandedSections = expandedSections.filter((sectionId) => updatedSections.some((section) => section.sectionId === sectionId));
 
 		dispatch({
-            type: 'UPDATE_MODULE',
+			type: "UPDATE_MODULE",
 			payload: {
 				updates: {
 					sections: updatedSections,
 					sectionLabels: updatedLabels,
-                    expandedSections: updatedExpandedSections
-                }
-            }
+					expandedSections: updatedExpandedSections,
+				},
+			},
 		});
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [numberOfLevelParts]);
 
-    const sectionIds = sections.map((section) => section.sectionId)
+	const sectionIds = sections.map((section) => section.sectionId);
 
-    const updateModule = useCallback((updates: Partial<ModuleState>) => {
-        dispatch({ type: 'UPDATE_MODULE', payload: { updates } });
-    }, [dispatch]);
+	const updateModule = useCallback(
+		(updates: Partial<ModuleState>) => {
+			dispatch({type: "UPDATE_MODULE", payload: {updates}});
+		},
+		[dispatch],
+	);
 
 	const toggleSection = (sectionId: number) => {
 		if (expandedSections.length === 1 && sectionIds.includes(sectionId)) {
 			toast.error("Include at least one section!");
 			return;
 		}
-        dispatch({ type: 'TOGGLE_SECTION', payload: { sectionId } });
+		dispatch({type: "TOGGLE_SECTION", payload: {sectionId}});
 	};
 
 	const ModuleSettings: Record<Module, React.ComponentType> = {
@@ -119,7 +117,7 @@ const ExamEditor: React.FC<{ levelParts?: number }> = ({ levelParts = 0 }) => {
 		writing: WritingSettings,
 		speaking: SpeakingSettings,
 		listening: ListeningSettings,
-        level: LevelSettings
+		level: LevelSettings,
 	};
 
 	const Settings = ModuleSettings[currentModule];
@@ -127,20 +125,34 @@ const ExamEditor: React.FC<{ levelParts?: number }> = ({ levelParts = 0 }) => {
 
 	const updateLevelParts = (parts: number) => {
 		setNumberOfLevelParts(parts);
-    }
+	};
 
 	return (
 		<>
-            {showImport ? <ImportOrStartFromScratch module={currentModule} setNumberOfLevelParts={updateLevelParts} /> : (
+			{showImport ? (
+				<ImportOrStartFromScratch module={currentModule} setNumberOfLevelParts={updateLevelParts} />
+			) : (
 				<>
-                    {isResetModuleOpen && <ResetModule module={currentModule} isOpen={isResetModuleOpen} setIsOpen={setIsResetModuleOpen} setNumberOfLevelParts={setNumberOfLevelParts}/>}
-                    <div className="flex gap-4 w-full items-center">
+					{isResetModuleOpen && (
+						<ResetModule
+							module={currentModule}
+							isOpen={isResetModuleOpen}
+							setIsOpen={setIsResetModuleOpen}
+							setNumberOfLevelParts={setNumberOfLevelParts}
+						/>
+					)}
+					<div className="flex gap-4 w-full items-center -xl:flex-col">
+						<div className="flex flex-row gap-3 w-full">
 							<div className="flex flex-col gap-3">
 								<label className="font-normal text-base text-mti-gray-dim">Timer</label>
 								<Input
 									type="number"
 									name="minTimer"
-                                onChange={(e) => updateModule({ minTimer: parseInt(e) < 15 ? 15 : parseInt(e) })}
+									onChange={(e) =>
+										updateModule({
+											minTimer: parseInt(e) < 15 ? 15 : parseInt(e),
+										})
+									}
 									value={minTimer}
 									className="max-w-[300px]"
 								/>
@@ -151,24 +163,25 @@ const ExamEditor: React.FC<{ levelParts?: number }> = ({ levelParts = 0 }) => {
 									isMulti={true}
 									options={DIFFICULTIES.map((x) => ({
 										value: x,
-                                    label: capitalize(x)
+										label: capitalize(x),
 									}))}
 									onChange={(values) => {
-                                    const selectedDifficulties = values ? values.map(v => v.value as Difficulty) : [];
+										const selectedDifficulties = values ? values.map((v) => v.value as Difficulty) : [];
 										updateModule({difficulty: selectedDifficulties});
 									}}
 									value={
 										difficulty
-                                    ? difficulty.map(d => ({ 
+											? difficulty.map((d) => ({
 													value: d,
-                                        label: capitalize(d)
+													label: capitalize(d),
 											  }))
 											: null
 									}
 								/>
 							</div>
-                        {(sectionLabels.length != 0 && currentModule !== "level") ? (
-                            <div className="flex flex-col gap-3">
+						</div>
+						{sectionLabels.length != 0 && currentModule !== "level" ? (
+							<div className="flex flex-col gap-3 -xl:w-full">
 								<label className="font-normal text-base text-mti-gray-dim">{sectionLabels[0].label.split(" ")[0]}</label>
 								<div className="flex flex-row gap-8">
 									{sectionLabels.map(({id, label}) => (
@@ -179,25 +192,32 @@ const ExamEditor: React.FC<{ levelParts?: number }> = ({ levelParts = 0 }) => {
 												"transition duration-300 ease-in-out",
 												sectionIds.includes(id)
 													? `bg-ielts-${currentModule}/70 border-ielts-${currentModule} text-white`
-                                                    : "bg-white border-mti-gray-platinum"
+													: "bg-white border-mti-gray-platinum",
 											)}
-                                            onClick={() => toggleSection(id)}
-                                        >
+											onClick={() => toggleSection(id)}>
 											{label}
 										</span>
 									))}
 								</div>
 							</div>
-
 						) : (
 							<div className="flex flex-col gap-3 w-1/3">
 								<label className="font-normal text-base text-mti-gray-dim">Number of Parts</label>
-                                <Input type="number" name="Number of Parts" min={1} onChange={(v) => setNumberOfLevelParts(parseInt(v))} value={numberOfLevelParts} />
+								<Input
+									type="number"
+									name="Number of Parts"
+									min={1}
+									onChange={(v) => setNumberOfLevelParts(parseInt(v))}
+									value={numberOfLevelParts}
+								/>
 							</div>
 						)}
 						<div className="flex flex-col gap-3 w-fit h-fit">
 							<div className="h-6" />
-                            <Checkbox isChecked={isPrivate} onChange={(checked) => updateModule({ isPrivate: checked })}>
+							<Checkbox
+								isChecked={isPrivate}
+								onChange={(checked) => updateModule({isPrivate: checked})}
+								disabled={entitiesAllowEditPrivacy.length === 0}>
 								Privacy (Only available for Assignments)
 							</Checkbox>
 						</div>
@@ -219,14 +239,13 @@ const ExamEditor: React.FC<{ levelParts?: number }> = ({ levelParts = 0 }) => {
 						<Button
 							onClick={() => setIsResetModuleOpen(true)}
 							customColor={`bg-ielts-${currentModule}/70 hover:bg-ielts-${currentModule} border-ielts-${currentModule}`}
-                            className={`text-white self-end`}
-                        >
+							className={`text-white self-end`}>
 							Reset Module
 						</Button>
 					</div>
-                    <div className="flex flex-row gap-8">
+					<div className="flex flex-row gap-8 -2xl:flex-col">
 						<Settings />
-                        <div className="flex-grow max-w-[66%]">
+						<div className="flex-grow max-w-[66%] -2xl:max-w-full">
 							<SectionRenderer />
 						</div>
 					</div>

src/components/Exercises/MatchSentences/DragNDrop.tsx

@@ -24,7 +24,7 @@ const DroppableQuestionArea: React.FC<DroppableQuestionAreaProps> = ({ question,
 			</div>
 			<div
 				key={`answer_${question.id}_${answer}`}
-				className={clsx("w-48 h-10 border rounded-xl flex items-center justify-center", isOver && "border-mti-purple-light")}>
+				className={clsx("w-48 h-10 border-2 border-mti-purple-light self-center rounded-xl flex items-center justify-center", isOver && "border-mti-purple-dark")}>
 				{answer && `Paragraph ${answer}`}
 			</div>
 		</div>

src/components/High/AssignmentCard.tsx

@@ -1,7 +1,10 @@
 import { Session } from "@/hooks/useSessions";
 import { Assignment } from "@/interfaces/results";
 import { User } from "@/interfaces/user";
-import { activeAssignmentFilter, futureAssignmentFilter } from "@/utils/assignments";
+import {
+  activeAssignmentFilter,
+  futureAssignmentFilter,
+} from "@/utils/assignments";
 import { sortByModuleName } from "@/utils/moduleUtils";
 import clsx from "clsx";
 import moment from "moment";
@@ -11,27 +14,38 @@ import Button from "../Low/Button";
 import ModuleBadge from "../ModuleBadge";
 
 interface Props {
-	assignment: Assignment
-	user: User
-	session?: Session
-	startAssignment: (assignment: Assignment) => void
-	resumeAssignment: (session: Session) => void
+  assignment: Assignment;
+  user: User;
+  session?: Session;
+  startAssignment: (assignment: Assignment) => void;
+  resumeAssignment: (session: Session) => void;
 }
 
-export default function AssignmentCard({ user, assignment, session, startAssignment, resumeAssignment }: Props) {
-	const router = useRouter()
-
-	const hasBeenSubmitted = useMemo(() => assignment.results.map((r) => r.user).includes(user.id), [assignment.results, user.id])
+export default function AssignmentCard({
+  user,
+  assignment,
+  session,
+  startAssignment,
+  resumeAssignment,
+}: Props) {
+  const hasBeenSubmitted = useMemo(
+    () => assignment.results.map((r) => r.user).includes(user.id),
+    [assignment.results, user.id]
+  );
 
   return (
     <div
       className={clsx(
         "border-mti-gray-anti-flash flex min-w-[350px] flex-col gap-6 rounded-xl border p-4",
-				assignment.results.map((r) => r.user).includes(user.id) && "border-mti-green-light",
+        assignment.results.map((r) => r.user).includes(user.id) &&
+          "border-mti-green-light"
       )}
-			key={assignment.id}>
+      key={assignment.id}
+    >
       <div className="flex flex-col gap-1">
-				<h3 className="text-mti-black/90 text-xl font-semibold">{assignment.name}</h3>
+        <h3 className="text-mti-black/90 text-xl font-semibold">
+          {assignment.name}
+        </h3>
         <span className="flex justify-between gap-1 text-lg">
           <span>{moment(assignment.startDate).format("DD/MM/YY, HH:mm")}</span>
           <span>-</span>
@@ -45,7 +59,11 @@ export default function AssignmentCard({ user, assignment, session, startAssignm
             .map((e) => e.module)
             .sort(sortByModuleName)
             .map((module) => (
-							<ModuleBadge className="scale-110 w-full" key={module} module={module} />
+              <ModuleBadge
+                className="scale-110 w-full"
+                key={module}
+                module={module}
+              />
             ))}
         </div>
         {futureAssignmentFilter(assignment) && !hasBeenSubmitted && (
@@ -53,7 +71,8 @@ export default function AssignmentCard({ user, assignment, session, startAssignm
             color="rose"
             className="-md:hidden h-full w-full max-w-[50%] !rounded-xl"
             disabled
-						variant="outline">
+            variant="outline"
+          >
             Not yet started
           </Button>
         )}
@@ -61,7 +80,8 @@ export default function AssignmentCard({ user, assignment, session, startAssignm
           <>
             <div
               className="tooltip flex h-full w-full items-center justify-end pl-8 md:hidden"
-							data-tip="Your screen size is too small to perform an assignment">
+              data-tip="Your screen size is too small to perform an assignment"
+            >
               <Button className="h-full w-full !rounded-xl" variant="outline">
                 Start
               </Button>
@@ -71,12 +91,14 @@ export default function AssignmentCard({ user, assignment, session, startAssignm
                 data-tip="You have already started this assignment!"
                 className={clsx(
                   "-md:hidden h-full w-full max-w-[50%] cursor-pointer",
-									!!session && "tooltip",
-								)}>
+                  !!session && "tooltip"
+                )}
+              >
                 <Button
                   className={clsx("w-full h-full !rounded-xl")}
                   onClick={() => startAssignment(assignment)}
-									variant="outline">
+                  variant="outline"
+                >
                   Start
                 </Button>
               </div>
@@ -85,12 +107,14 @@ export default function AssignmentCard({ user, assignment, session, startAssignm
               <div
                 className={clsx(
                   "-md:hidden h-full w-full max-w-[50%] cursor-pointer"
-								)}>
+                )}
+              >
                 <Button
                   className={clsx("w-full h-full !rounded-xl")}
                   onClick={() => resumeAssignment(session)}
                   color="green"
-									variant="outline">
+                  variant="outline"
+                >
                   Resume
                 </Button>
               </div>
@@ -102,11 +126,12 @@ export default function AssignmentCard({ user, assignment, session, startAssignm
             color="green"
             className="-md:hidden h-full w-full max-w-[50%] !rounded-xl"
             disabled
-						variant="outline">
+            variant="outline"
+          >
             Submitted
           </Button>
         )}
       </div>
     </div>
-	)
+  );
 }

src/components/High/CardList.tsx

@@ -2,8 +2,6 @@ import {useListSearch} from "@/hooks/useListSearch";
 import usePagination from "@/hooks/usePagination";
 import { clsx } from "clsx";
 import {ReactNode} from "react";
-import Checkbox from "../Low/Checkbox";
-import Separator from "../Low/Separator";
 
 interface Props<T> {
 	list: T[];

src/components/High/Layout.tsx

@@ -1,4 +1,3 @@
-import useEntities from "@/hooks/useEntities";
 import { EntityWithRoles } from "@/interfaces/entity";
 import { User } from "@/interfaces/user";
 import clsx from "clsx";
@@ -6,34 +5,92 @@ import { useRouter } from "next/router";
 import { ToastContainer } from "react-toastify";
 import Navbar from "../Navbar";
 import Sidebar from "../Sidebar";
+import React, { useEffect, useState } from "react";
+
+export const LayoutContext = React.createContext({
+  onFocusLayerMouseEnter: () => {},
+  setOnFocusLayerMouseEnter: (() => {}) as React.Dispatch<
+    React.SetStateAction<() => void>
+  >,
+  navDisabled: false,
+  setNavDisabled: (() => {}) as React.Dispatch<React.SetStateAction<boolean>>,
+  focusMode: false,
+  setFocusMode: (() => {}) as React.Dispatch<React.SetStateAction<boolean>>,
+  hideSidebar: false,
+  setHideSidebar: (() => {}) as React.Dispatch<React.SetStateAction<boolean>>,
+  bgColor: "bg-white",
+  setBgColor: (() => {}) as React.Dispatch<React.SetStateAction<string>>,
+  className: "",
+  setClassName: (() => {}) as React.Dispatch<React.SetStateAction<string>>,
+});
 
 interface Props {
   user: User;
-	entities?: EntityWithRoles[]
+  entities?: EntityWithRoles[];
   children: React.ReactNode;
-	className?: string;
-	navDisabled?: boolean;
-	focusMode?: boolean;
-	hideSidebar?: boolean
-	bgColor?: string;
-	onFocusLayerMouseEnter?: () => void;
+  refreshPage?: boolean;
 }
 
 export default function Layout({
   user,
+  entities,
   children,
-	className,
-	bgColor = "bg-white",
-	hideSidebar,
-	navDisabled = false,
-	focusMode = false,
-	onFocusLayerMouseEnter
+  refreshPage,
 }: Props) {
+  const [onFocusLayerMouseEnter, setOnFocusLayerMouseEnter] = useState(
+    () => () => {}
+  );
+  const [navDisabled, setNavDisabled] = useState(false);
+  const [focusMode, setFocusMode] = useState(false);
+  const [hideSidebar, setHideSidebar] = useState(false);
+  const [bgColor, setBgColor] = useState("bg-white");
+  const [className, setClassName] = useState("");
+
+  useEffect(() => {
+    if (refreshPage) {
+      setClassName("");
+      setBgColor("bg-white");
+      setFocusMode(false);
+      setHideSidebar(false);
+      setNavDisabled(false);
+      setOnFocusLayerMouseEnter(() => () => {});
+    }
+  }, [refreshPage]);
+
+  const LayoutContextValue = React.useMemo(
+    () => ({
+      onFocusLayerMouseEnter,
+      setOnFocusLayerMouseEnter,
+      navDisabled,
+      setNavDisabled,
+      focusMode,
+      setFocusMode,
+      hideSidebar,
+      setHideSidebar,
+      bgColor,
+      setBgColor,
+      className,
+      setClassName,
+    }),
+    [
+      bgColor,
+      className,
+      focusMode,
+      hideSidebar,
+      navDisabled,
+      onFocusLayerMouseEnter,
+    ]
+  );
+
   const router = useRouter();
-	const { entities } = useEntities()
 
   return (
-		<main className={clsx("w-full min-h-full h-screen flex flex-col bg-mti-gray-smoke relative")}>
+    <LayoutContext.Provider value={LayoutContextValue}>
+      <main
+        className={clsx(
+          "w-full min-h-full h-screen flex flex-col bg-mti-gray-smoke relative"
+        )}
+      >
         <ToastContainer />
         {!hideSidebar && user && (
           <Navbar
@@ -61,11 +118,13 @@ export default function Layout({
               `w-full min-h-full ${bgColor} shadow-md rounded-2xl p-4 xl:p-10 pb-8 flex flex-col gap-8 relative overflow-hidden mt-2`,
               bgColor !== "bg-white" ? "justify-center" : "h-fit",
               hideSidebar ? "md:mx-8" : "md:mr-8",
-						className,
-					)}>
+              className
+            )}
+          >
             {children}
           </div>
         </div>
       </main>
+    </LayoutContext.Provider>
   );
 }

src/components/High/Table.tsx

@@ -1,27 +1,49 @@
-import { useListSearch } from "@/hooks/useListSearch"
-import { ColumnDef, flexRender, getCoreRowModel, getPaginationRowModel, getSortedRowModel, PaginationState, useReactTable } from "@tanstack/react-table"
-import clsx from "clsx"
-import { useEffect, useState } from "react"
-import { BsArrowDown, BsArrowUp } from "react-icons/bs"
-import Button from "../Low/Button"
+import { useListSearch } from "@/hooks/useListSearch";
+import {
+  ColumnDef,
+  flexRender,
+  getCoreRowModel,
+  getPaginationRowModel,
+  getSortedRowModel,
+  PaginationState,
+  useReactTable,
+} from "@tanstack/react-table";
+import clsx from "clsx";
+import { useEffect, useState } from "react";
+import { BsArrowDown, BsArrowUp } from "react-icons/bs";
+import Button from "../Low/Button";
 
 interface Props<T> {
-	data: T[]
-	columns: ColumnDef<any, any>[]
-	searchFields: string[][]
-	size?: number
-	onDownload?: (rows: T[]) => void
-	isDownloadLoading?: boolean
-	searchPlaceholder?: string
+  data: T[];
+  columns: ColumnDef<any, any>[];
+  searchFields: string[][];
+  size?: number;
+  onDownload?: (rows: T[]) => void;
+  isDownloadLoading?: boolean;
+  searchPlaceholder?: string;
+  isLoading?: boolean;
 }
 
-export default function Table<T>({ data, columns, searchFields, size = 16, onDownload, isDownloadLoading, searchPlaceholder }: Props<T>) {
+export default function Table<T>({
+  data,
+  columns,
+  searchFields,
+  size = 16,
+  onDownload,
+  isDownloadLoading,
+  searchPlaceholder,
+  isLoading,
+}: Props<T>) {
   const [pagination, setPagination] = useState<PaginationState>({
     pageIndex: 0,
     pageSize: size,
-	})
+  });
 
-	const { rows, renderSearch } = useListSearch<T>(searchFields, data, searchPlaceholder);
+  const { rows, renderSearch } = useListSearch<T>(
+    searchFields,
+    data,
+    searchPlaceholder
+  );
 
   const table = useReactTable({
     data: rows,
@@ -31,8 +53,8 @@ export default function Table<T>({ data, columns, searchFields, size = 16, onDow
     getPaginationRowModel: getPaginationRowModel(),
     onPaginationChange: setPagination,
     state: {
-			pagination
-		}
+      pagination,
+    },
   });
 
   return (
@@ -40,16 +62,24 @@ export default function Table<T>({ data, columns, searchFields, size = 16, onDow
       <div className="w-full flex gap-2 items-end">
         {renderSearch()}
         {onDownload && (
-					<Button isLoading={isDownloadLoading} className="w-full max-w-[200px] mb-1" variant="outline" onClick={() => onDownload(rows)}>
+          <Button
+            isLoading={isDownloadLoading}
+            className="w-full max-w-[200px] mb-1"
+            variant="outline"
+            onClick={() => onDownload(rows)}
+          >
             Download
           </Button>
-				)
-				}
+        )}
       </div>
 
       <div className="w-full flex gap-2 justify-between items-center">
         <div className="flex items-center gap-4 w-fit">
-					<Button className="w-[200px] h-fit" disabled={!table.getCanPreviousPage()} onClick={() => table.previousPage()}>
+          <Button
+            className="w-[200px] h-fit"
+            disabled={!table.getCanPreviousPage()}
+            onClick={() => table.previousPage()}
+          >
             Previous Page
           </Button>
         </div>
@@ -57,12 +87,16 @@ export default function Table<T>({ data, columns, searchFields, size = 16, onDow
           <span className="flex items-center gap-1">
             <div>Page</div>
             <strong>
-							{table.getState().pagination.pageIndex + 1} of{' '}
+              {table.getState().pagination.pageIndex + 1} of{" "}
               {table.getPageCount().toLocaleString()}
             </strong>
             <div>| Total: {table.getRowCount().toLocaleString()}</div>
           </span>
-					<Button className="w-[200px]" disabled={!table.getCanNextPage()} onClick={() => table.nextPage()}>
+          <Button
+            className="w-[200px]"
+            disabled={!table.getCanNextPage()}
+            onClick={() => table.nextPage()}
+          >
             Next Page
           </Button>
         </div>
@@ -73,9 +107,17 @@ export default function Table<T>({ data, columns, searchFields, size = 16, onDow
           {table.getHeaderGroups().map((headerGroup) => (
             <tr key={headerGroup.id}>
               {headerGroup.headers.map((header) => (
-								<th className="py-4 px-4 text-left" key={header.id} colSpan={header.colSpan}>
+                <th
+                  className="py-4 px-4 text-left"
+                  key={header.id}
+                  colSpan={header.colSpan}
+                >
                   <div
-										className={clsx(header.column.getCanSort() && 'cursor-pointer select-none', 'flex items-center gap-2')}
+                    className={clsx(
+                      header.column.getCanSort() &&
+                        "cursor-pointer select-none",
+                      "flex items-center gap-2"
+                    )}
                     onClick={header.column.getToggleSortingHandler()}
                   >
                     {flexRender(
@@ -94,7 +136,10 @@ export default function Table<T>({ data, columns, searchFields, size = 16, onDow
         </thead>
         <tbody className="px-2 w-full">
           {table.getRowModel().rows.map((row) => (
-						<tr className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2" key={row.id}>
+            <tr
+              className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2"
+              key={row.id}
+            >
               {row.getVisibleCells().map((cell) => (
                 <td className="px-4 py-2 items-center w-fit" key={cell.id}>
                   {flexRender(cell.column.columnDef.cell, cell.getContext())}
@@ -104,6 +149,11 @@ export default function Table<T>({ data, columns, searchFields, size = 16, onDow
           ))}
         </tbody>
       </table>
+      {isLoading && (
+        <div className="min-h-screen flex justify-center items-start">
+          <span className="loading loading-infinity w-32" />
         </div>
-	)
+      )}
+    </div>
+  );
 }

src/components/Low/AsyncSelect.tsx

@@ -48,6 +48,15 @@ export default function AsyncSelect({
   flat,
 }: Props & (MultiProps | SingleProps)) {
   const [target, setTarget] = useState<HTMLElement>();
+  const [inputValue, setInputValue] = useState("");
+  
+  //Implemented a debounce to prevent the API from being called too frequently
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      loadOptions(inputValue);
+    }, 200);
+    return () => clearTimeout(timer);
+  }, [inputValue, loadOptions]);
 
   useEffect(() => {
     if (document) setTarget(document.body);
@@ -77,7 +86,7 @@ export default function AsyncSelect({
         filterOption={null}
         loadingMessage={() => "Loading..."}
         onInputChange={(inputValue) => {
-          loadOptions(inputValue);
+          setInputValue(inputValue);
         }}
         options={options}
         value={value}

src/components/Medium/UserProfileSkeleton.tsx

@@ -0,0 +1,60 @@
+import React from "react";
+
+export default function UserProfileSkeleton() {
+  return (
+    <div className="bg-white min-h-screen p-6">
+      <div className="mt-6 bg-white p-6  rounded-lg flex gap-4 items-center">
+        <div className="h-64 w-60 bg-gray-300 animate-pulse rounded"></div>
+        <div className="flex-1">
+          <div className="h-12 w-64 bg-gray-300 animate-pulse rounded"></div>
+          <div className="flex justify-between items-center mt-1">
+            <div className="h-4 w-60 bg-gray-300 animate-pulse mt-2 rounded"></div>
+            <div className="h-8 w-32 bg-gray-300 animate-pulse mt-2 rounded"></div>
+          </div>
+          <div className="h-4 w-100 bg-gray-300 animate-pulse mt-2 rounded"></div>
+          <div className="mt-6 grid grid-cols-4 justify-item-start gap-4">
+          <div className="bg-white p-4 rounded-lg text-center flex flex-row items-center justify-center">
+              <div className="h-12 w-12 mx-2  bg-gray-300 animate-pulse rounded"></div>
+              <div className="flex flex-col">
+                <div className="h-4 w-4 bg-gray-300 animate-pulse mt-2 rounded"></div>
+                <div className="h-4 w-16 bg-gray-300 animate-pulse mt-2 rounded"></div>
+              </div>
+            </div>
+            <div className="bg-white p-4 rounded-lg text-center flex flex-row items-center justify-center">
+              <div className="h-12 w-12 mx-2  bg-gray-300 animate-pulse rounded"></div>
+              <div className="flex flex-col">
+                <div className="h-4 w-4 bg-gray-300 animate-pulse mt-2 rounded"></div>
+                <div className="h-4 w-16 bg-gray-300 animate-pulse mt-2 rounded"></div>
+              </div>
+            </div>
+            <div className="bg-white p-4 rounded-lg text-center flex flex-row items-center justify-center">
+              <div className="h-12 w-12 mx-2  bg-gray-300 animate-pulse rounded"></div>
+              <div className="flex flex-col">
+                <div className="h-4 w-4 bg-gray-300 animate-pulse mt-2 rounded"></div>
+                <div className="h-4 w-16 bg-gray-300 animate-pulse mt-2 rounded"></div>
+              </div>
+            </div>
+            <div className="bg-white p-4 rounded-lg text-center flex flex-row items-center justify-center">
+              <div className="h-12 w-12 mx-2  bg-gray-300 animate-pulse rounded"></div>
+              <div className="flex flex-col">
+                <div className="h-4 w-4 bg-gray-300 animate-pulse mt-2 rounded"></div>
+                <div className="h-4 w-16 bg-gray-300 animate-pulse mt-2 rounded"></div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div className="mt-6 bg-white p-6 rounded-lg">
+        <div className="h-6 w-40 bg-gray-300 animate-pulse rounded mb-4"></div>
+        <div className="space-y-4">
+          {[...Array(4)].map((_, i) => (
+            <div key={i} className="flex justify-between items-center">
+              <div className="h-4 w-24 bg-gray-300 animate-pulse rounded"></div>
+              <div className="h-2 w-3/4 bg-gray-300 animate-pulse rounded"></div>
+            </div>
+          ))}
+        </div>
+      </div>
+    </div>
+  );
+}

src/components/Sidebar.tsx

@@ -4,7 +4,6 @@ import { MdSpaceDashboard } from "react-icons/md";
 import {
   BsFileEarmarkText,
   BsClockHistory,
-	BsPencil,
   BsGraphUp,
   BsChevronBarRight,
   BsChevronBarLeft,
@@ -14,6 +13,7 @@ import {
   BsClipboardData,
   BsPeople,
 } from "react-icons/bs";
+import { GoWorkflow } from "react-icons/go";
 import { CiDumbbell } from "react-icons/ci";
 import { RiLogoutBoxFill } from "react-icons/ri";
 import Link from "next/link";
@@ -24,11 +24,15 @@ import { preventNavigation } from "@/utils/navigation.disabled";
 import usePreferencesStore from "@/stores/preferencesStore";
 import { User } from "@/interfaces/user";
 import useTicketsListener from "@/hooks/useTicketsListener";
-import { checkAccess, getTypesOfUser } from "@/utils/permissions";
+import { getTypesOfUser } from "@/utils/permissions";
 import usePermissions from "@/hooks/usePermissions";
 import { EntityWithRoles } from "@/interfaces/entity";
-import { useAllowedEntities, useAllowedEntitiesSomePermissions } from "@/hooks/useEntityPermissions";
+import {
+  useAllowedEntities,
+  useAllowedEntitiesSomePermissions,
+} from "@/hooks/useEntityPermissions";
 import { useMemo } from "react";
+import { PermissionType } from "../interfaces/permissions";
 
 interface Props {
   path: string;
@@ -37,7 +41,7 @@ interface Props {
   onFocusLayerMouseEnter?: () => void;
   className?: string;
   user: User;
-	entities?: EntityWithRoles[]
+  entities?: EntityWithRoles[];
 }
 
 interface NavProps {
@@ -50,17 +54,28 @@ interface NavProps {
   badge?: number;
 }
 
-const Nav = ({ Icon, label, path, keyPath, disabled = false, isMinimized = false, badge }: NavProps) => {
+const Nav = ({
+  Icon,
+  label,
+  path,
+  keyPath,
+  disabled = false,
+  isMinimized = false,
+  badge,
+}: NavProps) => {
   return (
     <Link
       href={!disabled ? keyPath : ""}
       className={clsx(
         "flex items-center gap-4 rounded-full p-4 text-gray-500 hover:text-white",
         "transition-all duration-300 ease-in-out relative",
-				disabled ? "hover:bg-mti-gray-dim cursor-not-allowed" : "hover:bg-mti-purple-light cursor-pointer",
+        disabled
+          ? "hover:bg-mti-gray-dim cursor-not-allowed"
+          : "hover:bg-mti-purple-light cursor-pointer",
         path.startsWith(keyPath) && "bg-mti-purple-light text-white",
-				isMinimized ? "w-fit" : "w-full min-w-[200px] px-8 2xl:min-w-[220px]",
-			)}>
+        isMinimized ? "w-fit" : "w-full min-w-[200px] px-8 2xl:min-w-[220px]"
+      )}
+    >
       <Icon size={24} />
       {!isMinimized && <span className="text-lg font-semibold">{label}</span>}
       {!!badge && badge > 0 && (
@@ -68,8 +83,9 @@ const Nav = ({ Icon, label, path, keyPath, disabled = false, isMinimized = false
           className={clsx(
             "bg-mti-purple-light h-5 w-5 text-xs rounded-full flex items-center justify-center text-white",
             "transition ease-in-out duration-300",
-						isMinimized && "absolute right-0 top-0",
-					)}>
+            isMinimized && "absolute right-0 top-0"
+          )}
+        >
           {badge}
         </div>
       )}
@@ -84,23 +100,157 @@ export default function Sidebar({
   focusMode = false,
   user,
   onFocusLayerMouseEnter,
-	className
+  className,
 }: Props) {
   const router = useRouter();
 
-	const isAdmin = useMemo(() => ['developer', 'admin'].includes(user?.type), [user?.type])
+  const isAdmin = useMemo(
+    () => ["developer", "admin"].includes(user?.type),
+    [user?.type]
+  );
 
-	const [isMinimized, toggleMinimize] = usePreferencesStore((state) => [state.isSidebarMinimized, state.toggleSidebarMinimized]);
+  const [isMinimized, toggleMinimize] = usePreferencesStore((state) => [
+    state.isSidebarMinimized,
+    state.toggleSidebarMinimized,
+  ]);
 
-	const { totalAssignedTickets } = useTicketsListener(user.id);
   const { permissions } = usePermissions(user.id);
 
-	const entitiesAllowStatistics = useAllowedEntities(user, entities, "view_statistics")
-	const entitiesAllowPaymentRecord = useAllowedEntities(user, entities, "view_payment_record")
+  const entitiesAllowStatistics = useAllowedEntities(
+    user,
+    entities,
+    "view_statistics"
+  );
+  const entitiesAllowPaymentRecord = useAllowedEntities(
+    user,
+    entities,
+    "view_payment_record"
+  );
 
-	const entitiesAllowGeneration = useAllowedEntitiesSomePermissions(user, entities, [
-		"generate_reading", "generate_listening", "generate_writing", "generate_speaking", "generate_level"
-	])
+  const entitiesAllowGeneration = useAllowedEntitiesSomePermissions(
+    user,
+    entities,
+    [
+      "generate_reading",
+      "generate_listening",
+      "generate_writing",
+      "generate_speaking",
+      "generate_level",
+    ]
+  );
+
+  const sidebarPermissions = useMemo<{ [key: string]: boolean }>(() => {
+    if (user.type === "developer") {
+      return {
+        viewExams: true,
+        viewStats: true,
+        viewRecords: true,
+        viewTickets: true,
+        viewClassrooms: true,
+        viewSettings: true,
+        viewPaymentRecord: true,
+        viewGeneration: true,
+        viewApprovalWorkflows: true,
+      };
+    }
+    const sidebarPermissions: { [key: string]: boolean } = {
+      viewExams: false,
+      viewStats: false,
+      viewRecords: false,
+      viewTickets: false,
+      viewClassrooms: false,
+      viewSettings: false,
+      viewPaymentRecord: false,
+      viewGeneration: false,
+      viewApprovalWorkflows: false,
+    };
+
+    if (!user || !user?.type) return sidebarPermissions;
+
+    const neededPermissions = permissions.reduce((acc, curr) => {
+      if (
+        ["viewExams", "viewRecords", "viewTickets"].includes(curr as string)
+      ) {
+        acc.push(curr);
+      }
+      return acc;
+    }, [] as PermissionType[]);
+
+    if (
+      ["student", "teacher", "developer"].includes(user.type) &&
+      neededPermissions.includes("viewExams")
+    ) {
+      sidebarPermissions["viewExams"] = true;
+    }
+    if (
+      getTypesOfUser(["agent"]).includes(user.type) &&
+      (entitiesAllowStatistics.length > 0 ||
+        neededPermissions.includes("viewStats"))
+    ) {
+      sidebarPermissions["viewStats"] = true;
+    }
+    if (
+      [
+        "admin",
+        "developer",
+        "teacher",
+        "corporate",
+        "mastercorporate",
+      ].includes(user.type) &&
+      (entitiesAllowGeneration.length > 0 || isAdmin)
+    ) {
+      sidebarPermissions["viewGeneration"] = true;
+      sidebarPermissions["viewApprovalWorkflows"] = true;
+    }
+    if (
+      getTypesOfUser(["agent"]).includes(user.type) &&
+      neededPermissions.includes("viewRecords")
+    ) {
+      sidebarPermissions["viewRecords"] = true;
+    }
+    if (
+      ["admin", "developer", "agent"].includes(user.type) &&
+      neededPermissions.includes("viewTickets")
+    ) {
+      sidebarPermissions["viewTickets"] = true;
+    }
+    if (
+      [
+        "admin",
+        "mastercorporate",
+        "developer",
+        "corporate",
+        "teacher",
+        "student",
+      ].includes(user.type)
+    ) {
+      sidebarPermissions["viewClassrooms"] = true;
+    }
+    if (getTypesOfUser(["student", "agent"]).includes(user.type)) {
+      sidebarPermissions["viewSettings"] = true;
+    }
+    if (
+      ["admin", "developer", "agent", "corporate", "mastercorporate"].includes(
+        user.type
+      ) &&
+      entitiesAllowPaymentRecord.length > 0
+    ) {
+      sidebarPermissions["viewPaymentRecord"] = true;
+    }
+    return sidebarPermissions;
+  }, [
+    entitiesAllowGeneration.length,
+    entitiesAllowPaymentRecord.length,
+    entitiesAllowStatistics.length,
+    isAdmin,
+    permissions,
+    user,
+  ]);
+
+  const { totalAssignedTickets } = useTicketsListener(
+    user.id,
+    sidebarPermissions["viewTickets"]
+  );
 
   const logout = async () => {
     axios.post("/api/logout").finally(() => {
@@ -114,18 +264,40 @@ export default function Sidebar({
     <section
       className={clsx(
         "relative flex h-full flex-col justify-between bg-transparent px-4 py-4 pb-8",
-				isMinimized ? "w-fit" : "-xl:w-fit w-1/6",
-				className,
-			)}>
+        isMinimized ? "w-fit" : "-xl:w-20 w-1/6",
+        className
+      )}
+    >
       <div className="-xl:hidden flex-col gap-3 xl:flex">
-				<Nav disabled={disableNavigation} Icon={MdSpaceDashboard} label="Dashboard" path={path} keyPath="/dashboard" isMinimized={isMinimized} />
-				{checkAccess(user, ["student", "teacher", "developer"], permissions, "viewExams") && (
-					<Nav disabled={disableNavigation} Icon={BsFileEarmarkText} label="Practice" path={path} keyPath="/exam" isMinimized={isMinimized} />
+        <Nav
+          disabled={disableNavigation}
+          Icon={MdSpaceDashboard}
+          label="Dashboard"
+          path={path}
+          keyPath="/dashboard"
+          isMinimized={isMinimized}
+        />
+        {sidebarPermissions["viewExams"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={BsFileEarmarkText}
+            label="Practice"
+            path={path}
+            keyPath="/exam"
+            isMinimized={isMinimized}
+          />
         )}
-				{checkAccess(user, getTypesOfUser(["agent"])) && entitiesAllowStatistics.length > 0 && (
-					<Nav disabled={disableNavigation} Icon={BsGraphUp} label="Stats" path={path} keyPath="/stats" isMinimized={isMinimized} />
+        {sidebarPermissions["viewStats"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={BsGraphUp}
+            label="Stats"
+            path={path}
+            keyPath="/stats"
+            isMinimized={isMinimized}
+          />
         )}
-				{checkAccess(user, ["developer", "admin", "mastercorporate", "corporate", "teacher", "student"], permissions) && (
+        {sidebarPermissions["viewClassrooms"] && (
           <Nav
             disabled={disableNavigation}
             Icon={BsPeople}
@@ -135,13 +307,27 @@ export default function Sidebar({
             isMinimized={isMinimized}
           />
         )}
-				{checkAccess(user, getTypesOfUser(["agent"]), permissions, "viewRecords") && (
-					<Nav disabled={disableNavigation} Icon={BsClockHistory} label="Record" path={path} keyPath="/record" isMinimized={isMinimized} />
+        {sidebarPermissions["viewRecords"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={BsClockHistory}
+            label="Record"
+            path={path}
+            keyPath="/record"
+            isMinimized={isMinimized}
+          />
         )}
-				{checkAccess(user, getTypesOfUser(["agent"]), permissions, "viewRecords") && (
-					<Nav disabled={disableNavigation} Icon={CiDumbbell} label="Training" path={path} keyPath="/training" isMinimized={isMinimized} />
+        {sidebarPermissions["viewRecords"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={CiDumbbell}
+            label="Training"
+            path={path}
+            keyPath="/training"
+            isMinimized={isMinimized}
+          />
         )}
-				{checkAccess(user, ["admin", "developer", "agent", "corporate", "mastercorporate"]) && entitiesAllowPaymentRecord.length > 0 && (
+        {sidebarPermissions["viewPaymentRecords"] && (
           <Nav
             disabled={disableNavigation}
             Icon={BsCurrencyDollar}
@@ -151,7 +337,7 @@ export default function Sidebar({
             isMinimized={isMinimized}
           />
         )}
-				{checkAccess(user, ["admin", "developer", "corporate", "teacher", "mastercorporate"]) && (
+        {sidebarPermissions["viewSettings"] && (
           <Nav
             disabled={disableNavigation}
             Icon={BsShieldFill}
@@ -161,7 +347,7 @@ export default function Sidebar({
             isMinimized={isMinimized}
           />
         )}
-				{checkAccess(user, ["admin", "developer", "agent"], permissions, "viewTickets") && (
+        {sidebarPermissions["viewTickets"] && (
           <Nav
             disabled={disableNavigation}
             Icon={BsClipboardData}
@@ -172,8 +358,7 @@ export default function Sidebar({
             badge={totalAssignedTickets}
           />
         )}
-				{checkAccess(user, ["admin", "developer", "teacher", 'corporate', 'mastercorporate'])
-					&& (entitiesAllowGeneration.length > 0 || isAdmin) && (
+        {sidebarPermissions["viewGeneration"] && (
           <Nav
             disabled={disableNavigation}
             Icon={BsCloudFill}
@@ -183,23 +368,76 @@ export default function Sidebar({
             isMinimized={isMinimized}
           />
         )}
+        {sidebarPermissions["viewApprovalWorkflows"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={GoWorkflow}
+            label="Approval Workflows"
+            path={path}
+            keyPath="/approval-workflows"
+            isMinimized={isMinimized}
+          />
+        )}
+
       </div>
       <div className="-xl:flex flex-col gap-3 xl:hidden">
-				<Nav disabled={disableNavigation} Icon={MdSpaceDashboard} label="Dashboard" path={path} keyPath="/" isMinimized />
-				<Nav disabled={disableNavigation} Icon={BsFileEarmarkText} label="Exams" path={path} keyPath="/exam" isMinimized />
-				{checkAccess(user, getTypesOfUser(["agent"]), permissions, "viewStats") && (
-					<Nav disabled={disableNavigation} Icon={BsGraphUp} label="Stats" path={path} keyPath="/stats" isMinimized />
+        <Nav
+          disabled={disableNavigation}
+          Icon={MdSpaceDashboard}
+          label="Dashboard"
+          path={path}
+          keyPath="/"
+          isMinimized
+        />
+        <Nav
+          disabled={disableNavigation}
+          Icon={BsFileEarmarkText}
+          label="Exams"
+          path={path}
+          keyPath="/exam"
+          isMinimized
+        />
+        {sidebarPermissions["viewStats"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={BsGraphUp}
+            label="Stats"
+            path={path}
+            keyPath="/stats"
+            isMinimized
+          />
         )}
-				{checkAccess(user, getTypesOfUser(["agent"]), permissions, "viewRecords") && (
-					<Nav disabled={disableNavigation} Icon={BsClockHistory} label="Record" path={path} keyPath="/record" isMinimized />
+        {sidebarPermissions["viewRecords"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={BsClockHistory}
+            label="Record"
+            path={path}
+            keyPath="/record"
+            isMinimized
+          />
         )}
-				{checkAccess(user, getTypesOfUser(["agent"]), permissions, "viewRecords") && (
-					<Nav disabled={disableNavigation} Icon={CiDumbbell} label="Training" path={path} keyPath="/training" isMinimized />
+        {sidebarPermissions["viewRecords"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={CiDumbbell}
+            label="Training"
+            path={path}
+            keyPath="/training"
+            isMinimized
+          />
         )}
-				{checkAccess(user, getTypesOfUser(["student"])) && (
-					<Nav disabled={disableNavigation} Icon={BsShieldFill} label="Settings" path={path} keyPath="/settings" isMinimized />
+        {sidebarPermissions["viewSettings"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={BsShieldFill}
+            label="Settings"
+            path={path}
+            keyPath="/settings"
+            isMinimized
+          />
         )}
-				{entitiesAllowGeneration.length > 0 && (
+        {sidebarPermissions["viewGeneration"] && (
           <Nav
             disabled={disableNavigation}
             Icon={BsCloudFill}
@@ -209,6 +447,16 @@ export default function Sidebar({
             isMinimized
           />
         )}
+        {sidebarPermissions["viewApprovalWorkflows"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={GoWorkflow}
+            label="Approval Workflows"
+            path={path}
+            keyPath="/approval-workflows"
+            isMinimized
+          />
+        )}
       </div>
 
       <div className="2xl:fixed bottom-12 flex flex-col gap-0 -2xl:mt-8">
@@ -218,10 +466,17 @@ export default function Sidebar({
           onClick={toggleMinimize}
           className={clsx(
             "hover:text-mti-rose -xl:hidden flex cursor-pointer items-center gap-4 rounded-full p-4 text-black transition duration-300 ease-in-out",
-						isMinimized ? "w-fit" : "w-full min-w-[250px] px-8",
-					)}>
-					{isMinimized ? <BsChevronBarRight size={24} /> : <BsChevronBarLeft size={24} />}
-					{!isMinimized && <span className="text-lg font-medium">Minimize</span>}
+            isMinimized ? "w-fit" : "w-full min-w-[250px] px-8"
+          )}
+        >
+          {isMinimized ? (
+            <BsChevronBarRight size={24} />
+          ) : (
+            <BsChevronBarLeft size={24} />
+          )}
+          {!isMinimized && (
+            <span className="text-lg font-medium">Minimize</span>
+          )}
         </div>
         <div
           role="button"
@@ -229,13 +484,18 @@ export default function Sidebar({
           onClick={focusMode ? () => {} : logout}
           className={clsx(
             "hover:text-mti-rose flex cursor-pointer items-center gap-4 rounded-full p-4 text-black transition duration-300 ease-in-out",
-						isMinimized ? "w-fit" : "w-full min-w-[250px] px-8",
-					)}>
+            isMinimized ? "w-fit" : "w-full min-w-[250px] px-8"
+          )}
+        >
           <RiLogoutBoxFill size={24} />
-					{!isMinimized && <span className="-xl:hidden text-lg font-medium">Log Out</span>}
+          {!isMinimized && (
+            <span className="-xl:hidden text-lg font-medium">Log Out</span>
+          )}
         </div>
       </div>
-			{focusMode && <FocusLayer onFocusLayerMouseEnter={onFocusLayerMouseEnter} />}
+      {focusMode && (
+        <FocusLayer onFocusLayerMouseEnter={onFocusLayerMouseEnter} />
+      )}
     </section>
   );
 }

src/components/Solutions/MatchSentences.tsx

@@ -29,7 +29,7 @@ function QuestionSolutionArea({
 			</div>
 			<div
 				className={clsx(
-					"w-56 h-10 border rounded-xl items-center justify-center flex gap-3 px-2",
+					"w-56 h-10 border self-center rounded-xl items-center justify-center flex gap-3 px-2",
 					!userSolution
 						? "border-mti-gray-davy"
 						: userSolution.option.toString() === question.solution.toString()

src/demo/approval_workflows.json

@@ -0,0 +1,204 @@
+[
+    {
+        "id": "kajhfakscbka-asacaca-acawesae",
+        "name": "English Exam 1st Quarter 2025",
+        "entityId": "64a92896-fa8c-4908-95f3-23ffe05560c5",
+        "modules": [
+            "reading",
+            "writing"
+        ],
+        "requester": "ffdIipRyXTRmm10Sq2eg7P97rLB2",
+        "startDate": 1737712243906,
+        "status": "pending",
+        "steps": [
+            {
+                "stepType": "form-intake",
+                "stepNumber": 1,
+                "completed": true,
+                "completedBy": "5fZibjknlJdfIZVndlV2FIdamtn1",
+                "completedDate": 1737712243906,
+                "firstStep": true,
+                "assignees": [
+                    "5fZibjknlJdfIZVndlV2FIdamtn1",
+                    "50jqJuESQNX0Qas64B5JZBQTIiq1",
+                    "2rtgJKmBXfWFzrtG8AjFgyrGBcp1"
+                ],
+                "comments": "This is a random comment\nThis is a random comment\nThis is a random comment\nThis is a random comment\nThis is a random comment\n"
+            },
+            {
+                "stepType": "approval-by",
+                "stepNumber": 2,
+                "completed": true,
+                "completedBy": "50jqJuESQNX0Qas64B5JZBQTIiq1",
+                "completedDate": 1737712243906,
+                "assignees": [
+                    "5fZibjknlJdfIZVndlV2FIdamtn1",
+                    "50jqJuESQNX0Qas64B5JZBQTIiq1",
+                    "2rtgJKmBXfWFzrtG8AjFgyrGBcp1"
+                ],
+                "comments": "This is a random comment"
+            },
+            {
+                "stepType": "approval-by",
+                "stepNumber": 3,
+                "completed": false,
+                "assignees": [
+                    "5fZibjknlJdfIZVndlV2FIdamtn1",
+                    "50jqJuESQNX0Qas64B5JZBQTIiq1",
+                    "2rtgJKmBXfWFzrtG8AjFgyrGBcp1"
+                ],
+                "comments": "This is a random comment"
+            },
+            {
+                "stepType": "approval-by",
+                "stepNumber": 4,
+                "completed": false,
+                "assignees": [
+                    "50jqJuESQNX0Qas64B5JZBQTIiq1"
+                ],
+                "comments": "This is a random comment"
+            },
+            {
+                "stepType": "approval-by",
+                "stepNumber": 5,
+                "completed": false,
+                "finalStep": true,
+                "assignees": [
+                    "50jqJuESQNX0Qas64B5JZBQTIiq1",
+                    "2rtgJKmBXfWFzrtG8AjFgyrGBcp1"
+                ],
+                "comments": "This is a random comment"
+            }
+        ]
+    },
+    {
+        "id": "aaaaaakscbka-asacaca-acawesae",
+        "name": "English Exam 2nd Quarter 2025",
+        "entityId": "64a92896-fa8c-4908-95f3-23ffe05560c5",
+        "modules": [
+            "reading",
+            "writing",
+            "level",
+            "speaking",
+            "listening"
+        ],
+        "requester": "231c84b2-a65a-49a9-803c-c664d84b13e0",
+        "startDate": 1737712243906,
+        "status": "approved",
+        "steps": [
+            {
+                "stepType": "form-intake",
+                "stepNumber": 1,
+                "completed": true,
+                "completedBy": "fd5fce42-4bcc-4150-a143-b484e750b265",
+                "completedDate": 1737712243906,
+                "firstStep": true,
+                "assignees": [
+                    "fd5fce42-4bcc-4150-a143-b484e750b265",
+                    "231c84b2-a65a-49a9-803c-c664d84b13e0",
+                    "c5fc1514-1a94-4f8c-a046-a62099097a50"
+                ],
+                "comments": "This is a random comment"
+            },
+            {
+                "stepType": "approval-by",
+                "stepNumber": 2,
+                "completed": true,
+                "completedBy": "rTh9yz6Z1WOidHlVOSGInlpoxrk1",
+                "completedDate": 1737712243906,
+                "assignees": [
+                    "fd5fce42-4bcc-4150-a143-b484e750b265",
+                    "rTh9yz6Z1WOidHlVOSGInlpoxrk1",
+                    "c5fc1514-1a94-4f8c-a046-a62099097a50"
+                ],
+                "comments": "This is a random comment"
+            },
+            {
+                "stepType": "approval-by",
+                "stepNumber": 3,
+                "completed": true,
+                "completedBy": "231c84b2-a65a-49a9-803c-c664d84b13e0",
+                "completedDate": 1737712243906,
+                "assignees": [
+                    "fd5fce42-4bcc-4150-a143-b484e750b265",
+                    "231c84b2-a65a-49a9-803c-c664d84b13e0",
+                    "c5fc1514-1a94-4f8c-a046-a62099097a50"
+                ],
+                "comments": "This is a random comment"
+            },
+            {
+                "stepType": "approval-by",
+                "stepNumber": 4,
+                "completed": true,
+                "completedBy": "231c84b2-a65a-49a9-803c-c664d84b13e0",
+                "completedDate": 1737712243906,
+                "assignees": [
+                    "fd5fce42-4bcc-4150-a143-b484e750b265"
+                ],
+                "comments": "This is a random comment"
+            },
+            {
+                "stepType": "approval-by",
+                "stepNumber": 5,
+                "completed": true,
+                "completedBy": "c5fc1514-1a94-4f8c-a046-a62099097a50",
+                "completedDate": 1737712243906,
+                "finalStep": true,
+                "assignees": [
+                    "rTh9yz6Z1WOidHlVOSGInlpoxrk1",
+                    "c5fc1514-1a94-4f8c-a046-a62099097a50"
+                ],
+                "comments": "This is a random comment"
+            }
+        ]
+    },
+    {
+        "id": "bbbbkscbka-asacaca-acawesae",
+        "name": "English Exam 3rd Quarter 2025",
+        "entityId": "49ed2f0c-7d0d-46e4-9576-7cf19edc4980",
+        "modules": [
+            "reading"
+        ],
+        "requester": "rTh9yz6Z1WOidHlVOSGInlpoxrk1",
+        "startDate": 1737712243906,
+        "status": "rejected",
+        "steps": [
+            {
+                "stepType": "form-intake",
+                "stepNumber": 1,
+                "completed": true,
+                "completedBy": "231c84b2-a65a-49a9-803c-c664d84b13e0",
+                "completedDate": 1737712243906,
+                "firstStep": true,
+                "assignees": [
+                    "fd5fce42-4bcc-4150-a143-b484e750b265",
+                    "231c84b2-a65a-49a9-803c-c664d84b13e0",
+                    "c5fc1514-1a94-4f8c-a046-a62099097a50"
+                ],
+                "comments": "This is a random comment\nThis is a random comment\nThis is a random comment\nThis is a random comment\nThis is a random comment\n"
+            },
+            {
+                "stepType": "approval-by",
+                "stepNumber": 2,
+                "completed": true,
+                "completedBy": "rTh9yz6Z1WOidHlVOSGInlpoxrk1",
+                "completedDate": 1737712243906,
+                "assignees": [
+                    "rTh9yz6Z1WOidHlVOSGInlpoxrk1",
+                    "c5fc1514-1a94-4f8c-a046-a62099097a50"
+                ],
+                "comments": "This is a random comment"
+            },
+            {
+                "stepType": "approval-by",
+                "stepNumber": 3,
+                "completed": false,
+                "finalStep": true,
+                "assignees": [
+                    "rTh9yz6Z1WOidHlVOSGInlpoxrk1"
+                ],
+                "comments": "This is a random comment"
+            }
+        ]
+    }
+]

src/exams/Selection.tsx

@@ -14,8 +14,6 @@ import {
   BsPen,
   BsXCircle,
 } from "react-icons/bs";
-import { totalExamsByModule } from "@/utils/stats";
-import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
 import Button from "@/components/Low/Button";
 import { sortByModuleName } from "@/utils/moduleUtils";
 import { capitalize } from "lodash";
@@ -24,7 +22,7 @@ import { Variant } from "@/interfaces/exam";
 import useSessions, { Session } from "@/hooks/useSessions";
 import SessionCard from "@/components/Medium/SessionCard";
 import useExamStore from "@/stores/exam";
-import moment from "moment";
+import useStats from "../hooks/useStats";
 
 interface Props {
   user: User;
@@ -41,7 +39,21 @@ export default function Selection({ user, page, onStart }: Props) {
   const [avoidRepeatedExams, setAvoidRepeatedExams] = useState(true);
   const [variant, setVariant] = useState<Variant>("full");
 
-  const { data: stats } = useFilterRecordsByUser<Stat[]>(user?.id);
+  const {
+    data: {
+      allStats = [],
+      moduleCount: { reading, listening, writing, speaking, level } = {
+        reading: 0,
+        listening: 0,
+        writing: 0,
+        speaking: 0,
+        level: 0,
+      },
+    },
+  } = useStats<{
+    allStats: Stat[];
+    moduleCount: Record<Module, number>;
+  }>(user?.id, !user?.id, "byModule");
   const { sessions, isLoading, reload } = useSessions(user.id);
 
   const dispatch = useExamStore((state) => state.dispatch);
@@ -77,7 +89,7 @@ export default function Selection({ user, page, onStart }: Props) {
                   <BsBook className="text-ielts-reading h-6 w-6 md:h-8 md:w-8" />
                 ),
                 label: "Reading",
-                value: totalExamsByModule(stats, "reading"),
+                value: reading || 0,
                 tooltip: "The amount of reading exams performed.",
               },
               {
@@ -85,7 +97,7 @@ export default function Selection({ user, page, onStart }: Props) {
                   <BsHeadphones className="text-ielts-listening h-6 w-6 md:h-8 md:w-8" />
                 ),
                 label: "Listening",
-                value: totalExamsByModule(stats, "listening"),
+                value: listening || 0,
                 tooltip: "The amount of listening exams performed.",
               },
               {
@@ -93,7 +105,7 @@ export default function Selection({ user, page, onStart }: Props) {
                   <BsPen className="text-ielts-writing h-6 w-6 md:h-8 md:w-8" />
                 ),
                 label: "Writing",
-                value: totalExamsByModule(stats, "writing"),
+                value: writing || 0,
                 tooltip: "The amount of writing exams performed.",
               },
               {
@@ -101,7 +113,7 @@ export default function Selection({ user, page, onStart }: Props) {
                   <BsMegaphone className="text-ielts-speaking h-6 w-6 md:h-8 md:w-8" />
                 ),
                 label: "Speaking",
-                value: totalExamsByModule(stats, "speaking"),
+                value: speaking || 0,
                 tooltip: "The amount of speaking exams performed.",
               },
               {
@@ -109,7 +121,7 @@ export default function Selection({ user, page, onStart }: Props) {
                   <BsClipboard className="text-ielts-level h-6 w-6 md:h-8 md:w-8" />
                 ),
                 label: "Level",
-                value: totalExamsByModule(stats, "level"),
+                value: level || 0,
                 tooltip: "The amount of level exams performed.",
               },
             ]}

src/hooks/useApprovalWorkflow.tsx

@@ -0,0 +1,24 @@
+import { ApprovalWorkflow } from "@/interfaces/approval.workflow";
+import axios from "axios";
+import { useCallback, useEffect, useState } from "react";
+
+export default function useApprovalWorkflow(id: string) {
+  const [workflow, setWorkflow] = useState<ApprovalWorkflow>();
+  const [isLoading, setIsLoading] = useState(false);
+  const [isError, setIsError] = useState(false);
+
+  const getData = useCallback(() => {
+    setIsLoading(true);
+    axios
+      .get<ApprovalWorkflow>(`/api/approval-workflows/${id}`)
+      .then((response) => setWorkflow(response.data))
+      .catch((error) => {
+        setIsError(true);
+      })
+      .finally(() => setIsLoading(false));
+  }, []);
+
+  useEffect(getData, [getData]);
+
+  return { workflow, isLoading, isError, reload: getData };
+}

src/hooks/useApprovalWorkflows.tsx

@@ -0,0 +1,24 @@
+import { ApprovalWorkflow } from "@/interfaces/approval.workflow";
+import axios from "axios";
+import { useCallback, useEffect, useState } from "react";
+
+export default function useApprovalWorkflows() {
+  const [workflows, setWorkflows] = useState<ApprovalWorkflow[]>([]);
+  const [isLoading, setIsLoading] = useState(false);
+  const [isError, setIsError] = useState(false);
+
+  const getData = useCallback(() => {
+    setIsLoading(true);
+    axios
+      .get<ApprovalWorkflow[]>(`/api/approval-workflows`)
+      .then((response) => setWorkflows(response.data))
+      .catch((error) => {
+        setIsError(true);
+      })
+      .finally(() => setIsLoading(false));
+  }, []);
+
+  useEffect(getData, [getData]);
+
+  return { workflows, isLoading, isError, reload: getData };
+}

src/hooks/useEntities.tsx

@@ -1,23 +1,22 @@
 import { EntityWithRoles } from "@/interfaces/entity";
-import { Discount } from "@/interfaces/paypal";
-import { Code, Group, User } from "@/interfaces/user";
 import axios from "axios";
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 
-export default function useEntities() {
+export default function useEntities(shouldNot?: boolean) {
   const [entities, setEntities] = useState<EntityWithRoles[]>([]);
   const [isLoading, setIsLoading] = useState(false);
   const [isError, setIsError] = useState(false);
 
-  const getData = () => {
+  const getData = useCallback(() => {
+    if (shouldNot) return;
     setIsLoading(true);
     axios
       .get<EntityWithRoles[]>("/api/entities?showRoles=true")
       .then((response) => setEntities(response.data))
       .finally(() => setIsLoading(false));
-  };
+  }, [shouldNot]);
 
-  useEffect(getData, []);
+  useEffect(getData, [getData])
 
   return { entities, isLoading, isError, reload: getData };
 }

src/hooks/useEntitiesUsers.tsx

@@ -1,6 +1,5 @@
-import { EntityWithRoles, WithLabeledEntities } from "@/interfaces/entity";
-import { Discount } from "@/interfaces/paypal";
-import { Code, Group, Type, User } from "@/interfaces/user";
+import { WithLabeledEntities } from "@/interfaces/entity";
+import { Type, User } from "@/interfaces/user";
 import axios from "axios";
 import { useEffect, useState } from "react";
 
@@ -12,7 +11,9 @@ export default function useEntitiesUsers(type?: Type) {
   const getData = () => {
     setIsLoading(true);
     axios
-      .get<WithLabeledEntities<User>[]>(`/api/entities/users${type ? "?type=" + type : ""}`)
+      .get<WithLabeledEntities<User>[]>(
+        `/api/entities/users${type ? "?type=" + type : ""}`
+      )
       .then((response) => setUsers(response.data))
       .finally(() => setIsLoading(false));
   };

src/hooks/useStats.tsx

@@ -0,0 +1,42 @@
+import axios from "axios";
+import { useCallback, useEffect, useState } from "react";
+
+export default function useStats<T extends any>(
+  id?: string,
+  shouldNotQuery: boolean = !id,
+  queryType: string = "stats"
+) {
+  type ElementType = T extends (infer U)[] ? U : never;
+
+  const [data, setData] = useState<T>({} as unknown as T);
+  const [isLoading, setIsLoading] = useState(false);
+  const [isError, setIsError] = useState(false);
+
+  const getData = useCallback(() => {
+    if (shouldNotQuery) return;
+
+    setIsLoading(true);
+    setIsError(false);
+    let endpoint = `/api/stats/user/${id}`;
+    if (queryType) endpoint += `?query=${queryType}`;
+    axios
+      .get<T>(endpoint)
+      .then((response) => {
+        console.log(response.data);
+        setData(response.data);
+      })
+      .catch(() => setIsError(true))
+      .finally(() => setIsLoading(false));
+  }, [id, shouldNotQuery, queryType]);
+
+  useEffect(() => {
+    getData();
+  }, [getData]);
+
+  return {
+    data,
+    reload: getData,
+    isLoading,
+    isError,
+  };
+}

src/hooks/useTicketsListener.tsx

@@ -1,26 +1,28 @@
-import { useState, useEffect } from "react";
+import { useState, useEffect, useCallback } from "react";
 import axios from "axios";
 
-const useTicketsListener = (userId?: string) => {
+const useTicketsListener = (userId?: string, canFetch?: boolean) => {
   const [assignedTickets, setAssignedTickets] = useState([]);
 
-  const getData = () => {
+  const getData = useCallback(() => {
     axios
       .get("/api/tickets/assignedToUser")
       .then((response) => setAssignedTickets(response.data));
-  };
-
-  useEffect(() => {
-    getData();
   }, []);
 
   useEffect(() => {
+    if (!canFetch) return;
+    getData();
+  }, [canFetch, getData]);
+
+  useEffect(() => {
+    if (!canFetch) return;
     const intervalId = setInterval(() => {
       getData();
     }, 60 * 1000);
 
     return () => clearInterval(intervalId);
-  }, [assignedTickets]);
+  }, [assignedTickets, canFetch, getData]);
 
   if (userId) {
     return {

src/interfaces/approval.workflow.ts

@@ -0,0 +1,72 @@
+import { ObjectId } from "mongodb";
+import { Module } from ".";
+import { Type, User, userTypeLabels, userTypeLabelsShort } from "./user";
+
+export interface ApprovalWorkflow {
+    _id?: ObjectId,
+    name: string,
+    entityId: string,
+    requester: User["id"],
+    startDate: number,
+    modules: Module[],
+    examId?: string,
+    status: ApprovalWorkflowStatus,
+    steps: WorkflowStep[],
+}
+
+export interface EditableApprovalWorkflow extends Omit<ApprovalWorkflow, "_id" | "steps"> {
+    id: string,
+    steps: EditableWorkflowStep[],
+}
+
+export type StepType = "form-intake" | "approval-by";
+export const StepTypeLabel: Record<StepType, string> = {
+	"form-intake": "Form Intake",
+    "approval-by": "Approval",
+};
+
+export interface WorkflowStep {
+    stepType: StepType,
+    stepNumber: number,
+    completed: boolean,
+    rejected?: boolean,
+    completedBy?: User["id"],
+    completedDate?: number,
+    assignees: (User["id"])[];
+    firstStep?: boolean,
+    finalStep?: boolean,
+    selected?: boolean,
+    comments?: string,
+    examChanges?: string[],
+    onClick?: React.MouseEventHandler<HTMLDivElement>
+}
+
+export interface EditableWorkflowStep {
+    key: number,
+    stepType: StepType,
+    stepNumber: number,
+    completed: boolean,
+    rejected?: boolean,
+    completedBy?: User["id"],
+    completedDate?: number,
+    assignees: (User["id"] | null | undefined)[]; // bit of an hack, but allowing null or undefined values allows us to match one to one the select input components with the assignees array. And since select inputs allow undefined or null values, it is allowed here too, but must validate required input before form submission
+    firstStep: boolean,
+    finalStep?: boolean,
+    onDelete?: () => void;
+}
+
+export function getUserTypeLabel(type: Type | undefined): string {
+    if (type) return userTypeLabels[type];
+    return '';
+}
+export function getUserTypeLabelShort(type: Type | undefined): string {
+    if (type) return userTypeLabelsShort[type];
+    return '';
+}
+
+export type ApprovalWorkflowStatus = "approved" | "pending" | "rejected";
+export const ApprovalWorkflowStatusLabel: Record<ApprovalWorkflowStatus, string> = {
+	approved: "Approved",
+    pending: "Pending",
+    rejected: "Rejected",
+};

src/interfaces/index.ts

@@ -1,4 +1,11 @@
 export type Module = "reading" | "listening" | "writing" | "speaking" | "level";
+export const ModuleTypeLabels: Record<Module, string> = {
+	reading: "Reading",
+	listening: "Listening",
+	writing: "Writing",
+	speaking: "Speaking",
+	level: "Level",
+};
 
 export interface Step {
 	min: number;

src/interfaces/results.ts

@@ -37,3 +37,5 @@ export interface Assignment {
 }
 
 export type AssignmentWithCorporateId = Assignment & { corporateId: string };
+
+export type AssignmentWithHasResults = Assignment & { hasResults: boolean };

src/interfaces/user.ts

@@ -170,4 +170,24 @@ export interface Code {
 export type Type = "student" | "teacher" | "corporate" | "admin" | "developer" | "agent" | "mastercorporate";
 export const userTypes: Type[] = ["student", "teacher", "corporate", "admin", "developer", "agent", "mastercorporate"];
 
+export const userTypeLabels: Record<Type, string> = {
+	student: "Student",
+	teacher: "Teacher",
+	corporate: "Corporate",
+	admin: "Admin",
+	developer: "Developer",
+	agent: "Agent",
+	mastercorporate: "Master Corporate",
+};
+
+export const userTypeLabelsShort: Record<Type, string> = {
+	student: "",
+	teacher: "Prof.",
+	corporate: "Dir.",
+	admin: "Admin",
+	developer: "Dev.",
+	agent: "Agent",
+	mastercorporate: "Dir.",
+};
+
 export type WithUser<T> = T extends { participants: string[] } ? Omit<T, "participants"> & { participants: User[] } : T;

src/lib/createWorkflowsOnExamCreation.ts

@@ -0,0 +1,34 @@
+import { Module } from "@/interfaces";
+import { getApprovalWorkflowByFormIntaker, createApprovalWorkflow } from "@/utils/approval.workflows.be";
+
+export async function createApprovalWorkflowsOnExamCreation(examAuthor: string, examEntities: string[], examId: string, examModule: string) {
+    const results = await Promise.all(
+        examEntities.map(async (entity) => {
+            const configuredWorkflow = await getApprovalWorkflowByFormIntaker(entity, examAuthor);
+            if (!configuredWorkflow) {
+                return { entity, created: false };
+            }
+
+            configuredWorkflow.modules.push(examModule as Module);
+            configuredWorkflow.name = examId;
+            configuredWorkflow.examId = examId;
+            configuredWorkflow.entityId = entity;
+            configuredWorkflow.startDate = Date.now();
+
+            try {
+                await createApprovalWorkflow("active-workflows", configuredWorkflow);
+                return { entity, created: true };
+            } catch (error: any) {
+                return { entity, created: false };
+            }
+        })
+    );
+
+    const successCount = results.filter((r) => r.created).length;
+    const totalCount = examEntities.length;
+
+    return {
+        successCount,
+        totalCount,
+    };
+}

src/lib/mongodb.ts

@@ -5,7 +5,9 @@ if (!process.env.MONGODB_URI) {
 }
 
 const uri = process.env.MONGODB_URI || "";
-const options = {};
+const options = {
+	maxPoolSize: 10,
+};
 
 let client: MongoClient;
 

src/pages/(admin)/CorporateGradingSystem.tsx

@@ -5,13 +5,23 @@ import Separator from "@/components/Low/Separator";
 import { Grading, Step } from "@/interfaces";
 import { Entity } from "@/interfaces/entity";
 import { User } from "@/interfaces/user";
-import { CEFR_STEPS, GENERAL_STEPS, IELTS_STEPS, TOFEL_STEPS } from "@/resources/grading";
-import { mapBy } from "@/utils";
+import {
+  CEFR_STEPS,
+  GENERAL_STEPS,
+  IELTS_STEPS,
+  TOFEL_STEPS,
+} from "@/resources/grading";
 import { checkAccess } from "@/utils/permissions";
 import axios from "axios";
 import clsx from "clsx";
-import { Divider } from "primereact/divider";
-import { useEffect, useState } from "react";
+import {
+  Dispatch,
+  memo,
+  SetStateAction,
+  useCallback,
+  useEffect,
+  useState,
+} from "react";
 import { BsPlusCircle, BsTrash } from "react-icons/bs";
 import { toast } from "react-toastify";
 
@@ -27,30 +37,149 @@ const areStepsOverlapped = (steps: Step[]) => {
 
   return false;
 };
+interface RowProps {
+  min: number;
+  max: number;
+  index: number;
+  label: string;
+  isLast: boolean;
+  isLoading: boolean;
+  setSteps: Dispatch<SetStateAction<Step[]>>;
+  addRow: (index: number) => void;
+}
 
+function GradingRow({
+  min,
+  max,
+  label,
+  index,
+  isLoading,
+  isLast,
+  setSteps,
+  addRow,
+}: RowProps) {
+  const onChangeMin = useCallback(
+    (e: string) => {
+      setSteps((prev) =>
+        prev.map((x, i) => (i === index ? { ...x, min: parseInt(e) } : x))
+      );
+    },
+    [index, setSteps]
+  );
+
+  const onChangeMax = useCallback(
+    (e: string) => {
+      setSteps((prev) =>
+        prev.map((x, i) => (i === index ? { ...x, max: parseInt(e) } : x))
+      );
+    },
+    [index, setSteps]
+  );
+
+  const onChangeLabel = useCallback(
+    (e: string) => {
+      setSteps((prev) =>
+        prev.map((x, i) => (i === index ? { ...x, label: e } : x))
+      );
+    },
+    [index, setSteps]
+  );
+
+  const onAddRow = useCallback(() => addRow(index), [addRow, index]);
+
+  const removeRow = useCallback(
+    () => setSteps((prev) => prev.filter((_, i) => i !== index)),
+    [index, setSteps]
+  );
+  return (
+    <>
+      <div className="flex items-center gap-4">
+        <div className="grid grid-cols-3 gap-4 w-full">
+          <Input
+            label="Min. Percentage"
+            value={min}
+            type="number"
+            disabled={index === 0 || isLoading}
+            onChange={onChangeMin}
+            name="min"
+          />
+          <Input
+            label="Grade"
+            value={label}
+            type="text"
+            disabled={isLoading}
+            onChange={onChangeLabel}
+            name="min"
+          />
+          <Input
+            label="Max. Percentage"
+            value={max}
+            type="number"
+            disabled={isLast || isLoading}
+            onChange={onChangeMax}
+            name="max"
+          />
+        </div>
+        {index !== 0 && !isLast && (
+          <button
+            disabled={isLoading}
+            className="pt-9 text-xl group"
+            onClick={removeRow}
+          >
+            <div className="w-full h-full flex items-center justify-center group-hover:bg-neutral-200 rounded-full p-3 transition ease-in-out duration-300">
+              <BsTrash />
+            </div>
+          </button>
+        )}
+      </div>
+
+      {!isLast && (
+        <Button
+          className="w-full flex items-center justify-center"
+          disabled={isLoading}
+          onClick={onAddRow}
+        >
+          <BsPlusCircle />
+        </Button>
+      )}
+    </>
+  );
+}
+const GradingRowMemo = memo(GradingRow);
 interface Props {
   user: User;
   entitiesGrading: Grading[];
-	entities: Entity[]
-	mutate: () => void
+  entities: Entity[];
+  mutate: () => void;
 }
 
-export default function CorporateGradingSystem({ user, entitiesGrading = [], entities = [], mutate }: Props) {
-	const [entity, setEntity] = useState(entitiesGrading[0]?.entity || undefined)
+export default function CorporateGradingSystem({
+  user,
+  entitiesGrading = [],
+  entities = [],
+  mutate,
+}: Props) {
+  const [entity, setEntity] = useState(entitiesGrading[0]?.entity || undefined);
   const [isLoading, setIsLoading] = useState(false);
   const [steps, setSteps] = useState<Step[]>([]);
-	const [otherEntities, setOtherEntities] = useState<string[]>([])
+  const [otherEntities, setOtherEntities] = useState<string[]>([]);
 
   useEffect(() => {
     if (entity) {
-			const entitySteps = entitiesGrading.find(e => e.entity === entity)!.steps
-			setSteps(entitySteps || [])
+      const entitySteps = entitiesGrading.find(
+        (e) => e.entity === entity
+      )!.steps;
+      setSteps(entitySteps || []);
     }
-	}, [entitiesGrading, entity])
+  }, [entitiesGrading, entity]);
 
   const saveGradingSystem = () => {
-		if (!steps.every((x) => x.min < x.max)) return toast.error("One of your steps has a minimum threshold inferior to its superior threshold.");
-		if (areStepsOverlapped(steps)) return toast.error("There seems to be an overlap in one of your steps.");
+    if (!steps.every((x) => x.min < x.max))
+      return toast.error(
+        "One of your steps has a minimum threshold inferior to its superior threshold."
+      );
+    if (areStepsOverlapped(steps))
+      return toast.error("There seems to be an overlap in one of your steps.");
     if (
       steps.reduce((acc, curr) => {
         return acc - (curr.max - curr.min + 1);
@@ -68,8 +197,12 @@ export default function CorporateGradingSystem({ user, entitiesGrading = [], ent
   };
 
   const applyToOtherEntities = () => {
-		if (!steps.every((x) => x.min < x.max)) return toast.error("One of your steps has a minimum threshold inferior to its superior threshold.");
-		if (areStepsOverlapped(steps)) return toast.error("There seems to be an overlap in one of your steps.");
+    if (!steps.every((x) => x.min < x.max))
+      return toast.error(
+        "One of your steps has a minimum threshold inferior to its superior threshold."
+      );
+    if (areStepsOverlapped(steps))
+      return toast.error("There seems to be an overlap in one of your steps.");
     if (
       steps.reduce((acc, curr) => {
         return acc - (curr.max - curr.min + 1);
@@ -77,24 +210,51 @@ export default function CorporateGradingSystem({ user, entitiesGrading = [], ent
     )
       return toast.error("There seems to be an open interval in your steps.");
 
-		if (otherEntities.length === 0) return toast.error("Select at least one entity")
+    if (otherEntities.length === 0)
+      return toast.error("Select at least one entity");
 
     setIsLoading(true);
     axios
-			.post("/api/grading/multiple", { user: user.id, entities: otherEntities, steps })
+      .post("/api/grading/multiple", {
+        user: user.id,
+        entities: otherEntities,
+        steps,
+      })
       .then(() => toast.success("Your grading system has been saved!"))
       .then(mutate)
       .catch(() => toast.error("Something went wrong, please try again later"))
       .finally(() => setIsLoading(false));
   };
 
+  const addRow = useCallback((index: number) => {
+    setSteps((prev) => {
+      const item = {
+        min: prev[index === 0 ? 0 : index - 1].max + 1,
+        max: prev[index + 1].min - 1,
+        label: "",
+      };
+      return [
+        ...prev.slice(0, index + 1),
+        item,
+        ...prev.slice(index + 1, prev.length),
+      ];
+    });
+  }, []);
+
   return (
     <div className="flex flex-col gap-4 border p-4 border-mti-gray-platinum rounded-xl">
-			<label className="font-normal text-base text-mti-gray-dim">Grading System</label>
+      <label className="font-normal text-base text-mti-gray-dim">
+        Grading System
+      </label>
       <div className={clsx("flex flex-col gap-4")}>
-				<label className="font-normal text-base text-mti-gray-dim">Entity</label>
+        <label className="font-normal text-base text-mti-gray-dim">
+          Entity
+        </label>
         <Select
-					defaultValue={{ value: (entities || [])[0]?.id, label: (entities || [])[0]?.label }}
+          defaultValue={{
+            value: (entities || [])[0]?.id,
+            label: (entities || [])[0]?.label,
+          }}
           options={entities.map((e) => ({ value: e.id, label: e.label }))}
           onChange={(e) => setEntity(e?.value || undefined)}
           isClearable={checkAccess(user, ["admin", "developer"])}
@@ -104,20 +264,33 @@ export default function CorporateGradingSystem({ user, entitiesGrading = [], ent
       {entities.length > 1 && (
         <>
           <Separator />
-					<label className="font-normal text-base text-mti-gray-dim">Apply this grading system to other entities</label>
+          <label className="font-normal text-base text-mti-gray-dim">
+            Apply this grading system to other entities
+          </label>
           <Select
             options={entities.map((e) => ({ value: e.id, label: e.label }))}
-						onChange={(e) => !e ? setOtherEntities([]) : setOtherEntities(e.map(o => o.value!))}
+            onChange={(e) =>
+              !e
+                ? setOtherEntities([])
+                : setOtherEntities(e.map((o) => o.value!))
+            }
             isMulti
           />
-					<Button onClick={applyToOtherEntities} isLoading={isLoading} disabled={isLoading || otherEntities.length === 0} variant="outline">
+          <Button
+            onClick={applyToOtherEntities}
+            isLoading={isLoading}
+            disabled={isLoading || otherEntities.length === 0}
+            variant="outline"
+          >
             Apply to {otherEntities.length} other entities
           </Button>
           <Separator />
         </>
       )}
 
-			<label className="font-normal text-base text-mti-gray-dim">Preset Systems</label>
+      <label className="font-normal text-base text-mti-gray-dim">
+        Preset Systems
+      </label>
       <div className="grid grid-cols-4 gap-4">
         <Button variant="outline" onClick={() => setSteps(CEFR_STEPS)}>
           CEFR
@@ -134,61 +307,25 @@ export default function CorporateGradingSystem({ user, entitiesGrading = [], ent
       </div>
 
       {steps.map((step, index) => (
-				<>
-					<div className="flex items-center gap-4">
-						<div className="grid grid-cols-3 gap-4 w-full" key={step.min}>
-							<Input
-								label="Min. Percentage"
-								value={step.min}
-								type="number"
-								disabled={index === 0 || isLoading}
-								onChange={(e) => setSteps((prev) => prev.map((x, i) => (i === index ? { ...x, min: parseInt(e) } : x)))}
-								name="min"
+        <GradingRowMemo
+          key={index}
+          min={step.min}
+          max={step.max}
+          label={step.label}
+          index={index}
+          isLoading={isLoading}
+          isLast={index === steps.length - 1}
+          setSteps={setSteps}
+          addRow={addRow}
         />
-							<Input
-								label="Grade"
-								value={step.label}
-								type="text"
-								disabled={isLoading}
-								onChange={(e) => setSteps((prev) => prev.map((x, i) => (i === index ? { ...x, label: e } : x)))}
-								name="min"
-							/>
-							<Input
-								label="Max. Percentage"
-								value={step.max}
-								type="number"
-								disabled={index === steps.length - 1 || isLoading}
-								onChange={(e) => setSteps((prev) => prev.map((x, i) => (i === index ? { ...x, max: parseInt(e) } : x)))}
-								name="max"
-							/>
-						</div>
-						{index !== 0 && index !== steps.length - 1 && (
-							<button
-								disabled={isLoading}
-								className="pt-9 text-xl group"
-								onClick={() => setSteps((prev) => prev.filter((_, i) => i !== index))}>
-								<div className="w-full h-full flex items-center justify-center group-hover:bg-neutral-200 rounded-full p-3 transition ease-in-out duration-300">
-									<BsTrash />
-								</div>
-							</button>
-						)}
-					</div>
-
-					{index < steps.length - 1 && (
-						<Button
-							className="w-full flex items-center justify-center"
-							disabled={isLoading}
-							onClick={() => {
-								const item = { min: steps[index === 0 ? 0 : index - 1].max + 1, max: steps[index + 1].min - 1, label: "" };
-								setSteps((prev) => [...prev.slice(0, index + 1), item, ...prev.slice(index + 1, steps.length)]);
-							}}>
-							<BsPlusCircle />
-						</Button>
-					)}
-				</>
       ))}
 
-			<Button onClick={saveGradingSystem} isLoading={isLoading} disabled={isLoading} className="mt-8">
+      <Button
+        onClick={saveGradingSystem}
+        isLoading={isLoading}
+        disabled={isLoading}
+        className="mt-8"
+      >
         Save Grading System
       </Button>
     </div>

src/pages/(admin)/Lists/ExamList.tsx

@@ -4,16 +4,15 @@ import useExams from "@/hooks/useExams";
 import useUsers from "@/hooks/useUsers";
 import {Module} from "@/interfaces";
 import {Exam} from "@/interfaces/exam";
-import { Type, User } from "@/interfaces/user";
+import {User} from "@/interfaces/user";
 import useExamStore from "@/stores/exam";
 import {getExamById} from "@/utils/exams";
 import {countExercises} from "@/utils/moduleUtils";
 import {createColumnHelper, flexRender, getCoreRowModel, useReactTable} from "@tanstack/react-table";
 import axios from "axios";
-import clsx from "clsx";
 import {capitalize, uniq} from "lodash";
 import {useRouter} from "next/router";
-import { BsBan, BsBanFill, BsCheck, BsCircle, BsPencil, BsStop, BsTrash, BsUpload, BsX } from "react-icons/bs";
+import {BsBan, BsCheck, BsCircle, BsPencil, BsTrash, BsUpload, BsX} from "react-icons/bs";
 import {toast} from "react-toastify";
 import {useListSearch} from "@/hooks/useListSearch";
 import Modal from "@/components/Modal";
@@ -21,9 +20,9 @@ import { checkAccess } from "@/utils/permissions";
 import useGroups from "@/hooks/useGroups";
 import Button from "@/components/Low/Button";
 import {EntityWithRoles} from "@/interfaces/entity";
-import { FiEdit, FiArrowRight } from 'react-icons/fi';
-import { HiArrowRight } from "react-icons/hi";
 import {BiEdit} from "react-icons/bi";
+import {findBy, mapBy} from "@/utils";
+import {getUserName} from "@/utils/users";
 
 const searchFields = [["module"], ["id"], ["createdBy"]];
 
@@ -37,45 +36,20 @@ const CLASSES: { [key in Module]: string } = {
 
 const columnHelper = createColumnHelper<Exam>();
 
-const ExamOwnerSelector = ({ options, exam, onSave }: { options: User[]; exam: Exam; onSave: (owners: string[]) => void }) => {
-	const [owners, setOwners] = useState(exam.owners || []);
-
-	return (
-		<div className="w-full flex flex-col gap-4">
-			<div className="grid grid-cols-4 mt-4">
-				{options.map((c) => (
-					<Button
-						variant={owners.includes(c.id) ? "solid" : "outline"}
-						onClick={() => setOwners((prev) => (prev.includes(c.id) ? prev.filter((x) => x !== c.id) : [...prev, c.id]))}
-						className="max-w-[200px] w-full"
-						key={c.id}>
-						{c.name}
-					</Button>
-				))}
-			</div>
-			<Button onClick={() => onSave(owners)} className="w-full max-w-[200px] self-end">
-				Save
-			</Button>
-		</div>
-	);
-};
-
-export default function ExamList({ user, entities }: { user: User; entities: EntityWithRoles[]; }) {
+export default function ExamList({user, entities}: {user: User; entities: EntityWithRoles[]}) {
 	const [selectedExam, setSelectedExam] = useState<Exam>();
 
 	const {exams, reload} = useExams();
 	const {users} = useUsers();
-	const { groups } = useGroups({ admin: user?.id, userType: user?.type });
 
-	const filteredExams = useMemo(() => exams.filter((e) => {
-		if (!e.private) return true
-		return (e.owners || []).includes(user?.id || "")
-	}), [exams, user?.id])
-
-	const filteredCorporates = useMemo(() => {
-		const participantsAndAdmins = uniq(groups.flatMap((x) => [...x.participants, x.admin])).filter((x) => x !== user?.id);
-		return users.filter((x) => participantsAndAdmins.includes(x.id) && x.type === "corporate");
-	}, [users, groups, user]);
+	const filteredExams = useMemo(
+		() =>
+			exams.filter((e) => {
+				if (!e.private) return true;
+				return (e.entities || []).some((ent) => mapBy(user.entities, "id").includes(ent));
+			}),
+		[exams, user?.entities],
+	);
 
 	const parsedExams = useMemo(() => {
 		return filteredExams.map((exam) => {
@@ -108,7 +82,7 @@ export default function ExamList({ user, entities }: { user: User; entities: Ent
 
 			return;
 		}
-		dispatch({ type: "INIT_EXAM", payload: { exams: [exam], modules: [module] } })
+		dispatch({type: "INIT_EXAM", payload: {exams: [exam], modules: [module]}});
 
 		router.push("/exam");
 	};
@@ -135,29 +109,6 @@ export default function ExamList({ user, entities }: { user: User; entities: Ent
 			.finally(reload);
 	};
 
-	const updateExam = async (exam: Exam, body: object) => {
-		if (!confirm(`Are you sure you want to update this ${capitalize(exam.module)} exam?`)) return;
-
-		axios
-			.patch(`/api/exam/${exam.module}/${exam.id}`, body)
-			.then(() => toast.success(`Updated the "${exam.id}" exam`))
-			.catch((reason) => {
-				if (reason.response.status === 404) {
-					toast.error("Exam not found!");
-					return;
-				}
-
-				if (reason.response.status === 403) {
-					toast.error("You do not have permission to update this exam!");
-					return;
-				}
-
-				toast.error("Something went wrong, please try again later.");
-			})
-			.finally(reload)
-			.finally(() => setSelectedExam(undefined));
-	};
-
 	const deleteExam = async (exam: Exam) => {
 		if (!confirm(`Are you sure you want to delete this ${capitalize(exam.module)} exam?`)) return;
 
@@ -222,7 +173,7 @@ export default function ExamList({ user, entities }: { user: User; entities: Ent
 		}),
 		columnHelper.accessor("createdBy", {
 			header: "Created By",
-			cell: (info) => info.getValue(),
+			cell: (info) => (!info.getValue() ? "System" : findBy(users, "id", info.getValue())?.name || "N/A"),
 		}),
 		{
 			header: "",
@@ -270,7 +221,7 @@ export default function ExamList({ user, entities }: { user: User; entities: Ent
 
 	const handleExamEdit = () => {
 		router.push(`/generation?id=${selectedExam!.id}&module=${selectedExam!.module}`);
-	}
+	};
 
 	return (
 		<div className="flex flex-col gap-4 w-full h-full">
@@ -286,30 +237,17 @@ export default function ExamList({ user, entities }: { user: User; entities: Ent
 								</div>
 
 								<div className="bg-gray-50 rounded-lg p-4 mb-3">
-									<p className="font-medium mb-1">
-										Exam ID: {selectedExam.id}
-									</p>
+									<p className="font-medium mb-1">Exam ID: {selectedExam.id}</p>
 								</div>
 
-								<p className="text-gray-500 text-sm">
-									Click &apos;Next&apos; to proceed to the exam editor.
-								</p>
+								<p className="text-gray-500 text-sm">Click &apos;Next&apos; to proceed to the exam editor.</p>
 							</div>
 
 							<div className="flex justify-between gap-4 mt-8">
-								<Button
-									color="purple"
-									variant="outline"
-									onClick={() => setSelectedExam(undefined)}
-									className="w-32"
-								>
+								<Button color="purple" variant="outline" onClick={() => setSelectedExam(undefined)} className="w-32">
 									Cancel
 								</Button>
-								<Button
-									color="purple"
-									onClick={handleExamEdit}
-									className="w-32 text-white flex items-center justify-center gap-2"
-								>
+								<Button color="purple" onClick={handleExamEdit} className="w-32 text-white flex items-center justify-center gap-2">
 									Proceed
 								</Button>
 							</div>

src/pages/(admin)/Lists/UserList.tsx

@@ -6,7 +6,12 @@ import clsx from "clsx";
 import { capitalize } from "lodash";
 import moment from "moment";
 import { useEffect, useMemo, useState } from "react";
-import { BsCheck, BsCheckCircle, BsFillExclamationOctagonFill, BsTrash } from "react-icons/bs";
+import {
+  BsCheck,
+  BsCheckCircle,
+  BsFillExclamationOctagonFill,
+  BsTrash,
+} from "react-icons/bs";
 import { toast } from "react-toastify";
 import { countries, TCountries } from "countries-list";
 import countryCodes from "country-codes-list";
@@ -24,7 +29,6 @@ import { WithLabeledEntities } from "@/interfaces/entity";
 import Table from "@/components/High/Table";
 import useEntities from "@/hooks/useEntities";
 import { useAllowedEntities } from "@/hooks/useEntityPermissions";
-import { findAllowedEntities } from "@/utils/permissions";
 
 const columnHelper = createColumnHelper<WithLabeledEntities<User>>();
 const searchFields = [["name"], ["email"], ["entities", ""]];
@@ -40,31 +44,87 @@ export default function UserList({
   type?: Type;
   renderHeader?: (total: number) => JSX.Element;
 }) {
-	const [showDemographicInformation, setShowDemographicInformation] = useState(false);
+  const [showDemographicInformation, setShowDemographicInformation] =
+    useState(false);
   const [selectedUser, setSelectedUser] = useState<User>();
 
-	const { users, reload } = useEntitiesUsers(type)
-	const { entities } = useEntities()
+  const { users, isLoading, reload } = useEntitiesUsers(type);
+  const { entities } = useEntities();
 
-	const isAdmin = useMemo(() => ["admin", "developer"].includes(user?.type), [user?.type])
+  const isAdmin = useMemo(
+    () => ["admin", "developer"].includes(user?.type),
+    [user?.type]
+  );
 
-	const entitiesViewStudents = useAllowedEntities(user, entities, "view_students")
-	const entitiesEditStudents = useAllowedEntities(user, entities, "edit_students")
-	const entitiesDeleteStudents = useAllowedEntities(user, entities, "delete_students")
+  const entitiesViewStudents = useAllowedEntities(
+    user,
+    entities,
+    "view_students"
+  );
+  const entitiesEditStudents = useAllowedEntities(
+    user,
+    entities,
+    "edit_students"
+  );
+  const entitiesDeleteStudents = useAllowedEntities(
+    user,
+    entities,
+    "delete_students"
+  );
 
-	const entitiesViewTeachers = useAllowedEntities(user, entities, "view_teachers")
-	const entitiesEditTeachers = useAllowedEntities(user, entities, "edit_teachers")
-	const entitiesDeleteTeachers = useAllowedEntities(user, entities, "delete_teachers")
+  const entitiesViewTeachers = useAllowedEntities(
+    user,
+    entities,
+    "view_teachers"
+  );
+  const entitiesEditTeachers = useAllowedEntities(
+    user,
+    entities,
+    "edit_teachers"
+  );
+  const entitiesDeleteTeachers = useAllowedEntities(
+    user,
+    entities,
+    "delete_teachers"
+  );
 
-	const entitiesViewCorporates = useAllowedEntities(user, entities, "view_corporates")
-	const entitiesEditCorporates = useAllowedEntities(user, entities, "edit_corporates")
-	const entitiesDeleteCorporates = useAllowedEntities(user, entities, "delete_corporates")
+  const entitiesViewCorporates = useAllowedEntities(
+    user,
+    entities,
+    "view_corporates"
+  );
+  const entitiesEditCorporates = useAllowedEntities(
+    user,
+    entities,
+    "edit_corporates"
+  );
+  const entitiesDeleteCorporates = useAllowedEntities(
+    user,
+    entities,
+    "delete_corporates"
+  );
 
-	const entitiesViewMasterCorporates = useAllowedEntities(user, entities, "view_mastercorporates")
-	const entitiesEditMasterCorporates = useAllowedEntities(user, entities, "edit_mastercorporates")
-	const entitiesDeleteMasterCorporates = useAllowedEntities(user, entities, "delete_mastercorporates")
+  const entitiesViewMasterCorporates = useAllowedEntities(
+    user,
+    entities,
+    "view_mastercorporates"
+  );
+  const entitiesEditMasterCorporates = useAllowedEntities(
+    user,
+    entities,
+    "edit_mastercorporates"
+  );
+  const entitiesDeleteMasterCorporates = useAllowedEntities(
+    user,
+    entities,
+    "delete_mastercorporates"
+  );
 
-	const entitiesDownloadUsers = useAllowedEntities(user, entities, "download_user_list")
+  const entitiesDownloadUsers = useAllowedEntities(
+    user,
+    entities,
+    "download_user_list"
+  );
 
   const appendUserFilters = useFilterStore((state) => state.appendUserFilter);
   const router = useRouter();
@@ -73,38 +133,70 @@ export default function UserList({
     const momentDate = moment(date);
     const today = moment(new Date());
 
-		if (today.isAfter(momentDate)) return "!text-mti-red-light  font-bold line-through";
+    if (today.isAfter(momentDate))
+      return "!text-mti-red-light  font-bold line-through";
     if (today.add(1, "weeks").isAfter(momentDate)) return "!text-mti-red-light";
-		if (today.add(2, "weeks").isAfter(momentDate)) return "!text-mti-rose-light";
-		if (today.add(1, "months").isAfter(momentDate)) return "!text-mti-orange-light";
+    if (today.add(2, "weeks").isAfter(momentDate))
+      return "!text-mti-rose-light";
+    if (today.add(1, "months").isAfter(momentDate))
+      return "!text-mti-orange-light";
   };
 
-	const allowedUsers = useMemo(() => users.filter((u) => {
-		if (isAdmin) return true
-		if (u.id === user?.id) return false
+  const allowedUsers = useMemo(
+    () =>
+      users.filter((u) => {
+        if (isAdmin) return true;
+        if (u.id === user?.id) return false;
 
         switch (u.type) {
-			case "student": return mapBy((u.entities || []), 'id').some((id) => mapBy(entitiesViewStudents, 'id').includes(id))
-			case "teacher": return mapBy((u.entities || []), 'id').some((id) => mapBy(entitiesViewTeachers, 'id').includes(id))
-			case 'corporate': return mapBy((u.entities || []), 'id').some((id) => mapBy(entitiesViewCorporates, 'id').includes(id))
-			case 'mastercorporate': return mapBy((u.entities || []), 'id').some((id) => mapBy(entitiesViewMasterCorporates, 'id').includes(id))
-			default: return false
+          case "student":
+            return mapBy(u.entities || [], "id").some((id) =>
+              mapBy(entitiesViewStudents, "id").includes(id)
+            );
+          case "teacher":
+            return mapBy(u.entities || [], "id").some((id) =>
+              mapBy(entitiesViewTeachers, "id").includes(id)
+            );
+          case "corporate":
+            return mapBy(u.entities || [], "id").some((id) =>
+              mapBy(entitiesViewCorporates, "id").includes(id)
+            );
+          case "mastercorporate":
+            return mapBy(u.entities || [], "id").some((id) =>
+              mapBy(entitiesViewMasterCorporates, "id").includes(id)
+            );
+          default:
+            return false;
         }
-	})
-		, [entitiesViewCorporates, entitiesViewMasterCorporates, entitiesViewStudents, entitiesViewTeachers, isAdmin, user?.id, users])
+      }),
+    [
+      entitiesViewCorporates,
+      entitiesViewMasterCorporates,
+      entitiesViewStudents,
+      entitiesViewTeachers,
+      isAdmin,
+      user?.id,
+      users,
+    ]
+  );
 
-	const displayUsers = useMemo(() =>
-		filters.length > 0 ? filters.reduce((d, f) => d.filter(f), allowedUsers) : allowedUsers,
-		[filters, allowedUsers])
+  const displayUsers = useMemo(
+    () =>
+      filters.length > 0
+        ? filters.reduce((d, f) => d.filter(f), allowedUsers)
+        : allowedUsers,
+    [filters, allowedUsers]
+  );
 
   const deleteAccount = (user: User) => {
-		if (!confirm(`Are you sure you want to delete ${user.name}'s account?`)) return;
+    if (!confirm(`Are you sure you want to delete ${user.name}'s account?`))
+      return;
 
     axios
       .delete<{ ok: boolean }>(`/api/user?id=${user.id}`)
       .then(() => {
         toast.success("User deleted successfully!");
-				reload()
+        reload();
       })
       .catch(() => {
         toast.error("Something went wrong!", { toastId: "delete-error" });
@@ -130,8 +222,11 @@ export default function UserList({
   const toggleDisableAccount = (user: User) => {
     if (
       !confirm(
-				`Are you sure you want to ${user.status === "disabled" ? "enable" : "disable"} ${user.name
-				}'s account? This change is usually related to their payment state.`,
+        `Are you sure you want to ${
+          user.status === "disabled" ? "enable" : "disable"
+        } ${
+          user.name
+        }'s account? This change is usually related to their payment state.`
       )
     )
       return;
@@ -142,7 +237,11 @@ export default function UserList({
         status: user.status === "disabled" ? "active" : "disabled",
       })
       .then(() => {
-				toast.success(`User ${user.status === "disabled" ? "enabled" : "disabled"} successfully!`);
+        toast.success(
+          `User ${
+            user.status === "disabled" ? "enabled" : "disabled"
+          } successfully!`
+        );
         reload();
       })
       .catch(() => {
@@ -151,45 +250,60 @@ export default function UserList({
   };
 
   const getEditPermission = (type: Type) => {
-		if (type === "student") return entitiesEditStudents
-		if (type === "teacher") return entitiesEditTeachers
-		if (type === "corporate") return entitiesEditCorporates
-		if (type === "mastercorporate") return entitiesEditMasterCorporates
+    if (type === "student") return entitiesEditStudents;
+    if (type === "teacher") return entitiesEditTeachers;
+    if (type === "corporate") return entitiesEditCorporates;
+    if (type === "mastercorporate") return entitiesEditMasterCorporates;
 
-		return []
-	}
+    return [];
+  };
 
   const getDeletePermission = (type: Type) => {
-		if (type === "student") return entitiesDeleteStudents
-		if (type === "teacher") return entitiesDeleteTeachers
-		if (type === "corporate") return entitiesDeleteCorporates
-		if (type === "mastercorporate") return entitiesDeleteMasterCorporates
+    if (type === "student") return entitiesDeleteStudents;
+    if (type === "teacher") return entitiesDeleteTeachers;
+    if (type === "corporate") return entitiesDeleteCorporates;
+    if (type === "mastercorporate") return entitiesDeleteMasterCorporates;
 
-		return []
-	}
+    return [];
+  };
 
   const canEditUser = (u: User) =>
-		isAdmin || u.entities.some(e => mapBy(getEditPermission(u.type), 'id').includes(e.id))
+    isAdmin ||
+    u.entities.some((e) =>
+      mapBy(getEditPermission(u.type), "id").includes(e.id)
+    );
 
   const canDeleteUser = (u: User) =>
-		isAdmin || u.entities.some(e => mapBy(getDeletePermission(u.type), 'id').includes(e.id))
+    isAdmin ||
+    u.entities.some((e) =>
+      mapBy(getDeletePermission(u.type), "id").includes(e.id)
+    );
 
   const actionColumn = ({ row }: { row: { original: User } }) => {
-		const canEdit = canEditUser(row.original)
-		const canDelete = canDeleteUser(row.original)
+    const canEdit = canEditUser(row.original);
+    const canDelete = canDeleteUser(row.original);
 
     return (
       <div className="flex gap-4">
         {!row.original.isVerified && canEdit && (
-					<div data-tip="Verify User" className="cursor-pointer tooltip" onClick={() => verifyAccount(row.original)}>
+          <div
+            data-tip="Verify User"
+            className="cursor-pointer tooltip"
+            onClick={() => verifyAccount(row.original)}
+          >
             <BsCheck className="hover:text-mti-purple-light transition ease-in-out duration-300" />
           </div>
         )}
         {canEdit && (
           <div
-						data-tip={row.original.status === "disabled" ? "Enable User" : "Disable User"}
+            data-tip={
+              row.original.status === "disabled"
+                ? "Enable User"
+                : "Disable User"
+            }
             className="cursor-pointer tooltip"
-						onClick={() => toggleDisableAccount(row.original)}>
+            onClick={() => toggleDisableAccount(row.original)}
+          >
             {row.original.status === "disabled" ? (
               <BsCheckCircle className="hover:text-mti-purple-light transition ease-in-out duration-300" />
             ) : (
@@ -198,7 +312,11 @@ export default function UserList({
           </div>
         )}
         {canDelete && (
-					<div data-tip="Delete" className="cursor-pointer tooltip" onClick={() => deleteAccount(row.original)}>
+          <div
+            data-tip="Delete"
+            className="cursor-pointer tooltip"
+            onClick={() => deleteAccount(row.original)}
+          >
             <BsTrash className="hover:text-mti-purple-light transition ease-in-out duration-300" />
           </div>
         )}
@@ -213,11 +331,12 @@ export default function UserList({
         <div
           className={clsx(
             canEditUser(row.original) &&
-						"underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer",
+              "underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer"
           )}
           onClick={() =>
             canEditUser(row.original) ? setSelectedUser(row.original) : null
-					}>
+          }
+        >
           {getValue()}
         </div>
       ),
@@ -226,8 +345,14 @@ export default function UserList({
       header: "Country",
       cell: (info) =>
         info.getValue()
-					? `${countryCodes.findOne("countryCode" as any, info.getValue())?.flag} ${countries[info.getValue() as unknown as keyof TCountries]?.name
-					} (+${countryCodes.findOne("countryCode" as any, info.getValue())?.countryCallingCode})`
+          ? `${
+              countryCodes.findOne("countryCode" as any, info.getValue())?.flag
+            } ${
+              countries[info.getValue() as unknown as keyof TCountries]?.name
+            } (+${
+              countryCodes.findOne("countryCode" as any, info.getValue())
+                ?.countryCallingCode
+            })`
           : "N/A",
     }),
     columnHelper.accessor("demographicInformation.phone", {
@@ -237,17 +362,25 @@ export default function UserList({
     }),
     columnHelper.accessor(
       (x) =>
-				x.type === "corporate" || x.type === "mastercorporate" ? x.demographicInformation?.position : x.demographicInformation?.employment,
+        x.type === "corporate" || x.type === "mastercorporate"
+          ? x.demographicInformation?.position
+          : x.demographicInformation?.employment,
       {
         id: "employment",
         header: "Employment",
-				cell: (info) => (info.row.original.type === "corporate" ? info.getValue() : capitalize(info.getValue())) || "N/A",
+        cell: (info) =>
+          (info.row.original.type === "corporate"
+            ? info.getValue()
+            : capitalize(info.getValue())) || "N/A",
         enableSorting: true,
-			},
+      }
     ),
     columnHelper.accessor("lastLogin", {
       header: "Last Login",
-			cell: (info) => (!!info.getValue() ? moment(info.getValue()).format("YYYY-MM-DD HH:mm") : "N/A"),
+      cell: (info) =>
+        !!info.getValue()
+          ? moment(info.getValue()).format("YYYY-MM-DD HH:mm")
+          : "N/A",
     }),
     columnHelper.accessor("demographicInformation.gender", {
       header: "Gender",
@@ -256,13 +389,16 @@ export default function UserList({
     }),
     {
       header: (
-				<span className="cursor-pointer" onClick={() => setShowDemographicInformation((prev) => !prev)}>
+        <span
+          className="cursor-pointer"
+          onClick={() => setShowDemographicInformation((prev) => !prev)}
+        >
           Switch
         </span>
       ),
       id: "actions",
       cell: actionColumn,
-			sortable: false
+      sortable: false,
     },
   ];
 
@@ -273,11 +409,12 @@ export default function UserList({
         <div
           className={clsx(
             canEditUser(row.original) &&
-						"underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer",
+              "underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer"
           )}
           onClick={() =>
             canEditUser(row.original) ? setSelectedUser(row.original) : null
-					}>
+          }
+        >
           {getValue()}
         </div>
       ),
@@ -288,9 +425,12 @@ export default function UserList({
         <div
           className={clsx(
             canEditUser(row.original) &&
-						"underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer",
+              "underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer"
           )}
-					onClick={() => (canEditUser(row.original) ? setSelectedUser(row.original) : null)}>
+          onClick={() =>
+            canEditUser(row.original) ? setSelectedUser(row.original) : null
+          }
+        >
           {getValue()}
         </div>
       ),
@@ -305,13 +445,21 @@ export default function UserList({
     }),
     columnHelper.accessor("entities", {
       header: "Entities",
-			cell: ({ getValue }) => mapBy(getValue(), 'label').join(', '),
+      cell: ({ getValue }) => mapBy(getValue(), "label").join(", "),
     }),
     columnHelper.accessor("subscriptionExpirationDate", {
       header: "Expiration",
       cell: (info) => (
-				<span className={clsx(info.getValue() ? expirationDateColor(moment(info.getValue()).toDate()) : "")}>
-					{!info.getValue() ? "No expiry date" : moment(info.getValue()).format("DD/MM/YYYY")}
+        <span
+          className={clsx(
+            info.getValue()
+              ? expirationDateColor(moment(info.getValue()).toDate())
+              : ""
+          )}
+        >
+          {!info.getValue()
+            ? "No expiry date"
+            : moment(info.getValue()).format("DD/MM/YYYY")}
         </span>
       ),
     }),
@@ -323,8 +471,9 @@ export default function UserList({
             className={clsx(
               "w-6 h-6 rounded-md flex items-center justify-center border border-mti-purple-light bg-white",
               "transition duration-300 ease-in-out",
-							info.getValue() && "!bg-mti-purple-light ",
-						)}>
+              info.getValue() && "!bg-mti-purple-light "
+            )}
+          >
             <BsCheck color="white" className="w-full h-full" />
           </div>
         </div>
@@ -332,20 +481,28 @@ export default function UserList({
     }),
     {
       header: (
-				<span className="cursor-pointer" onClick={() => setShowDemographicInformation((prev) => !prev)}>
+        <span
+          className="cursor-pointer"
+          onClick={() => setShowDemographicInformation((prev) => !prev)}
+        >
           Switch
         </span>
       ),
       id: "actions",
       cell: actionColumn,
-			sortable: false
+      sortable: false,
     },
   ];
 
   const downloadExcel = (rows: WithLabeledEntities<User>[]) => {
-		if (entitiesDownloadUsers.length === 0) return toast.error("You are not allowed to download the user list.")
+    if (entitiesDownloadUsers.length === 0)
+      return toast.error("You are not allowed to download the user list.");
 
-		const allowedRows = rows.filter(r => mapBy(r.entities, 'id').some(e => mapBy(entitiesDownloadUsers, 'id').includes(e)))
+    const allowedRows = rows.filter((r) =>
+      mapBy(r.entities, "id").some((e) =>
+        mapBy(entitiesDownloadUsers, "id").includes(e)
+      )
+    );
     const csv = exportListToExcel(allowedRows);
 
     const element = document.createElement("a");
@@ -359,10 +516,15 @@ export default function UserList({
 
   const viewStudentFilter = (x: User) => x.type === "student";
   const viewTeacherFilter = (x: User) => x.type === "teacher";
-	const belongsToAdminFilter = (x: User) => x.entities.some(({ id }) => mapBy(selectedUser?.entities || [], 'id').includes(id));
+  const belongsToAdminFilter = (x: User) =>
+    x.entities.some(({ id }) =>
+      mapBy(selectedUser?.entities || [], "id").includes(id)
+    );
 
-	const viewStudentFilterBelongsToAdmin = (x: User) => viewStudentFilter(x) && belongsToAdminFilter(x);
-	const viewTeacherFilterBelongsToAdmin = (x: User) => viewTeacherFilter(x) && belongsToAdminFilter(x);
+  const viewStudentFilterBelongsToAdmin = (x: User) =>
+    viewStudentFilter(x) && belongsToAdminFilter(x);
+  const viewTeacherFilterBelongsToAdmin = (x: User) =>
+    viewTeacherFilter(x) && belongsToAdminFilter(x);
 
   const renderUserCard = (selectedUser: User) => {
     const studentsFromAdmin = users.filter(viewStudentFilterBelongsToAdmin);
@@ -373,7 +535,9 @@ export default function UserList({
           maxUserAmount={0}
           loggedInUser={user}
           onViewStudents={
-						(selectedUser.type === "corporate" || selectedUser.type === "teacher") && studentsFromAdmin.length > 0
+            (selectedUser.type === "corporate" ||
+              selectedUser.type === "teacher") &&
+            studentsFromAdmin.length > 0
               ? () => {
                   appendUserFilters({
                     id: "view-students",
@@ -389,7 +553,9 @@ export default function UserList({
               : undefined
           }
           onViewTeachers={
-						(selectedUser.type === "corporate" || selectedUser.type === "student") && teachersFromAdmin.length > 0
+            (selectedUser.type === "corporate" ||
+              selectedUser.type === "student") &&
+            teachersFromAdmin.length > 0
               ? () => {
                   appendUserFilters({
                     id: "view-teachers",
@@ -413,7 +579,7 @@ export default function UserList({
                   });
                   appendUserFilters({
                     id: "belongs-to-admin",
-									filter: belongsToAdminFilter
+                    filter: belongsToAdminFilter,
                   });
 
                   router.push("/users");
@@ -434,14 +600,24 @@ export default function UserList({
     <>
       {renderHeader && renderHeader(displayUsers.length)}
       <div className="w-full">
-				<Modal isOpen={!!selectedUser} onClose={() => setSelectedUser(undefined)}>
+        <Modal
+          isOpen={!!selectedUser}
+          onClose={() => setSelectedUser(undefined)}
+        >
           {selectedUser && renderUserCard(selectedUser)}
         </Modal>
         <Table<WithLabeledEntities<User>>
           data={displayUsers}
-					columns={(!showDemographicInformation ? defaultColumns : demographicColumns) as any}
+          columns={
+            (!showDemographicInformation
+              ? defaultColumns
+              : demographicColumns) as any
+          }
           searchFields={searchFields}
-					onDownload={entitiesDownloadUsers.length > 0 ? downloadExcel : undefined}
+          onDownload={
+            entitiesDownloadUsers.length > 0 ? downloadExcel : undefined
+          }
+          isLoading={isLoading}
         />
       </div>
     </>

src/pages/(exam)/ExamPage.tsx

@@ -1,9 +1,9 @@
 /* eslint-disable @next/next/no-img-element */
 import { Module } from "@/interfaces";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import React, { useContext, useEffect, useState } from "react";
 
 import AbandonPopup from "@/components/AbandonPopup";
-import Layout from "@/components/High/Layout";
+import { LayoutContext } from "@/components/High/Layout";
 import Finish from "@/exams/Finish";
 import Level from "@/exams/Level";
 import Listening from "@/exams/Listening";
@@ -11,9 +11,12 @@ import Reading from "@/exams/Reading";
 import Selection from "@/exams/Selection";
 import Speaking from "@/exams/Speaking";
 import Writing from "@/exams/Writing";
-import { Exam, LevelExam, UserSolution, Variant, WritingExam } from "@/interfaces/exam";
+import { Exam, LevelExam, Variant } from "@/interfaces/exam";
 import { User } from "@/interfaces/user";
-import { evaluateSpeakingAnswer, evaluateWritingAnswer } from "@/utils/evaluation";
+import {
+  evaluateSpeakingAnswer,
+  evaluateWritingAnswer,
+} from "@/utils/evaluation";
 import { getExam } from "@/utils/exams";
 import axios from "axios";
 import { useRouter } from "next/router";
@@ -26,11 +29,16 @@ import useEvaluationPolling from "@/hooks/useEvaluationPolling";
 interface Props {
   page: "exams" | "exercises";
   user: User;
-	destination?: string
-	hideSidebar?: boolean
+  destination?: string;
+  hideSidebar?: boolean;
 }
 
-export default function ExamPage({ page, user, destination = "/", hideSidebar = false }: Props) {
+export default function ExamPage({
+  page,
+  user,
+  destination = "/",
+  hideSidebar = false,
+}: Props) {
   const router = useRouter();
   const [variant, setVariant] = useState<Variant>("full");
   const [avoidRepeated, setAvoidRepeated] = useState(false);
@@ -38,14 +46,22 @@ export default function ExamPage({ page, user, destination = "/", hideSidebar =
   const [moduleLock, setModuleLock] = useState(false);
 
   const {
-		exam, setExam,
+    exam,
+    setExam,
     exams,
-		sessionId, setSessionId, setPartIndex,
-		moduleIndex, setModuleIndex,
-		setQuestionIndex, setExerciseIndex,
-		userSolutions, setUserSolutions,
-		showSolutions, setShowSolutions,
-		selectedModules, setSelectedModules,
+    sessionId,
+    setSessionId,
+    setPartIndex,
+    moduleIndex,
+    setModuleIndex,
+    setQuestionIndex,
+    setExerciseIndex,
+    userSolutions,
+    setUserSolutions,
+    showSolutions,
+    setShowSolutions,
+    selectedModules,
+    setSelectedModules,
     setUser,
     inactivity,
     timeSpent,
@@ -61,7 +77,9 @@ export default function ExamPage({ page, user, destination = "/", hideSidebar =
   } = useExamStore();
 
   const [isFetchingExams, setIsFetchingExams] = useState(false);
-	const [isExamLoaded, setIsExamLoaded] = useState(moduleIndex < selectedModules.length);
+  const [isExamLoaded, setIsExamLoaded] = useState(
+    moduleIndex < selectedModules.length
+  );
 
   useEffect(() => {
     setIsExamLoaded(moduleIndex < selectedModules.length);
@@ -88,13 +106,21 @@ export default function ExamPage({ page, user, destination = "/", hideSidebar =
             module,
             avoidRepeated,
             variant,
-						user?.type === "student" || user?.type === "developer" ? user.preferredGender : undefined,
-					),
+            user?.type === "student" || user?.type === "developer"
+              ? user.preferredGender
+              : undefined
+          )
         );
         Promise.all(examPromises).then((values) => {
           setIsFetchingExams(false);
           if (values.every((x) => !!x)) {
-						dispatch({ type: 'INIT_EXAM', payload: { exams: values.map((x) => x!), modules: selectedModules } })
+            dispatch({
+              type: "INIT_EXAM",
+              payload: {
+                exams: values.map((x) => x!),
+                modules: selectedModules,
+              },
+            });
           } else {
             toast.error("Something went wrong, please try again");
             setTimeout(router.reload, 500);
@@ -105,7 +131,6 @@ export default function ExamPage({ page, user, destination = "/", hideSidebar =
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [selectedModules, exams]);
 
-
   const reset = () => {
     resetStore();
     setVariant("full");
@@ -117,45 +142,55 @@ export default function ExamPage({ page, user, destination = "/", hideSidebar =
 
   useEffect(() => {
     setModuleLock(true);
-	}, [flags.finalizeModule])
+  }, [flags.finalizeModule]);
 
   useEffect(() => {
     if (flags.finalizeModule && !showSolutions) {
-			if (exam && (exam.module === "writing" || exam.module === "speaking") && userSolutions.length > 0) {
+      if (
+        exam &&
+        (exam.module === "writing" || exam.module === "speaking") &&
+        userSolutions.length > 0
+      ) {
         (async () => {
           try {
             const results = await Promise.all(
               exam.exercises.map(async (exercise, index) => {
                 if (exercise.type === "writing") {
                   const sol = await evaluateWritingAnswer(
-										user.id, sessionId, exercise, index + 1,
+                    user.id,
+                    sessionId,
+                    exercise,
+                    index + 1,
                     userSolutions.find((x) => x.exercise === exercise.id)!,
                     exercise.attachment?.url
                   );
                   return sol;
                 }
-								if (exercise.type === "interactiveSpeaking" || exercise.type === "speaking") {
+                if (
+                  exercise.type === "interactiveSpeaking" ||
+                  exercise.type === "speaking"
+                ) {
                   const sol = await evaluateSpeakingAnswer(
                     user.id,
                     sessionId,
                     exercise,
                     userSolutions.find((x) => x.exercise === exercise.id)!,
-										index + 1,
+                    index + 1
                   );
                   return sol;
                 }
                 return null;
               })
             );
-						const updatedSolutions = userSolutions.map(solution => {
-							const completed = results.filter(r => r !== null).find(
-								(c: any) => c.exercise === solution.exercise
-							);
+            const updatedSolutions = userSolutions.map((solution) => {
+              const completed = results
+                .filter((r) => r !== null)
+                .find((c: any) => c.exercise === solution.exercise);
               return completed || solution;
             });
             setUserSolutions(updatedSolutions);
           } catch (error) {
-						console.error('Error during module evaluation:', error);
+            console.error("Error during module evaluation:", error);
           } finally {
             setModuleLock(false);
           }
@@ -164,7 +199,15 @@ export default function ExamPage({ page, user, destination = "/", hideSidebar =
         setModuleLock(false);
       }
     }
-	}, [exam, showSolutions, userSolutions, sessionId, user.id, flags.finalizeModule, setUserSolutions]);
+  }, [
+    exam,
+    showSolutions,
+    userSolutions,
+    sessionId,
+    user.id,
+    flags.finalizeModule,
+    setUserSolutions,
+  ]);
 
   useEffect(() => {
     if (flags.finalizeExam && moduleIndex !== -1 && !moduleLock) {
@@ -172,12 +215,24 @@ export default function ExamPage({ page, user, destination = "/", hideSidebar =
         setModuleIndex(-1);
         await saveStats();
         await axios.get("/api/stats/update");
-			})()
+      })();
     }
-	}, [flags.finalizeExam, moduleIndex, saveStats, setModuleIndex, userSolutions, moduleLock, flags.finalizeModule]);
+  }, [
+    flags.finalizeExam,
+    moduleIndex,
+    saveStats,
+    setModuleIndex,
+    userSolutions,
+    moduleLock,
+    flags.finalizeModule,
+  ]);
 
   useEffect(() => {
-		if (flags.finalizeExam && !userSolutions.some(s => s.isDisabled) && !moduleLock) {
+    if (
+      flags.finalizeExam &&
+      !userSolutions.some((s) => s.isDisabled) &&
+      !moduleLock
+    ) {
       setShowSolutions(true);
       setFlags({ finalizeExam: false });
       dispatch({ type: "UPDATE_EXAMS" });
@@ -185,8 +240,9 @@ export default function ExamPage({ page, user, destination = "/", hideSidebar =
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [flags.finalizeExam, userSolutions, showSolutions, moduleLock]);
 
-
-	const aggregateScoresByModule = (isPractice?: boolean): {
+  const aggregateScoresByModule = (
+    isPractice?: boolean
+  ): {
     module: Module;
     total: number;
     missing: number;
@@ -222,29 +278,40 @@ export default function ExamPage({ page, user, destination = "/", hideSidebar =
       },
     };
 
-		userSolutions.filter(x => isPractice ? x.isPractice : !x.isPractice).forEach((x) => {
+    userSolutions.forEach((x) => {
+      if (isPractice ? x.isPractice : !x.isPractice) {
         const examModule =
-				x.module || (x.type === "writing" ? "writing" : x.type === "speaking" || x.type === "interactiveSpeaking" ? "speaking" : undefined);
+          x.module ||
+          (x.type === "writing"
+            ? "writing"
+            : x.type === "speaking" || x.type === "interactiveSpeaking"
+            ? "speaking"
+            : undefined);
 
         scores[examModule!] = {
           total: scores[examModule!].total + x.score.total,
           correct: scores[examModule!].correct + x.score.correct,
           missing: scores[examModule!].missing + x.score.missing,
         };
+      }
     });
 
-		return Object.keys(scores)
-			.filter((x) => scores[x as Module].total > 0)
-			.map((x) => ({ module: x as Module, ...scores[x as Module] }));
+    return Object.keys(scores).reduce<
+      { module: Module; total: number; missing: number; correct: number }[]
+    >((accm, x) => {
+      if (scores[x as Module].total > 0)
+        accm.push({ module: x as Module, ...scores[x as Module] });
+      return accm;
+    }, []);
   };
 
   const ModuleExamMap: Record<Module, React.ComponentType<ExamProps<Exam>>> = {
-		"reading": Reading as React.ComponentType<ExamProps<Exam>>,
-		"listening": Listening as React.ComponentType<ExamProps<Exam>>,
-		"writing": Writing as React.ComponentType<ExamProps<Exam>>,
-		"speaking": Speaking as React.ComponentType<ExamProps<Exam>>,
-		"level": Level as React.ComponentType<ExamProps<Exam>>,
-	}
+    reading: Reading as React.ComponentType<ExamProps<Exam>>,
+    listening: Listening as React.ComponentType<ExamProps<Exam>>,
+    writing: Writing as React.ComponentType<ExamProps<Exam>>,
+    speaking: Speaking as React.ComponentType<ExamProps<Exam>>,
+    level: Level as React.ComponentType<ExamProps<Exam>>,
+  };
 
   const CurrentExam = exam?.module ? ModuleExamMap[exam.module] : undefined;
 
@@ -253,38 +320,74 @@ export default function ExamPage({ page, user, destination = "/", hideSidebar =
     reset();
   };
 
+  const {
+    setBgColor,
+    setHideSidebar,
+    setFocusMode,
+    setOnFocusLayerMouseEnter,
+  } = React.useContext(LayoutContext);
+
+  useEffect(() => {
+    setOnFocusLayerMouseEnter(() => () => setShowAbandonPopup(true));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  useEffect(() => {
+    setBgColor(bgColor);
+    setHideSidebar(hideSidebar);
+    setFocusMode(
+      selectedModules.length !== 0 &&
+        !showSolutions &&
+        moduleIndex < selectedModules.length
+    );
+  }, [
+    bgColor,
+    hideSidebar,
+    moduleIndex,
+    selectedModules.length,
+    setBgColor,
+    setFocusMode,
+    setHideSidebar,
+    showSolutions,
+  ]);
+
   return (
     <>
       <ToastContainer />
       {user && (
-				<Layout
-					user={user}
-					bgColor={bgColor}
-					hideSidebar={hideSidebar}
-					className="justify-between"
-					focusMode={selectedModules.length !== 0 && !showSolutions && moduleIndex < selectedModules.length}
-					onFocusLayerMouseEnter={() => setShowAbandonPopup(true)}>
         <>
           {/* Modules weren't yet set by an INIT_EXAM or INIT_SOLUTIONS dispatch, show Selection component*/}
-						{selectedModules.length === 0 && <Selection
+          {selectedModules.length === 0 && (
+            <Selection
               page={page}
               user={user!}
-							onStart={(modules: Module[], avoid: boolean, variant: Variant) => {
+              onStart={(
+                modules: Module[],
+                avoid: boolean,
+                variant: Variant
+              ) => {
                 setModuleIndex(0);
                 setAvoidRepeated(avoid);
                 setSelectedModules(modules);
                 setVariant(variant);
               }}
-						/>}
+            />
+          )}
           {isFetchingExams && (
             <div className="flex flex-grow flex-col items-center justify-center animate-pulse">
-								<span className={`loading loading-infinity w-32 bg-ielts-${selectedModules[0]}`} />
-								<span className={`font-bold text-2xl text-ielts-${selectedModules[0]}`}>Loading Exam ...</span>
+              <span
+                className={`loading loading-infinity w-32 bg-ielts-${selectedModules[0]}`}
+              />
+              <span
+                className={`font-bold text-2xl text-ielts-${selectedModules[0]}`}
+              >
+                Loading Exam ...
+              </span>
             </div>
           )}
-						{(moduleIndex === -1 && selectedModules.length !== 0) &&
+          {moduleIndex === -1 && selectedModules.length !== 0 && (
             <Finish
-								isLoading={userSolutions.some(s => s.isDisabled)}
+              isLoading={userSolutions.some((s) => s.isDisabled)}
               user={user!}
               modules={selectedModules}
               solutions={userSolutions}
@@ -297,11 +400,19 @@ export default function ExamPage({ page, user, destination = "/", hideSidebar =
               onViewResults={(index?: number) => {
                 if (exams[0].module === "level") {
                   const levelExam = exams[0] as LevelExam;
-										const allExercises = levelExam.parts.flatMap((part) => part.exercises);
-										const exerciseOrderMap = new Map(allExercises.map((ex, index) => [ex.id, index]));
-										const orderedSolutions = userSolutions.slice().sort((a, b) => {
-											const indexA = exerciseOrderMap.get(a.exercise) ?? Infinity;
-											const indexB = exerciseOrderMap.get(b.exercise) ?? Infinity;
+                  const allExercises = levelExam.parts.flatMap(
+                    (part) => part.exercises
+                  );
+                  const exerciseOrderMap = new Map(
+                    allExercises.map((ex, index) => [ex.id, index])
+                  );
+                  const orderedSolutions = userSolutions
+                    .slice()
+                    .sort((a, b) => {
+                      const indexA =
+                        exerciseOrderMap.get(a.exercise) ?? Infinity;
+                      const indexB =
+                        exerciseOrderMap.get(b.exercise) ?? Infinity;
                       return indexA - indexB;
                     });
                   setUserSolutions(orderedSolutions);
@@ -324,12 +435,16 @@ export default function ExamPage({ page, user, destination = "/", hideSidebar =
               }}
               scores={aggregateScoresByModule()}
               practiceScores={aggregateScoresByModule(true)}
-							/>}
+            />
+          )}
           {/* Exam is on going, display it and the abandon modal */}
           {isExamLoaded && moduleIndex !== -1 && (
             <>
-								{exam && CurrentExam && <CurrentExam exam={exam} showSolutions={showSolutions} />}
-								{!showSolutions && <AbandonPopup
+              {exam && CurrentExam && (
+                <CurrentExam exam={exam} showSolutions={showSolutions} />
+              )}
+              {!showSolutions && (
+                <AbandonPopup
                   isOpen={showAbandonPopup}
                   abandonPopupTitle="Leave Exercise"
                   abandonPopupDescription="Are you sure you want to leave the exercise? Your progress will be saved and this exam can be resumed on the Dashboard."
@@ -337,11 +452,10 @@ export default function ExamPage({ page, user, destination = "/", hideSidebar =
                   onAbandon={onAbandon}
                   onCancel={() => setShowAbandonPopup(false)}
                 />
-								}
+              )}
             </>
           )}
         </>
-				</Layout>
       )}
     </>
   );

src/pages/(status)/PaymentDue.tsx

@@ -1,18 +1,14 @@
 /* eslint-disable @next/next/no-img-element */
-import Layout from "@/components/High/Layout";
-import useGroups from "@/hooks/useGroups";
-import usePackages from "@/hooks/usePackages";
 import useUsers from "@/hooks/useUsers";
 import { User } from "@/interfaces/user";
 import clsx from "clsx";
-import { capitalize, sortBy } from "lodash";
+import { capitalize } from "lodash";
 import { useEffect, useMemo, useState } from "react";
 import useInvites from "@/hooks/useInvites";
 import { BsArrowRepeat } from "react-icons/bs";
 import InviteCard from "@/components/Medium/InviteCard";
 import { useRouter } from "next/router";
 import { ToastContainer } from "react-toastify";
-import useDiscounts from "@/hooks/useDiscounts";
 import PaymobPayment from "@/components/PaymobPayment";
 import moment from "moment";
 import { EntityWithRoles } from "@/interfaces/entity";
@@ -22,44 +18,65 @@ import { useAllowedEntities } from "@/hooks/useEntityPermissions";
 import Select from "@/components/Low/Select";
 
 interface Props {
-	user: User
-	discounts: Discount[]
-	packages: Package[]
-	entities: EntityWithRoles[]
+  user: User;
+  discounts: Discount[];
+  packages: Package[];
+  entities: EntityWithRoles[];
   hasExpired?: boolean;
   reload: () => void;
 }
 
-export default function PaymentDue({ user, discounts = [], entities = [], packages = [], hasExpired = false, reload }: Props) {
+export default function PaymentDue({
+  user,
+  discounts = [],
+  entities = [],
+  packages = [],
+  hasExpired = false,
+  reload,
+}: Props) {
   const [isLoading, setIsLoading] = useState(false);
-	const [entity, setEntity] = useState<EntityWithRoles>()
+  const [entity, setEntity] = useState<EntityWithRoles>();
 
   const router = useRouter();
 
   const { users } = useUsers();
-	const { invites, isLoading: isInvitesLoading, reload: reloadInvites } = useInvites({ to: user?.id });
+  const {
+    invites,
+    isLoading: isInvitesLoading,
+    reload: reloadInvites,
+  } = useInvites({ to: user?.id });
 
   const isIndividual = useMemo(() => {
     if (isAdmin(user)) return false;
     if (user?.type !== "student") return false;
 
-		return user.entities.length === 0
-	}, [user])
+    return user.entities.length === 0;
+  }, [user]);
 
   const appliedDiscount = useMemo(() => {
-		const biggestDiscount = [...discounts].sort((a, b) => b.percentage - a.percentage).shift();
+    const biggestDiscount = [...discounts]
+      .sort((a, b) => b.percentage - a.percentage)
+      .shift();
 
-		if (!biggestDiscount || (biggestDiscount.validUntil && moment(biggestDiscount.validUntil).isBefore(moment())))
+    if (
+      !biggestDiscount ||
+      (biggestDiscount.validUntil &&
+        moment(biggestDiscount.validUntil).isBefore(moment()))
+    )
       return 0;
 
-		return biggestDiscount.percentage
-	}, [discounts])
+    return biggestDiscount.percentage;
+  }, [discounts]);
 
-	const entitiesThatCanBePaid = useAllowedEntities(user, entities, 'pay_entity')
+  const entitiesThatCanBePaid = useAllowedEntities(
+    user,
+    entities,
+    "pay_entity"
+  );
 
   useEffect(() => {
-		if (entitiesThatCanBePaid.length > 0) setEntity(entitiesThatCanBePaid[0])
-	}, [entitiesThatCanBePaid])
+    if (entitiesThatCanBePaid.length > 0) setEntity(entitiesThatCanBePaid[0]);
+  }, [entitiesThatCanBePaid]);
 
   return (
     <>
@@ -67,26 +84,42 @@ export default function PaymentDue({ user, discounts = [], entities = [], packag
       {isLoading && (
         <div className="absolute left-0 top-0 z-[999] h-screen w-screen overflow-hidden bg-black/60">
           <div className="absolute left-1/2 top-1/2 flex h-fit w-fit -translate-x-1/2 -translate-y-1/2 flex-col items-center gap-8 text-white">
-						<span className={clsx("loading loading-infinity w-48 animate-pulse")} />
-						<span className={clsx("text-2xl font-bold animate-pulse")}>Completing your payment...</span>
-						<span>If you canceled your payment or it failed, please click the button below to restart</span>
+            <span
+              className={clsx("loading loading-infinity w-48 animate-pulse")}
+            />
+            <span className={clsx("text-2xl font-bold animate-pulse")}>
+              Completing your payment...
+            </span>
+            <span>
+              If you canceled your payment or it failed, please click the button
+              below to restart
+            </span>
             <button
               onClick={() => setIsLoading(false)}
-							className="border border-white rounded-full px-4 py-2 hover:bg-white/80 hover:text-black cursor-pointer transition ease-in-out duration-300">
+              className="border border-white rounded-full px-4 py-2 hover:bg-white/80 hover:text-black cursor-pointer transition ease-in-out duration-300"
+            >
               Cancel Payment
             </button>
           </div>
         </div>
       )}
-			<Layout user={user} navDisabled={hasExpired}>
+      <>
         {invites.length > 0 && (
           <section className="flex flex-col gap-1 md:gap-3">
             <div className="flex items-center gap-4">
               <div
                 onClick={reloadInvites}
-								className="text-mti-purple-light hover:text-mti-purple-dark flex cursor-pointer items-center gap-2 transition duration-300 ease-in-out">
-								<span className="text-mti-black text-lg font-bold">Invites</span>
-								<BsArrowRepeat className={clsx("text-xl", isInvitesLoading && "animate-spin")} />
+                className="text-mti-purple-light hover:text-mti-purple-dark flex cursor-pointer items-center gap-2 transition duration-300 ease-in-out"
+              >
+                <span className="text-mti-black text-lg font-bold">
+                  Invites
+                </span>
+                <BsArrowRepeat
+                  className={clsx(
+                    "text-xl",
+                    isInvitesLoading && "animate-spin"
+                  )}
+                />
               </div>
             </div>
             <span className="text-mti-gray-taupe scrollbar-hide flex gap-8 overflow-x-scroll">
@@ -106,21 +139,40 @@ export default function PaymentDue({ user, discounts = [], entities = [], packag
         )}
 
         <div className="flex w-full flex-col items-center justify-center gap-4 text-center">
-					{hasExpired && <span className="text-lg font-bold">You do not have time credits for your account type!</span>}
+          {hasExpired && (
+            <span className="text-lg font-bold">
+              You do not have time credits for your account type!
+            </span>
+          )}
           {isIndividual && (
             <div className="scrollbar-hide flex w-full flex-col items-center gap-12 overflow-x-scroll">
               <span className="max-w-lg">
-								To add to your use of EnCoach, please purchase one of the time packages available below:
+                To add to your use of EnCoach, please purchase one of the time
+                packages available below:
               </span>
               <div className="flex w-full flex-wrap justify-center gap-8">
                 {packages.map((p) => (
-									<div key={p.id} className={clsx("flex flex-col items-start gap-6 rounded-xl bg-white p-4")}>
+                  <div
+                    key={p.id}
+                    className={clsx(
+                      "flex flex-col items-start gap-6 rounded-xl bg-white p-4"
+                    )}
+                  >
                     <div className="mb-2 flex flex-col items-start">
-											<img src="/logo_title.png" alt="EnCoach's Logo" className="w-32" />
+                      <img
+                        src="/logo_title.png"
+                        alt="EnCoach's Logo"
+                        className="w-32"
+                      />
                       <span className="text-xl font-semibold">
                         EnCoach - {p.duration}{" "}
                         {capitalize(
-													p.duration === 1 ? p.duration_unit.slice(0, p.duration_unit.length - 1) : p.duration_unit,
+                          p.duration === 1
+                            ? p.duration_unit.slice(
+                                0,
+                                p.duration_unit.length - 1
+                              )
+                            : p.duration_unit
                         )}
                       </span>
                     </div>
@@ -136,7 +188,11 @@ export default function PaymentDue({ user, discounts = [], entities = [], packag
                             {p.price} {p.currency}
                           </span>
                           <span className="text-2xl text-mti-red-light">
-														{(p.price - p.price * (appliedDiscount / 100)).toFixed(2)} {p.currency}
+                            {(
+                              p.price -
+                              p.price * (appliedDiscount / 100)
+                            ).toFixed(2)}{" "}
+                            {p.currency}
                           </span>
                         </div>
                       )}
@@ -149,15 +205,24 @@ export default function PaymentDue({ user, discounts = [], entities = [], packag
                         currency={p.currency}
                         duration={p.duration}
                         duration_unit={p.duration_unit}
-												price={+(p.price - p.price * (appliedDiscount / 100)).toFixed(2)}
+                        price={
+                          +(
+                            p.price -
+                            p.price * (appliedDiscount / 100)
+                          ).toFixed(2)
+                        }
                       />
                     </div>
                     <div className="flex flex-col items-start gap-1">
                       <span>This includes:</span>
                       <ul className="flex flex-col items-start text-sm">
                         <li>- Train your abilities for the IELTS exam</li>
-												<li>- Gain insights into your weaknesses and strengths</li>
-												<li>- Allow yourself to correctly prepare for the exam</li>
+                        <li>
+                          - Gain insights into your weaknesses and strengths
+                        </li>
+                        <li>
+                          - Allow yourself to correctly prepare for the exam
+                        </li>
                       </ul>
                     </div>
                   </div>
@@ -166,26 +231,43 @@ export default function PaymentDue({ user, discounts = [], entities = [], packag
             </div>
           )}
 
-					{!isIndividual && entitiesThatCanBePaid.length > 0 &&
+          {!isIndividual &&
+            entitiesThatCanBePaid.length > 0 &&
             entity?.payment && (
               <div className="flex flex-col items-center gap-8">
-								<div className={clsx("flex flex-col items-center gap-4 w-full")}>
-									<label className="font-normal text-base text-mti-gray-dim">Entity</label>
+                <div
+                  className={clsx("flex flex-col items-center gap-4 w-full")}
+                >
+                  <label className="font-normal text-base text-mti-gray-dim">
+                    Entity
+                  </label>
                   <Select
                     defaultValue={{ value: entity?.id, label: entity?.label }}
-										options={entitiesThatCanBePaid.map((e) => ({ value: e.id, label: e.label, entity: e }))}
-										onChange={(e) => e?.value ? setEntity(e?.entity) : null}
+                    options={entitiesThatCanBePaid.map((e) => ({
+                      value: e.id,
+                      label: e.label,
+                      entity: e,
+                    }))}
+                    onChange={(e) => (e?.value ? setEntity(e?.entity) : null)}
                     className="!w-full max-w-[400px] self-center"
                   />
                 </div>
 
                 <span className="max-w-lg">
-									To add to your use of EnCoach and that of your students and teachers, please pay your designated package
-									below:
+                  To add to your use of EnCoach and that of your students and
+                  teachers, please pay your designated package below:
                 </span>
-								<div className={clsx("flex flex-col items-start gap-6 rounded-xl bg-white p-4")}>
+                <div
+                  className={clsx(
+                    "flex flex-col items-start gap-6 rounded-xl bg-white p-4"
+                  )}
+                >
                   <div className="mb-2 flex flex-col items-start">
-										<img src="/logo_title.png" alt="EnCoach's Logo" className="w-32" />
+                    <img
+                      src="/logo_title.png"
+                      alt="EnCoach's Logo"
+                      className="w-32"
+                    />
                     <span className="text-xl font-semibold">
                       EnCoach - {12} Months
                     </span>
@@ -212,10 +294,14 @@ export default function PaymentDue({ user, discounts = [], entities = [], packag
                     <span>This includes:</span>
                     <ul className="flex flex-col items-start text-sm">
                       <li>
-												- Allow a total of {entity.licenses} students and teachers to use EnCoach
+                        - Allow a total of {entity.licenses} students and
+                        teachers to use EnCoach
                       </li>
                       <li>- Train their abilities for the IELTS exam</li>
-											<li>- Gain insights into your students&apos; weaknesses and strengths</li>
+                      <li>
+                        - Gain insights into your students&apos; weaknesses and
+                        strengths
+                      </li>
                       <li>- Allow them to correctly prepare for the exam</li>
                     </ul>
                   </div>
@@ -225,11 +311,12 @@ export default function PaymentDue({ user, discounts = [], entities = [], packag
           {!isIndividual && entitiesThatCanBePaid.length === 0 && (
             <div className="flex flex-col items-center">
               <span className="max-w-lg">
-								You are not the person in charge of your time credits, please contact your administrator about this situation.
+                You are not the person in charge of your time credits, please
+                contact your administrator about this situation.
               </span>
               <span className="max-w-lg">
-								If you believe this to be a mistake, please contact the platform&apos;s administration, thank you for your
-								patience.
+                If you believe this to be a mistake, please contact the
+                platform&apos;s administration, thank you for your patience.
               </span>
             </div>
           )}
@@ -237,26 +324,39 @@ export default function PaymentDue({ user, discounts = [], entities = [], packag
             entitiesThatCanBePaid.length > 0 &&
             !entity?.payment && (
               <div className="flex flex-col items-center gap-8">
-								<div className={clsx("flex flex-col items-center gap-4 w-full")}>
-									<label className="font-normal text-base text-mti-gray-dim">Entity</label>
+                <div
+                  className={clsx("flex flex-col items-center gap-4 w-full")}
+                >
+                  <label className="font-normal text-base text-mti-gray-dim">
+                    Entity
+                  </label>
                   <Select
-										defaultValue={{ value: entity?.id || "", label: entity?.label || "" }}
-										options={entitiesThatCanBePaid.map((e) => ({ value: e.id, label: e.label, entity: e }))}
-										onChange={(e) => e?.value ? setEntity(e?.entity) : null}
+                    defaultValue={{
+                      value: entity?.id || "",
+                      label: entity?.label || "",
+                    }}
+                    options={entitiesThatCanBePaid.map((e) => ({
+                      value: e.id,
+                      label: e.label,
+                      entity: e,
+                    }))}
+                    onChange={(e) => (e?.value ? setEntity(e?.entity) : null)}
                     className="!w-full max-w-[400px] self-center"
                   />
                 </div>
                 <span className="max-w-lg">
-									An admin nor your agent have yet set the price intended to your requirements in terms of the amount of users
-									you desire and your expected monthly duration.
+                  An admin nor your agent have yet set the price intended to
+                  your requirements in terms of the amount of users you desire
+                  and your expected monthly duration.
                 </span>
                 <span className="max-w-lg">
-									Please try again later or contact your agent or an admin, thank you for your patience.
+                  Please try again later or contact your agent or an admin,
+                  thank you for your patience.
                 </span>
               </div>
             )}
         </div>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/_app.tsx

@@ -6,19 +6,45 @@ import "primereact/resources/themes/lara-light-indigo/theme.css";
 import "primereact/resources/primereact.min.css";
 import "primeicons/primeicons.css";
 import "react-datepicker/dist/react-datepicker.css";
-import {useRouter} from "next/router";
-import {useEffect} from "react";
+import { Router, useRouter } from "next/router";
+import { useEffect, useState } from "react";
 import useExamStore from "@/stores/exam";
 import usePreferencesStore from "@/stores/preferencesStore";
-
+import Layout from "../components/High/Layout";
+import useEntities from "../hooks/useEntities";
 export default function App({ Component, pageProps }: AppProps) {
+  const [loading, setLoading] = useState(false);
+
   const { reset } = useExamStore();
-	const setIsSidebarMinimized = usePreferencesStore((state) => state.setSidebarMinimized);
+
+  const setIsSidebarMinimized = usePreferencesStore(
+    (state) => state.setSidebarMinimized
+  );
 
   const router = useRouter();
 
+  const { entities } = useEntities(!pageProps?.user?.id);
+
   useEffect(() => {
-		if (router.pathname !== "/exam" && router.pathname !== "/exercises") reset();
+    const start = () => {
+      setLoading(true);
+    };
+    const end = () => {
+      setLoading(false);
+    };
+    Router.events.on("routeChangeStart", start);
+    Router.events.on("routeChangeComplete", end);
+    Router.events.on("routeChangeError", end);
+    return () => {
+      Router.events.off("routeChangeStart", start);
+      Router.events.off("routeChangeComplete", end);
+      Router.events.off("routeChangeError", end);
+    };
+  }, []);
+
+  useEffect(() => {
+    if (router.pathname !== "/exam" && router.pathname !== "/exercises")
+      reset();
   }, [router.pathname, reset]);
 
   useEffect(() => {
@@ -31,5 +57,18 @@ export default function App({Component, pageProps}: AppProps) {
     }
   }, [setIsSidebarMinimized]);
 
-	return <Component {...pageProps} />;
+  return pageProps?.user ? (
+    <Layout user={pageProps.user} entities={entities} refreshPage={loading}>
+      {loading ? (
+        // TODO: Change this later to a better loading screen (example: skeletons for each page)
+        <div className="min-h-screen flex justify-center items-start">
+          <span className="loading loading-infinity w-32" />
+        </div>
+      ) : (
+        <Component entities={entities} {...pageProps} />
+      )}
+    </Layout>
+  ) : (
+    <Component {...pageProps} />
+  );
 }

src/pages/api/approval-workflows/[id]/edit.ts

@@ -0,0 +1,32 @@
+// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
+import { ApprovalWorkflow } from "@/interfaces/approval.workflow";
+import { sessionOptions } from "@/lib/session";
+import { requestUser } from "@/utils/api";
+import { updateApprovalWorkflow } from "@/utils/approval.workflows.be";
+import { withIronSessionApiRoute } from "iron-session/next";
+import { ObjectId } from "mongodb";
+import type { NextApiRequest, NextApiResponse } from "next";
+
+export default withIronSessionApiRoute(handler, sessionOptions);
+
+async function handler(req: NextApiRequest, res: NextApiResponse) {
+    if (req.method === "PUT") return await put(req, res);
+}
+
+async function put(req: NextApiRequest, res: NextApiResponse) {
+    const user = await requestUser(req, res);
+    if (!user) return res.status(401).json({ ok: false });
+
+    if (!["admin", "developer", "teacher", "corporate", "mastercorporate"].includes(user.type)) {
+        return res.status(403).json({ ok: false });
+    }
+
+    const { id } = req.query as { id?: string };
+    const approvalWorkflow: ApprovalWorkflow = req.body;
+
+    if (id && approvalWorkflow) {
+        approvalWorkflow._id = new ObjectId(id);
+        await updateApprovalWorkflow("active-workflows", approvalWorkflow);
+        return res.status(204).end();
+    }
+}

src/pages/api/approval-workflows/[id]/index.ts

@@ -0,0 +1,74 @@
+// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
+import { ApprovalWorkflow } from "@/interfaces/approval.workflow";
+import { sessionOptions } from "@/lib/session";
+import { requestUser } from "@/utils/api";
+import { deleteApprovalWorkflow, getApprovalWorkflow, updateApprovalWorkflow } from "@/utils/approval.workflows.be";
+import { getEntityWithRoles } from "@/utils/entities.be";
+import { doesEntityAllow } from "@/utils/permissions";
+import { withIronSessionApiRoute } from "iron-session/next";
+import { ObjectId } from "mongodb";
+import type { NextApiRequest, NextApiResponse } from "next";
+
+export default withIronSessionApiRoute(handler, sessionOptions);
+
+async function handler(req: NextApiRequest, res: NextApiResponse) {
+    if (req.method === "DELETE") return await del(req, res);
+    if (req.method === "PUT") return await put(req, res);
+    if (req.method === "GET") return await get(req, res);
+}
+
+async function del(req: NextApiRequest, res: NextApiResponse) {
+    const user = await requestUser(req, res);
+    if (!user) return res.status(401).json({ ok: false });
+
+    if (!["admin", "developer", "teacher", "corporate", "mastercorporate"].includes(user.type)) {
+        return res.status(403).json({ ok: false });
+    }
+
+    const { id } = req.query as { id: string };
+    const workflow = await getApprovalWorkflow("active-workflows", id);
+
+    if (!workflow) return res.status(404).json({ ok: false });
+
+    const entity = await getEntityWithRoles(workflow.entityId);
+    if (!entity) return res.status(404).json({ ok: false });
+
+    if (!doesEntityAllow(user, entity, "delete_workflow") && !["admin", "developer"].includes(user.type)) {
+        return res.status(403).json({ ok: false });
+    }
+
+    return res.status(200).json(await deleteApprovalWorkflow("active-workflows", id));
+}
+
+async function put(req: NextApiRequest, res: NextApiResponse) {
+    const user = await requestUser(req, res);
+    if (!user) return res.status(401).json({ ok: false });
+
+    if (!["admin", "developer", "teacher", "corporate", "mastercorporate"].includes(user.type)) {
+        return res.status(403).json({ ok: false });
+    }
+
+    const { id } = req.query as { id?: string };
+    const workflow: ApprovalWorkflow = req.body;
+
+    if (id && workflow) {
+        workflow._id = new ObjectId(id);
+        await updateApprovalWorkflow("active-workflows", workflow);
+        return res.status(204).end();
+    }
+}
+
+async function get(req: NextApiRequest, res: NextApiResponse) {
+    const user = await requestUser(req, res);
+    if (!user) return res.status(401).json({ ok: false });
+
+    if (!["admin", "developer", "teacher", "corporate", "mastercorporate"].includes(user.type)) {
+        return res.status(403).json({ ok: false });
+    }
+
+    const { id } = req.query as { id?: string };
+
+    if (id) {
+        return res.status(200).json(await getApprovalWorkflow("active-workflows", id));
+    }
+}

src/pages/api/approval-workflows/create.ts

@@ -0,0 +1,37 @@
+// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
+import { ApprovalWorkflow } from "@/interfaces/approval.workflow";
+import { Entity } from "@/interfaces/entity";
+import { sessionOptions } from "@/lib/session";
+import { requestUser } from "@/utils/api";
+import { replaceApprovalWorkflowsByEntities } from "@/utils/approval.workflows.be";
+import { withIronSessionApiRoute } from "iron-session/next";
+import type { NextApiRequest, NextApiResponse } from "next";
+
+export default withIronSessionApiRoute(handler, sessionOptions);
+
+interface ReplaceApprovalWorkflowsRequest {
+    filteredWorkflows: ApprovalWorkflow[];
+    userEntitiesWithLabel: Entity[];
+}
+
+async function handler(req: NextApiRequest, res: NextApiResponse) {
+    if (req.method === "POST") return await post(req, res);
+}
+
+async function post(req: NextApiRequest, res: NextApiResponse) {
+    const user = await requestUser(req, res);
+    if (!user) return res.status(401).json({ ok: false });
+
+    if (!["admin", "developer", "teacher", "corporate", "mastercorporate"].includes(user.type)) {
+        return res.status(403).json({ ok: false });
+    }
+
+    const { filteredWorkflows, userEntitiesWithLabel } = req.body as ReplaceApprovalWorkflowsRequest;
+
+    const configuredWorkflows: ApprovalWorkflow[] = filteredWorkflows;
+    const entitiesIds: string[] = userEntitiesWithLabel.map((e) => e.id);
+
+    await replaceApprovalWorkflowsByEntities(configuredWorkflows, entitiesIds);
+
+    return res.status(204).end();
+}

src/pages/api/approval-workflows/index.ts

@@ -0,0 +1,23 @@
+// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
+import { sessionOptions } from "@/lib/session";
+import { requestUser } from "@/utils/api";
+import { getApprovalWorkflows } from "@/utils/approval.workflows.be";
+import { withIronSessionApiRoute } from "iron-session/next";
+import type { NextApiRequest, NextApiResponse } from "next";
+
+export default withIronSessionApiRoute(handler, sessionOptions);
+
+async function handler(req: NextApiRequest, res: NextApiResponse) {
+    if (req.method === "GET") return await get(req, res);
+}
+
+async function get(req: NextApiRequest, res: NextApiResponse) {
+    const user = await requestUser(req, res);
+    if (!user) return res.status(401).json({ ok: false });
+
+    if (!["admin", "developer", "teacher", "corporate", "mastercorporate"].includes(user.type)) {
+        return res.status(403).json({ ok: false });
+    }
+
+    return res.status(200).json(await getApprovalWorkflows("active-workflows"));
+}

src/pages/api/exam/[module]/index.ts

@@ -1,15 +1,17 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
-import type { NextApiRequest, NextApiResponse } from "next";
-import client from "@/lib/mongodb";
-import { withIronSessionApiRoute } from "iron-session/next";
-import { sessionOptions } from "@/lib/session";
-import { Exam, ExamBase, InstructorGender, Variant } from "@/interfaces/exam";
-import { getExams } from "@/utils/exams.be";
 import { Module } from "@/interfaces";
-import { getUserCorporate } from "@/utils/groups.be";
-import { requestUser } from "@/utils/api";
-import { isAdmin } from "@/utils/users";
+import { Exam, ExamBase, InstructorGender, Variant } from "@/interfaces/exam";
+import { createApprovalWorkflowsOnExamCreation } from "@/lib/createWorkflowsOnExamCreation";
+import client from "@/lib/mongodb";
+import { sessionOptions } from "@/lib/session";
 import { mapBy } from "@/utils";
+import { requestUser } from "@/utils/api";
+import { getApprovalWorkflowsByExamId, updateApprovalWorkflows } from "@/utils/approval.workflows.be";
+import { generateExamDifferences } from "@/utils/exam.differences";
+import { getExams } from "@/utils/exams.be";
+import { isAdmin } from "@/utils/users";
+import { withIronSessionApiRoute } from "iron-session/next";
+import type { NextApiRequest, NextApiResponse } from "next";
 
 const db = client.db(process.env.MONGODB_DB);
 
@@ -40,13 +42,13 @@ async function GET(req: NextApiRequest, res: NextApiResponse) {
 }
 
 async function POST(req: NextApiRequest, res: NextApiResponse) {
-	const user = await requestUser(req, res)
+	const user = await requestUser(req, res);
 	if (!user) return res.status(401).json({ ok: false });
 
 	const { module } = req.query as { module: string };
 
 	const session = client.startSession();
-	const entities = isAdmin(user) ? [] : mapBy(user.entities, 'id')
+	const entities = isAdmin(user) ? [] : mapBy(user.entities, "id"); // might need to change this with new approval workflows logic.. if an admin creates an exam no workflow is started because workflows must have entities configured.
 
 	try {
 		const exam = {
@@ -57,14 +59,20 @@ async function POST(req: NextApiRequest, res: NextApiResponse) {
 			createdAt: new Date().toISOString(),
 		};
 
+		let responseStatus: number;
+		let responseMessage: string;
+
 		await session.withTransaction(async () => {
 			const docSnap = await db.collection(module).findOne<ExamBase>({ id: req.body.id }, { session });
 
 			// Check whether the id of the exam matches another exam with different
 			// owners, throw exception if there is, else allow editing
-			const ownersSet = new Set(docSnap?.owners || []);
+			const existingExamOwners = docSnap?.owners ?? [];
+			const newExamOwners = exam.owners ?? [];
 
-			if (docSnap !== null && docSnap?.owners?.length === exam.owners.lenght && exam.owners.every((e: string) => ownersSet.has(e))) {
+			const ownersSet = new Set(existingExamOwners);
+
+			if (docSnap !== null && (existingExamOwners.length !== newExamOwners.length || !newExamOwners.every((e: string) => ownersSet.has(e)))) {
 				throw new Error("Name already exists");
 			}
 
@@ -73,13 +81,59 @@ async function POST(req: NextApiRequest, res: NextApiResponse) {
 				{ $set: { id: req.body.id, ...exam } },
 				{
 					upsert: true,
-					session
+					session,
 				}
 			);
+
+			// if it doesn't enter the next if condition it means the exam was updated and not created, so we can send this response.
+			responseStatus = 200;
+			responseMessage = `Successfully updated exam with ID: "${exam.id}"`;
+			// TODO maybe find a way to start missing approval workflows in case they were only configured after exam creation.
+
+			// create workflow only if exam is being created for the first time
+			if (docSnap === null) {
+				try {
+					const { successCount, totalCount } = await createApprovalWorkflowsOnExamCreation(exam.createdBy, exam.entities, exam.id, module);
+
+					if (successCount === totalCount) {
+						responseStatus = 200;
+						responseMessage = `Successfully created exam "${exam.id}" and started its Approval Workflow(s)`;
+					} else if (successCount > 0) {
+						responseStatus = 207;
+						responseMessage = `Successfully created exam with ID: "${exam.id}" but was not able to start/find an Approval Workflow for all the author's entities`;
+					} else {
+						responseStatus = 207;
+						responseMessage = `Successfully created exam with ID: "${exam.id}" but was not able to find any configured Approval Workflow for the author.`;
+					}
+				} catch (error) {
+					console.error("Workflow creation error:", error);
+					responseStatus = 207;
+					responseMessage = `Successfully created exam with ID: "${exam.id}" but something went wrong while creating the Approval Workflow(s).`;
+				}
+			} else { // if exam was updated, log the updates
+				const approvalWorkflows = await getApprovalWorkflowsByExamId(exam.id);
+				
+				if (approvalWorkflows) {
+					const differences = generateExamDifferences(docSnap as Exam, exam as Exam);
+					if (differences) {
+						approvalWorkflows.forEach((workflow) => {
+							const currentStepIndex = workflow.steps.findIndex(step => !step.completed || step.rejected);
+		
+							if (workflow.steps[currentStepIndex].examChanges === undefined) {
+								workflow.steps[currentStepIndex].examChanges = [...differences];
+							} else {
+								workflow.steps[currentStepIndex].examChanges!.push(...differences);
+							}
 						});
+						await updateApprovalWorkflows("active-workflows", approvalWorkflows);
+					}
+				}
+			}
 			
-		res.status(200).json(exam);
-
+			res.status(responseStatus).json({
+				message: responseMessage,
+			});
+		});
 	} catch (error) {
 		console.error("Transaction failed: ", error);
 		res.status(500).json({ ok: false, error: (error as any).message });

src/pages/api/stats/user/[user].ts

@@ -1,10 +1,9 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type { NextApiRequest, NextApiResponse } from "next";
-import client from "@/lib/mongodb";
 import { withIronSessionApiRoute } from "iron-session/next";
 import { sessionOptions } from "@/lib/session";
+import { getDetailedStatsByUser } from "../../../../utils/stats.be";
 
-const db = client.db(process.env.MONGODB_DB);
 
 export default withIronSessionApiRoute(handler, sessionOptions);
 
@@ -14,11 +13,8 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 		return;
 	}
 
-	const {user} = req.query;
-	const snapshot = await db.collection("stats").aggregate([
-		{ $match: { user: user } },
-		{ $sort: { "date": 1 } }
-	  ]).toArray();
+	const { user, query } = req.query as { user: string, query?: string };
 
+	const snapshot = await getDetailedStatsByUser(user, query);
 	res.status(200).json(snapshot);
 }

src/pages/api/tickets/assignedToUser/index.ts

@@ -33,7 +33,7 @@ async function get(req: NextApiRequest, res: NextApiResponse) {
 		res.status(401).json({ ok: false });
 		return;
 	}
-	const docs = await db.collection("tickets").find<Ticket>({ assignedTo: req.session.user.id }).toArray();
+	const docs = await db.collection("tickets").find<Ticket>({ assignedTo: req.session.user.id, status: { $ne: "completed" } }).toArray();
 
 	res.status(200).json(docs);
 }

src/pages/approval-workflows/[id]/edit.tsx

@@ -0,0 +1,197 @@
+import RequestedBy from "@/components/ApprovalWorkflows/RequestedBy";
+import StartedOn from "@/components/ApprovalWorkflows/StartedOn";
+import Status from "@/components/ApprovalWorkflows/Status";
+import WorkflowForm from "@/components/ApprovalWorkflows/WorkflowForm";
+import Layout from "@/components/High/Layout";
+import { ApprovalWorkflow, EditableApprovalWorkflow, EditableWorkflowStep, getUserTypeLabelShort } from "@/interfaces/approval.workflow";
+import { CorporateUser, DeveloperUser, MasterCorporateUser, TeacherUser, User } from "@/interfaces/user";
+import { sessionOptions } from "@/lib/session";
+import { findBy, redirect, serialize } from "@/utils";
+import { requestUser } from "@/utils/api";
+import { getApprovalWorkflow } from "@/utils/approval.workflows.be";
+import { getEntityWithRoles } from "@/utils/entities.be";
+import { shouldRedirectHome } from "@/utils/navigation.disabled";
+import { doesEntityAllow } from "@/utils/permissions";
+import { getEntityUsers } from "@/utils/users.be";
+import axios from "axios";
+import { LayoutGroup, motion } from "framer-motion";
+import { withIronSessionSsr } from "iron-session/next";
+import Head from "next/head";
+import Link from "next/link";
+import { useEffect, useState } from "react";
+import { BsChevronLeft } from "react-icons/bs";
+import { toast, ToastContainer } from "react-toastify";
+
+export const getServerSideProps = withIronSessionSsr(async ({ req, res, params }) => {
+    const user = await requestUser(req, res);
+    if (!user) return redirect("/login")
+
+    if (shouldRedirectHome(user) || !["admin", "developer", "teacher", "corporate", "mastercorporate"].includes(user.type))
+        return redirect("/")
+
+    const { id } = params as { id: string };
+
+    const workflow: ApprovalWorkflow | null = await getApprovalWorkflow("active-workflows", id);
+    if (!workflow) return redirect("/approval-workflows");
+
+    const entityWithRole = await getEntityWithRoles(workflow.entityId);
+    if (!entityWithRole) return redirect("/approval-workflows");
+
+    if (!doesEntityAllow(user, entityWithRole, "edit_workflow")) return redirect("/approval-workflows");
+
+    return {
+        props: serialize({
+            user,
+            workflow,
+            workflowEntityApprovers: await getEntityUsers(workflow.entityId, undefined, { type: { $in: ["teacher", "corporate", "mastercorporate", "developer"] } }) as (TeacherUser | CorporateUser | MasterCorporateUser | DeveloperUser)[],
+        }),
+    };
+}, sessionOptions);
+
+interface Props {
+    user: User,
+    workflow: ApprovalWorkflow,
+    workflowEntityApprovers: (TeacherUser | CorporateUser | MasterCorporateUser | DeveloperUser)[],
+}
+
+export default function Home({ user, workflow, workflowEntityApprovers }: Props) {
+    const [updatedWorkflow, setUpdatedWorkflow] = useState<EditableApprovalWorkflow | null>(null);
+    const [isLoading, setIsLoading] = useState<boolean>(false);
+
+    useEffect(() => {
+        const editableSteps: EditableWorkflowStep[] = workflow.steps.map(step => ({
+            key: step.stepNumber + 999, // just making sure they are unique because new steps that users add will have key=3 key=4 etc
+            stepType: step.stepType,
+            stepNumber: step.stepNumber,
+            completed: step.completed,
+            completedBy: step.completedBy || undefined,
+            completedDate: step.completedDate || undefined,
+            assignees: step.assignees,
+            firstStep: step.firstStep || false,
+            finalStep: step.finalStep || false,
+            onDelete: undefined,
+        }));
+
+        const editableWorkflow: EditableApprovalWorkflow = {
+            id: workflow._id?.toString() ?? "",
+            name: workflow.name,
+            entityId: workflow.entityId,
+            requester: user.id, // should it change to the editor?
+            startDate: workflow.startDate,
+            modules: workflow.modules,
+            status: workflow.status,
+            steps: editableSteps,
+        };
+
+        setUpdatedWorkflow(editableWorkflow);
+    }, []);
+
+    const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
+        e.preventDefault();
+        setIsLoading(true);
+
+        if (!updatedWorkflow) {
+            setIsLoading(false);
+            return;
+        }
+
+        for (const step of updatedWorkflow.steps) {
+            if (step.assignees.every(x => !x)) {
+                toast.warning("There is at least one empty step in the workflow.");
+                setIsLoading(false);
+                return;
+            }
+        }
+
+        const filteredWorkflow: ApprovalWorkflow = {
+            ...updatedWorkflow,
+            steps: updatedWorkflow.steps.map(step => ({
+                ...step,
+                assignees: step.assignees.filter((assignee): assignee is string => assignee !== null && assignee !== undefined)
+            }))
+        };
+
+        axios
+            .put(`/api/approval-workflows/${updatedWorkflow.id}/edit`, filteredWorkflow)
+            .then(() => {
+                toast.success("Approval Workflow edited successfully.");
+                setIsLoading(false);
+            })
+            .catch((reason) => {
+                if (reason.response.status === 401) {
+                    toast.error("Not logged in!");
+                } else if (reason.response.status === 403) {
+                    toast.error("You do not have permission to edit Approval Workflows!");
+                } else {
+                    toast.error("Something went wrong, please try again later.");
+                }
+                setIsLoading(false);
+                console.log("Submitted Values:", filteredWorkflow);
+                return;
+            })
+    };
+
+    const onWorkflowChange = (updatedWorkflow: EditableApprovalWorkflow) => {
+        setUpdatedWorkflow(updatedWorkflow);
+    };
+
+    return (
+        <>
+            <Head>
+                <title> Edit Workflow | EnCoach</title>
+                <meta
+                    name="description"
+                    content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+                />
+                <meta name="viewport" content="width=device-width, initial-scale=1" />
+                <link rel="icon" href="/favicon.ico" />
+            </Head>
+            <ToastContainer />
+            <section className="flex items-center gap-2">
+                <Link
+                    href="/approval-workflows"
+                    className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl">
+                    <BsChevronLeft />
+                </Link>
+                <h1 className="text-2xl font-semibold">{workflow.name}</h1>
+            </section>
+
+            <section className="flex flex-col gap-6">
+                <div className="flex flex-row gap-6">
+                    <RequestedBy
+                        prefix={getUserTypeLabelShort(user.type)}
+                        name={user.name}
+                        profileImage={user.profilePicture}
+                    />
+                    <StartedOn
+                        date={workflow.startDate}
+                    />
+                    <Status
+                        status={workflow.status}
+                    />
+                </div>
+            </section>
+
+            <form onSubmit={handleSubmit}>
+                <LayoutGroup key={workflow.name}>
+                    <motion.div
+                        key="form"
+                        initial={{ opacity: 0, y: -30 }}
+                        animate={{ opacity: 1, y: 0 }}
+                        exit={{ opacity: 0, x: 60 }}
+                        transition={{ duration: 0.20 }}
+                    >
+                        {updatedWorkflow &&
+                            <WorkflowForm
+                                workflow={updatedWorkflow}
+                                onWorkflowChange={onWorkflowChange}
+                                entityApprovers={workflowEntityApprovers}
+                                isLoading={isLoading}
+                            />
+                        }
+                    </motion.div>
+                </LayoutGroup>
+            </form>
+        </>
+    );
+}

src/pages/approval-workflows/[id]/index.tsx

@@ -0,0 +1,608 @@
+import RequestedBy from "@/components/ApprovalWorkflows/RequestedBy";
+import StartedOn from "@/components/ApprovalWorkflows/StartedOn";
+import Status from "@/components/ApprovalWorkflows/Status";
+import Tip from "@/components/ApprovalWorkflows/Tip";
+import UserWithProfilePic from "@/components/ApprovalWorkflows/UserWithProfilePic";
+import WorkflowStepComponent from "@/components/ApprovalWorkflows/WorkflowStepComponent";
+import Layout from "@/components/High/Layout";
+import Button from "@/components/Low/Button";
+import useApprovalWorkflow from "@/hooks/useApprovalWorkflow";
+import { ApprovalWorkflow, getUserTypeLabelShort, WorkflowStep } from "@/interfaces/approval.workflow";
+import { User } from "@/interfaces/user";
+import { sessionOptions } from "@/lib/session";
+import useExamStore from "@/stores/exam";
+import { redirect, serialize } from "@/utils";
+import { requestUser } from "@/utils/api";
+import { getApprovalWorkflow } from "@/utils/approval.workflows.be";
+import { getEntityWithRoles } from "@/utils/entities.be";
+import { getExamById } from "@/utils/exams";
+import { shouldRedirectHome } from "@/utils/navigation.disabled";
+import { doesEntityAllow } from "@/utils/permissions";
+import { getSpecificUsers, getUser } from "@/utils/users.be";
+import axios from "axios";
+import { AnimatePresence, LayoutGroup, motion } from "framer-motion";
+import { withIronSessionSsr } from "iron-session/next";
+import Head from "next/head";
+import Link from "next/link";
+import { useRouter } from "next/router";
+import { useState } from "react";
+import { BsChevronLeft } from "react-icons/bs";
+import { FaSpinner, FaWpforms } from "react-icons/fa6";
+import { FiSave } from "react-icons/fi";
+import { IoMdCheckmarkCircleOutline } from "react-icons/io";
+import { IoDocumentTextOutline } from "react-icons/io5";
+import { MdKeyboardArrowDown, MdKeyboardArrowUp, MdOutlineDoubleArrow } from "react-icons/md";
+import { RiThumbUpLine } from "react-icons/ri";
+import { RxCrossCircled } from "react-icons/rx";
+import { TiEdit } from "react-icons/ti";
+import { toast, ToastContainer } from "react-toastify";
+
+export const getServerSideProps = withIronSessionSsr(async ({ req, res, params }) => {
+    const user = await requestUser(req, res);
+    if (!user) return redirect("/login")
+
+    if (shouldRedirectHome(user) || !["admin", "developer", "teacher", "corporate", "mastercorporate"].includes(user.type))
+        return redirect("/")
+
+    const { id } = params as { id: string };
+
+    const workflow: ApprovalWorkflow | null = await getApprovalWorkflow("active-workflows", id);
+
+    if (!workflow) return redirect("/approval-workflows")
+
+    const entityWithRole = await getEntityWithRoles(workflow.entityId);
+    if (!entityWithRole) return redirect("/approval-workflows");
+
+    if (!doesEntityAllow(user, entityWithRole, "view_workflows")) return redirect("/approval-workflows");
+
+    const allAssigneeIds: string[] = [
+        ...new Set(
+            workflow.steps
+                .map(step => step.assignees)
+                .flat()
+        )
+    ];
+
+    return {
+        props: serialize({
+            user,
+            initialWorkflow: workflow,
+            id,
+            workflowAssignees: await getSpecificUsers(allAssigneeIds),
+            workflowRequester: await getUser(workflow.requester),
+        }),
+    };
+}, sessionOptions);
+
+interface Props {
+    user: User,
+    initialWorkflow: ApprovalWorkflow,
+    id: string,
+    workflowAssignees: User[],
+    workflowRequester: User,
+}
+
+export default function Home({ user, initialWorkflow, id, workflowAssignees, workflowRequester }: Props) {
+
+    const { workflow, reload, isLoading } = useApprovalWorkflow(id);
+
+    const currentWorkflow = workflow || initialWorkflow;
+
+    let currentStepIndex = currentWorkflow.steps.findIndex(step => !step.completed || step.rejected);
+    if (currentStepIndex === -1)
+        currentStepIndex = currentWorkflow.steps.length - 1;
+
+    const [selectedStepIndex, setSelectedStepIndex] = useState<number>(currentStepIndex);
+    const [selectedStep, setSelectedStep] = useState<WorkflowStep>(currentWorkflow.steps[selectedStepIndex]);
+    const [isPanelOpen, setIsPanelOpen] = useState(true);
+    const [isAccordionOpen, setIsAccordionOpen] = useState(false);
+    const [comments, setComments] = useState<string>(selectedStep.comments || "");
+    const [viewExamIsLoading, setViewExamIsLoading] = useState<boolean>(false);
+    const [editExamIsLoading, setEditExamIsLoading] = useState<boolean>(false);
+
+    const router = useRouter();
+
+    const handleStepClick = (index: number, stepInfo: WorkflowStep) => {
+        setSelectedStep(stepInfo);
+        setSelectedStepIndex(index);
+        setComments(stepInfo.comments || "");
+        setIsPanelOpen(true);
+    };
+
+    const handleSaveComments = () => {
+        const updatedWorkflow: ApprovalWorkflow = {
+            ...currentWorkflow,
+            steps: currentWorkflow.steps.map((step, index) =>
+                index === selectedStepIndex ?
+                    {
+                        ...step,
+                        comments: comments,
+                    }
+                    : step
+            )
+        };
+
+        axios
+            .put(`/api/approval-workflows/${id}`, updatedWorkflow)
+            .then(() => {
+                toast.success("Comments saved successfully.");
+                reload();
+            })
+            .catch((reason) => {
+                if (reason.response.status === 401) {
+                    toast.error("Not logged in!");
+                } else if (reason.response.status === 403) {
+                    toast.error("You do not have permission to approve this step!");
+                } else {
+                    toast.error("Something went wrong, please try again later.");
+                }
+                console.log("Submitted Values:", updatedWorkflow);
+                return;
+            })
+    };
+
+    const handleApproveStep = () => {
+        const isLastStep = (selectedStepIndex + 1 === currentWorkflow.steps.length);
+        if (isLastStep) {
+            if (!confirm(`Are you sure you want to approve the last step? Doing so will approve the exam.`)) return;
+        }
+
+        const updatedWorkflow: ApprovalWorkflow = {
+            ...currentWorkflow,
+            status: selectedStepIndex === currentWorkflow.steps.length - 1 ? "approved" : "pending",
+            steps: currentWorkflow.steps.map((step, index) =>
+                index === selectedStepIndex ?
+                    {
+                        ...step,
+                        completed: true,
+                        completedBy: user.id,
+                        completedDate: Date.now(),
+                    }
+                    : step
+            )
+        };
+
+        axios
+            .put(`/api/approval-workflows/${id}`, updatedWorkflow)
+            .then(() => {
+                toast.success("Step approved successfully.");
+                reload();
+            })
+            .catch((reason) => {
+                if (reason.response.status === 401) {
+                    toast.error("Not logged in!");
+                } else if (reason.response.status === 403) {
+                    toast.error("You do not have permission to approve this step!");
+                } else {
+                    toast.error("Something went wrong, please try again later.");
+                }
+                console.log("Submitted Values:", updatedWorkflow);
+                return;
+            })
+
+        if (isLastStep) {
+            setIsPanelOpen(false);
+            const examModule = currentWorkflow.modules[0];
+            const examId = currentWorkflow.examId;
+
+            axios
+                .patch(`/api/exam/${examModule}/${examId}`, { isDiagnostic: false })
+                .then(() => toast.success(`The exam was successfuly approved and this workflow has been completed.`))
+                .catch((reason) => {
+                    if (reason.response.status === 404) {
+                        toast.error("Exam not found!");
+                        return;
+                    }
+
+                    if (reason.response.status === 403) {
+                        toast.error("You do not have permission to update this exam!");
+                        return;
+                    }
+
+                    toast.error("Something went wrong, please try again later.");
+                })
+                .finally(reload);
+        } else {
+            handleStepClick(selectedStepIndex + 1, currentWorkflow.steps[selectedStepIndex + 1]);
+        }
+    };
+
+    const handleRejectStep = () => {
+        if (!confirm(`Are you sure you want to reject this step? Doing so will terminate this approval workflow.`)) return;
+
+        const updatedWorkflow: ApprovalWorkflow = {
+            ...currentWorkflow,
+            status: "rejected",
+            steps: currentWorkflow.steps.map((step, index) =>
+                index === selectedStepIndex ?
+                    {
+                        ...step,
+                        completed: true,
+                        completedBy: user.id,
+                        completedDate: Date.now(),
+                        rejected: true,
+                    }
+                    : step
+            )
+        };
+
+        axios
+            .put(`/api/approval-workflows/${id}`, updatedWorkflow)
+            .then(() => {
+                toast.success("Step rejected successfully.");
+                reload();
+            })
+            .catch((reason) => {
+                if (reason.response.status === 401) {
+                    toast.error("Not logged in!");
+                } else if (reason.response.status === 403) {
+                    toast.error("You do not have permission to approve this step!");
+                } else {
+                    toast.error("Something went wrong, please try again later.");
+                }
+                console.log("Submitted Values:", updatedWorkflow);
+                return;
+            })
+    };
+
+    const dispatch = useExamStore((store) => store.dispatch);
+    const handleViewExam = async () => {
+        setViewExamIsLoading(true);
+        const examModule = currentWorkflow.modules[0];
+        const examId = currentWorkflow.examId;
+
+        if (examModule && examId) {
+            const exam = await getExamById(examModule, examId.trim());
+            if (!exam) {
+                toast.error(
+                    "Unknown Exam ID! Please make sure you selected the right module and entered the right exam ID",
+                    { toastId: "invalid-exam-id" }
+                );
+                setViewExamIsLoading(false);
+                return;
+            }
+            dispatch({
+                type: "INIT_EXAM",
+                payload: { exams: [exam], modules: [examModule] },
+            });
+            router.push("/exam");
+        }
+    }
+
+    const handleEditExam = () => {
+        setEditExamIsLoading(true);
+        const examModule = currentWorkflow.modules[0];
+        const examId = currentWorkflow.examId;
+
+        router.push(`/generation?id=${examId}&module=${examModule}`);
+    }
+
+    return (
+        <>
+            <Head>
+                <title> Workflow | EnCoach</title>
+                <meta
+                    name="description"
+                    content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+                />
+                <meta name="viewport" content="width=device-width, initial-scale=1" />
+                <link rel="icon" href="/favicon.ico" />
+            </Head>
+            <ToastContainer />
+
+            <section className="flex items-center gap-2">
+                <Link
+                    href="/approval-workflows"
+                    className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl">
+                    <BsChevronLeft />
+                </Link>
+                <h1 className="text-2xl font-semibold">{currentWorkflow.name}</h1>
+            </section>
+
+            <section className="flex flex-col gap-6">
+                <div className="flex flex-row gap-6">
+                    <RequestedBy
+                        prefix={getUserTypeLabelShort(workflowRequester.type)}
+                        name={workflowRequester.name}
+                        profileImage={workflowRequester.profilePicture}
+                    />
+                    <StartedOn
+                        date={currentWorkflow.startDate}
+                    />
+                    <Status
+                        status={currentWorkflow.status}
+                    />
+                </div>
+                <div className="flex flex-row gap-3">
+                    <Button
+                        color="purple"
+                        variant="solid"
+                        onClick={handleViewExam}
+                        disabled={viewExamIsLoading}
+                        padding="px-6 py-2"
+                        className="w-[240px] text-lg flex items-center justify-center gap-2 text-left"
+                    >
+                        {viewExamIsLoading ? (
+                            <>
+                                <FaSpinner className="animate-spin size-5" />
+                                Loading...
+                            </>
+                        ) : (
+                            <>
+                                <IoDocumentTextOutline />
+                                Load Exam
+                            </>
+                        )}
+                    </Button>
+                    <Button
+                        color="purple"
+                        variant="solid"
+                        onClick={handleEditExam}
+                        padding="px-6 py-2"
+                        disabled={(!currentWorkflow.steps[currentStepIndex].assignees.includes(user.id) && user.type !== "admin" && user.type !== "developer") || editExamIsLoading}
+                        className="w-[240px] text-lg flex items-center justify-center gap-2 text-left"
+                    >
+                        {editExamIsLoading ? (
+                            <>
+                                <FaSpinner className="animate-spin size-5" />
+                                Loading...
+                            </>
+                        ) : (
+                            <>
+                                <TiEdit size={20} />
+                                Edit Exam
+                            </>
+                        )}
+                    </Button>
+
+                </div>
+                {currentWorkflow.steps.find((step) => !step.completed) === undefined &&
+                    <Tip text="All steps in this instance have been completed." />
+                }
+            </section>
+
+            <section className="flex flex-col gap-0">
+                {currentWorkflow.steps.map((step, index) => (
+                    <WorkflowStepComponent
+                        workflowAssignees={workflowAssignees}
+                        key={index}
+                        completed={step.completed}
+                        completedBy={step.completedBy}
+                        rejected={step.rejected}
+                        stepNumber={step.stepNumber}
+                        stepType={step.stepType}
+                        assignees={step.assignees}
+                        finalStep={index === currentWorkflow.steps.length - 1}
+                        currentStep={index === currentStepIndex}
+                        selected={index === selectedStepIndex}
+                        onClick={() => handleStepClick(index, step)}
+                    />
+                ))}
+            </section>
+
+            {/* Side panel */}
+            <AnimatePresence mode="wait">
+                <LayoutGroup key="sidePanel">
+                    <section className={`absolute inset-y-0 right-0 h-full bg-mti-purple-ultralight bg-opacity-50 shadow-xl shadow-mti-purple transition-all duration-300 overflow-hidden ${isPanelOpen ? 'w-[500px]' : 'w-0'}`}>
+                        {isPanelOpen && selectedStep && (
+                            <motion.div
+                                className="p-6"
+                                key={selectedStep.stepNumber}
+                                initial={{ opacity: 0, x: 30 }}
+                                animate={{ opacity: 1, x: 0 }}
+                                exit={{ opacity: 0, x: 30 }}
+                                transition={{ duration: 0.2 }}
+                            >
+                                <hr className="my-4 h-[4px] bg-mti-purple-ultralight rounded-full w-full" />
+                                <div className="flex flex-row gap-2">
+                                    <p className="text-2xl font-medium text-left align-middle">Step {selectedStepIndex + 1}</p>
+                                    <div className="ml-auto flex flex-row">
+                                        <button
+                                            className="min-w-fit max-h-fit text-lg font-medium flex items-center gap-2 text-left"
+                                            onClick={() => setIsPanelOpen(false)}
+                                        >
+                                            Collapse
+                                            <MdOutlineDoubleArrow size={20} />
+                                        </button>
+                                    </div>
+                                </div>
+
+                                <hr className="my-4 h-[4px] bg-mti-purple-ultralight rounded-full w-full" />
+
+                                <div>
+                                    <div className="my-8 flex flex-row gap-4 items-center text-lg font-medium">
+                                        {selectedStep.stepType === "approval-by" ? (
+                                            <>
+                                                <RiThumbUpLine size={30} />
+                                                Approval Step
+                                            </>
+                                        ) : (
+                                            <>
+                                                <FaWpforms size={30} />
+                                                Form Intake Step
+                                            </>
+                                        )
+                                        }
+                                    </div>
+
+                                    {selectedStep.completed ? (
+                                        <div className={"text-base font-medium text-gray-500 flex flex-col gap-6"}>
+                                            {selectedStep.rejected ? "Rejected" : "Approved"} on {new Date(selectedStep.completedDate!).toLocaleString("en-CA", {
+                                                year: "numeric",
+                                                month: "2-digit",
+                                                day: "2-digit",
+                                                hour: "2-digit",
+                                                minute: "2-digit",
+                                                second: "2-digit",
+                                                hour12: false,
+                                            }).replace(", ", " at ")}
+                                            <div className="flex flex-row gap-1 text-sm">
+                                                <p className="text-base">{selectedStep.rejected ? "Rejected" : "Approved"} by:</p>
+                                                {(() => {
+                                                    const assignee = workflowAssignees.find(
+                                                        (assignee) => assignee.id === selectedStep.completedBy
+                                                    );
+                                                    return assignee ? (
+                                                        <UserWithProfilePic
+                                                            textSize="text-base"
+                                                            prefix={getUserTypeLabelShort(assignee.type)}
+                                                            name={assignee.name}
+                                                            profileImage={assignee.profilePicture}
+                                                        />
+                                                    ) : (
+                                                        "Unknown"
+                                                    );
+                                                })()}
+                                            </div>
+                                            <p className="text-sm">No additional actions are required.</p>
+                                        </div>
+
+                                    ) : (
+                                        <div className={"text-base font-medium text-gray-500 mb-6"}>
+                                            One assignee is required to sign off to complete this step:
+                                            <div className="flex flex-col gap-2 mt-3">
+                                                {workflowAssignees.filter(user => selectedStep.assignees.includes(user.id)).map(user => (
+                                                    <span key={user.id}>
+                                                        <UserWithProfilePic
+                                                            textSize="text-sm"
+                                                            prefix={`- ${getUserTypeLabelShort(user.type)}`}
+                                                            name={user.name}
+                                                            profileImage={user.profilePicture}
+                                                        />
+                                                    </span>
+                                                ))}
+                                            </div>
+                                        </div>
+                                    )}
+
+                                    {selectedStepIndex === currentStepIndex && !selectedStep.completed && !selectedStep.rejected &&
+                                        <div className="flex flex-row gap-2 ">
+                                            <Button
+                                                type="submit"
+                                                color="purple"
+                                                variant="solid"
+                                                disabled={(!selectedStep.assignees.includes(user.id) && user.type !== "admin" && user.type !== "developer") || isLoading}
+                                                onClick={handleApproveStep}
+                                                padding="px-6 py-2"
+                                                className="mb-3 w-full text-lg flex items-center justify-center gap-2 text-left"
+                                            >
+                                                {isLoading ? (
+                                                    <>
+                                                        <FaSpinner className="animate-spin size-5" />
+                                                        Loading...
+                                                    </>
+                                                ) : (
+                                                    <>
+                                                        <IoMdCheckmarkCircleOutline size={20} />
+                                                        Approve Step
+                                                    </>
+                                                )}
+                                            </Button>
+                                            <Button
+                                                type="submit"
+                                                color="red"
+                                                variant="solid"
+                                                disabled={(!selectedStep.assignees.includes(user.id) && user.type !== "admin" && user.type !== "developer") || isLoading}
+                                                onClick={handleRejectStep}
+                                                padding="px-6 py-2"
+                                                className="mb-3 w-1/2 text-lg flex items-center justify-center gap-2 text-left"
+                                            >
+                                                {isLoading ? (
+                                                    <>
+                                                        <FaSpinner className="animate-spin size-5" />
+                                                        Loading...
+                                                    </>
+                                                ) : (
+                                                    <>
+                                                        <RxCrossCircled size={20} />
+                                                        Reject
+                                                    </>
+                                                )}
+                                            </Button>
+                                        </div>
+                                    }
+
+                                    <hr className="my-4 h-[4px] bg-mti-purple-ultralight rounded-full w-full" />
+
+                                    {/* Accordion for Exam Changes */}
+                                    <div className="mb-4">
+                                        <div
+                                            className="flex items-center justify-between cursor-pointer p-2 rounded-lg"
+                                            onClick={() => setIsAccordionOpen((prev) => !prev)}
+                                        >
+                                            <h2 className="font-medium text-gray-500">
+                                                Changes ({currentWorkflow.steps[selectedStepIndex].examChanges?.length || "0"})
+                                            </h2>
+                                            {isAccordionOpen ? (
+                                                <MdKeyboardArrowUp size={24} />
+                                            ) : (
+                                                <MdKeyboardArrowDown size={24} />
+                                            )}
+                                        </div>
+                                        <AnimatePresence>
+                                            {isAccordionOpen && (
+                                                <motion.div
+                                                    initial={{ height: 0, opacity: 0 }}
+                                                    animate={{ height: "auto", opacity: 1 }}
+                                                    exit={{ height: 0, opacity: 0 }}
+                                                    transition={{ duration: 0.3 }}
+                                                    className="overflow-hidden mt-2"
+                                                >
+                                                    <div className="p-3 border border-gray-300 rounded-xl bg-white bg-opacity-80 overflow-y-auto max-h-40">
+                                                        {currentWorkflow.steps[selectedStepIndex].examChanges?.length ? (
+                                                            currentWorkflow.steps[selectedStepIndex].examChanges!.map((change, index) => (
+                                                                <p key={index} className="text-sm text-gray-500 mb-2">
+                                                                    {change}
+                                                                </p>
+                                                            ))
+                                                        ) : (
+                                                            <p className="text-normal text-opacity-70 text-gray-500">No changes made so far.</p>
+                                                        )}
+                                                    </div>
+                                                </motion.div>
+                                            )}
+                                        </AnimatePresence>
+                                    </div>
+
+                                    <hr className="my-4 h-[4px] bg-mti-purple-ultralight rounded-full w-full" />
+
+                                    <textarea
+                                        value={comments}
+                                        onChange={(e) => setComments(e.target.value)}
+                                        placeholder="Input comments here"
+                                        className="w-full h-40 p-2 border-2 rounded-xl shadow-lg focus:border-mti-purple focus:outline-none mt-3 resize-none"
+                                    />
+
+                                    <Button
+                                        type="submit"
+                                        color="purple"
+                                        variant="solid"
+                                        onClick={handleSaveComments}
+                                        disabled={isLoading}
+                                        padding="px-6 py-2"
+                                        className="mt-6 mb-3 w-full text-lg flex items-center justify-center gap-2 text-left"
+                                    >
+                                        {isLoading ? (
+                                            <>
+                                                <FaSpinner className="animate-spin size-5" />
+                                                Loading...
+                                            </>
+                                        ) : (
+                                            <>
+                                                <FiSave size={20} />
+                                                Save Comments
+                                            </>
+                                        )}
+                                    </Button>
+
+                                    <hr className="my-4 h-[4px] bg-mti-purple-ultralight rounded-full w-full" />
+
+                                </div>
+                            </motion.div>
+                        )}
+                    </section>
+                </LayoutGroup>
+            </AnimatePresence>
+        </>
+    );
+}

src/pages/approval-workflows/create.tsx

@@ -0,0 +1,415 @@
+import Tip from "@/components/ApprovalWorkflows/Tip";
+import WorkflowForm from "@/components/ApprovalWorkflows/WorkflowForm";
+import Button from "@/components/Low/Button";
+import Input from "@/components/Low/Input";
+import Select from "@/components/Low/Select";
+import { ApprovalWorkflow, EditableApprovalWorkflow } from "@/interfaces/approval.workflow";
+import { Entity } from "@/interfaces/entity";
+import { CorporateUser, DeveloperUser, MasterCorporateUser, TeacherUser, User } from "@/interfaces/user";
+import { sessionOptions } from "@/lib/session";
+import { mapBy, redirect, serialize } from "@/utils";
+import { requestUser } from "@/utils/api";
+import { getApprovalWorkflowsByEntities } from "@/utils/approval.workflows.be";
+import { getEntitiesWithRoles } from "@/utils/entities.be";
+import { shouldRedirectHome } from "@/utils/navigation.disabled";
+import { findAllowedEntities } from "@/utils/permissions";
+import { isAdmin } from "@/utils/users";
+import { getEntitiesUsers } from "@/utils/users.be";
+import axios from "axios";
+import { AnimatePresence, LayoutGroup, motion } from "framer-motion";
+import { withIronSessionSsr } from "iron-session/next";
+import Head from "next/head";
+import Link from "next/link";
+import { useRouter } from "next/router";
+import { useEffect, useState } from "react";
+import { BsChevronLeft, BsTrash } from "react-icons/bs";
+import { FaRegClone } from "react-icons/fa6";
+import { MdFormatListBulletedAdd } from "react-icons/md";
+import { toast, ToastContainer } from "react-toastify";
+import { v4 as uuidv4 } from 'uuid';
+
+export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
+    const user = await requestUser(req, res)
+    if (!user) return redirect("/login")
+
+    if (shouldRedirectHome(user) || !["admin", "developer", "teacher", "corporate", "mastercorporate"].includes(user.type))
+        return redirect("/")
+
+    const entityIDS = mapBy(user.entities, "id");
+    const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDS);
+    const userEntitiesWithLabel = findAllowedEntities(user, entities, "configure_workflows");
+
+    const allConfiguredWorkflows = await getApprovalWorkflowsByEntities("configured-workflows", userEntitiesWithLabel.map(entity => entity.id));
+
+    const approverTypes = ["teacher", "corporate", "mastercorporate"];
+
+    if (user.type === "developer") {
+        approverTypes.push("developer");
+    }
+
+    const userEntitiesApprovers = await getEntitiesUsers(userEntitiesWithLabel.map(entity => entity.id), { type: { $in: approverTypes } }) as (TeacherUser | CorporateUser | MasterCorporateUser | DeveloperUser)[];
+
+    return {
+        props: serialize({
+            user,
+            allConfiguredWorkflows,
+            userEntitiesWithLabel,
+            userEntitiesApprovers,
+        }),
+    };
+}, sessionOptions);
+
+interface Props {
+    user: User,
+    allConfiguredWorkflows: EditableApprovalWorkflow[],
+    userEntitiesWithLabel: Entity[],
+    userEntitiesApprovers: (TeacherUser | CorporateUser | MasterCorporateUser | DeveloperUser)[],
+}
+
+export default function Home({ user, allConfiguredWorkflows, userEntitiesWithLabel, userEntitiesApprovers }: Props) {
+    const [workflows, setWorkflows] = useState<EditableApprovalWorkflow[]>(allConfiguredWorkflows);
+    const [selectedWorkflowId, setSelectedWorkflowId] = useState<string | undefined>(undefined);
+    const [entityId, setEntityId] = useState<string | null | undefined>(null);
+    const [entityApprovers, setEntityApprovers] = useState<(TeacherUser | CorporateUser | MasterCorporateUser | DeveloperUser)[]>([]);
+    const [entityAvailableFormIntakers, setEntityAvailableFormIntakers] = useState<(TeacherUser | CorporateUser | MasterCorporateUser | DeveloperUser)[]>([]);
+    const [isAdding, setIsAdding] = useState<boolean>(false); // used to temporary timeout new workflow button. With animations, clicking too fast might cause state inconsistencies between renders.
+    const [isLoading, setIsLoading] = useState<boolean>(false);
+    const [isRedirecting, setIsRedirecting] = useState<boolean>(false);
+
+    const router = useRouter();
+
+    useEffect(() => {
+        if (entityId) {
+            setEntityApprovers(
+                userEntitiesApprovers.filter(approver =>
+                    approver.entities.some(entity => entity.id === entityId)
+                )
+            );
+        }
+    }, [entityId, userEntitiesApprovers]);
+
+    useEffect(() => {
+        if (entityId) {
+            // Get all workflows for the selected entity
+            const workflowsForEntity = workflows.filter(wf => wf.entityId === entityId);
+
+            // For all workflows except the current one, collect the first step assignees
+            const assignedFormIntakers = workflowsForEntity.reduce<string[]>((acc, wf) => {
+                if (wf.id === selectedWorkflowId) return acc; // skip current workflow so its selection isn’t removed
+
+                const formIntakeStep = wf.steps.find(step => step.stepType === "form-intake");
+                if (formIntakeStep) {
+                    // Only consider non-null assignees
+                    const validAssignees = formIntakeStep.assignees.filter(
+                        (assignee): assignee is string => !!assignee
+                    );
+                    return acc.concat(validAssignees);
+                }
+                return acc;
+            }, []);
+
+            // Now filter out any user from entityApprovers whose id is in the assignedFormIntakers list.
+            // (The selected one in the current workflow is allowed even if it is in the list.)
+            const availableFormIntakers = entityApprovers.filter(assignee =>
+                !assignedFormIntakers.includes(assignee.id)
+            );
+
+            setEntityAvailableFormIntakers(availableFormIntakers);
+        }
+    }, [entityId, entityApprovers, workflows, selectedWorkflowId]);
+
+
+    const currentWorkflow = workflows.find(wf => wf.id === selectedWorkflowId);
+
+    const ENTITY_OPTIONS = userEntitiesWithLabel.map(entity => ({
+        label: entity.label,
+        value: entity.id,
+        filter: (x: EditableApprovalWorkflow) => x.entityId === entity.id,
+    }));
+
+    const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
+        e.preventDefault();
+        setIsLoading(true);
+
+        if (workflows.length === 0) {
+            setIsLoading(false);
+            return;
+        }
+
+        for (const workflow of workflows) {
+            for (const step of workflow.steps) {
+                if (step.assignees.every(x => !x)) {
+                    toast.warning("There are empty steps in at least one of the configured workflows.");
+                    setIsLoading(false);
+                    return;
+                }
+            }
+        }
+
+        const filteredWorkflows: ApprovalWorkflow[] = workflows.map(workflow => ({
+            ...workflow,
+            steps: workflow.steps.map(step => ({
+                ...step,
+                assignees: step.assignees.filter((assignee): assignee is string => assignee !== null && assignee !== undefined)
+            }))
+        }));
+
+        const requestData = { filteredWorkflows, userEntitiesWithLabel };
+
+        axios
+            .post(`/api/approval-workflows/create`, requestData)
+            .then(() => {
+                toast.success("Approval Workflows created successfully.");
+                setIsRedirecting(true);
+                router.push("/approval-workflows");
+            })
+            .catch((reason) => {
+                if (reason.response.status === 401) {
+                    toast.error("Not logged in!");
+                }
+                else if (reason.response.status === 403) {
+                    toast.error("You do not have permission to create Approval Workflows!");
+                }
+                else {
+                    toast.error("Something went wrong, please try again later.");
+                }
+                setIsLoading(false);
+                console.log("Submitted Values:", filteredWorkflows);
+                return;
+            })
+    };
+
+    const handleAddNewWorkflow = () => {
+        if (isAdding) return;
+        setIsAdding(true);
+
+        const newId = uuidv4(); // this id is only used in UI. it is ommited on submission to DB and lets mongo handle unique id.
+        const newWorkflow: EditableApprovalWorkflow = {
+            id: newId,
+            name: "",
+            entityId: "",
+            modules: [],
+            requester: user.id,
+            startDate: Date.now(),
+            status: "pending",
+            steps: [
+                { key: 9998, stepType: "form-intake", stepNumber: 1, completed: false, firstStep: true, finalStep: false, assignees: [null] },
+                { key: 9999, stepType: "approval-by", stepNumber: 2, completed: false, firstStep: false, finalStep: true, assignees: [null] },
+            ],
+        };
+        setWorkflows((prev) => [...prev, newWorkflow]);
+        handleSelectWorkflow(newId);
+
+        setTimeout(() => setIsAdding(false), 300);
+    };
+
+    const onWorkflowChange = (updatedWorkflow: EditableApprovalWorkflow) => {
+        setWorkflows(prev =>
+            prev.map(wf => (wf.id === updatedWorkflow.id ? updatedWorkflow : wf))
+        );
+    }
+
+    const handleSelectWorkflow = (id: string | undefined) => {
+        setSelectedWorkflowId(id);
+        const selectedWorkflow = workflows.find(wf => wf.id === id);
+        if (selectedWorkflow) {
+            setEntityId(selectedWorkflow.entityId || null);
+        } else {
+            setEntityId(null);
+        }
+    };
+
+    const handleCloneWorkflow = (id: string) => {
+        const workflowToClone = workflows.find(wf => wf.id === id);
+        if (!workflowToClone) return;
+
+        const newId = uuidv4();
+
+        const clonedWorkflow: EditableApprovalWorkflow = {
+            ...workflowToClone,
+            id: newId,
+            steps: workflowToClone.steps.map(step => ({
+                ...step,
+                assignees: step.firstStep ? [null] : [...step.assignees], // we can't have more than one form intaker per teacher per entity
+            })),
+        };
+
+        setWorkflows(prev => {
+            const updatedWorkflows = [...prev, clonedWorkflow];
+            setSelectedWorkflowId(newId);
+            setEntityId(clonedWorkflow.entityId || null);
+            return updatedWorkflows;
+        });
+    };
+
+    const handleDeleteWorkflow = (id: string) => {
+        if (!confirm(`Are you sure you want to delete this Approval Workflow?`)) return;
+
+        const updatedWorkflows = workflows.filter(wf => wf.id !== id);
+
+        setWorkflows(updatedWorkflows);
+
+        if (selectedWorkflowId === id) {
+            handleSelectWorkflow(updatedWorkflows.find(wf => wf.id)?.id);
+        }
+    };
+
+    const handleEntityChange = (wf: EditableApprovalWorkflow, entityId: string) => {
+        const updatedWorkflow = {
+            ...wf,
+            entityId: entityId,
+            steps: wf.steps.map(step => ({
+                ...step,
+                assignees: step.assignees.map(() => null)
+            }))
+        }
+        onWorkflowChange(updatedWorkflow);
+    }
+
+    return (
+        <>
+            <Head>
+                <title> Configure Workflows | EnCoach</title>
+                <meta
+                    name="description"
+                    content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+                />
+                <meta name="viewport" content="width=device-width, initial-scale=1" />
+                <link rel="icon" href="/favicon.ico" />
+            </Head>
+            <ToastContainer />
+            <section className="flex flex-col">
+                <div className="flex items-center gap-2">
+                    <Link
+                        href="/approval-workflows"
+                        className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl">
+                        <BsChevronLeft />
+                    </Link>
+                    <h1 className="text-2xl font-semibold">{"Configure Approval Workflows"}</h1>
+                </div>
+            </section>
+
+            <Tip text="Setting a teacher as a Form Intaker means the configured workflow will be instantiated when said teacher publishes an exam. Only one Form Intake per teacher per entity is allowed." />
+
+            <section className="flex flex-row gap-6">
+                <Button
+                    color="purple"
+                    variant="solid"
+                    onClick={handleAddNewWorkflow}
+                    className="min-w-fit max-h-fit text-lg font-medium flex items-center gap-2 text-left"
+                >
+                    <MdFormatListBulletedAdd className="size-6" />
+                    Add New Workflow
+                </Button>
+
+                {workflows.length !== 0 && <div className="bg-gray-300 w-[1px]"></div>}
+
+                <div className="flex flex-wrap gap-2">
+                    {workflows.map((workflow) => (
+                        <Button
+                            key={workflow.id}
+                            color="purple"
+                            variant={
+                                selectedWorkflowId === workflow.id
+                                    ? "solid"
+                                    : "outline"
+                            }
+                            onClick={() => handleSelectWorkflow(workflow.id)}
+                            className="min-w-fit text-lg font-medium flex items-center gap-2 text-left"
+                        >
+                            {workflow.name.trim() === "" ? "Workflow" : workflow.name}
+                        </Button>
+
+                    ))}
+                </div>
+            </section>
+
+            <form onSubmit={handleSubmit}>
+                {currentWorkflow && (
+                    <>
+                        <div className="mb-8 flex flex-row gap-6 items-end">
+                            <Input
+                                label="Name:"
+                                type="text"
+                                name={currentWorkflow.name}
+                                placeholder="Enter workflow name"
+                                value={currentWorkflow.name}
+                                onChange={(updatedName) => {
+                                    const updatedWorkflow = {
+                                        ...currentWorkflow,
+                                        name: updatedName,
+                                    };
+                                    onWorkflowChange(updatedWorkflow);
+                                }}
+                            />
+                            <Select
+                                label="Entity:"
+                                options={ENTITY_OPTIONS}
+                                value={
+                                    currentWorkflow.entityId === ""
+                                        ? null
+                                        : ENTITY_OPTIONS.find(option => option.value === currentWorkflow.entityId)
+                                }
+                                onChange={(selectedEntity) => {
+                                    if (currentWorkflow.entityId) {
+                                        if (!confirm("Clearing or changing entity will clear all the assignees for all steps in this workflow. Are you sure you want to proceed?")) return;
+                                    }
+                                    if (selectedEntity?.value) {
+                                        setEntityId(selectedEntity.value);
+                                        handleEntityChange(currentWorkflow, selectedEntity.value);
+                                    }
+                                }}
+                                isClearable
+                                placeholder="Enter workflow entity"
+                            />
+                            <Button
+                                color="gray"
+                                variant="solid"
+                                onClick={() => handleCloneWorkflow(currentWorkflow.id)}
+                                type="button"
+                                className="min-w-fit h-[72px] text-lg font-medium flex items-center gap-2 text-left"
+                            >
+                                Clone Workflow
+                                <FaRegClone className="size-6" />
+                            </Button>
+                            <Button
+                                color="red"
+                                variant="solid"
+                                onClick={() => handleDeleteWorkflow(currentWorkflow.id)}
+                                type="button"
+                                className="min-w-fit h-[72px] text-lg font-medium flex items-center gap-2 text-left"
+                            >
+                                Delete Workflow
+                                <BsTrash className="size-6" />
+                            </Button>
+                        </div>
+
+                        <AnimatePresence mode="wait">
+                            <LayoutGroup key={currentWorkflow.id}>
+                                <motion.div
+                                    key="form"
+                                    initial={{ opacity: 0, y: -30 }}
+                                    animate={{ opacity: 1, y: 0 }}
+                                    exit={{ opacity: 0, x: 60 }}
+                                    transition={{ duration: 0.20 }}
+                                >
+                                    {(!currentWorkflow.name || !currentWorkflow.entityId) && (
+                                        <Tip text="Please fill in workflow name and associated entity to start configuring workflow." />
+                                    )}
+                                    <WorkflowForm
+                                        workflow={currentWorkflow}
+                                        onWorkflowChange={onWorkflowChange}
+                                        entityApprovers={entityApprovers}
+                                        entityAvailableFormIntakers={entityAvailableFormIntakers}
+                                        isLoading={isLoading}
+                                        isRedirecting={isRedirecting}
+                                    />
+                                </motion.div>
+                            </LayoutGroup>
+                        </AnimatePresence>
+                    </>
+                )}
+            </form>
+        </>
+    );
+}

src/pages/approval-workflows/index.tsx

@@ -0,0 +1,401 @@
+import Tip from "@/components/ApprovalWorkflows/Tip";
+import Layout from "@/components/High/Layout";
+import Button from "@/components/Low/Button";
+import Input from "@/components/Low/Input";
+import Select from "@/components/Low/Select";
+import useApprovalWorkflows from "@/hooks/useApprovalWorkflows";
+import { useAllowedEntities, useAllowedEntitiesSomePermissions, useEntityPermission } from "@/hooks/useEntityPermissions";
+import { Module, ModuleTypeLabels } from "@/interfaces";
+import { ApprovalWorkflow, ApprovalWorkflowStatus, ApprovalWorkflowStatusLabel, StepTypeLabel } from "@/interfaces/approval.workflow";
+import { Entity, EntityWithRoles } from "@/interfaces/entity";
+import { User } from "@/interfaces/user";
+import { sessionOptions } from "@/lib/session";
+import { mapBy, redirect, serialize } from "@/utils";
+import { requestUser } from "@/utils/api";
+import { getApprovalWorkflows } from "@/utils/approval.workflows.be";
+import { getEntities, getEntitiesWithRoles } from "@/utils/entities.be";
+import { shouldRedirectHome } from "@/utils/navigation.disabled";
+import { doesEntityAllow, findAllowedEntities } from "@/utils/permissions";
+import { isAdmin } from "@/utils/users";
+import { getSpecificUsers } from "@/utils/users.be";
+import { createColumnHelper, flexRender, getCoreRowModel, useReactTable } from "@tanstack/react-table";
+import axios from "axios";
+import clsx from "clsx";
+import { withIronSessionSsr } from "iron-session/next";
+import Head from "next/head";
+import Link from "next/link";
+import { useRouter } from "next/router";
+import { useEffect, useState } from "react";
+import { BsTrash } from "react-icons/bs";
+import { FaRegEdit } from "react-icons/fa";
+import { IoIosAddCircleOutline } from "react-icons/io";
+import { toast, ToastContainer } from "react-toastify";
+
+const StatusClassNames: { [key in ApprovalWorkflowStatus]: string } = {
+	approved:
+		"bg-green-100 text-green-800 border border-green-300 before:content-[''] before:w-2 before:h-2 before:bg-green-500 before:rounded-full before:inline-block before:mr-2",
+	pending:
+		"bg-orange-100 text-orange-800 border border-orange-300 before:content-[''] before:w-2 before:h-2 before:bg-orange-500 before:rounded-full before:inline-block before:mr-2",
+	rejected:
+		"bg-red-100 text-red-800 border border-red-300 before:content-[''] before:w-2 before:h-2 before:bg-red-500 before:rounded-full before:inline-block before:mr-2",
+};
+
+type CustomStatus = ApprovalWorkflowStatus | undefined;
+type CustomEntity = EntityWithRoles["id"] | undefined;
+
+const STATUS_OPTIONS = [
+	{
+		label: "Approved",
+		value: "approved",
+		filter: (x: ApprovalWorkflow) => x.status === "approved",
+	},
+	{
+		label: "Pending",
+		value: "pending",
+		filter: (x: ApprovalWorkflow) => x.status === "pending",
+	},
+	{
+		label: "Rejected",
+		value: "rejected",
+		filter: (x: ApprovalWorkflow) => x.status === "rejected",
+	},
+];
+
+const columnHelper = createColumnHelper<ApprovalWorkflow>();
+
+export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
+	const user = await requestUser(req, res);
+	if (!user) return redirect("/login");
+
+	if (shouldRedirectHome(user) || !["admin", "developer", "teacher", "corporate", "mastercorporate"].includes(user.type)) return redirect("/");
+
+	const workflows = await getApprovalWorkflows("active-workflows");
+
+	const allAssigneeIds: string[] = [
+		...new Set(
+			workflows
+				.map(workflow => workflow.steps
+					.map(step => step.assignees)
+					.flat()
+				).flat()
+		)
+	];
+
+	const entityIDS = mapBy(user.entities, "id");
+	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDS);
+	const allowedEntities = findAllowedEntities(user, entities, "view_workflows");
+
+	return {
+		props: serialize({
+			user,
+			initialWorkflows: workflows,
+			workflowsAssignees: await getSpecificUsers(allAssigneeIds),
+			userEntitiesWithLabel: allowedEntities,
+		}),
+	};
+}, sessionOptions);
+
+interface Props {
+	user: User;
+	initialWorkflows: ApprovalWorkflow[];
+	workflowsAssignees: User[];
+	userEntitiesWithLabel: EntityWithRoles[];
+}
+
+export default function ApprovalWorkflows({ user, initialWorkflows, workflowsAssignees, userEntitiesWithLabel }: Props) {
+	const { workflows, reload } = useApprovalWorkflows();
+	const currentWorkflows = workflows || initialWorkflows;
+
+	const [filteredWorkflows, setFilteredWorkflows] = useState<ApprovalWorkflow[]>([]);
+
+	const [statusFilter, setStatusFilter] = useState<CustomStatus>(undefined);
+	const [entityFilter, setEntityFilter] = useState<CustomEntity>(undefined);
+	const [nameFilter, setNameFilter] = useState<string>("");
+
+	const router = useRouter();
+
+	/* const allowedEntities = useAllowedEntities(user, userEntitiesWithLabel, "view_workflows");
+	const allowedSomeEntities = useAllowedEntitiesSomePermissions(user, userEntitiesWithLabel, ["view_workflows", "create_workflow"]); */
+
+	const ENTITY_OPTIONS = [
+		...userEntitiesWithLabel
+			.map((entity) => ({
+				label: entity.label,
+				value: entity.id,
+				filter: (x: ApprovalWorkflow) => x.entityId === entity.id,
+			}))
+			.sort((a, b) => a.label.localeCompare(b.label)),
+	];
+
+	useEffect(() => {
+		const filters: Array<(workflow: ApprovalWorkflow) => boolean> = [];
+
+		if (statusFilter && statusFilter !== undefined) {
+			const statusOption = STATUS_OPTIONS.find((x) => x.value === statusFilter);
+			if (statusOption && statusOption.filter) {
+				filters.push(statusOption.filter);
+			}
+		}
+
+		if (entityFilter && entityFilter !== undefined) {
+			const entityOption = ENTITY_OPTIONS.find((x) => x.value === entityFilter);
+			if (entityOption && entityOption.filter) {
+				filters.push(entityOption.filter);
+			}
+		}
+
+		if (nameFilter.trim() !== "") {
+			const nameFilterFunction = (workflow: ApprovalWorkflow) => workflow.name.toLowerCase().includes(nameFilter.toLowerCase());
+			filters.push(nameFilterFunction);
+		}
+
+		// Apply all filters
+		const filtered = currentWorkflows.filter((workflow) => filters.every((filterFn) => filterFn(workflow)));
+		setFilteredWorkflows(filtered);
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [currentWorkflows, statusFilter, entityFilter, nameFilter]);
+
+	const handleNameFilterChange = (name: ApprovalWorkflow["name"]) => {
+		setNameFilter(name);
+	};
+
+	const deleteApprovalWorkflow = (id: string | undefined, name: string) => {
+		if (id === undefined) return;
+		if (!confirm(`Are you sure you want to delete this Approval Workflow?`)) return;
+
+		axios
+			.delete(`/api/approval-workflows/${id}`)
+			.then(() => {
+				toast.success(`Successfully deleted ${name} Approval Workflow.`);
+				reload();
+			})
+			.catch((reason) => {
+				if (reason.response.status === 403) {
+					toast.error("You do not have permission to delete this Approval Workflow!");
+				} else {
+					toast.error("Something went wrong, please try again later.");
+				}
+				return;
+			});
+	};
+
+	const columns = [
+		columnHelper.accessor("name", {
+			header: "EXAM NAME",
+			cell: (info) => <span className="font-medium">{info.getValue()}</span>,
+		}),
+		columnHelper.accessor("modules", {
+			header: "MODULES",
+			cell: (info) => (
+				<div className="flex flex-wrap gap-2">
+					{info.getValue().map((module: Module, index: number) => (
+						<span
+							key={index}
+							className="inline-block rounded-full px-3 py-1 text-sm font-medium bg-indigo-100 border border-indigo-300 text-indigo-900">
+							{ModuleTypeLabels[module]}
+						</span>
+					))}
+				</div>
+			),
+		}),
+		columnHelper.accessor("status", {
+			header: "STATUS",
+			cell: (info) => (
+				<span
+					className={clsx(
+						"inline-block rounded-full px-3 py-1 text-sm font-medium text-left w-[110px]",
+						StatusClassNames[info.getValue()],
+					)}>
+					{ApprovalWorkflowStatusLabel[info.getValue()]}
+				</span>
+			),
+		}),
+		columnHelper.accessor("entityId", {
+			header: "ENTITY",
+			cell: (info) => <span className="font-medium">{userEntitiesWithLabel.find((entity) => entity.id === info.getValue())?.label}</span>,
+		}),
+		columnHelper.accessor("steps", {
+			id: "currentAssignees",
+			header: "CURRENT ASSIGNEES",
+			cell: (info) => {
+				const steps = info.row.original.steps;
+				const currentStep = steps.find((step) => !step.completed);
+				const rejected = steps.find((step) => step.rejected);
+
+				if (rejected) return "";
+
+				const assignees = currentStep?.assignees.map((assigneeId) => {
+					const assignee = workflowsAssignees.find((user) => user.id === assigneeId);
+					return assignee?.name || "Unknown Assignee";
+				});
+
+				return (
+					<div className="flex flex-wrap gap-2">
+						{assignees?.map((assigneeName: string, index: number) => (
+							<span
+								key={index}
+								className="inline-block rounded-full px-3 py-1 text-sm font-medium bg-gray-100 border border-gray-300 text-gray-900">
+								{assigneeName}
+							</span>
+						))}
+					</div>
+				);
+			},
+		}),
+		columnHelper.accessor("steps", {
+			id: "currentStep",
+			header: "CURRENT STEP",
+			cell: (info) => {
+				const steps = info.row.original.steps;
+				const currentStep = steps.find((step) => !step.completed);
+				const rejected = steps.find((step) => step.rejected);
+
+				return (
+					<span className="font-medium">
+						{currentStep && !rejected ? `Step ${currentStep.stepNumber}: ${StepTypeLabel[currentStep.stepType]}` : "Completed"}
+					</span>
+				);
+			},
+		}),
+		columnHelper.accessor("steps", {
+			header: "ACTIONS",
+			id: "actions",
+			cell: ({ row }) => {
+				const steps = row.original.steps;
+				const currentStep = steps.find((step) => !step.completed);
+				const rejected = steps.find((step) => step.rejected);
+
+				return (
+					<div className="flex gap-4">
+						<button
+							data-tip="Delete"
+							className="cursor-pointer tooltip"
+							disabled={!doesEntityAllow(user, userEntitiesWithLabel.find(entity => entity.id === row.original.entityId)!, "delete_workflow")}
+							onClick={(e) => {
+								e.stopPropagation();
+								deleteApprovalWorkflow(row.original._id?.toString(), row.original.name);
+							}}>
+							<BsTrash className="hover:text-mti-purple-light transition ease-in-out duration-300" />
+						</button>
+
+						{currentStep && !rejected && (
+							<button
+								data-tip="Edit"
+								className="cursor-pointer tooltip"
+								disabled={!doesEntityAllow(user, userEntitiesWithLabel.find(entity => entity.id === row.original.entityId)!, "edit_workflow")}
+								onClick={(e) => {
+									e.stopPropagation();
+									router.push(`/approval-workflows/${row.original._id?.toString()}/edit`);
+								}}>
+								<FaRegEdit className="hover:text-mti-purple-light transition ease-in-out duration-300" />
+							</button>
+						)}
+					</div>
+				);
+			},
+		}),
+	];
+
+	const table = useReactTable({
+		data: filteredWorkflows,
+		columns: columns,
+		getCoreRowModel: getCoreRowModel(),
+	});
+
+	return (
+		<>
+			<Head>
+				<title>Approval Workflows Panel | EnCoach</title>
+				<meta
+					name="description"
+					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+				/>
+				<meta name="viewport" content="width=device-width, initial-scale=1" />
+				<link rel="icon" href="/favicon.ico" />
+			</Head>
+			<ToastContainer />
+			<h1 className="text-2xl font-semibold">Approval Workflows</h1>
+
+			<div className="flex flex-row">
+				<Link href={"/approval-workflows/create"}>
+					<Button color="purple" variant="solid" className="min-w-fit text-lg font-medium flex items-center gap-2 text-left">
+						<IoIosAddCircleOutline className="size-6" />
+						Configure Workflows
+					</Button>
+				</Link>
+			</div>
+
+			<div className="flex w-full items-center gap-4">
+				<div className="flex w-full flex-col gap-3">
+					<label className="text-mti-gray-dim text-base font-normal">Name</label>
+					<Input name="nameFilter" type="text" value={nameFilter} onChange={handleNameFilterChange} placeholder="Filter by name..." />
+				</div>
+				<div className="flex w-full flex-col gap-3">
+					<label className="text-mti-gray-dim text-base font-normal">Status</label>
+					<Select
+						options={STATUS_OPTIONS}
+						value={STATUS_OPTIONS.find((x) => x.value === statusFilter)}
+						onChange={(value) => setStatusFilter((value?.value as ApprovalWorkflowStatus) ?? undefined)}
+						isClearable
+						placeholder="Filter by status..."
+					/>
+				</div>
+				<div className="flex w-full flex-col gap-3">
+					<label className="text-mti-gray-dim text-base font-normal">Entity</label>
+					<Select
+						options={ENTITY_OPTIONS}
+						value={ENTITY_OPTIONS.find((x) => x.value === entityFilter)}
+						onChange={(value) => setEntityFilter((value?.value as CustomEntity) ?? undefined)}
+						isClearable
+						placeholder="Filter by entity..."
+					/>
+				</div>
+			</div>
+
+			<Tip text="An exam submission will instantiate the approval workflow configured for the exam author. The exam will be valid only when all the steps of the workflow have been approved."></Tip>
+
+			<div className="px-6 pb-4 bg-mti-purple-ultralight rounded-2xl border-2 border-mti-purple-light border-opacity-40">
+				<table className="w-full table-auto border-separate border-spacing-y-2" style={{ tableLayout: "auto" }}>
+					<thead>
+						{table.getHeaderGroups().map((headerGroup) => (
+							<tr key={headerGroup.id}>
+								{headerGroup.headers.map((header) => (
+									<th key={header.id} className="px-3 py-2 text-left text-mti-purple-ultradark">
+										{header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+									</th>
+								))}
+							</tr>
+						))}
+					</thead>
+					<tbody>
+						{table.getRowModel().rows.map((row) => (
+							<tr
+								key={row.id}
+								onClick={() => (window.location.href = `/approval-workflows/${row.original._id?.toString()}`)}
+								style={{ cursor: "pointer" }}
+								className="bg-purple-50">
+								{row.getVisibleCells().map((cell, cellIndex) => {
+									const lastCellIndex = row.getVisibleCells().length - 1;
+
+									let cellClasses = "pl-3 pr-4 py-2 border-y-2 border-mti-purple-light border-opacity-60";
+									if (cellIndex === 0) {
+										cellClasses += " border-l-2 rounded-l-2xl";
+									}
+									if (cellIndex === lastCellIndex) {
+										cellClasses += " border-r-2 rounded-r-2xl";
+									}
+
+									return (
+										<td key={cellIndex} className={cellClasses}>
+											{flexRender(cell.column.columnDef.cell, cell.getContext())}
+										</td>
+									);
+								})}
+							</tr>
+						))}
+					</tbody>
+				</table>
+			</div>
+		</>
+	);
+}

src/pages/assignments/[id].tsx

@@ -1,104 +1,178 @@
 import Button from "@/components/Low/Button";
 import ProgressBar from "@/components/Low/ProgressBar";
-import Modal from "@/components/Modal";
-import useUsers from "@/hooks/useUsers";
 import { Grading, Module } from "@/interfaces";
 import { Assignment } from "@/interfaces/results";
-import { Group, Stat, User } from "@/interfaces/user";
+import { Stat, User } from "@/interfaces/user";
 import useExamStore from "@/stores/exam";
 import { getExamById } from "@/utils/exams";
 import { sortByModule } from "@/utils/moduleUtils";
 import { calculateBandScore, getGradingLabel } from "@/utils/score";
-import { convertToUserSolutions } from "@/utils/stats";
 import { getUserName } from "@/utils/users";
 import axios from "axios";
 import clsx from "clsx";
 import { capitalize, uniqBy } from "lodash";
 import moment from "moment";
 import { useRouter } from "next/router";
-import { BsBook, BsBuilding, BsChevronLeft, BsClipboard, BsHeadphones, BsMegaphone, BsPen } from "react-icons/bs";
+import {
+  BsBook,
+  BsBuilding,
+  BsChevronLeft,
+  BsClipboard,
+  BsHeadphones,
+  BsMegaphone,
+  BsPen,
+} from "react-icons/bs";
 import { toast } from "react-toastify";
 import { futureAssignmentFilter } from "@/utils/assignments";
 import { withIronSessionSsr } from "iron-session/next";
 import { checkAccess, doesEntityAllow } from "@/utils/permissions";
 import { mapBy, redirect, serialize } from "@/utils";
 import { getAssignment } from "@/utils/assignments.be";
-import { getEntitiesUsers, getEntityUsers, getUsers } from "@/utils/users.be";
-import { getEntitiesWithRoles, getEntityWithRoles } from "@/utils/entities.be";
-import { getGroups, getGroupsByEntities, getGroupsByEntity } from "@/utils/groups.be";
+import { getEntityUsers, getUsers } from "@/utils/users.be";
+import { getEntityWithRoles } from "@/utils/entities.be";
 import { sessionOptions } from "@/lib/session";
 import { EntityWithRoles } from "@/interfaces/entity";
 import Head from "next/head";
-import Layout from "@/components/High/Layout";
 import Separator from "@/components/Low/Separator";
 import Link from "next/link";
 import { requestUser } from "@/utils/api";
 import { useEntityPermission } from "@/hooks/useEntityPermissions";
 import { getGradingSystemByEntity } from "@/utils/grading.be";
 
-export const getServerSideProps = withIronSessionSsr(async ({ req, res, params }) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+export const getServerSideProps = withIronSessionSsr(
+  async ({ req, res, params }) => {
+    const user = await requestUser(req, res);
+    if (!user) return redirect("/login");
 
-	if (!checkAccess(user, ["admin", "developer", "corporate", "teacher", "mastercorporate"]))
-		return redirect("/assignments")
+    if (
+      !checkAccess(user, [
+        "admin",
+        "developer",
+        "corporate",
+        "teacher",
+        "mastercorporate",
+      ])
+    )
+      return redirect("/assignments");
 
-	res.setHeader("Cache-Control", "public, s-maxage=10, stale-while-revalidate=59");
+    res.setHeader(
+      "Cache-Control",
+      "public, s-maxage=10, stale-while-revalidate=59"
+    );
 
     const { id } = params as { id: string };
 
     const assignment = await getAssignment(id);
-	if (!assignment) return redirect("/assignments")
+    if (!assignment) return redirect("/assignments");
 
-	const entity = await getEntityWithRoles(assignment.entity || "")
+    const entity = await getEntityWithRoles(assignment.entity || "");
     if (!entity) {
-		const users = await getUsers()
+      const users = await getUsers(
+        {},
+        0,
+        {},
+        {
+          _id: 0,
+          id: 1,
+          name: 1,
+          email: 1,
+        }
+      );
       return { props: serialize({ user, users, assignment }) };
     }
 
-	if (!doesEntityAllow(user, entity, 'view_assignments')) return redirect("/assignments")
+    if (!doesEntityAllow(user, entity, "view_assignments"))
+      return redirect("/assignments");
 
-	const users = await (checkAccess(user, ["developer", "admin"]) ? getUsers() : getEntityUsers(entity.id));
-	const gradingSystem = await getGradingSystemByEntity(entity.id)
+    const [users, gradingSystem] = await Promise.all([
+      await (checkAccess(user, ["developer", "admin"])
+        ? getUsers(
+            {},
+            0,
+            {},
+            {
+              _id: 0,
+              id: 1,
+              name: 1,
+              email: 1,
+            }
+          )
+        : getEntityUsers(
+            entity.id,
+            0,
+            {},
+            {
+              _id: 0,
+              id: 1,
+              name: 1,
+              email: 1,
+            }
+          )),
+      getGradingSystemByEntity(entity.id),
+    ]);
 
-	return { props: serialize({ user, users, entity, assignment, gradingSystem }) };
-}, sessionOptions);
+    return {
+      props: serialize({ user, users, entity, assignment, gradingSystem }),
+    };
+  },
+  sessionOptions
+);
 
 interface Props {
   user: User;
   users: User[];
   assignment: Assignment;
-	entity?: EntityWithRoles
-	gradingSystem?: Grading
+  entity?: EntityWithRoles;
+  gradingSystem?: Grading;
 }
 
-export default function AssignmentView({ user, users, entity, assignment, gradingSystem }: Props) {
-	const canDeleteAssignment = useEntityPermission(user, entity, 'delete_assignment')
-	const canStartAssignment = useEntityPermission(user, entity, 'start_assignment')
+export default function AssignmentView({
+  user,
+  users,
+  entity,
+  assignment,
+  gradingSystem,
+}: Props) {
+  const canDeleteAssignment = useEntityPermission(
+    user,
+    entity,
+    "delete_assignment"
+  );
+  const canStartAssignment = useEntityPermission(
+    user,
+    entity,
+    "start_assignment"
+  );
 
   const router = useRouter();
 
   const dispatch = useExamStore((state) => state.dispatch);
 
   const deleteAssignment = async () => {
-		if (!canDeleteAssignment) return
+    if (!canDeleteAssignment) return;
     if (!confirm("Are you sure you want to delete this assignment?")) return;
 
     axios
       .delete(`/api/assignments/${assignment?.id}`)
-			.then(() => toast.success(`Successfully deleted the assignment "${assignment?.name}".`))
+      .then(() =>
+        toast.success(
+          `Successfully deleted the assignment "${assignment?.name}".`
+        )
+      )
       .catch(() => toast.error("Something went wrong, please try again later."))
       .finally(() => router.push("/assignments"));
   };
 
   const startAssignment = () => {
-		if (!canStartAssignment) return
+    if (!canStartAssignment) return;
     if (!confirm("Are you sure you want to start this assignment?")) return;
 
     axios
       .post(`/api/assignments/${assignment.id}/start`)
       .then(() => {
-				toast.success(`The assignment "${assignment.name}" has been started successfully!`);
+        toast.success(
+          `The assignment "${assignment.name}" has been started successfully!`
+        );
         router.replace(router.asPath);
       })
       .catch((e) => {
@@ -120,15 +194,26 @@ export default function AssignmentView({ user, users, entity, assignment, gradin
     const resultModuleBandScores = assignment.results.map((r) => {
       const moduleStats = r.stats.filter((s) => s.module === module);
 
-			const correct = moduleStats.reduce((acc, curr) => acc + curr.score.correct, 0);
-			const total = moduleStats.reduce((acc, curr) => acc + curr.score.total, 0);
+      const correct = moduleStats.reduce(
+        (acc, curr) => acc + curr.score.correct,
+        0
+      );
+      const total = moduleStats.reduce(
+        (acc, curr) => acc + curr.score.total,
+        0
+      );
       return calculateBandScore(correct, total, module, r.type);
     });
 
-		return resultModuleBandScores.length === 0 ? -1 : resultModuleBandScores.reduce((acc, curr) => acc + curr, 0) / assignment.results.length;
+    return resultModuleBandScores.length === 0
+      ? -1
+      : resultModuleBandScores.reduce((acc, curr) => acc + curr, 0) /
+          assignment.results.length;
   };
 
-	const aggregateScoresByModule = (stats: Stat[]): { module: Module; total: number; missing: number; correct: number }[] => {
+  const aggregateScoresByModule = (
+    stats: Stat[]
+  ): { module: Module; total: number; missing: number; correct: number }[] => {
     const scores: {
       [key in Module]: { total: number; missing: number; correct: number };
     } = {
@@ -159,7 +244,9 @@ export default function AssignmentView({ user, users, entity, assignment, gradin
       },
     };
 
-		stats.filter(x => !x.isPractice).forEach((x) => {
+    stats
+      .filter((x) => !x.isPractice)
+      .forEach((x) => {
         scores[x.module!] = {
           total: scores[x.module!].total + x.score.total,
           correct: scores[x.module!].correct + x.score.correct,
@@ -172,28 +259,53 @@ export default function AssignmentView({ user, users, entity, assignment, gradin
       .map((x) => ({ module: x as Module, ...scores[x as Module] }));
   };
 
-	const levelAverage = (aggregatedLevels: { module: Module, level: number }[]) =>
-		aggregatedLevels.reduce((accumulator, current) => accumulator + current.level, 0) / aggregatedLevels.length
+  const levelAverage = (
+    aggregatedLevels: { module: Module; level: number }[]
+  ) =>
+    aggregatedLevels.reduce(
+      (accumulator, current) => accumulator + current.level,
+      0
+    ) / aggregatedLevels.length;
 
-	const renderLevelScore = (stats: Stat[], aggregatedLevels: { module: Module, level: number }[]) => {
-		const defaultLevelScore = levelAverage(aggregatedLevels).toFixed(1)
-		if (!stats.every(s => s.module === "level")) return defaultLevelScore
-		if (!gradingSystem) return defaultLevelScore
+  const renderLevelScore = (
+    stats: Stat[],
+    aggregatedLevels: { module: Module; level: number }[]
+  ) => {
+    const defaultLevelScore = levelAverage(aggregatedLevels).toFixed(1);
+    if (!stats.every((s) => s.module === "level")) return defaultLevelScore;
+    if (!gradingSystem) return defaultLevelScore;
 
     const score = {
       correct: stats.reduce((acc, curr) => acc + curr.score.correct, 0),
-			total: stats.reduce((acc, curr) => acc + curr.score.total, 0)
-		}
+      total: stats.reduce((acc, curr) => acc + curr.score.total, 0),
+    };
 
-		const level: number = calculateBandScore(score.correct, score.total, "level", user.focus);
+    const level: number = calculateBandScore(
+      score.correct,
+      score.total,
+      "level",
+      user.focus
+    );
 
-		return getGradingLabel(level, gradingSystem.steps)
-	}
+    return getGradingLabel(level, gradingSystem.steps);
+  };
 
-	const customContent = (stats: Stat[], user: string, focus: "academic" | "general") => {
-		const correct = stats.reduce((accumulator, current) => accumulator + current.score.correct, 0);
-		const total = stats.reduce((accumulator, current) => accumulator + current.score.total, 0);
-		const aggregatedScores = aggregateScoresByModule(stats).filter((x) => x.total > 0);
+  const customContent = (
+    stats: Stat[],
+    user: string,
+    focus: "academic" | "general"
+  ) => {
+    const correct = stats.reduce(
+      (accumulator, current) => accumulator + current.score.correct,
+      0
+    );
+    const total = stats.reduce(
+      (accumulator, current) => accumulator + current.score.total,
+      0
+    );
+    const aggregatedScores = aggregateScoresByModule(stats).filter(
+      (x) => x.total > 0
+    );
 
     const aggregatedLevels = aggregatedScores.map((x) => ({
       module: x.module,
@@ -203,19 +315,22 @@ export default function AssignmentView({ user, users, entity, assignment, gradin
     const timeSpent = stats[0].timeSpent;
 
     const selectExam = () => {
-			const examPromises = uniqBy(stats, "exam").map((stat) => getExamById(stat.module, stat.exam));
+      const examPromises = uniqBy(stats, "exam").map((stat) =>
+        getExamById(stat.module, stat.exam)
+      );
 
       Promise.all(examPromises).then((exams) => {
         if (exams.every((x) => !!x)) {
           dispatch({
-						type: 'INIT_SOLUTIONS', payload: {
+            type: "INIT_SOLUTIONS",
+            payload: {
               exams: exams.map((x) => x!).sort(sortByModule),
               modules: exams
                 .map((x) => x!)
                 .sort(sortByModule)
                 .map((x) => x!.module),
               stats,
-						}
+            },
           });
           router.push("/exam");
         }
@@ -226,11 +341,15 @@ export default function AssignmentView({ user, users, entity, assignment, gradin
       <>
         <div className="-md:items-center flex w-full justify-between 2xl:items-center">
           <div className="-md:gap-2 -md:items-center flex md:flex-col md:gap-1 2xl:flex-row 2xl:items-center 2xl:gap-2">
-						<span className="font-medium">{formatTimestamp(stats[0].date.toString())}</span>
+            <span className="font-medium">
+              {formatTimestamp(stats[0].date.toString())}
+            </span>
             {timeSpent && (
               <>
                 <span className="md:hidden 2xl:flex">• </span>
-								<span className="text-sm">{Math.floor(timeSpent / 60)} minutes</span>
+                <span className="text-sm">
+                  {Math.floor(timeSpent / 60)} minutes
+                </span>
               </>
             )}
           </div>
@@ -238,10 +357,10 @@ export default function AssignmentView({ user, users, entity, assignment, gradin
             className={clsx(
               correct / total >= 0.7 && "text-mti-purple",
               correct / total >= 0.3 && correct / total < 0.7 && "text-mti-red",
-							correct / total < 0.3 && "text-mti-rose",
-						)}>
-						Level{' '}
-						{renderLevelScore(stats, aggregatedLevels)}
+              correct / total < 0.3 && "text-mti-rose"
+            )}
+          >
+            Level {renderLevelScore(stats, aggregatedLevels)}
           </span>
         </div>
 
@@ -256,8 +375,9 @@ export default function AssignmentView({ user, users, entity, assignment, gradin
                   module === "listening" && "bg-ielts-listening",
                   module === "writing" && "bg-ielts-writing",
                   module === "speaking" && "bg-ielts-speaking",
-									module === "level" && "bg-ielts-level",
-								)}>
+                  module === "level" && "bg-ielts-level"
+                )}
+              >
                 {module === "reading" && <BsBook className="h-4 w-4" />}
                 {module === "listening" && <BsHeadphones className="h-4 w-4" />}
                 {module === "writing" && <BsPen className="h-4 w-4" />}
@@ -284,11 +404,14 @@ export default function AssignmentView({ user, users, entity, assignment, gradin
           className={clsx(
             "border-mti-gray-platinum -md:hidden flex cursor-pointer flex-col gap-4 rounded-xl border p-4 transition duration-300 ease-in-out",
             correct / total >= 0.7 && "hover:border-mti-purple",
-						correct / total >= 0.3 && correct / total < 0.7 && "hover:border-mti-red",
-						correct / total < 0.3 && "hover:border-mti-rose",
+            correct / total >= 0.3 &&
+              correct / total < 0.7 &&
+              "hover:border-mti-red",
+            correct / total < 0.3 && "hover:border-mti-rose"
           )}
           onClick={selectExam}
-					role="button">
+          role="button"
+        >
           {content}
         </div>
         <div
@@ -296,11 +419,14 @@ export default function AssignmentView({ user, users, entity, assignment, gradin
           className={clsx(
             "border-mti-gray-platinum -md:tooltip flex cursor-pointer flex-col gap-4 rounded-xl border p-4 transition duration-300 ease-in-out md:hidden",
             correct / total >= 0.7 && "hover:border-mti-purple",
-						correct / total >= 0.3 && correct / total < 0.7 && "hover:border-mti-red",
-						correct / total < 0.3 && "hover:border-mti-rose",
+            correct / total >= 0.3 &&
+              correct / total < 0.7 &&
+              "hover:border-mti-red",
+            correct / total < 0.3 && "hover:border-mti-rose"
           )}
           data-tip="Your screen size is too small to view previous exams."
-					role="button">
+          role="button"
+        >
           {content}
         </div>
       </div>
@@ -318,29 +444,46 @@ export default function AssignmentView({ user, users, entity, assignment, gradin
   };
 
   const removeInactiveAssignees = () => {
-		const mappedResults = mapBy(assignment.results, 'user')
-		const inactiveAssignees = assignment.assignees.filter((a) => !mappedResults.includes(a))
-		const activeAssignees = assignment.assignees.filter((a) => mappedResults.includes(a))
+    const mappedResults = mapBy(assignment.results, "user");
+    const inactiveAssignees = assignment.assignees.filter(
+      (a) => !mappedResults.includes(a)
+    );
+    const activeAssignees = assignment.assignees.filter((a) =>
+      mappedResults.includes(a)
+    );
 
-		if (!confirm(`Are you sure you want to remove ${inactiveAssignees.length} assignees?`)) return
+    if (
+      !confirm(
+        `Are you sure you want to remove ${inactiveAssignees.length} assignees?`
+      )
+    )
+      return;
 
     axios
-			.patch(`/api/assignments/${assignment.id}`, { assignees: activeAssignees })
+      .patch(`/api/assignments/${assignment.id}`, {
+        assignees: activeAssignees,
+      })
       .then(() => {
-				toast.success(`The assignment "${assignment.name}" has been updated successfully!`);
+        toast.success(
+          `The assignment "${assignment.name}" has been updated successfully!`
+        );
         router.replace(router.asPath);
       })
       .catch((e) => {
         console.log(e);
         toast.error("Something went wrong, please try again later!");
       });
-	}
+  };
 
   const copyLink = async () => {
-		const origin = window.location.origin
-		await navigator.clipboard.writeText(`${origin}/exam?assignment=${assignment.id}`)
-		toast.success("The URL to the assignment has been copied to your clipboard!")
-	}
+    const origin = window.location.origin;
+    await navigator.clipboard.writeText(
+      `${origin}/exam?assignment=${assignment.id}`
+    );
+    toast.success(
+      "The URL to the assignment has been copied to your clipboard!"
+    );
+  };
 
   return (
     <>
@@ -353,11 +496,14 @@ export default function AssignmentView({ user, users, entity, assignment, gradin
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="icon" href="/favicon.ico" />
       </Head>
-			<Layout user={user}>
+      <>
         <div className="flex flex-col gap-4">
           <div className="w-full flex items-center justify-between">
             <div className="flex items-center gap-2">
-							<Link href="/assignments" className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl">
+              <Link
+                href="/assignments"
+                className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl"
+              >
                 <BsChevronLeft />
               </Link>
               <h2 className="font-bold text-2xl">{assignment.name}</h2>
@@ -376,16 +522,28 @@ export default function AssignmentView({ user, users, entity, assignment, gradin
             label={`${assignment?.results.length}/${assignment?.assignees.length} assignees completed`}
             className="h-6"
             textClassName={
-							(assignment?.results.length || 0) / (assignment?.assignees.length || 1) < 0.5
+              (assignment?.results.length || 0) /
+                (assignment?.assignees.length || 1) <
+              0.5
                 ? "!text-mti-gray-dim font-light"
                 : "text-white"
             }
-						percentage={((assignment?.results.length || 0) / (assignment?.assignees.length || 1)) * 100}
+            percentage={
+              ((assignment?.results.length || 0) /
+                (assignment?.assignees.length || 1)) *
+              100
+            }
           />
           <div className="flex items-start gap-8">
             <div className="flex flex-col gap-2">
-							<span>Start Date: {moment(assignment?.startDate).format("DD/MM/YY, HH:mm")}</span>
-							<span>End Date: {moment(assignment?.endDate).format("DD/MM/YY, HH:mm")}</span>
+              <span>
+                Start Date:{" "}
+                {moment(assignment?.startDate).format("DD/MM/YY, HH:mm")}
+              </span>
+              <span>
+                End Date:{" "}
+                {moment(assignment?.endDate).format("DD/MM/YY, HH:mm")}
+              </span>
             </div>
             <div className="flex flex-col gap-2">
               <span>
@@ -395,12 +553,18 @@ export default function AssignmentView({ user, users, entity, assignment, gradin
                   .map((u) => `${u.name} (${u.email})`)
                   .join(", ")}
               </span>
-							<span>Assigner: {getUserName(users.find((x) => x.id === assignment?.assigner))}</span>
+              <span>
+                Assigner:{" "}
+                {getUserName(users.find((x) => x.id === assignment?.assigner))}
+              </span>
             </div>
           </div>
 
-					{assignment.assignees.length !== 0 && assignment.results.length !== assignment.assignees.length && (
-						<Button onClick={removeInactiveAssignees} variant="outline">Remove Inactive Assignees</Button>
+          {assignment.assignees.length !== 0 &&
+            assignment.results.length !== assignment.assignees.length && (
+              <Button onClick={removeInactiveAssignees} variant="outline">
+                Remove Inactive Assignees
+              </Button>
             )}
 
           <div className="flex flex-col gap-2">
@@ -417,15 +581,22 @@ export default function AssignmentView({ user, users, entity, assignment, gradin
                       module === "listening" && "bg-ielts-listening",
                       module === "writing" && "bg-ielts-writing",
                       module === "speaking" && "bg-ielts-speaking",
-											module === "level" && "bg-ielts-level",
-										)}>
+                      module === "level" && "bg-ielts-level"
+                    )}
+                  >
                     {module === "reading" && <BsBook className="h-4 w-4" />}
-										{module === "listening" && <BsHeadphones className="h-4 w-4" />}
+                    {module === "listening" && (
+                      <BsHeadphones className="h-4 w-4" />
+                    )}
                     {module === "writing" && <BsPen className="h-4 w-4" />}
-										{module === "speaking" && <BsMegaphone className="h-4 w-4" />}
+                    {module === "speaking" && (
+                      <BsMegaphone className="h-4 w-4" />
+                    )}
                     {module === "level" && <BsClipboard className="h-4 w-4" />}
                     {calculateAverageModuleScore(module) > -1 && (
-											<span className="text-sm">{calculateAverageModuleScore(module).toFixed(1)}</span>
+                      <span className="text-sm">
+                        {calculateAverageModuleScore(module).toFixed(1)}
+                      </span>
                     )}
                   </div>
                 ))}
@@ -433,40 +604,64 @@ export default function AssignmentView({ user, users, entity, assignment, gradin
           </div>
           <div className="flex flex-col gap-2">
             <span className="text-xl font-bold">
-							Results ({assignment?.results.length}/{assignment?.assignees.length})
+              Results ({assignment?.results.length}/
+              {assignment?.assignees.length})
             </span>
             <div>
               {assignment && assignment?.results.length > 0 && (
                 <div className="grid w-full grid-cols-1 gap-4 md:grid-cols-2 xl:grid-cols-3 xl:gap-6">
-									{assignment.results.map((r) => customContent(r.stats, r.user, r.type))}
+                  {assignment.results.map((r) =>
+                    customContent(r.stats, r.user, r.type)
+                  )}
                 </div>
               )}
-							{assignment && assignment?.results.length === 0 && <span className="ml-1 font-semibold">No results yet...</span>}
+              {assignment && assignment?.results.length === 0 && (
+                <span className="ml-1 font-semibold">No results yet...</span>
+              )}
             </div>
           </div>
 
           <div className="flex gap-4 w-full items-center justify-end">
-						<Button variant="outline" color="purple" className="w-full max-w-[200px]" onClick={copyLink}>
+            <Button
+              variant="outline"
+              color="purple"
+              className="w-full max-w-[200px]"
+              onClick={copyLink}
+            >
               Copy Link
             </Button>
             {assignment &&
-							(assignment.results.length === assignment.assignees.length || moment().isAfter(moment(assignment.endDate))) && (
-								<Button variant="outline" color="red" className="w-full max-w-[200px]" onClick={deleteAssignment}>
+              (assignment.results.length === assignment.assignees.length ||
+                moment().isAfter(moment(assignment.endDate))) && (
+                <Button
+                  variant="outline"
+                  color="red"
+                  className="w-full max-w-[200px]"
+                  onClick={deleteAssignment}
+                >
                   Delete
                 </Button>
               )}
             {/** if the assignment is not deemed as active yet, display start */}
             {shouldRenderStart() && (
-							<Button variant="outline" color="green" className="w-full max-w-[200px]" onClick={startAssignment}>
+              <Button
+                variant="outline"
+                color="green"
+                className="w-full max-w-[200px]"
+                onClick={startAssignment}
+              >
                 Start
               </Button>
             )}
-						<Button onClick={() => router.push("/assignments")} className="w-full max-w-[200px]">
+            <Button
+              onClick={() => router.push("/assignments")}
+              className="w-full max-w-[200px]"
+            >
               Close
             </Button>
           </div>
         </div>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/assignments/creator/[id].tsx

@@ -1,4 +1,3 @@
-import Layout from "@/components/High/Layout";
 import Button from "@/components/Low/Button";
 import Checkbox from "@/components/Low/Checkbox";
 import Input from "@/components/Low/Input";
@@ -19,7 +18,11 @@ import { requestUser } from "@/utils/api";
 import { getAssignment } from "@/utils/assignments.be";
 import { getEntitiesWithRoles } from "@/utils/entities.be";
 import { getGroups, getGroupsByEntities } from "@/utils/groups.be";
-import { checkAccess, doesEntityAllow, findAllowedEntities } from "@/utils/permissions";
+import {
+  checkAccess,
+  doesEntityAllow,
+  findAllowedEntities,
+} from "@/utils/permissions";
 import { calculateAverageLevel } from "@/utils/score";
 import { getEntitiesUsers, getUsers } from "@/utils/users.be";
 import axios from "axios";
@@ -33,34 +36,91 @@ import { useRouter } from "next/router";
 import { generate } from "random-words";
 import { useEffect, useMemo, useState } from "react";
 import ReactDatePicker from "react-datepicker";
-import { BsBook, BsCheckCircle, BsChevronLeft, BsClipboard, BsHeadphones, BsMegaphone, BsPen, BsXCircle } from "react-icons/bs";
+import {
+  BsBook,
+  BsCheckCircle,
+  BsChevronLeft,
+  BsClipboard,
+  BsHeadphones,
+  BsMegaphone,
+  BsPen,
+  BsXCircle,
+} from "react-icons/bs";
 import { toast } from "react-toastify";
 
-export const getServerSideProps = withIronSessionSsr(async ({ req, res, params }) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+export const getServerSideProps = withIronSessionSsr(
+  async ({ req, res, params }) => {
+    const user = await requestUser(req, res);
+    if (!user) return redirect("/login");
 
-	res.setHeader("Cache-Control", "public, s-maxage=10, stale-while-revalidate=59");
+    res.setHeader(
+      "Cache-Control",
+      "public, s-maxage=10, stale-while-revalidate=59"
+    );
 
     const { id } = params as { id: string };
     const entityIDS = mapBy(user.entities, "id") || [];
+    const isAdmin = checkAccess(user, ["developer", "admin"]);
 
-	const assignment = await getAssignment(id);
-	if (!assignment) return redirect("/assignments")
+    const [assignment, entities] = await Promise.all([
+      getAssignment(id),
+      getEntitiesWithRoles(isAdmin ? undefined : entityIDS),
+    ]);
 
-	const entities = await (checkAccess(user, ["developer", "admin"]) ? getEntitiesWithRoles() : getEntitiesWithRoles(entityIDS));
-	const entity = entities.find((e) => e.id === assignment.entity)
+    if (!assignment) return redirect("/assignments");
+    const entity = entities.find((e) => e.id === assignment.entity);
 
-	if (!entity) return redirect("/assignments")
-	if (!doesEntityAllow(user, entity, 'edit_assignment')) return redirect("/assignments")
+    if (!entity) return redirect("/assignments");
 
-	const allowedEntities = findAllowedEntities(user, entities, 'edit_assignment')
+    if (!doesEntityAllow(user, entity, "edit_assignment"))
+      return redirect("/assignments");
 
-	const users = await (checkAccess(user, ["developer", "admin"]) ? getUsers() : getEntitiesUsers(mapBy(allowedEntities, 'id')));
-	const groups = await (checkAccess(user, ["developer", "admin"]) ? getGroups() : getGroupsByEntities(mapBy(allowedEntities, 'id')));
+    const allowedEntities = findAllowedEntities(
+      user,
+      entities,
+      "edit_assignment"
+    );
 
-	return { props: serialize({ user, users, entities: allowedEntities, assignment, groups }) };
-}, sessionOptions);
+    const allowEntitiesIDs = mapBy(allowedEntities, "id");
+
+    const [users, groups] = await Promise.all([
+      isAdmin
+        ? getUsers(
+            {},
+            0,
+            {},
+            {
+              _id: 0,
+              id: 1,
+              type: 1,
+              name: 1,
+              email: 1,
+              levels: 1,
+            }
+          )
+        : getEntitiesUsers(allowEntitiesIDs, {}, 0, {
+            _id: 0,
+            id: 1,
+            type: 1,
+            name: 1,
+            email: 1,
+            levels: 1,
+          }),
+      isAdmin ? getGroups() : getGroupsByEntities(allowEntitiesIDs),
+    ]);
+
+    return {
+      props: serialize({
+        user,
+        users,
+        entities: allowedEntities,
+        assignment,
+        groups,
+      }),
+    };
+  },
+  sessionOptions
+);
 
 interface Props {
   assignment: Assignment;
@@ -72,24 +132,44 @@ interface Props {
 
 const SIZE = 9;
 
-export default function AssignmentsPage({ assignment, user, users, entities, groups }: Props) {
-	const [selectedModules, setSelectedModules] = useState<Module[]>(assignment.exams.map((e) => e.module));
+export default function AssignmentsPage({
+  assignment,
+  user,
+  users,
+  entities,
+  groups,
+}: Props) {
+  const [selectedModules, setSelectedModules] = useState<Module[]>(
+    assignment.exams.map((e) => e.module)
+  );
   const [assignees, setAssignees] = useState<string[]>(assignment.assignees);
   const [teachers, setTeachers] = useState<string[]>(assignment.teachers || []);
-	const [entity, setEntity] = useState<string | undefined>(assignment.entity || entities[0]?.id);
+  const [entity, setEntity] = useState<string | undefined>(
+    assignment.entity || entities[0]?.id
+  );
   const [name, setName] = useState(assignment.name);
   const [isLoading, setIsLoading] = useState(false);
 
-	const [startDate, setStartDate] = useState<Date | null>(moment(assignment.startDate).toDate());
-	const [endDate, setEndDate] = useState<Date | null>(moment(assignment.endDate).toDate());
+  const [startDate, setStartDate] = useState<Date | null>(
+    moment(assignment.startDate).toDate()
+  );
+  const [endDate, setEndDate] = useState<Date | null>(
+    moment(assignment.endDate).toDate()
+  );
 
   const [variant, setVariant] = useState<Variant>("full");
-	const [instructorGender, setInstructorGender] = useState<InstructorGender>(assignment?.instructorGender || "varied");
+  const [instructorGender, setInstructorGender] = useState<InstructorGender>(
+    assignment?.instructorGender || "varied"
+  );
 
   const [generateMultiple, setGenerateMultiple] = useState<boolean>(false);
-	const [released, setReleased] = useState<boolean>(assignment.released || false);
+  const [released, setReleased] = useState<boolean>(
+    assignment.released || false
+  );
 
-	const [autoStart, setAutostart] = useState<boolean>(assignment.autoStart || false);
+  const [autoStart, setAutostart] = useState<boolean>(
+    assignment.autoStart || false
+  );
 
   const [useRandomExams, setUseRandomExams] = useState(true);
   const [examIDs, setExamIDs] = useState<{ id: string; module: Module }[]>([]);
@@ -97,19 +177,34 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
   const { exams } = useExams();
   const router = useRouter();
 
-	const classrooms = useMemo(() => groups.filter((e) => e.entity === entity), [entity, groups]);
+  const classrooms = useMemo(
+    () => groups.filter((e) => e.entity === entity),
+    [entity, groups]
+  );
 
-	const userStudents = useMemo(() => users.filter((x) => x.type === "student"), [users]);
-	const userTeachers = useMemo(() => users.filter((x) => x.type === "teacher"), [users]);
+  const userStudents = useMemo(
+    () => users.filter((x) => x.type === "student"),
+    [users]
+  );
+  const userTeachers = useMemo(
+    () => users.filter((x) => x.type === "teacher"),
+    [users]
+  );
 
-	const { rows: filteredStudentsRows, renderSearch: renderStudentSearch } = useListSearch([["name"], ["email"]], userStudents);
-	const { rows: filteredTeachersRows, renderSearch: renderTeacherSearch } = useListSearch([["name"], ["email"]], userTeachers);
+  const { rows: filteredStudentsRows, renderSearch: renderStudentSearch } =
+    useListSearch([["name"], ["email"]], userStudents);
+  const { rows: filteredTeachersRows, renderSearch: renderTeacherSearch } =
+    useListSearch([["name"], ["email"]], userTeachers);
 
-	const { items: studentRows, renderMinimal: renderStudentPagination } = usePagination(filteredStudentsRows, SIZE);
-	const { items: teacherRows, renderMinimal: renderTeacherPagination } = usePagination(filteredTeachersRows, SIZE);
+  const { items: studentRows, renderMinimal: renderStudentPagination } =
+    usePagination(filteredStudentsRows, SIZE);
+  const { items: teacherRows, renderMinimal: renderTeacherPagination } =
+    usePagination(filteredTeachersRows, SIZE);
 
   useEffect(() => {
-		setExamIDs((prev) => prev.filter((x) => selectedModules.includes(x.module)));
+    setExamIDs((prev) =>
+      prev.filter((x) => selectedModules.includes(x.module))
+    );
   }, [selectedModules]);
 
   useEffect(() => {
@@ -119,21 +214,33 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
 
   const toggleModule = (module: Module) => {
     const modules = selectedModules.filter((x) => x !== module);
-		setSelectedModules((prev) => (prev.includes(module) ? modules : [...modules, module]));
+    setSelectedModules((prev) =>
+      prev.includes(module) ? modules : [...modules, module]
+    );
   };
 
   const toggleAssignee = (user: User) => {
-		setAssignees((prev) => (prev.includes(user.id) ? prev.filter((a) => a !== user.id) : [...prev, user.id]));
+    setAssignees((prev) =>
+      prev.includes(user.id)
+        ? prev.filter((a) => a !== user.id)
+        : [...prev, user.id]
+    );
   };
 
   const toggleTeacher = (user: User) => {
-		setTeachers((prev) => (prev.includes(user.id) ? prev.filter((a) => a !== user.id) : [...prev, user.id]));
+    setTeachers((prev) =>
+      prev.includes(user.id)
+        ? prev.filter((a) => a !== user.id)
+        : [...prev, user.id]
+    );
   };
 
   const createAssignment = () => {
     setIsLoading(true);
 
-		(assignment ? axios.patch : axios.post)(`/api/assignments/${assignment.id}`, {
+    (assignment ? axios.patch : axios.post)(
+      `/api/assignments/${assignment.id}`,
+      {
         assignees,
         name,
         startDate,
@@ -147,9 +254,12 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
         instructorGender,
         released,
         autoStart,
-		})
+      }
+    )
       .then(() => {
-				toast.success(`The assignment "${name}" has been updated successfully!`);
+        toast.success(
+          `The assignment "${name}" has been updated successfully!`
+        );
         router.push(`/assignments/${assignment.id}`);
       })
       .catch((e) => {
@@ -160,14 +270,21 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
   };
 
   const deleteAssignment = () => {
-		if (!confirm(`Are you sure you want to delete the "${assignment.name}" assignment?`)) return;
+    if (
+      !confirm(
+        `Are you sure you want to delete the "${assignment.name}" assignment?`
+      )
+    )
+      return;
     console.log("GOT HERE");
     setIsLoading(true);
 
     axios
       .delete(`/api/assignments/${assignment.id}`)
       .then(() => {
-				toast.success(`The assignment "${name}" has been deleted successfully!`);
+        toast.success(
+          `The assignment "${name}" has been deleted successfully!`
+        );
         router.push("/assignments");
       })
       .catch((e) => {
@@ -184,7 +301,9 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
       axios
         .post(`/api/assignments/${assignment.id}/start`)
         .then(() => {
-					toast.success(`The assignment "${name}" has been started successfully!`);
+          toast.success(
+            `The assignment "${name}" has been started successfully!`
+          );
           router.push(`/assignments/${assignment.id}`);
         })
         .catch((e) => {
@@ -196,10 +315,14 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
   };
 
   const copyLink = async () => {
-		const origin = window.location.origin
-		await navigator.clipboard.writeText(`${origin}/exam?assignment=${assignment.id}`)
-		toast.success("The URL to the assignment has been copied to your clipboard!")
-	}
+    const origin = window.location.origin;
+    await navigator.clipboard.writeText(
+      `${origin}/exam?assignment=${assignment.id}`
+    );
+    toast.success(
+      "The URL to the assignment has been copied to your clipboard!"
+    );
+  };
 
   return (
     <>
@@ -212,10 +335,13 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="icon" href="/favicon.ico" />
       </Head>
-			<Layout user={user}>
+      <>
         <div className="flex flex-col gap-4">
           <div className="flex items-center gap-2">
-						<Link href="/assignments" className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl">
+            <Link
+              href="/assignments"
+              className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl"
+            >
               <BsChevronLeft />
             </Link>
             <h2 className="font-bold text-2xl">Edit {assignment.name}</h2>
@@ -225,109 +351,180 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
         <div className="w-full flex flex-col gap-4">
           <section className="w-full grid -md:grid-cols-1 md:grid-cols-3 place-items-center -md:flex-col -md:items-center -md:gap-12 justify-between gap-8 mt-8 px-8">
             <div
-							onClick={!selectedModules.includes("level") ? () => toggleModule("reading") : undefined}
+              onClick={
+                !selectedModules.includes("level")
+                  ? () => toggleModule("reading")
+                  : undefined
+              }
               className={clsx(
                 "w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
-								selectedModules.includes("reading") ? "border-mti-purple-light" : "border-mti-gray-platinum",
-							)}>
+                selectedModules.includes("reading")
+                  ? "border-mti-purple-light"
+                  : "border-mti-gray-platinum"
+              )}
+            >
               <div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-reading top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
                 <BsBook className="text-white w-7 h-7" />
               </div>
               <span className="ml-8 font-semibold">Reading</span>
-							{!selectedModules.includes("reading") && !selectedModules.includes("level") && (
+              {!selectedModules.includes("reading") &&
+                !selectedModules.includes("level") && (
                   <div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
                 )}
-							{selectedModules.includes("level") && <BsXCircle className="text-mti-red-light w-8 h-8" />}
-							{selectedModules.includes("reading") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
+              {selectedModules.includes("level") && (
+                <BsXCircle className="text-mti-red-light w-8 h-8" />
+              )}
+              {selectedModules.includes("reading") && (
+                <BsCheckCircle className="text-mti-purple-light w-8 h-8" />
+              )}
             </div>
             <div
-							onClick={!selectedModules.includes("level") ? () => toggleModule("listening") : undefined}
+              onClick={
+                !selectedModules.includes("level")
+                  ? () => toggleModule("listening")
+                  : undefined
+              }
               className={clsx(
                 "w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
-								selectedModules.includes("listening") ? "border-mti-purple-light" : "border-mti-gray-platinum",
-							)}>
+                selectedModules.includes("listening")
+                  ? "border-mti-purple-light"
+                  : "border-mti-gray-platinum"
+              )}
+            >
               <div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-listening top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
                 <BsHeadphones className="text-white w-7 h-7" />
               </div>
               <span className="ml-8 font-semibold">Listening</span>
-							{!selectedModules.includes("listening") && !selectedModules.includes("level") && (
+              {!selectedModules.includes("listening") &&
+                !selectedModules.includes("level") && (
                   <div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
                 )}
-							{selectedModules.includes("level") && <BsXCircle className="text-mti-red-light w-8 h-8" />}
-							{selectedModules.includes("listening") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
+              {selectedModules.includes("level") && (
+                <BsXCircle className="text-mti-red-light w-8 h-8" />
+              )}
+              {selectedModules.includes("listening") && (
+                <BsCheckCircle className="text-mti-purple-light w-8 h-8" />
+              )}
             </div>
             <div
               onClick={
-								(!selectedModules.includes("level") && selectedModules.length === 0) || selectedModules.includes("level")
+                (!selectedModules.includes("level") &&
+                  selectedModules.length === 0) ||
+                selectedModules.includes("level")
                   ? () => toggleModule("level")
                   : undefined
               }
               className={clsx(
                 "w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
-								selectedModules.includes("level") ? "border-mti-purple-light" : "border-mti-gray-platinum",
-							)}>
+                selectedModules.includes("level")
+                  ? "border-mti-purple-light"
+                  : "border-mti-gray-platinum"
+              )}
+            >
               <div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-level top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
                 <BsClipboard className="text-white w-7 h-7" />
               </div>
               <span className="ml-8 font-semibold">Level</span>
-							{!selectedModules.includes("level") && selectedModules.length === 0 && (
+              {!selectedModules.includes("level") &&
+                selectedModules.length === 0 && (
                   <div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
                 )}
-							{!selectedModules.includes("level") && selectedModules.length > 0 && <BsXCircle className="text-mti-red-light w-8 h-8" />}
-							{selectedModules.includes("level") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
+              {!selectedModules.includes("level") &&
+                selectedModules.length > 0 && (
+                  <BsXCircle className="text-mti-red-light w-8 h-8" />
+                )}
+              {selectedModules.includes("level") && (
+                <BsCheckCircle className="text-mti-purple-light w-8 h-8" />
+              )}
             </div>
             <div
-							onClick={!selectedModules.includes("level") ? () => toggleModule("writing") : undefined}
+              onClick={
+                !selectedModules.includes("level")
+                  ? () => toggleModule("writing")
+                  : undefined
+              }
               className={clsx(
                 "w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
-								selectedModules.includes("writing") ? "border-mti-purple-light" : "border-mti-gray-platinum",
-							)}>
+                selectedModules.includes("writing")
+                  ? "border-mti-purple-light"
+                  : "border-mti-gray-platinum"
+              )}
+            >
               <div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-writing top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
                 <BsPen className="text-white w-7 h-7" />
               </div>
               <span className="ml-8 font-semibold">Writing</span>
-							{!selectedModules.includes("writing") && !selectedModules.includes("level") && (
+              {!selectedModules.includes("writing") &&
+                !selectedModules.includes("level") && (
                   <div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
                 )}
-							{selectedModules.includes("level") && <BsXCircle className="text-mti-red-light w-8 h-8" />}
-							{selectedModules.includes("writing") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
+              {selectedModules.includes("level") && (
+                <BsXCircle className="text-mti-red-light w-8 h-8" />
+              )}
+              {selectedModules.includes("writing") && (
+                <BsCheckCircle className="text-mti-purple-light w-8 h-8" />
+              )}
             </div>
             <div
-							onClick={!selectedModules.includes("level") ? () => toggleModule("speaking") : undefined}
+              onClick={
+                !selectedModules.includes("level")
+                  ? () => toggleModule("speaking")
+                  : undefined
+              }
               className={clsx(
                 "w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
-								selectedModules.includes("speaking") ? "border-mti-purple-light" : "border-mti-gray-platinum",
-							)}>
+                selectedModules.includes("speaking")
+                  ? "border-mti-purple-light"
+                  : "border-mti-gray-platinum"
+              )}
+            >
               <div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-speaking top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
                 <BsMegaphone className="text-white w-7 h-7" />
               </div>
               <span className="ml-8 font-semibold">Speaking</span>
-							{!selectedModules.includes("speaking") && !selectedModules.includes("level") && (
+              {!selectedModules.includes("speaking") &&
+                !selectedModules.includes("level") && (
                   <div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
                 )}
-							{selectedModules.includes("level") && <BsXCircle className="text-mti-red-light w-8 h-8" />}
-							{selectedModules.includes("speaking") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
+              {selectedModules.includes("level") && (
+                <BsXCircle className="text-mti-red-light w-8 h-8" />
+              )}
+              {selectedModules.includes("speaking") && (
+                <BsCheckCircle className="text-mti-purple-light w-8 h-8" />
+              )}
             </div>
           </section>
 
           <div className="w-full grid -md:grid-cols-1 md:grid-cols-2 gap-8">
-						<Input type="text" name="name" onChange={(e) => setName(e)} defaultValue={name} label="Assignment Name" required />
+            <Input
+              type="text"
+              name="name"
+              onChange={(e) => setName(e)}
+              defaultValue={name}
+              label="Assignment Name"
+              required
+            />
             <Select
               label="Entity"
               options={entities.map((e) => ({ value: e.id, label: e.label }))}
               onChange={(v) => setEntity(v ? v.value! : undefined)}
-							defaultValue={{ value: entities[0]?.id, label: entities[0]?.label }}
+              defaultValue={{
+                value: entities[0]?.id,
+                label: entities[0]?.label,
+              }}
             />
           </div>
 
           <div className="w-full grid -md:grid-cols-1 md:grid-cols-2 gap-8">
             <div className="flex flex-col gap-2">
-							<label className="font-normal text-base text-mti-gray-dim">Limit Start Date *</label>
+              <label className="font-normal text-base text-mti-gray-dim">
+                Limit Start Date *
+              </label>
               <ReactDatePicker
                 className={clsx(
                   "p-6 w-full min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
                   "hover:border-mti-purple tooltip z-10",
-									"transition duration-300 ease-in-out",
+                  "transition duration-300 ease-in-out"
                 )}
                 popperClassName="!z-20"
                 filterTime={(date) => moment(date).isSameOrAfter(new Date())}
@@ -338,12 +535,14 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
               />
             </div>
             <div className="flex flex-col gap-2">
-							<label className="font-normal text-base text-mti-gray-dim">End Date *</label>
+              <label className="font-normal text-base text-mti-gray-dim">
+                End Date *
+              </label>
               <ReactDatePicker
                 className={clsx(
                   "p-6 w-full min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
                   "hover:border-mti-purple tooltip z-10",
-									"transition duration-300 ease-in-out",
+                  "transition duration-300 ease-in-out"
                 )}
                 popperClassName="!z-20"
                 filterTime={(date) => moment(date).isAfter(startDate)}
@@ -357,13 +556,19 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
 
           {selectedModules.includes("speaking") && (
             <div className="flex flex-col gap-3 w-full">
-							<label className="font-normal text-base text-mti-gray-dim">Speaking Instructor&apos;s Gender</label>
+              <label className="font-normal text-base text-mti-gray-dim">
+                Speaking Instructor&apos;s Gender
+              </label>
               <Select
                 value={{
                   value: instructorGender,
                   label: capitalize(instructorGender),
                 }}
-								onChange={(value) => (value ? setInstructorGender(value.value as InstructorGender) : null)}
+                onChange={(value) =>
+                  value
+                    ? setInstructorGender(value.value as InstructorGender)
+                    : null
+                }
                 disabled={!selectedModules.includes("speaking") || !!assignment}
                 options={[
                   { value: "male", label: "Male" },
@@ -383,11 +588,16 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
                 <div className="grid md:grid-cols-2 w-full gap-4">
                   {selectedModules.map((module) => (
                     <div key={module} className="flex flex-col gap-3 w-full">
-											<label className="font-normal text-base text-mti-gray-dim">{capitalize(module)} Exam</label>
+                      <label className="font-normal text-base text-mti-gray-dim">
+                        {capitalize(module)} Exam
+                      </label>
                       <Select
                         value={{
-													value: examIDs.find((e) => e.module === module)?.id || null,
-													label: examIDs.find((e) => e.module === module)?.id || "",
+                          value:
+                            examIDs.find((e) => e.module === module)?.id ||
+                            null,
+                          label:
+                            examIDs.find((e) => e.module === module)?.id || "",
                         }}
                         onChange={(value) =>
                           value
@@ -395,7 +605,9 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
                                 ...prev.filter((x) => x.module !== module),
                                 { id: value.value!, module },
                               ])
-														: setExamIDs((prev) => prev.filter((x) => x.module !== module))
+                            : setExamIDs((prev) =>
+                                prev.filter((x) => x.module !== module)
+                              )
                         }
                         options={exams
                           .filter((x) => !x.isDiagnostic && x.module === module)
@@ -409,25 +621,40 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
           )}
 
           <section className="w-full flex flex-col gap-4">
-						<span className="font-semibold">Assignees ({assignees.length} selected)</span>
+            <span className="font-semibold">
+              Assignees ({assignees.length} selected)
+            </span>
             <div className="grid grid-cols-5 gap-4">
               {classrooms.map((g) => (
                 <button
                   key={g.id}
                   onClick={() => {
-										const groupStudentIds = users.filter((u) => g.participants.includes(u.id)).map((u) => u.id);
+                    const groupStudentIds = users.reduce<string[]>((acc, u) => {
+                      if (g.participants.includes(u.id)) {
+                        acc.push(u.id);
+                      }
+                      return acc;
+                    }, []);
                     if (groupStudentIds.every((u) => assignees.includes(u))) {
-											setAssignees((prev) => prev.filter((a) => !groupStudentIds.includes(a)));
+                      setAssignees((prev) =>
+                        prev.filter((a) => !groupStudentIds.includes(a))
+                      );
                     } else {
-											setAssignees((prev) => [...prev.filter((a) => !groupStudentIds.includes(a)), ...groupStudentIds]);
+                      setAssignees((prev) => [
+                        ...prev.filter((a) => !groupStudentIds.includes(a)),
+                        ...groupStudentIds,
+                      ]);
                     }
                   }}
                   className={clsx(
                     "bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",
                     "transition duration-300 ease-in-out",
-										users.filter((u) => g.participants.includes(u.id)).every((u) => assignees.includes(u.id)) &&
-										"!bg-mti-purple-light !text-white",
-									)}>
+                    users
+                      .filter((u) => g.participants.includes(u.id))
+                      .every((u) => assignees.includes(u.id)) &&
+                      "!bg-mti-purple-light !text-white"
+                  )}
+                >
                   {g.name}
                 </button>
               ))}
@@ -445,9 +672,12 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
                   className={clsx(
                     "p-4 flex flex-col gap-2 rounded-xl border cursor-pointer w-72",
                     "transition ease-in-out duration-300",
-										assignees.includes(user.id) ? "border-mti-purple" : "border-mti-gray-platinum",
+                    assignees.includes(user.id)
+                      ? "border-mti-purple"
+                      : "border-mti-gray-platinum"
                   )}
-									key={user.id}>
+                  key={user.id}
+                >
                   <span className="flex flex-col gap-0 justify-center">
                     <span className="font-semibold">{user.name}</span>
                     <span className="text-sm opacity-80">{user.email}</span>
@@ -473,25 +703,43 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
 
           {user.type !== "teacher" && (
             <section className="w-full flex flex-col gap-3">
-							<span className="font-semibold">Teachers ({teachers.length} selected)</span>
+              <span className="font-semibold">
+                Teachers ({teachers.length} selected)
+              </span>
               <div className="grid grid-cols-5 gap-4">
                 {classrooms.map((g) => (
                   <button
                     key={g.id}
                     onClick={() => {
-											const groupStudentIds = users.filter((u) => g.participants.includes(u.id)).map((u) => u.id);
+                      const groupStudentIds = users.reduce<string[]>(
+                        (acc, u) => {
+                          if (g.participants.includes(u.id)) {
+                            acc.push(u.id);
+                          }
+                          return acc;
+                        },
+                        []
+                      );
                       if (groupStudentIds.every((u) => teachers.includes(u))) {
-												setTeachers((prev) => prev.filter((a) => !groupStudentIds.includes(a)));
+                        setTeachers((prev) =>
+                          prev.filter((a) => !groupStudentIds.includes(a))
+                        );
                       } else {
-												setTeachers((prev) => [...prev.filter((a) => !groupStudentIds.includes(a)), ...groupStudentIds]);
+                        setTeachers((prev) => [
+                          ...prev.filter((a) => !groupStudentIds.includes(a)),
+                          ...groupStudentIds,
+                        ]);
                       }
                     }}
                     className={clsx(
                       "bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",
                       "transition duration-300 ease-in-out",
-											users.filter((u) => g.participants.includes(u.id)).every((u) => teachers.includes(u.id)) &&
-											"!bg-mti-purple-light !text-white",
-										)}>
+                      users
+                        .filter((u) => g.participants.includes(u.id))
+                        .every((u) => teachers.includes(u.id)) &&
+                        "!bg-mti-purple-light !text-white"
+                    )}
+                  >
                     {g.name}
                   </button>
                 ))}
@@ -509,9 +757,12 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
                     className={clsx(
                       "p-4 flex flex-col gap-2 rounded-xl border cursor-pointer w-72",
                       "transition ease-in-out duration-300",
-											teachers.includes(user.id) ? "border-mti-purple" : "border-mti-gray-platinum",
+                      teachers.includes(user.id)
+                        ? "border-mti-purple"
+                        : "border-mti-gray-platinum"
                     )}
-										key={user.id}>
+                    key={user.id}
+                  >
                     <span className="flex flex-col gap-0 justify-center">
                       <span className="font-semibold">{user.name}</span>
                       <span className="text-sm opacity-80">{user.email}</span>
@@ -530,21 +781,40 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
           )}
 
           <div className="flex gap-4 w-full items-end">
-						<Checkbox isChecked={variant === "full"} onChange={() => setVariant((prev) => (prev === "full" ? "partial" : "full"))}>
+            <Checkbox
+              isChecked={variant === "full"}
+              onChange={() =>
+                setVariant((prev) => (prev === "full" ? "partial" : "full"))
+              }
+            >
               Full length exams
             </Checkbox>
-						<Checkbox isChecked={generateMultiple} onChange={() => setGenerateMultiple((d) => !d)}>
+            <Checkbox
+              isChecked={generateMultiple}
+              onChange={() => setGenerateMultiple((d) => !d)}
+            >
               Generate different exams
             </Checkbox>
-						<Checkbox isChecked={released} onChange={() => setReleased((d) => !d)}>
+            <Checkbox
+              isChecked={released}
+              onChange={() => setReleased((d) => !d)}
+            >
               Auto release results
             </Checkbox>
-						<Checkbox isChecked={autoStart} onChange={() => setAutostart((d) => !d)}>
+            <Checkbox
+              isChecked={autoStart}
+              onChange={() => setAutostart((d) => !d)}
+            >
               Auto start exam
             </Checkbox>
           </div>
           <div className="flex gap-4 w-full justify-end">
-						<Button variant="outline" color="purple" className="w-full max-w-[200px]" onClick={copyLink}>
+            <Button
+              variant="outline"
+              color="purple"
+              className="w-full max-w-[200px]"
+              onClick={copyLink}
+            >
               Copy Link
             </Button>
             <Button
@@ -552,7 +822,8 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
               variant="outline"
               onClick={() => router.push("/assignments")}
               disabled={isLoading}
-							isLoading={isLoading}>
+              isLoading={isLoading}
+            >
               Cancel
             </Button>
             <Button
@@ -561,7 +832,8 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
               variant="outline"
               onClick={startAssignment}
               disabled={isLoading || moment().isAfter(startDate)}
-							isLoading={isLoading}>
+              isLoading={isLoading}
+            >
               Start
             </Button>
             <Button
@@ -570,7 +842,8 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
               variant="outline"
               onClick={deleteAssignment}
               disabled={isLoading}
-							isLoading={isLoading}>
+              isLoading={isLoading}
+            >
               Delete
             </Button>
             <Button
@@ -584,12 +857,13 @@ export default function AssignmentsPage({ assignment, user, users, entities, gro
               }
               className="w-full max-w-[200px]"
               onClick={createAssignment}
-							isLoading={isLoading}>
+              isLoading={isLoading}
+            >
               Update
             </Button>
           </div>
         </div>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/assignments/creator/index.tsx

@@ -1,4 +1,3 @@
-import Layout from "@/components/High/Layout";
 import Button from "@/components/Low/Button";
 import Checkbox from "@/components/Low/Checkbox";
 import Input from "@/components/Low/Input";
@@ -33,21 +32,61 @@ import { useRouter } from "next/router";
 import { generate } from "random-words";
 import { useEffect, useMemo, useState } from "react";
 import ReactDatePicker from "react-datepicker";
-import { BsBook, BsCheckCircle, BsChevronLeft, BsClipboard, BsHeadphones, BsMegaphone, BsPen, BsXCircle } from "react-icons/bs";
+import {
+  BsBook,
+  BsCheckCircle,
+  BsChevronLeft,
+  BsClipboard,
+  BsHeadphones,
+  BsMegaphone,
+  BsPen,
+  BsXCircle,
+} from "react-icons/bs";
 import { toast } from "react-toastify";
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+  const user = await requestUser(req, res);
+  if (!user) return redirect("/login");
 
   const entityIDS = mapBy(user.entities, "id") || [];
-	const entities = await (checkAccess(user, ["developer", "admin"]) ? getEntitiesWithRoles() : getEntitiesWithRoles(entityIDS));
+  const entities = await (checkAccess(user, ["developer", "admin"])
+    ? getEntitiesWithRoles()
+    : getEntitiesWithRoles(entityIDS));
 
-	const allowedEntities = findAllowedEntities(user, entities, 'create_assignment')
-	if (allowedEntities.length === 0) return redirect("/assignments")
+  const allowedEntities = findAllowedEntities(
+    user,
+    entities,
+    "create_assignment"
+  );
+  if (allowedEntities.length === 0) return redirect("/assignments");
 
-	const users = await (isAdmin(user) ? getUsers() : getEntitiesUsers(mapBy(allowedEntities, 'id')));
-	const groups = await (isAdmin(user) ? getGroups() : getGroupsByEntities(mapBy(allowedEntities, 'id')));
+  const [users, groups] = await Promise.all([
+    isAdmin(user)
+      ? getUsers(
+          {},
+          0,
+          {},
+          {
+            _id: 0,
+            id: 1,
+            type: 1,
+            name: 1,
+            email: 1,
+            levels: 1,
+          }
+        )
+      : getEntitiesUsers(mapBy(allowedEntities, "id"), {}, 0, {
+          _id: 0,
+          id: 1,
+          type: 1,
+          name: 1,
+          email: 1,
+          levels: 1,
+        }),
+    isAdmin(user)
+      ? getGroups()
+      : getGroupsByEntities(mapBy(allowedEntities, "id")),
+  ]);
 
   return { props: serialize({ user, users, entities, groups }) };
 }, sessionOptions);
@@ -62,10 +101,17 @@ interface Props {
 
 const SIZE = 9;
 
-export default function AssignmentsPage({ user, users, groups, entities }: Props) {
+export default function AssignmentsPage({
+  user,
+  users,
+  groups,
+  entities,
+}: Props) {
   const [selectedModules, setSelectedModules] = useState<Module[]>([]);
   const [assignees, setAssignees] = useState<string[]>([]);
-	const [teachers, setTeachers] = useState<string[]>([...(user.type === "teacher" ? [user.id] : [])]);
+  const [teachers, setTeachers] = useState<string[]>([
+    ...(user.type === "teacher" ? [user.id] : []),
+  ]);
   const [entity, setEntity] = useState<string | undefined>(entities[0]?.id);
   const [name, setName] = useState(
     generate({
@@ -75,14 +121,19 @@ export default function AssignmentsPage({ user, users, groups, entities }: Props
       max: 3,
       join: " ",
       formatter: capitalize,
-		}),
+    })
   );
   const [isLoading, setIsLoading] = useState(false);
-	const [startDate, setStartDate] = useState<Date | null>(moment().add(1, "hour").toDate());
+  const [startDate, setStartDate] = useState<Date | null>(
+    moment().add(1, "hour").toDate()
+  );
 
-	const [endDate, setEndDate] = useState<Date | null>(moment().hours(23).minutes(59).add(8, "day").toDate());
+  const [endDate, setEndDate] = useState<Date | null>(
+    moment().hours(23).minutes(59).add(8, "day").toDate()
+  );
   const [variant, setVariant] = useState<Variant>("full");
-	const [instructorGender, setInstructorGender] = useState<InstructorGender>("varied");
+  const [instructorGender, setInstructorGender] =
+    useState<InstructorGender>("varied");
 
   const [generateMultiple, setGenerateMultiple] = useState<boolean>(false);
   const [released, setReleased] = useState<boolean>(false);
@@ -95,20 +146,38 @@ export default function AssignmentsPage({ user, users, groups, entities }: Props
   const { exams } = useExams();
   const router = useRouter();
 
-	const classrooms = useMemo(() => groups.filter((e) => e.entity?.id === entity), [entity, groups]);
-	const allowedUsers = useMemo(() => users.filter((u) => mapBy(u.entities, 'id').includes(entity || "")), [users, entity])
+  const classrooms = useMemo(
+    () => groups.filter((e) => e.entity?.id === entity),
+    [entity, groups]
+  );
+  const allowedUsers = useMemo(
+    () => users.filter((u) => mapBy(u.entities, "id").includes(entity || "")),
+    [users, entity]
+  );
 
-	const userStudents = useMemo(() => allowedUsers.filter((x) => x.type === "student"), [allowedUsers]);
-	const userTeachers = useMemo(() => allowedUsers.filter((x) => x.type === "teacher"), [allowedUsers]);
+  const userStudents = useMemo(
+    () => allowedUsers.filter((x) => x.type === "student"),
+    [allowedUsers]
+  );
+  const userTeachers = useMemo(
+    () => allowedUsers.filter((x) => x.type === "teacher"),
+    [allowedUsers]
+  );
 
-	const { rows: filteredStudentsRows, renderSearch: renderStudentSearch } = useListSearch([["name"], ["email"]], userStudents);
-	const { rows: filteredTeachersRows, renderSearch: renderTeacherSearch } = useListSearch([["name"], ["email"]], userTeachers);
+  const { rows: filteredStudentsRows, renderSearch: renderStudentSearch } =
+    useListSearch([["name"], ["email"]], userStudents);
+  const { rows: filteredTeachersRows, renderSearch: renderTeacherSearch } =
+    useListSearch([["name"], ["email"]], userTeachers);
 
-	const { items: studentRows, renderMinimal: renderStudentPagination } = usePagination(filteredStudentsRows, SIZE);
-	const { items: teacherRows, renderMinimal: renderTeacherPagination } = usePagination(filteredTeachersRows, SIZE);
+  const { items: studentRows, renderMinimal: renderStudentPagination } =
+    usePagination(filteredStudentsRows, SIZE);
+  const { items: teacherRows, renderMinimal: renderTeacherPagination } =
+    usePagination(filteredTeachersRows, SIZE);
 
   useEffect(() => {
-		setExamIDs((prev) => prev.filter((x) => selectedModules.includes(x.module)));
+    setExamIDs((prev) =>
+      prev.filter((x) => selectedModules.includes(x.module))
+    );
   }, [selectedModules]);
 
   useEffect(() => {
@@ -118,15 +187,25 @@ export default function AssignmentsPage({ user, users, groups, entities }: Props
 
   const toggleModule = (module: Module) => {
     const modules = selectedModules.filter((x) => x !== module);
-		setSelectedModules((prev) => (prev.includes(module) ? modules : [...modules, module]));
+    setSelectedModules((prev) =>
+      prev.includes(module) ? modules : [...modules, module]
+    );
   };
 
   const toggleAssignee = (user: User) => {
-		setAssignees((prev) => (prev.includes(user.id) ? prev.filter((a) => a !== user.id) : [...prev, user.id]));
+    setAssignees((prev) =>
+      prev.includes(user.id)
+        ? prev.filter((a) => a !== user.id)
+        : [...prev, user.id]
+    );
   };
 
   const toggleTeacher = (user: User) => {
-		setTeachers((prev) => (prev.includes(user.id) ? prev.filter((a) => a !== user.id) : [...prev, user.id]));
+    setTeachers((prev) =>
+      prev.includes(user.id)
+        ? prev.filter((a) => a !== user.id)
+        : [...prev, user.id]
+    );
   };
 
   const createAssignment = () => {
@@ -149,7 +228,9 @@ export default function AssignmentsPage({ user, users, groups, entities }: Props
         autoStart,
       })
       .then((result) => {
-				toast.success(`The assignment "${name}" has been created successfully!`);
+        toast.success(
+          `The assignment "${name}" has been created successfully!`
+        );
         router.push(`/assignments/${result.data.id}`);
       })
       .catch((e) => {
@@ -170,10 +251,13 @@ export default function AssignmentsPage({ user, users, groups, entities }: Props
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="icon" href="/favicon.ico" />
       </Head>
-			<Layout user={user}>
+      <>
         <div className="flex flex-col gap-4">
           <div className="flex items-center gap-2">
-						<Link href="/assignments" className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl">
+            <Link
+              href="/assignments"
+              className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl"
+            >
               <BsChevronLeft />
             </Link>
             <h2 className="font-bold text-2xl">Create Assignment</h2>
@@ -183,109 +267,180 @@ export default function AssignmentsPage({ user, users, groups, entities }: Props
         <div className="w-full flex flex-col gap-4">
           <section className="w-full grid -md:grid-cols-1 md:grid-cols-3 place-items-center -md:flex-col -md:items-center -md:gap-12 justify-between gap-8 mt-8 px-8">
             <div
-							onClick={!selectedModules.includes("level") ? () => toggleModule("reading") : undefined}
+              onClick={
+                !selectedModules.includes("level")
+                  ? () => toggleModule("reading")
+                  : undefined
+              }
               className={clsx(
                 "w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
-								selectedModules.includes("reading") ? "border-mti-purple-light" : "border-mti-gray-platinum",
-							)}>
+                selectedModules.includes("reading")
+                  ? "border-mti-purple-light"
+                  : "border-mti-gray-platinum"
+              )}
+            >
               <div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-reading top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
                 <BsBook className="text-white w-7 h-7" />
               </div>
               <span className="ml-8 font-semibold">Reading</span>
-							{!selectedModules.includes("reading") && !selectedModules.includes("level") && (
+              {!selectedModules.includes("reading") &&
+                !selectedModules.includes("level") && (
                   <div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
                 )}
-							{selectedModules.includes("level") && <BsXCircle className="text-mti-red-light w-8 h-8" />}
-							{selectedModules.includes("reading") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
+              {selectedModules.includes("level") && (
+                <BsXCircle className="text-mti-red-light w-8 h-8" />
+              )}
+              {selectedModules.includes("reading") && (
+                <BsCheckCircle className="text-mti-purple-light w-8 h-8" />
+              )}
             </div>
             <div
-							onClick={!selectedModules.includes("level") ? () => toggleModule("listening") : undefined}
+              onClick={
+                !selectedModules.includes("level")
+                  ? () => toggleModule("listening")
+                  : undefined
+              }
               className={clsx(
                 "w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
-								selectedModules.includes("listening") ? "border-mti-purple-light" : "border-mti-gray-platinum",
-							)}>
+                selectedModules.includes("listening")
+                  ? "border-mti-purple-light"
+                  : "border-mti-gray-platinum"
+              )}
+            >
               <div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-listening top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
                 <BsHeadphones className="text-white w-7 h-7" />
               </div>
               <span className="ml-8 font-semibold">Listening</span>
-							{!selectedModules.includes("listening") && !selectedModules.includes("level") && (
+              {!selectedModules.includes("listening") &&
+                !selectedModules.includes("level") && (
                   <div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
                 )}
-							{selectedModules.includes("level") && <BsXCircle className="text-mti-red-light w-8 h-8" />}
-							{selectedModules.includes("listening") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
+              {selectedModules.includes("level") && (
+                <BsXCircle className="text-mti-red-light w-8 h-8" />
+              )}
+              {selectedModules.includes("listening") && (
+                <BsCheckCircle className="text-mti-purple-light w-8 h-8" />
+              )}
             </div>
             <div
               onClick={
-								(!selectedModules.includes("level") && selectedModules.length === 0) || selectedModules.includes("level")
+                (!selectedModules.includes("level") &&
+                  selectedModules.length === 0) ||
+                selectedModules.includes("level")
                   ? () => toggleModule("level")
                   : undefined
               }
               className={clsx(
                 "w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
-								selectedModules.includes("level") ? "border-mti-purple-light" : "border-mti-gray-platinum",
-							)}>
+                selectedModules.includes("level")
+                  ? "border-mti-purple-light"
+                  : "border-mti-gray-platinum"
+              )}
+            >
               <div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-level top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
                 <BsClipboard className="text-white w-7 h-7" />
               </div>
               <span className="ml-8 font-semibold">Level</span>
-							{!selectedModules.includes("level") && selectedModules.length === 0 && (
+              {!selectedModules.includes("level") &&
+                selectedModules.length === 0 && (
                   <div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
                 )}
-							{!selectedModules.includes("level") && selectedModules.length > 0 && <BsXCircle className="text-mti-red-light w-8 h-8" />}
-							{selectedModules.includes("level") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
+              {!selectedModules.includes("level") &&
+                selectedModules.length > 0 && (
+                  <BsXCircle className="text-mti-red-light w-8 h-8" />
+                )}
+              {selectedModules.includes("level") && (
+                <BsCheckCircle className="text-mti-purple-light w-8 h-8" />
+              )}
             </div>
             <div
-							onClick={!selectedModules.includes("level") ? () => toggleModule("writing") : undefined}
+              onClick={
+                !selectedModules.includes("level")
+                  ? () => toggleModule("writing")
+                  : undefined
+              }
               className={clsx(
                 "w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
-								selectedModules.includes("writing") ? "border-mti-purple-light" : "border-mti-gray-platinum",
-							)}>
+                selectedModules.includes("writing")
+                  ? "border-mti-purple-light"
+                  : "border-mti-gray-platinum"
+              )}
+            >
               <div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-writing top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
                 <BsPen className="text-white w-7 h-7" />
               </div>
               <span className="ml-8 font-semibold">Writing</span>
-							{!selectedModules.includes("writing") && !selectedModules.includes("level") && (
+              {!selectedModules.includes("writing") &&
+                !selectedModules.includes("level") && (
                   <div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
                 )}
-							{selectedModules.includes("level") && <BsXCircle className="text-mti-red-light w-8 h-8" />}
-							{selectedModules.includes("writing") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
+              {selectedModules.includes("level") && (
+                <BsXCircle className="text-mti-red-light w-8 h-8" />
+              )}
+              {selectedModules.includes("writing") && (
+                <BsCheckCircle className="text-mti-purple-light w-8 h-8" />
+              )}
             </div>
             <div
-							onClick={!selectedModules.includes("level") ? () => toggleModule("speaking") : undefined}
+              onClick={
+                !selectedModules.includes("level")
+                  ? () => toggleModule("speaking")
+                  : undefined
+              }
               className={clsx(
                 "w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
-								selectedModules.includes("speaking") ? "border-mti-purple-light" : "border-mti-gray-platinum",
-							)}>
+                selectedModules.includes("speaking")
+                  ? "border-mti-purple-light"
+                  : "border-mti-gray-platinum"
+              )}
+            >
               <div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-speaking top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
                 <BsMegaphone className="text-white w-7 h-7" />
               </div>
               <span className="ml-8 font-semibold">Speaking</span>
-							{!selectedModules.includes("speaking") && !selectedModules.includes("level") && (
+              {!selectedModules.includes("speaking") &&
+                !selectedModules.includes("level") && (
                   <div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
                 )}
-							{selectedModules.includes("level") && <BsXCircle className="text-mti-red-light w-8 h-8" />}
-							{selectedModules.includes("speaking") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
+              {selectedModules.includes("level") && (
+                <BsXCircle className="text-mti-red-light w-8 h-8" />
+              )}
+              {selectedModules.includes("speaking") && (
+                <BsCheckCircle className="text-mti-purple-light w-8 h-8" />
+              )}
             </div>
           </section>
 
           <div className="w-full grid -md:grid-cols-1 md:grid-cols-2 gap-8">
-						<Input type="text" name="name" onChange={(e) => setName(e)} defaultValue={name} label="Assignment Name" required />
+            <Input
+              type="text"
+              name="name"
+              onChange={(e) => setName(e)}
+              defaultValue={name}
+              label="Assignment Name"
+              required
+            />
             <Select
               label="Entity"
               options={entities.map((e) => ({ value: e.id, label: e.label }))}
               onChange={(v) => setEntity(v ? v.value! : undefined)}
-							defaultValue={{ value: entities[0]?.id, label: entities[0]?.label }}
+              defaultValue={{
+                value: entities[0]?.id,
+                label: entities[0]?.label,
+              }}
             />
           </div>
 
           <div className="w-full grid -md:grid-cols-1 md:grid-cols-2 gap-8">
             <div className="flex flex-col gap-2">
-							<label className="font-normal text-base text-mti-gray-dim">Limit Start Date *</label>
+              <label className="font-normal text-base text-mti-gray-dim">
+                Limit Start Date *
+              </label>
               <ReactDatePicker
                 className={clsx(
                   "p-6 w-full min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
                   "hover:border-mti-purple tooltip z-10",
-									"transition duration-300 ease-in-out",
+                  "transition duration-300 ease-in-out"
                 )}
                 popperClassName="!z-20"
                 filterTime={(date) => moment(date).isSameOrAfter(new Date())}
@@ -296,12 +451,14 @@ export default function AssignmentsPage({ user, users, groups, entities }: Props
               />
             </div>
             <div className="flex flex-col gap-2">
-							<label className="font-normal text-base text-mti-gray-dim">End Date *</label>
+              <label className="font-normal text-base text-mti-gray-dim">
+                End Date *
+              </label>
               <ReactDatePicker
                 className={clsx(
                   "p-6 w-full min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
                   "hover:border-mti-purple tooltip z-10",
-									"transition duration-300 ease-in-out",
+                  "transition duration-300 ease-in-out"
                 )}
                 popperClassName="!z-20"
                 filterTime={(date) => moment(date).isAfter(startDate)}
@@ -315,13 +472,19 @@ export default function AssignmentsPage({ user, users, groups, entities }: Props
 
           {selectedModules.includes("speaking") && (
             <div className="flex flex-col gap-3 w-full">
-							<label className="font-normal text-base text-mti-gray-dim">Speaking Instructor&apos;s Gender</label>
+              <label className="font-normal text-base text-mti-gray-dim">
+                Speaking Instructor&apos;s Gender
+              </label>
               <Select
                 value={{
                   value: instructorGender,
                   label: capitalize(instructorGender),
                 }}
-								onChange={(value) => (value ? setInstructorGender(value.value as InstructorGender) : null)}
+                onChange={(value) =>
+                  value
+                    ? setInstructorGender(value.value as InstructorGender)
+                    : null
+                }
                 disabled={!selectedModules.includes("speaking")}
                 options={[
                   { value: "male", label: "Male" },
@@ -341,11 +504,16 @@ export default function AssignmentsPage({ user, users, groups, entities }: Props
                 <div className="grid md:grid-cols-2 w-full gap-4">
                   {selectedModules.map((module) => (
                     <div key={module} className="flex flex-col gap-3 w-full">
-											<label className="font-normal text-base text-mti-gray-dim">{capitalize(module)} Exam</label>
+                      <label className="font-normal text-base text-mti-gray-dim">
+                        {capitalize(module)} Exam
+                      </label>
                       <Select
                         value={{
-													value: examIDs.find((e) => e.module === module)?.id || null,
-													label: examIDs.find((e) => e.module === module)?.id || "",
+                          value:
+                            examIDs.find((e) => e.module === module)?.id ||
+                            null,
+                          label:
+                            examIDs.find((e) => e.module === module)?.id || "",
                         }}
                         onChange={(value) =>
                           value
@@ -353,7 +521,9 @@ export default function AssignmentsPage({ user, users, groups, entities }: Props
                                 ...prev.filter((x) => x.module !== module),
                                 { id: value.value!, module },
                               ])
-														: setExamIDs((prev) => prev.filter((x) => x.module !== module))
+                            : setExamIDs((prev) =>
+                                prev.filter((x) => x.module !== module)
+                              )
                         }
                         options={exams
                           .filter((x) => !x.isDiagnostic && x.module === module)
@@ -367,25 +537,40 @@ export default function AssignmentsPage({ user, users, groups, entities }: Props
           )}
 
           <section className="w-full flex flex-col gap-4">
-						<span className="font-semibold">Assignees ({assignees.length} selected)</span>
+            <span className="font-semibold">
+              Assignees ({assignees.length} selected)
+            </span>
             <div className="grid grid-cols-5 gap-4">
               {classrooms.map((g) => (
                 <button
                   key={g.id}
                   onClick={() => {
-										const groupStudentIds = users.filter((u) => g.participants.includes(u.id)).map((u) => u.id);
+                    const groupStudentIds = users.reduce<string[]>((acc, u) => {
+                      if (g.participants.includes(u.id)) {
+                        acc.push(u.id);
+                      }
+                      return acc;
+                    }, []);
                     if (groupStudentIds.every((u) => assignees.includes(u))) {
-											setAssignees((prev) => prev.filter((a) => !groupStudentIds.includes(a)));
+                      setAssignees((prev) =>
+                        prev.filter((a) => !groupStudentIds.includes(a))
+                      );
                     } else {
-											setAssignees((prev) => [...prev.filter((a) => !groupStudentIds.includes(a)), ...groupStudentIds]);
+                      setAssignees((prev) => [
+                        ...prev.filter((a) => !groupStudentIds.includes(a)),
+                        ...groupStudentIds,
+                      ]);
                     }
                   }}
                   className={clsx(
                     "bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",
                     "transition duration-300 ease-in-out",
-										users.filter((u) => g.participants.includes(u.id)).every((u) => assignees.includes(u.id)) &&
-										"!bg-mti-purple-light !text-white",
-									)}>
+                    users
+                      .filter((u) => g.participants.includes(u.id))
+                      .every((u) => assignees.includes(u.id)) &&
+                      "!bg-mti-purple-light !text-white"
+                  )}
+                >
                   {g.name}
                 </button>
               ))}
@@ -403,9 +588,12 @@ export default function AssignmentsPage({ user, users, groups, entities }: Props
                   className={clsx(
                     "p-4 flex flex-col gap-2 rounded-xl border cursor-pointer w-72",
                     "transition ease-in-out duration-300",
-										assignees.includes(user.id) ? "border-mti-purple" : "border-mti-gray-platinum",
+                    assignees.includes(user.id)
+                      ? "border-mti-purple"
+                      : "border-mti-gray-platinum"
                   )}
-									key={user.id}>
+                  key={user.id}
+                >
                   <span className="flex flex-col gap-0 justify-center">
                     <span className="font-semibold">{user.name}</span>
                     <span className="text-sm opacity-80">{user.email}</span>
@@ -431,25 +619,43 @@ export default function AssignmentsPage({ user, users, groups, entities }: Props
 
           {user.type !== "teacher" && (
             <section className="w-full flex flex-col gap-3">
-							<span className="font-semibold">Teachers ({teachers.length} selected)</span>
+              <span className="font-semibold">
+                Teachers ({teachers.length} selected)
+              </span>
               <div className="grid grid-cols-5 gap-4">
                 {classrooms.map((g) => (
                   <button
                     key={g.id}
                     onClick={() => {
-											const groupStudentIds = users.filter((u) => g.participants.includes(u.id)).map((u) => u.id);
+                      const groupStudentIds = users.reduce<string[]>(
+                        (acc, u) => {
+                          if (g.participants.includes(u.id)) {
+                            acc.push(u.id);
+                          }
+                          return acc;
+                        },
+                        []
+                      );
                       if (groupStudentIds.every((u) => teachers.includes(u))) {
-												setTeachers((prev) => prev.filter((a) => !groupStudentIds.includes(a)));
+                        setTeachers((prev) =>
+                          prev.filter((a) => !groupStudentIds.includes(a))
+                        );
                       } else {
-												setTeachers((prev) => [...prev.filter((a) => !groupStudentIds.includes(a)), ...groupStudentIds]);
+                        setTeachers((prev) => [
+                          ...prev.filter((a) => !groupStudentIds.includes(a)),
+                          ...groupStudentIds,
+                        ]);
                       }
                     }}
                     className={clsx(
                       "bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",
                       "transition duration-300 ease-in-out",
-											users.filter((u) => g.participants.includes(u.id)).every((u) => teachers.includes(u.id)) &&
-											"!bg-mti-purple-light !text-white",
-										)}>
+                      users
+                        .filter((u) => g.participants.includes(u.id))
+                        .every((u) => teachers.includes(u.id)) &&
+                        "!bg-mti-purple-light !text-white"
+                    )}
+                  >
                     {g.name}
                   </button>
                 ))}
@@ -467,9 +673,12 @@ export default function AssignmentsPage({ user, users, groups, entities }: Props
                     className={clsx(
                       "p-4 flex flex-col gap-2 rounded-xl border cursor-pointer w-72",
                       "transition ease-in-out duration-300",
-											teachers.includes(user.id) ? "border-mti-purple" : "border-mti-gray-platinum",
+                      teachers.includes(user.id)
+                        ? "border-mti-purple"
+                        : "border-mti-gray-platinum"
                     )}
-										key={user.id}>
+                    key={user.id}
+                  >
                     <span className="flex flex-col gap-0 justify-center">
                       <span className="font-semibold">{user.name}</span>
                       <span className="text-sm opacity-80">{user.email}</span>
@@ -488,16 +697,30 @@ export default function AssignmentsPage({ user, users, groups, entities }: Props
           )}
 
           <div className="flex gap-4 w-full items-end">
-						<Checkbox isChecked={variant === "full"} onChange={() => setVariant((prev) => (prev === "full" ? "partial" : "full"))}>
+            <Checkbox
+              isChecked={variant === "full"}
+              onChange={() =>
+                setVariant((prev) => (prev === "full" ? "partial" : "full"))
+              }
+            >
               Full length exams
             </Checkbox>
-						<Checkbox isChecked={generateMultiple} onChange={() => setGenerateMultiple((d) => !d)}>
+            <Checkbox
+              isChecked={generateMultiple}
+              onChange={() => setGenerateMultiple((d) => !d)}
+            >
               Generate different exams
             </Checkbox>
-						<Checkbox isChecked={released} onChange={() => setReleased((d) => !d)}>
+            <Checkbox
+              isChecked={released}
+              onChange={() => setReleased((d) => !d)}
+            >
               Auto release results
             </Checkbox>
-						<Checkbox isChecked={autoStart} onChange={() => setAutostart((d) => !d)}>
+            <Checkbox
+              isChecked={autoStart}
+              onChange={() => setAutostart((d) => !d)}
+            >
               Auto start exam
             </Checkbox>
           </div>
@@ -507,7 +730,8 @@ export default function AssignmentsPage({ user, users, groups, entities }: Props
               variant="outline"
               onClick={() => router.push("/assignments")}
               disabled={isLoading}
-							isLoading={isLoading}>
+              isLoading={isLoading}
+            >
               Cancel
             </Button>
 
@@ -523,12 +747,13 @@ export default function AssignmentsPage({ user, users, groups, entities }: Props
               }
               className="w-full max-w-[200px]"
               onClick={createAssignment}
-							isLoading={isLoading}>
+              isLoading={isLoading}
+            >
               Create
             </Button>
           </div>
         </div>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/assignments/index.tsx

@@ -1,15 +1,12 @@
-import Layout from "@/components/High/Layout";
 import Separator from "@/components/Low/Separator";
 import AssignmentCard from "@/components/AssignmentCard";
-import AssignmentView from "@/components/AssignmentView";
 import { useAllowedEntities } from "@/hooks/useEntityPermissions";
 import { useListSearch } from "@/hooks/useListSearch";
 import usePagination from "@/hooks/usePagination";
 import { EntityWithRoles } from "@/interfaces/entity";
 import { Assignment } from "@/interfaces/results";
-import { CorporateUser, Group, User } from "@/interfaces/user";
+import { User } from "@/interfaces/user";
 import { sessionOptions } from "@/lib/session";
-import { getUserCompanyName } from "@/resources/user";
 import { findBy, mapBy, redirect, serialize } from "@/utils";
 import { requestUser } from "@/utils/api";
 import {
@@ -21,71 +18,147 @@ import {
 } from "@/utils/assignments";
 import { getAssignments, getEntitiesAssignments } from "@/utils/assignments.be";
 import { getEntitiesWithRoles } from "@/utils/entities.be";
-import { getGroups, getGroupsByEntities } from "@/utils/groups.be";
 import { checkAccess, findAllowedEntities } from "@/utils/permissions";
 import { getEntitiesUsers, getUsers } from "@/utils/users.be";
 import { withIronSessionSsr } from "iron-session/next";
-import { groupBy } from "lodash";
 import Head from "next/head";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import { useMemo, useState } from "react";
+import { useMemo } from "react";
 import { BsChevronLeft, BsPlus } from "react-icons/bs";
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
-
-	if (!checkAccess(user, ["admin", "developer", "corporate", "teacher", "mastercorporate"]))
-		return redirect("/")
+  const user = await requestUser(req, res);
+  if (!user) return redirect("/login");
 
+  if (
+    !checkAccess(user, [
+      "admin",
+      "developer",
+      "corporate",
+      "teacher",
+      "mastercorporate",
+    ])
+  )
+    return redirect("/");
+  const isAdmin = checkAccess(user, ["developer", "admin"]);
   const entityIDS = mapBy(user.entities, "id") || [];
-	const entities = await (checkAccess(user, ["developer", "admin"]) ? getEntitiesWithRoles() : getEntitiesWithRoles(entityIDS));
+  const entities = await (isAdmin
+    ? getEntitiesWithRoles()
+    : getEntitiesWithRoles(entityIDS));
 
-	const allowedEntities = findAllowedEntities(user, entities, "view_assignments")
+  const allowedEntities = findAllowedEntities(
+    user,
+    entities,
+    "view_assignments"
+  );
+  const [users, assignments] = await Promise.all([
+    await (isAdmin
+      ? getUsers({}, 0, {}, { _id: 0, id: 1, name: 1 })
+      : getEntitiesUsers(mapBy(allowedEntities, "id"), {}, 0, {
+          _id: 0,
+          id: 1,
+          name: 1,
+        })),
+    await (isAdmin
+      ? getAssignments()
+      : getEntitiesAssignments(mapBy(allowedEntities, "id"))),
+  ]);
 
-	const users =
-		await (checkAccess(user, ["developer", "admin"]) ? getUsers() : getEntitiesUsers(mapBy(allowedEntities, 'id')));
-
-	const assignments =
-		await (checkAccess(user, ["developer", "admin"]) ? getAssignments() : getEntitiesAssignments(mapBy(allowedEntities, 'id')));
-
-	return { props: serialize({ user, users, entities: allowedEntities, assignments }) };
+  return {
+    props: serialize({ user, users, entities: allowedEntities, assignments }),
+  };
 }, sessionOptions);
 
 const SEARCH_FIELDS = [["name"]];
 
 interface Props {
   assignments: Assignment[];
-	entities: EntityWithRoles[]
+  entities: EntityWithRoles[];
   user: User;
   users: User[];
 }
 
-export default function AssignmentsPage({ assignments, entities, user, users }: Props) {
-	const entitiesAllowCreate = useAllowedEntities(user, entities, 'create_assignment')
-	const entitiesAllowEdit = useAllowedEntities(user, entities, 'edit_assignment')
-	const entitiesAllowArchive = useAllowedEntities(user, entities, 'archive_assignment')
+export default function AssignmentsPage({
+  assignments,
+  entities,
+  user,
+  users,
+}: Props) {
+  const entitiesAllowCreate = useAllowedEntities(
+    user,
+    entities,
+    "create_assignment"
+  );
+  const entitiesAllowEdit = useAllowedEntities(
+    user,
+    entities,
+    "edit_assignment"
+  );
+  const entitiesAllowArchive = useAllowedEntities(
+    user,
+    entities,
+    "archive_assignment"
+  );
 
-	const activeAssignments = useMemo(() => assignments.filter(activeAssignmentFilter), [assignments]);
-	const plannedAssignments = useMemo(() => assignments.filter(futureAssignmentFilter), [assignments]);
-	const pastAssignments = useMemo(() => assignments.filter(pastAssignmentFilter), [assignments]);
-	const startExpiredAssignments = useMemo(() => assignments.filter(startHasExpiredAssignmentFilter), [assignments]);
-	const archivedAssignments = useMemo(() => assignments.filter(archivedAssignmentFilter), [assignments]);
+  const activeAssignments = useMemo(
+    () => assignments.filter(activeAssignmentFilter),
+    [assignments]
+  );
+  const plannedAssignments = useMemo(
+    () => assignments.filter(futureAssignmentFilter),
+    [assignments]
+  );
+  const pastAssignments = useMemo(
+    () => assignments.filter(pastAssignmentFilter),
+    [assignments]
+  );
+  const startExpiredAssignments = useMemo(
+    () => assignments.filter(startHasExpiredAssignmentFilter),
+    [assignments]
+  );
+  const archivedAssignments = useMemo(
+    () => assignments.filter(archivedAssignmentFilter),
+    [assignments]
+  );
 
   const router = useRouter();
 
-	const { rows: activeRows, renderSearch: renderActive } = useListSearch(SEARCH_FIELDS, activeAssignments);
-	const { rows: plannedRows, renderSearch: renderPlanned } = useListSearch(SEARCH_FIELDS, plannedAssignments);
-	const { rows: pastRows, renderSearch: renderPast } = useListSearch(SEARCH_FIELDS, pastAssignments);
-	const { rows: expiredRows, renderSearch: renderExpired } = useListSearch(SEARCH_FIELDS, startExpiredAssignments);
-	const { rows: archivedRows, renderSearch: renderArchived } = useListSearch(SEARCH_FIELDS, archivedAssignments);
+  const { rows: activeRows, renderSearch: renderActive } = useListSearch(
+    SEARCH_FIELDS,
+    activeAssignments
+  );
+  const { rows: plannedRows, renderSearch: renderPlanned } = useListSearch(
+    SEARCH_FIELDS,
+    plannedAssignments
+  );
+  const { rows: pastRows, renderSearch: renderPast } = useListSearch(
+    SEARCH_FIELDS,
+    pastAssignments
+  );
+  const { rows: expiredRows, renderSearch: renderExpired } = useListSearch(
+    SEARCH_FIELDS,
+    startExpiredAssignments
+  );
+  const { rows: archivedRows, renderSearch: renderArchived } = useListSearch(
+    SEARCH_FIELDS,
+    archivedAssignments
+  );
 
-	const { items: activeItems, renderMinimal: paginationActive } = usePagination(activeRows, 16);
-	const { items: plannedItems, renderMinimal: paginationPlanned } = usePagination(plannedRows, 16);
-	const { items: pastItems, renderMinimal: paginationPast } = usePagination(pastRows, 16);
-	const { items: expiredItems, renderMinimal: paginationExpired } = usePagination(expiredRows, 16);
-	const { items: archivedItems, renderMinimal: paginationArchived } = usePagination(archivedRows, 16);
+  const { items: activeItems, renderMinimal: paginationActive } = usePagination(
+    activeRows,
+    16
+  );
+  const { items: plannedItems, renderMinimal: paginationPlanned } =
+    usePagination(plannedRows, 16);
+  const { items: pastItems, renderMinimal: paginationPast } = usePagination(
+    pastRows,
+    16
+  );
+  const { items: expiredItems, renderMinimal: paginationExpired } =
+    usePagination(expiredRows, 16);
+  const { items: archivedItems, renderMinimal: paginationArchived } =
+    usePagination(archivedRows, 16);
 
   return (
     <>
@@ -98,10 +171,13 @@ export default function AssignmentsPage({ assignments, entities, user, users }:
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="icon" href="/favicon.ico" />
       </Head>
-			<Layout user={user}>
+      <>
         <div className="flex flex-col gap-4">
           <div className="flex items-center gap-2">
-						<Link href="/dashboard" className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl">
+            <Link
+              href="/dashboard"
+              className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl"
+            >
               <BsChevronLeft />
             </Link>
             <h2 className="font-bold text-2xl">Assignments</h2>
@@ -112,35 +188,56 @@ export default function AssignmentsPage({ assignments, entities, user, users }:
           <span className="text-lg font-bold">Active Assignments Status</span>
           <div className="flex items-center gap-4">
             <span>
-							<b>Total:</b> {activeAssignments.reduce((acc, curr) => acc + curr.results.length, 0)}/
-							{activeAssignments.reduce((acc, curr) => curr.exams.length + acc, 0)}
+              <b>Total:</b>{" "}
+              {activeAssignments.reduce(
+                (acc, curr) => acc + curr.results.length,
+                0
+              )}
+              /
+              {activeAssignments.reduce(
+                (acc, curr) => curr.exams.length + acc,
+                0
+              )}
             </span>
           </div>
         </div>
 
         <section className="flex flex-col gap-4">
-					<h2 className="text-2xl font-semibold">Active Assignments ({activeAssignments.length})</h2>
+          <h2 className="text-2xl font-semibold">
+            Active Assignments ({activeAssignments.length})
+          </h2>
           <div className="w-full flex items-center gap-4">
             {renderActive()}
             {paginationActive()}
           </div>
           <div className="flex flex-wrap gap-2">
             {activeItems.map((a) => (
-							<AssignmentCard {...a} entityObj={findBy(entities, 'id', a.entity)} users={users} onClick={() => router.push(`/assignments/${a.id}`)} key={a.id} />
+              <AssignmentCard
+                {...a}
+                entityObj={findBy(entities, "id", a.entity)}
+                users={users}
+                onClick={() => router.push(`/assignments/${a.id}`)}
+                key={a.id}
+              />
             ))}
           </div>
         </section>
 
         <section className="flex flex-col gap-4">
-					<h2 className="text-2xl font-semibold">Planned Assignments ({plannedAssignments.length})</h2>
+          <h2 className="text-2xl font-semibold">
+            Planned Assignments ({plannedAssignments.length})
+          </h2>
           <div className="w-full flex items-center gap-4">
             {renderPlanned()}
             {paginationPlanned()}
           </div>
           <div className="flex flex-wrap gap-2">
             <Link
-							href={entitiesAllowCreate.length > 0 ? "/assignments/creator" : ""}
-							className="w-[250px] h-[200px] flex flex-col gap-2 items-center justify-center bg-white hover:bg-mti-purple-ultralight text-mti-purple-light hover:text-mti-purple-dark border border-mti-gray-platinum hover:drop-shadow p-4 cursor-pointer rounded-xl transition ease-in-out duration-300">
+              href={
+                entitiesAllowCreate.length > 0 ? "/assignments/creator" : ""
+              }
+              className="w-[250px] h-[200px] flex flex-col gap-2 items-center justify-center bg-white hover:bg-mti-purple-ultralight text-mti-purple-light hover:text-mti-purple-dark border border-mti-gray-platinum hover:drop-shadow p-4 cursor-pointer rounded-xl transition ease-in-out duration-300"
+            >
               <BsPlus className="text-6xl" />
               <span className="text-lg">New Assignment</span>
             </Link>
@@ -148,9 +245,9 @@ export default function AssignmentsPage({ assignments, entities, user, users }:
               <AssignmentCard
                 {...a}
                 users={users}
-								entityObj={findBy(entities, 'id', a.entity)}
+                entityObj={findBy(entities, "id", a.entity)}
                 onClick={
-									mapBy(entitiesAllowEdit, 'id').includes(a.entity || "")
+                  mapBy(entitiesAllowEdit, "id").includes(a.entity || "")
                     ? () => router.push(`/assignments/creator/${a.id}`)
                     : () => router.push(`/assignments/${a.id}`)
                 }
@@ -161,7 +258,9 @@ export default function AssignmentsPage({ assignments, entities, user, users }:
         </section>
 
         <section className="flex flex-col gap-4">
-					<h2 className="text-2xl font-semibold">Past Assignments ({pastAssignments.length})</h2>
+          <h2 className="text-2xl font-semibold">
+            Past Assignments ({pastAssignments.length})
+          </h2>
           <div className="w-full flex items-center gap-4">
             {renderPast()}
             {paginationPast()}
@@ -171,18 +270,22 @@ export default function AssignmentsPage({ assignments, entities, user, users }:
               <AssignmentCard
                 {...a}
                 users={users}
-								entityObj={findBy(entities, 'id', a.entity)}
+                entityObj={findBy(entities, "id", a.entity)}
                 onClick={() => router.push(`/assignments/${a.id}`)}
                 key={a.id}
                 allowDownload
-								allowArchive={mapBy(entitiesAllowArchive, 'id').includes(a.entity || "")}
+                allowArchive={mapBy(entitiesAllowArchive, "id").includes(
+                  a.entity || ""
+                )}
                 allowExcelDownload
               />
             ))}
           </div>
         </section>
         <section className="flex flex-col gap-4">
-					<h2 className="text-2xl font-semibold">Assignments start expired ({startExpiredAssignments.length})</h2>
+          <h2 className="text-2xl font-semibold">
+            Assignments start expired ({startExpiredAssignments.length})
+          </h2>
           <div className="w-full flex items-center gap-4">
             {renderExpired()}
             {paginationExpired()}
@@ -192,18 +295,22 @@ export default function AssignmentsPage({ assignments, entities, user, users }:
               <AssignmentCard
                 {...a}
                 users={users}
-								entityObj={findBy(entities, 'id', a.entity)}
+                entityObj={findBy(entities, "id", a.entity)}
                 onClick={() => router.push(`/assignments/${a.id}`)}
                 key={a.id}
                 allowDownload
-								allowArchive={mapBy(entitiesAllowArchive, 'id').includes(a.entity || "")}
+                allowArchive={mapBy(entitiesAllowArchive, "id").includes(
+                  a.entity || ""
+                )}
                 allowExcelDownload
               />
             ))}
           </div>
         </section>
         <section className="flex flex-col gap-4">
-					<h2 className="text-2xl font-semibold">Archived Assignments ({archivedAssignments.length})</h2>
+          <h2 className="text-2xl font-semibold">
+            Archived Assignments ({archivedAssignments.length})
+          </h2>
           <div className="w-full flex items-center gap-4">
             {renderArchived()}
             {paginationArchived()}
@@ -215,7 +322,7 @@ export default function AssignmentsPage({ assignments, entities, user, users }:
                 users={users}
                 onClick={() => router.push(`/assignments/${a.id}`)}
                 key={a.id}
-								entityObj={findBy(entities, 'id', a.entity)}
+                entityObj={findBy(entities, "id", a.entity)}
                 allowDownload
                 allowUnarchive
                 allowExcelDownload
@@ -223,7 +330,7 @@ export default function AssignmentsPage({ assignments, entities, user, users }:
             ))}
           </div>
         </section>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/classrooms/[id].tsx

@@ -1,5 +1,4 @@
 /* eslint-disable @next/next/no-img-element */
-import Layout from "@/components/High/Layout";
 import Tooltip from "@/components/Low/Tooltip";
 import { useEntityPermission } from "@/hooks/useEntityPermissions";
 import { useListSearch } from "@/hooks/useListSearch";
@@ -19,47 +18,93 @@ import { getEntityUsers, getSpecificUsers } from "@/utils/users.be";
 import axios from "axios";
 import clsx from "clsx";
 import { withIronSessionSsr } from "iron-session/next";
-import { capitalize } from "lodash";
+import { capitalize, last } 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 {
+  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 }) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+export const getServerSideProps = withIronSessionSsr(
+  async ({ req, res, params }) => {
+    const user = await requestUser(req, res);
+    if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user)) return redirect("/")
+    if (shouldRedirectHome(user)) return redirect("/");
 
     const { id } = params as { id: string };
 
     const group = await getGroup(id);
-	if (!group || !group.entity) return redirect("/classrooms")
+    if (!group || !group.entity) return redirect("/classrooms");
 
-	const entity = await getEntityWithRoles(group.entity)
-	if (!entity) return redirect("/classrooms")
+    const entity = await getEntityWithRoles(group.entity);
+    if (!entity) return redirect("/classrooms");
 
-	const canView = doesEntityAllow(user, entity, "view_classrooms")
-	if (!canView) return redirect("/")
+    const canView = doesEntityAllow(user, entity, "view_classrooms");
+    if (!canView) return redirect("/");
+    const [linkedUsers, users] = await Promise.all([
+      getEntityUsers(
+        entity.id,
+        0,
+        {},
+        {
+          _id: 0,
+          id: 1,
+          name: 1,
+          email: 1,
+          corporateInformation: 1,
+          type: 1,
+          profilePicture: 1,
+          subscriptionExpirationDate: 1,
+          lastLogin: 1,
+        }
+      ),
+      getSpecificUsers([...group.participants, group.admin], {
+        _id: 0,
+        id: 1,
+        name: 1,
+        email: 1,
+        corporateInformation: 1,
+        type: 1,
+        profilePicture: 1,
+        subscriptionExpirationDate: 1,
+        lastLogin: 1,
+      }),
+    ]);
 
-	const linkedUsers = await getEntityUsers(entity.id)
-	const users = await getSpecificUsers([...group.participants, group.admin]);
     const groupWithUser = convertToUsers(group, users);
 
     return {
-		props: serialize({ user, group: groupWithUser, users: linkedUsers.filter(x => isAdmin(user) ? true : !isAdmin(x)), entity }),
+      props: serialize({
+        user,
+        group: groupWithUser,
+        users: linkedUsers.filter((x) => (isAdmin(user) ? true : !isAdmin(x))),
+        entity,
+      }),
     };
-}, sessionOptions);
+  },
+  sessionOptions
+);
 
 interface Props {
   user: User;
   group: GroupWithUsers;
   users: User[];
-	entity: EntityWithRoles
+  entity: EntityWithRoles;
 }
 
 export default function Home({ user, group, users, entity }: Props) {
@@ -67,36 +112,73 @@ export default function Home({ user, group, users, entity }: Props) {
   const [isLoading, setIsLoading] = useState(false);
   const [selectedUsers, setSelectedUsers] = useState<string[]>([]);
 
-	const canAddParticipants = useEntityPermission(user, entity, "add_to_classroom")
-	const canRemoveParticipants = useEntityPermission(user, entity, "remove_from_classroom")
-	const canRenameClassroom = useEntityPermission(user, entity, "rename_classrooms")
-	const canDeleteClassroom = useEntityPermission(user, entity, "delete_classroom")
+  const canAddParticipants = useEntityPermission(
+    user,
+    entity,
+    "add_to_classroom"
+  );
+  const canRemoveParticipants = useEntityPermission(
+    user,
+    entity,
+    "remove_from_classroom"
+  );
+  const canRenameClassroom = useEntityPermission(
+    user,
+    entity,
+    "rename_classrooms"
+  );
+  const canDeleteClassroom = useEntityPermission(
+    user,
+    entity,
+    "delete_classroom"
+  );
 
   const nonParticipantUsers = useMemo(
-		() => users.filter((x) => ![...group.participants.map((g) => g.id), group.admin.id, user.id].includes(x.id)),
-		[users, group.participants, group.admin.id, user.id],
+    () =>
+      users.filter(
+        (x) =>
+          ![
+            ...group.participants.map((g) => g.id),
+            group.admin.id,
+            user.id,
+          ].includes(x.id)
+      ),
+    [users, group.participants, group.admin.id, user.id]
   );
 
   const { rows, renderSearch } = useListSearch<User>(
     [["name"], ["corporateInformation", "companyInformation", "name"]],
-		isAdding ? nonParticipantUsers : group.participants,
+    isAdding ? nonParticipantUsers : group.participants
   );
   const { items, renderMinimal } = usePagination<User>(rows, 20);
 
   const router = useRouter();
 
-	const toggleUser = (u: User) => setSelectedUsers((prev) => (prev.includes(u.id) ? prev.filter((p) => p !== u.id) : [...prev, u.id]));
+  const toggleUser = (u: User) =>
+    setSelectedUsers((prev) =>
+      prev.includes(u.id) ? prev.filter((p) => p !== u.id) : [...prev, u.id]
+    );
 
   const removeParticipants = () => {
     if (selectedUsers.length === 0) return;
     if (!canRemoveParticipants) return;
-		if (!confirm(`Are you sure you want to remove ${selectedUsers.length} participant${selectedUsers.length === 1 ? "" : "s"} from this group?`))
+    if (
+      !confirm(
+        `Are you sure you want to remove ${selectedUsers.length} participant${
+          selectedUsers.length === 1 ? "" : "s"
+        } from this group?`
+      )
+    )
       return;
 
     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);
@@ -111,13 +193,24 @@ export default function Home({ user, group, users, entity }: Props) {
   const addParticipants = () => {
     if (selectedUsers.length === 0) return;
     if (!canAddParticipants || !isAdding) return;
-		if (!confirm(`Are you sure you want to add ${selectedUsers.length} participant${selectedUsers.length === 1 ? "" : "s"} to this group?`))
+    if (
+      !confirm(
+        `Are you sure you want to add ${selectedUsers.length} participant${
+          selectedUsers.length === 1 ? "" : "s"
+        } to this group?`
+      )
+    )
       return;
 
     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);
@@ -183,14 +276,15 @@ export default function Home({ user, group, users, entity }: Props) {
       </Head>
       <ToastContainer />
       {user && (
-				<Layout user={user}>
+        <>
           <section className="flex flex-col gap-0">
             <div className="flex items-center justify-between">
               <div className="flex flex-col gap-3">
                 <div className="flex items-center gap-2">
                   <Link
                     href="/classrooms"
-										className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl">
+                    className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl"
+                  >
                     <BsChevronLeft />
                   </Link>
                   <h2 className="font-bold text-2xl">{group.name}</h2>
@@ -201,14 +295,16 @@ export default function Home({ user, group, users, entity }: Props) {
                     <button
                       onClick={renameGroup}
                       disabled={isLoading || !canRenameClassroom}
-											className="flex items-center gap-1 px-2 py-2 border rounded-full hover:bg-neutral-100 disabled:hover:bg-transparent disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                      className="flex items-center gap-1 px-2 py-2 border rounded-full hover:bg-neutral-100 disabled:hover:bg-transparent disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+                    >
                       <BsTag />
                       <span className="text-xs">Rename Classroom</span>
                     </button>
                     <button
                       onClick={deleteGroup}
                       disabled={isLoading || !canDeleteClassroom}
-											className="flex items-center gap-1 px-2 py-2 border border-mti-rose rounded-full bg-mti-rose-light text-white hover:bg-mti-rose-dark disabled:hover:bg-mti-rose-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                      className="flex items-center gap-1 px-2 py-2 border border-mti-rose rounded-full bg-mti-rose-light text-white hover:bg-mti-rose-dark disabled:hover:bg-mti-rose-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+                    >
                       <BsTrash />
                       <span className="text-xs">Delete Classroom</span>
                     </button>
@@ -220,7 +316,8 @@ export default function Home({ user, group, users, entity }: Props) {
                   <BsBuilding className="text-xl" /> {entity.label}
                 </span>
                 <span className="flex items-center gap-2">
-									<BsFillPersonVcardFill className="text-xl" /> {getUserName(group.admin)}
+                  <BsFillPersonVcardFill className="text-xl" />{" "}
+                  {getUserName(group.admin)}
                 </span>
               </div>
             </div>
@@ -232,14 +329,20 @@ export default function Home({ user, group, users, entity }: Props) {
                   <button
                     onClick={() => setIsAdding(true)}
                     disabled={isLoading || !canAddParticipants}
-										className="flex items-center gap-1 px-2 py-2 border rounded-full hover:bg-neutral-100 disabled:hover:bg-transparent disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                    className="flex items-center gap-1 px-2 py-2 border rounded-full hover:bg-neutral-100 disabled:hover:bg-transparent disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+                  >
                     <BsPlus />
                     <span className="text-xs">Add Participants</span>
                   </button>
                   <button
                     onClick={removeParticipants}
-										disabled={selectedUsers.length === 0 || isLoading || !canRemoveParticipants}
-										className="flex items-center gap-1 px-2 py-2 border border-mti-rose rounded-full bg-mti-rose-light text-white hover:bg-mti-rose-dark disabled:hover:bg-mti-rose-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                    disabled={
+                      selectedUsers.length === 0 ||
+                      isLoading ||
+                      !canRemoveParticipants
+                    }
+                    className="flex items-center gap-1 px-2 py-2 border border-mti-rose rounded-full bg-mti-rose-light text-white hover:bg-mti-rose-dark disabled:hover:bg-mti-rose-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+                  >
                     <BsTrash />
                     <span className="text-xs">Remove Participants</span>
                   </button>
@@ -250,14 +353,20 @@ export default function Home({ user, group, users, entity }: Props) {
                   <button
                     onClick={() => setIsAdding(false)}
                     disabled={isLoading}
-										className="flex items-center gap-1 px-2 py-2 border rounded-full border-mti-rose bg-mti-rose-light text-white hover:bg-mti-rose-dark disabled:hover:bg-mti-rose-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                    className="flex items-center gap-1 px-2 py-2 border rounded-full border-mti-rose bg-mti-rose-light text-white hover:bg-mti-rose-dark disabled:hover:bg-mti-rose-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+                  >
                     <BsX />
                     <span className="text-xs">Discard Selection</span>
                   </button>
                   <button
                     onClick={addParticipants}
-										disabled={selectedUsers.length === 0 || isLoading || !canAddParticipants}
-										className="flex items-center gap-1 px-2 py-2 border rounded-full border-mti-green bg-mti-green-light text-white hover:bg-mti-green-dark disabled:hover:bg-mti-green-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                    disabled={
+                      selectedUsers.length === 0 ||
+                      isLoading ||
+                      !canAddParticipants
+                    }
+                    className="flex items-center gap-1 px-2 py-2 border rounded-full border-mti-green bg-mti-green-light text-white hover:bg-mti-green-dark disabled:hover:bg-mti-green-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+                  >
                     <BsPlus />
                     <span className="text-xs">Add Participants</span>
                   </button>
@@ -269,26 +378,53 @@ export default function Home({ user, group, users, entity }: Props) {
               {renderMinimal()}
             </div>
             <div className="flex items-center gap-2 mt-4">
-							{['student', 'teacher', 'corporate'].map((type) => (
+              {["student", "teacher", "corporate"].map((type) => (
                 <button
                   key={type}
                   onClick={() => {
-										const typeUsers = mapBy(filterBy(isAdding ? nonParticipantUsers : group.participants, 'type', type), 'id')
+                    const typeUsers = mapBy(
+                      filterBy(
+                        isAdding ? nonParticipantUsers : group.participants,
+                        "type",
+                        type
+                      ),
+                      "id"
+                    );
                     if (typeUsers.every((u) => selectedUsers.includes(u))) {
-											setSelectedUsers((prev) => prev.filter((a) => !typeUsers.includes(a)));
+                      setSelectedUsers((prev) =>
+                        prev.filter((a) => !typeUsers.includes(a))
+                      );
                     } else {
-											setSelectedUsers((prev) => [...prev.filter((a) => !typeUsers.includes(a)), ...typeUsers]);
+                      setSelectedUsers((prev) => [
+                        ...prev.filter((a) => !typeUsers.includes(a)),
+                        ...typeUsers,
+                      ]);
                     }
                   }}
-									disabled={filterBy(isAdding ? nonParticipantUsers : group.participants, 'type', type).length === 0}
+                  disabled={
+                    filterBy(
+                      isAdding ? nonParticipantUsers : group.participants,
+                      "type",
+                      type
+                    ).length === 0
+                  }
                   className={clsx(
                     "bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",
                     "transition duration-300 ease-in-out",
                     "disabled:grayscale disabled:hover:bg-mti-purple-ultralight disabled:hover:text-mti-purple disabled:cursor-not-allowed",
-										filterBy(isAdding ? nonParticipantUsers : group.participants, 'type', type).length > 0 &&
-										filterBy(isAdding ? nonParticipantUsers : group.participants, 'type', type).every((u) => selectedUsers.includes(u.id)) &&
-										"!bg-mti-purple-light !text-white",
-									)}>
+                    filterBy(
+                      isAdding ? nonParticipantUsers : group.participants,
+                      "type",
+                      type
+                    ).length > 0 &&
+                      filterBy(
+                        isAdding ? nonParticipantUsers : group.participants,
+                        "type",
+                        type
+                      ).every((u) => selectedUsers.includes(u.id)) &&
+                      "!bg-mti-purple-light !text-white"
+                  )}
+                >
                   {capitalize(type)}
                 </button>
               ))}
@@ -299,20 +435,25 @@ export default function Home({ user, group, users, entity }: Props) {
             {items.map((u) => (
               <button
                 onClick={() => toggleUser(u)}
-								disabled={isAdding ? !canAddParticipants : !canRemoveParticipants}
+                disabled={
+                  isAdding ? !canAddParticipants : !canRemoveParticipants
+                }
                 key={u.id}
                 className={clsx(
                   "p-4 pr-6 h-48 relative border rounded-xl flex flex-col gap-3 justify-between text-left cursor-pointer",
                   "hover:border-mti-purple transition ease-in-out duration-300",
-									selectedUsers.includes(u.id) && "border-mti-purple",
-								)}>
+                  selectedUsers.includes(u.id) && "border-mti-purple"
+                )}
+              >
                 <div className="flex items-center gap-2">
                   <div className="min-w-[3rem] min-h-[3rem] w-12 h-12 border flex items-center justify-center overflow-hidden rounded-full">
                     <img src={u.profilePicture} alt={u.name} />
                   </div>
                   <div className="flex flex-col">
                     <span className="font-semibold">{getUserName(u)}</span>
-										<span className="opacity-80 text-sm">{USER_TYPE_LABELS[u.type]}</span>
+                    <span className="opacity-80 text-sm">
+                      {USER_TYPE_LABELS[u.type]}
+                    </span>
                   </div>
                 </div>
 
@@ -327,19 +468,25 @@ export default function Home({ user, group, users, entity }: Props) {
                     <Tooltip tooltip="Expiration Date">
                       <BsStopwatchFill />
                     </Tooltip>
-										{u.subscriptionExpirationDate ? moment(u.subscriptionExpirationDate).format("DD/MM/YYYY") : "Unlimited"}
+                    {u.subscriptionExpirationDate
+                      ? moment(u.subscriptionExpirationDate).format(
+                          "DD/MM/YYYY"
+                        )
+                      : "Unlimited"}
                   </span>
                   <span className="flex items-center gap-2">
                     <Tooltip tooltip="Last Login">
                       <BsClockFill />
                     </Tooltip>
-										{u.lastLogin ? moment(u.lastLogin).format("DD/MM/YYYY - HH:mm") : "N/A"}
+                    {u.lastLogin
+                      ? moment(u.lastLogin).format("DD/MM/YYYY - HH:mm")
+                      : "N/A"}
                   </span>
                 </div>
               </button>
             ))}
           </section>
-				</Layout>
+        </>
       )}
     </>
   );

src/pages/classrooms/create.tsx

@@ -1,19 +1,18 @@
 /* eslint-disable @next/next/no-img-element */
-import Layout from "@/components/High/Layout";
 import Input from "@/components/Low/Input";
 import Select from "@/components/Low/Select";
 import Tooltip from "@/components/Low/Tooltip";
 import { useListSearch } from "@/hooks/useListSearch";
 import usePagination from "@/hooks/usePagination";
-import {Entity, EntityWithRoles} from "@/interfaces/entity";
+import { EntityWithRoles } from "@/interfaces/entity";
 import { User } from "@/interfaces/user";
 import { sessionOptions } from "@/lib/session";
 import { USER_TYPE_LABELS } from "@/resources/user";
 import { filterBy, mapBy, redirect, serialize } from "@/utils";
-import {getEntities, getEntitiesWithRoles} from "@/utils/entities.be";
+import { getEntitiesWithRoles } from "@/utils/entities.be";
 import { shouldRedirectHome } from "@/utils/navigation.disabled";
 import { getUserName, isAdmin } from "@/utils/users";
-import {getEntitiesUsers, getLinkedUsers} from "@/utils/users.be";
+import { getEntitiesUsers } from "@/utils/users.be";
 import axios from "axios";
 import clsx from "clsx";
 import { withIronSessionSsr } from "iron-session/next";
@@ -23,24 +22,57 @@ import Link from "next/link";
 import { useRouter } from "next/router";
 import { Divider } from "primereact/divider";
 import { useEffect, useMemo, useState } from "react";
-import {BsCheck, BsChevronLeft, BsClockFill, BsEnvelopeFill, BsStopwatchFill} from "react-icons/bs";
+import {
+  BsCheck,
+  BsChevronLeft,
+  BsClockFill,
+  BsEnvelopeFill,
+  BsStopwatchFill,
+} from "react-icons/bs";
 import { toast, ToastContainer } from "react-toastify";
 import { requestUser } from "@/utils/api";
 import { findAllowedEntities } from "@/utils/permissions";
 import { capitalize } from "lodash";
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+  const user = await requestUser(req, res);
+  if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user)) return redirect("/")
+  if (shouldRedirectHome(user)) return redirect("/");
 
-	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : mapBy(user.entities, "id"));
-	const users = await getEntitiesUsers(mapBy(entities, 'id'))
-	const allowedEntities = findAllowedEntities(user, entities, "create_classroom")
+  const entities = await getEntitiesWithRoles(
+    isAdmin(user) ? undefined : mapBy(user.entities, "id")
+  );
+  const users = await getEntitiesUsers(
+    mapBy(entities, "id"),
+    {
+      id: { $ne: user.id },
+    },
+    0,
+    {
+      _id: 0,
+      id: 1,
+      name: 1,
+      email: 1,
+      profilePicture: 1,
+      type: 1,
+      corporateInformation: 1,
+      lastLogin: 1,
+      subscriptionExpirationDate: 1,
+    }
+  );
+  const allowedEntities = findAllowedEntities(
+    user,
+    entities,
+    "create_classroom"
+  );
 
   return {
-		props: serialize({user, entities: allowedEntities, users: users.filter((x) => x.id !== user.id)}),
+    props: serialize({
+      user,
+      entities: allowedEntities,
+      users: users,
+    }),
   };
 }, sessionOptions);
 
@@ -56,27 +88,48 @@ export default function Home({user, users, entities}: Props) {
   const [name, setName] = useState("");
   const [entity, setEntity] = useState<string | undefined>(entities[0]?.id);
 
-	const entityUsers = useMemo(() => !entity ? users : users.filter(u => mapBy(u.entities, 'id').includes(entity)), [entity, users])
+  const entityUsers = useMemo(
+    () =>
+      !entity
+        ? users
+        : users.filter((u) => mapBy(u.entities, "id").includes(entity)),
+    [entity, users]
+  );
 
   const { rows, renderSearch } = useListSearch<User>(
-		[["name"], ["type"], ["corporateInformation", "companyInformation", "name"]], entityUsers
+    [
+      ["name"],
+      ["type"],
+      ["corporateInformation", "companyInformation", "name"],
+    ],
+    entityUsers
   );
 
   const { items, renderMinimal } = usePagination<User>(rows, 16);
 
   const router = useRouter();
 
-	useEffect(() => setSelectedUsers([]), [entity])
+  useEffect(() => setSelectedUsers([]), [entity]);
 
   const createGroup = () => {
     if (!name.trim()) return;
     if (!entity) return;
-		if (!confirm(`Are you sure you want to create this group with ${selectedUsers.length} participants?`)) return;
+    if (
+      !confirm(
+        `Are you sure you want to create this group with ${selectedUsers.length} participants?`
+      )
+    )
+      return;
 
     setIsLoading(true);
 
     axios
-			.post<{id: string}>(`/api/groups`, {name, participants: selectedUsers, admin: user.id, entity})
+      .post<{ id: string }>(`/api/groups`, {
+        name,
+        participants: selectedUsers,
+        admin: user.id,
+        entity,
+      })
       .then((result) => {
         toast.success("Your group has been created successfully!");
         router.replace(`/classrooms/${result.data.id}`);
@@ -88,7 +141,10 @@ export default function Home({user, users, entities}: Props) {
       .finally(() => setIsLoading(false));
   };
 
-	const toggleUser = (u: User) => setSelectedUsers((prev) => (prev.includes(u.id) ? prev.filter((p) => p !== u.id) : [...prev, u.id]));
+  const toggleUser = (u: User) =>
+    setSelectedUsers((prev) =>
+      prev.includes(u.id) ? prev.filter((p) => p !== u.id) : [...prev, u.id]
+    );
 
   return (
     <>
@@ -102,13 +158,14 @@ export default function Home({user, users, entities}: Props) {
         <link rel="icon" href="/favicon.ico" />
       </Head>
       <ToastContainer />
-			<Layout user={user}>
+      <>
         <section className="flex flex-col gap-0">
           <div className="flex gap-3 justify-between">
             <div className="flex items-center gap-2">
               <Link
                 href="/classrooms"
-								className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl">
+                className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl"
+              >
                 <BsChevronLeft />
               </Link>
               <h2 className="font-bold text-2xl">Create Classroom</h2>
@@ -117,7 +174,8 @@ export default function Home({user, users, entities}: Props) {
               <button
                 onClick={createGroup}
                 disabled={!name.trim() || !entity || isLoading}
-								className="flex items-center gap-1 px-2 py-2 border rounded-full border-mti-green bg-mti-green-light text-white hover:bg-mti-green-dark disabled:hover:bg-mti-green-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                className="flex items-center gap-1 px-2 py-2 border rounded-full border-mti-green bg-mti-green-light text-white hover:bg-mti-green-dark disabled:hover:bg-mti-green-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+              >
                 <BsCheck />
                 <span className="text-xs">Create Classroom</span>
               </button>
@@ -127,46 +185,67 @@ export default function Home({user, users, entities}: Props) {
           <div className="grid grid-cols-2 gap-4 place-items-end">
             <div className="flex flex-col gap-4 w-full">
               <span className="font-semibold text-xl">Classroom Name:</span>
-							<Input name="name" onChange={setName} type="text" placeholder="Classroom A" />
+              <Input
+                name="name"
+                onChange={setName}
+                type="text"
+                placeholder="Classroom A"
+              />
             </div>
             <div className="flex flex-col gap-4 w-full">
               <span className="font-semibold text-xl">Entity:</span>
               <Select
                 options={entities.map((e) => ({ value: e.id, label: e.label }))}
                 onChange={(v) => setEntity(v ? v.value! : undefined)}
-								defaultValue={{value: entities[0]?.id, label: entities[0]?.label}}
+                defaultValue={{
+                  value: entities[0]?.id,
+                  label: entities[0]?.label,
+                }}
               />
             </div>
           </div>
           <Divider />
           <div className="flex items-center justify-between mb-4">
-						<span className="font-semibold text-xl">Participants ({selectedUsers.length} selected):</span>
+            <span className="font-semibold text-xl">
+              Participants ({selectedUsers.length} selected):
+            </span>
           </div>
           <div className="w-full flex items-center gap-4">
             {renderSearch()}
             {renderMinimal()}
           </div>
           <div className="flex items-center gap-2 mt-4">
-						{['student', 'teacher', 'corporate'].map((type) => (
+            {["student", "teacher", "corporate"].map((type) => (
               <button
                 key={type}
                 onClick={() => {
-									const typeUsers = mapBy(filterBy(entityUsers, 'type', type), 'id')
+                  const typeUsers = mapBy(
+                    filterBy(entityUsers, "type", type),
+                    "id"
+                  );
                   if (typeUsers.every((u) => selectedUsers.includes(u))) {
-										setSelectedUsers((prev) => prev.filter((a) => !typeUsers.includes(a)));
+                    setSelectedUsers((prev) =>
+                      prev.filter((a) => !typeUsers.includes(a))
+                    );
                   } else {
-										setSelectedUsers((prev) => [...prev.filter((a) => !typeUsers.includes(a)), ...typeUsers]);
+                    setSelectedUsers((prev) => [
+                      ...prev.filter((a) => !typeUsers.includes(a)),
+                      ...typeUsers,
+                    ]);
                   }
                 }}
-								disabled={filterBy(entityUsers, 'type', type).length === 0}
+                disabled={filterBy(entityUsers, "type", type).length === 0}
                 className={clsx(
                   "bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",
                   "transition duration-300 ease-in-out",
                   "disabled:grayscale disabled:hover:bg-mti-purple-ultralight disabled:hover:text-mti-purple disabled:cursor-not-allowed",
-									filterBy(entityUsers, 'type', type).length > 0 &&
-									filterBy(entityUsers, 'type', type).every((u) => selectedUsers.includes(u.id)) &&
-									"!bg-mti-purple-light !text-white",
-								)}>
+                  filterBy(entityUsers, "type", type).length > 0 &&
+                    filterBy(entityUsers, "type", type).every((u) =>
+                      selectedUsers.includes(u.id)
+                    ) &&
+                    "!bg-mti-purple-light !text-white"
+                )}
+              >
                 {capitalize(type)}
               </button>
             ))}
@@ -182,15 +261,18 @@ export default function Home({user, users, entities}: Props) {
               className={clsx(
                 "p-4 pr-6 h-48 relative border rounded-xl flex flex-col gap-3 justify-between text-left cursor-pointer",
                 "hover:border-mti-purple transition ease-in-out duration-300",
-								selectedUsers.includes(u.id) && "border-mti-purple",
-							)}>
+                selectedUsers.includes(u.id) && "border-mti-purple"
+              )}
+            >
               <div className="flex items-center gap-2">
                 <div className="min-w-[3rem] min-h-[3rem] w-12 h-12 border flex items-center justify-center overflow-hidden rounded-full">
                   <img src={u.profilePicture} alt={u.name} />
                 </div>
                 <div className="flex flex-col">
                   <span className="font-semibold">{getUserName(u)}</span>
-									<span className="opacity-80 text-sm">{USER_TYPE_LABELS[u.type]}</span>
+                  <span className="opacity-80 text-sm">
+                    {USER_TYPE_LABELS[u.type]}
+                  </span>
                 </div>
               </div>
 
@@ -205,19 +287,23 @@ export default function Home({user, users, entities}: Props) {
                   <Tooltip tooltip="Expiration Date">
                     <BsStopwatchFill />
                   </Tooltip>
-									{u.subscriptionExpirationDate ? moment(u.subscriptionExpirationDate).format("DD/MM/YYYY") : "Unlimited"}
+                  {u.subscriptionExpirationDate
+                    ? moment(u.subscriptionExpirationDate).format("DD/MM/YYYY")
+                    : "Unlimited"}
                 </span>
                 <span className="flex items-center gap-2">
                   <Tooltip tooltip="Last Login">
                     <BsClockFill />
                   </Tooltip>
-									{u.lastLogin ? moment(u.lastLogin).format("DD/MM/YYYY - HH:mm") : "N/A"}
+                  {u.lastLogin
+                    ? moment(u.lastLogin).format("DD/MM/YYYY - HH:mm")
+                    : "N/A"}
                 </span>
               </div>
             </button>
           ))}
         </section>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/classrooms/index.tsx

@@ -3,7 +3,6 @@ import Head from "next/head";
 import { withIronSessionSsr } from "iron-session/next";
 import { sessionOptions } from "@/lib/session";
 import { ToastContainer } from "react-toastify";
-import Layout from "@/components/High/Layout";
 import { GroupWithUsers, User } from "@/interfaces/user";
 import { shouldRedirectHome } from "@/utils/navigation.disabled";
 import { getUserName, isAdmin } from "@/utils/users";
@@ -11,13 +10,13 @@ import { convertToUsers, getGroupsForEntities } from "@/utils/groups.be";
 import { getSpecificUsers } from "@/utils/users.be";
 import Link from "next/link";
 import { uniq } from "lodash";
-import { BsFillMortarboardFill, BsPlus } from "react-icons/bs";
+import { BsPlus } from "react-icons/bs";
 import CardList from "@/components/High/CardList";
 import Separator from "@/components/Low/Separator";
 import { findBy, mapBy, redirect, serialize } from "@/utils";
 import { requestUser } from "@/utils/api";
 import { findAllowedEntities } from "@/utils/permissions";
-import { getEntities, getEntitiesWithRoles } from "@/utils/entities.be";
+import { getEntitiesWithRoles } from "@/utils/entities.be";
 import { useAllowedEntities } from "@/hooks/useEntityPermissions";
 import { EntityWithRoles } from "@/interfaces/entity";
 import { FaPersonChalkboard } from "react-icons/fa6";
@@ -28,22 +27,41 @@ import StudentClassroomTransfer from "@/components/Imports/StudentClassroomTrans
 import Modal from "@/components/Modal";
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+  const user = await requestUser(req, res);
+  if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user)) return redirect("/")
+  if (shouldRedirectHome(user)) return redirect("/");
 
   const entityIDS = mapBy(user.entities, "id");
-	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDS)
-	const allowedEntities = findAllowedEntities(user, entities, "view_classrooms")
+  const entities = await getEntitiesWithRoles(
+    isAdmin(user) ? undefined : entityIDS
+  );
 
-	const groups = await getGroupsForEntities(mapBy(allowedEntities, 'id'));
+  const allowedEntities = findAllowedEntities(
+    user,
+    entities,
+    "view_classrooms"
+  );
 
-	const users = await getSpecificUsers(uniq(groups.flatMap((g) => [...g.participants, g.admin])));
-	const groupsWithUsers: GroupWithUsers[] = groups.map((g) => convertToUsers(g, users.filter(x => isAdmin(user) ? true : !isAdmin(x))));
+  const groups = await getGroupsForEntities(mapBy(allowedEntities, "id"));
+
+  const users = await getSpecificUsers(
+    uniq(groups.flatMap((g) => [...g.participants, g.admin])),
+    { _id: 0, id: 1, name: 1, email: 1, corporateInformation: 1, type: 1 }
+  );
+  const groupsWithUsers: GroupWithUsers[] = groups.map((g) =>
+    convertToUsers(
+      g,
+      users.filter((x) => (isAdmin(user) ? true : !isAdmin(x)))
+    )
+  );
 
   return {
-		props: serialize({ user, groups: groupsWithUsers, entities: allowedEntities }),
+    props: serialize({
+      user,
+      groups: groupsWithUsers,
+      entities: allowedEntities,
+    }),
   };
 }, sessionOptions);
 
@@ -60,39 +78,60 @@ const SEARCH_FIELDS = [
 interface Props {
   user: User;
   groups: GroupWithUsers[];
-	entities: EntityWithRoles[]
+  entities: EntityWithRoles[];
 }
 export default function Home({ user, groups, entities }: Props) {
-	const entitiesAllowCreate = useAllowedEntities(user, entities, 'create_classroom');
+  const entitiesAllowCreate = useAllowedEntities(
+    user,
+    entities,
+    "create_classroom"
+  );
   const [showImport, setShowImport] = useState(false);
 
   const renderCard = (group: GroupWithUsers) => (
     <Link
       href={`/classrooms/${group.id}`}
       key={group.id}
-			className="p-4 border-2 border-mti-purple-light/20 rounded-xl flex gap-2 justify-between hover:border-mti-purple group transition ease-in-out duration-300 text-left cursor-pointer">
+      className="p-4 border-2 border-mti-purple-light/20 rounded-xl flex gap-2 justify-between hover:border-mti-purple group transition ease-in-out duration-300 text-left cursor-pointer"
+    >
       <div className="flex flex-col gap-2 w-full">
         <span className="flex items-center gap-1">
-					<span className="bg-mti-purple text-white font-semibold px-2">Classroom</span>
+          <span className="bg-mti-purple text-white font-semibold px-2">
+            Classroom
+          </span>
           {group.name}
         </span>
         <span className="flex items-center gap-1">
-					<span className="bg-mti-purple text-white font-semibold px-2">Admin</span>
+          <span className="bg-mti-purple text-white font-semibold px-2">
+            Admin
+          </span>
           {getUserName(group.admin)}
         </span>
         {!!group.entity && (
           <span className="flex items-center gap-1">
-						<span className="bg-mti-purple text-white font-semibold px-2">Entity</span>
-						{findBy(entities, 'id', group.entity)?.label}
+            <span className="bg-mti-purple text-white font-semibold px-2">
+              Entity
+            </span>
+            {findBy(entities, "id", group.entity)?.label}
           </span>
         )}
         <span className="flex items-center gap-1">
-					<span className="bg-mti-purple text-white font-semibold px-2">Participants</span>
-					<span className="bg-mti-purple-light/50 px-2">{group.participants.length}</span>
+          <span className="bg-mti-purple text-white font-semibold px-2">
+            Participants
+          </span>
+          <span className="bg-mti-purple-light/50 px-2">
+            {group.participants.length}
+          </span>
         </span>
         <span>
-					{group.participants.slice(0, 3).map(getUserName).join(", ")}{' '}
-					{group.participants.length > 3 ? <span className="opacity-50 bg-mti-purple-light/50 px-1 text-sm">and {group.participants.length - 3} more</span> : ""}
+          {group.participants.slice(0, 3).map(getUserName).join(", ")}{" "}
+          {group.participants.length > 3 ? (
+            <span className="opacity-50 bg-mti-purple-light/50 px-1 text-sm">
+              and {group.participants.length - 3} more
+            </span>
+          ) : (
+            ""
+          )}
         </span>
       </div>
       <div className="w-fit">
@@ -104,7 +143,8 @@ export default function Home({ user, groups, entities }: Props) {
   const firstCard = () => (
     <Link
       href={`/classrooms/create`}
-			className="p-4 border-2 hover:text-mti-purple rounded-xl flex flex-col items-center justify-center gap-0 hover:border-mti-purple transition ease-in-out duration-300 text-left cursor-pointer">
+      className="p-4 border-2 hover:text-mti-purple rounded-xl flex flex-col items-center justify-center gap-0 hover:border-mti-purple transition ease-in-out duration-300 text-left cursor-pointer"
+    >
       <BsPlus size={40} />
       <span className="font-semibold">Create Classroom</span>
     </Link>
@@ -122,26 +162,35 @@ export default function Home({ user, groups, entities }: Props) {
         <link rel="icon" href="/favicon.ico" />
       </Head>
       <ToastContainer />
-			<Layout user={user} className="!gap-4">
+      <>
         <section className="flex flex-col gap-4 w-full h-full">
-					<Modal isOpen={showImport} onClose={() => setShowImport(false)} maxWidth="max-w-[85%]">
-						<StudentClassroomTransfer user={user} entities={entities} onFinish={() => setShowImport(false)} />
+          <Modal
+            isOpen={showImport}
+            onClose={() => setShowImport(false)}
+            maxWidth="max-w-[85%]"
+          >
+            <StudentClassroomTransfer
+              user={user}
+              entities={entities}
+              onFinish={() => setShowImport(false)}
+            />
           </Modal>
           <div className="flex flex-col gap-4">
             <div className="flex justify-between">
               <h2 className="font-bold text-2xl">Classrooms</h2>
-							{entitiesAllowCreate.length !== 0 && <button
+              {entitiesAllowCreate.length !== 0 && (
+                <button
                   className={clsx(
                     "flex flex-row gap-3 items-center py-1.5 px-4 text-lg",
                     "bg-mti-purple-light border border-mti-purple-light rounded-xl text-white",
-									"hover:bg-white hover:text-mti-purple-light transition duration-300 ease-in-out",
+                    "hover:bg-white hover:text-mti-purple-light transition duration-300 ease-in-out"
                   )}
                   onClick={() => setShowImport(true)}
                 >
                   <FaFileUpload className="w-5 h-5" />
                   Transfer Students
                 </button>
-							}
+              )}
             </div>
             <Separator />
           </div>
@@ -153,7 +202,7 @@ export default function Home({ user, groups, entities }: Props) {
             firstCard={entitiesAllowCreate.length === 0 ? undefined : firstCard}
           />
         </section>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/dashboard/admin.tsx

@@ -1,29 +1,23 @@
 /* eslint-disable @next/next/no-img-element */
-import Layout from "@/components/High/Layout";
 import UserDisplayList from "@/components/UserDisplayList";
 import IconCard from "@/components/IconCard";
 import { EntityWithRoles } from "@/interfaces/entity";
-import { Assignment } from "@/interfaces/results";
-import { Group, Stat, Type, User } from "@/interfaces/user";
+import { Stat, Type, User } from "@/interfaces/user";
 import { sessionOptions } from "@/lib/session";
-import { dateSorter, filterBy, mapBy, redirect, serialize } from "@/utils";
+import { filterBy, mapBy, redirect, serialize } from "@/utils";
 import { requestUser } from "@/utils/api";
-import { countEntitiesAssignments, getAssignments } from "@/utils/assignments.be";
-import { getEntitiesWithRoles } from "@/utils/entities.be";
-import { countGroups, getGroups } from "@/utils/groups.be";
+import { countEntitiesAssignments } from "@/utils/assignments.be";
+import { getEntities } from "@/utils/entities.be";
+import { countGroups } from "@/utils/groups.be";
 import { checkAccess } from "@/utils/permissions";
-import { calculateAverageLevel, calculateBandScore } from "@/utils/score";
 import { groupByExam } from "@/utils/stats";
 import { getStatsByUsers } from "@/utils/stats.be";
-import { countUsers, getUser, getUsers } from "@/utils/users.be";
+import { countUsersByTypes, getUsers } from "@/utils/users.be";
 import { withIronSessionSsr } from "iron-session/next";
-import { uniqBy } from "lodash";
 import Head from "next/head";
 import { useRouter } from "next/router";
-import { useMemo } from "react";
 import {
   BsBank,
-	BsClipboard2Data,
   BsEnvelopePaper,
   BsPencilSquare,
   BsPeople,
@@ -36,39 +30,76 @@ import { ToastContainer } from "react-toastify";
 interface Props {
   user: User;
   students: User[];
-	latestStudents: User[]
-	latestTeachers: User[]
+  latestStudents: User[];
+  latestTeachers: User[];
   entities: EntityWithRoles[];
-	usersCount: { [key in Type]: number }
+  usersCount: { [key in Type]: number };
   assignmentsCount: number;
   stats: Stat[];
   groupsCount: number;
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	if (!user || !user.isVerified) return redirect("/login")
+  const user = await requestUser(req, res);
+  if (!user || !user.isVerified) return redirect("/login");
 
-	if (!checkAccess(user, ["admin", "developer"])) return redirect("/")
+  if (!checkAccess(user, ["admin", "developer"])) return redirect("/");
+  const [
+    entities,
+    usersCount,
+    groupsCount,
+    students,
+    latestStudents,
+    latestTeachers,
+  ] = await Promise.all([
+    getEntities(undefined, { _id: 0, id: 1, label: 1 }),
+    countUsersByTypes(["student", "teacher", "corporate", "mastercorporate"]),
+    countGroups(),
+    getUsers(
+      { type: "student" },
+      10,
+      {
+        averageLevel: -1,
+      },
+      { _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
+    ),
+    getUsers(
+      { type: "student" },
+      10,
+      {
+        registrationDate: -1,
+      },
+      { _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
+    ),
+    getUsers(
+      { type: "teacher" },
+      10,
+      {
+        registrationDate: -1,
+      },
+      { _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
+    ),
+  ]);
+  const [assignmentsCount, stats] = await Promise.all([
+    countEntitiesAssignments(mapBy(entities, "id"), {
+      archived: { $ne: true },
+    }),
+    getStatsByUsers(mapBy(students, "id")),
+  ]);
 
-	const students = await getUsers({ type: 'student' });
-	const usersCount = {
-		student: await countUsers({ type: "student" }),
-		teacher: await countUsers({ type: "teacher" }),
-		corporate: await countUsers({ type: "corporate" }),
-		mastercorporate: await countUsers({ type: "mastercorporate" }),
-	}
-
-	const latestStudents = await getUsers({ type: 'student' }, 10, { registrationDate: -1 })
-	const latestTeachers = await getUsers({ type: 'teacher' }, 10, { registrationDate: -1 })
-
-	const entities = await getEntitiesWithRoles();
-	const assignmentsCount = await countEntitiesAssignments(mapBy(entities, 'id'), { archived: { $ne: true } });
-	const groupsCount = await countGroups();
-
-	const stats = await getStatsByUsers(mapBy(students, 'id'));
-
-	return { props: serialize({ user, students, latestStudents, latestTeachers, usersCount, entities, assignmentsCount, stats, groupsCount }) };
+  return {
+    props: serialize({
+      user,
+      students,
+      latestStudents,
+      latestTeachers,
+      usersCount,
+      entities,
+      assignmentsCount,
+      stats,
+      groupsCount,
+    }),
+  };
 }, sessionOptions);
 
 export default function Dashboard({
@@ -80,7 +111,7 @@ export default function Dashboard({
   entities,
   assignmentsCount,
   stats,
-	groupsCount
+  groupsCount,
 }: Props) {
   const router = useRouter();
 
@@ -96,7 +127,7 @@ export default function Dashboard({
         <link rel="icon" href="/favicon.ico" />
       </Head>
       <ToastContainer />
-			<Layout user={user}>
+      <>
         <section className="grid grid-cols-5 place-items-center -md:grid-cols-2 gap-4 text-center">
           <IconCard
             onClick={() => router.push("/users?type=student")}
@@ -133,19 +164,22 @@ export default function Dashboard({
             value={groupsCount}
             color="purple"
           />
-					<IconCard Icon={BsPeopleFill}
+          <IconCard
+            Icon={BsPeopleFill}
             onClick={() => router.push("/entities")}
             label="Entities"
             value={entities.length}
             color="purple"
           />
-					<IconCard Icon={BsPersonFillGear}
+          <IconCard
+            Icon={BsPersonFillGear}
             onClick={() => router.push("/statistical")}
             label="Entity Statistics"
             value={entities.length}
             color="purple"
           />
-					<IconCard Icon={BsPersonFillGear}
+          <IconCard
+            Icon={BsPersonFillGear}
             onClick={() => router.push("/users/performance")}
             label="Student Performance"
             value={usersCount.student}
@@ -161,31 +195,19 @@ export default function Dashboard({
         </section>
 
         <section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
+          <UserDisplayList users={latestStudents} title="Latest Students" />
+          <UserDisplayList users={latestTeachers} title="Latest Teachers" />
+          <UserDisplayList users={students} title="Highest level students" />
           <UserDisplayList
-						users={latestStudents}
-						title="Latest Students"
-					/>
-					<UserDisplayList
-						users={latestTeachers}
-						title="Latest Teachers"
-					/>
-					<UserDisplayList
-						users={students.sort((a, b) => calculateAverageLevel(b.levels) - calculateAverageLevel(a.levels))}
-						title="Highest level students"
-					/>
-					<UserDisplayList
-						users={
-							students
-								.sort(
+            users={students.sort(
               (a, b) =>
                 Object.keys(groupByExam(filterBy(stats, "user", b))).length -
-										Object.keys(groupByExam(filterBy(stats, "user", a))).length,
-								)
-						}
+                Object.keys(groupByExam(filterBy(stats, "user", a))).length
+            )}
             title="Highest exam count students"
           />
         </section>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/dashboard/corporate.tsx

@@ -1,28 +1,26 @@
 /* eslint-disable @next/next/no-img-element */
-import Layout from "@/components/High/Layout";
 import UserDisplayList from "@/components/UserDisplayList";
 import IconCard from "@/components/IconCard";
 import { EntityWithRoles } from "@/interfaces/entity";
 import { Stat, StudentUser, Type, User } from "@/interfaces/user";
 import { sessionOptions } from "@/lib/session";
-import { dateSorter, filterBy, mapBy, redirect, serialize } from "@/utils";
+import { filterBy, mapBy, redirect, serialize } from "@/utils";
 import { requestUser } from "@/utils/api";
 import { countEntitiesAssignments } from "@/utils/assignments.be";
 import { getEntitiesWithRoles } from "@/utils/entities.be";
 import { countGroupsByEntities } from "@/utils/groups.be";
-import { checkAccess, findAllowedEntities } from "@/utils/permissions";
-import { calculateAverageLevel } from "@/utils/score";
+import {
+  checkAccess,
+  groupAllowedEntitiesByPermissions,
+} from "@/utils/permissions";
 import { groupByExam } from "@/utils/stats";
-import { getStatsByUsers } from "@/utils/stats.be";
-import { countAllowedUsers, filterAllowedUsers, getUsers } from "@/utils/users.be";
+import { countAllowedUsers, getUsers } from "@/utils/users.be";
 import { withIronSessionSsr } from "iron-session/next";
-import { uniqBy } from "lodash";
 import moment from "moment";
 import Head from "next/head";
 import { useRouter } from "next/router";
 import { useMemo } from "react";
 import {
-	BsClipboard2Data,
   BsClock,
   BsEnvelopePaper,
   BsPencilSquare,
@@ -37,10 +35,10 @@ import { isAdmin } from "@/utils/users";
 
 interface Props {
   user: User;
-	students: StudentUser[]
-	latestStudents: User[]
-	latestTeachers: User[]
-	userCounts: { [key in Type]: number }
+  students: StudentUser[];
+  latestStudents: User[];
+  latestTeachers: User[];
+  userCounts: { [key in Type]: number };
   entities: EntityWithRoles[];
   assignmentsCount: number;
   stats: Stat[];
@@ -48,38 +46,117 @@ interface Props {
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	if (!user || !user.isVerified) return redirect("/login")
+  const user = await requestUser(req, res);
+  if (!user || !user.isVerified) return redirect("/login");
 
-	if (!checkAccess(user, ["admin", "developer", "corporate"])) return redirect("/")
+  if (!checkAccess(user, ["admin", "developer", "corporate"]))
+    return redirect("/");
 
   const entityIDS = mapBy(user.entities, "id") || [];
-	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDS);
+  const entities = await getEntitiesWithRoles(
+    isAdmin(user) ? undefined : entityIDS
+  );
 
-	const allowedStudentEntities = findAllowedEntities(user, entities, "view_students")
-	const allowedTeacherEntities = findAllowedEntities(user, entities, "view_teachers")
+  const {
+    ["view_students"]: allowedStudentEntities,
+    ["view_teachers"]: allowedTeacherEntities,
+  } = groupAllowedEntitiesByPermissions(user, entities, [
+    "view_students",
+    "view_teachers",
+  ]);
 
-	const students =
-		await getUsers({ type: 'student', "entities.id": { $in: mapBy(allowedStudentEntities, 'id') } }, 10, { averageLevel: -1 });
-	const latestStudents =
-		await getUsers({ type: 'student', "entities.id": { $in: mapBy(allowedStudentEntities, 'id') } }, 10, { registrationDate: -1 })
-	const latestTeachers =
-		await getUsers({ type: 'teacher', "entities.id": { $in: mapBy(allowedTeacherEntities, 'id') } }, 10, { registrationDate: -1 })
+  const allowedStudentEntitiesIDS = mapBy(allowedStudentEntities, "id");
+  const entitiesIDS = mapBy(entities, "id") || [];
 
-	const userCounts = await countAllowedUsers(user, entities)
-	const assignmentsCount = await countEntitiesAssignments(mapBy(entities, "id"), { archived: { $ne: true } });
-	const groupsCount = await countGroupsByEntities(mapBy(entities, "id"));
+  const [
+    students,
+    latestStudents,
+    latestTeachers,
+    userCounts,
+    assignmentsCount,
+    groupsCount,
+  ] = await Promise.all([
+    getUsers(
+      { type: "student", "entities.id": { $in: allowedStudentEntitiesIDS } },
+      10,
+      { averageLevel: -1 },
+      { _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
+    ),
+    getUsers(
+      { type: "student", "entities.id": { $in: allowedStudentEntitiesIDS } },
+      10,
+      { registrationDate: -1 },
+      { _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
+    ),
+    getUsers(
+      {
+        type: "teacher",
+        "entities.id": { $in: mapBy(allowedTeacherEntities, "id") },
+      },
+      10,
+      { registrationDate: -1 },
+      { _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
+    ),
+    countAllowedUsers(user, entities),
+    countEntitiesAssignments(entitiesIDS, {
+      archived: { $ne: true },
+    }),
+    countGroupsByEntities(entitiesIDS),
+  ]);
 
-	return { props: serialize({ user, students, latestStudents, latestTeachers, userCounts, entities, assignmentsCount, groupsCount }) };
+  return {
+    props: serialize({
+      user,
+      students,
+      latestStudents,
+      latestTeachers,
+      userCounts,
+      entities,
+      assignmentsCount,
+      groupsCount,
+    }),
+  };
 }, sessionOptions);
 
-export default function Dashboard({ user, students, latestStudents, latestTeachers, userCounts, entities, assignmentsCount, stats = [], groupsCount }: Props) {
-	const totalCount = useMemo(() =>
-		userCounts.corporate + userCounts.mastercorporate + userCounts.student + userCounts.teacher, [userCounts])
-	const totalLicenses = useMemo(() => entities.reduce((acc, curr) => acc + parseInt(curr.licenses.toString()), 0), [entities])
+export default function Dashboard({
+  user,
+  students,
+  latestStudents,
+  latestTeachers,
+  userCounts,
+  entities,
+  assignmentsCount,
+  stats = [],
+  groupsCount,
+}: Props) {
+  const totalCount = useMemo(
+    () =>
+      userCounts.corporate +
+      userCounts.mastercorporate +
+      userCounts.student +
+      userCounts.teacher,
+    [userCounts]
+  );
 
-	const allowedEntityStatistics = useAllowedEntities(user, entities, 'view_entity_statistics')
-	const allowedStudentPerformance = useAllowedEntities(user, entities, 'view_student_performance')
+  const totalLicenses = useMemo(
+    () =>
+      entities.reduce(
+        (acc, curr) => acc + parseInt(curr.licenses.toString()),
+        0
+      ),
+    [entities]
+  );
+
+  const allowedEntityStatistics = useAllowedEntities(
+    user,
+    entities,
+    "view_entity_statistics"
+  );
+  const allowedStudentPerformance = useAllowedEntities(
+    user,
+    entities,
+    "view_student_performance"
+  );
 
   const router = useRouter();
 
@@ -95,7 +172,7 @@ export default function Dashboard({ user, students, latestStudents, latestTeache
         <link rel="icon" href="/favicon.ico" />
       </Head>
       <ToastContainer />
-			<Layout user={user}>
+      <>
         <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">
@@ -124,14 +201,16 @@ export default function Dashboard({ user, students, latestStudents, latestTeache
               value={groupsCount}
               color="purple"
             />
-						<IconCard Icon={BsPeopleFill}
+            <IconCard
+              Icon={BsPeopleFill}
               onClick={() => router.push("/entities")}
               label="Entities"
               value={`${entities.length} - ${totalCount}/${totalLicenses}`}
               color="purple"
             />
             {allowedEntityStatistics.length > 0 && (
-							<IconCard Icon={BsPersonFillGear}
+              <IconCard
+                Icon={BsPersonFillGear}
                 onClick={() => router.push("/statistical")}
                 label="Entity Statistics"
                 value={allowedEntityStatistics.length}
@@ -139,7 +218,8 @@ export default function Dashboard({ user, students, latestStudents, latestTeache
               />
             )}
             {allowedStudentPerformance.length > 0 && (
-							<IconCard Icon={BsPersonFillGear}
+              <IconCard
+                Icon={BsPersonFillGear}
                 onClick={() => router.push("/users/performance")}
                 label="Student Performance"
                 value={userCounts.student}
@@ -149,7 +229,11 @@ export default function Dashboard({ user, students, latestStudents, latestTeache
             <IconCard
               Icon={BsClock}
               label="Expiration Date"
-							value={user.subscriptionExpirationDate ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy") : "Unlimited"}
+              value={
+                user.subscriptionExpirationDate
+                  ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy")
+                  : "Unlimited"
+              }
               color="rose"
             />
             <IconCard
@@ -164,31 +248,19 @@ export default function Dashboard({ user, students, latestStudents, latestTeache
         </div>
 
         <section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
+          <UserDisplayList users={latestStudents} title="Latest Students" />
+          <UserDisplayList users={latestTeachers} title="Latest Teachers" />
+          <UserDisplayList users={students} title="Highest level students" />
           <UserDisplayList
-						users={latestStudents}
-						title="Latest Students"
-					/>
-					<UserDisplayList
-						users={latestTeachers}
-						title="Latest Teachers"
-					/>
-					<UserDisplayList
-						users={students}
-						title="Highest level students"
-					/>
-					<UserDisplayList
-						users={
-							students
-								.sort(
+            users={students.sort(
               (a, b) =>
                 Object.keys(groupByExam(filterBy(stats, "user", b))).length -
-										Object.keys(groupByExam(filterBy(stats, "user", a))).length,
-								)
-						}
+                Object.keys(groupByExam(filterBy(stats, "user", a))).length
+            )}
             title="Highest exam count students"
           />
         </section>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/dashboard/developer.tsx

@@ -1,29 +1,22 @@
 /* eslint-disable @next/next/no-img-element */
-import Layout from "@/components/High/Layout";
 import UserDisplayList from "@/components/UserDisplayList";
 import IconCard from "@/components/IconCard";
 import { EntityWithRoles } from "@/interfaces/entity";
-import { Assignment } from "@/interfaces/results";
-import { Group, Stat, StudentUser, Type, User } from "@/interfaces/user";
+import { Stat, Type, User } from "@/interfaces/user";
 import { sessionOptions } from "@/lib/session";
-import { dateSorter, filterBy, mapBy, redirect, serialize } from "@/utils";
+import { filterBy, mapBy, redirect, serialize } from "@/utils";
 import { requestUser } from "@/utils/api";
-import { countEntitiesAssignments, getAssignments } from "@/utils/assignments.be";
-import { getEntitiesWithRoles } from "@/utils/entities.be";
-import { countGroups, getGroups } from "@/utils/groups.be";
+import { countEntitiesAssignments } from "@/utils/assignments.be";
+import { getEntities } from "@/utils/entities.be";
+import { countGroups } from "@/utils/groups.be";
 import { checkAccess } from "@/utils/permissions";
-import { calculateAverageLevel, calculateBandScore } from "@/utils/score";
 import { groupByExam } from "@/utils/stats";
-import { getStatsByUsers } from "@/utils/stats.be";
-import { countUsers, getUser, getUsers } from "@/utils/users.be";
+import { countUsersByTypes, getUsers } from "@/utils/users.be";
 import { withIronSessionSsr } from "iron-session/next";
-import { uniqBy } from "lodash";
 import Head from "next/head";
 import { useRouter } from "next/router";
-import { useMemo } from "react";
 import {
   BsBank,
-	BsClipboard2Data,
   BsEnvelopePaper,
   BsPencilSquare,
   BsPeople,
@@ -36,37 +29,69 @@ import { ToastContainer } from "react-toastify";
 interface Props {
   user: User;
   students: User[];
-	latestStudents: User[]
-	latestTeachers: User[]
+  latestStudents: User[];
+  latestTeachers: User[];
   entities: EntityWithRoles[];
-	usersCount: { [key in Type]: number }
+  usersCount: { [key in Type]: number };
   assignmentsCount: number;
   stats: Stat[];
   groupsCount: number;
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	if (!user || !user.isVerified) return redirect("/login")
+  const user = await requestUser(req, res);
+  if (!user || !user.isVerified) return redirect("/login");
 
-	if (!checkAccess(user, ["admin", "developer"])) return redirect("/")
+  if (!checkAccess(user, ["admin", "developer"])) return redirect("/");
 
-	const students = await getUsers({ type: 'student' }, 10, { averageLevel: -1 });
-	const usersCount = {
-		student: await countUsers({ type: "student" }),
-		teacher: await countUsers({ type: "teacher" }),
-		corporate: await countUsers({ type: "corporate" }),
-		mastercorporate: await countUsers({ type: "mastercorporate" }),
-	}
+  const [
+    students,
+    latestStudents,
+    latestTeachers,
+    usersCount,
+    entities,
+    groupsCount,
+  ] = await Promise.all([
+    getUsers(
+      { type: "student" },
+      10,
+      { averageLevel: -1 },
+      { _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
+    ),
+    getUsers(
+      { type: "student" },
+      10,
+      { registrationDate: -1 },
+      { _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
+    ),
+    getUsers(
+      { type: "teacher" },
+      10,
+      { registrationDate: -1 },
+      { _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
+    ),
+    countUsersByTypes(["student", "teacher", "corporate", "mastercorporate"]),
+    getEntities(undefined, { _id: 0, id: 1, label: 1 }),
+    countGroups(),
+  ]);
 
-	const latestStudents = await getUsers({ type: 'student' }, 10, { registrationDate: -1 })
-	const latestTeachers = await getUsers({ type: 'teacher' }, 10, { registrationDate: -1 })
+  const assignmentsCount = await countEntitiesAssignments(
+    mapBy(entities, "id"),
+    { archived: { $ne: true } }
+  );
 
-	const entities = await getEntitiesWithRoles();
-	const assignmentsCount = await countEntitiesAssignments(mapBy(entities, 'id'), { archived: { $ne: true } });
-	const groupsCount = await countGroups();
-
-	return { props: serialize({ user, students, latestStudents, latestTeachers, usersCount, entities, assignmentsCount, groupsCount }) };
+  return {
+    props: serialize({
+      user,
+      students,
+      latestStudents,
+      latestTeachers,
+      usersCount,
+      entities,
+      assignmentsCount,
+      groupsCount,
+    }),
+  };
 }, sessionOptions);
 
 export default function Dashboard({
@@ -78,7 +103,7 @@ export default function Dashboard({
   entities,
   assignmentsCount,
   stats = [],
-	groupsCount
+  groupsCount,
 }: Props) {
   const router = useRouter();
 
@@ -94,7 +119,7 @@ export default function Dashboard({
         <link rel="icon" href="/favicon.ico" />
       </Head>
       <ToastContainer />
-			<Layout user={user}>
+      <>
         <section className="grid grid-cols-5 place-items-center -md:grid-cols-2 gap-4 text-center">
           <IconCard
             onClick={() => router.push("/users?type=student")}
@@ -131,19 +156,22 @@ export default function Dashboard({
             value={groupsCount}
             color="purple"
           />
-					<IconCard Icon={BsPeopleFill}
+          <IconCard
+            Icon={BsPeopleFill}
             onClick={() => router.push("/entities")}
             label="Entities"
             value={entities.length}
             color="purple"
           />
-					<IconCard Icon={BsPersonFillGear}
+          <IconCard
+            Icon={BsPersonFillGear}
             onClick={() => router.push("/statistical")}
             label="Entity Statistics"
             value={entities.length}
             color="purple"
           />
-					<IconCard Icon={BsPersonFillGear}
+          <IconCard
+            Icon={BsPersonFillGear}
             onClick={() => router.push("/users/performance")}
             label="Student Performance"
             value={usersCount.student}
@@ -159,31 +187,19 @@ export default function Dashboard({
         </section>
 
         <section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
+          <UserDisplayList users={latestStudents} title="Latest Students" />
+          <UserDisplayList users={latestTeachers} title="Latest Teachers" />
+          <UserDisplayList users={students} title="Highest level students" />
           <UserDisplayList
-						users={latestStudents}
-						title="Latest Students"
-					/>
-					<UserDisplayList
-						users={latestTeachers}
-						title="Latest Teachers"
-					/>
-					<UserDisplayList
-						users={students}
-						title="Highest level students"
-					/>
-					<UserDisplayList
-						users={
-							students
-								.sort(
+            users={students.sort(
               (a, b) =>
-										Object.keys(groupByExam(filterBy(stats, "user", b))).length -
-										Object.keys(groupByExam(filterBy(stats, "user", a))).length,
-								)
-						}
+                Object.keys(groupByExam(filterBy(stats, "user", b.id))).length -
+                Object.keys(groupByExam(filterBy(stats, "user", a.id))).length
+            )}
             title="Highest exam count students"
           />
         </section>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/dashboard/index.tsx

@@ -1,4 +1,3 @@
-import { User } from "@/interfaces/user";
 import { sessionOptions } from "@/lib/session";
 import { redirect } from "@/utils";
 import { requestUser } from "@/utils/api";

src/pages/dashboard/mastercorporate.tsx

@@ -1,38 +1,31 @@
 /* eslint-disable @next/next/no-img-element */
-import Layout from "@/components/High/Layout";
 import UserDisplayList from "@/components/UserDisplayList";
 import IconCard from "@/components/IconCard";
 import { useAllowedEntities } from "@/hooks/useEntityPermissions";
-import { Module } from "@/interfaces";
 import { EntityWithRoles } from "@/interfaces/entity";
-import { Assignment } from "@/interfaces/results";
-import { Group, Stat, StudentUser, Type, User } from "@/interfaces/user";
+import { Stat, StudentUser, Type, User } from "@/interfaces/user";
 import { sessionOptions } from "@/lib/session";
-import { dateSorter, filterBy, mapBy, redirect, serialize } from "@/utils";
+import { filterBy, mapBy, redirect, serialize } from "@/utils";
 import { requestUser } from "@/utils/api";
-import { countEntitiesAssignments, getEntitiesAssignments } from "@/utils/assignments.be";
+import { countEntitiesAssignments } from "@/utils/assignments.be";
 import { getEntitiesWithRoles } from "@/utils/entities.be";
-import { countGroupsByEntities, getGroupsByEntities } from "@/utils/groups.be";
-import { checkAccess, findAllowedEntities } from "@/utils/permissions";
-import { calculateAverageLevel, calculateBandScore } from "@/utils/score";
+import { countGroupsByEntities } from "@/utils/groups.be";
+import {
+  checkAccess,
+  groupAllowedEntitiesByPermissions,
+} from "@/utils/permissions";
 import { groupByExam } from "@/utils/stats";
-import { getStatsByUsers } from "@/utils/stats.be";
-import { countAllowedUsers, filterAllowedUsers, getUsers } from "@/utils/users.be";
-import { getEntitiesUsers } from "@/utils/users.be";
+import { countAllowedUsers, getUsers } from "@/utils/users.be";
 import { clsx } from "clsx";
 import { withIronSessionSsr } from "iron-session/next";
-import { uniqBy } from "lodash";
 import moment from "moment";
 import Head from "next/head";
-import Link from "next/link";
 import { useRouter } from "next/router";
 import { useMemo } from "react";
 import {
   BsBank,
-	BsClipboard2Data,
   BsClock,
   BsEnvelopePaper,
-	BsPaperclip,
   BsPencilSquare,
   BsPeople,
   BsPeopleFill,
@@ -44,10 +37,10 @@ import { isAdmin } from "@/utils/users";
 
 interface Props {
   user: User;
-	students: StudentUser[]
-	latestStudents: User[]
-	latestTeachers: User[]
-	userCounts: { [key in Type]: number }
+  students: StudentUser[];
+  latestStudents: User[];
+  latestTeachers: User[];
+  userCounts: { [key in Type]: number };
   entities: EntityWithRoles[];
   assignmentsCount: number;
   stats: Stat[];
@@ -55,42 +48,118 @@ interface Props {
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	if (!user || !user.isVerified) return redirect("/login")
+  const user = await requestUser(req, res);
+  if (!user || !user.isVerified) return redirect("/login");
 
-	if (!checkAccess(user, ["admin", "developer", "mastercorporate"])) return redirect("/")
+  if (!checkAccess(user, ["admin", "developer", "mastercorporate"]))
+    return redirect("/");
 
   const entityIDS = mapBy(user.entities, "id") || [];
-	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDS);
+  const entities = await getEntitiesWithRoles(
+    isAdmin(user) ? undefined : entityIDS
+  );
+  const {
+    ["view_students"]: allowedStudentEntities,
+    ["view_teachers"]: allowedTeacherEntities,
+  } = groupAllowedEntitiesByPermissions(user, entities, [
+    "view_students",
+    "view_teachers",
+  ]);
 
-	const allowedStudentEntities = findAllowedEntities(user, entities, "view_students")
-	const allowedTeacherEntities = findAllowedEntities(user, entities, "view_teachers")
+  const allowedStudentEntitiesIDS = mapBy(allowedStudentEntities, "id");
 
-	const students =
-		await getUsers({ type: 'student', "entities.id": { $in: mapBy(allowedStudentEntities, 'id') } }, 10, { averageLevel: -1 });
-	const latestStudents =
-		await getUsers({ type: 'student', "entities.id": { $in: mapBy(allowedStudentEntities, 'id') } }, 10, { registrationDate: -1 })
-	const latestTeachers =
-		await getUsers({ type: 'teacher', "entities.id": { $in: mapBy(allowedTeacherEntities, 'id') } }, 10, { registrationDate: -1 })
+  const entitiesIDS = mapBy(entities, "id") || [];
 
-	const userCounts = await countAllowedUsers(user, entities)
-	const assignmentsCount = await countEntitiesAssignments(mapBy(entities, "id"), { archived: { $ne: true } });
-	const groupsCount = await countGroupsByEntities(mapBy(entities, "id"));
+  const [
+    students,
+    latestStudents,
+    latestTeachers,
+    userCounts,
+    assignmentsCount,
+    groupsCount,
+  ] = await Promise.all([
+    getUsers(
+      { type: "student", "entities.id": { $in: allowedStudentEntitiesIDS } },
+      10,
+      { averageLevel: -1 },
+      { _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
+    ),
+    getUsers(
+      { type: "student", "entities.id": { $in: allowedStudentEntitiesIDS } },
+      10,
+      { registrationDate: -1 },
+      { _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
+    ),
+    getUsers(
+      {
+        type: "teacher",
+        "entities.id": { $in: mapBy(allowedTeacherEntities, "id") },
+      },
+      10,
+      { registrationDate: -1 },
+      { _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
+    ),
+    countAllowedUsers(user, entities),
+    countEntitiesAssignments(entitiesIDS, { archived: { $ne: true } }),
+    countGroupsByEntities(entitiesIDS),
+  ]);
 
-	return { props: serialize({ user, students, latestStudents, latestTeachers, userCounts, entities, assignmentsCount, groupsCount }) };
+  return {
+    props: serialize({
+      user,
+      students,
+      latestStudents,
+      latestTeachers,
+      userCounts,
+      entities,
+      assignmentsCount,
+      groupsCount,
+    }),
+  };
 }, sessionOptions);
 
-export default function Dashboard({ user, students, latestStudents, latestTeachers, userCounts, entities, assignmentsCount, stats = [], groupsCount }: Props) {
+export default function Dashboard({
+  user,
+  students,
+  latestStudents,
+  latestTeachers,
+  userCounts,
+  entities,
+  assignmentsCount,
+  stats = [],
+  groupsCount,
+}: Props) {
   
-	const totalCount = useMemo(() =>
-		userCounts.corporate + userCounts.mastercorporate + userCounts.student + userCounts.teacher, [userCounts])
+  const totalCount = useMemo(
+    () =>
+      userCounts.corporate +
+      userCounts.mastercorporate +
+      userCounts.student +
+      userCounts.teacher,
+    [userCounts]
+  );
 
-	const totalLicenses = useMemo(() => entities.reduce((acc, curr) => acc + parseInt(curr.licenses.toString()), 0), [entities])
+  const totalLicenses = useMemo(
+    () =>
+      entities.reduce(
+        (acc, curr) => acc + parseInt(curr.licenses.toString()),
+        0
+      ),
+    [entities]
+  );
 
   const router = useRouter();
 
-	const allowedEntityStatistics = useAllowedEntities(user, entities, 'view_entity_statistics')
-	const allowedStudentPerformance = useAllowedEntities(user, entities, 'view_student_performance')
+  const allowedEntityStatistics = useAllowedEntities(
+    user,
+    entities,
+    "view_entity_statistics"
+  );
+  const allowedStudentPerformance = useAllowedEntities(
+    user,
+    entities,
+    "view_student_performance"
+  );
 
   return (
     <>
@@ -104,7 +173,7 @@ export default function Dashboard({ user, students, latestStudents, latestTeache
         <link rel="icon" href="/favicon.ico" />
       </Head>
       <ToastContainer />
-			<Layout user={user}>
+      <>
         <section className="grid grid-cols-5 place-items-center -md:grid-cols-2 gap-4 text-center">
           <IconCard
             onClick={() => router.push("/users?type=student")}
@@ -134,14 +203,16 @@ export default function Dashboard({ user, students, latestStudents, latestTeache
             value={groupsCount}
             color="purple"
           />
-					<IconCard Icon={BsPeopleFill}
+          <IconCard
+            Icon={BsPeopleFill}
             onClick={() => router.push("/entities")}
             label="Entities"
             value={`${entities.length} - ${totalCount}/${totalLicenses}`}
             color="purple"
           />
           {allowedStudentPerformance.length > 0 && (
-						<IconCard Icon={BsPersonFillGear}
+            <IconCard
+              Icon={BsPersonFillGear}
               onClick={() => router.push("/users/performance")}
               label="Student Performance"
               value={userCounts.student}
@@ -149,7 +220,8 @@ export default function Dashboard({ user, students, latestStudents, latestTeache
             />
           )}
           {allowedEntityStatistics.length > 0 && (
-						<IconCard Icon={BsPersonFillGear}
+            <IconCard
+              Icon={BsPersonFillGear}
               onClick={() => router.push("/statistical")}
               label="Entity Statistics"
               value={allowedEntityStatistics.length}
@@ -161,43 +233,37 @@ export default function Dashboard({ user, students, latestStudents, latestTeache
             onClick={() => router.push("/assignments")}
             label="Assignments"
             value={assignmentsCount}
-						className={clsx(allowedEntityStatistics.length === 0 && "col-span-2")}
+            className={clsx(
+              allowedEntityStatistics.length === 0 && "col-span-2"
+            )}
             color="purple"
           />
           <IconCard
             Icon={BsClock}
             label="Expiration Date"
-						value={user.subscriptionExpirationDate ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy") : "Unlimited"}
+            value={
+              user.subscriptionExpirationDate
+                ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy")
+                : "Unlimited"
+            }
             color="rose"
           />
         </section>
 
         <section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
+          <UserDisplayList users={latestStudents} title="Latest Students" />
+          <UserDisplayList users={latestTeachers} title="Latest Teachers" />
+          <UserDisplayList users={students} title="Highest level students" />
           <UserDisplayList
-						users={latestStudents}
-						title="Latest Students"
-					/>
-					<UserDisplayList
-						users={latestTeachers}
-						title="Latest Teachers"
-					/>
-					<UserDisplayList
-						users={students}
-						title="Highest level students"
-					/>
-					<UserDisplayList
-						users={
-							students
-								.sort(
+            users={students.sort(
               (a, b) =>
                 Object.keys(groupByExam(filterBy(stats, "user", b))).length -
-										Object.keys(groupByExam(filterBy(stats, "user", a))).length,
-								)
-						}
+                Object.keys(groupByExam(filterBy(stats, "user", a))).length
+            )}
             title="Highest exam count students"
           />
         </section>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/dashboard/student.tsx

@@ -1,33 +1,32 @@
 /* eslint-disable @next/next/no-img-element */
-import Layout from "@/components/High/Layout";
 import Button from "@/components/Low/Button";
 import ProgressBar from "@/components/Low/ProgressBar";
 import InviteWithUserCard from "@/components/Medium/InviteWithUserCard";
 import ModuleBadge from "@/components/ModuleBadge";
 import ProfileSummary from "@/components/ProfileSummary";
 import { Session } from "@/hooks/useSessions";
-import { Grading } from "@/interfaces";
+import { Grading, Module } from "@/interfaces";
 import { EntityWithRoles } from "@/interfaces/entity";
 import { Exam } from "@/interfaces/exam";
 import { InviteWithEntity } from "@/interfaces/invite";
-import { Assignment } from "@/interfaces/results";
-import { Stat, User } from "@/interfaces/user";
+import { Assignment, AssignmentWithHasResults } from "@/interfaces/results";
+import { User } from "@/interfaces/user";
 import { sessionOptions } from "@/lib/session";
 import useExamStore from "@/stores/exam";
 import { findBy, mapBy, redirect, serialize } from "@/utils";
 import { requestUser } from "@/utils/api";
-import { activeAssignmentFilter } from "@/utils/assignments";
-import { getAssignmentsByAssignee } from "@/utils/assignments.be";
-import { getEntitiesWithRoles, getEntityWithRoles } from "@/utils/entities.be";
+import { getAssignmentsForStudent } from "@/utils/assignments.be";
 import { getExamsByIds } from "@/utils/exams.be";
 import { getGradingSystemByEntity } from "@/utils/grading.be";
-import { convertInvitersToEntity, getInvitesByInvitee } from "@/utils/invites.be";
-import { countExamModules, countFullExams, MODULE_ARRAY, sortByModule, sortByModuleName } from "@/utils/moduleUtils";
+import {
+  convertInvitersToEntity,
+  getInvitesByInvitee,
+} from "@/utils/invites.be";
+import { MODULE_ARRAY, sortByModule } from "@/utils/moduleUtils";
 import { checkAccess } from "@/utils/permissions";
 import { getGradingLabel } from "@/utils/score";
 import { getSessionsByUser } from "@/utils/sessions.be";
-import { averageScore } from "@/utils/stats";
-import { getStatsByUser } from "@/utils/stats.be";
+import { getDetailedStatsByUser } from "@/utils/stats.be";
 import clsx from "clsx";
 import { withIronSessionSsr } from "iron-session/next";
 import { capitalize, uniqBy } from "lodash";
@@ -35,14 +34,23 @@ import moment from "moment";
 import Head from "next/head";
 import { useRouter } from "next/router";
 import { useMemo } from "react";
-import { BsBook, BsClipboard, BsFileEarmarkText, BsHeadphones, BsMegaphone, BsPen, BsPencil, BsStar } from "react-icons/bs";
+import {
+  BsBook,
+  BsClipboard,
+  BsFileEarmarkText,
+  BsHeadphones,
+  BsMegaphone,
+  BsPen,
+  BsPencil,
+  BsStar,
+} from "react-icons/bs";
 import { ToastContainer } from "react-toastify";
 
 interface Props {
   user: User;
   entities: EntityWithRoles[];
-	assignments: Assignment[];
-	stats: Stat[];
+  assignments: AssignmentWithHasResults[];
+  stats: { fullExams: number; uniqueModules: number; averageScore: number };
   exams: Exam[];
   sessions: Session[];
   invites: InviteWithEntity[];
@@ -50,59 +58,102 @@ interface Props {
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	if (!user || !user.isVerified) return redirect("/login")
+  const user = await requestUser(req, res);
+  if (!user || !user.isVerified) return redirect("/login");
 
   if (!checkAccess(user, ["admin", "developer", "student"]))
-		return redirect("/")
+    return redirect("/");
 
   const entityIDS = mapBy(user.entities, "id") || [];
+  const currentDate = moment().toISOString();
 
-	const entities = await getEntitiesWithRoles(entityIDS);
-	const assignments = await getAssignmentsByAssignee(user.id, { archived: { $ne: true } });
-	const stats = await getStatsByUser(user.id);
-	const sessions = await getSessionsByUser(user.id, 10);
-	const invites = await getInvitesByInvitee(user.id);
-	const grading = await getGradingSystemByEntity(entityIDS[0] || "");
-
-	const formattedInvites = await Promise.all(invites.map(convertInvitersToEntity));
+  const [assignments, stats, invites, grading] = await Promise.all([
+    getAssignmentsForStudent(user.id, currentDate),
+    getDetailedStatsByUser(user.id, "stats"),
+    getInvitesByInvitee(user.id),
+    getGradingSystemByEntity(entityIDS[0] || "", {
+      _id: 0,
+      steps: 1,
+    }),
+  ]);
+  const assignmentsIDs = mapBy(assignments, "id");
+  const [sessions, ...formattedInvites] = await Promise.all([
+    getSessionsByUser(user.id, 10, {
+      ["assignment.id"]: { $in: assignmentsIDs },
+    }),
+    ...invites.map(convertInvitersToEntity),
+  ]);
 
   const examIDs = uniqBy(
-		assignments.flatMap((a) =>
-			a.exams.filter((e) => e.assignee === user.id).map((e) => ({ module: e.module, id: e.id, key: `${e.module}_${e.id}` })),
+    assignments.reduce<{ module: Module; id: string; key: string }[]>(
+      (acc, a) => {
+        a.exams.forEach((e: { module: Module; id: string }) => {
+          acc.push({
+            module: e.module,
+            id: e.id,
+            key: `${e.module}_${e.id}`,
+          });
+        });
+        return acc;
+      },
+      []
     ),
-		"key",
+    "key"
   );
-	const exams = await getExamsByIds(examIDs);
 
-	return { props: serialize({ user, entities, assignments, stats, exams, sessions, invites: formattedInvites, grading }) };
+  const exams = examIDs.length > 0 ? await getExamsByIds(examIDs) : [];
+
+  return {
+    props: serialize({
+      user,
+      assignments,
+      stats: stats ,
+      exams,
+      sessions,
+      invites: formattedInvites,
+      grading,
+    }),
+  };
 }, sessionOptions);
 
-export default function Dashboard({ user, entities, assignments, stats, invites, grading, sessions, exams }: Props) {
+export default function Dashboard({
+  user,
+  entities,
+  assignments,
+  stats,
+  invites,
+  grading,
+  sessions,
+  exams,
+}: Props) {
   const router = useRouter();
 
   const dispatch = useExamStore((state) => state.dispatch);
 
   const startAssignment = (assignment: Assignment) => {
-		const assignmentExams = exams.filter(e => {
-			const exam = findBy(assignment.exams, 'id', e.id)
-			return !!exam && exam.module === e.module
-		})
+    const assignmentExams = exams.filter((e) => {
+      const exam = findBy(assignment.exams, "id", e.id);
+      return !!exam && exam.module === e.module;
+    });
 
     if (assignmentExams.every((x) => !!x)) {
       dispatch({
-				type: "INIT_EXAM", payload: {
+        type: "INIT_EXAM",
+        payload: {
           exams: assignmentExams.sort(sortByModule),
-					modules: mapBy(assignmentExams.sort(sortByModule), 'module'),
-					assignment
-				}
-			})
+          modules: mapBy(assignmentExams.sort(sortByModule), "module"),
+          assignment,
+        },
+      });
 
       router.push("/exam");
     }
   };
 
-	const studentAssignments = useMemo(() => assignments.filter(activeAssignmentFilter), [assignments]);
+  const entitiesLabels = useMemo(
+    () => (entities.length > 0 ? mapBy(entities, "label")?.join(", ") : ""),
+    [entities]
+  );
 
   return (
     <>
@@ -116,10 +167,10 @@ export default function Dashboard({ user, entities, assignments, stats, invites,
         <link rel="icon" href="/favicon.ico" />
       </Head>
       <ToastContainer />
-			<Layout user={user}>
+      <>
         {entities.length > 0 && (
-					<div className="absolute right-4 top-4 rounded-lg bg-neutral-200 px-2 py-1">
-						<b>{mapBy(entities, "label")?.join(", ")}</b>
+          <div className="rounded-lg bg-neutral-200 px-2 py-1 ">
+            <b>{entitiesLabels}</b>
           </div>
         )}
 
@@ -127,20 +178,27 @@ export default function Dashboard({ user, entities, assignments, stats, invites,
           user={user}
           items={[
             {
-							icon: <BsFileEarmarkText className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />,
-							value: countFullExams(stats),
+              icon: (
+                <BsFileEarmarkText className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />
+              ),
+              value: stats?.fullExams || 0,
               label: "Exams",
               tooltip: "Number of all conducted completed exams",
             },
             {
-							icon: <BsPencil className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />,
-							value: countExamModules(stats),
+              icon: (
+                <BsPencil className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />
+              ),
+              value: stats?.uniqueModules || 0,
               label: "Modules",
-							tooltip: "Number of all exam modules performed including Level Test",
+              tooltip:
+                "Number of all exam modules performed including Level Test",
             },
             {
-							icon: <BsStar className="text-mti-red-light h-6 w-6 md:h-8 md:w-8" />,
-							value: `${stats.length > 0 ? averageScore(stats) : 0}%`,
+              icon: (
+                <BsStar className="text-mti-red-light h-6 w-6 md:h-8 md:w-8" />
+              ),
+              value: `${stats?.averageScore.toFixed(2) || 0}%`,
               label: "Average Score",
               tooltip: "Average success rate for questions responded",
             },
@@ -151,40 +209,50 @@ export default function Dashboard({ user, entities, assignments, stats, invites,
         <section className="flex flex-col gap-1 md:gap-3">
           <span className="text-mti-black text-lg font-bold">Assignments</span>
           <span className="text-mti-gray-taupe scrollbar-hide flex gap-8 overflow-x-scroll">
-						{studentAssignments.length === 0 && "Assignments will appear here. It seems that for now there are no assignments for you."}
-						{studentAssignments
-							.sort((a, b) => moment(a.startDate).diff(b.startDate))
-							.map((assignment) => (
+            {assignments.length === 0 &&
+              "Assignments will appear here. It seems that for now there are no assignments for you."}
+            {assignments.map((assignment) => (
               <div
                 className={clsx(
                   "border-mti-gray-anti-flash flex min-w-[350px] flex-col gap-6 rounded-xl border p-4",
-										assignment.results.map((r) => r.user).includes(user.id) && "border-mti-green-light",
+                  assignment.hasResults && "border-mti-green-light"
                 )}
-									key={assignment.id}>
+                key={assignment.id}
+              >
                 <div className="flex flex-col gap-1">
-										<h3 className="text-mti-black/90 text-xl font-semibold">{assignment.name}</h3>
+                  <h3 className="text-mti-black/90 text-xl font-semibold">
+                    {assignment.name}
+                  </h3>
                   <span className="flex justify-between gap-1 text-lg">
-											<span>{moment(assignment.startDate).format("DD/MM/YY, HH:mm")}</span>
+                    <span>
+                      {moment(assignment.startDate).format("DD/MM/YY, HH:mm")}
+                    </span>
                     <span>-</span>
-											<span>{moment(assignment.endDate).format("DD/MM/YY, HH:mm")}</span>
+                    <span>
+                      {moment(assignment.endDate).format("DD/MM/YY, HH:mm")}
+                    </span>
                   </span>
                 </div>
                 <div className="flex w-full items-center justify-between">
                   <div className="-md:mt-2 grid w-fit min-w-[140px] grid-cols-2 grid-rows-2 place-items-center justify-between gap-4">
-											{assignment.exams
-												.filter((e) => e.assignee === user.id)
-												.map((e) => e.module)
-												.sort(sortByModuleName)
-												.map((module) => (
-													<ModuleBadge className="scale-110 w-full" key={module} module={module} />
+                    {assignment.exams.map((e) => (
+                      <ModuleBadge
+                        className="scale-110 w-full"
+                        key={e.module}
+                        module={e.module}
+                      />
                     ))}
                   </div>
-										{!assignment.results.map((r) => r.user).includes(user.id) && (
+                  {!assignment.hasResults && (
                     <>
                       <div
                         className="tooltip flex h-full w-full items-center justify-end pl-8 md:hidden"
-													data-tip="Your screen size is too small to perform an assignment">
-													<Button className="h-full w-full !rounded-xl" variant="outline">
+                        data-tip="Your screen size is too small to perform an assignment"
+                      >
+                        <Button
+                          className="h-full w-full !rounded-xl"
+                          variant="outline"
+                        >
                           Start
                         </Button>
                       </div>
@@ -192,24 +260,33 @@ export default function Dashboard({ user, entities, assignments, stats, invites,
                         data-tip="You have already started this assignment!"
                         className={clsx(
                           "-md:hidden h-full w-full max-w-[50%] cursor-pointer",
-														sessions.filter((x) => x.assignment?.id === assignment.id).length > 0 && "tooltip",
-													)}>
+                          sessions.filter(
+                            (x) => x.assignment?.id === assignment.id
+                          ).length > 0 && "tooltip"
+                        )}
+                      >
                         <Button
                           className={clsx("w-full h-full !rounded-xl")}
                           onClick={() => startAssignment(assignment)}
                           variant="outline"
-														disabled={sessions.filter((x) => x.assignment?.id === assignment.id).length > 0}>
+                          disabled={
+                            sessions.filter(
+                              (x) => x.assignment?.id === assignment.id
+                            ).length > 0
+                          }
+                        >
                           Start
                         </Button>
                       </div>
                     </>
                   )}
-										{assignment.results.map((r) => r.user).includes(user.id) && (
+                  {assignment.hasResults && (
                     <Button
                       onClick={() => router.push("/record")}
                       color="green"
                       className="-md:hidden h-full w-full max-w-[50%] !rounded-xl"
-												variant="outline">
+                      variant="outline"
+                    >
                       Submitted
                     </Button>
                   )}
@@ -224,7 +301,11 @@ export default function Dashboard({ user, entities, assignments, stats, invites,
           <section className="flex flex-col gap-1 md:gap-3">
             <span className="text-mti-gray-taupe scrollbar-hide flex gap-8 overflow-x-scroll">
               {invites.map((invite) => (
-								<InviteWithUserCard key={invite.id} invite={invite} reload={() => router.replace(router.asPath)} />
+                <InviteWithUserCard
+                  key={invite.id}
+                  invite={invite}
+                  reload={() => router.replace(router.asPath)}
+                />
               ))}
             </span>
           </section>
@@ -238,20 +319,41 @@ export default function Dashboard({ user, entities, assignments, stats, invites,
               const desiredLevel = user.desiredLevels[module] || 9;
               const level = user.levels[module] || 0;
               return (
-								<div className="border-mti-gray-anti-flash flex flex-col gap-2 rounded-xl border p-4" key={module}>
+                <div
+                  className="border-mti-gray-anti-flash flex flex-col gap-2 rounded-xl border p-4 w-full"
+                  key={module}
+                >
                   <div className="flex items-center gap-2 md:gap-3">
                     <div className="bg-mti-gray-smoke flex h-8 w-8 items-center justify-center rounded-lg md:h-12 md:w-12 md:rounded-xl">
-											{module === "reading" && <BsBook className="text-ielts-reading h-4 w-4 md:h-5 md:w-5" />}
-											{module === "listening" && <BsHeadphones className="text-ielts-listening h-4 w-4 md:h-5 md:w-5" />}
-											{module === "writing" && <BsPen className="text-ielts-writing h-4 w-4 md:h-5 md:w-5" />}
-											{module === "speaking" && <BsMegaphone className="text-ielts-speaking h-4 w-4 md:h-5 md:w-5" />}
-											{module === "level" && <BsClipboard className="text-ielts-level h-4 w-4 md:h-5 md:w-5" />}
+                      {module === "reading" && (
+                        <BsBook className="text-ielts-reading h-4 w-4 md:h-5 md:w-5" />
+                      )}
+                      {module === "listening" && (
+                        <BsHeadphones className="text-ielts-listening h-4 w-4 md:h-5 md:w-5" />
+                      )}
+                      {module === "writing" && (
+                        <BsPen className="text-ielts-writing h-4 w-4 md:h-5 md:w-5" />
+                      )}
+                      {module === "speaking" && (
+                        <BsMegaphone className="text-ielts-speaking h-4 w-4 md:h-5 md:w-5" />
+                      )}
+                      {module === "level" && (
+                        <BsClipboard className="text-ielts-level h-4 w-4 md:h-5 md:w-5" />
+                      )}
                     </div>
                     <div className="flex w-full justify-between">
-											<span className="text-sm font-bold md:font-extrabold">{capitalize(module)}</span>
+                      <span className="text-sm font-bold md:font-extrabold">
+                        {capitalize(module)}
+                      </span>
                       <span className="text-mti-gray-dim text-sm font-normal">
-												{module === "level" && !!grading && `English Level: ${getGradingLabel(level, grading.steps)}`}
-												{module !== "level" && `Level ${level} / Level 9 (Desired Level: ${desiredLevel})`}
+                        {module === "level" &&
+                          !!grading &&
+                          `English Level: ${getGradingLabel(
+                            level,
+                            grading.steps
+                          )}`}
+                        {module !== "level" &&
+                          `Level ${level} / Level 9 (Desired Level: ${desiredLevel})`}
                       </span>
                     </div>
                   </div>
@@ -259,9 +361,17 @@ export default function Dashboard({ user, entities, assignments, stats, invites,
                     <ProgressBar
                       color={module}
                       label=""
-											mark={module === "level" ? undefined : Math.round((desiredLevel * 100) / 9)}
+                      mark={
+                        module === "level"
+                          ? undefined
+                          : Math.round((desiredLevel * 100) / 9)
+                      }
                       markLabel={`Desired Level: ${desiredLevel}`}
-											percentage={module === "level" ? level : Math.round((level * 100) / 9)}
+                      percentage={
+                        module === "level"
+                          ? level
+                          : Math.round((level * 100) / 9)
+                      }
                       className="h-2 w-full"
                     />
                   </div>
@@ -270,7 +380,7 @@ export default function Dashboard({ user, entities, assignments, stats, invites,
             })}
           </div>
         </section>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/dashboard/teacher.tsx

@@ -1,8 +1,6 @@
 /* eslint-disable @next/next/no-img-element */
-import Layout from "@/components/High/Layout";
 import UserDisplayList from "@/components/UserDisplayList";
 import IconCard from "@/components/IconCard";
-import { Module } from "@/interfaces";
 import { EntityWithRoles } from "@/interfaces/entity";
 import { Assignment } from "@/interfaces/results";
 import { Group, Stat, User } from "@/interfaces/user";
@@ -12,25 +10,28 @@ import { getEntitiesAssignments } from "@/utils/assignments.be";
 import { getEntitiesWithRoles } from "@/utils/entities.be";
 import { getGroupsByEntities } from "@/utils/groups.be";
 import { checkAccess, findAllowedEntities } from "@/utils/permissions";
-import { calculateAverageLevel, calculateBandScore } from "@/utils/score";
+import { calculateAverageLevel } from "@/utils/score";
 import { groupByExam } from "@/utils/stats";
 import { getStatsByUsers } from "@/utils/stats.be";
-import { getEntitiesUsers } from "@/utils/users.be";
 import { withIronSessionSsr } from "iron-session/next";
-import { uniqBy } from "lodash";
 import Head from "next/head";
 import { useRouter } from "next/router";
-import { useMemo } from "react";
-import { BsClipboard2Data, BsEnvelopePaper, BsPaperclip, BsPeople, BsPersonFill, BsPersonFillGear } from "react-icons/bs";
+import {
+  BsEnvelopePaper,
+  BsPeople,
+  BsPersonFill,
+  BsPersonFillGear,
+} from "react-icons/bs";
 import { ToastContainer } from "react-toastify";
 import { requestUser } from "@/utils/api";
 import { useAllowedEntities } from "@/hooks/useEntityPermissions";
-import { filterAllowedUsers } from "@/utils/users.be";
+import { getEntitiesUsers } from "@/utils/users.be";
 import { isAdmin } from "@/utils/users";
+import { useMemo } from "react";
 
 interface Props {
   user: User;
-	users: User[];
+  students: User[];
   entities: EntityWithRoles[];
   assignments: Assignment[];
   stats: Stat[];
@@ -38,29 +39,72 @@ interface Props {
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	if (!user || !user.isVerified) return redirect("/login")
+  const user = await requestUser(req, res);
+  if (!user || !user.isVerified) return redirect("/login");
 
   if (!checkAccess(user, ["admin", "developer", "teacher"]))
-		return redirect("/")
+    return redirect("/");
 
   const entityIDS = mapBy(user.entities, "id") || [];
-	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDS);
-	const users = await filterAllowedUsers(user, entities)
 
-	const assignments = await getEntitiesAssignments(entityIDS);
-	const stats = await getStatsByUsers(users.map((u) => u.id));
-	const groups = await getGroupsByEntities(entityIDS);
+  const entities = await getEntitiesWithRoles(
+    isAdmin(user) ? undefined : entityIDS
+  );
 
-	return { props: serialize({ user, users, entities, assignments, stats, groups }) };
+  const filteredEntities = findAllowedEntities(user, entities, "view_students");
+
+  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));
+
+  return {
+    props: serialize({ user, students, entities, assignments, stats, groups }),
+  };
 }, sessionOptions);
 
-export default function Dashboard({ user, users, entities, assignments, stats, groups }: Props) {
-	const students = useMemo(() => users.filter((u) => u.type === "student"), [users]);
+export default function Dashboard({
+  user,
+  students,
+  entities,
+  assignments,
+  stats,
+  groups,
+}: Props) {
   const router = useRouter();
 
-	const allowedEntityStatistics = useAllowedEntities(user, entities, 'view_entity_statistics')
-	const allowedStudentPerformance = useAllowedEntities(user, entities, 'view_student_performance')
+  const allowedEntityStatistics = useAllowedEntities(
+    user,
+    entities,
+    "view_entity_statistics"
+  );
+  const allowedStudentPerformance = useAllowedEntities(
+    user,
+    entities,
+    "view_student_performance"
+  );
+  const entitiesLabels = useMemo(
+    () => mapBy(entities, "label")?.join(", "),
+    [entities]
+  );
 
   return (
     <>
@@ -74,11 +118,11 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
         <link rel="icon" href="/favicon.ico" />
       </Head>
       <ToastContainer />
-			<Layout user={user}>
+      <>
         <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">
@@ -97,7 +141,8 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
               color="purple"
             />
             {allowedStudentPerformance.length > 0 && (
-							<IconCard Icon={BsPersonFillGear}
+              <IconCard
+                Icon={BsPersonFillGear}
                 onClick={() => router.push("/users/performance")}
                 label="Student Performance"
                 value={students.length}
@@ -105,7 +150,8 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
               />
             )}
             {allowedEntityStatistics.length > 0 && (
-							<IconCard Icon={BsPersonFillGear}
+              <IconCard
+                Icon={BsPersonFillGear}
                 onClick={() => router.push("/statistical")}
                 label="Entity Statistics"
                 value={allowedEntityStatistics.length}
@@ -124,26 +170,29 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 
         <section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
           <UserDisplayList
-						users={students.sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))}
+            users={students.sort((a, b) =>
+              dateSorter(a, b, "desc", "registrationDate")
+            )}
             title="Latest Students"
           />
           <UserDisplayList
-						users={students.sort((a, b) => calculateAverageLevel(b.levels) - calculateAverageLevel(a.levels))}
+            users={students.sort(
+              (a, b) =>
+                calculateAverageLevel(b.levels) -
+                calculateAverageLevel(a.levels)
+            )}
             title="Highest level students"
           />
           <UserDisplayList
-						users={
-							students
-								.sort(
+            users={students.sort(
               (a, b) =>
                 Object.keys(groupByExam(filterBy(stats, "user", b))).length -
-										Object.keys(groupByExam(filterBy(stats, "user", a))).length,
-								)
-						}
+                Object.keys(groupByExam(filterBy(stats, "user", a))).length
+            )}
             title="Highest exam count students"
           />
         </section>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/entities/[id]/index.tsx

@@ -1,24 +1,25 @@
 /* eslint-disable @next/next/no-img-element */
 import CardList from "@/components/High/CardList";
-import Layout from "@/components/High/Layout";
 import Select from "@/components/Low/Select";
 import Input from "@/components/Low/Input";
 import Checkbox from "@/components/Low/Checkbox";
 import Tooltip from "@/components/Low/Tooltip";
 import { useEntityPermission } from "@/hooks/useEntityPermissions";
-import { useListSearch } from "@/hooks/useListSearch";
-import usePagination from "@/hooks/usePagination";
-import { Entity, EntityWithRoles, Role } from "@/interfaces/entity";
-import { GroupWithUsers, User } from "@/interfaces/user";
+import { EntityWithRoles, Role } from "@/interfaces/entity";
+import { User } from "@/interfaces/user";
 import { sessionOptions } from "@/lib/session";
 import { USER_TYPE_LABELS } from "@/resources/user";
 import { findBy, mapBy, redirect, serialize } from "@/utils";
 import { getEntityWithRoles } from "@/utils/entities.be";
-import { convertToUsers, getGroup } from "@/utils/groups.be";
 import { shouldRedirectHome } from "@/utils/navigation.disabled";
-import { checkAccess, doesEntityAllow, getTypesOfUser } from "@/utils/permissions";
+import { doesEntityAllow } from "@/utils/permissions";
 import { getUserName, isAdmin } from "@/utils/users";
-import { filterAllowedUsers, getEntitiesUsers, getEntityUsers, getLinkedUsers, getSpecificUsers, getUsers } from "@/utils/users.be";
+import {
+  filterAllowedUsers,
+  getEntitiesUsers,
+  getEntityUsers,
+  getUsers,
+} from "@/utils/users.be";
 import { Menu, MenuButton, MenuItem, MenuItems } from "@headlessui/react";
 import axios from "axios";
 import clsx from "clsx";
@@ -28,7 +29,7 @@ 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 { useEffect, useState } from "react";
 import ReactDatePicker from "react-datepicker";
 import { CURRENCIES } from "@/resources/paypal";
 
@@ -37,25 +38,27 @@ import {
   BsChevronLeft,
   BsClockFill,
   BsEnvelopeFill,
-	BsFillPersonVcardFill,
   BsHash,
   BsPerson,
   BsPlus,
-	BsSquare,
   BsStopwatchFill,
   BsTag,
   BsTrash,
   BsX,
 } from "react-icons/bs";
 import { toast } from "react-toastify";
+import entities from "../../api/entities";
 
 const expirationDateColor = (date: Date) => {
   const momentDate = moment(date);
   const today = moment(new Date());
 
-	if (today.add(1, "days").isAfter(momentDate)) return "!bg-mti-red-ultralight border-mti-red-light";
-	if (today.add(3, "days").isAfter(momentDate)) return "!bg-mti-rose-ultralight border-mti-rose-light";
-	if (today.add(7, "days").isAfter(momentDate)) return "!bg-mti-orange-ultralight border-mti-orange-light";
+  if (today.add(1, "days").isAfter(momentDate))
+    return "!bg-mti-red-ultralight border-mti-red-light";
+  if (today.add(3, "days").isAfter(momentDate))
+    return "!bg-mti-rose-ultralight border-mti-rose-light";
+  if (today.add(7, "days").isAfter(momentDate))
+    return "!bg-mti-orange-ultralight border-mti-orange-light";
 };
 
 const CURRENCIES_OPTIONS = CURRENCIES.map(({ label, currency }) => ({
@@ -63,26 +66,62 @@ const CURRENCIES_OPTIONS = CURRENCIES.map(({ label, currency }) => ({
   label,
 }));
 
-export const getServerSideProps = withIronSessionSsr(async ({ req, params }) => {
+const USER_DATA_SCHEMA = {
+  _id: 0,
+  id: 1,
+  name: 1,
+  type: 1,
+  profilePicture: 1,
+  email: 1,
+  lastLogin: 1,
+  subscriptionExpirationDate: 1,
+  entities: 1,
+  corporateInformation: 1,
+};
+
+export const getServerSideProps = withIronSessionSsr(
+  async ({ req, params }) => {
     const user = req.session.user as User;
 
-	if (!user) return redirect("/login")
-	if (shouldRedirectHome(user)) return redirect("/")
+    if (!user) return redirect("/login");
+    if (shouldRedirectHome(user)) return redirect("/");
 
     const { id } = params as { id: string };
 
     const entity = await getEntityWithRoles(id);
-	if (!entity) return redirect("/entities")
+    if (!entity) return redirect("/entities");
 
-	if (!doesEntityAllow(user, entity, "view_entities")) return redirect(`/entities`)
-
-	const linkedUsers = await (isAdmin(user) ? getUsers() : getEntitiesUsers(mapBy(user.entities, 'id'),
-		{ $and: [{ type: { $ne: "developer" } }, { type: { $ne: "admin" } }] }))
-	const entityUsers = await (isAdmin(user) ? getEntityUsers(id) : filterAllowedUsers(user, [entity]));
+    if (!doesEntityAllow(user, entity, "view_entities"))
+      return redirect(`/entities`);
+    const [linkedUsers, entityUsers] = await Promise.all([
+      isAdmin(user)
+        ? getUsers({}, 0, {}, USER_DATA_SCHEMA)
+        : getEntitiesUsers(
+            mapBy(user.entities, "id"),
+            {
+              $and: [
+                { type: { $ne: "developer" } },
+                { type: { $ne: "admin" } },
+              ],
+            },
+            0,
+            USER_DATA_SCHEMA
+          ),
+      isAdmin(user)
+        ? getEntityUsers(
+            id,
+            0,
+            {
+              id: { $ne: user.id },
+            },
+            USER_DATA_SCHEMA
+          )
+        : filterAllowedUsers(user, [entity], USER_DATA_SCHEMA),
+    ]);
 
     const usersWithRole = entityUsers.map((u) => {
-		const e = u.entities.find((e) => e.id === id);
-		return { ...u, role: findBy(entity.roles, 'id', e?.role) };
+      const e = u?.entities?.find((e) => e.id === id);
+      return { ...u, role: findBy(entity.roles, "id", e?.role) };
     });
 
     return {
@@ -90,10 +129,14 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, params }) =>
         user,
         entity,
         users: usersWithRole,
-			linkedUsers: linkedUsers.filter(x => x.id !== user.id && !mapBy(entityUsers, 'id').includes(x.id)),
+        linkedUsers: linkedUsers.filter(
+          (x) => !mapBy(entityUsers, "id").includes(x.id)
+        ),
       }),
     };
-}, sessionOptions);
+  },
+  sessionOptions
+);
 
 type UserWithRole = User & { role?: Role };
 
@@ -108,34 +151,52 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
   const [isAdding, setIsAdding] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
   const [selectedUsers, setSelectedUsers] = useState<string[]>([]);
-	const [expiryDate, setExpiryDate] = useState(entity?.expiryDate)
-	const [paymentPrice, setPaymentPrice] = useState(entity?.payment?.price)
-	const [paymentCurrency, setPaymentCurrency] = useState(entity?.payment?.currency)
+  const [expiryDate, setExpiryDate] = useState(entity?.expiryDate);
+  const [paymentPrice, setPaymentPrice] = useState(entity?.payment?.price);
+  const [paymentCurrency, setPaymentCurrency] = useState(
+    entity?.payment?.currency
+  );
 
   const router = useRouter();
 
-	const canRenameEntity = useEntityPermission(user, entity, "rename_entity")
-	const canViewRoles = useEntityPermission(user, entity, "view_entity_roles")
-	const canDeleteEntity = useEntityPermission(user, entity, "delete_entity")
+  const canRenameEntity = useEntityPermission(user, entity, "rename_entity");
+  const canViewRoles = useEntityPermission(user, entity, "view_entity_roles");
+  const canDeleteEntity = useEntityPermission(user, entity, "delete_entity");
 
-	const canAddMembers = useEntityPermission(user, entity, "add_to_entity")
-	const canRemoveMembers = useEntityPermission(user, entity, "remove_from_entity")
+  const canAddMembers = useEntityPermission(user, entity, "add_to_entity");
+  const canRemoveMembers = useEntityPermission(
+    user,
+    entity,
+    "remove_from_entity"
+  );
 
-	const canAssignRole = useEntityPermission(user, entity, "assign_to_role")
-	const canPay = useEntityPermission(user, entity, 'pay_entity')
+  const canAssignRole = useEntityPermission(user, entity, "assign_to_role");
+  const canPay = useEntityPermission(user, entity, "pay_entity");
 
-	const toggleUser = (u: User) => setSelectedUsers((prev) => (prev.includes(u.id) ? prev.filter((p) => p !== u.id) : [...prev, u.id]));
+  const toggleUser = (u: User) =>
+    setSelectedUsers((prev) =>
+      prev.includes(u.id) ? prev.filter((p) => p !== u.id) : [...prev, u.id]
+    );
 
   const removeParticipants = () => {
     if (selectedUsers.length === 0) return;
     if (!canRemoveMembers) return;
-		if (!confirm(`Are you sure you want to remove ${selectedUsers.length} member${selectedUsers.length === 1 ? "" : "s"} from this entity?`))
+    if (
+      !confirm(
+        `Are you sure you want to remove ${selectedUsers.length} member${
+          selectedUsers.length === 1 ? "" : "s"
+        } from this entity?`
+      )
+    )
       return;
 
     setIsLoading(true);
 
     axios
-			.patch(`/api/entities/${entity.id}/users`, { add: false, members: selectedUsers })
+      .patch(`/api/entities/${entity.id}/users`, {
+        add: false,
+        members: selectedUsers,
+      })
       .then(() => {
         toast.success("The entity has been updated successfully!");
         router.replace(router.asPath);
@@ -151,13 +212,24 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
   const addParticipants = () => {
     if (selectedUsers.length === 0) return;
     if (!canAddMembers || !isAdding) return;
-		if (!confirm(`Are you sure you want to add ${selectedUsers.length} member${selectedUsers.length === 1 ? "" : "s"} to this entity?`)) return;
+    if (
+      !confirm(
+        `Are you sure you want to add ${selectedUsers.length} member${
+          selectedUsers.length === 1 ? "" : "s"
+        } to this entity?`
+      )
+    )
+      return;
 
     setIsLoading(true);
-		const defaultRole = findBy(entity.roles, 'isDefault', true)!
+    const defaultRole = findBy(entity.roles, "isDefault", true)!;
 
     axios
-			.patch(`/api/entities/${entity.id}/users`, { add: true, members: selectedUsers, role: defaultRole.id })
+      .patch(`/api/entities/${entity.id}/users`, {
+        add: true,
+        members: selectedUsers,
+        role: defaultRole.id,
+      })
       .then(() => {
         toast.success("The entity has been updated successfully!");
         router.replace(router.asPath);
@@ -212,7 +284,9 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
 
     setIsLoading(true);
     axios
-			.patch(`/api/entities/${entity.id}`, { payment: { price: paymentPrice, currency: paymentCurrency } })
+      .patch(`/api/entities/${entity.id}`, {
+        payment: { price: paymentPrice, currency: paymentCurrency },
+      })
       .then(() => {
         toast.success("The entity has been updated successfully!");
         router.replace(router.asPath);
@@ -227,9 +301,13 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
   const editLicenses = () => {
     if (!isAdmin(user)) return;
 
-		const licenses = prompt("Update the number of licenses:", (entity.licenses || 0).toString());
+    const licenses = prompt(
+      "Update the number of licenses:",
+      (entity.licenses || 0).toString()
+    );
     if (!licenses) return;
-		if (!parseInt(licenses) || parseInt(licenses) <= 0) return toast.error("Write a valid number of licenses!")
+    if (!parseInt(licenses) || parseInt(licenses) <= 0)
+      return toast.error("Write a valid number of licenses!");
 
     setIsLoading(true);
     axios
@@ -265,8 +343,8 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
   };
 
   const assignUsersToRole = (role: string) => {
-		if (!canAssignRole) return
-		if (selectedUsers.length === 0) return
+    if (!canAssignRole) return;
+    if (selectedUsers.length === 0) return;
 
     setIsLoading(true);
     axios
@@ -280,7 +358,7 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
         toast.error("Something went wrong!");
       })
       .finally(() => setIsLoading(false));
-	}
+  };
 
   const renderCard = (u: UserWithRole) => {
     return (
@@ -291,8 +369,9 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
         className={clsx(
           "p-4 pr-6 h-48 relative border rounded-xl flex flex-col gap-3 justify-between text-left cursor-pointer",
           "hover:border-mti-purple transition ease-in-out duration-300",
-					selectedUsers.includes(u.id) && "border-mti-purple",
-				)}>
+          selectedUsers.includes(u.id) && "border-mti-purple"
+        )}
+      >
         <div className="flex items-center gap-2">
           <div className="min-w-[3rem] min-h-[3rem] w-12 h-12 border flex items-center justify-center overflow-hidden rounded-full">
             <img src={u.profilePicture} alt={u.name} />
@@ -317,13 +396,17 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
             <Tooltip tooltip="Expiration Date">
               <BsStopwatchFill />
             </Tooltip>
-						{u.subscriptionExpirationDate ? moment(u.subscriptionExpirationDate).format("DD/MM/YYYY") : "Unlimited"}
+            {u.subscriptionExpirationDate
+              ? moment(u.subscriptionExpirationDate).format("DD/MM/YYYY")
+              : "Unlimited"}
           </span>
           <span className="flex items-center gap-2">
             <Tooltip tooltip="Last Login">
               <BsClockFill />
             </Tooltip>
-						{u.lastLogin ? moment(u.lastLogin).format("DD/MM/YYYY - HH:mm") : "N/A"}
+            {u.lastLogin
+              ? moment(u.lastLogin).format("DD/MM/YYYY - HH:mm")
+              : "N/A"}
           </span>
         </div>
       </button>
@@ -344,17 +427,21 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
         <link rel="icon" href="/favicon.ico" />
       </Head>
 
-			<Layout user={user}>
+      <>
         <section className="flex flex-col gap-0">
           <div className="flex flex-col gap-3">
             <div className="flex items-start justify-between">
               <div className="flex items-center gap-2">
                 <Link
                   href="/entities"
-									className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl">
+                  className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl"
+                >
                   <BsChevronLeft />
                 </Link>
-								<h2 className="font-bold text-2xl">{entity.label} {isAdmin(user) && `- ${entity.licenses || 0} licenses`}</h2>
+                <h2 className="font-bold text-2xl">
+                  {entity.label}{" "}
+                  {isAdmin(user) && `- ${entity.licenses || 0} licenses`}
+                </h2>
               </div>
 
               {!isAdmin(user) && canPay && (
@@ -363,11 +450,15 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
                   className={clsx(
                     "p-2 w-full max-w-[200px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
                     "transition duration-300 ease-in-out",
-										!entity.expiryDate ? "!bg-mti-green-ultralight !border-mti-green-light" : expirationDateColor(entity.expiryDate),
-										"bg-white border-mti-gray-platinum",
-									)}>
+                    !entity.expiryDate
+                      ? "!bg-mti-green-ultralight !border-mti-green-light"
+                      : expirationDateColor(entity.expiryDate),
+                    "bg-white border-mti-gray-platinum"
+                  )}
+                >
                   {!entity.expiryDate && "Unlimited"}
-									{entity.expiryDate && moment(entity.expiryDate).format("DD/MM/YYYY")}
+                  {entity.expiryDate &&
+                    moment(entity.expiryDate).format("DD/MM/YYYY")}
                 </Link>
               )}
             </div>
@@ -375,7 +466,8 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
               <button
                 onClick={renameGroup}
                 disabled={isLoading || !canRenameEntity}
-								className="flex items-center gap-1 px-2 py-2 border rounded-full hover:bg-neutral-100 disabled:hover:bg-transparent disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                className="flex items-center gap-1 px-2 py-2 border rounded-full hover:bg-neutral-100 disabled:hover:bg-transparent disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+              >
                 <BsTag />
                 <span className="text-xs">Rename Entity</span>
               </button>
@@ -383,7 +475,8 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
                 <button
                   onClick={editLicenses}
                   disabled={isLoading || !isAdmin(user)}
-									className="flex items-center gap-1 px-2 py-2 border rounded-full hover:bg-neutral-100 disabled:hover:bg-transparent disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                  className="flex items-center gap-1 px-2 py-2 border rounded-full hover:bg-neutral-100 disabled:hover:bg-transparent disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+                >
                   <BsHash />
                   <span className="text-xs">Edit Licenses</span>
                 </button>
@@ -391,14 +484,16 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
               <button
                 onClick={() => router.push(`/entities/${entity.id}/roles`)}
                 disabled={isLoading || !canViewRoles}
-								className="flex items-center gap-1 px-2 py-2 border rounded-full hover:bg-neutral-100 disabled:hover:bg-transparent disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                className="flex items-center gap-1 px-2 py-2 border rounded-full hover:bg-neutral-100 disabled:hover:bg-transparent disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+              >
                 <BsPerson />
                 <span className="text-xs">Edit Roles</span>
               </button>
               <button
                 onClick={deleteGroup}
                 disabled={isLoading || !canDeleteEntity}
-								className="flex items-center gap-1 px-2 py-2 border border-mti-rose rounded-full bg-mti-rose-light text-white hover:bg-mti-rose-dark disabled:hover:bg-mti-rose-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                className="flex items-center gap-1 px-2 py-2 border border-mti-rose rounded-full bg-mti-rose-light text-white hover:bg-mti-rose-dark disabled:hover:bg-mti-rose-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+              >
                 <BsTrash />
                 <span className="text-xs">Delete Entity</span>
               </button>
@@ -416,8 +511,10 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
                       className={clsx(
                         "p-2 w-full max-w-[200px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
                         "hover:border-mti-purple tooltip",
-												!expiryDate ? "!bg-mti-green-ultralight !border-mti-green-light" : expirationDateColor(expiryDate),
-												"transition duration-300 ease-in-out",
+                        !expiryDate
+                          ? "!bg-mti-green-ultralight !border-mti-green-light"
+                          : expirationDateColor(expiryDate),
+                        "transition duration-300 ease-in-out"
                       )}
                       filterDate={(date) => moment(date).isAfter(new Date())}
                       dateFormat="dd/MM/yyyy"
@@ -431,8 +528,10 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
                       className={clsx(
                         "p-2 w-full max-w-[200px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
                         "transition duration-300 ease-in-out",
-												!expiryDate ? "!bg-mti-green-ultralight !border-mti-green-light" : expirationDateColor(expiryDate),
-												"bg-white border-mti-gray-platinum",
+                        !expiryDate
+                          ? "!bg-mti-green-ultralight !border-mti-green-light"
+                          : expirationDateColor(expiryDate),
+                        "bg-white border-mti-gray-platinum"
                       )}
                     >
                       Unlimited
@@ -441,17 +540,21 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
 
                   <Checkbox
                     isChecked={!!expiryDate}
-										onChange={(checked: boolean) => setExpiryDate(checked ? entity.expiryDate || new Date() : null)}
+                    onChange={(checked: boolean) =>
+                      setExpiryDate(
+                        checked ? entity.expiryDate || new Date() : null
+                      )
+                    }
                   >
                     Enable expiry date
                   </Checkbox>
                 </div>
 
-
                 <button
                   onClick={updateExpiryDate}
                   disabled={expiryDate === entity.expiryDate}
-									className="flex w-fit text-nowrap items-center gap-1 px-2 py-2 border rounded-full border-mti-green bg-mti-green-light text-white hover:bg-mti-green-dark disabled:hover:bg-mti-green-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                  className="flex w-fit text-nowrap items-center gap-1 px-2 py-2 border rounded-full border-mti-green bg-mti-green-light text-white hover:bg-mti-green-dark disabled:hover:bg-mti-green-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+                >
                   <BsCheck />
                   <span className="text-xs">Apply Change</span>
                 </button>
@@ -463,25 +566,34 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
                 <div className="w-full max-w-xl flex items-center gap-4">
                   <Input
                     name="paymentValue"
-										onChange={(e) => setPaymentPrice(e ? parseInt(e) : undefined)}
+                    onChange={(e) =>
+                      setPaymentPrice(e ? parseInt(e) : undefined)
+                    }
                     type="number"
                     defaultValue={entity.payment?.price || 0}
                     thin
                   />
                   <Select
                     className={clsx(
-											"px-4 !py-2 !w-full text-sm font-normal placeholder:text-mti-gray-cool bg-white rounded-full border border-mti-gray-platinum focus:outline-none",
+                      "px-4 !py-2 !w-full text-sm font-normal placeholder:text-mti-gray-cool bg-white rounded-full border border-mti-gray-platinum focus:outline-none"
                     )}
                     options={CURRENCIES_OPTIONS}
-										value={CURRENCIES_OPTIONS.find((c) => c.value === paymentCurrency)}
-										onChange={(value) => setPaymentCurrency(value?.value ?? undefined)}
+                    value={CURRENCIES_OPTIONS.find(
+                      (c) => c.value === paymentCurrency
+                    )}
+                    onChange={(value) =>
+                      setPaymentCurrency(value?.value ?? undefined)
+                    }
                   />
                 </div>
 
                 <button
                   onClick={updatePayment}
-									disabled={!paymentPrice || paymentPrice <= 0 || !paymentCurrency}
-									className="flex w-fit text-nowrap items-center gap-1 px-2 py-2 border rounded-full border-mti-green bg-mti-green-light text-white hover:bg-mti-green-dark disabled:hover:bg-mti-green-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                  disabled={
+                    !paymentPrice || paymentPrice <= 0 || !paymentCurrency
+                  }
+                  className="flex w-fit text-nowrap items-center gap-1 px-2 py-2 border rounded-full border-mti-green bg-mti-green-light text-white hover:bg-mti-green-dark disabled:hover:bg-mti-green-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+                >
                   <BsCheck />
                   <span className="text-xs">Apply Change</span>
                 </button>
@@ -491,28 +603,40 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
 
           <Divider />
           <div className="flex items-center justify-between mb-4">
-						<span className="font-semibold text-xl">Members ({users.length})</span>
+            <span className="font-semibold text-xl">
+              Members ({users.length})
+            </span>
             {!isAdding && (
               <div className="flex items-center gap-2">
                 <button
                   onClick={() => setIsAdding(true)}
                   disabled={isLoading || !canAddMembers}
-									className="flex items-center gap-1 px-2 py-2 border rounded-full hover:bg-neutral-100 disabled:hover:bg-transparent disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                  className="flex items-center gap-1 px-2 py-2 border rounded-full hover:bg-neutral-100 disabled:hover:bg-transparent disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+                >
                   <BsPlus />
                   <span className="text-xs">Add Members</span>
                 </button>
 
                 <Menu>
                   <MenuButton
-										disabled={isLoading || !canAssignRole || selectedUsers.length === 0}
-										className="flex items-center gap-1 px-2 py-2 border rounded-full hover:bg-neutral-100 disabled:hover:bg-transparent disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                    disabled={
+                      isLoading || !canAssignRole || selectedUsers.length === 0
+                    }
+                    className="flex items-center gap-1 px-2 py-2 border rounded-full hover:bg-neutral-100 disabled:hover:bg-transparent disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+                  >
                     <BsPerson />
                     <span className="text-xs">Assign Role</span>
                   </MenuButton>
-									<MenuItems anchor="bottom" className="bg-white rounded-xl shadow drop-shadow border mt-1 flex flex-col">
+                  <MenuItems
+                    anchor="bottom"
+                    className="bg-white rounded-xl shadow drop-shadow border mt-1 flex flex-col"
+                  >
                     {entity.roles.map((role) => (
                       <MenuItem key={role.id}>
-												<button onClick={() => assignUsersToRole(role.id)} className="p-4 hover:bg-neutral-100 w-32">
+                        <button
+                          onClick={() => assignUsersToRole(role.id)}
+                          className="p-4 hover:bg-neutral-100 w-32"
+                        >
                           {role.label}
                         </button>
                       </MenuItem>
@@ -522,8 +646,11 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
 
                 <button
                   onClick={removeParticipants}
-									disabled={selectedUsers.length === 0 || isLoading || !canRemoveMembers}
-									className="flex items-center gap-1 px-2 py-2 border border-mti-rose rounded-full bg-mti-rose-light text-white hover:bg-mti-rose-dark disabled:hover:bg-mti-rose-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                  disabled={
+                    selectedUsers.length === 0 || isLoading || !canRemoveMembers
+                  }
+                  className="flex items-center gap-1 px-2 py-2 border border-mti-rose rounded-full bg-mti-rose-light text-white hover:bg-mti-rose-dark disabled:hover:bg-mti-rose-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+                >
                   <BsTrash />
                   <span className="text-xs">Remove Members</span>
                 </button>
@@ -534,16 +661,22 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
                 <button
                   onClick={() => setIsAdding(false)}
                   disabled={isLoading}
-									className="flex items-center gap-1 px-2 py-2 border rounded-full border-mti-rose bg-mti-rose-light text-white hover:bg-mti-rose-dark disabled:hover:bg-mti-rose-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                  className="flex items-center gap-1 px-2 py-2 border rounded-full border-mti-rose bg-mti-rose-light text-white hover:bg-mti-rose-dark disabled:hover:bg-mti-rose-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+                >
                   <BsX />
                   <span className="text-xs">Discard Selection</span>
                 </button>
                 <button
                   onClick={addParticipants}
-									disabled={selectedUsers.length === 0 || isLoading || !canAddMembers}
-									className="flex items-center gap-1 px-2 py-2 border rounded-full border-mti-green bg-mti-green-light text-white hover:bg-mti-green-dark disabled:hover:bg-mti-green-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                  disabled={
+                    selectedUsers.length === 0 || isLoading || !canAddMembers
+                  }
+                  className="flex items-center gap-1 px-2 py-2 border rounded-full border-mti-green bg-mti-green-light text-white hover:bg-mti-green-dark disabled:hover:bg-mti-green-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+                >
                   <BsPlus />
-									<span className="text-xs">Add Members ({selectedUsers.length})</span>
+                  <span className="text-xs">
+                    Add Members ({selectedUsers.length})
+                  </span>
                 </button>
               </div>
             )}
@@ -552,10 +685,16 @@ export default function Home({ user, entity, users, linkedUsers }: Props) {
           <CardList<User | UserWithRole>
             list={isAdding ? linkedUsers : users}
             renderCard={renderCard}
-						searchFields={[["name"], ["email"], ["corporateInformation", "companyInformation", "name"], ["role", "label"], ["type"]]}
+            searchFields={[
+              ["name"],
+              ["email"],
+              ["corporateInformation", "companyInformation", "name"],
+              ["role", "label"],
+              ["type"],
+            ]}
           />
         </section>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/entities/[id]/roles/[role].tsx

@@ -1,4 +1,3 @@
-import Layout from "@/components/High/Layout";
 import Checkbox from "@/components/Low/Checkbox";
 import Separator from "@/components/Low/Separator";
 import {useEntityPermission} from "@/hooks/useEntityPermissions";
@@ -20,15 +19,10 @@ import Link from "next/link";
 import {useRouter} from "next/router";
 import {Divider} from "primereact/divider";
 import {useState} from "react";
-import {
-	BsCheck,
-	BsChevronLeft,
-	BsTag,
-	BsTrash,
-} from "react-icons/bs";
+import {BsCheck, BsChevronLeft, BsTag, BsTrash} from "react-icons/bs";
 import {toast} from "react-toastify";
 
-type PermissionLayout = { label: string, key: RolePermission }
+type PermissionLayout = {label: string; key: RolePermission};
 
 const USER_MANAGEMENT: PermissionLayout[] = [
 	{label: "View Students", key: "view_students"},
@@ -50,7 +44,7 @@ const USER_MANAGEMENT: PermissionLayout[] = [
 	{label: "Download User List", key: "download_user_list"},
 	{label: "View Code List", key: "view_code_list"},
 	{label: "Delete Code", key: "delete_code"},
-]
+];
 
 const EXAM_MANAGEMENT: PermissionLayout[] = [
 	{label: "View Reading", key: "view_reading"},
@@ -68,8 +62,9 @@ const EXAM_MANAGEMENT: PermissionLayout[] = [
 	{label: "View Level", key: "view_level"},
 	{label: "Generate Level", key: "generate_level"},
 	{label: "Delete Level", key: "delete_level"},
+	{label: "Set as Private/Public", key: "update_exam_privacy"},
 	{label: "View Statistics", key: "view_statistics"},
-]
+];
 
 const CLASSROOM_MANAGEMENT: PermissionLayout[] = [
 	{label: "View Classrooms", key: "view_classrooms"},
@@ -81,7 +76,7 @@ const CLASSROOM_MANAGEMENT: PermissionLayout[] = [
 	{label: "Delete Classroom", key: "delete_classroom"},
 	{label: "View Student Record", key: "view_student_record"},
 	{label: "Download Student Report", key: "download_student_record"},
-]
+];
 
 const ENTITY_MANAGEMENT: PermissionLayout[] = [
 	{label: "View Entities", key: "view_entities"},
@@ -100,8 +95,8 @@ const ENTITY_MANAGEMENT: PermissionLayout[] = [
 	{label: "Edit Grading System", key: "edit_grading_system"},
 	{label: "View Student Performance", key: "view_student_performance"},
 	{label: "Pay for Entity", key: "pay_entity"},
-	{ label: "View Payment Record", key: "view_payment_record" }
-]
+	{label: "View Payment Record", key: "view_payment_record"},
+];
 
 const ASSIGNMENT_MANAGEMENT: PermissionLayout[] = [
 	{label: "View Assignments", key: "view_assignments"},
@@ -110,26 +105,33 @@ const ASSIGNMENT_MANAGEMENT: PermissionLayout[] = [
 	{label: "Edit Assignments", key: "edit_assignment"},
 	{label: "Delete Assignments", key: "delete_assignment"},
 	{label: "Archive Assignments", key: "archive_assignment"},
-]
+];
+
+const WORKFLOW_MANAGEMENT: PermissionLayout[] = [
+	{label: "View Workflows", key: "view_workflows"},
+	{label: "Configure Workflows", key: "configure_workflows"},
+	{label: "Edit Workflow", key: "edit_workflow"},
+	{label: "Delete Workflow", key: "delete_workflow"},
+];
 
 export const getServerSideProps = withIronSessionSsr(async ({req, res, params}) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+	const user = await requestUser(req, res);
+	if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user)) return redirect("/")
+	if (shouldRedirectHome(user)) return redirect("/");
 
-	const { id, role } = params as { id: string, role: string };
+	const {id, role} = params as {id: string; role: string};
 
-	if (!mapBy(user.entities, 'id').includes(id) && !["admin", "developer"].includes(user.type)) return redirect("/entities")
+	if (!mapBy(user.entities, "id").includes(id) && !["admin", "developer"].includes(user.type)) return redirect("/entities");
 
 	const entity = await getEntityWithRoles(id);
-	if (!entity) return redirect("/entities")
+	if (!entity) return redirect("/entities");
 
-	const entityRole = findBy(entity.roles, 'id', role)
-	if (!entityRole) return redirect(`/entities/${id}/roles`)
+	const entityRole = findBy(entity.roles, "id", role);
+	if (!entityRole) return redirect(`/entities/${id}/roles`);
 
-	if (!doesEntityAllow(user, entity, "view_entity_roles")) return redirect(`/entities/${id}`)
-	const disableEdit = !isAdmin(user) && findBy(user.entities, 'id', entity.id)?.role === entityRole.id
+	if (!doesEntityAllow(user, entity, "view_entity_roles")) return redirect(`/entities/${id}`);
+	const disableEdit = !isAdmin(user) && findBy(user.entities, "id", entity.id)?.role === entityRole.id;
 
 	const userCount = await countEntityUsers(id, {"entities.role": role});
 
@@ -139,7 +141,7 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res, params }
 			entity,
 			role: entityRole,
 			userCount,
-			disableEdit
+			disableEdit,
 		}),
 	};
 }, sessionOptions);
@@ -149,19 +151,18 @@ interface Props {
 	entity: EntityWithRoles;
 	role: Role;
 	userCount: number;
-	disableEdit?: boolean
+	disableEdit?: boolean;
 }
 
-export default function Role({ user, entity, role, userCount, disableEdit }: Props) {
-	const [permissions, setPermissions] = useState(role.permissions)
+export default function EntityRole({user, entity, role, userCount, disableEdit}: Props) {
+	const [permissions, setPermissions] = useState(role.permissions);
 	const [isLoading, setIsLoading] = useState(false);
 
 	const router = useRouter();
 
-	const canEditPermissions = useEntityPermission(user, entity, "edit_role_permissions")
-	const canRenameRole = useEntityPermission(user, entity, "rename_entity_role")
-	const canDeleteRole = useEntityPermission(user, entity, "delete_entity_role")
-
+	const canEditPermissions = useEntityPermission(user, entity, "edit_role_permissions");
+	const canRenameRole = useEntityPermission(user, entity, "rename_entity_role");
+	const canDeleteRole = useEntityPermission(user, entity, "delete_entity_role");
 
 	const renameRole = () => {
 		if (!canRenameRole || disableEdit) return;
@@ -203,7 +204,7 @@ export default function Role({ user, entity, role, userCount, disableEdit }: Pro
 	};
 
 	const editPermissions = () => {
-		if (!canEditPermissions || disableEdit) return
+		if (!canEditPermissions || disableEdit) return;
 
 		setIsLoading(true);
 
@@ -218,21 +219,23 @@ export default function Role({ user, entity, role, userCount, disableEdit }: Pro
 				toast.error("Something went wrong!");
 			})
 			.finally(() => setIsLoading(false));
-	}
+	};
 
 	const enableCheckbox = (permission: RolePermission) => {
-		if (!canEditPermissions || disableEdit) return false
-		return doesEntityAllow(user, entity, permission)
-	}
+		if (!canEditPermissions || disableEdit) return false;
+		return doesEntityAllow(user, entity, permission);
+	};
 
-	const togglePermissions = (p: RolePermission) => setPermissions(prev => prev.includes(p) ? prev.filter(x => x !== p) : [...prev, p])
+	const togglePermissions = (p: RolePermission) => setPermissions((prev) => (prev.includes(p) ? prev.filter((x) => x !== p) : [...prev, p]));
 	const toggleMultiplePermissions = (p: RolePermission[]) =>
-		setPermissions(prev => [...prev.filter(x => !p.includes(x)), ...(p.every(x => prev.includes(x)) ? [] : p)])
+		setPermissions((prev) => [...prev.filter((x) => !p.includes(x)), ...(p.every((x) => prev.includes(x)) ? [] : p)]);
 
 	return (
 		<>
 			<Head>
-				<title>{role.label} | {entity.label} | EnCoach</title>
+				<title>
+					{role.label} | {entity.label} | EnCoach
+				</title>
 				<meta
 					name="description"
 					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
@@ -240,7 +243,7 @@ export default function Role({ user, entity, role, userCount, disableEdit }: Pro
 				<meta name="viewport" content="width=device-width, initial-scale=1" />
 				<link rel="icon" href="/favicon.ico" />
 			</Head>
-			<Layout user={user}>
+			<>
 				<section className="flex flex-col gap-0">
 					<div className="flex flex-col gap-3">
 						<div className="flex items-end justify-between">
@@ -250,7 +253,9 @@ export default function Role({ user, entity, role, userCount, disableEdit }: Pro
 									className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl">
 									<BsChevronLeft />
 								</Link>
-								<h2 className="font-bold text-2xl">{role.label} Role ({userCount} users)</h2>
+								<h2 className="font-bold text-2xl">
+									{role.label} Role ({userCount} users)
+								</h2>
 							</div>
 						</div>
 						<div className="flex items-center justify-between w-full">
@@ -287,16 +292,19 @@ export default function Role({ user, entity, role, userCount, disableEdit }: Pro
 								<b>User Management</b>
 								<Checkbox
 									disabled={!canEditPermissions || disableEdit}
-									isChecked={mapBy(USER_MANAGEMENT, 'key').every(k => permissions.includes(k))}
-									onChange={() => toggleMultiplePermissions(mapBy(USER_MANAGEMENT, 'key').filter(enableCheckbox))}
-								>
+									isChecked={mapBy(USER_MANAGEMENT, "key").every((k) => permissions.includes(k))}
+									onChange={() => toggleMultiplePermissions(mapBy(USER_MANAGEMENT, "key").filter(enableCheckbox))}>
 									Select all
 								</Checkbox>
 							</div>
 							<Separator />
 							<div className="grid grid-cols-2 gap-4">
 								{USER_MANAGEMENT.map(({label, key}) => (
-									<Checkbox disabled={!enableCheckbox(key)} key={key} isChecked={permissions.includes(key)} onChange={() => togglePermissions(key)}>
+									<Checkbox
+										disabled={!enableCheckbox(key)}
+										key={key}
+										isChecked={permissions.includes(key)}
+										onChange={() => togglePermissions(key)}>
 										{label}
 									</Checkbox>
 								))}
@@ -308,16 +316,19 @@ export default function Role({ user, entity, role, userCount, disableEdit }: Pro
 								<b>Exam Management</b>
 								<Checkbox
 									disabled={!canEditPermissions || disableEdit}
-									isChecked={mapBy(EXAM_MANAGEMENT, 'key').every(k => permissions.includes(k))}
-									onChange={() => toggleMultiplePermissions(mapBy(EXAM_MANAGEMENT, 'key').filter(enableCheckbox))}
-								>
+									isChecked={mapBy(EXAM_MANAGEMENT, "key").every((k) => permissions.includes(k))}
+									onChange={() => toggleMultiplePermissions(mapBy(EXAM_MANAGEMENT, "key").filter(enableCheckbox))}>
 									Select all
 								</Checkbox>
 							</div>
 							<Separator />
 							<div className="grid grid-cols-3 gap-4">
 								{EXAM_MANAGEMENT.map(({label, key}) => (
-									<Checkbox disabled={!enableCheckbox(key)} key={key} isChecked={permissions.includes(key)} onChange={() => togglePermissions(key)}>
+									<Checkbox
+										disabled={!enableCheckbox(key)}
+										key={key}
+										isChecked={permissions.includes(key)}
+										onChange={() => togglePermissions(key)}>
 										{label}
 									</Checkbox>
 								))}
@@ -329,16 +340,19 @@ export default function Role({ user, entity, role, userCount, disableEdit }: Pro
 								<b>Clasroom Management</b>
 								<Checkbox
 									disabled={!canEditPermissions || disableEdit}
-									isChecked={mapBy(CLASSROOM_MANAGEMENT, 'key').every(k => permissions.includes(k))}
-									onChange={() => toggleMultiplePermissions(mapBy(CLASSROOM_MANAGEMENT, 'key').filter(enableCheckbox))}
-								>
+									isChecked={mapBy(CLASSROOM_MANAGEMENT, "key").every((k) => permissions.includes(k))}
+									onChange={() => toggleMultiplePermissions(mapBy(CLASSROOM_MANAGEMENT, "key").filter(enableCheckbox))}>
 									Select all
 								</Checkbox>
 							</div>
 							<Separator />
 							<div className="grid grid-cols-2 gap-4">
 								{CLASSROOM_MANAGEMENT.map(({label, key}) => (
-									<Checkbox disabled={!enableCheckbox(key)} key={key} isChecked={permissions.includes(key)} onChange={() => togglePermissions(key)}>
+									<Checkbox
+										disabled={!enableCheckbox(key)}
+										key={key}
+										isChecked={permissions.includes(key)}
+										onChange={() => togglePermissions(key)}>
 										{label}
 									</Checkbox>
 								))}
@@ -350,16 +364,19 @@ export default function Role({ user, entity, role, userCount, disableEdit }: Pro
 								<b>Entity Management</b>
 								<Checkbox
 									disabled={!canEditPermissions || disableEdit}
-									isChecked={mapBy(ENTITY_MANAGEMENT, 'key').every(k => permissions.includes(k))}
-									onChange={() => toggleMultiplePermissions(mapBy(ENTITY_MANAGEMENT, 'key').filter(enableCheckbox))}
-								>
+									isChecked={mapBy(ENTITY_MANAGEMENT, "key").every((k) => permissions.includes(k))}
+									onChange={() => toggleMultiplePermissions(mapBy(ENTITY_MANAGEMENT, "key").filter(enableCheckbox))}>
 									Select all
 								</Checkbox>
 							</div>
 							<Separator />
 							<div className="grid grid-cols-2 gap-4">
 								{ENTITY_MANAGEMENT.map(({label, key}) => (
-									<Checkbox disabled={!enableCheckbox(key)} key={key} isChecked={permissions.includes(key)} onChange={() => togglePermissions(key)}>
+									<Checkbox
+										disabled={!enableCheckbox(key)}
+										key={key}
+										isChecked={permissions.includes(key)}
+										onChange={() => togglePermissions(key)}>
 										{label}
 									</Checkbox>
 								))}
@@ -371,16 +388,43 @@ export default function Role({ user, entity, role, userCount, disableEdit }: Pro
 								<b>Assignment Management</b>
 								<Checkbox
 									disabled={!canEditPermissions || disableEdit}
-									isChecked={mapBy(ASSIGNMENT_MANAGEMENT, 'key').every(k => permissions.includes(k))}
-									onChange={() => toggleMultiplePermissions(mapBy(ASSIGNMENT_MANAGEMENT, 'key').filter(enableCheckbox))}
-								>
+									isChecked={mapBy(ASSIGNMENT_MANAGEMENT, "key").every((k) => permissions.includes(k))}
+									onChange={() => toggleMultiplePermissions(mapBy(ASSIGNMENT_MANAGEMENT, "key").filter(enableCheckbox))}>
 									Select all
 								</Checkbox>
 							</div>
 							<Separator />
 							<div className="grid grid-cols-2 gap-4">
 								{ASSIGNMENT_MANAGEMENT.map(({label, key}) => (
-									<Checkbox disabled={!enableCheckbox(key)} key={key} isChecked={permissions.includes(key)} onChange={() => togglePermissions(key)}>
+									<Checkbox
+										disabled={!enableCheckbox(key)}
+										key={key}
+										isChecked={permissions.includes(key)}
+										onChange={() => togglePermissions(key)}>
+										{label}
+									</Checkbox>
+								))}
+							</div>
+						</div>
+
+						<div className="flex flex-col gap-4">
+							<div className="w-full flex items-center justify-between">
+								<b>Workflow Management</b>
+								<Checkbox
+									disabled={!canEditPermissions || disableEdit}
+									isChecked={mapBy(WORKFLOW_MANAGEMENT, "key").every((k) => permissions.includes(k))}
+									onChange={() => toggleMultiplePermissions(mapBy(WORKFLOW_MANAGEMENT, "key").filter(enableCheckbox))}>
+									Select all
+								</Checkbox>
+							</div>
+							<Separator />
+							<div className="grid grid-cols-2 gap-4">
+								{WORKFLOW_MANAGEMENT.map(({label, key}) => (
+									<Checkbox
+										disabled={!enableCheckbox(key)}
+										key={key}
+										isChecked={permissions.includes(key)}
+										onChange={() => togglePermissions(key)}>
 										{label}
 									</Checkbox>
 								))}
@@ -388,7 +432,7 @@ export default function Role({ user, entity, role, userCount, disableEdit }: Pro
 						</div>
 					</section>
 				</section>
-			</Layout>
+			</>
 		</>
 	);
 }

src/pages/entities/[id]/roles/index.tsx

@@ -1,42 +1,25 @@
 /* eslint-disable @next/next/no-img-element */
 import CardList from "@/components/High/CardList";
-import Layout from "@/components/High/Layout";
-import Tooltip from "@/components/Low/Tooltip";
 import { useEntityPermission } from "@/hooks/useEntityPermissions";
-import {useListSearch} from "@/hooks/useListSearch";
-import usePagination from "@/hooks/usePagination";
-import {Entity, EntityWithRoles, Role} from "@/interfaces/entity";
-import {GroupWithUsers, User} from "@/interfaces/user";
+import { EntityWithRoles, Role} from "@/interfaces/entity";
+import { User} from "@/interfaces/user";
 import {sessionOptions} from "@/lib/session";
-import {USER_TYPE_LABELS} from "@/resources/user";
 import { redirect, serialize } from "@/utils";
 import { requestUser } from "@/utils/api";
 import {getEntityWithRoles} from "@/utils/entities.be";
-import {convertToUsers, getGroup} from "@/utils/groups.be";
 import {shouldRedirectHome} from "@/utils/navigation.disabled";
-import {checkAccess, doesEntityAllow, getTypesOfUser} from "@/utils/permissions";
-import {getUserName} from "@/utils/users";
-import {getEntityUsers, getLinkedUsers, getSpecificUsers} from "@/utils/users.be";
+import { doesEntityAllow} from "@/utils/permissions";
+import {getEntityUsers} from "@/utils/users.be";
 import axios from "axios";
 import clsx from "clsx";
 import {withIronSessionSsr} from "iron-session/next";
-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 {
 	BsChevronLeft,
-	BsClockFill,
-	BsEnvelopeFill,
-	BsFillPersonVcardFill,
 	BsPlus,
-	BsSquare,
-	BsStopwatchFill,
-	BsTag,
-	BsTrash,
-	BsX,
 } from "react-icons/bs";
 import {toast, ToastContainer} from "react-toastify";
 
@@ -133,7 +116,7 @@ export default function Home({user, entity, roles, users}: Props) {
 				<link rel="icon" href="/favicon.ico" />
 			</Head>
 			<ToastContainer />
-			<Layout user={user}>
+			<>
 				<section className="flex flex-col gap-0">
 					<div className="flex flex-col gap-3">
 						<div className="flex items-end justify-between">
@@ -152,7 +135,7 @@ export default function Home({user, entity, roles, users}: Props) {
 
 					<CardList list={roles} searchFields={[["label"]]} renderCard={renderCard} firstCard={canCreateRole ? firstCard : undefined} />
 				</section>
-			</Layout>
+			</>
 		</>
 	);
 }

src/pages/entities/create.tsx

@@ -1,19 +1,16 @@
 /* eslint-disable @next/next/no-img-element */
-import Layout from "@/components/High/Layout";
 import Input from "@/components/Low/Input";
-import Select from "@/components/Low/Select";
 import Tooltip from "@/components/Low/Tooltip";
 import { useListSearch } from "@/hooks/useListSearch";
 import usePagination from "@/hooks/usePagination";
-import { Entity, EntityWithRoles } from "@/interfaces/entity";
+import { Entity } from "@/interfaces/entity";
 import { User } from "@/interfaces/user";
 import { sessionOptions } from "@/lib/session";
 import { USER_TYPE_LABELS } from "@/resources/user";
-import { mapBy, redirect, serialize } from "@/utils";
-import { getEntities, getEntitiesWithRoles } from "@/utils/entities.be";
+import { redirect, serialize } from "@/utils";
 import { shouldRedirectHome } from "@/utils/navigation.disabled";
 import { getUserName } from "@/utils/users";
-import { getLinkedUsers, getUsers } from "@/utils/users.be";
+import { getUsers } from "@/utils/users.be";
 import axios from "axios";
 import clsx from "clsx";
 import { withIronSessionSsr } from "iron-session/next";
@@ -23,22 +20,41 @@ import Link from "next/link";
 import { useRouter } from "next/router";
 import { Divider } from "primereact/divider";
 import { useState } from "react";
-import { BsCheck, BsChevronLeft, BsClockFill, BsEnvelopeFill, BsStopwatchFill } from "react-icons/bs";
+import {
+  BsCheck,
+  BsChevronLeft,
+  BsClockFill,
+  BsEnvelopeFill,
+  BsStopwatchFill,
+} from "react-icons/bs";
 import { toast, ToastContainer } from "react-toastify";
 import { requestUser } from "@/utils/api";
-import { findAllowedEntities } from "@/utils/permissions";
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+  const user = await requestUser(req, res);
+  if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user)) return redirect("/")
-	if (!["admin", "developer"].includes(user.type)) return redirect("/entities")
+  if (shouldRedirectHome(user)) return redirect("/");
+  if (!["admin", "developer"].includes(user.type)) return redirect("/entities");
 
-	const users = await getUsers()
+  const users = await getUsers(
+    { id: { $ne: user.id } },
+    0,
+    {},
+    {
+      _id: 0,
+      id: 1,
+      name: 1,
+      type: 1,
+      profilePicture: 1,
+      email: 1,
+      lastLogin: 1,
+      subscriptionExpirationDate: 1,
+    }
+  );
 
   return {
-		props: serialize({ user, users: users.filter((x) => x.id !== user.id) }),
+    props: serialize({ user, users }),
   };
 }, sessionOptions);
 
@@ -53,19 +69,31 @@ export default function Home({ user, users }: Props) {
   const [label, setLabel] = useState("");
   const [licenses, setLicenses] = useState(0);
 
-	const { rows, renderSearch } = useListSearch<User>([["name"], ["corporateInformation", "companyInformation", "name"]], users);
+  const { rows, renderSearch } = useListSearch<User>(
+    [["name"], ["corporateInformation", "companyInformation", "name"]],
+    users
+  );
   const { items, renderMinimal } = usePagination<User>(rows, 16);
 
   const router = useRouter();
 
   const createGroup = () => {
     if (!label.trim()) return;
-		if (!confirm(`Are you sure you want to create this entity with ${selectedUsers.length} members?`)) return;
+    if (
+      !confirm(
+        `Are you sure you want to create this entity with ${selectedUsers.length} members?`
+      )
+    )
+      return;
 
     setIsLoading(true);
 
     axios
-			.post<Entity>(`/api/entities`, { label, licenses, members: selectedUsers })
+      .post<Entity>(`/api/entities`, {
+        label,
+        licenses,
+        members: selectedUsers,
+      })
       .then((result) => {
         toast.success("Your entity has been created successfully!");
         router.replace(`/entities/${result.data.id}`);
@@ -77,7 +105,10 @@ export default function Home({ user, users }: Props) {
       .finally(() => setIsLoading(false));
   };
 
-	const toggleUser = (u: User) => setSelectedUsers((prev) => (prev.includes(u.id) ? prev.filter((p) => p !== u.id) : [...prev, u.id]));
+  const toggleUser = (u: User) =>
+    setSelectedUsers((prev) =>
+      prev.includes(u.id) ? prev.filter((p) => p !== u.id) : [...prev, u.id]
+    );
 
   return (
     <>
@@ -91,13 +122,14 @@ export default function Home({ user, users }: Props) {
         <link rel="icon" href="/favicon.ico" />
       </Head>
       <ToastContainer />
-			<Layout user={user}>
+      <>
         <section className="flex flex-col gap-0">
           <div className="flex gap-3 justify-between">
             <div className="flex items-center gap-2">
               <Link
                 href="/classrooms"
-								className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl">
+                className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl"
+              >
                 <BsChevronLeft />
               </Link>
               <h2 className="font-bold text-2xl">Create Entity</h2>
@@ -106,7 +138,8 @@ export default function Home({ user, users }: Props) {
               <button
                 onClick={createGroup}
                 disabled={!label.trim() || licenses <= 0 || isLoading}
-								className="flex items-center gap-1 px-2 py-2 border rounded-full border-mti-green bg-mti-green-light text-white hover:bg-mti-green-dark disabled:hover:bg-mti-green-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300">
+                className="flex items-center gap-1 px-2 py-2 border rounded-full border-mti-green bg-mti-green-light text-white hover:bg-mti-green-dark disabled:hover:bg-mti-green-light disabled:opacity-50 disabled:cursor-not-allowed cursor-pointer transition ease-in-out duration-300"
+              >
                 <BsCheck />
                 <span className="text-xs">Create Entity</span>
               </button>
@@ -116,17 +149,30 @@ export default function Home({ user, users }: Props) {
           <div className="w-full grid grid-cols-2 gap-4">
             <div className="flex flex-col gap-4 w-full">
               <span className="font-semibold text-xl">Entity Label:</span>
-							<Input name="name" onChange={setLabel} type="text" placeholder="Entity A" />
+              <Input
+                name="name"
+                onChange={setLabel}
+                type="text"
+                placeholder="Entity A"
+              />
             </div>
 
             <div className="flex flex-col gap-4 w-full">
               <span className="font-semibold text-xl">Licenses:</span>
-							<Input name="licenses" min={0} onChange={(v) => setLicenses(parseInt(v))} type="number" placeholder="12" />
+              <Input
+                name="licenses"
+                min={0}
+                onChange={(v) => setLicenses(parseInt(v))}
+                type="number"
+                placeholder="12"
+              />
             </div>
           </div>
           <Divider />
           <div className="flex items-center justify-between mb-4">
-						<span className="font-semibold text-xl">Members ({selectedUsers.length} selected):</span>
+            <span className="font-semibold text-xl">
+              Members ({selectedUsers.length} selected):
+            </span>
           </div>
           <div className="w-full flex items-center gap-4">
             {renderSearch()}
@@ -143,15 +189,18 @@ export default function Home({ user, users }: Props) {
               className={clsx(
                 "p-4 pr-6 h-48 relative border rounded-xl flex flex-col gap-3 justify-between text-left cursor-pointer",
                 "hover:border-mti-purple transition ease-in-out duration-300",
-								selectedUsers.includes(u.id) && "border-mti-purple",
-							)}>
+                selectedUsers.includes(u.id) && "border-mti-purple"
+              )}
+            >
               <div className="flex items-center gap-2">
                 <div className="min-w-[3rem] min-h-[3rem] w-12 h-12 border flex items-center justify-center overflow-hidden rounded-full">
                   <img src={u.profilePicture} alt={u.name} />
                 </div>
                 <div className="flex flex-col">
                   <span className="font-semibold">{getUserName(u)}</span>
-									<span className="opacity-80 text-sm">{USER_TYPE_LABELS[u.type]}</span>
+                  <span className="opacity-80 text-sm">
+                    {USER_TYPE_LABELS[u.type]}
+                  </span>
                 </div>
               </div>
 
@@ -166,19 +215,23 @@ export default function Home({ user, users }: Props) {
                   <Tooltip tooltip="Expiration Date">
                     <BsStopwatchFill />
                   </Tooltip>
-									{u.subscriptionExpirationDate ? moment(u.subscriptionExpirationDate).format("DD/MM/YYYY") : "Unlimited"}
+                  {u.subscriptionExpirationDate
+                    ? moment(u.subscriptionExpirationDate).format("DD/MM/YYYY")
+                    : "Unlimited"}
                 </span>
                 <span className="flex items-center gap-2">
                   <Tooltip tooltip="Last Login">
                     <BsClockFill />
                   </Tooltip>
-									{u.lastLogin ? moment(u.lastLogin).format("DD/MM/YYYY - HH:mm") : "N/A"}
+                  {u.lastLogin
+                    ? moment(u.lastLogin).format("DD/MM/YYYY - HH:mm")
+                    : "N/A"}
                 </span>
               </div>
             </button>
           ))}
         </section>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/entities/index.tsx

@@ -3,15 +3,12 @@ import Head from "next/head";
 import { withIronSessionSsr } from "iron-session/next";
 import { sessionOptions } from "@/lib/session";
 import { ToastContainer } from "react-toastify";
-import Layout from "@/components/High/Layout";
-import { GroupWithUsers, User } from "@/interfaces/user";
+import { User } from "@/interfaces/user";
 import { shouldRedirectHome } from "@/utils/navigation.disabled";
 import { getUserName, isAdmin } from "@/utils/users";
-import { convertToUsers, getGroupsForUser } from "@/utils/groups.be";
-import { countEntityUsers, getEntityUsers, getSpecificUsers, getUsers } from "@/utils/users.be";
-import { checkAccess, findAllowedEntities, getTypesOfUser } from "@/utils/permissions";
+import { countEntityUsers, getEntityUsers } from "@/utils/users.be";
+import { findAllowedEntities } from "@/utils/permissions";
 import Link from "next/link";
-import { uniq } from "lodash";
 import { BsBank, BsPlus } from "react-icons/bs";
 import CardList from "@/components/High/CardList";
 import { getEntitiesWithRoles } from "@/utils/entities.be";
@@ -20,25 +17,53 @@ import Separator from "@/components/Low/Separator";
 import { requestUser } from "@/utils/api";
 import { mapBy, redirect, serialize } from "@/utils";
 
-type EntitiesWithCount = { entity: EntityWithRoles; users: User[]; count: number };
+type EntitiesWithCount = {
+  entity: EntityWithRoles;
+  users: User[];
+  count: number;
+};
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+  const user = await requestUser(req, res);
+  if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user)) return redirect("/")
+  if (shouldRedirectHome(user)) return redirect("/");
 
-	const entityIDs = mapBy(user.entities, 'id')
-	const entities = await getEntitiesWithRoles(["admin", "developer"].includes(user.type) ? undefined : entityIDs);
-	const allowedEntities = findAllowedEntities(user, entities, 'view_entities')
-
-	const entitiesWithCount = await Promise.all(
-		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"] } })
-		})),
+  const entityIDs = mapBy(user.entities, "id");
+  const entities = await getEntitiesWithRoles(
+    ["admin", "developer"].includes(user.type) ? undefined : entityIDs
   );
+  const allowedEntities = findAllowedEntities(user, entities, "view_entities");
+
+  const [counts, users] = await Promise.all([
+    await Promise.all(
+      allowedEntities.map(async (e) =>
+        countEntityUsers(e.id, {
+          type: { $in: ["student", "teacher", "corporate", "mastercorporate"] },
+        })
+      )
+    ),
+    await Promise.all(
+      allowedEntities.map(async (e) =>
+        getEntityUsers(
+          e.id,
+          5,
+          {
+            type: {
+              $in: ["student", "teacher", "corporate", "mastercorporate"],
+            },
+          },
+          { name: 1 }
+        )
+      )
+    ),
+  ]);
+
+  const entitiesWithCount = allowedEntities.map<{
+    entity: EntityWithRoles;
+    users: User[];
+    count: number;
+  }>((e, i) => ({ entity: e, users: users[i], count: counts[i] }));
 
   return {
     props: serialize({ user, entities: entitiesWithCount }),
@@ -56,19 +81,33 @@ export default function Home({ user, entities }: Props) {
     <Link
       href={`/entities/${entity.id}`}
       key={entity.id}
-			className="p-4 border-2 border-mti-purple-light/20 rounded-xl flex gap-2 justify-between hover:border-mti-purple group transition ease-in-out duration-300 text-left cursor-pointer">
+      className="p-4 border-2 border-mti-purple-light/20 rounded-xl flex gap-2 justify-between hover:border-mti-purple group transition ease-in-out duration-300 text-left cursor-pointer"
+    >
       <div className="flex flex-col gap-2 w-full">
         <span className="flex items-center gap-1">
-					<span className="bg-mti-purple text-white font-semibold px-2">Entity</span>
+          <span className="bg-mti-purple text-white font-semibold px-2">
+            Entity
+          </span>
           {entity.label}
         </span>
         <span className="flex items-center gap-1">
-					<span className="bg-mti-purple text-white font-semibold px-2">Members</span>
-					<span className="bg-mti-purple-light/50 px-2">{count}{isAdmin(user) && ` / ${entity.licenses || 0}`}</span>
+          <span className="bg-mti-purple text-white font-semibold px-2">
+            Members
+          </span>
+          <span className="bg-mti-purple-light/50 px-2">
+            {count}
+            {isAdmin(user) && ` / ${entity.licenses || 0}`}
+          </span>
         </span>
         <span>
-					{users.map(getUserName).join(", ")}{' '}
-					{count > 5 ? <span className="opacity-50 bg-mti-purple-light/50 px-1 text-sm">and {count - 5} more</span> : ""}
+          {users.map(getUserName).join(", ")}{" "}
+          {count > 5 ? (
+            <span className="opacity-50 bg-mti-purple-light/50 px-1 text-sm">
+              and {count - 5} more
+            </span>
+          ) : (
+            ""
+          )}
         </span>
       </div>
       <div className="w-fit">
@@ -80,7 +119,8 @@ export default function Home({ user, entities }: Props) {
   const firstCard = () => (
     <Link
       href={`/entities/create`}
-			className="p-4 border-2 hover:text-mti-purple rounded-xl flex flex-col items-center justify-center gap-0 hover:border-mti-purple transition ease-in-out duration-300 text-left cursor-pointer">
+      className="p-4 border-2 hover:text-mti-purple rounded-xl flex flex-col items-center justify-center gap-0 hover:border-mti-purple transition ease-in-out duration-300 text-left cursor-pointer"
+    >
       <BsPlus size={40} />
       <span className="font-semibold">Create Entity</span>
     </Link>
@@ -98,7 +138,7 @@ export default function Home({ user, entities }: Props) {
         <link rel="icon" href="/favicon.ico" />
       </Head>
       <ToastContainer />
-			<Layout user={user} className="!gap-4">
+      <>
         <section className="flex flex-col gap-4 w-full h-full">
           <div className="flex flex-col gap-4">
             <h2 className="font-bold text-2xl">Entities</h2>
@@ -109,10 +149,12 @@ export default function Home({ user, entities }: Props) {
             list={entities}
             searchFields={SEARCH_FIELDS}
             renderCard={renderCard}
-						firstCard={["admin", "developer"].includes(user.type) ? firstCard : undefined}
+            firstCard={
+              ["admin", "developer"].includes(user.type) ? firstCard : undefined
+            }
           />
         </section>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/exam.tsx

@@ -20,79 +20,104 @@ import { useRouter } from "next/router";
 import { getSessionByAssignment } from "@/utils/sessions.be";
 import { Session } from "@/hooks/useSessions";
 import { activeAssignmentFilter } from "@/utils/assignments";
-import { checkAccess } from "@/utils/permissions";
 
-export const getServerSideProps = withIronSessionSsr(async ({ req, res, query }) => {
-	const user = await requestUser(req, res)
-	const loginDestination = Buffer.from(req.url || "/").toString("base64")
-	if (!user) return redirect(`/login?destination=${loginDestination}`)
+export const getServerSideProps = withIronSessionSsr(
+  async ({ req, res, query }) => {
+    const user = await requestUser(req, res);
+    const loginDestination = Buffer.from(req.url || "/").toString("base64");
+    if (!user) return redirect(`/login?destination=${loginDestination}`);
 
-	if (shouldRedirectHome(user)) return redirect("/")
+    if (shouldRedirectHome(user)) return redirect("/");
 
-	const { assignment: assignmentID, destination } = query as { assignment?: string, destination?: string }
-	const destinationURL = !!destination ? Buffer.from(destination, 'base64').toString() : undefined
+    const { assignment: assignmentID, destination } = query as {
+      assignment?: string;
+      destination?: string;
+    };
+    const destinationURL = !!destination
+      ? Buffer.from(destination, "base64").toString()
+      : undefined;
 
     if (!!assignmentID) {
-		const assignment = await getAssignment(assignmentID)
+      const assignment = await getAssignment(assignmentID);
 
-		if (!assignment) return redirect(destinationURL || "/exam")
-		if (!assignment.assignees.includes(user.id) && !["admin", "developer"].includes(user.type))
-			return redirect(destinationURL || "/exam")
+      if (!assignment) return redirect(destinationURL || "/exam");
+      if (
+        !assignment.assignees.includes(user.id) &&
+        !["admin", "developer"].includes(user.type)
+      )
+        return redirect(destinationURL || "/exam");
 
-		if (filterBy(assignment.results, 'user', user.id).length > 0)
-			return redirect(destinationURL || "/exam")
+      if (filterBy(assignment.results, "user", user.id).length > 0)
+			return redirect(destinationURL || "/exam");
 		
-		const exams = await getExamsByIds(uniqBy(assignment.exams, "id"))
-		const session = await getSessionByAssignment(assignmentID)
+      const [exams, session] = await Promise.all([
+        getExamsByIds(uniqBy(assignment.exams, "id")),
+        getSessionByAssignment(assignmentID),
+      ]);
 
       return {
-			props: serialize({ user, assignment, exams, destinationURL, session: session ?? undefined })
-		}
+        props: serialize({
+          user,
+          assignment,
+          exams,
+          destinationURL,
+          session: session ?? undefined,
+        }),
+      };
     }
 
     return {
       props: serialize({ user, destinationURL }),
     };
-}, sessionOptions);
+  },
+  sessionOptions
+);
 
 interface Props {
   user: User;
-	assignment?: Assignment
-	exams?: Exam[]
-	session?: Session
-	destinationURL?: string
+  assignment?: Assignment;
+  exams?: Exam[];
+  session?: Session;
+  destinationURL?: string;
 }
 
-const Page: React.FC<Props> = ({ user, assignment, exams = [], destinationURL = "/exam", session }) => {
-	const router = useRouter()
+const Page: React.FC<Props> = ({
+  user,
+  assignment,
+  exams = [],
+  destinationURL = "/exam",
+  session,
+}) => {
+  const router = useRouter();
   const { assignment: storeAssignment, dispatch } = useExamStore();
 
   useEffect(() => {
     if (assignment && exams.length > 0 && !storeAssignment && !session) {
-			if (!activeAssignmentFilter(assignment)) return
+      if (!activeAssignmentFilter(assignment)) return;
       dispatch({
-				type: "INIT_EXAM", payload: {
+        type: "INIT_EXAM",
+        payload: {
           exams: exams.sort(sortByModule),
           modules: exams
             .map((x) => x!)
             .sort(sortByModule)
             .map((x) => x!.module),
-					assignment
-				}
+          assignment,
+        },
       });
 
-			router.replace(router.asPath)
+      router.replace(router.asPath);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [assignment, exams, session])
+  }, [assignment, exams, session]);
 
   useEffect(() => {
     if (assignment && exams.length > 0 && !storeAssignment && !!session) {
-			dispatch({ type: "SET_SESSION", payload: { session } })
-			router.replace(router.asPath)
+      dispatch({ type: "SET_SESSION", payload: { session } });
+      router.replace(router.asPath);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [assignment, exams, session])
+  }, [assignment, exams, session]);
 
   return (
     <>
@@ -105,10 +130,15 @@ const Page: React.FC<Props> = ({ user, assignment, exams = [], destinationURL =
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="icon" href="/favicon.ico" />
       </Head>
-			<ExamPage page="exams" destination={destinationURL} user={user} hideSidebar={!!assignment || !!storeAssignment} />
+      <ExamPage
+        page="exams"
+        destination={destinationURL}
+        user={user}
+        hideSidebar={!!assignment || !!storeAssignment}
+      />
     </>
   );
-}
+};
 
 //Page.whyDidYouRender = true;
 export default Page;

src/pages/exercises.tsx

@@ -21,79 +21,87 @@ import { getSessionByAssignment } from "@/utils/sessions.be";
 import { Session } from "@/hooks/useSessions";
 import moment from "moment";
 
-export const getServerSideProps = withIronSessionSsr(async ({ req, res, query }) => {
-	const user = await requestUser(req, res)
-	const destination = Buffer.from(req.url || "/").toString("base64")
-	if (!user) return redirect(`/login?destination=${destination}`)
+export const getServerSideProps = withIronSessionSsr(
+  async ({ req, res, query }) => {
+    const user = await requestUser(req, res);
+    const destination = Buffer.from(req.url || "/").toString("base64");
+    if (!user) return redirect(`/login?destination=${destination}`);
 
-	if (shouldRedirectHome(user)) return redirect("/")
+    if (shouldRedirectHome(user)) return redirect("/");
 
-	const { assignment: assignmentID } = query as { assignment?: string }
+    const { assignment: assignmentID } = query as { assignment?: string };
 
     if (assignmentID) {
-		const assignment = await getAssignment(assignmentID)
-
-		if (!assignment) return redirect("/exam")
-		if (!["admin", "developer"].includes(user.type) && !assignment.assignees.includes(user.id)) return redirect("/exercises")
-
-		const exams = await getExamsByIds(uniqBy(assignment.exams, "id"))
-		const session = await getSessionByAssignment(assignmentID)
+      const assignment = await getAssignment(assignmentID);
 
+      if (!assignment) return redirect("/exam");
       if (
-			filterBy(assignment.results, 'user', user.id) ||
+        !["admin", "developer"].includes(user.type) &&
+        !assignment.assignees.includes(user.id)
+      )
+        return redirect("/exercises");
+      if (
+        filterBy(assignment.results, "user", user.id) ||
         moment(assignment.startDate).isBefore(moment()) ||
         moment(assignment.endDate).isAfter(moment())
       )
-			return redirect("/exam")
+        return redirect("/exam");
+      const [exams, session] = await Promise.all([
+        getExamsByIds(uniqBy(assignment.exams, "id")),
+        getSessionByAssignment(assignmentID),
+      ]);
 
       return {
-			props: serialize({ user, assignment, exams, session })
-		}
+        props: serialize({ user, assignment, exams, session }),
+      };
     }
 
     return {
       props: serialize({ user }),
     };
-}, sessionOptions);
+  },
+  sessionOptions
+);
 
 interface Props {
   user: User;
-	assignment?: Assignment
-	exams?: Exam[]
-	session?: Session
+  assignment?: Assignment;
+  exams?: Exam[];
+  session?: Session;
 }
 
 export default function Page({ user, assignment, exams = [], session }: Props) {
-	const router = useRouter()
+  const router = useRouter();
 
-	const { assignment: storeAssignment, dispatch } = useExamStore()
+  const { assignment: storeAssignment, dispatch } = useExamStore();
 
   useEffect(() => {
     if (assignment && exams.length > 0 && !storeAssignment && !session) {
       dispatch({
-				type: "INIT_EXAM", payload: {
+        type: "INIT_EXAM",
+        payload: {
           exams: exams.sort(sortByModule),
           modules: exams
             .map((x) => x!)
             .sort(sortByModule)
             .map((x) => x!.module),
-					assignment
-				}
-			})
+          assignment,
+        },
+      });
 
-			router.replace(router.asPath)
+      router.replace(router.asPath);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [assignment, exams, session])
+  }, [assignment, exams, session]);
 
   useEffect(() => {
     if (assignment && exams.length > 0 && !storeAssignment && !!session) {
       dispatch({ type: "SET_SESSION", payload: { session } });
 
-			router.replace(router.asPath)
+      router.replace(router.asPath);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [assignment, exams, session])
+  }, [assignment, exams, session]);
 
   return (
     <>

src/pages/generation.tsx

@@ -2,40 +2,39 @@
 import Head from "next/head";
 import {withIronSessionSsr} from "iron-session/next";
 import {sessionOptions} from "@/lib/session";
-import { toast, ToastContainer } from "react-toastify";
-import Layout from "@/components/High/Layout";
+import {ToastContainer} from "react-toastify";
 import {shouldRedirectHome} from "@/utils/navigation.disabled";
 import {Radio, RadioGroup} from "@headlessui/react";
 import clsx from "clsx";
 import {MODULE_ARRAY} from "@/utils/moduleUtils";
 import {capitalize} from "lodash";
 import Input from "@/components/Low/Input";
-import { checkAccess, findAllowedEntities } from "@/utils/permissions";
+import {findAllowedEntities} from "@/utils/permissions";
 import {User} from "@/interfaces/user";
 import useExamEditorStore from "@/stores/examEditor";
 import ExamEditorStore from "@/stores/examEditor/types";
 import ExamEditor from "@/components/ExamEditor";
-import MultipleAudioUploader from "@/components/ExamEditor/Shared/AudioEdit";
 import {mapBy, redirect, serialize} from "@/utils";
 import {requestUser} from "@/utils/api";
 import {Module} from "@/interfaces";
-import { getExam, getExams } from "@/utils/exams.be";
+import {getExam} from "@/utils/exams.be";
 import {Exam, Exercise, InteractiveSpeakingExercise, ListeningPart, SpeakingExercise} from "@/interfaces/exam";
 import {useEffect, useState} from "react";
 import {getEntitiesWithRoles} from "@/utils/entities.be";
 import {isAdmin} from "@/utils/users";
 import axios from "axios";
+import {EntityWithRoles} from "@/interfaces/entity";
 
-type Permission = { [key in Module]: boolean }
+type Permission = {[key in Module]: boolean};
 
 export const getServerSideProps = withIronSessionSsr(async ({req, res, query}) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+	const user = await requestUser(req, res);
+	if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user)) return redirect("/")
+	if (shouldRedirectHome(user)) return redirect("/");
 
-	const entityIDs = mapBy(user.entities, 'id')
-	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDs)
+	const entityIDs = mapBy(user.entities, "id");
+	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDs);
 
 	const permissions: Permission = {
 		reading: findAllowedEntities(user, entities, `generate_reading`).length > 0,
@@ -43,29 +42,46 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res, query })
 		writing: findAllowedEntities(user, entities, `generate_writing`).length > 0,
 		speaking: findAllowedEntities(user, entities, `generate_speaking`).length > 0,
 		level: findAllowedEntities(user, entities, `generate_level`).length > 0,
-	}
+	};
 
-	if (Object.keys(permissions).every(p => !permissions[p as Module])) return redirect("/")
+	const entitiesAllowEditPrivacy = findAllowedEntities(user, entities, "update_exam_privacy");
+	console.log(entitiesAllowEditPrivacy);
 
-	const { id, module: examModule } = query as { id?: string, module?: Module }
+	if (Object.keys(permissions).every((p) => !permissions[p as Module])) return redirect("/");
+
+	const {id, module: examModule} = query as {id?: string; module?: Module};
 	if (!id || !examModule) return {props: serialize({user, permissions})};
 
 	//if (!permissions[module]) return redirect("/generation")
 
-	const exam = await getExam(examModule, id)
-	if (!exam) return redirect("/generation")
+	const exam = await getExam(examModule, id);
+	if (!exam) return redirect("/generation");
 
 	return {
-		props: serialize({ id, user, exam, examModule, permissions }),
+		props: serialize({id, user, exam, examModule, permissions, entitiesAllowEditPrivacy}),
 	};
 }, sessionOptions);
 
-export default function Generation({ id, user, exam, examModule, permissions }: { id: string, user: User; exam?: Exam, examModule?: Module, permissions: Permission }) {
+export default function Generation({
+	id,
+	user,
+	exam,
+	examModule,
+	permissions,
+	entitiesAllowEditPrivacy,
+}: {
+	id: string;
+	user: User;
+	exam?: Exam;
+	examModule?: Module;
+	permissions: Permission;
+	entitiesAllowEditPrivacy: EntityWithRoles[];
+}) {
 	const {title, currentModule, modules, dispatch} = useExamEditorStore();
 	const [examLevelParts, setExamLevelParts] = useState<number | undefined>(undefined);
 
 	const updateRoot = (updates: Partial<ExamEditorStore>) => {
-		dispatch({ type: 'UPDATE_ROOT', payload: { updates } });
+		dispatch({type: "UPDATE_ROOT", payload: {updates}});
 	};
 
 	useEffect(() => {
@@ -73,11 +89,11 @@ export default function Generation({ id, user, exam, examModule, permissions }:
 			if (examModule === "level" && exam.module === "level") {
 				setExamLevelParts(exam.parts.length);
 			}
-			updateRoot({currentModule: examModule})
-			dispatch({ type: "INIT_EXAM_EDIT", payload: { exam, id, examModule } })
+			updateRoot({currentModule: examModule});
+			dispatch({type: "INIT_EXAM_EDIT", payload: {exam, id, examModule}});
 		}
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [id, exam, module])
+	}, [id, exam, module]);
 
 	useEffect(() => {
 		const fetchAvatars = async () => {
@@ -98,48 +114,61 @@ export default function Generation({ id, user, exam, examModule, permissions }:
 				URL.revokeObjectURL(state.writing.academic_url);
 			}
 
-			state.listening.sections.forEach(section => {
+			state.listening.sections.forEach((section) => {
 				const listeningPart = section.state as ListeningPart;
 				if (listeningPart.audio?.source) {
 					URL.revokeObjectURL(listeningPart.audio.source);
 					dispatch({
-						type: "UPDATE_SECTION_SINGLE_FIELD", payload: {
-							sectionId: section.sectionId, module: "listening", field: "state", value: { ...listeningPart, audio: undefined }
-						}
-					})
+						type: "UPDATE_SECTION_SINGLE_FIELD",
+						payload: {
+							sectionId: section.sectionId,
+							module: "listening",
+							field: "state",
+							value: {...listeningPart, audio: undefined},
+						},
+					});
 				}
 			});
 
-			if (state.listening.instructionsState.customInstructionsURL.startsWith('blob:')) {
+			if (state.listening.instructionsState.customInstructionsURL.startsWith("blob:")) {
 				URL.revokeObjectURL(state.listening.instructionsState.customInstructionsURL);
 			}
 
-			state.speaking.sections.forEach(section => {
+			state.speaking.sections.forEach((section) => {
 				const sectionState = section.state as Exercise;
-				if (sectionState.type === 'speaking') {
+				if (sectionState.type === "speaking") {
 					const speakingExercise = sectionState as SpeakingExercise;
 					URL.revokeObjectURL(speakingExercise.video_url);
 					dispatch({
-						type: "UPDATE_SECTION_SINGLE_FIELD", payload: {
-							sectionId: section.sectionId, module: "listening", field: "state", value: { ...speakingExercise, video_url: undefined }
+						type: "UPDATE_SECTION_SINGLE_FIELD",
+						payload: {
+							sectionId: section.sectionId,
+							module: "listening",
+							field: "state",
+							value: {...speakingExercise, video_url: undefined},
+						},
+					});
 				}
-					})
-				}
-				if (sectionState.type === 'interactiveSpeaking') {
+				if (sectionState.type === "interactiveSpeaking") {
 					const interactiveSpeaking = sectionState as InteractiveSpeakingExercise;
-					interactiveSpeaking.prompts.forEach(prompt => {
+					interactiveSpeaking.prompts.forEach((prompt) => {
 						URL.revokeObjectURL(prompt.video_url);
 					});
 					dispatch({
-						type: "UPDATE_SECTION_SINGLE_FIELD", payload: {
-							sectionId: section.sectionId, module: "listening", field: "state", value: {
-								...interactiveSpeaking, prompts: interactiveSpeaking.prompts.map((p) => ({ ...p, video_url: undefined }))
-							}
-						}
-					})
+						type: "UPDATE_SECTION_SINGLE_FIELD",
+						payload: {
+							sectionId: section.sectionId,
+							module: "listening",
+							field: "state",
+							value: {
+								...interactiveSpeaking,
+								prompts: interactiveSpeaking.prompts.map((p) => ({...p, video_url: undefined})),
+							},
+						},
+					});
 				}
 			});
-			dispatch({ type: 'FULL_RESET' });
+			dispatch({type: "FULL_RESET"});
 		};
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, []);
@@ -157,7 +186,7 @@ export default function Generation({ id, user, exam, examModule, permissions }:
 			</Head>
 			<ToastContainer />
 			{user && (
-				<Layout user={user} className="gap-6">
+				<>
 					<h1 className="text-2xl font-semibold">Exam Editor</h1>
 					<div className="flex flex-col gap-3">
 						<Input
@@ -175,8 +204,10 @@ export default function Generation({ id, user, exam, examModule, permissions }:
 						<RadioGroup
 							value={currentModule}
 							onChange={(currentModule) => updateRoot({currentModule})}
-							className="flex flex-row -2xl:flex-wrap w-full gap-4 -md:justify-center justify-between">
-							{[...MODULE_ARRAY].filter(m => permissions[m]).map((x) => (
+							className="flex flex-row flex-wrap w-full gap-4 -md:justify-center justify-between">
+							{[...MODULE_ARRAY]
+								.filter((m) => permissions[m])
+								.map((x) => (
 									<Radio value={x} key={x}>
 										{({checked}) => (
 											<span
@@ -211,8 +242,8 @@ export default function Generation({ id, user, exam, examModule, permissions }:
 								))}
 						</RadioGroup>
 					</div>
-					<ExamEditor levelParts={examLevelParts} />
-				</Layout>
+					<ExamEditor levelParts={examLevelParts} entitiesAllowEditPrivacy={entitiesAllowEditPrivacy} />
+				</>
 			)}
 		</>
 	);

src/pages/official-exam.tsx

@@ -1,11 +1,10 @@
 /* eslint-disable @next/next/no-img-element */
 import AssignmentCard from "@/components/High/AssignmentCard";
-import Layout from "@/components/High/Layout";
 import Button from "@/components/Low/Button";
 import Separator from "@/components/Low/Separator";
 import ProfileSummary from "@/components/ProfileSummary";
 import { Session } from "@/hooks/useSessions";
-import { Grading } from "@/interfaces";
+import { Grading, Module } from "@/interfaces";
 import { EntityWithRoles } from "@/interfaces/entity";
 import { Exam } from "@/interfaces/exam";
 import { InviteWithEntity } from "@/interfaces/invite";
@@ -13,11 +12,13 @@ import { Assignment } from "@/interfaces/results";
 import { Stat, User } from "@/interfaces/user";
 import { sessionOptions } from "@/lib/session";
 import useExamStore from "@/stores/exam";
-import { filterBy, findBy, mapBy, redirect, serialize } from "@/utils";
+import { findBy, mapBy, redirect, serialize } from "@/utils";
 import { requestUser } from "@/utils/api";
-import { activeAssignmentFilter, futureAssignmentFilter } from "@/utils/assignments";
+import {
+  activeAssignmentFilter,
+  futureAssignmentFilter,
+} from "@/utils/assignments";
 import { getAssignmentsByAssignee } from "@/utils/assignments.be";
-import { getEntitiesWithRoles } from "@/utils/entities.be";
 import { getExamsByIds } from "@/utils/exams.be";
 import { sortByModule } from "@/utils/moduleUtils";
 import { checkAccess } from "@/utils/permissions";
@@ -26,7 +27,6 @@ import axios from "axios";
 import clsx from "clsx";
 import { withIronSessionSsr } from "iron-session/next";
 import { uniqBy } from "lodash";
-import moment from "moment";
 import Head from "next/head";
 import { useRouter } from "next/router";
 import { useMemo, useState } from "react";
@@ -45,66 +45,115 @@ interface Props {
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	const destination = Buffer.from(req.url || "/").toString("base64")
-	if (!user) return redirect(`/login?destination=${destination}`)
+  const user = await requestUser(req, res);
+  const destination = Buffer.from(req.url || "/").toString("base64");
+  if (!user) return redirect(`/login?destination=${destination}`);
 
   if (!checkAccess(user, ["admin", "developer", "student"]))
-		return redirect("/")
+    return redirect("/");
+  const assignments = (await getAssignmentsByAssignee(
+    user.id,
+    {
+      archived: { $ne: true },
+    },
+    {
+      _id: 0,
+      id: 1,
+      name: 1,
+      startDate: 1,
+      endDate: 1,
+      exams: 1,
+      results: 1,
+    },
+    {
+      sort: { startDate: 1 },
+    }
+  )) as Assignment[];
 
-	const entityIDS = mapBy(user.entities, "id") || [];
-
-	const entities = await getEntitiesWithRoles(entityIDS);
-	const assignments = await getAssignmentsByAssignee(user.id, { archived: { $ne: true } });
-	const sessions = await getSessionsByUser(user.id, 0, { "assignment.id": { $in: mapBy(assignments, 'id') } });
+  const sessions = await getSessionsByUser(
+    user.id,
+    0,
+    {
+      "assignment.id": { $in: mapBy(assignments, "id") },
+    },
+    {
+      _id: 0,
+      id: 1,
+      assignment: 1,
+    }
+  );
 
   const examIDs = uniqBy(
-		assignments.flatMap((a) =>
-			filterBy(a.exams, 'assignee', user.id).map((e) => ({ module: e.module, id: e.id, key: `${e.module}_${e.id}` })),
+    assignments.reduce<{ module: Module; id: string; key: string }[]>(
+      (acc, a) => {
+        a.exams.forEach((e) => {
+          if (e.assignee === user.id)
+            acc.push({
+              module: e.module,
+              id: e.id,
+              key: `${e.module}_${e.id}`,
+            });
+        });
+        return acc;
+      },
+      []
     ),
-		"key",
+    "key"
   );
+
   const exams = await getExamsByIds(examIDs);
 
-	return { props: serialize({ user, entities, assignments, exams, sessions }) };
+  return { props: serialize({ user, assignments, exams, sessions }) };
 }, sessionOptions);
 
-const destination = Buffer.from("/official-exam").toString("base64")
+const destination = Buffer.from("/official-exam").toString("base64");
 
-export default function OfficialExam({ user, entities, assignments, sessions, exams }: Props) {
-	const [isLoading, setIsLoading] = useState(false)
+export default function OfficialExam({
+  user,
+  entities,
+  assignments,
+  sessions,
+  exams,
+}: Props) {
+  const [isLoading, setIsLoading] = useState(false);
 
   const router = useRouter();
 
   const dispatch = useExamStore((state) => state.dispatch);
 
   const reload = () => {
-		setIsLoading(true)
-		router.replace(router.asPath)
-		setTimeout(() => setIsLoading(false), 500)
-	}
+    setIsLoading(true);
+    router.replace(router.asPath);
+    setTimeout(() => setIsLoading(false), 500);
+  };
 
   const startAssignment = (assignment: Assignment) => {
-		const assignmentExams = exams.filter(e => {
-			const exam = findBy(assignment.exams, 'id', e.id)
-			return !!exam && exam.module === e.module
-		})
+    const assignmentExams = exams.filter((e) => {
+      const exam = findBy(assignment.exams, "id", e.id);
+      return !!exam && exam.module === e.module;
+    });
 
     if (assignmentExams.every((x) => !!x)) {
+      const sortedAssignmentExams = assignmentExams.sort(sortByModule);
       dispatch({
-				type: "INIT_EXAM", payload: {
-					exams: assignmentExams.sort(sortByModule),
-					modules: mapBy(assignmentExams.sort(sortByModule), 'module'),
-					assignment
-				}
-			})
-			router.push(`/exam?assignment=${assignment.id}&destination=${destination}`);
+        type: "INIT_EXAM",
+        payload: {
+          exams: sortedAssignmentExams,
+          modules: mapBy(sortedAssignmentExams, "module"),
+          assignment,
+        },
+      });
+      router.push(
+        `/exam?assignment=${assignment.id}&destination=${destination}`
+      );
     }
   };
 
   const loadSession = async (session: Session) => {
     dispatch({ type: "SET_SESSION", payload: { session } });
-		router.push(`/exam?assignment=${session.assignment?.id}&destination=${destination}`);
+    router.push(
+      `/exam?assignment=${session.assignment?.id}&destination=${destination}`
+    );
   };
 
   const logout = async () => {
@@ -113,12 +162,25 @@ export default function OfficialExam({ user, entities, assignments, sessions, ex
     });
   };
 
-	const studentAssignments = useMemo(() => [
-		...assignments.filter(activeAssignmentFilter), ...assignments.filter(futureAssignmentFilter)],
+  const studentAssignments = useMemo(
+    () => [
+      ...assignments.filter(activeAssignmentFilter),
+      ...assignments.filter(futureAssignmentFilter),
+    ],
     [assignments]
   );
 
-	const assignmentSessions = useMemo(() => sessions.filter(s => mapBy(studentAssignments, 'id').includes(s.assignment?.id || "")), [sessions, studentAssignments])
+  const assignmentSessions = useMemo(() => {
+    const studentAssignmentsIDs = mapBy(studentAssignments, "id");
+    return sessions.filter((s) =>
+      studentAssignmentsIDs.includes(s.assignment?.id || "")
+    );
+  }, [sessions, studentAssignments]);
+
+  const entityLabels = useMemo(
+    () => mapBy(entities, "label")?.join(","),
+    [entities]
+  );
 
   return (
     <>
@@ -132,10 +194,10 @@ export default function OfficialExam({ user, entities, assignments, sessions, ex
         <link rel="icon" href="/favicon.ico" />
       </Head>
       <ToastContainer />
-			<Layout user={user} hideSidebar>
+      <>
         {entities.length > 0 && (
           <div className="absolute right-4 top-4 rounded-lg bg-neutral-200 px-2 py-1">
-						<b>{mapBy(entities, "label")?.join(", ")}</b>
+            <b>{entityLabels}</b>
           </div>
         )}
 
@@ -147,29 +209,42 @@ export default function OfficialExam({ user, entities, assignments, sessions, ex
         <section className="flex flex-col gap-1 md:gap-3">
           <div
             onClick={reload}
-						className="text-mti-purple-light hover:text-mti-purple-dark flex cursor-pointer items-center gap-2 transition duration-300 ease-in-out">
-						<span className="text-mti-black text-lg font-bold">Assignments</span>
-						<BsArrowRepeat className={clsx("text-xl", isLoading && "animate-spin")} />
+            className="text-mti-purple-light hover:text-mti-purple-dark flex cursor-pointer items-center gap-2 transition duration-300 ease-in-out"
+          >
+            <span className="text-mti-black text-lg font-bold">
+              Assignments
+            </span>
+            <BsArrowRepeat
+              className={clsx("text-xl", isLoading && "animate-spin")}
+            />
           </div>
           <span className="text-mti-gray-taupe scrollbar-hide flex gap-8 overflow-x-scroll">
-						{studentAssignments.length === 0 && "Assignments will appear here. It seems that for now there are no assignments for you."}
-						{studentAssignments
-							.sort((a, b) => moment(a.startDate).diff(b.startDate))
-							.map((a) =>
+            {studentAssignments.length === 0 &&
+              "Assignments will appear here. It seems that for now there are no assignments for you."}
+            {studentAssignments.map((a) => (
               <AssignmentCard
                 key={a.id}
                 assignment={a}
                 user={user}
-									session={assignmentSessions.find(s => s.assignment?.id === a.id)}
+                session={assignmentSessions.find(
+                  (s) => s.assignment?.id === a.id
+                )}
                 startAssignment={startAssignment}
                 resumeAssignment={loadSession}
               />
-							)}
+            ))}
           </span>
         </section>
 
-				<Button onClick={logout} variant="outline" color="red" className="max-w-[200px] w-full absolute bottom-8 left-8">Sign out</Button>
-			</Layout>
+        <Button
+          onClick={logout}
+          variant="outline"
+          color="red"
+          className="max-w-[200px] w-full absolute bottom-8 left-8"
+        >
+          Sign out
+        </Button>
+      </>
     </>
   );
 }

src/pages/payment-record.tsx

@@ -2,14 +2,12 @@
 import Head from "next/head";
 import { withIronSessionSsr } from "iron-session/next";
 import { sessionOptions } from "@/lib/session";
-import useUser from "@/hooks/useUser";
 import { toast, ToastContainer } from "react-toastify";
-import Layout from "@/components/High/Layout";
 import { shouldRedirectHome } from "@/utils/navigation.disabled";
 import usePayments from "@/hooks/usePayments";
 import usePaypalPayments from "@/hooks/usePaypalPayments";
 import { Payment, PaypalPayment } from "@/interfaces/paypal";
-import { CellContext, createColumnHelper, flexRender, getCoreRowModel, HeaderGroup, Table, useReactTable } from "@tanstack/react-table";
+import { createColumnHelper, flexRender, getCoreRowModel, HeaderGroup, Table, useReactTable } from "@tanstack/react-table";
 import { CURRENCIES } from "@/resources/paypal";
 import { BsTrash } from "react-icons/bs";
 import axios from "axios";
@@ -33,7 +31,7 @@ import { useListSearch } from "@/hooks/useListSearch";
 import { checkAccess, findAllowedEntities, getTypesOfUser } from "@/utils/permissions";
 import { requestUser } from "@/utils/api";
 import { mapBy, redirect, serialize } from "@/utils";
-import { getEntities, getEntitiesWithRoles } from "@/utils/entities.be";
+import { getEntitiesWithRoles } from "@/utils/entities.be";
 import { isAdmin } from "@/utils/users";
 import { Entity, EntityWithRoles } from "@/interfaces/entity";
 
@@ -943,7 +941,7 @@ export default function PaymentRecord({ user, entities }: Props) {
 			</Head>
 			<ToastContainer />
 			{user && (
-				<Layout user={user} className="gap-6">
+				<>
 					{getUserModal()}
 					<Modal isOpen={isCreatingPayment} onClose={() => setIsCreatingPayment(false)}>
 						<PaymentCreator
@@ -1248,7 +1246,7 @@ export default function PaymentRecord({ user, entities }: Props) {
 							</Tab.Panel>
 						</Tab.Panels>
 					</Tab.Group>
-				</Layout>
+				</>
 			)}
 		</>
 	);

src/pages/payment.tsx

@@ -21,11 +21,12 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	if (!user) return redirect("/login")
 
 	const entityIDs = mapBy(user.entities, 'id')
-	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDs)
-
 	const domain = user.email.split("@").pop()
-	const discounts = await db.collection<Discount>("discounts").find({ domain }).toArray()
-	const packages = await db.collection<Package>("packages").find().toArray()
+	const [entities, discounts, packages] = await Promise.all([
+		getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDs),
+		db.collection<Discount>("discounts").find({ domain }).toArray(),
+		db.collection<Package>("packages").find().toArray(),
+	])
 
 	return {
 		props: serialize({ user, entities, discounts, packages }),

src/pages/permissions/[id].tsx

@@ -1,13 +1,13 @@
 /* eslint-disable @next/next/no-img-element */
 import Head from "next/head";
-import {useEffect, useState} from "react";
+import React, { useEffect, useState } from "react";
 import { withIronSessionSsr } from "iron-session/next";
 import { sessionOptions } from "@/lib/session";
 import { shouldRedirectHome } from "@/utils/navigation.disabled";
 import { Permission, PermissionType } from "@/interfaces/permissions";
 import { getPermissionDoc } from "@/utils/permissions.be";
 import { User } from "@/interfaces/user";
-import Layout from "@/components/High/Layout";
+import { LayoutContext } from "@/components/High/Layout";
 import { getUsers } from "@/utils/users.be";
 import { BsTrash } from "react-icons/bs";
 import Select from "@/components/Low/Select";
@@ -18,6 +18,7 @@ import {Type as UserType} from "@/interfaces/user";
 import { getGroups } from "@/utils/groups.be";
 import { requestUser } from "@/utils/api";
 import { redirect } from "@/utils";
+import { G } from "@react-pdf/renderer";
 interface BasicUser {
   id: string;
   name: string;
@@ -30,46 +31,48 @@ interface PermissionWithBasicUsers {
   users: BasicUser[];
 }
 
-export const getServerSideProps = withIronSessionSsr(async ({req, res, params}) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+export const getServerSideProps = withIronSessionSsr(
+  async ({ req, res, params }) => {
+    const user = await requestUser(req, res);
+    if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user)) return redirect("/")
+    if (shouldRedirectHome(user)) return redirect("/");
 
-	if (!params?.id) return redirect("/permissions")
+    if (!params?.id) return redirect("/permissions");
 
     // Fetch data from external API
-	const permission: Permission = await getPermissionDoc(params.id as string);
-
-	const allUserData: User[] = await getUsers();
-	const groups = await getGroups();
+    const [permission, users, groups] = await Promise.all([
+      getPermissionDoc(params.id as string),
+      getUsers({}, 0, {}, { _id: 0, id: 1, name: 1, type: 1 }),
+      getGroups(),
+    ]);
 
     const userGroups = groups.filter((x) => x.admin === user.id);
+    const userGroupsParticipants = userGroups.flatMap((x) => x.participants);
     const filteredGroups =
       user.type === "corporate"
         ? userGroups
         : user.type === "mastercorporate"
-			? groups.filter((x) => userGroups.flatMap((y) => y.participants).includes(x.admin))
+        ? groups.filter((x) => userGroupsParticipants.includes(x.admin))
         : groups;
-
-	const users = allUserData.map((u) => ({
-		id: u.id,
-		name: u.name,
-		type: u.type,
-	})) as BasicUser[];
-
+    const filteredGroupsParticipants = filteredGroups.flatMap(
+      (g) => g.participants
+    );
     const filteredUsers = ["mastercorporate", "corporate"].includes(user.type)
-		? users.filter((u) => filteredGroups.flatMap((g) => g.participants).includes(u.id))
+      ? users.filter((u) => filteredGroupsParticipants.includes(u.id))
       : users;
 
     // const res = await fetch("api/permissions");
     // const permissions: Permission[] = await res.json();
     // Pass data to the page via props
-	const usersData: BasicUser[] = permission.users.reduce((acc: BasicUser[], userId) => {
+    const usersData: BasicUser[] = permission.users.reduce(
+      (acc: BasicUser[], userId) => {
         const user = filteredUsers.find((u) => u.id === userId) as BasicUser;
         if (!!user) acc.push(user);
         return acc;
-	}, []);
+      },
+      []
+    );
 
     return {
       props: {
@@ -83,7 +86,9 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res, params})
         users: filteredUsers,
       },
     };
-}, sessionOptions);
+  },
+  sessionOptions
+);
 
 interface Props {
   permission: PermissionWithBasicUsers;
@@ -94,7 +99,9 @@ interface Props {
 export default function Page(props: Props) {
   const { permission, user, users } = props;
 
-	const [selectedUsers, setSelectedUsers] = useState<string[]>(() => permission.users.map((u) => u.id));
+  const [selectedUsers, setSelectedUsers] = useState<string[]>(() =>
+    permission.users.map((u) => u.id)
+  );
 
   const onChange = (value: any) => {
     setSelectedUsers((prev) => {
@@ -119,6 +126,13 @@ export default function Page(props: Props) {
     }
   };
 
+  const { setClassName } = React.useContext(LayoutContext);
+
+  useEffect(() => {
+    setClassName("gap-6");
+    return () => setClassName("");
+  }, [setClassName]);
+
   return (
     <>
       <Head>
@@ -131,18 +145,22 @@ export default function Page(props: Props) {
         <link rel="icon" href="/favicon.ico" />
       </Head>
       <ToastContainer />
-			<Layout user={user} className="gap-6">
+      <>
         <div className="flex flex-col gap-6 w-full h-[88vh] overflow-y-scroll scrollbar-hide rounded-xl">
-					<h1 className="text-2xl font-semibold">Permission: {permission.type as string}</h1>
+          <h1 className="text-2xl font-semibold">
+            Permission: {permission.type as string}
+          </h1>
           <div className="flex gap-3">
             <Select
               value={null}
-							options={users
-								.filter((u) => !selectedUsers.includes(u.id))
-								.map((u) => ({
-									label: `${u?.type}-${u?.name}`,
-									value: u.id,
-								}))}
+              options={users.reduce<{ label: string; value: string }[]>(
+                (acc, u) => {
+                  if (!selectedUsers.includes(u.id))
+                    acc.push({ label: `${u?.type}-${u?.name}`, value: u.id });
+                  return acc;
+                },
+                []
+              )}
               onChange={onChange}
             />
             <Button onClick={update}>Update</Button>
@@ -154,11 +172,18 @@ export default function Page(props: Props) {
                 {selectedUsers.map((userId) => {
                   const user = users.find((u) => u.id === userId);
                   return (
-										<div className="flex p-4 rounded-xl w-auto bg-mti-purple-light text-white gap-4" key={userId}>
+                    <div
+                      className="flex p-4 rounded-xl w-auto bg-mti-purple-light text-white gap-4"
+                      key={userId}
+                    >
                       <span className="text-base first-letter:uppercase">
                         {user?.type}-{user?.name}
                       </span>
-											<BsTrash style={{cursor: "pointer"}} onClick={() => removeUser(userId)} size={20} />
+                      <BsTrash
+                        style={{ cursor: "pointer" }}
+                        onClick={() => removeUser(userId)}
+                        size={20}
+                      />
                     </div>
                   );
                 })}
@@ -167,22 +192,25 @@ export default function Page(props: Props) {
             <div className="flex flex-col gap-3">
               <h2>Whitelisted Users</h2>
               <div className="flex flex-col gap-3 flex-wrap">
-								{users
-									.filter((user) => !selectedUsers.includes(user.id))
-									.map((user) => {
+                {users.map((user) => {
+                  if (!selectedUsers.includes(user.id))
                     return (
-											<div className="flex p-4 rounded-xl w-auto bg-mti-purple-light text-white gap-4" key={user.id}>
+                      <div
+                        className="flex p-4 rounded-xl w-auto bg-mti-purple-light text-white gap-4"
+                        key={user.id}
+                      >
                         <span className="text-base first-letter:uppercase">
                           {user?.type}-{user?.name}
                         </span>
                       </div>
                     );
+                  return null;
                 })}
               </div>
             </div>
           </div>
         </div>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/permissions/index.tsx

@@ -6,24 +6,33 @@ import {shouldRedirectHome} from "@/utils/navigation.disabled";
 import { Permission } from "@/interfaces/permissions";
 import { getPermissionDocs } from "@/utils/permissions.be";
 import { User } from "@/interfaces/user";
-import Layout from "@/components/High/Layout";
+import  { LayoutContext } from "@/components/High/Layout";
 import PermissionList from "@/components/PermissionList";
 import { requestUser } from "@/utils/api";
 import { redirect } from "@/utils";
+import React from "react";
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+  const user = await requestUser(req, res);
+  if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user)) return redirect("/")
+  if (shouldRedirectHome(user)) return redirect("/");
 
   // Fetch data from external API
   const permissions: Permission[] = await getPermissionDocs();
   const filteredPermissions = permissions.filter((p) => {
     const permissionType = p.type.toString().toLowerCase();
 
-		if (user.type === "corporate") return !permissionType.includes("corporate") && !permissionType.includes("admin");
-		if (user.type === "mastercorporate") return !permissionType.includes("mastercorporate") && !permissionType.includes("admin");
+    if (user.type === "corporate")
+      return (
+        !permissionType.includes("corporate") &&
+        !permissionType.includes("admin")
+      );
+    if (user.type === "mastercorporate")
+      return (
+        !permissionType.includes("mastercorporate") &&
+        !permissionType.includes("admin")
+      );
 
     return true;
   });
@@ -51,6 +60,9 @@ interface Props {
 export default function Page(props: Props) {
   const { permissions, user } = props;
 
+  const { setClassName } = React.useContext(LayoutContext);
+  React.useEffect(() => setClassName("gap-6"), [setClassName]);
+
   return (
     <>
       <Head>
@@ -62,12 +74,12 @@ export default function Page(props: Props) {
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="icon" href="/favicon.ico" />
       </Head>
-			<Layout user={user} className="gap-6">
+      <>
         <h1 className="text-2xl font-semibold">Permissions</h1>
         <div className="flex gap-3 flex-wrap overflow-y-scroll scrollbar-hide h-[80vh] rounded-xl">
           <PermissionList permissions={permissions} />
         </div>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/profile.tsx

@@ -2,10 +2,16 @@
 import Head from "next/head";
 import { withIronSessionSsr } from "iron-session/next";
 import { sessionOptions } from "@/lib/session";
-import { ChangeEvent, Dispatch, ReactNode, SetStateAction, useEffect, useRef, useState } from "react";
+import {
+  ChangeEvent,
+  Dispatch,
+  ReactNode,
+  SetStateAction,
+  useRef,
+  useState,
+} from "react";
 import useUser from "@/hooks/useUser";
 import { toast, ToastContainer } from "react-toastify";
-import Layout from "@/components/High/Layout";
 import Input from "@/components/Low/Input";
 import Button from "@/components/Low/Button";
 import Link from "next/link";
@@ -15,26 +21,21 @@ import clsx from "clsx";
 import {
   CorporateUser,
   EmploymentStatus,
-	EMPLOYMENT_STATUS,
   Gender,
   User,
   DemographicInformation,
   MasterCorporateUser,
-	Group,
 } from "@/interfaces/user";
 import CountrySelect from "@/components/Low/CountrySelect";
 import { shouldRedirectHome } from "@/utils/navigation.disabled";
 import moment from "moment";
 import { BsCamera, BsQuestionCircleFill } from "react-icons/bs";
 import { USER_TYPE_LABELS } from "@/resources/user";
-import useGroups from "@/hooks/useGroups";
-import useUsers from "@/hooks/useUsers";
 import { convertBase64, redirect } from "@/utils";
 import { Divider } from "primereact/divider";
 import GenderInput from "@/components/High/GenderInput";
 import EmploymentStatusInput from "@/components/High/EmploymentStatusInput";
 import TimezoneSelect from "@/components/Low/TImezoneSelect";
-import Modal from "@/components/Modal";
 import { Module } from "@/interfaces";
 import ModuleLevelSelector from "@/components/Medium/ModuleLevelSelector";
 import Select from "@/components/Low/Select";
@@ -42,39 +43,65 @@ import { InstructorGender } from "@/interfaces/exam";
 import { capitalize } from "lodash";
 import TopicModal from "@/components/Medium/TopicModal";
 import { v4 } from "uuid";
-import { checkAccess, getTypesOfUser } from "@/utils/permissions";
+import { checkAccess } from "@/utils/permissions";
 import { getParticipantGroups, getUserCorporate } from "@/utils/groups.be";
-import { InferGetServerSidePropsType } from "next";
-import { getUsers } from "@/utils/users.be";
+import { countUsers, getUser } from "@/utils/users.be";
 import { requestUser } from "@/utils/api";
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+  const user = await requestUser(req, res);
+  if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user)) return redirect("/")
+  if (shouldRedirectHome(user)) return redirect("/");
+  const [linkedCorporate, groups, referralAgent] = await Promise.all([
+    getUserCorporate(user.id) || null,
+    getParticipantGroups(user.id, { _id: 0, group: 1 }),
+    user.type === "corporate" && user.corporateInformation.referralAgent
+      ? getUser(user.corporateInformation.referralAgent, {
+          _id: 0,
+          name: 1,
+          email: 1,
+          demographicInformation: 1,
+        })
+      : null,
+  ]);
+  const groupsAdmin = groups.map((group) => group.admin);
+
+  const hasBenefitsFromUniversity =
+    (await countUsers({
+      id: { $in: groupsAdmin },
+      type: "corporate",
+    })) > 0;
 
   return {
     props: {
       user,
-			linkedCorporate: (await getUserCorporate(user.id)) || null,
-			groups: await getParticipantGroups(user.id),
-			users: await getUsers(),
+      linkedCorporate,
+      hasBenefitsFromUniversity,
+      referralAgent,
     },
   };
 }, sessionOptions);
 
 interface Props {
   user: User;
-	groups: Group[];
-	users: User[];
+  hasBenefitsFromUniversity: boolean;
   mutateUser: Function;
+  referralAgent?: User;
   linkedCorporate?: CorporateUser | MasterCorporateUser;
 }
 
-const DoubleColumnRow = ({ children }: { children: ReactNode }) => <div className="flex flex-col lg:flex-row gap-8 w-full">{children}</div>;
+const DoubleColumnRow = ({ children }: { children: ReactNode }) => (
+  <div className="flex flex-col lg:flex-row gap-8 w-full">{children}</div>
+);
 
-function UserProfile({ user, mutateUser, linkedCorporate, groups, users }: Props) {
+function UserProfile({
+  user,
+  mutateUser,
+  linkedCorporate,
+  hasBenefitsFromUniversity,
+  referralAgent,
+}: Props) {
   const [bio, setBio] = useState(user.bio || "");
   const [name, setName] = useState(user.name || "");
   const [email, setEmail] = useState(user.email || "");
@@ -83,37 +110,69 @@ function UserProfile({ user, mutateUser, linkedCorporate, groups, users }: Props
   const [isLoading, setIsLoading] = useState(false);
   const [profilePicture, setProfilePicture] = useState(user.profilePicture);
 
-	const [desiredLevels, setDesiredLevels] = useState(checkAccess(user, ["developer", "student"]) ? user.desiredLevels : undefined);
+  const [desiredLevels, setDesiredLevels] = useState(
+    checkAccess(user, ["developer", "student"]) ? user.desiredLevels : undefined
+  );
   const [focus, setFocus] = useState<"academic" | "general">(user.focus);
 
-	const [country, setCountry] = useState<string>(user.demographicInformation?.country || "");
-	const [phone, setPhone] = useState<string>(user.demographicInformation?.phone || "");
-	const [gender, setGender] = useState<Gender | undefined>(user.demographicInformation?.gender || undefined);
+  const [country, setCountry] = useState<string>(
+    user.demographicInformation?.country || ""
+  );
+  const [phone, setPhone] = useState<string>(
+    user.demographicInformation?.phone || ""
+  );
+  const [gender, setGender] = useState<Gender | undefined>(
+    user.demographicInformation?.gender || undefined
+  );
   const [employment, setEmployment] = useState<EmploymentStatus | undefined>(
-		checkAccess(user, ["corporate", "mastercorporate"]) ? undefined : (user.demographicInformation as DemographicInformation)?.employment,
+    checkAccess(user, ["corporate", "mastercorporate"])
+      ? undefined
+      : (user.demographicInformation as DemographicInformation)?.employment
   );
   const [passport_id, setPassportID] = useState<string | undefined>(
-		checkAccess(user, ["student"]) ? (user.demographicInformation as DemographicInformation)?.passport_id : undefined,
+    checkAccess(user, ["student"])
+      ? (user.demographicInformation as DemographicInformation)?.passport_id
+      : undefined
   );
 
-	const [preferredGender, setPreferredGender] = useState<InstructorGender | undefined>(
-		user.type === "student" || user.type === "developer" ? user.preferredGender || "varied" : undefined,
+  const [preferredGender, setPreferredGender] = useState<
+    InstructorGender | undefined
+  >(
+    user.type === "student" || user.type === "developer"
+      ? user.preferredGender || "varied"
+      : undefined
   );
   const [preferredTopics, setPreferredTopics] = useState<string[] | undefined>(
-		user.type === "student" || user.type === "developer" ? user.preferredTopics : undefined,
+    user.type === "student" || user.type === "developer"
+      ? user.preferredTopics
+      : undefined
   );
 
   const [position, setPosition] = useState<string | undefined>(
-		user.type === "corporate" || user.type === "mastercorporate" ? user.demographicInformation?.position : undefined,
+    user.type === "corporate" || user.type === "mastercorporate"
+      ? user.demographicInformation?.position
+      : undefined
   );
   const [corporateInformation, setCorporateInformation] = useState(
-		user.type === "corporate" || user.type === "mastercorporate" ? user.corporateInformation : undefined,
+    user.type === "corporate" || user.type === "mastercorporate"
+      ? user.corporateInformation
+      : undefined
   );
 
-	const [companyName] = useState<string | undefined>(user.type === "agent" ? user.agentInformation?.companyName : undefined);
-	const [commercialRegistration] = useState<string | undefined>(user.type === "agent" ? user.agentInformation?.commercialRegistration : undefined);
-	const [arabName, setArabName] = useState<string | undefined>(user.type === "agent" ? user.agentInformation?.companyArabName : undefined);
-	const [timezone, setTimezone] = useState<string>(user.demographicInformation?.timezone || moment.tz.guess());
+  const [companyName] = useState<string | undefined>(
+    user.type === "agent" ? user.agentInformation?.companyName : undefined
+  );
+  const [commercialRegistration] = useState<string | undefined>(
+    user.type === "agent"
+      ? user.agentInformation?.commercialRegistration
+      : undefined
+  );
+  const [arabName, setArabName] = useState<string | undefined>(
+    user.type === "agent" ? user.agentInformation?.companyArabName : undefined
+  );
+  const [timezone, setTimezone] = useState<string>(
+    user.demographicInformation?.timezone || moment.tz.guess()
+  );
   const [isPreferredTopicsOpen, setIsPreferredTopicsOpen] = useState(false);
 
   const profilePictureInput = useRef(null);
@@ -121,9 +180,12 @@ function UserProfile({ user, mutateUser, linkedCorporate, groups, users }: Props
     const momentDate = moment(date);
     const today = moment(new Date());
 
-		if (today.add(1, "days").isAfter(momentDate)) return "!bg-mti-red-ultralight border-mti-red-light";
-		if (today.add(3, "days").isAfter(momentDate)) return "!bg-mti-rose-ultralight border-mti-rose-light";
-		if (today.add(7, "days").isAfter(momentDate)) return "!bg-mti-orange-ultralight border-mti-orange-light";
+    if (today.add(1, "days").isAfter(momentDate))
+      return "!bg-mti-red-ultralight border-mti-red-light";
+    if (today.add(3, "days").isAfter(momentDate))
+      return "!bg-mti-rose-ultralight border-mti-rose-light";
+    if (today.add(7, "days").isAfter(momentDate))
+      return "!bg-mti-orange-ultralight border-mti-orange-light";
   };
 
   const uploadProfilePicture = async (event: ChangeEvent<HTMLInputElement>) => {
@@ -143,15 +205,15 @@ function UserProfile({ user, mutateUser, linkedCorporate, groups, users }: Props
     }
 
     if (newPassword && !password) {
-			toast.error("To update your password you need to input your current one!");
+      toast.error(
+        "To update your password you need to input your current one!"
+      );
       setIsLoading(false);
       return;
     }
 
     if (email !== user?.email) {
-			const userAdmins = groups.filter((x) => x.participants.includes(user.id)).map((x) => x.admin);
-			const message =
-				users.filter((x) => userAdmins.includes(x.id) && x.type === "corporate").length > 0
+      const message = hasBenefitsFromUniversity
         ? "If you change your e-mail address, you will lose all benefits from your university/institute. Are you sure you want to continue?"
         : "Are you sure you want to update your e-mail address?";
 
@@ -212,7 +274,9 @@ function UserProfile({ user, mutateUser, linkedCorporate, groups, users }: Props
 
   const ExpirationDate = () => (
     <div className="flex flex-col gap-3 w-full">
-			<label className="font-normal text-base text-mti-gray-dim">Expiry Date (click to purchase)</label>
+      <label className="font-normal text-base text-mti-gray-dim">
+        Expiry Date (click to purchase)
+      </label>
       <Link
         href="/payment"
         className={clsx(
@@ -221,33 +285,45 @@ function UserProfile({ user, mutateUser, linkedCorporate, groups, users }: Props
           !user.subscriptionExpirationDate
             ? "!bg-mti-green-ultralight !border-mti-green-light"
             : expirationDateColor(user.subscriptionExpirationDate),
-					"bg-white border-mti-gray-platinum",
-				)}>
+          "bg-white border-mti-gray-platinum"
+        )}
+      >
         {!user.subscriptionExpirationDate && "Unlimited"}
-				{user.subscriptionExpirationDate && moment(user.subscriptionExpirationDate).format("DD/MM/YYYY")}
+        {user.subscriptionExpirationDate &&
+          moment(user.subscriptionExpirationDate).format("DD/MM/YYYY")}
       </Link>
     </div>
   );
 
   const TimezoneInput = () => (
     <div className="flex flex-col gap-3 w-full">
-			<label className="font-normal text-base text-mti-gray-dim">Timezone</label>
+      <label className="font-normal text-base text-mti-gray-dim">
+        Timezone
+      </label>
       <TimezoneSelect value={timezone} onChange={setTimezone} />
     </div>
   );
 
-	const manualDownloadLink = ["student", "teacher", "corporate"].includes(user.type) ? `/manuals/${user.type}.pdf` : "";
+  const manualDownloadLink = ["student", "teacher", "corporate"].includes(
+    user.type
+  )
+    ? `/manuals/${user.type}.pdf`
+    : "";
 
   return (
-		<Layout user={user}>
+    <>
       <section className="w-full flex flex-col gap-4 md:gap-8 px-4 py-8">
         <h1 className="text-4xl font-bold mb-6 md:hidden">Edit Profile</h1>
         <div className="flex -md:flex-col-reverse -md:items-center w-full justify-between">
           <div className="flex flex-col gap-8 w-full md:w-2/3">
             <h1 className="text-4xl font-bold mb-6 -md:hidden">Edit Profile</h1>
-						<form className="flex flex-col items-center gap-6 w-full" onSubmit={(e) => e.preventDefault()}>
+            <form
+              className="flex flex-col items-center gap-6 w-full"
+              onSubmit={(e) => e.preventDefault()}
+            >
               <DoubleColumnRow>
-								{user.type !== "corporate" && user.type !== "mastercorporate" && (
+                {user.type !== "corporate" &&
+                  user.type !== "mastercorporate" && (
                     <Input
                       label={user.type === "agent" ? "English name" : "Name"}
                       type="text"
@@ -323,7 +399,9 @@ function UserProfile({ user, mutateUser, linkedCorporate, groups, users }: Props
 
               <DoubleColumnRow>
                 <div className="flex flex-col gap-3 w-full">
-									<label className="font-normal text-base text-mti-gray-dim">Country *</label>
+                  <label className="font-normal text-base text-mti-gray-dim">
+                    Country *
+                  </label>
                   <CountrySelect value={country} onChange={setCountry} />
                 </div>
                 <Input
@@ -356,26 +434,37 @@ function UserProfile({ user, mutateUser, linkedCorporate, groups, users }: Props
 
               <Divider />
 
-							{desiredLevels && ["developer", "student"].includes(user.type) && (
+              {desiredLevels &&
+                ["developer", "student"].includes(user.type) && (
                   <>
                     <div className="flex flex-col gap-3 w-full">
-										<label className="font-normal text-base text-mti-gray-dim">Desired Levels</label>
+                      <label className="font-normal text-base text-mti-gray-dim">
+                        Desired Levels
+                      </label>
                       <ModuleLevelSelector
                         levels={desiredLevels}
-											setLevels={setDesiredLevels as Dispatch<SetStateAction<{ [key in Module]: number }>>}
+                        setLevels={
+                          setDesiredLevels as Dispatch<
+                            SetStateAction<{ [key in Module]: number }>
+                          >
+                        }
                       />
                     </div>
                     <div className="flex flex-col gap-3 w-full">
-										<label className="font-normal text-base text-mti-gray-dim">Focus</label>
+                      <label className="font-normal text-base text-mti-gray-dim">
+                        Focus
+                      </label>
                       <div className="grid grid-cols-1 md:grid-cols-2 gap-y-4 gap-x-16 w-full">
                         <button
                           onClick={() => setFocus("academic")}
                           className={clsx(
                             "w-full border border-mti-gray-platinum rounded-full px-6 py-4 flex justify-center items-center gap-12 bg-white",
                             "hover:bg-mti-purple-light hover:text-white",
-													focus === "academic" && "!bg-mti-purple-light !text-white",
-													"transition duration-300 ease-in-out",
-												)}>
+                            focus === "academic" &&
+                              "!bg-mti-purple-light !text-white",
+                            "transition duration-300 ease-in-out"
+                          )}
+                        >
                           Academic
                         </button>
                         <button
@@ -383,9 +472,11 @@ function UserProfile({ user, mutateUser, linkedCorporate, groups, users }: Props
                           className={clsx(
                             "w-full border border-mti-gray-platinum rounded-full px-6 py-4 flex justify-center items-center gap-12 bg-white",
                             "hover:bg-mti-purple-light hover:text-white",
-													focus === "general" && "!bg-mti-purple-light !text-white",
-													"transition duration-300 ease-in-out",
-												)}>
+                            focus === "general" &&
+                              "!bg-mti-purple-light !text-white",
+                            "transition duration-300 ease-in-out"
+                          )}
+                        >
                           General
                         </button>
                       </div>
@@ -393,18 +484,27 @@ function UserProfile({ user, mutateUser, linkedCorporate, groups, users }: Props
                   </>
                 )}
 
-							{preferredGender && ["developer", "student"].includes(user.type) && (
+              {preferredGender &&
+                ["developer", "student"].includes(user.type) && (
                   <>
                     <Divider />
                     <DoubleColumnRow>
                       <div className="flex flex-col gap-3 w-full">
-											<label className="font-normal text-base text-mti-gray-dim">Speaking Instructor&apos;s Gender</label>
+                        <label className="font-normal text-base text-mti-gray-dim">
+                          Speaking Instructor&apos;s Gender
+                        </label>
                         <Select
                           value={{
                             value: preferredGender,
                             label: capitalize(preferredGender),
                           }}
-												onChange={(value) => (value ? setPreferredGender(value.value as InstructorGender) : null)}
+                          onChange={(value) =>
+                            value
+                              ? setPreferredGender(
+                                  value.value as InstructorGender
+                                )
+                              : null
+                          }
                           options={[
                             { value: "male", label: "Male" },
                             { value: "female", label: "Female" },
@@ -417,12 +517,18 @@ function UserProfile({ user, mutateUser, linkedCorporate, groups, users }: Props
                           Preferred Topics{" "}
                           <span
                             className="tooltip"
-													data-tip="These topics will be considered for speaking and writing modules, aiming to include at least one exercise containing of the these in the selected exams.">
+                            data-tip="These topics will be considered for speaking and writing modules, aiming to include at least one exercise containing of the these in the selected exams."
+                          >
                             <BsQuestionCircleFill />
                           </span>
                         </label>
-											<Button className="w-full" variant="outline" onClick={() => setIsPreferredTopicsOpen(true)}>
-												Select Topics ({preferredTopics?.length || "All"} selected)
+                        <Button
+                          className="w-full"
+                          variant="outline"
+                          onClick={() => setIsPreferredTopicsOpen(true)}
+                        >
+                          Select Topics ({preferredTopics?.length || "All"}{" "}
+                          selected)
                         </Button>
                       </div>
                     </DoubleColumnRow>
@@ -483,14 +589,16 @@ function UserProfile({ user, mutateUser, linkedCorporate, groups, users }: Props
                 </>
               )}
 
-							{user.type === "corporate" && user.corporateInformation.referralAgent && (
+              {user.type === "corporate" &&
+                user.corporateInformation.referralAgent &&
+                referralAgent && (
                   <>
                     <Divider />
                     <DoubleColumnRow>
                       <Input
                         name="agentName"
                         onChange={() => null}
-											defaultValue={users.find((x) => x.id === user.corporateInformation.referralAgent)?.name}
+                        defaultValue={referralAgent?.name}
                         type="text"
                         label="Country Manager's Name"
                         placeholder="Not available"
@@ -500,7 +608,7 @@ function UserProfile({ user, mutateUser, linkedCorporate, groups, users }: Props
                       <Input
                         name="agentEmail"
                         onChange={() => null}
-											defaultValue={users.find((x) => x.id === user.corporateInformation.referralAgent)?.email}
+                        defaultValue={referralAgent?.email}
                         type="text"
                         label="Country Manager's E-mail"
                         placeholder="Not available"
@@ -510,12 +618,11 @@ function UserProfile({ user, mutateUser, linkedCorporate, groups, users }: Props
                     </DoubleColumnRow>
                     <DoubleColumnRow>
                       <div className="flex flex-col gap-2 w-full">
-											<label className="font-normal text-base text-mti-gray-dim">Country Manager&apos;s Country *</label>
+                        <label className="font-normal text-base text-mti-gray-dim">
+                          Country Manager&apos;s Country *
+                        </label>
                         <CountrySelect
-												value={
-													users.find((x) => x.id === user.corporateInformation.referralAgent)?.demographicInformation
-														?.country
-												}
+                          value={referralAgent?.demographicInformation?.country}
                           onChange={() => null}
                           disabled
                         />
@@ -528,7 +635,7 @@ function UserProfile({ user, mutateUser, linkedCorporate, groups, users }: Props
                         onChange={() => null}
                         placeholder="Not available"
                         defaultValue={
-												users.find((x) => x.id === user.corporateInformation.referralAgent)?.demographicInformation?.phone
+                          referralAgent?.demographicInformation?.phone
                         }
                         disabled
                         required
@@ -539,7 +646,10 @@ function UserProfile({ user, mutateUser, linkedCorporate, groups, users }: Props
 
               {user.type !== "corporate" && (
                 <DoubleColumnRow>
-									<EmploymentStatusInput value={employment} onChange={setEmployment} />
+                  <EmploymentStatusInput
+                    value={employment}
+                    onChange={setEmployment}
+                  />
 
                   <div className="flex flex-col gap-8 w-full">
                     <GenderInput value={gender} onChange={setGender} />
@@ -552,37 +662,62 @@ function UserProfile({ user, mutateUser, linkedCorporate, groups, users }: Props
           <div className="flex flex-col gap-6 w-48">
             <div
               className="flex flex-col gap-3 items-center h-fit cursor-pointer group"
-							onClick={() => (profilePictureInput.current as any)?.click()}>
+              onClick={() => (profilePictureInput.current as any)?.click()}
+            >
               <div className="relative overflow-hidden h-48 w-48 rounded-full">
                 <div
                   className={clsx(
                     "absolute top-0 left-0 bg-mti-purple-light/60 w-full h-full z-20 flex items-center justify-center opacity-0 group-hover:opacity-100",
-										"transition ease-in-out duration-300",
-									)}>
+                    "transition ease-in-out duration-300"
+                  )}
+                >
                   <BsCamera className="text-6xl text-mti-purple-ultralight/80" />
                 </div>
-								<img src={profilePicture} alt={user.name} className="aspect-square drop-shadow-xl self-end object-cover" />
+                <img
+                  src={profilePicture}
+                  alt={user.name}
+                  className="aspect-square drop-shadow-xl self-end object-cover"
+                />
               </div>
-							<input type="file" className="hidden" onChange={uploadProfilePicture} accept="image/*" ref={profilePictureInput} />
+              <input
+                type="file"
+                className="hidden"
+                onChange={uploadProfilePicture}
+                accept="image/*"
+                ref={profilePictureInput}
+              />
               <span
                 onClick={() => (profilePictureInput.current as any)?.click()}
-								className="cursor-pointer text-mti-purple-light text-sm">
+                className="cursor-pointer text-mti-purple-light text-sm"
+              >
                 Change picture
               </span>
-							<h6 className="font-normal text-base text-mti-gray-taupe">{USER_TYPE_LABELS[user.type]}</h6>
+              <h6 className="font-normal text-base text-mti-gray-taupe">
+                {USER_TYPE_LABELS[user.type]}
+              </h6>
             </div>
             {user.type === "agent" && (
               <div className="flag items-center h-fit">
                 <img
-									alt={user.demographicInformation?.country.toLowerCase() + "_flag"}
+                  alt={
+                    user.demographicInformation?.country.toLowerCase() + "_flag"
+                  }
                   src={`https://flagcdn.com/w320/${user.demographicInformation?.country.toLowerCase()}.png`}
                   width="320"
                 />
               </div>
             )}
             {manualDownloadLink && (
-							<a href={manualDownloadLink} className="max-w-[200px] self-end w-full" download>
-								<Button color="purple" variant="outline" className="max-w-[200px] self-end w-full">
+              <a
+                href={manualDownloadLink}
+                className="max-w-[200px] self-end w-full"
+                download
+              >
+                <Button
+                  color="purple"
+                  variant="outline"
+                  className="max-w-[200px] self-end w-full"
+                >
                   Download Manual
                 </Button>
               </a>
@@ -601,20 +736,33 @@ function UserProfile({ user, mutateUser, linkedCorporate, groups, users }: Props
 
         <div className="self-end flex justify-between w-full gap-8 absolute bottom-8 left-0 px-8">
           <Link href="/" className="max-w-[200px] self-end w-full">
-						<Button color="purple" variant="outline" className="max-w-[200px] self-end w-full">
+            <Button
+              color="purple"
+              variant="outline"
+              className="max-w-[200px] self-end w-full"
+            >
               Back
             </Button>
           </Link>
-					<Button color="purple" className="max-w-[200px] self-end w-full" onClick={updateUser} disabled={isLoading}>
+          <Button
+            color="purple"
+            className="max-w-[200px] self-end w-full"
+            onClick={updateUser}
+            disabled={isLoading}
+          >
             Save Changes
           </Button>
         </div>
       </section>
-		</Layout>
+    </>
   );
 }
 
-export default function Home(props: { linkedCorporate?: CorporateUser | MasterCorporateUser; groups: Group[]; users: User[] }) {
+export default function Home(props: {
+  hasBenefitsFromUniversity: boolean;
+  referralAgent?: User;
+  linkedCorporate?: CorporateUser | MasterCorporateUser;
+}) {
   const { user, mutateUser } = useUser({ redirectTo: "/login" });
 
   return (

src/pages/record.tsx

@@ -8,7 +8,6 @@ import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
 import { groupByDate } from "@/utils/stats";
 import moment from "moment";
 import { ToastContainer } from "react-toastify";
-import Layout from "@/components/High/Layout";
 import clsx from "clsx";
 import { shouldRedirectHome } from "@/utils/navigation.disabled";
 import { uuidv4 } from "@firebase/util";
@@ -24,7 +23,9 @@ import { getAssignments, getEntitiesAssignments } from "@/utils/assignments.be";
 import { findBy, mapBy, redirect, serialize } from "@/utils";
 import { getEntitiesWithRoles } from "@/utils/entities.be";
 import { checkAccess } from "@/utils/permissions";
-import { getGradingSystemByEntities, getGradingSystemByEntity } from "@/utils/grading.be";
+import {
+  getGradingSystemByEntities,
+} from "@/utils/grading.be";
 import { Grading } from "@/interfaces";
 import { EntityWithRoles } from "@/interfaces/entity";
 import CardList from "@/components/High/CardList";
@@ -34,23 +35,34 @@ import getPendingEvals from "@/utils/disabled.be";
 import useEvaluationPolling from "@/hooks/useEvaluationPolling";
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+  const user = await requestUser(req, res);
+  if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user)) return redirect("/")
+  if (shouldRedirectHome(user)) return redirect("/");
 
-	const entityIDs = mapBy(user.entities, 'id')
-	const isAdmin = checkAccess(user, ["admin", "developer"])
+  const entityIDs = mapBy(user.entities, "id");
+  const isAdmin = checkAccess(user, ["admin", "developer"]);
 
-	const entities = await getEntitiesWithRoles(checkAccess(user, ["admin", "developer"]) ? undefined : entityIDs)
-	const entitiesIds = mapBy(entities, 'id')
-	const users = await (isAdmin ? getUsers() : getEntitiesUsers(entitiesIds))
-	const assignments = await (isAdmin ? getAssignments() : getEntitiesAssignments(entitiesIds))
-	const gradingSystems = await getGradingSystemByEntities(entitiesIds)
-	const pendingSessionIds = await getPendingEvals(user.id);
+  const entities = await getEntitiesWithRoles(isAdmin ? undefined : entityIDs);
+  const entitiesIds = mapBy(entities, "id");
+  const [users, assignments, gradingSystems, pendingSessionIds] =
+    await Promise.all([
+      isAdmin ? getUsers() : getEntitiesUsers(entitiesIds),
+      isAdmin ? getAssignments() : getEntitiesAssignments(entitiesIds),
+      getGradingSystemByEntities(entitiesIds),
+      getPendingEvals(user.id),
+    ]);
 
   return {
-		props: serialize({ user, users, assignments, entities, gradingSystems, isAdmin, pendingSessionIds }),
+    props: serialize({
+      user,
+      users,
+      assignments,
+      entities,
+      gradingSystems,
+      isAdmin,
+      pendingSessionIds,
+    }),
   };
 }, sessionOptions);
 
@@ -60,46 +72,67 @@ interface Props {
   user: User;
   users: User[];
   assignments: Assignment[];
-	entities: EntityWithRoles[]
-	gradingSystems: Grading[]
+  entities: EntityWithRoles[];
+  gradingSystems: Grading[];
   pendingSessionIds: string[];
-	isAdmin:boolean
+  isAdmin: boolean;
 }
 
 const MAX_TRAINING_EXAMS = 10;
 
-export default function History({ user, users, assignments, entities, gradingSystems, isAdmin, pendingSessionIds }: Props) {
+export default function History({
+  user,
+  users,
+  assignments,
+  entities,
+  gradingSystems,
+  isAdmin,
+  pendingSessionIds,
+}: Props) {
   const router = useRouter();
-	const [statsUserId, setStatsUserId, training, setTraining] = useRecordStore((state) => [
+  const [statsUserId, setStatsUserId, training, setTraining] = useRecordStore(
+    (state) => [
       state.selectedUser,
       state.setSelectedUser,
       state.training,
       state.setTraining,
-	]);
+    ]
+  );
 
   const [filter, setFilter] = useState<Filter>();
 
-	const { data: stats, isLoading: isStatsLoading } = useFilterRecordsByUser<Stat[]>(statsUserId || user?.id);
-	const allowedDownloadEntities = useAllowedEntities(user, entities, 'download_student_record')
+  const { data: stats, isLoading: isStatsLoading } = useFilterRecordsByUser<
+    Stat[]
+  >(statsUserId || user?.id);
+  const allowedDownloadEntities = useAllowedEntities(
+    user,
+    entities,
+    "download_student_record"
+  );
 
   const renderPdfIcon = usePDFDownload("stats");
 
-	const [selectedTrainingExams, setSelectedTrainingExams] = useState<string[]>([]);
+  const [selectedTrainingExams, setSelectedTrainingExams] = useState<string[]>(
+    []
+  );
   const setTrainingStats = useTrainingContentStore((state) => state.setStats);
 
-	const groupedStats = useMemo(() => groupByDate(
+  const groupedStats = useMemo(
+    () =>
+      groupByDate(
         stats.filter((x) => {
           if (
-				(
-					x.module === "writing" || x.module === "speaking") &&
-					!x.isDisabled && Array.isArray(x.solutions) && 
-					!x.solutions.every((y) => Object.keys(y).includes("evaluation")
-				)
+            (x.module === "writing" || x.module === "speaking") &&
+            !x.isDisabled &&
+            Array.isArray(x.solutions) &&
+            !x.solutions.every((y) => Object.keys(y).includes("evaluation"))
           )
             return false;
           return true;
-		}),
-	), [stats])
+        })
+      ),
+    [stats]
+  );
 
   useEffect(() => setStatsUserId(user.id), [setStatsUserId, user]);
 
@@ -121,7 +154,8 @@ export default function History({ user, users, assignments, entities, gradingSys
       const filteredStats: { [key: string]: Stat[] } = {};
 
       Object.keys(stats).forEach((timestamp) => {
-				if (timestamp >= filterDate) filteredStats[timestamp] = stats[timestamp];
+        if (timestamp >= filterDate)
+          filteredStats[timestamp] = stats[timestamp];
       });
       return filteredStats;
     }
@@ -130,8 +164,14 @@ export default function History({ user, users, assignments, entities, gradingSys
       const filteredStats: { [key: string]: Stat[] } = {};
 
       Object.keys(stats).forEach((timestamp) => {
-				if (stats[timestamp].map((s) => s.assignment === undefined).includes(false))
-					filteredStats[timestamp] = [...stats[timestamp].filter((s) => !!s.assignment)];
+        if (
+          stats[timestamp]
+            .map((s) => s.assignment === undefined)
+            .includes(false)
+        )
+          filteredStats[timestamp] = [
+            ...stats[timestamp].filter((s) => !!s.assignment),
+          ];
       });
 
       return filteredStats;
@@ -144,9 +184,14 @@ export default function History({ user, users, assignments, entities, gradingSys
     if (groupedStats) {
       const groupedStatsByDate = filterStatsByDate(groupedStats);
       const allStats = Object.keys(groupedStatsByDate);
-			const selectedStats = selectedTrainingExams.reduce<Record<string, Stat[]>>((accumulator, moduleAndTimestamp) => {
+      const selectedStats = selectedTrainingExams.reduce<
+        Record<string, Stat[]>
+      >((accumulator, moduleAndTimestamp) => {
         const timestamp = moduleAndTimestamp.split("-")[1];
-				if (allStats.includes(timestamp) && !accumulator.hasOwnProperty(timestamp)) {
+        if (
+          allStats.includes(timestamp) &&
+          !accumulator.hasOwnProperty(timestamp)
+        ) {
           accumulator[timestamp] = groupedStatsByDate[timestamp];
         }
         return accumulator;
@@ -156,17 +201,22 @@ export default function History({ user, users, assignments, entities, gradingSys
     }
   };
 
-	const filteredStats = useMemo(() =>
-		Object.keys(filterStatsByDate(groupedStats))
-			.sort((a, b) => parseInt(b) - parseInt(a)),
+  const filteredStats = useMemo(
+    () =>
+      Object.keys(filterStatsByDate(groupedStats)).sort(
+        (a, b) => parseInt(b) - parseInt(a)
+      ),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-		[groupedStats, filter])
+    [groupedStats, filter]
+  );
 
   const customContent = (timestamp: string) => {
     const dateStats = groupedStats[timestamp];
-		const statUser = findBy(users, 'id', dateStats[0]?.user)
+    const statUser = findBy(users, "id", dateStats[0]?.user);
 
-		const canDownload = mapBy(statUser?.entities, 'id').some(e => mapBy(allowedDownloadEntities, 'id').includes(e))
+    const canDownload = mapBy(statUser?.entities, "id").some((e) =>
+      mapBy(allowedDownloadEntities, "id").includes(e)
+    );
 
     return (
       <StatsGridItem
@@ -186,7 +236,11 @@ export default function History({ user, users, assignments, entities, gradingSys
     );
   };
 
-	useEvaluationPolling(pendingSessionIds ? pendingSessionIds : [], "records", user.id);
+  useEvaluationPolling(
+    pendingSessionIds ? pendingSessionIds : [],
+    "records",
+    user.id
+  );
 
   return (
     <>
@@ -201,8 +255,13 @@ export default function History({ user, users, assignments, entities, gradingSys
       </Head>
       <ToastContainer />
       {user && (
-				<Layout user={user}>
-					<RecordFilter user={user} isAdmin={isAdmin} entities={entities} filterState={{ filter: filter, setFilter: setFilter }}>
+        <>
+          <RecordFilter
+            user={user}
+            isAdmin={isAdmin}
+            entities={entities}
+            filterState={{ filter: filter, setFilter: setFilter }}
+          >
             {training && (
               <div className="flex flex-row">
                 <div className="font-semibold text-2xl mr-4">
@@ -212,19 +271,25 @@ export default function History({ user, users, assignments, entities, gradingSys
                 <button
                   className={clsx(
                     "bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light ml-4 disabled:cursor-not-allowed",
-										"transition duration-300 ease-in-out",
+                    "transition duration-300 ease-in-out"
                   )}
                   disabled={selectedTrainingExams.length == 0}
-									onClick={handleTrainingContentSubmission}>
+                  onClick={handleTrainingContentSubmission}
+                >
                   Submit
                 </button>
               </div>
             )}
           </RecordFilter>
 
-
           {filteredStats.length > 0 && !isStatsLoading && (
-						<CardList list={filteredStats} renderCard={customContent} searchFields={[]} pageSize={30} className="lg:!grid-cols-3" />
+            <CardList
+              list={filteredStats}
+              renderCard={customContent}
+              searchFields={[]}
+              pageSize={30}
+              className="lg:!grid-cols-3"
+            />
           )}
           {filteredStats.length === 0 && !isStatsLoading && (
             <span className="font-semibold ml-1">No record to display...</span>
@@ -234,7 +299,7 @@ export default function History({ user, users, assignments, entities, gradingSys
               <span className="loading loading-infinity w-32 bg-mti-green-light" />
             </div>
           )}
-				</Layout>
+        </>
       )}
     </>
   );

src/pages/register.tsx

@@ -8,9 +8,7 @@ import clsx from "clsx";
 import {Tab} from "@headlessui/react";
 import RegisterIndividual from "./(register)/RegisterIndividual";
 import RegisterCorporate from "./(register)/RegisterCorporate";
-import EmailVerification from "./(auth)/EmailVerification";
 import {sendEmailVerification} from "@/utils/email";
-import useUsers from "@/hooks/useUsers";
 import axios from "axios";
 
 export const getServerSideProps = (context: any) => {

src/pages/settings.tsx

@@ -3,54 +3,84 @@ import Head from "next/head";
 import { withIronSessionSsr } from "iron-session/next";
 import { sessionOptions } from "@/lib/session";
 import { ToastContainer } from "react-toastify";
-import Layout from "@/components/High/Layout";
 import CodeGenerator from "./(admin)/CodeGenerator";
 import ExamLoader from "./(admin)/ExamLoader";
-import { Tab } from "@headlessui/react";
-import clsx from "clsx";
 import Lists from "./(admin)/Lists";
 import BatchCodeGenerator from "./(admin)/BatchCodeGenerator";
 import { shouldRedirectHome } from "@/utils/navigation.disabled";
 import BatchCreateUser from "./(admin)/Lists/BatchCreateUser";
 import { checkAccess, getTypesOfUser } from "@/utils/permissions";
-import usePermissions from "@/hooks/usePermissions";
 import { useState } from "react";
 import Modal from "@/components/Modal";
 import IconCard from "@/components/IconCard";
-import { BsCode, BsCodeSquare, BsGearFill, BsPeopleFill, BsPersonFill } from "react-icons/bs";
+import {
+  BsCode,
+  BsCodeSquare,
+  BsGearFill,
+  BsPeopleFill,
+  BsPersonFill,
+} from "react-icons/bs";
 import UserCreator from "./(admin)/UserCreator";
 import CorporateGradingSystem from "./(admin)/CorporateGradingSystem";
 import { CEFR_STEPS } from "@/resources/grading";
 import { User } from "@/interfaces/user";
 import { getUserPermissions } from "@/utils/permissions.be";
-import { Permission, PermissionType } from "@/interfaces/permissions";
+import { PermissionType } from "@/interfaces/permissions";
 import { getUsers } from "@/utils/users.be";
-import useUsers from "@/hooks/useUsers";
-import { getEntitiesWithRoles, getEntityWithRoles } from "@/utils/entities.be";
+import { getEntitiesWithRoles } from "@/utils/entities.be";
 import { mapBy, serialize, redirect } from "@/utils";
 import { EntityWithRoles } from "@/interfaces/entity";
 import { requestUser } from "@/utils/api";
 import { isAdmin } from "@/utils/users";
-import { getGradingSystemByEntities, getGradingSystemByEntity } from "@/utils/grading.be";
+import {
+  getGradingSystemByEntities,
+  getGradingSystemByEntity,
+} from "@/utils/grading.be";
 import { Grading } from "@/interfaces";
 import { useRouter } from "next/router";
 import { useAllowedEntities } from "@/hooks/useEntityPermissions";
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+  const user = await requestUser(req, res);
+  if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user) || !checkAccess(user, ["admin", "developer", "corporate", "teacher", "mastercorporate"]))
-		return redirect("/")
-
-	const permissions = await getUserPermissions(user.id);
-	const entities = isAdmin(user) ? await getEntitiesWithRoles() : await getEntitiesWithRoles(mapBy(user.entities, 'id'))
-	const allUsers = await getUsers()
-	const gradingSystems = await getGradingSystemByEntities(mapBy(entities, 'id'))
-	const entitiesGrading = entities.map(e => gradingSystems.find(g => g.entity === e.id) || { entity: e.id, steps: CEFR_STEPS })
+  if (
+    shouldRedirectHome(user) ||
+    !checkAccess(user, [
+      "admin",
+      "developer",
+      "corporate",
+      "teacher",
+      "mastercorporate",
+    ])
+  )
+    return redirect("/");
+  const [permissions, entities, allUsers] = await Promise.all([
+    getUserPermissions(user.id),
+    isAdmin(user)
+      ? await getEntitiesWithRoles()
+      : await getEntitiesWithRoles(mapBy(user.entities, "id")),
+    getUsers(),
+  ]);
+  const gradingSystems = await getGradingSystemByEntities(
+    mapBy(entities, "id")
+  );
+  const entitiesGrading = entities.map(
+    (e) =>
+      gradingSystems.find((g) => g.entity === e.id) || {
+        entity: e.id,
+        steps: CEFR_STEPS,
+      }
+  );
 
   return {
-		props: serialize({ user, permissions, entities, allUsers, entitiesGrading }),
+    props: serialize({
+      user,
+      permissions,
+      entities,
+      allUsers,
+      entitiesGrading,
+    }),
   };
 }, sessionOptions);
 
@@ -58,19 +88,45 @@ interface Props {
   user: User;
   permissions: PermissionType[];
   entities: EntityWithRoles[];
-	allUsers: User[]
-	entitiesGrading: Grading[]
+  allUsers: User[];
+  entitiesGrading: Grading[];
 }
 
-export default function Admin({ user, entities, permissions, allUsers, entitiesGrading }: Props) {
+export default function Admin({
+  user,
+  entities,
+  permissions,
+  allUsers,
+  entitiesGrading,
+}: Props) {
   const [modalOpen, setModalOpen] = useState<string>();
-	const router = useRouter()
+  const router = useRouter();
 
-	const entitiesAllowCreateUser = useAllowedEntities(user, entities, 'create_user')
-	const entitiesAllowCreateUsers = useAllowedEntities(user, entities, 'create_user_batch')
-	const entitiesAllowCreateCode = useAllowedEntities(user, entities, 'create_code')
-	const entitiesAllowCreateCodes = useAllowedEntities(user, entities, 'create_code_batch')
-	const entitiesAllowEditGrading = useAllowedEntities(user, entities, 'edit_grading_system')
+  const entitiesAllowCreateUser = useAllowedEntities(
+    user,
+    entities,
+    "create_user"
+  );
+  const entitiesAllowCreateUsers = useAllowedEntities(
+    user,
+    entities,
+    "create_user_batch"
+  );
+  const entitiesAllowCreateCode = useAllowedEntities(
+    user,
+    entities,
+    "create_code"
+  );
+  const entitiesAllowCreateCodes = useAllowedEntities(
+    user,
+    entities,
+    "create_code_batch"
+  );
+  const entitiesAllowEditGrading = useAllowedEntities(
+    user,
+    entities,
+    "edit_grading_system"
+  );
 
   return (
     <>
@@ -84,8 +140,12 @@ export default function Admin({ user, entities, permissions, allUsers, entitiesG
         <link rel="icon" href="/favicon.ico" />
       </Head>
       <ToastContainer />
-			<Layout user={user} className="gap-6">
-				<Modal isOpen={modalOpen === "batchCreateUser"} onClose={() => setModalOpen(undefined)} maxWidth="max-w-[85%]">
+      <>
+        <Modal
+          isOpen={modalOpen === "batchCreateUser"}
+          onClose={() => setModalOpen(undefined)}
+          maxWidth="max-w-[85%]"
+        >
           <BatchCreateUser
             user={user}
             entities={entitiesAllowCreateUser}
@@ -93,7 +153,10 @@ export default function Admin({ user, entities, permissions, allUsers, entitiesG
             onFinish={() => setModalOpen(undefined)}
           />
         </Modal>
-				<Modal isOpen={modalOpen === "batchCreateCode"} onClose={() => setModalOpen(undefined)}>
+        <Modal
+          isOpen={modalOpen === "batchCreateCode"}
+          onClose={() => setModalOpen(undefined)}
+        >
           <BatchCodeGenerator
             entities={entitiesAllowCreateCodes}
             user={user}
@@ -102,7 +165,10 @@ export default function Admin({ user, entities, permissions, allUsers, entitiesG
             onFinish={() => setModalOpen(undefined)}
           />
         </Modal>
-				<Modal isOpen={modalOpen === "createCode"} onClose={() => setModalOpen(undefined)}>
+        <Modal
+          isOpen={modalOpen === "createCode"}
+          onClose={() => setModalOpen(undefined)}
+        >
           <CodeGenerator
             entities={entitiesAllowCreateCode}
             user={user}
@@ -110,7 +176,10 @@ export default function Admin({ user, entities, permissions, allUsers, entitiesG
             onFinish={() => setModalOpen(undefined)}
           />
         </Modal>
-				<Modal isOpen={modalOpen === "createUser"} onClose={() => setModalOpen(undefined)}>
+        <Modal
+          isOpen={modalOpen === "createUser"}
+          onClose={() => setModalOpen(undefined)}
+        >
           <UserCreator
             user={user}
             entities={entitiesAllowCreateUsers}
@@ -119,7 +188,10 @@ export default function Admin({ user, entities, permissions, allUsers, entitiesG
             onFinish={() => setModalOpen(undefined)}
           />
         </Modal>
-				<Modal isOpen={modalOpen === "gradingSystem"} onClose={() => setModalOpen(undefined)}>
+        <Modal
+          isOpen={modalOpen === "gradingSystem"}
+          onClose={() => setModalOpen(undefined)}
+        >
           <CorporateGradingSystem
             user={user}
             entitiesGrading={entitiesGrading}
@@ -130,7 +202,12 @@ export default function Admin({ user, entities, permissions, allUsers, entitiesG
 
         <section className="w-full grid grid-cols-2 -md:grid-cols-1 gap-8">
           <ExamLoader />
-					{checkAccess(user, getTypesOfUser(["teacher"]), permissions, "viewCodes") && (
+          {checkAccess(
+            user,
+            getTypesOfUser(["teacher"]),
+            permissions,
+            "viewCodes"
+          ) && (
             <div className="w-full grid grid-cols-2 gap-4">
               <IconCard
                 Icon={BsCode}
@@ -164,7 +241,12 @@ export default function Admin({ user, entities, permissions, allUsers, entitiesG
                 onClick={() => setModalOpen("batchCreateUser")}
                 disabled={entitiesAllowCreateUsers.length === 0}
               />
-							{checkAccess(user, ["admin", "corporate", "developer", "mastercorporate"]) && (
+              {checkAccess(user, [
+                "admin",
+                "corporate",
+                "developer",
+                "mastercorporate",
+              ]) && (
                 <IconCard
                   Icon={BsGearFill}
                   label="Grading System"
@@ -180,7 +262,7 @@ export default function Admin({ user, entities, permissions, allUsers, entitiesG
         <section className="w-full">
           <Lists user={user} entities={entities} permissions={permissions} />
         </section>
-			</Layout>
+      </>
     </>
   );
 }

src/pages/statistical.tsx

@@ -1,5 +1,4 @@
 /* eslint-disable @next/next/no-img-element */
-import Layout from "@/components/High/Layout";
 import Table from "@/components/High/Table";
 import Checkbox from "@/components/Low/Checkbox";
 import Separator from "@/components/Low/Separator";
@@ -8,16 +7,15 @@ import { Session } from "@/hooks/useSessions";
 import { Entity, EntityWithRoles } from "@/interfaces/entity";
 import { Exam } from "@/interfaces/exam";
 import { Assignment, AssignmentResult } from "@/interfaces/results";
-import { Group, Stat, StudentUser, User } from "@/interfaces/user";
+import { StudentUser, User } from "@/interfaces/user";
 import { sessionOptions } from "@/lib/session";
 import { filterBy, findBy, mapBy, redirect, serialize } from "@/utils";
 import { requestUser } from "@/utils/api";
 import { getEntitiesAssignments } from "@/utils/assignments.be";
 import { getEntitiesWithRoles } from "@/utils/entities.be";
 import { getExamsByIds } from "@/utils/exams.be";
-import { checkAccess, findAllowedEntities } from "@/utils/permissions";
-import { getSessionsByAssignments, getSessionsByUser } from "@/utils/sessions.be";
-import { getStatsByUsers } from "@/utils/stats.be";
+import { findAllowedEntities } from "@/utils/permissions";
+import { getSessionsByAssignments } from "@/utils/sessions.be";
 import { isAdmin } from "@/utils/users";
 import { getEntitiesUsers } from "@/utils/users.be";
 import { createColumnHelper } from "@tanstack/react-table";
@@ -30,67 +28,104 @@ import Head from "next/head";
 import Link from "next/link";
 import { useEffect, useMemo, useState } from "react";
 import ReactDatePicker from "react-datepicker";
-import {
-	BsBank,
-	BsChevronLeft,
-	BsX,
-} from "react-icons/bs";
+import { BsBank, BsChevronLeft, BsX } from "react-icons/bs";
 
 interface Props {
   user: User;
   students: StudentUser[];
   entities: EntityWithRoles[];
   assignments: Assignment[];
-	sessions: Session[]
-	exams: Exam[]
+  sessions: Session[];
+  exams: Exam[];
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+  const user = await requestUser(req, res);
+  if (!user) return redirect("/login");
 
   const entityIDS = mapBy(user.entities, "id") || [];
-	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDS);
-	const allowedEntities = findAllowedEntities(user, entities, 'view_entity_statistics')
+  const entities = await getEntitiesWithRoles(
+    isAdmin(user) ? undefined : entityIDS
+  );
+  const allowedEntities = findAllowedEntities(
+    user,
+    entities,
+    "view_entity_statistics"
+  );
 
-	if (allowedEntities.length === 0) return redirect("/")
+  if (allowedEntities.length === 0) return redirect("/");
 
-	const studentsAllowedEntities = findAllowedEntities(user, entities, 'view_students')
-	const students = await getEntitiesUsers(mapBy(studentsAllowedEntities, 'id'), { type: "student" })
+  const studentsAllowedEntities = findAllowedEntities(
+    user,
+    entities,
+    "view_students"
+	);
 	
-	const assignments = await getEntitiesAssignments(mapBy(entities, "id"));
-	const sessions = await getSessionsByAssignments(mapBy(assignments, 'id'))
-	const exams = await getExamsByIds(assignments.flatMap(a => a.exams))
+  const [students, assignments] = await Promise.all([
+    getEntitiesUsers(mapBy(studentsAllowedEntities, "id"), { type: "student" }),
+    getEntitiesAssignments(mapBy(entities, "id")),
+  ]);
 	
-	return { props: serialize({ user, students, entities: allowedEntities, assignments, sessions, exams }) };
+  const [sessions, exams] = await Promise.all([
+    getSessionsByAssignments(mapBy(assignments, "id")),
+    getExamsByIds(assignments.flatMap((a) => a.exams)),
+  ]);
+
+  return {
+    props: serialize({
+      user,
+      students,
+      entities: allowedEntities,
+      assignments,
+      sessions,
+      exams,
+    }),
+  };
 }, sessionOptions);
 
 interface Item {
-	student: StudentUser
-	result?: AssignmentResult
-	assignment: Assignment
-	exams: Exam[]
-	entity: Entity
-	session?: Session
+  student: StudentUser;
+  result?: AssignmentResult;
+  assignment: Assignment;
+  exams: Exam[];
+  entity: Entity;
+  session?: Session;
 }
 
 const columnHelper = createColumnHelper<Item>();
 
-export default function Statistical({ user, students, entities, assignments, sessions, exams }: Props) {
+export default function Statistical({
+  user,
+  students,
+  entities,
+  assignments,
+  sessions,
+  exams,
+}: Props) {
   const [startDate, setStartDate] = useState<Date>(new Date());
-	const [endDate, setEndDate] = useState<Date | null>(moment().add(1, 'month').toDate());
-	const [selectedEntities, setSelectedEntities] = useState<string[]>([])
-	const [isDownloading, setIsDownloading] = useState(false)
+  const [endDate, setEndDate] = useState<Date | null>(
+    moment().add(1, "month").toDate()
+  );
+  const [selectedEntities, setSelectedEntities] = useState<string[]>([]);
+  const [isDownloading, setIsDownloading] = useState(false);
 
-	const entitiesAllowDownload = useAllowedEntities(user, entities, 'download_statistics_report')
+  const entitiesAllowDownload = useAllowedEntities(
+    user,
+    entities,
+    "download_statistics_report"
+  );
 
   const resetDateRange = () => {
-		const orderedAssignments = orderBy(assignments, ['startDate'], ['asc'])
-		setStartDate(moment(orderedAssignments.shift()?.startDate || "2024-01-01T00:00:01.986Z").toDate())
-		setEndDate(moment().add(1, 'month').toDate())
-	}
+    const orderedAssignments = orderBy(assignments, ["startDate"], ["asc"]);
+    setStartDate(
+      moment(
+        orderedAssignments.shift()?.startDate || "2024-01-01T00:00:01.986Z"
+      ).toDate()
+    );
+    setEndDate(moment().add(1, "month").toDate());
+  };
 
-	useEffect(resetDateRange, [assignments])
+  useEffect(resetDateRange, [assignments]);
 
   const updateDateRange = (dates: [Date, Date | null]) => {
     const [start, end] = dates;
@@ -98,75 +133,134 @@ export default function Statistical({ user, students, entities, assignments, ses
     setEndDate(end);
   };
 
-	const toggleEntity = (id: string) => setSelectedEntities(prev => prev.includes(id) ? prev.filter(x => x !== id) : [...prev, id])
+  const toggleEntity = (id: string) =>
+    setSelectedEntities((prev) =>
+      prev.includes(id) ? prev.filter((x) => x !== id) : [...prev, id]
+    );
 
   const renderAssignmentResolution = (entityID: string) => {
-		const entityAssignments = filterBy(assignments, 'entity', entityID)
-		const total = entityAssignments.reduce((acc, curr) => acc + curr.assignees.length, 0)
-		const results = entityAssignments.reduce((acc, curr) => acc + curr.results.length, 0)
+    const entityAssignments = filterBy(assignments, "entity", entityID);
+    const total = entityAssignments.reduce(
+      (acc, curr) => acc + curr.assignees.length,
+      0
+    );
+    const results = entityAssignments.reduce(
+      (acc, curr) => acc + curr.results.length,
+      0
+    );
 
-		return `${results}/${total}`
-	}
+    return `${results}/${total}`;
+  };
 
   const totalAssignmentResolution = useMemo(() => {
-		const total = assignments.reduce((acc, curr) => acc + curr.assignees.length, 0)
-		const results = assignments.reduce((acc, curr) => acc + curr.results.length, 0)
+    const total = assignments.reduce(
+      (acc, curr) => acc + curr.assignees.length,
+      0
+    );
+    const results = assignments.reduce(
+      (acc, curr) => acc + curr.results.length,
+      0
+    );
 
-		return { results, total }
-	}, [assignments])
+    return { results, total };
+  }, [assignments]);
 
   const filteredAssignments = useMemo(() => {
-		if (!startDate && !endDate) return assignments
-		const startDateFiltered = startDate ? assignments.filter(a => moment(a.startDate).isSameOrAfter(moment(startDate))) : assignments
-		return endDate ? startDateFiltered.filter(a => moment(a.endDate).isSameOrBefore(moment(endDate))) : startDateFiltered
-	}, [startDate, endDate, assignments])
-
-	const data: Item[] = useMemo(() =>
-		filteredAssignments.filter(a => selectedEntities.includes(a.entity || "")).flatMap(a => a.assignees.map(x => {
-			const result = findBy(a.results, 'user', x)
-			const student = findBy(students, 'id', x)
-			const entity = findBy(entities, 'id', a.entity)
-			const assignmentExams = exams.filter(e => a.exams.map(x => `${x.id}_${x.module}`).includes(`${e.id}_${e.module}`))
-			const session = sessions.find(s => s.assignment?.id === a.id && s.user === x)
-
-			if (!student) return undefined
-			return { student, result, assignment: a, exams: assignmentExams, session, entity }
-		})).filter(x => !!x) as Item[],
-		[students, selectedEntities, filteredAssignments, exams, sessions, entities]
+    if (!startDate && !endDate) return assignments;
+    const startDateFiltered = startDate
+      ? assignments.filter((a) =>
+          moment(a.startDate).isSameOrAfter(moment(startDate))
         )
+      : assignments;
+    return endDate
+      ? startDateFiltered.filter((a) =>
+          moment(a.endDate).isSameOrBefore(moment(endDate))
+        )
+      : startDateFiltered;
+  }, [startDate, endDate, assignments]);
 
-	const sortedData: Item[] = useMemo(() => data.sort((a, b) => {
-		const aTotalScore = a.result?.stats.filter(x => !x.isPractice).reduce((acc, curr) => acc + curr.score.correct, 0) || 0
-		const bTotalScore = b.result?.stats.filter(x => !x.isPractice).reduce((acc, curr) => acc + curr.score.correct, 0) || 0
+  const data: Item[] = useMemo(
+    () =>
+      filteredAssignments
+        .filter((a) => selectedEntities.includes(a.entity || ""))
+        .flatMap((a) =>
+          a.assignees.map((x) => {
+            const result = findBy(a.results, "user", x);
+            const student = findBy(students, "id", x);
+            const entity = findBy(entities, "id", a.entity);
+            const assignmentExams = exams.filter((e) =>
+              a.exams
+                .map((x) => `${x.id}_${x.module}`)
+                .includes(`${e.id}_${e.module}`)
+            );
+            const session = sessions.find(
+              (s) => s.assignment?.id === a.id && s.user === x
+            );
 
-		return bTotalScore - aTotalScore
-	}), [data])
+            if (!student) return undefined;
+            return {
+              student,
+              result,
+              assignment: a,
+              exams: assignmentExams,
+              session,
+              entity,
+            };
+          })
+        )
+        .filter((x) => !!x) as Item[],
+    [students, selectedEntities, filteredAssignments, exams, sessions, entities]
+  );
+
+  const sortedData: Item[] = useMemo(
+    () =>
+      data.sort((a, b) => {
+        const aTotalScore =
+          a.result?.stats
+            .filter((x) => !x.isPractice)
+            .reduce((acc, curr) => acc + curr.score.correct, 0) || 0;
+        const bTotalScore =
+          b.result?.stats
+            .filter((x) => !x.isPractice)
+            .reduce((acc, curr) => acc + curr.score.correct, 0) || 0;
+
+        return bTotalScore - aTotalScore;
+      }),
+    [data]
+  );
 
   const downloadExcel = async () => {
-		setIsDownloading(true)
+    setIsDownloading(true);
 
-		const request = await axios.post("/api/statistical", {
-			entities: entities.filter(e => selectedEntities.includes(e.id)),
+    const request = await axios.post(
+      "/api/statistical",
+      {
+        entities: entities.filter((e) => selectedEntities.includes(e.id)),
         items: data,
         assignments: filteredAssignments,
         startDate,
-			endDate
-		}, {
-			responseType: 'blob'
-		})
+        endDate,
+      },
+      {
+        responseType: "blob",
+      }
+    );
 
-		const href = URL.createObjectURL(request.data)
-		const link = document.createElement('a');
+    const href = URL.createObjectURL(request.data);
+    const link = document.createElement("a");
     link.href = href;
-		link.setAttribute('download', `statistical_${new Date().toISOString()}.xlsx`);
+    link.setAttribute(
+      "download",
+      `statistical_${new Date().toISOString()}.xlsx`
+    );
     document.body.appendChild(link);
     link.click();
 
     document.body.removeChild(link);
     URL.revokeObjectURL(href);
 
-		setIsDownloading(false)
-	}
+    setIsDownloading(false);
+  };
 
   const columns = [
     columnHelper.accessor("student.name", {
@@ -196,19 +290,26 @@ export default function Statistical({ user, students, entities, assignments, ses
     columnHelper.accessor("result", {
       header: "Progress",
       cell: (info) => {
-				const student = info.row.original.student
-				const session = info.row.original.session
+        const student = info.row.original.student;
+        const session = info.row.original.session;
 
-				if (!student.lastLogin) return <span className="text-mti-red-dark">Never logged in</span>
-				if (info.getValue()) return <span className="text-mti-green font-semibold">Submitted</span>
-				if (!session) return <span className="text-mti-rose">Not started</span>
+        if (!student.lastLogin)
+          return <span className="text-mti-red-dark">Never logged in</span>;
+        if (info.getValue())
+          return (
+            <span className="text-mti-green font-semibold">Submitted</span>
+          );
+        if (!session) return <span className="text-mti-rose">Not started</span>;
 
-				return <span className="font-semibold">
-					{capitalize(session.exam?.module || "")} Module, Part {session.partIndex + 1}, Exercise {session.exerciseIndex + 1}
+        return (
+          <span className="font-semibold">
+            {capitalize(session.exam?.module || "")} Module, Part{" "}
+            {session.partIndex + 1}, Exercise {session.exerciseIndex + 1}
           </span>
+        );
       },
-		})
-	]
+    }),
+  ];
 
   return (
     <>
@@ -222,17 +323,22 @@ export default function Statistical({ user, students, entities, assignments, ses
         <link rel="icon" href="/favicon.ico" />
       </Head>
 
-			<Layout user={user}>
+      <>
         <div className="flex flex-col gap-4">
           <div className="flex items-center justify-between w-full">
             <div className="flex items-center gap-2">
-							<Link href="/dashboard" className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl">
+              <Link
+                href="/dashboard"
+                className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl"
+              >
                 <BsChevronLeft />
               </Link>
               <h2 className="font-bold text-2xl">Statistical</h2>
             </div>
             <Checkbox
-							onChange={value => setSelectedEntities(value ? mapBy(entities, 'id') : [])}
+              onChange={(value) =>
+                setSelectedEntities(value ? mapBy(entities, "id") : [])
+              }
               isChecked={selectedEntities.length === entities.length}
             >
               Select All
@@ -243,13 +349,14 @@ export default function Statistical({ user, students, entities, assignments, ses
 
         <section className="flex flex-col gap-3">
           <div className="w-full flex items-center justify-between gap-4 flex-wrap">
-						{entities.map(entity => (
+            {entities.map((entity) => (
               <button
                 onClick={() => toggleEntity(entity.id)}
                 className={clsx(
                   "flex flex-col items-center justify-between gap-3 border-2 drop-shadow rounded-xl bg-white p-8 px-2 w-48 h-52",
                   "transition ease-in-out duration-300 hover:shadow-xl hover:border-mti-purple",
-									selectedEntities.includes(entity.id) && "border-mti-purple text-mti-purple"
+                  selectedEntities.includes(entity.id) &&
+                    "border-mti-purple text-mti-purple"
                 )}
                 key={entity.id}
               >
@@ -270,7 +377,7 @@ export default function Statistical({ user, students, entities, assignments, ses
                 className={clsx(
                   "p-6 px-12 w-full flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
                   "hover:border-mti-purple tooltip",
-									"transition duration-300 ease-in-out",
+                  "transition duration-300 ease-in-out"
                 )}
                 dateFormat="dd/MM/yyyy"
                 selectsRange
@@ -280,13 +387,17 @@ export default function Statistical({ user, students, entities, assignments, ses
                 endDate={endDate}
               />
               {startDate !== null && endDate !== null && (
-								<button onClick={resetDateRange} className="transition ease-in-out duration-300 rounded-full p-2 hover:bg-mti-gray-cool/10">
+                <button
+                  onClick={resetDateRange}
+                  className="transition ease-in-out duration-300 rounded-full p-2 hover:bg-mti-gray-cool/10"
+                >
                   <BsX size={24} />
                 </button>
               )}
             </div>
             <span className="font-semibold text-lg pr-1">
-							Total: {totalAssignmentResolution.results} / {totalAssignmentResolution.total}
+              Total: {totalAssignmentResolution.results} /{" "}
+              {totalAssignmentResolution.total}
             </span>
           </div>
         </section>
@@ -295,13 +406,21 @@ export default function Statistical({ user, students, entities, assignments, ses
           <Table
             columns={columns}
             data={sortedData}
-						searchFields={[["student", "name"], ["student", "email"], ["student", "studentID"], ["exams", "id"], ["assignment", "name"]]}
+            searchFields={[
+              ["student", "name"],
+              ["student", "email"],
+              ["student", "studentID"],
+              ["exams", "id"],
+              ["assignment", "name"],
+            ]}
             searchPlaceholder="Search by student, assignment or exam..."
-						onDownload={entitiesAllowDownload.length > 0 ? downloadExcel : undefined}
+            onDownload={
+              entitiesAllowDownload.length > 0 ? downloadExcel : undefined
+            }
             isDownloadLoading={isDownloading}
           />
         )}
-			</Layout>
       </>
-	)
+    </>
+  );
 }

src/pages/stats.tsx

@@ -21,9 +21,8 @@ import {
 import { withIronSessionSsr } from "iron-session/next";
 import { sessionOptions } from "@/lib/session";
 import { useEffect, useMemo, useState } from "react";
-import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
+import useStats from "@/hooks/useStats";
 import {
-  averageScore,
   groupBySession,
   groupByModule,
   timestampToMoment,
@@ -32,14 +31,8 @@ import { ToastContainer } from "react-toastify";
 import { capitalize } from "lodash";
 import { Module } from "@/interfaces";
 import ProgressBar from "@/components/Low/ProgressBar";
-import Layout from "@/components/High/Layout";
 import { calculateBandScore } from "@/utils/score";
-import {
-  countExamModules,
-  countFullExams,
-  MODULE_ARRAY,
-  sortByModule,
-} from "@/utils/moduleUtils";
+import { MODULE_ARRAY, sortByModule } from "@/utils/moduleUtils";
 import { Chart } from "react-chartjs-2";
 import DatePicker from "react-datepicker";
 import { shouldRedirectHome } from "@/utils/navigation.disabled";
@@ -49,7 +42,6 @@ import { Stat, User } from "@/interfaces/user";
 import { Divider } from "primereact/divider";
 import Badge from "@/components/Low/Badge";
 import { mapBy, redirect, serialize } from "@/utils";
-import { getEntities } from "@/utils/entities.be";
 import { checkAccess } from "@/utils/permissions";
 import { EntityWithRoles } from "@/interfaces/entity";
 import Select from "@/components/Low/Select";
@@ -73,19 +65,10 @@ const COLORS = ["#1EB3FF", "#FF790A", "#3D9F11", "#EF5DA8", "#414288"];
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
   const user = await requestUser(req, res);
   if (!user) return redirect("/login");
-
   if (shouldRedirectHome(user)) return redirect("/");
-
-  const entityIDs = mapBy(user.entities, "id");
   const isAdmin = checkAccess(user, ["admin", "developer"]);
-
-  const entities = await getEntities(isAdmin ? undefined : entityIDs, {
-    id: 1,
-    label: 1,
-  });
-
   return {
-    props: serialize({ user, entities, isAdmin }),
+    props: serialize({ user, isAdmin }),
   };
 }, sessionOptions);
 
@@ -109,7 +92,7 @@ export default function Stats({ user, entities, isAdmin }: Props) {
   const [selectedEntity, setSelectedEntity] = useState<string>();
 
   const entitiesToSearch = useMemo(() => {
-    if(selectedEntity) return [selectedEntity]
+    if (selectedEntity) return [selectedEntity];
     if (isAdmin) return undefined;
     return mapBy(entities, "id");
   }, [entities, isAdmin, selectedEntity]);
@@ -137,10 +120,19 @@ export default function Stats({ user, entities, isAdmin }: Props) {
 
   const [intervalDates, setIntervalDates] = useState<Date[]>([]);
 
-  const { data: stats } = useFilterRecordsByUser<Stat[]>(
-    statsUserId,
-    !statsUserId
-  );
+  const {
+    data: {
+      allStats: stats = [],
+      fullExams: exams = 0,
+      uniqueModules: modules = 0,
+      averageScore = 0,
+    },
+  } = useStats<{
+    allStats: Stat[];
+    fullExams: number;
+    uniqueModules: number;
+    averageScore: number;
+  }>(statsUserId, !statsUserId, "stats");
 
   const initialStatDate = useMemo(
     () => (stats[0] ? timestampToMoment(stats[0]).toDate() : null),
@@ -239,7 +231,7 @@ export default function Stats({ user, entities, isAdmin }: Props) {
       </Head>
       <ToastContainer />
       {user && (
-        <Layout user={user} className="gap-8">
+        <>
           <ProfileSummary
             user={userData || user}
             items={[
@@ -247,7 +239,7 @@ export default function Stats({ user, entities, isAdmin }: Props) {
                 icon: (
                   <BsFileEarmarkText className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />
                 ),
-                value: countFullExams(stats),
+                value: exams,
                 label: "Exams",
                 tooltip: "Number of all conducted completed exams",
               },
@@ -255,7 +247,7 @@ export default function Stats({ user, entities, isAdmin }: Props) {
                 icon: (
                   <BsPencil className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />
                 ),
-                value: countExamModules(stats),
+                value: modules,
                 label: "Modules",
                 tooltip:
                   "Number of all exam modules performed including Level Test",
@@ -264,7 +256,7 @@ export default function Stats({ user, entities, isAdmin }: Props) {
                 icon: (
                   <BsStar className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />
                 ),
-                value: `${stats.length > 0 ? averageScore(stats) : 0}%`,
+                value: `${averageScore.toFixed(2) || 0}%`,
                 label: "Average Score",
                 tooltip: "Average success rate for questions responded",
               },
@@ -888,7 +880,7 @@ export default function Stats({ user, entities, isAdmin }: Props) {
               <span className="font-semibold ml-1">No stats to display...</span>
             </section>
           )}
-        </Layout>
+        </>
       )}
     </>
   );

src/pages/tickets.tsx

@@ -1,4 +1,3 @@
-import Layout from "@/components/High/Layout";
 import TicketDisplay from "@/components/High/TicketDisplay";
 import Select from "@/components/Low/Select";
 import Modal from "@/components/Modal";
@@ -228,7 +227,7 @@ export default function Tickets() {
 			</Head>
 			<ToastContainer />
 			{user && (
-				<Layout user={user} className="gap-6">
+				<>
 					<h1 className="text-2xl font-semibold">Tickets</h1>
 
 					<div className="flex w-full items-center gap-4">
@@ -317,7 +316,7 @@ export default function Tickets() {
 							))}
 						</tbody>
 					</table>
-				</Layout>
+				</>
 			)}
 		</>
 	);

src/pages/training/[id]/index.tsx

@@ -13,7 +13,6 @@ import { ITrainingContent, ITrainingTip } from "@/training/TrainingInterfaces";
 import formatTip from "@/training/FormatTip";
 import { Stat, User } from "@/interfaces/user";
 import Head from "next/head";
-import Layout from "@/components/High/Layout";
 import { ToastContainer } from "react-toastify";
 import { withIronSessionSsr } from "iron-session/next";
 import { shouldRedirectHome } from "@/utils/navigation.disabled";
@@ -149,7 +148,7 @@ const TrainingContent: React.FC<{ user: User }> = ({ user }) => {
 			</Head>
 			<ToastContainer />
 
-			<Layout user={user}>
+			<>
 				{loading ? (
 					<div className="absolute left-1/2 top-1/2 flex h-fit w-fit -translate-x-1/2 -translate-y-1/2 animate-pulse flex-col items-center gap-12">
 						<span className="loading loading-infinity w-32 bg-mti-green-light" />
@@ -343,7 +342,7 @@ const TrainingContent: React.FC<{ user: User }> = ({ user }) => {
 						</div>
 					)
 				)}
-			</Layout>
+			</>
 		</>
 	);
 };

src/pages/training/index.tsx

@@ -4,7 +4,6 @@ import {withIronSessionSsr} from "iron-session/next";
 import { sessionOptions } from "@/lib/session";
 import { User } from "@/interfaces/user";
 import { ToastContainer } from "react-toastify";
-import Layout from "@/components/High/Layout";
 import { shouldRedirectHome } from "@/utils/navigation.disabled";
 import { useEffect, useState } from "react";
 import clsx from "clsx";
@@ -21,40 +20,55 @@ import ModuleBadge from "@/components/ModuleBadge";
 import RecordFilter from "@/components/Medium/RecordFilter";
 import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
 import { mapBy, redirect, serialize } from "@/utils";
-import { getEntitiesWithRoles } from "@/utils/entities.be";
-import { getAssignmentsByAssignee } from "@/utils/assignments.be";
 import { getEntitiesUsers } from "@/utils/users.be";
 import { EntityWithRoles } from "@/interfaces/entity";
-import { Assignment } from "@/interfaces/results";
 import { requestUser } from "@/utils/api";
+import { checkAccess } from "../../utils/permissions";
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+  const user = await requestUser(req, res);
+  if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user)) return redirect("/")
-
-	const entityIDs = mapBy(user.entities, 'id')
-	const entities = await getEntitiesWithRoles(entityIDs)
-	const users = await getEntitiesUsers(entityIDs)
+  if (shouldRedirectHome(user)) return redirect("/");
+  const isAdmin = checkAccess(user, ["admin", "developer"]);
+  const entityIDs = mapBy(user.entities, "id");
+  const users = await getEntitiesUsers(entityIDs);
 
   return {
-		props: serialize({user, users, entities}),
+    props: serialize({ user, users, isAdmin }),
   };
 }, sessionOptions);
 
-const Training: React.FC<{user: User, entities: EntityWithRoles[], users: User[] }> = ({user, entities, users}) => {
-	const [recordUserId, setRecordTraining] = useRecordStore((state) => [state.selectedUser, state.setTraining]);
-	const [filter, setFilter] = useState<"months" | "weeks" | "days" | "assignments">();
+const Training: React.FC<{
+  user: User;
+  entities: EntityWithRoles[];
+  users: User[];
+  isAdmin: boolean;
+}> = ({ user, entities, isAdmin }) => {
+  const [recordUserId, setRecordTraining] = useRecordStore((state) => [
+    state.selectedUser,
+    state.setTraining,
+  ]);
+  const [filter, setFilter] = useState<
+    "months" | "weeks" | "days" | "assignments"
+  >();
 
-	const [stats, setTrainingStats] = useTrainingContentStore((state) => [state.stats, state.setStats]);
-	const [isNewContentLoading, setIsNewContentLoading] = useState(stats.length != 0);
-	const [groupedByTrainingContent, setGroupedByTrainingContent] = useState<{[key: string]: ITrainingContent}>();
+  const [stats, setTrainingStats] = useTrainingContentStore((state) => [
+    state.stats,
+    state.setStats,
+  ]);
+  const [isNewContentLoading, setIsNewContentLoading] = useState(
+    stats.length != 0
+  );
+  const [groupedByTrainingContent, setGroupedByTrainingContent] = useState<{
+    [key: string]: ITrainingContent;
+  }>();
 
-	const {data: trainingContent, isLoading: areRecordsLoading} = useFilterRecordsByUser<ITrainingContent[]>(
+  const { data: trainingContent, isLoading: areRecordsLoading } =
+    useFilterRecordsByUser<ITrainingContent[]>(
       recordUserId || user?.id,
       undefined,
-		"training",
+      "training"
     );
 
   useEffect(() => {
@@ -71,7 +85,10 @@ const Training: React.FC<{user: User, entities: EntityWithRoles[], users: User[]
   useEffect(() => {
     const postStats = async () => {
       try {
-				const response = await axios.post<{id: string}>(`/api/training`, {userID: user.id, stats: stats});
+        const response = await axios.post<{ id: string }>(`/api/training`, {
+          userID: user.id,
+          stats: stats,
+        });
         return response.data.id;
       } catch (error) {
         setIsNewContentLoading(false);
@@ -94,7 +111,9 @@ const Training: React.FC<{user: User, entities: EntityWithRoles[], users: User[]
     router.push("/record");
   };
 
-	const filterTrainingContentByDate = (trainingContent: {[key: string]: ITrainingContent}) => {
+  const filterTrainingContentByDate = (trainingContent: {
+    [key: string]: ITrainingContent;
+  }) => {
     if (filter) {
       const filterDate = moment()
         .subtract({ [filter as string]: 1 })
@@ -102,7 +121,8 @@ const Training: React.FC<{user: User, entities: EntityWithRoles[], users: User[]
       const filteredTrainingContent: { [key: string]: ITrainingContent } = {};
 
       Object.keys(trainingContent).forEach((timestamp) => {
-				if (timestamp >= filterDate) filteredTrainingContent[timestamp] = trainingContent[timestamp];
+        if (timestamp >= filterDate)
+          filteredTrainingContent[timestamp] = trainingContent[timestamp];
       });
       return filteredTrainingContent;
     }
@@ -136,18 +156,22 @@ const Training: React.FC<{user: User, entities: EntityWithRoles[], users: User[]
   const trainingContentContainer = (timestamp: string) => {
     if (!groupedByTrainingContent) return <></>;
 
-		const trainingContent: ITrainingContent = groupedByTrainingContent[timestamp];
-		const uniqueModules = [...new Set(trainingContent.exams.map((exam) => exam.module))];
+    const trainingContent: ITrainingContent =
+      groupedByTrainingContent[timestamp];
+    const uniqueModules = [
+      ...new Set(trainingContent.exams.map((exam) => exam.module)),
+    ];
 
     return (
       <>
         <div
           key={uuidv4()}
           className={clsx(
-						"flex flex-col justify-between gap-4 border border-mti-gray-platinum p-4 cursor-pointer rounded-xl transition ease-in-out duration-300 -md:hidden",
+            "flex flex-col justify-between gap-4 border border-mti-gray-platinum p-4 cursor-pointer rounded-xl transition ease-in-out duration-300 -md:hidden"
           )}
           onClick={() => selectTrainingContent(trainingContent)}
-					role="button">
+          role="button"
+        >
           <div className="w-full flex justify-between -md:items-center 2xl:items-center">
             <div className="flex flex-col md:gap-1 -md:gap-2 2xl:gap-2">
               <span className="font-medium">{formatTimestamp(timestamp)}</span>
@@ -179,27 +203,38 @@ const Training: React.FC<{user: User, entities: EntityWithRoles[], users: User[]
       </Head>
       <ToastContainer />
 
-			<Layout user={user}>
+      <>
         {isNewContentLoading || areRecordsLoading ? (
           <div className="absolute left-1/2 top-1/2 flex h-fit w-fit -translate-x-1/2 -translate-y-1/2 animate-pulse flex-col items-center gap-12">
             <span className="loading loading-infinity w-32 bg-mti-green-light" />
             {isNewContentLoading && (
-							<span className="text-center text-2xl font-bold text-mti-green-light">Assessing your exams, please be patient...</span>
+              <span className="text-center text-2xl font-bold text-mti-green-light">
+                Assessing your exams, please be patient...
+              </span>
             )}
           </div>
         ) : (
           <>
-						<RecordFilter  entities={entities} user={user} filterState={{filter: filter, setFilter: setFilter}} assignments={false}>
+            <RecordFilter
+              entities={entities}
+              user={user}
+              isAdmin={isAdmin}
+              filterState={{ filter: filter, setFilter: setFilter }}
+              assignments={false}
+            >
               {user.type === "student" && (
                 <>
                   <div className="flex items-center">
-										<div className="font-semibold text-2xl">Generate New Training Material</div>
+                    <div className="font-semibold text-2xl">
+                      Generate New Training Material
+                    </div>
                     <button
                       className={clsx(
                         "bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light ml-4",
-												"transition duration-300 ease-in-out",
+                        "transition duration-300 ease-in-out"
                       )}
-											onClick={handleNewTrainingContent}>
+                      onClick={handleNewTrainingContent}
+                    >
                       <FaPlus />
                     </button>
                   </div>
@@ -208,19 +243,25 @@ const Training: React.FC<{user: User, entities: EntityWithRoles[], users: User[]
             </RecordFilter>
             {trainingContent.length == 0 && (
               <div className="flex flex-grow justify-center items-center">
-								<span className="font-semibold ml-1">No training content to display...</span>
+                <span className="font-semibold ml-1">
+                  No training content to display...
+                </span>
               </div>
             )}
-						{!areRecordsLoading && groupedByTrainingContent && Object.keys(groupedByTrainingContent).length > 0 && (
+            {!areRecordsLoading &&
+              groupedByTrainingContent &&
+              Object.keys(groupedByTrainingContent).length > 0 && (
                 <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-2 2xl:grid-cols-3 w-full gap-4 xl:gap-6">
-								{Object.keys(filterTrainingContentByDate(groupedByTrainingContent))
+                  {Object.keys(
+                    filterTrainingContentByDate(groupedByTrainingContent)
+                  )
                     .sort((a, b) => parseInt(b) - parseInt(a))
                     .map(trainingContentContainer)}
                 </div>
               )}
           </>
         )}
-			</Layout>
+      </>
     </>
   );
 };

src/pages/users/index.tsx

@@ -1,6 +1,4 @@
-import Layout from "@/components/High/Layout";
-import useUser from "@/hooks/useUser";
-import useUsers from "@/hooks/useUsers";
+
 import { Type, User } from "@/interfaces/user";
 import {sessionOptions} from "@/lib/session";
 import useFilterStore from "@/stores/listFilterStore";
@@ -10,8 +8,7 @@ import { shouldRedirectHome } from "@/utils/navigation.disabled";
 import {withIronSessionSsr} from "iron-session/next";
 import Head from "next/head";
 import {useRouter} from "next/router";
-import {useEffect} from "react";
-import {BsArrowLeft, BsChevronLeft} from "react-icons/bs";
+import { BsChevronLeft} from "react-icons/bs";
 import {ToastContainer} from "react-toastify";
 import UserList from "../(admin)/Lists/UserList";
 
@@ -51,7 +48,7 @@ export default function UsersListPage({ user, type }: Props) {
 			</Head>
 			<ToastContainer />
 
-				<Layout user={user}>
+				<>
 					<UserList
 						user={user}
 						type={type}
@@ -70,7 +67,7 @@ export default function UsersListPage({ user, type }: Props) {
 							</div>
 						)}
 					/>
-				</Layout>
+				</>
 		</>
 	);
 }

src/pages/users/performance.tsx

@@ -1,42 +1,42 @@
 import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
-import useGroups from "@/hooks/useGroups";
-import useUsers, { userHashStudent } from "@/hooks/useUsers";
 import { Group, Stat, StudentUser, User } from "@/interfaces/user";
-import { getUserCompanyName } from "@/resources/user";
-import clsx from "clsx";
 import { useRouter } from "next/router";
-import { BsArrowLeft, BsArrowRepeat, BsChevronLeft } from "react-icons/bs";
+import { BsChevronLeft } from "react-icons/bs";
 import { mapBy, serialize } from "@/utils";
 import { withIronSessionSsr } from "iron-session/next";
 import { getEntitiesUsers, getUsers } from "@/utils/users.be";
 import { sessionOptions } from "@/lib/session";
 import { checkAccess, findAllowedEntities } from "@/utils/permissions";
-import { getEntities, getEntitiesWithRoles } from "@/utils/entities.be";
+import { getEntitiesWithRoles } from "@/utils/entities.be";
 import { Entity } from "@/interfaces/entity";
-import { getParticipantGroups, getParticipantsGroups } from "@/utils/groups.be";
+import { getParticipantsGroups } from "@/utils/groups.be";
 import StudentPerformanceList from "../(admin)/Lists/StudentPerformanceList";
 import Head from "next/head";
 import { ToastContainer } from "react-toastify";
-import Layout from "@/components/High/Layout";
 import { requestUser } from "@/utils/api";
 import { redirect } from "@/utils";
 
-export const getServerSideProps = withIronSessionSsr(async ({ req, res, query }) => {
-	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
+  const user = await requestUser(req, res);
+  if (!user) return redirect("/login");
 
-	const entityIDs = mapBy(user.entities, 'id')
+  const entityIDs = mapBy(user.entities, "id");
 
-	const entities = await getEntitiesWithRoles(checkAccess(user, ["admin", 'developer']) ? undefined : entityIDs)
-	const allowedEntities = findAllowedEntities(user, entities, "view_student_performance")
+  const entities = await getEntitiesWithRoles(
+    checkAccess(user, ["admin", "developer"]) ? undefined : entityIDs
+  );
+  const allowedEntities = findAllowedEntities(
+    user,
+    entities,
+    "view_student_performance"
+  );
 
-	if (allowedEntities.length === 0) return redirect("/")
+  if (allowedEntities.length === 0) return redirect("/");
 
-	const students = await (checkAccess(user, ["admin", 'developer'])
-		? getUsers({ type: 'student' })
-		: getEntitiesUsers(mapBy(allowedEntities, 'id'), { type: 'student' })
-	)
-	const groups = await getParticipantsGroups(mapBy(students, 'id'))
+  const students = await (checkAccess(user, ["admin", "developer"])
+    ? getUsers({ type: "student" })
+    : getEntitiesUsers(mapBy(allowedEntities, "id"), { type: "student" }));
+  const groups = await getParticipantsGroups(mapBy(students, "id"));
 
   return {
     props: serialize({ user, students, entities, groups }),
@@ -45,9 +45,9 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res, query })
 
 interface Props {
   user: User;
-	students: StudentUser[]
-	entities: Entity[]
-	groups: Group[]
+  students: StudentUser[];
+  entities: Entity[];
+  groups: Group[];
 }
 
 const StudentPerformance = ({ user, students, entities, groups }: Props) => {
@@ -58,7 +58,10 @@ const StudentPerformance = ({ user, students, entities, groups }: Props) => {
   const performanceStudents = students.map((u) => ({
     ...u,
     group: groups.find((x) => x.participants.includes(u.id))?.name || "N/A",
-		entitiesLabel: mapBy(u.entities, 'id').map((id) => entities.find((e) => e.id === id)?.label).filter((e) => !!e).join(', '),
+    entitiesLabel: mapBy(u.entities, "id")
+      .map((id) => entities.find((e) => e.id === id)?.label)
+      .filter((e) => !!e)
+      .join(", "),
   }));
 
   return (
@@ -74,19 +77,22 @@ const StudentPerformance = ({ user, students, entities, groups }: Props) => {
       </Head>
       <ToastContainer />
 
-			<Layout user={user}>
+      <>
         <div className="flex items-center gap-2">
           <button
             onClick={() => {
-							router.back()
+              router.back();
             }}
-						className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl">
+            className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl"
+          >
             <BsChevronLeft />
           </button>
-					<h2 className="font-bold text-2xl">Student Performance ({students.length})</h2>
+          <h2 className="font-bold text-2xl">
+            Student Performance ({students.length})
+          </h2>
         </div>
         <StudentPerformanceList items={performanceStudents} stats={stats} />
-			</Layout>
+      </>
     </>
   );
 };