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

@@ -40,4 +40,6 @@ next-env.d.ts
 .env
 .yarn/*
 .history*
-__ENV.js
+__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,103 +5,140 @@ 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;
+  localSettings: ReadingSectionSettings | LevelSectionSettings;
-    updateLocalAndScheduleGlobal: (updates: Partial<ReadingSectionSettings | LevelSectionSettings>, schedule?: boolean) => void;
+  updateLocalAndScheduleGlobal: (
-    currentSection: ReadingPart | LevelPart;
+    updates: Partial<ReadingSectionSettings | LevelSectionSettings>,
-    generatePassageDisabled?: boolean;
+    schedule?: boolean
-    levelId?: number;
+  ) => void;
-    level?: boolean;
+  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> = ({
-    const { currentModule } = useExamEditorStore();
+  localSettings,
-    const {
+  updateLocalAndScheduleGlobal,
-        focusedSection,
+  currentSection,
-        difficulty,
+  levelId,
-    } = useExamEditorStore(state => state.modules[currentModule]);
+  level = false,
+  generatePassageDisabled = false,
+}) => {
+  const { currentModule } = useExamEditorStore();
+  const { focusedSection, difficulty } = useExamEditorStore(
+    (state) => state.modules[currentModule]
+  );
 
-    const generatePassage = useCallback(() => {
+  const generatePassage = useCallback(() => {
-        generate(
+    generate(
-            levelId ? levelId : focusedSection,
+      levelId ? levelId : focusedSection,
-            "reading",
+      "reading",
-            "passage",
+      "passage",
-            {
+      {
-                method: 'GET',
+        method: "GET",
-                queryParams: {
+        queryParams: {
-                    difficulty,
+          difficulty,
-                    ...(localSettings.readingTopic && { topic: localSettings.readingTopic })
+          ...(localSettings.readingTopic && {
-                }
+            topic: localSettings.readingTopic,
-            },
+          }),
-            (data: any) => [{
+        },
-                title: data.title,
+      },
-                text: data.text
+      (data: any) => [
-            }],
+        {
-            level ? focusedSection : undefined,
+          title: data.title,
-            level
+          text: data.text,
-        );
+        },
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+      ],
-    }, [localSettings.readingTopic, difficulty, focusedSection, levelId]);
+      level ? focusedSection : undefined,
-
+      level
-    const onTopicChange = useCallback((readingTopic: string) => {
-        updateLocalAndScheduleGlobal({ readingTopic });
-    }, [updateLocalAndScheduleGlobal]);
-
-    return (
-        <>
-            <Dropdown
-                title="Generate Passage"
-                module="reading"
-                open={localSettings.isPassageOpen}
-                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-col flex-grow gap-4 px-2">
-                        <label className="font-normal text-base text-mti-gray-dim">Topic (Optional)</label>
-                        <Input
-                            key={`section-${focusedSection}`}
-                            type="text"
-                            placeholder="Topic"
-                            name="category"
-                            onChange={onTopicChange}
-                            roundness="full"
-                            value={localSettings.readingTopic}
-                        />
-                    </div>
-                    <div className="flex self-end h-16 mb-1">
-                        <GenerateBtn
-                            module="reading"
-                            genType="passage"
-                            sectionId={focusedSection}
-                            generateFnc={generatePassage}
-                            level={level}
-                        />
-                    </div>
-                </div>
-            </Dropdown>
-            <Dropdown
-                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 === ""}
-            >
-                <ExercisePicker
-                    module="reading"
-                    sectionId={levelId !== undefined ? levelId : focusedSection}
-                    extraArgs={{ text: currentSection === undefined || currentSection.text === undefined ? "" : currentSection.text.content }}
-                    levelSectionId={focusedSection}
-                    level={level}
-                />
-            </Dropdown>
-        </>
     );
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [localSettings.readingTopic, difficulty, focusedSection, levelId]);
+
+  const onTopicChange = useCallback(
+    (readingTopic: string) => {
+      updateLocalAndScheduleGlobal({ readingTopic });
+    },
+    [updateLocalAndScheduleGlobal]
+  );
+
+  return (
+    <>
+      <Dropdown
+        title="Generate Passage"
+        module="reading"
+        open={localSettings.isPassageOpen}
+        setIsOpen={(isOpen: boolean) =>
+          updateLocalAndScheduleGlobal({ isPassageOpen: isOpen }, false)
+        }
+        contentWrapperClassName={level ? `border border-ielts-reading` : ""}
+        disabled={generatePassageDisabled}
+      >
+        <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
+              key={`section-${focusedSection}`}
+              type="text"
+              placeholder="Topic"
+              name="category"
+              onChange={onTopicChange}
+              roundness="full"
+              value={localSettings.readingTopic}
+            />
+          </div>
+          <div className="flex self-end h-16 mb-1">
+            <GenerateBtn
+              module="reading"
+              genType="passage"
+              sectionId={focusedSection}
+              generateFnc={generatePassage}
+              level={level}
+            />
+          </div>
+        </div>
+      </Dropdown>
+      <Dropdown
+        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 === ""
+        }
+      >
+        <ExercisePicker
+          module="reading"
+          sectionId={levelId !== undefined ? levelId : focusedSection}
+          extraArgs={{
+            text:
+              currentSection === undefined || currentSection.text === undefined
+                ? ""
+                : currentSection.text.content,
+          }}
+          levelSectionId={focusedSection}
+          level={level}
+        />
+      </Dropdown>
+    </>
+  );
 };
 
 export default ReadingComponents;

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();
@@ -46,15 +47,15 @@ const ReadingSettings: React.FC = () => {
         {
             label: "Preset: Reading Passage 1",
             value: "Welcome to {part} of the {label}. You will read texts relating to everyday topics and situations. These may include advertisements, brochures, manuals, or official documents. Answer questions that test your ability to locate specific information and understand main ideas."
-          },
+        },
-          {
+        {
-            label: "Preset: Reading Passage 2", 
+            label: "Preset: Reading Passage 2",
             value: "Welcome to {part} of the {label}. You will read texts dealing with general interest topics that may include news articles, company policies, or workplace documents. Answer questions testing your understanding of main ideas, specific details, and the author's views."
-          },
+        },
-          {
+        {
             label: "Preset: Reading Passage 3",
             value: "Welcome to {part} of the {label}. You will read longer academic texts that may include journal articles, academic essays, or research papers. Answer questions testing your ability to understand complex arguments, identify key points, and follow the development of ideas."
-          }
+        }
     ];
 
     const canPreviewOrSubmit = sections.some(
@@ -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>
+            <span className="font-semibold ellipsis-2">{label(type, firstId, lastId)}</span>
-            <div className="text-sm font-light italic">{previewLabel(prompt)}</div>
+            <div className="text-sm font-light italic ellipsis-2">{previewLabel(prompt)}</div>
         </div>
     );
 }

src/components/ExamEditor/index.tsx

@@ -3,12 +3,12 @@ import SectionRenderer from "./SectionRenderer";
 import Checkbox from "../Low/Checkbox";
 import Input from "../Low/Input";
 import Select from "../Low/Select";
-import { capitalize } from "lodash";
+import {capitalize} from "lodash";
-import { Difficulty } from "@/interfaces/exam";
+import {Difficulty} from "@/interfaces/exam";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import {useCallback, useEffect, useMemo, useState} from "react";
-import { toast } from "react-toastify";
+import {toast} from "react-toastify";
-import { ModuleState, SectionState } from "@/stores/examEditor/types";
+import {ModuleState, SectionState} from "@/stores/examEditor/types";
-import { Module } from "@/interfaces";
+import {Module} from "@/interfaces";
 import useExamEditorStore from "@/stores/examEditor";
 import WritingSettings from "./SettingsEditor/writing";
 import ReadingSettings from "./SettingsEditor/reading";
@@ -16,224 +16,243 @@ import LevelSettings from "./SettingsEditor/level";
 import ListeningSettings from "./SettingsEditor/listening";
 import SpeakingSettings from "./SettingsEditor/speaking";
 import ImportOrStartFromScratch from "./ImportExam/ImportOrFromScratch";
-import { defaultSectionSettings } from "@/stores/examEditor/defaults";
+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[]}> = ({
-    const { currentModule, dispatch } = useExamEditorStore();
+	levelParts = 0,
-    const {
+	entitiesAllowEditPrivacy = [],
-        sections,
+}) => {
-        minTimer,
+	const {currentModule, dispatch} = useExamEditorStore();
-        expandedSections,
+	const {sections, minTimer, expandedSections, examLabel, isPrivate, difficulty, sectionLabels, importModule} = useExamEditorStore(
-        examLabel,
+		(state) => state.modules[currentModule],
-        isPrivate,
+	);
-        difficulty,
-        sectionLabels,
-        importModule
-    } = useExamEditorStore(state => state.modules[currentModule]);
 
-    const [numberOfLevelParts, setNumberOfLevelParts] = useState(levelParts !== 0 ? levelParts : 1);
+	const [numberOfLevelParts, setNumberOfLevelParts] = useState(levelParts !== 0 ? levelParts : 1);
-    const [isResetModuleOpen, setIsResetModuleOpen] = useState(false);
+	const [isResetModuleOpen, setIsResetModuleOpen] = useState(false);
 
-    // For exam edits
+	// For exam edits
-    useEffect(() => {
+	useEffect(() => {
-        if (levelParts !== 0) {
+		if (levelParts !== 0) {
-            setNumberOfLevelParts(levelParts);
+			setNumberOfLevelParts(levelParts);
-            dispatch({
+			dispatch({
-                type: 'UPDATE_MODULE',
+				type: "UPDATE_MODULE",
-                payload: {
+				payload: {
-                    updates: {
+					updates: {
-                        sectionLabels: Array.from({ length: levelParts }).map((_, i) => ({
+						sectionLabels: Array.from({length: levelParts}).map((_, i) => ({
-                            id: i + 1,
+							id: i + 1,
-                            label: `Part ${i + 1}`
+							label: `Part ${i + 1}`,
-                        }))
+						})),
-                    },
+					},
-                    module: "level"
+					module: "level",
-                }
+				},
-            })
+			});
-        }
+		}
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+		// eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [levelParts])
+	}, [levelParts]);
 
-    useEffect(() => {
+	useEffect(() => {
-        const currentSections = sections;
+		const currentSections = sections;
-        const currentLabels = sectionLabels;
+		const currentLabels = sectionLabels;
-        let updatedSections: SectionState[];
+		let updatedSections: SectionState[];
-        let updatedLabels: any;
+		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 newSections = [...currentSections];
-            const newLabels = [...currentLabels];
+			const newLabels = [...currentLabels];
-            for (let i = currentLabels.length; i < numberOfLevelParts; i++) {
+			for (let i = currentLabels.length; i < numberOfLevelParts; i++) {
-                if (currentSections.length !== numberOfLevelParts) newSections.push(defaultSectionSettings(currentModule, i + 1));
+				if (currentSections.length !== numberOfLevelParts) newSections.push(defaultSectionSettings(currentModule, i + 1));
-                newLabels.push({
+				newLabels.push({
-                    id: i + 1,
+					id: i + 1,
-                    label: `Part ${i + 1}`
+					label: `Part ${i + 1}`,
-                });
+				});
-            }
+			}
-            updatedSections = newSections;
+			updatedSections = newSections;
-            updatedLabels = newLabels;
+			updatedLabels = newLabels;
-        } else if (numberOfLevelParts < currentSections.length) {
+		} else if (numberOfLevelParts < currentSections.length) {
-            updatedSections = currentSections.slice(0, numberOfLevelParts);
+			updatedSections = currentSections.slice(0, numberOfLevelParts);
-            updatedLabels = currentLabels.slice(0, numberOfLevelParts);
+			updatedLabels = currentLabels.slice(0, numberOfLevelParts);
-        } else {
+		} else {
-            return;
+			return;
-        }
+		}
 
-        const updatedExpandedSections = expandedSections.filter(
+		const updatedExpandedSections = expandedSections.filter((sectionId) => updatedSections.some((section) => section.sectionId === sectionId));
-            sectionId => updatedSections.some(section => section.sectionId === sectionId)
-        );
 
-        dispatch({
+		dispatch({
-            type: 'UPDATE_MODULE',
+			type: "UPDATE_MODULE",
-            payload: {
+			payload: {
-                updates: {
+				updates: {
-                    sections: updatedSections,
+					sections: updatedSections,
-                    sectionLabels: updatedLabels,
+					sectionLabels: updatedLabels,
-                    expandedSections: updatedExpandedSections
+					expandedSections: updatedExpandedSections,
-                }
+				},
-            }
+			},
-        });
+		});
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+		// eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [numberOfLevelParts]);
+	}, [numberOfLevelParts]);
 
-    const sectionIds = sections.map((section) => section.sectionId)
+	const sectionIds = sections.map((section) => section.sectionId);
 
-    const updateModule = useCallback((updates: Partial<ModuleState>) => {
+	const updateModule = useCallback(
-        dispatch({ type: 'UPDATE_MODULE', payload: { updates } });
+		(updates: Partial<ModuleState>) => {
-    }, [dispatch]);
+			dispatch({type: "UPDATE_MODULE", payload: {updates}});
+		},
+		[dispatch],
+	);
 
-    const toggleSection = (sectionId: number) => {
+	const toggleSection = (sectionId: number) => {
-        if (expandedSections.length === 1 && sectionIds.includes(sectionId)) {
+		if (expandedSections.length === 1 && sectionIds.includes(sectionId)) {
-            toast.error("Include at least one section!");
+			toast.error("Include at least one section!");
-            return;
+			return;
-        }
+		}
-        dispatch({ type: 'TOGGLE_SECTION', payload: { sectionId } });
+		dispatch({type: "TOGGLE_SECTION", payload: {sectionId}});
-    };
+	};
 
-    const ModuleSettings: Record<Module, React.ComponentType> = {
+	const ModuleSettings: Record<Module, React.ComponentType> = {
-        reading: ReadingSettings,
+		reading: ReadingSettings,
-        writing: WritingSettings,
+		writing: WritingSettings,
-        speaking: SpeakingSettings,
+		speaking: SpeakingSettings,
-        listening: ListeningSettings,
+		listening: ListeningSettings,
-        level: LevelSettings
+		level: LevelSettings,
-    };
+	};
 
-    const Settings = ModuleSettings[currentModule];
+	const Settings = ModuleSettings[currentModule];
-    const showImport = importModule && ["reading", "listening", "level"].includes(currentModule);
+	const showImport = importModule && ["reading", "listening", "level"].includes(currentModule);
 
-    const updateLevelParts = (parts: number) => {
+	const updateLevelParts = (parts: number) => {
-        setNumberOfLevelParts(parts);
+		setNumberOfLevelParts(parts);
-    }
+	};
 
-    return (
+	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">
+				<>
-                        <div className="flex flex-col gap-3">
+					{isResetModuleOpen && (
-                            <label className="font-normal text-base text-mti-gray-dim">Timer</label>
+						<ResetModule
-                            <Input
+							module={currentModule}
-                                type="number"
+							isOpen={isResetModuleOpen}
-                                name="minTimer"
+							setIsOpen={setIsResetModuleOpen}
-                                onChange={(e) => updateModule({ minTimer: parseInt(e) < 15 ? 15 : parseInt(e) })}
+							setNumberOfLevelParts={setNumberOfLevelParts}
-                                value={minTimer}
+						/>
-                                className="max-w-[300px]"
+					)}
-                            />
+					<div className="flex gap-4 w-full items-center -xl:flex-col">
-                        </div>
+						<div className="flex flex-row gap-3 w-full">
-                        <div className="flex flex-col gap-3 flex-grow">
+							<div className="flex flex-col gap-3">
-                            <label className="font-normal text-base text-mti-gray-dim">Difficulty</label>
+								<label className="font-normal text-base text-mti-gray-dim">Timer</label>
-                            <Select
+								<Input
-                                isMulti={true}
+									type="number"
-                                options={DIFFICULTIES.map((x) => ({ 
+									name="minTimer"
-                                    value: x,
+									onChange={(e) =>
-                                    label: capitalize(x)
+										updateModule({
-                                }))}
+											minTimer: parseInt(e) < 15 ? 15 : parseInt(e),
-                                onChange={(values) => {
+										})
-                                    const selectedDifficulties = values ? values.map(v => v.value as Difficulty) : [];
+									}
-                                    updateModule({ difficulty: selectedDifficulties });
+									value={minTimer}
-                                }}
+									className="max-w-[300px]"
-                                value={
+								/>
-                                    difficulty 
+							</div>
-                                    ? difficulty.map(d => ({ 
+							<div className="flex flex-col gap-3 flex-grow">
-                                        value: d,
+								<label className="font-normal text-base text-mti-gray-dim">Difficulty</label>
-                                        label: capitalize(d)
+								<Select
-                                        }))
+									isMulti={true}
-                                    : null
+									options={DIFFICULTIES.map((x) => ({
-                                }
+										value: x,
-                            />
+										label: capitalize(x),
-                        </div>
+									}))}
-                        {(sectionLabels.length != 0 && currentModule !== "level") ? (
+									onChange={(values) => {
-                            <div className="flex flex-col gap-3">
+										const selectedDifficulties = values ? values.map((v) => v.value as Difficulty) : [];
-                                <label className="font-normal text-base text-mti-gray-dim">{sectionLabels[0].label.split(" ")[0]}</label>
+										updateModule({difficulty: selectedDifficulties});
-                                <div className="flex flex-row gap-8">
+									}}
-                                    {sectionLabels.map(({ id, label }) => (
+									value={
-                                        <span
+										difficulty
-                                            key={id}
+											? difficulty.map((d) => ({
-                                            className={clsx(
+													value: d,
-                                                "px-6 py-4 w-48 h-[72px] flex justify-center items-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
+													label: capitalize(d),
-                                                "transition duration-300 ease-in-out",
+											  }))
-                                                sectionIds.includes(id)
+											: null
-                                                    ? `bg-ielts-${currentModule}/70 border-ielts-${currentModule} text-white`
+									}
-                                                    : "bg-white border-mti-gray-platinum"
+								/>
-                                            )}
+							</div>
-                                            onClick={() => toggleSection(id)}
+						</div>
-                                        >
+						{sectionLabels.length != 0 && currentModule !== "level" ? (
-                                            {label}
+							<div className="flex flex-col gap-3 -xl:w-full">
-                                        </span>
+								<label className="font-normal text-base text-mti-gray-dim">{sectionLabels[0].label.split(" ")[0]}</label>
-                                    ))}
+								<div className="flex flex-row gap-8">
-                                </div>
+									{sectionLabels.map(({id, label}) => (
-                            </div>
+										<span
-
+											key={id}
-                        ) : (
+											className={clsx(
-                            <div className="flex flex-col gap-3 w-1/3">
+												"px-6 py-4 w-48 h-[72px] flex justify-center items-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
-                                <label className="font-normal text-base text-mti-gray-dim">Number of Parts</label>
+												"transition duration-300 ease-in-out",
-                                <Input type="number" name="Number of Parts" min={1} onChange={(v) => setNumberOfLevelParts(parseInt(v))} value={numberOfLevelParts} />
+												sectionIds.includes(id)
-                            </div>
+													? `bg-ielts-${currentModule}/70 border-ielts-${currentModule} text-white`
-                        )}
+													: "bg-white border-mti-gray-platinum",
-                        <div className="flex flex-col gap-3 w-fit h-fit">
+											)}
-                            <div className="h-6" />
+											onClick={() => toggleSection(id)}>
-                            <Checkbox isChecked={isPrivate} onChange={(checked) => updateModule({ isPrivate: checked })}>
+											{label}
-                                Privacy (Only available for Assignments)
+										</span>
-                            </Checkbox>
+									))}
-                        </div>
+								</div>
-                    </div>
+							</div>
-                    <div className="flex flex-row gap-3 w-full">
+						) : (
-                        <div className="flex flex-col gap-3 flex-grow">
+							<div className="flex flex-col gap-3 w-1/3">
-                        <label className="font-normal text-base text-mti-gray-dim">Exam Label *</label>
+								<label className="font-normal text-base text-mti-gray-dim">Number of Parts</label>
-                        <Input
+								<Input
-                            type="text"
+									type="number"
-                            placeholder="Exam Label"
+									name="Number of Parts"
-                            name="label"
+									min={1}
-                            onChange={(text) => updateModule({ examLabel: text })}
+									onChange={(v) => setNumberOfLevelParts(parseInt(v))}
-                            roundness="xl"
+									value={numberOfLevelParts}
-                            value={examLabel}
+								/>
-                            required
+							</div>
-                        />
+						)}
-                        </div>
+						<div className="flex flex-col gap-3 w-fit h-fit">
-                        {currentModule === "listening" && <ListeningInstructions />}
+							<div className="h-6" />
-                        <Button 
+							<Checkbox
-                            onClick={() => setIsResetModuleOpen(true)} 
+								isChecked={isPrivate}
-                            customColor={`bg-ielts-${currentModule}/70 hover:bg-ielts-${currentModule} border-ielts-${currentModule}`} 
+								onChange={(checked) => updateModule({isPrivate: checked})}
-                            className={`text-white self-end`}
+								disabled={entitiesAllowEditPrivacy.length === 0}>
-                        >
+								Privacy (Only available for Assignments)
-                            Reset Module
+							</Checkbox>
-                        </Button>
+						</div>
-                    </div>
+					</div>
-                    <div className="flex flex-row gap-8">
+					<div className="flex flex-row gap-3 w-full">
-                        <Settings />
+						<div className="flex flex-col gap-3 flex-grow">
-                        <div className="flex-grow max-w-[66%]">
+							<label className="font-normal text-base text-mti-gray-dim">Exam Label *</label>
-                            <SectionRenderer />
+							<Input
-                        </div>
+								type="text"
-                    </div>
+								placeholder="Exam Label"
-                </>
+								name="label"
-            )}
+								onChange={(text) => updateModule({examLabel: text})}
-        </>
+								roundness="xl"
-    );
+								value={examLabel}
+								required
+							/>
+						</div>
+						{currentModule === "listening" && <ListeningInstructions />}
+						<Button
+							onClick={() => setIsResetModuleOpen(true)}
+							customColor={`bg-ielts-${currentModule}/70 hover:bg-ielts-${currentModule} border-ielts-${currentModule}`}
+							className={`text-white self-end`}>
+							Reset Module
+						</Button>
+					</div>
+					<div className="flex flex-row gap-8 -2xl:flex-col">
+						<Settings />
+						<div className="flex-grow max-w-[66%] -2xl:max-w-full">
+							<SectionRenderer />
+						</div>
+					</div>
+				</>
+			)}
+		</>
+	);
 };
 
 export default ExamEditor;

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,102 +14,124 @@ import Button from "../Low/Button";
 import ModuleBadge from "../ModuleBadge";
 
 interface Props {
-	assignment: Assignment
+  assignment: Assignment;
-	user: User
+  user: User;
-	session?: Session
+  session?: Session;
-	startAssignment: (assignment: Assignment) => void
+  startAssignment: (assignment: Assignment) => void;
-	resumeAssignment: (session: Session) => void
+  resumeAssignment: (session: Session) => void;
 }
 
-export default function AssignmentCard({ user, assignment, session, startAssignment, resumeAssignment }: Props) {
+export default function AssignmentCard({
-	const router = useRouter()
+  user,
+  assignment,
+  session,
+  startAssignment,
+  resumeAssignment,
+}: Props) {
+  const hasBeenSubmitted = useMemo(
+    () => assignment.results.map((r) => r.user).includes(user.id),
+    [assignment.results, user.id]
+  );
 
-	const hasBeenSubmitted = useMemo(() => assignment.results.map((r) => r.user).includes(user.id), [assignment.results, user.id])
+  return (
-
+    <div
-	return (
+      className={clsx(
-		<div
+        "border-mti-gray-anti-flash flex min-w-[350px] flex-col gap-6 rounded-xl border p-4",
-			className={clsx(
+        assignment.results.map((r) => r.user).includes(user.id) &&
-				"border-mti-gray-anti-flash flex min-w-[350px] flex-col gap-6 rounded-xl border p-4",
+          "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">
+      <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">
-				<span className="flex justify-between gap-1 text-lg">
+          {assignment.name}
-					<span>{moment(assignment.startDate).format("DD/MM/YY, HH:mm")}</span>
+        </h3>
-					<span>-</span>
+        <span className="flex justify-between gap-1 text-lg">
-					<span>{moment(assignment.endDate).format("DD/MM/YY, HH:mm")}</span>
+          <span>{moment(assignment.startDate).format("DD/MM/YY, HH:mm")}</span>
-				</span>
+          <span>-</span>
-			</div>
+          <span>{moment(assignment.endDate).format("DD/MM/YY, HH:mm")}</span>
-			<div className="flex w-full items-center justify-between">
+        </span>
-				<div className="-md:mt-2 grid w-fit min-w-[140px] grid-cols-2 grid-rows-2 place-items-center justify-between gap-4">
+      </div>
-					{assignment.exams
+      <div className="flex w-full items-center justify-between">
-						.filter((e) => e.assignee === user.id)
+        <div className="-md:mt-2 grid w-fit min-w-[140px] grid-cols-2 grid-rows-2 place-items-center justify-between gap-4">
-						.map((e) => e.module)
+          {assignment.exams
-						.sort(sortByModuleName)
+            .filter((e) => e.assignee === user.id)
-						.map((module) => (
+            .map((e) => e.module)
-							<ModuleBadge className="scale-110 w-full" key={module} module={module} />
+            .sort(sortByModuleName)
-						))}
+            .map((module) => (
-				</div>
+              <ModuleBadge
-				{futureAssignmentFilter(assignment) && !hasBeenSubmitted && (
+                className="scale-110 w-full"
-					<Button
+                key={module}
-						color="rose"
+                module={module}
-						className="-md:hidden h-full w-full max-w-[50%] !rounded-xl"
+              />
-						disabled
+            ))}
-						variant="outline">
+        </div>
-						Not yet started
+        {futureAssignmentFilter(assignment) && !hasBeenSubmitted && (
-					</Button>
+          <Button
-				)}
+            color="rose"
-				{activeAssignmentFilter(assignment) && !hasBeenSubmitted && (
+            className="-md:hidden h-full w-full max-w-[50%] !rounded-xl"
-					<>
+            disabled
-						<div
+            variant="outline"
-							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">
+            Not yet started
-							<Button className="h-full w-full !rounded-xl" variant="outline">
+          </Button>
-								Start
+        )}
-							</Button>
+        {activeAssignmentFilter(assignment) && !hasBeenSubmitted && (
-						</div>
+          <>
-						{!session && (
+            <div
-							<div
+              className="tooltip flex h-full w-full items-center justify-end pl-8 md:hidden"
-								data-tip="You have already started this assignment!"
+              data-tip="Your screen size is too small to perform an assignment"
-								className={clsx(
+            >
-									"-md:hidden h-full w-full max-w-[50%] cursor-pointer",
+              <Button className="h-full w-full !rounded-xl" variant="outline">
-									!!session && "tooltip",
+                Start
-								)}>
+              </Button>
-								<Button
+            </div>
-									className={clsx("w-full h-full !rounded-xl")}
+            {!session && (
-									onClick={() => startAssignment(assignment)}
+              <div
-									variant="outline">
+                data-tip="You have already started this assignment!"
-									Start
+                className={clsx(
-								</Button>
+                  "-md:hidden h-full w-full max-w-[50%] cursor-pointer",
-							</div>
+                  !!session && "tooltip"
-						)}
+                )}
-						{!!session && (
+              >
-							<div
+                <Button
-								className={clsx(
+                  className={clsx("w-full h-full !rounded-xl")}
-									"-md:hidden h-full w-full max-w-[50%] cursor-pointer"
+                  onClick={() => startAssignment(assignment)}
-								)}>
+                  variant="outline"
-								<Button
+                >
-									className={clsx("w-full h-full !rounded-xl")}
+                  Start
-									onClick={() => resumeAssignment(session)}
+                </Button>
-									color="green"
+              </div>
-									variant="outline">
+            )}
-									Resume
+            {!!session && (
-								</Button>
+              <div
-							</div>
+                className={clsx(
-						)}
+                  "-md:hidden h-full w-full max-w-[50%] cursor-pointer"
-					</>
+                )}
-				)}
+              >
-				{hasBeenSubmitted && (
+                <Button
-					<Button
+                  className={clsx("w-full h-full !rounded-xl")}
-						color="green"
+                  onClick={() => resumeAssignment(session)}
-						className="-md:hidden h-full w-full max-w-[50%] !rounded-xl"
+                  color="green"
-						disabled
+                  variant="outline"
-						variant="outline">
+                >
-						Submitted
+                  Resume
-					</Button>
+                </Button>
-				)}
+              </div>
-			</div>
+            )}
-		</div>
+          </>
-	)
+        )}
+        {hasBeenSubmitted && (
+          <Button
+            color="green"
+            className="-md:hidden h-full w-full max-w-[50%] !rounded-xl"
+            disabled
+            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,66 +5,126 @@ 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;
+  user: User;
-	entities?: EntityWithRoles[]
+  entities?: EntityWithRoles[];
-	children: React.ReactNode;
+  children: React.ReactNode;
-	className?: string;
+  refreshPage?: boolean;
-	navDisabled?: boolean;
-	focusMode?: boolean;
-	hideSidebar?: boolean
-	bgColor?: string;
-	onFocusLayerMouseEnter?: () => void;
 }
 
 export default function Layout({
-	user,
+  user,
-	children,
+  entities,
-	className,
+  children,
-	bgColor = "bg-white",
+  refreshPage,
-	hideSidebar,
-	navDisabled = false,
-	focusMode = false,
-	onFocusLayerMouseEnter
 }: Props) {
-	const router = useRouter();
+  const [onFocusLayerMouseEnter, setOnFocusLayerMouseEnter] = useState(
-	const { entities } = useEntities()
+    () => () => {}
+  );
+  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("");
 
-	return (
+  useEffect(() => {
-		<main className={clsx("w-full min-h-full h-screen flex flex-col bg-mti-gray-smoke relative")}>
+    if (refreshPage) {
-			<ToastContainer />
+      setClassName("");
-			{!hideSidebar && user && (
+      setBgColor("bg-white");
-				<Navbar
+      setFocusMode(false);
-					path={router.pathname}
+      setHideSidebar(false);
-					user={user}
+      setNavDisabled(false);
-					navDisabled={navDisabled}
+      setOnFocusLayerMouseEnter(() => () => {});
-					focusMode={focusMode}
+    }
-					onFocusLayerMouseEnter={onFocusLayerMouseEnter}
+  }, [refreshPage]);
-				/>
+
-			)}
+  const LayoutContextValue = React.useMemo(
-			<div className={clsx("h-full w-full flex gap-2")}>
+    () => ({
-				{!hideSidebar && user && (
+      onFocusLayerMouseEnter,
-					<Sidebar
+      setOnFocusLayerMouseEnter,
-						path={router.pathname}
+      navDisabled,
-						navDisabled={navDisabled}
+      setNavDisabled,
-						focusMode={focusMode}
+      focusMode,
-						onFocusLayerMouseEnter={onFocusLayerMouseEnter}
+      setFocusMode,
-						className="-md:hidden"
+      hideSidebar,
-						user={user}
+      setHideSidebar,
-						entities={entities}
+      bgColor,
-					/>
+      setBgColor,
-				)}
+      className,
-				<div
+      setClassName,
-					className={clsx(
+    }),
-						`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",
+      bgColor,
-						hideSidebar ? "md:mx-8" : "md:mr-8",
+      className,
-						className,
+      focusMode,
-					)}>
+      hideSidebar,
-					{children}
+      navDisabled,
-				</div>
+      onFocusLayerMouseEnter,
-			</div>
+    ]
-		</main>
+  );
-	);
+
+  const router = useRouter();
+
+  return (
+    <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
+            path={router.pathname}
+            user={user}
+            navDisabled={navDisabled}
+            focusMode={focusMode}
+            onFocusLayerMouseEnter={onFocusLayerMouseEnter}
+          />
+        )}
+        <div className={clsx("h-full w-full flex gap-2")}>
+          {!hideSidebar && user && (
+            <Sidebar
+              path={router.pathname}
+              navDisabled={navDisabled}
+              focusMode={focusMode}
+              onFocusLayerMouseEnter={onFocusLayerMouseEnter}
+              className="-md:hidden"
+              user={user}
+              entities={entities}
+            />
+          )}
+          <div
+            className={clsx(
+              `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
+            )}
+          >
+            {children}
+          </div>
+        </div>
+      </main>
+    </LayoutContext.Provider>
+  );
 }

src/components/High/Table.tsx

@@ -1,109 +1,159 @@
-import { useListSearch } from "@/hooks/useListSearch"
+import { useListSearch } from "@/hooks/useListSearch";
-import { ColumnDef, flexRender, getCoreRowModel, getPaginationRowModel, getSortedRowModel, PaginationState, useReactTable } from "@tanstack/react-table"
+import {
-import clsx from "clsx"
+  ColumnDef,
-import { useEffect, useState } from "react"
+  flexRender,
-import { BsArrowDown, BsArrowUp } from "react-icons/bs"
+  getCoreRowModel,
-import Button from "../Low/Button"
+  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[]
+  data: T[];
-	columns: ColumnDef<any, any>[]
+  columns: ColumnDef<any, any>[];
-	searchFields: string[][]
+  searchFields: string[][];
-	size?: number
+  size?: number;
-	onDownload?: (rows: T[]) => void
+  onDownload?: (rows: T[]) => void;
-	isDownloadLoading?: boolean
+  isDownloadLoading?: boolean;
-	searchPlaceholder?: string
+  searchPlaceholder?: string;
+  isLoading?: boolean;
 }
 
-export default function Table<T>({ data, columns, searchFields, size = 16, onDownload, isDownloadLoading, searchPlaceholder }: Props<T>) {
+export default function Table<T>({
-	const [pagination, setPagination] = useState<PaginationState>({
+  data,
-		pageIndex: 0,
+  columns,
-		pageSize: size,
+  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({
+  const table = useReactTable({
-		data: rows,
+    data: rows,
-		columns,
+    columns,
-		getCoreRowModel: getCoreRowModel(),
+    getCoreRowModel: getCoreRowModel(),
-		getSortedRowModel: getSortedRowModel(),
+    getSortedRowModel: getSortedRowModel(),
-		getPaginationRowModel: getPaginationRowModel(),
+    getPaginationRowModel: getPaginationRowModel(),
-		onPaginationChange: setPagination,
+    onPaginationChange: setPagination,
-		state: {
+    state: {
-			pagination
+      pagination,
-		}
+    },
-	});
+  });
 
-	return (
+  return (
-		<div className="w-full flex flex-col gap-2">
+    <div className="w-full flex flex-col gap-2">
-			<div className="w-full flex gap-2 items-end">
+      <div className="w-full flex gap-2 items-end">
-				{renderSearch()}
+        {renderSearch()}
-				{onDownload && (
+        {onDownload && (
-					<Button isLoading={isDownloadLoading} className="w-full max-w-[200px] mb-1" variant="outline" onClick={() => onDownload(rows)}>
+          <Button
-						Download
+            isLoading={isDownloadLoading}
-					</Button>
+            className="w-full max-w-[200px] mb-1"
-				)
+            variant="outline"
-				}
+            onClick={() => onDownload(rows)}
-			</div>
+          >
+            Download
+          </Button>
+        )}
+      </div>
 
-			<div className="w-full flex gap-2 justify-between items-center">
+      <div className="w-full flex gap-2 justify-between items-center">
-				<div className="flex items-center gap-4 w-fit">
+        <div className="flex items-center gap-4 w-fit">
-					<Button className="w-[200px] h-fit" disabled={!table.getCanPreviousPage()} onClick={() => table.previousPage()}>
+          <Button
-						Previous Page
+            className="w-[200px] h-fit"
-					</Button>
+            disabled={!table.getCanPreviousPage()}
-				</div>
+            onClick={() => table.previousPage()}
-				<div className="flex items-center gap-4 w-fit">
+          >
-					<span className="flex items-center gap-1">
+            Previous Page
-						<div>Page</div>
+          </Button>
-						<strong>
+        </div>
-							{table.getState().pagination.pageIndex + 1} of{' '}
+        <div className="flex items-center gap-4 w-fit">
-							{table.getPageCount().toLocaleString()}
+          <span className="flex items-center gap-1">
-						</strong>
+            <div>Page</div>
-						<div>| Total: {table.getRowCount().toLocaleString()}</div>
+            <strong>
-					</span>
+              {table.getState().pagination.pageIndex + 1} of{" "}
-					<Button className="w-[200px]" disabled={!table.getCanNextPage()} onClick={() => table.nextPage()}>
+              {table.getPageCount().toLocaleString()}
-						Next Page
+            </strong>
-					</Button>
+            <div>| Total: {table.getRowCount().toLocaleString()}</div>
-				</div>
+          </span>
-			</div>
+          <Button
+            className="w-[200px]"
+            disabled={!table.getCanNextPage()}
+            onClick={() => table.nextPage()}
+          >
+            Next Page
+          </Button>
+        </div>
+      </div>
 
-			<table className="rounded-xl bg-mti-purple-ultralight/40 w-full">
+      <table className="rounded-xl bg-mti-purple-ultralight/40 w-full">
-				<thead>
+        <thead>
-					{table.getHeaderGroups().map((headerGroup) => (
+          {table.getHeaderGroups().map((headerGroup) => (
-						<tr key={headerGroup.id}>
+            <tr key={headerGroup.id}>
-							{headerGroup.headers.map((header) => (
+              {headerGroup.headers.map((header) => (
-								<th className="py-4 px-4 text-left" key={header.id} colSpan={header.colSpan}>
+                <th
-									<div
+                  className="py-4 px-4 text-left"
-										className={clsx(header.column.getCanSort() && 'cursor-pointer select-none', 'flex items-center gap-2')}
+                  key={header.id}
-										onClick={header.column.getToggleSortingHandler()}
+                  colSpan={header.colSpan}
-									>
+                >
-										{flexRender(
+                  <div
-											header.column.columnDef.header,
+                    className={clsx(
-											header.getContext()
+                      header.column.getCanSort() &&
-										)}
+                        "cursor-pointer select-none",
-										{{
+                      "flex items-center gap-2"
-											asc: <BsArrowUp />,
+                    )}
-											desc: <BsArrowDown />,
+                    onClick={header.column.getToggleSortingHandler()}
-										}[header.column.getIsSorted() as string] ?? null}
+                  >
-									</div>
+                    {flexRender(
-								</th>
+                      header.column.columnDef.header,
-							))}
+                      header.getContext()
-						</tr>
+                    )}
-					))}
+                    {{
-				</thead>
+                      asc: <BsArrowUp />,
-				<tbody className="px-2 w-full">
+                      desc: <BsArrowDown />,
-					{table.getRowModel().rows.map((row) => (
+                    }[header.column.getIsSorted() as string] ?? null}
-						<tr className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2" key={row.id}>
+                  </div>
-							{row.getVisibleCells().map((cell) => (
+                </th>
-								<td className="px-4 py-2 items-center w-fit" key={cell.id}>
+              ))}
-									{flexRender(cell.column.columnDef.cell, cell.getContext())}
+            </tr>
-								</td>
+          ))}
-							))}
+        </thead>
-						</tr>
+        <tbody className="px-2 w-full">
-					))}
+          {table.getRowModel().rows.map((row) => (
-				</tbody>
+            <tr
-			</table>
+              className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2"
-		</div>
+              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())}
+                </td>
+              ))}
+            </tr>
+          ))}
+        </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

@@ -2,18 +2,18 @@ import clsx from "clsx";
 import { IconType } from "react-icons";
 import { MdSpaceDashboard } from "react-icons/md";
 import {
-	BsFileEarmarkText,
+  BsFileEarmarkText,
-	BsClockHistory,
+  BsClockHistory,
-	BsPencil,
+  BsGraphUp,
-	BsGraphUp,
+  BsChevronBarRight,
-	BsChevronBarRight,
+  BsChevronBarLeft,
-	BsChevronBarLeft,
+  BsShieldFill,
-	BsShieldFill,
+  BsCloudFill,
-	BsCloudFill,
+  BsCurrencyDollar,
-	BsCurrencyDollar,
+  BsClipboardData,
-	BsClipboardData,
+  BsPeople,
-	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,218 +24,478 @@ 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;
+  path: string;
-	navDisabled?: boolean;
+  navDisabled?: boolean;
-	focusMode?: boolean;
+  focusMode?: boolean;
-	onFocusLayerMouseEnter?: () => void;
+  onFocusLayerMouseEnter?: () => void;
-	className?: string;
+  className?: string;
-	user: User;
+  user: User;
-	entities?: EntityWithRoles[]
+  entities?: EntityWithRoles[];
 }
 
 interface NavProps {
-	Icon: IconType;
+  Icon: IconType;
-	label: string;
+  label: string;
-	path: string;
+  path: string;
-	keyPath: string;
+  keyPath: string;
-	disabled?: boolean;
+  disabled?: boolean;
-	isMinimized?: boolean;
+  isMinimized?: boolean;
-	badge?: number;
+  badge?: number;
 }
 
-const Nav = ({ Icon, label, path, keyPath, disabled = false, isMinimized = false, badge }: NavProps) => {
+const Nav = ({
-	return (
+  Icon,
-		<Link
+  label,
-			href={!disabled ? keyPath : ""}
+  path,
-			className={clsx(
+  keyPath,
-				"flex items-center gap-4 rounded-full p-4 text-gray-500 hover:text-white",
+  disabled = false,
-				"transition-all duration-300 ease-in-out relative",
+  isMinimized = false,
-				disabled ? "hover:bg-mti-gray-dim cursor-not-allowed" : "hover:bg-mti-purple-light cursor-pointer",
+  badge,
-				path.startsWith(keyPath) && "bg-mti-purple-light text-white",
+}: NavProps) => {
-				isMinimized ? "w-fit" : "w-full min-w-[200px] px-8 2xl:min-w-[220px]",
+  return (
-			)}>
+    <Link
-			<Icon size={24} />
+      href={!disabled ? keyPath : ""}
-			{!isMinimized && <span className="text-lg font-semibold">{label}</span>}
+      className={clsx(
-			{!!badge && badge > 0 && (
+        "flex items-center gap-4 rounded-full p-4 text-gray-500 hover:text-white",
-				<div
+        "transition-all duration-300 ease-in-out relative",
-					className={clsx(
+        disabled
-						"bg-mti-purple-light h-5 w-5 text-xs rounded-full flex items-center justify-center text-white",
+          ? "hover:bg-mti-gray-dim cursor-not-allowed"
-						"transition ease-in-out duration-300",
+          : "hover:bg-mti-purple-light cursor-pointer",
-						isMinimized && "absolute right-0 top-0",
+        path.startsWith(keyPath) && "bg-mti-purple-light text-white",
-					)}>
+        isMinimized ? "w-fit" : "w-full min-w-[200px] px-8 2xl:min-w-[220px]"
-					{badge}
+      )}
-				</div>
+    >
-			)}
+      <Icon size={24} />
-		</Link>
+      {!isMinimized && <span className="text-lg font-semibold">{label}</span>}
-	);
+      {!!badge && badge > 0 && (
+        <div
+          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"
+          )}
+        >
+          {badge}
+        </div>
+      )}
+    </Link>
+  );
 };
 
 export default function Sidebar({
-	path,
+  path,
-	entities = [],
+  entities = [],
-	navDisabled = false,
+  navDisabled = false,
-	focusMode = false,
+  focusMode = false,
-	user,
+  user,
-	onFocusLayerMouseEnter,
+  onFocusLayerMouseEnter,
-	className
+  className,
 }: Props) {
-	const router = useRouter();
+  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 { permissions } = usePermissions(user.id);
 
-	const entitiesAllowStatistics = useAllowedEntities(user, entities, "view_statistics")
+  const entitiesAllowStatistics = useAllowedEntities(
-	const entitiesAllowPaymentRecord = useAllowedEntities(user, entities, "view_payment_record")
+    user,
+    entities,
+    "view_statistics"
+  );
+  const entitiesAllowPaymentRecord = useAllowedEntities(
+    user,
+    entities,
+    "view_payment_record"
+  );
 
-	const entitiesAllowGeneration = useAllowedEntitiesSomePermissions(user, entities, [
+  const entitiesAllowGeneration = useAllowedEntitiesSomePermissions(
-		"generate_reading", "generate_listening", "generate_writing", "generate_speaking", "generate_level"
+    user,
-	])
+    entities,
+    [
+      "generate_reading",
+      "generate_listening",
+      "generate_writing",
+      "generate_speaking",
+      "generate_level",
+    ]
+  );
 
-	const logout = async () => {
+  const sidebarPermissions = useMemo<{ [key: string]: boolean }>(() => {
-		axios.post("/api/logout").finally(() => {
+    if (user.type === "developer") {
-			setTimeout(() => router.reload(), 500);
+      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,
+    };
 
-	const disableNavigation = preventNavigation(navDisabled, focusMode);
+    if (!user || !user?.type) return sidebarPermissions;
 
-	return (
+    const neededPermissions = permissions.reduce((acc, curr) => {
-		<section
+      if (
-			className={clsx(
+        ["viewExams", "viewRecords", "viewTickets"].includes(curr as string)
-				"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",
+        acc.push(curr);
-				className,
+      }
-			)}>
+      return acc;
-			<div className="-xl:hidden flex-col gap-3 xl:flex">
+    }, [] as PermissionType[]);
-				<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} />
-				)}
-				{checkAccess(user, getTypesOfUser(["agent"])) && entitiesAllowStatistics.length > 0 && (
-					<Nav disabled={disableNavigation} Icon={BsGraphUp} label="Stats" path={path} keyPath="/stats" isMinimized={isMinimized} />
-				)}
-				{checkAccess(user, ["developer", "admin", "mastercorporate", "corporate", "teacher", "student"], permissions) && (
-					<Nav
-						disabled={disableNavigation}
-						Icon={BsPeople}
-						label="Classrooms"
-						path={path}
-						keyPath="/classrooms"
-						isMinimized={isMinimized}
-					/>
-				)}
-				{checkAccess(user, getTypesOfUser(["agent"]), permissions, "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} />
-				)}
-				{checkAccess(user, ["admin", "developer", "agent", "corporate", "mastercorporate"]) && entitiesAllowPaymentRecord.length > 0 && (
-					<Nav
-						disabled={disableNavigation}
-						Icon={BsCurrencyDollar}
-						label="Payment Record"
-						path={path}
-						keyPath="/payment-record"
-						isMinimized={isMinimized}
-					/>
-				)}
-				{checkAccess(user, ["admin", "developer", "corporate", "teacher", "mastercorporate"]) && (
-					<Nav
-						disabled={disableNavigation}
-						Icon={BsShieldFill}
-						label="Settings"
-						path={path}
-						keyPath="/settings"
-						isMinimized={isMinimized}
-					/>
-				)}
-				{checkAccess(user, ["admin", "developer", "agent"], permissions, "viewTickets") && (
-					<Nav
-						disabled={disableNavigation}
-						Icon={BsClipboardData}
-						label="Tickets"
-						path={path}
-						keyPath="/tickets"
-						isMinimized={isMinimized}
-						badge={totalAssignedTickets}
-					/>
-				)}
-				{checkAccess(user, ["admin", "developer", "teacher", 'corporate', 'mastercorporate'])
-					&& (entitiesAllowGeneration.length > 0 || isAdmin) && (
-						<Nav
-							disabled={disableNavigation}
-							Icon={BsCloudFill}
-							label="Generation"
-							path={path}
-							keyPath="/generation"
-							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 />
-				)}
-				{checkAccess(user, getTypesOfUser(["agent"]), permissions, "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 />
-				)}
-				{checkAccess(user, getTypesOfUser(["student"])) && (
-					<Nav disabled={disableNavigation} Icon={BsShieldFill} label="Settings" path={path} keyPath="/settings" isMinimized />
-				)}
-				{entitiesAllowGeneration.length > 0 && (
-					<Nav
-						disabled={disableNavigation}
-						Icon={BsCloudFill}
-						label="Generation"
-						path={path}
-						keyPath="/generation"
-						isMinimized
-					/>
-				)}
-			</div>
 
-			<div className="2xl:fixed bottom-12 flex flex-col gap-0 -2xl:mt-8">
+    if (
-				<div
+      ["student", "teacher", "developer"].includes(user.type) &&
-					role="button"
+      neededPermissions.includes("viewExams")
-					tabIndex={1}
+    ) {
-					onClick={toggleMinimize}
+      sidebarPermissions["viewExams"] = true;
-					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",
+    if (
-						isMinimized ? "w-fit" : "w-full min-w-[250px] px-8",
+      getTypesOfUser(["agent"]).includes(user.type) &&
-					)}>
+      (entitiesAllowStatistics.length > 0 ||
-					{isMinimized ? <BsChevronBarRight size={24} /> : <BsChevronBarLeft size={24} />}
+        neededPermissions.includes("viewStats"))
-					{!isMinimized && <span className="text-lg font-medium">Minimize</span>}
+    ) {
-				</div>
+      sidebarPermissions["viewStats"] = true;
-				<div
+    }
-					role="button"
+    if (
-					tabIndex={1}
+      [
-					onClick={focusMode ? () => { } : logout}
+        "admin",
-					className={clsx(
+        "developer",
-						"hover:text-mti-rose flex cursor-pointer items-center gap-4 rounded-full p-4 text-black transition duration-300 ease-in-out",
+        "teacher",
-						isMinimized ? "w-fit" : "w-full min-w-[250px] px-8",
+        "corporate",
-					)}>
+        "mastercorporate",
-					<RiLogoutBoxFill size={24} />
+      ].includes(user.type) &&
-					{!isMinimized && <span className="-xl:hidden text-lg font-medium">Log Out</span>}
+      (entitiesAllowGeneration.length > 0 || isAdmin)
-				</div>
+    ) {
-			</div>
+      sidebarPermissions["viewGeneration"] = true;
-			{focusMode && <FocusLayer onFocusLayerMouseEnter={onFocusLayerMouseEnter} />}
+      sidebarPermissions["viewApprovalWorkflows"] = true;
-		</section>
+    }
-	);
+    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(() => {
+      setTimeout(() => router.reload(), 500);
+    });
+  };
+
+  const disableNavigation = preventNavigation(navDisabled, focusMode);
+
+  return (
+    <section
+      className={clsx(
+        "relative flex h-full flex-col justify-between bg-transparent px-4 py-4 pb-8",
+        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}
+        />
+        {sidebarPermissions["viewExams"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={BsFileEarmarkText}
+            label="Practice"
+            path={path}
+            keyPath="/exam"
+            isMinimized={isMinimized}
+          />
+        )}
+        {sidebarPermissions["viewStats"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={BsGraphUp}
+            label="Stats"
+            path={path}
+            keyPath="/stats"
+            isMinimized={isMinimized}
+          />
+        )}
+        {sidebarPermissions["viewClassrooms"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={BsPeople}
+            label="Classrooms"
+            path={path}
+            keyPath="/classrooms"
+            isMinimized={isMinimized}
+          />
+        )}
+        {sidebarPermissions["viewRecords"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={BsClockHistory}
+            label="Record"
+            path={path}
+            keyPath="/record"
+            isMinimized={isMinimized}
+          />
+        )}
+        {sidebarPermissions["viewRecords"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={CiDumbbell}
+            label="Training"
+            path={path}
+            keyPath="/training"
+            isMinimized={isMinimized}
+          />
+        )}
+        {sidebarPermissions["viewPaymentRecords"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={BsCurrencyDollar}
+            label="Payment Record"
+            path={path}
+            keyPath="/payment-record"
+            isMinimized={isMinimized}
+          />
+        )}
+        {sidebarPermissions["viewSettings"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={BsShieldFill}
+            label="Settings"
+            path={path}
+            keyPath="/settings"
+            isMinimized={isMinimized}
+          />
+        )}
+        {sidebarPermissions["viewTickets"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={BsClipboardData}
+            label="Tickets"
+            path={path}
+            keyPath="/tickets"
+            isMinimized={isMinimized}
+            badge={totalAssignedTickets}
+          />
+        )}
+        {sidebarPermissions["viewGeneration"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={BsCloudFill}
+            label="Generation"
+            path={path}
+            keyPath="/generation"
+            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
+        />
+        {sidebarPermissions["viewStats"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={BsGraphUp}
+            label="Stats"
+            path={path}
+            keyPath="/stats"
+            isMinimized
+          />
+        )}
+        {sidebarPermissions["viewRecords"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={BsClockHistory}
+            label="Record"
+            path={path}
+            keyPath="/record"
+            isMinimized
+          />
+        )}
+        {sidebarPermissions["viewRecords"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={CiDumbbell}
+            label="Training"
+            path={path}
+            keyPath="/training"
+            isMinimized
+          />
+        )}
+        {sidebarPermissions["viewSettings"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={BsShieldFill}
+            label="Settings"
+            path={path}
+            keyPath="/settings"
+            isMinimized
+          />
+        )}
+        {sidebarPermissions["viewGeneration"] && (
+          <Nav
+            disabled={disableNavigation}
+            Icon={BsCloudFill}
+            label="Generation"
+            path={path}
+            keyPath="/generation"
+            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">
+        <div
+          role="button"
+          tabIndex={1}
+          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>
+          )}
+        </div>
+        <div
+          role="button"
+          tabIndex={1}
+          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"
+          )}
+        >
+          <RiLogoutBoxFill size={24} />
+          {!isMinimized && (
+            <span className="-xl:hidden text-lg font-medium">Log Out</span>
+          )}
+        </div>
+      </div>
+      {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 { WithLabeledEntities } from "@/interfaces/entity";
-import { Discount } from "@/interfaces/paypal";
+import { Type, User } from "@/interfaces/user";
-import { Code, Group, 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/useEvaluationPolling.tsx

@@ -1,95 +1,114 @@
-import { UserSolution } from '@/interfaces/exam';
+import { UserSolution } from "@/interfaces/exam";
-import useExamStore from '@/stores/exam';
+import useExamStore from "@/stores/exam";
-import { StateFlags } from '@/stores/exam/types';
+import axios from "axios";
-import axios from 'axios';
+import { useEffect, useRef } from "react";
-import { SetStateAction, useEffect, useRef } from 'react';
+import { useRouter } from "next/router";
 
-type UseEvaluationPolling = (props: {
+const useEvaluationPolling = (sessionIds: string[], mode: "exam" | "records", userId: string) => {
-    pendingExercises: string[],
+  const { setUserSolutions, userSolutions } = useExamStore();
-    setPendingExercises: React.Dispatch<SetStateAction<string[]>>,
+  const pollingTimeoutsRef = useRef<Map<string, NodeJS.Timeout>>(new Map());
-}) => void;
+  const router = useRouter();
 
-const useEvaluationPolling: UseEvaluationPolling = ({
+  const poll = async (sessionId: string) => {
-    pendingExercises,
+    try {
-    setPendingExercises,
+      const { data: statusData } = await axios.get('/api/evaluate/status', {
-}) => {
+        params: { op: 'pending', userId, sessionId }
-    const {
+      });
-        flags, sessionId, user, 
-        userSolutions, evaluated, 
-        setEvaluated, setFlags
-    } = useExamStore();
 
-    const pollingTimeoutRef = useRef<NodeJS.Timeout>();
+      if (!statusData.hasPendingEvaluation) {
 
-    useEffect(() => {
+        let solutionsOrStats = userSolutions;
-        return () => {
-            if (pollingTimeoutRef.current) {
-                clearTimeout(pollingTimeoutRef.current);
-            }
-        };
-    }, []);
 
-    useEffect(() => {
+        if (mode === "records") {
-        if (!flags.pendingEvaluation || pendingExercises.length === 0) {
+          const res = await axios.get(`/api/stats/session/${sessionId}`)
-
+          solutionsOrStats = res.data;
-            if (pollingTimeoutRef.current) {
-                clearTimeout(pollingTimeoutRef.current);
-            }
-            return;
         }
+        const { data: completedSolutions } = await axios.post('/api/evaluate/fetchSolutions?op=session', {
+          sessionId,
+          userId,
+          stats: solutionsOrStats,
+        });
 
-        const pollStatus = async () => {
+        await axios.post('/api/stats/disabled', {
-            try {
+          sessionId,
-                const { data } = await axios.get('/api/evaluate/status', {
+          userId,
-                    params: {
+          solutions: completedSolutions,
-                        sessionId,
+        });
-                        userId: user,
-                        exerciseIds: pendingExercises.join(',')
-                    }
-                });
 
-                if (data.finishedExerciseIds.length > 0) {
+        const timeout = pollingTimeoutsRef.current.get(sessionId);
-                    const remainingExercises = pendingExercises.filter(
+        if (timeout) clearTimeout(timeout);
-                        id => !data.finishedExerciseIds.includes(id)
+        pollingTimeoutsRef.current.delete(sessionId);
-                    );
 
-                    setPendingExercises(remainingExercises);
+        if (mode === "exam") {
+          const updatedSolutions = userSolutions.map(solution => {
+            const completed = completedSolutions.find(
+              (c: UserSolution) => c.exercise === solution.exercise
+            );
+            return completed || solution;
+          });
 
-                    if (remainingExercises.length === 0) {
+          setUserSolutions(updatedSolutions);
-                        const evaluatedData = await axios.post('/api/evaluate/fetchSolutions', {
+        } else {
-                            sessionId,
+          router.reload();
-                            userId: user,
+        }
-                            userSolutions
+      } else {
-                        });
+        if (pollingTimeoutsRef.current.has(sessionId)) {
+          clearTimeout(pollingTimeoutsRef.current.get(sessionId));
+        }
+        pollingTimeoutsRef.current.set(
+          sessionId,
+          setTimeout(() => poll(sessionId), 5000)
+        );
+      }
+    } catch (error) {
+      if (pollingTimeoutsRef.current.has(sessionId)) {
+        clearTimeout(pollingTimeoutsRef.current.get(sessionId));
+      }
+      pollingTimeoutsRef.current.set(
+        sessionId,
+        setTimeout(() => poll(sessionId), 5000)
+      );
+    }
+  };
 
-                        const newEvaluations = evaluatedData.data.filter(
+  useEffect(() => {
-                            (newEval: UserSolution) =>
+    if (mode === "exam") {
-                                !evaluated.some(existingEval => existingEval.exercise === newEval.exercise)
+      const hasDisabledSolutions = userSolutions.some(s => s.isDisabled);
-                        );
 
-                        setEvaluated([...evaluated, ...newEvaluations]);
+      if (hasDisabledSolutions && sessionIds.length > 0) {
-                        setFlags({ pendingEvaluation: false });
+        poll(sessionIds[0]);
-                        return;
+      } else {
-                    }
+        pollingTimeoutsRef.current.forEach((timeout) => {
-                }
+          clearTimeout(timeout);
+        });
+        pollingTimeoutsRef.current.clear();
+      }
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [mode, sessionIds, userSolutions]);
 
-                if (pendingExercises.length > 0) {
+  useEffect(() => {
-                    pollingTimeoutRef.current = setTimeout(pollStatus, 5000);
+    if (mode === "records" && sessionIds.length > 0) {
-                }
+      sessionIds.forEach(sessionId => {
-            } catch (error) {
+        poll(sessionId);
-                console.error('Evaluation polling error:', error);
+      });
-                pollingTimeoutRef.current = setTimeout(pollStatus, 5000);
+    }
-            }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
-        };
+  }, [mode, sessionIds]);
 
-        pollStatus();
+  useEffect(() => {
+    const timeouts = pollingTimeoutsRef.current;
+    return () => {
+      timeouts.forEach((timeout) => {
+        clearTimeout(timeout);
+      });
+      timeouts.clear();
+    };
+  }, []);
 
-        return () => {
+  return {
-            if (pollingTimeoutRef.current) {
+    isPolling: pollingTimeoutsRef.current.size > 0
-                clearTimeout(pollingTimeoutRef.current);
+  };
-            }
-        };
-    });
 };
 
 export default useEvaluationPolling;

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,192 +5,329 @@ 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 {
-import { mapBy } from "@/utils";
+  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 {
-import { useEffect, useState } from "react";
+  Dispatch,
+  memo,
+  SetStateAction,
+  useCallback,
+  useEffect,
+  useState,
+} from "react";
 import { BsPlusCircle, BsTrash } from "react-icons/bs";
 import { toast } from "react-toastify";
 
 const areStepsOverlapped = (steps: Step[]) => {
-	for (let i = 0; i < steps.length; i++) {
+  for (let i = 0; i < steps.length; i++) {
-		if (i === 0) continue;
+    if (i === 0) continue;
 
-		const step = steps[i];
+    const step = steps[i];
-		const previous = steps[i - 1];
+    const previous = steps[i - 1];
 
-		if (previous.max >= step.min) return true;
+    if (previous.max >= step.min) return true;
-	}
+  }
 
-	return false;
+  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;
+  user: User;
-	entitiesGrading: Grading[];
+  entitiesGrading: Grading[];
-	entities: Entity[]
+  entities: Entity[];
-	mutate: () => void
+  mutate: () => void;
 }
 
-export default function CorporateGradingSystem({ user, entitiesGrading = [], entities = [], mutate }: Props) {
+export default function CorporateGradingSystem({
-	const [entity, setEntity] = useState(entitiesGrading[0]?.entity || undefined)
+  user,
-	const [isLoading, setIsLoading] = useState(false);
+  entitiesGrading = [],
-	const [steps, setSteps] = useState<Step[]>([]);
+  entities = [],
-	const [otherEntities, setOtherEntities] = useState<string[]>([])
+  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[]>([]);
 
-	useEffect(() => {
+  useEffect(() => {
-		if (entity) {
+    if (entity) {
-			const entitySteps = entitiesGrading.find(e => e.entity === entity)!.steps
+      const entitySteps = entitiesGrading.find(
-			setSteps(entitySteps || [])
+        (e) => e.entity === entity
-		}
+      )!.steps;
-	}, [entitiesGrading, entity])
+      setSteps(entitySteps || []);
+    }
+  }, [entitiesGrading, entity]);
 
-	const saveGradingSystem = () => {
+  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 (!steps.every((x) => x.min < x.max))
-		if (areStepsOverlapped(steps)) return toast.error("There seems to be an overlap in one of your steps.");
+      return toast.error(
-		if (
+        "One of your steps has a minimum threshold inferior to its superior threshold."
-			steps.reduce((acc, curr) => {
+      );
-				return acc - (curr.max - curr.min + 1);
+    if (areStepsOverlapped(steps))
-			}, 100) > 0
+      return toast.error("There seems to be an overlap in one of your steps.");
-		)
+    if (
-			return toast.error("There seems to be an open interval in your steps.");
+      steps.reduce((acc, curr) => {
+        return acc - (curr.max - curr.min + 1);
+      }, 100) > 0
+    )
+      return toast.error("There seems to be an open interval in your steps.");
 
-		setIsLoading(true);
+    setIsLoading(true);
-		axios
+    axios
-			.post("/api/grading", { user: user.id, entity, steps })
+      .post("/api/grading", { user: user.id, entity, steps })
-			.then(() => toast.success("Your grading system has been saved!"))
+      .then(() => toast.success("Your grading system has been saved!"))
-			.then(mutate)
+      .then(mutate)
-			.catch(() => toast.error("Something went wrong, please try again later"))
+      .catch(() => toast.error("Something went wrong, please try again later"))
-			.finally(() => setIsLoading(false));
+      .finally(() => setIsLoading(false));
-	};
+  };
 
-	const applyToOtherEntities = () => {
+  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 (!steps.every((x) => x.min < x.max))
-		if (areStepsOverlapped(steps)) return toast.error("There seems to be an overlap in one of your steps.");
+      return toast.error(
-		if (
+        "One of your steps has a minimum threshold inferior to its superior threshold."
-			steps.reduce((acc, curr) => {
+      );
-				return acc - (curr.max - curr.min + 1);
+    if (areStepsOverlapped(steps))
-			}, 100) > 0
+      return toast.error("There seems to be an overlap in one of your steps.");
-		)
+    if (
-			return toast.error("There seems to be an open interval in your steps.");
+      steps.reduce((acc, curr) => {
+        return acc - (curr.max - curr.min + 1);
+      }, 100) > 0
+    )
+      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);
+    setIsLoading(true);
-		axios
+    axios
-			.post("/api/grading/multiple", { user: user.id, entities: otherEntities, steps })
+      .post("/api/grading/multiple", {
-			.then(() => toast.success("Your grading system has been saved!"))
+        user: user.id,
-			.then(mutate)
+        entities: otherEntities,
-			.catch(() => toast.error("Something went wrong, please try again later"))
+        steps,
-			.finally(() => setIsLoading(false));
+      })
-	};
+      .then(() => toast.success("Your grading system has been saved!"))
+      .then(mutate)
+      .catch(() => toast.error("Something went wrong, please try again later"))
+      .finally(() => setIsLoading(false));
+  };
 
-	return (
+  const addRow = useCallback((index: number) => {
-		<div className="flex flex-col gap-4 border p-4 border-mti-gray-platinum rounded-xl">
+    setSteps((prev) => {
-			<label className="font-normal text-base text-mti-gray-dim">Grading System</label>
+      const item = {
-			<div className={clsx("flex flex-col gap-4")}>
+        min: prev[index === 0 ? 0 : index - 1].max + 1,
-				<label className="font-normal text-base text-mti-gray-dim">Entity</label>
+        max: prev[index + 1].min - 1,
-				<Select
+        label: "",
-					defaultValue={{ value: (entities || [])[0]?.id, label: (entities || [])[0]?.label }}
+      };
-					options={entities.map((e) => ({ value: e.id, label: e.label }))}
+      return [
-					onChange={(e) => setEntity(e?.value || undefined)}
+        ...prev.slice(0, index + 1),
-					isClearable={checkAccess(user, ["admin", "developer"])}
+        item,
-				/>
+        ...prev.slice(index + 1, prev.length),
-			</div>
+      ];
+    });
+  }, []);
 
-			{entities.length > 1 && (
+  return (
-				<>
+    <div className="flex flex-col gap-4 border p-4 border-mti-gray-platinum rounded-xl">
-					<Separator />
+      <label className="font-normal text-base text-mti-gray-dim">
-					<label className="font-normal text-base text-mti-gray-dim">Apply this grading system to other entities</label>
+        Grading System
-					<Select
+      </label>
-						options={entities.map((e) => ({ value: e.id, label: e.label }))}
+      <div className={clsx("flex flex-col gap-4")}>
-						onChange={(e) => !e ? setOtherEntities([]) : setOtherEntities(e.map(o => o.value!))}
+        <label className="font-normal text-base text-mti-gray-dim">
-						isMulti
+          Entity
-					/>
+        </label>
-					<Button onClick={applyToOtherEntities} isLoading={isLoading} disabled={isLoading || otherEntities.length === 0} variant="outline">
+        <Select
-						Apply to {otherEntities.length} other entities
+          defaultValue={{
-					</Button>
+            value: (entities || [])[0]?.id,
-					<Separator />
+            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"])}
+        />
+      </div>
 
-			<label className="font-normal text-base text-mti-gray-dim">Preset Systems</label>
+      {entities.length > 1 && (
-			<div className="grid grid-cols-4 gap-4">
+        <>
-				<Button variant="outline" onClick={() => setSteps(CEFR_STEPS)}>
+          <Separator />
-					CEFR
+          <label className="font-normal text-base text-mti-gray-dim">
-				</Button>
+            Apply this grading system to other entities
-				<Button variant="outline" onClick={() => setSteps(GENERAL_STEPS)}>
+          </label>
-					General English
+          <Select
-				</Button>
+            options={entities.map((e) => ({ value: e.id, label: e.label }))}
-				<Button variant="outline" onClick={() => setSteps(IELTS_STEPS)}>
+            onChange={(e) =>
-					IELTS
+              !e
-				</Button>
+                ? setOtherEntities([])
-				<Button variant="outline" onClick={() => setSteps(TOFEL_STEPS)}>
+                : setOtherEntities(e.map((o) => o.value!))
-					TOFEL iBT
+            }
-				</Button>
+            isMulti
-			</div>
+          />
+          <Button
+            onClick={applyToOtherEntities}
+            isLoading={isLoading}
+            disabled={isLoading || otherEntities.length === 0}
+            variant="outline"
+          >
+            Apply to {otherEntities.length} other entities
+          </Button>
+          <Separator />
+        </>
+      )}
 
-			{steps.map((step, index) => (
+      <label className="font-normal text-base text-mti-gray-dim">
-				<>
+        Preset Systems
-					<div className="flex items-center gap-4">
+      </label>
-						<div className="grid grid-cols-3 gap-4 w-full" key={step.min}>
+      <div className="grid grid-cols-4 gap-4">
-							<Input
+        <Button variant="outline" onClick={() => setSteps(CEFR_STEPS)}>
-								label="Min. Percentage"
+          CEFR
-								value={step.min}
+        </Button>
-								type="number"
+        <Button variant="outline" onClick={() => setSteps(GENERAL_STEPS)}>
-								disabled={index === 0 || isLoading}
+          General English
-								onChange={(e) => setSteps((prev) => prev.map((x, i) => (i === index ? { ...x, min: parseInt(e) } : x)))}
+        </Button>
-								name="min"
+        <Button variant="outline" onClick={() => setSteps(IELTS_STEPS)}>
-							/>
+          IELTS
-							<Input
+        </Button>
-								label="Grade"
+        <Button variant="outline" onClick={() => setSteps(TOFEL_STEPS)}>
-								value={step.label}
+          TOFEL iBT
-								type="text"
+        </Button>
-								disabled={isLoading}
+      </div>
-								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 && (
+      {steps.map((step, index) => (
-						<Button
+        <GradingRowMemo
-							className="w-full flex items-center justify-center"
+          key={index}
-							disabled={isLoading}
+          min={step.min}
-							onClick={() => {
+          max={step.max}
-								const item = { min: steps[index === 0 ? 0 : index - 1].max + 1, max: steps[index + 1].min - 1, label: "" };
+          label={step.label}
-								setSteps((prev) => [...prev.slice(0, index + 1), item, ...prev.slice(index + 1, steps.length)]);
+          index={index}
-							}}>
+          isLoading={isLoading}
-							<BsPlusCircle />
+          isLast={index === steps.length - 1}
-						</Button>
+          setSteps={setSteps}
-					)}
+          addRow={addRow}
-				</>
+        />
-			))}
+      ))}
 
-			<Button onClick={saveGradingSystem} isLoading={isLoading} disabled={isLoading} className="mt-8">
+      <Button
-				Save Grading System
+        onClick={saveGradingSystem}
-			</Button>
+        isLoading={isLoading}
-		</div>
+        disabled={isLoading}
-	);
+        className="mt-8"
+      >
+        Save Grading System
+      </Button>
+    </div>
+  );
 }

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

@@ -1,33 +1,32 @@
-import { useMemo, useState } from "react";
+import {useMemo, useState} from "react";
-import { PERMISSIONS } from "@/constants/userPermissions";
+import {PERMISSIONS} from "@/constants/userPermissions";
 import useExams from "@/hooks/useExams";
 import useUsers from "@/hooks/useUsers";
-import { Module } from "@/interfaces";
+import {Module} from "@/interfaces";
-import { Exam } from "@/interfaces/exam";
+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 {getExamById} from "@/utils/exams";
-import { countExercises } from "@/utils/moduleUtils";
+import {countExercises} from "@/utils/moduleUtils";
-import { createColumnHelper, flexRender, getCoreRowModel, useReactTable } from "@tanstack/react-table";
+import {createColumnHelper, flexRender, getCoreRowModel, useReactTable} from "@tanstack/react-table";
 import axios from "axios";
-import clsx from "clsx";
+import {capitalize, uniq} from "lodash";
-import { capitalize, uniq } from "lodash";
+import {useRouter} from "next/router";
-import { useRouter } from "next/router";
+import {BsBan, BsCheck, BsCircle, BsPencil, BsTrash, BsUpload, BsX} from "react-icons/bs";
-import { BsBan, BsBanFill, BsCheck, BsCircle, BsPencil, BsStop, BsTrash, BsUpload, BsX } from "react-icons/bs";
+import {toast} from "react-toastify";
-import { toast } from "react-toastify";
+import {useListSearch} from "@/hooks/useListSearch";
-import { useListSearch } from "@/hooks/useListSearch";
 import Modal from "@/components/Modal";
-import { checkAccess } from "@/utils/permissions";
+import {checkAccess} from "@/utils/permissions";
 import useGroups from "@/hooks/useGroups";
 import Button from "@/components/Low/Button";
-import { EntityWithRoles } from "@/interfaces/entity";
+import {EntityWithRoles} from "@/interfaces/entity";
-import { FiEdit, FiArrowRight } from 'react-icons/fi';
+import {BiEdit} from "react-icons/bi";
-import { HiArrowRight } from "react-icons/hi";
+import {findBy, mapBy} from "@/utils";
-import { BiEdit } from "react-icons/bi";
+import {getUserName} from "@/utils/users";
 
 const searchFields = [["module"], ["id"], ["createdBy"]];
 
-const CLASSES: { [key in Module]: string } = {
+const CLASSES: {[key in Module]: string} = {
 	reading: "text-ielts-reading",
 	listening: "text-ielts-listening",
 	speaking: "text-ielts-speaking",
@@ -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 }) => {
+export default function ExamList({user, entities}: {user: User; entities: EntityWithRoles[]}) {
-	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[]; }) {
 	const [selectedExam, setSelectedExam] = useState<Exam>();
 
-	const { exams, reload } = useExams();
+	const {exams, reload} = useExams();
-	const { users } = useUsers();
+	const {users} = useUsers();
-	const { groups } = useGroups({ admin: user?.id, userType: user?.type });
 
-	const filteredExams = useMemo(() => exams.filter((e) => {
+	const filteredExams = useMemo(
-		if (!e.private) return true
+		() =>
-		return (e.owners || []).includes(user?.id || "")
+			exams.filter((e) => {
-	}), [exams, user?.id])
+				if (!e.private) return true;
-
+				return (e.entities || []).some((ent) => mapBy(user.entities, "id").includes(ent));
-	const filteredCorporates = useMemo(() => {
+			}),
-		const participantsAndAdmins = uniq(groups.flatMap((x) => [...x.participants, x.admin])).filter((x) => x !== user?.id);
+		[exams, user?.entities],
-		return users.filter((x) => participantsAndAdmins.includes(x.id) && x.type === "corporate");
+	);
-	}, [users, groups, user]);
 
 	const parsedExams = useMemo(() => {
 		return filteredExams.map((exam) => {
@@ -93,7 +67,7 @@ export default function ExamList({ user, entities }: { user: User; entities: Ent
 		});
 	}, [filteredExams, users]);
 
-	const { rows: filteredRows, renderSearch } = useListSearch<Exam>(searchFields, parsedExams);
+	const {rows: filteredRows, renderSearch} = useListSearch<Exam>(searchFields, parsedExams);
 
 	const dispatch = useExamStore((state) => state.dispatch);
 
@@ -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");
 	};
@@ -117,7 +91,7 @@ export default function ExamList({ user, entities }: { user: User; entities: Ent
 		if (!confirm(`Are you sure you want to make this ${capitalize(exam.module)} exam ${exam.private ? "public" : "private"}?`)) return;
 
 		axios
-			.patch(`/api/exam/${exam.module}/${exam.id}`, { private: !exam.private })
+			.patch(`/api/exam/${exam.module}/${exam.id}`, {private: !exam.private})
 			.then(() => toast.success(`Updated the "${exam.id}" exam`))
 			.catch((reason) => {
 				if (reason.response.status === 404) {
@@ -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,12 +173,12 @@ 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: "",
 			id: "actions",
-			cell: ({ row }: { row: { original: Exam } }) => {
+			cell: ({row}: {row: {original: Exam}}) => {
 				return (
 					<div className="flex gap-4">
 						{(row.original.owners?.includes(user.id) || checkAccess(user, ["admin", "developer"])) && (
@@ -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">
+									<p className="font-medium mb-1">Exam ID: {selectedExam.id}</p>
-										Exam ID: {selectedExam.id}
-									</p>
 								</div>
 
-								<p className="text-gray-500 text-sm">
+								<p className="text-gray-500 text-sm">Click &apos;Next&apos; to proceed to the exam editor.</p>
-									Click &apos;Next&apos; to proceed to the exam editor.
-								</p>
 							</div>
 
 							<div className="flex justify-between gap-4 mt-8">
-								<Button
+								<Button color="purple" variant="outline" onClick={() => setSelectedExam(undefined)} className="w-32">
-									color="purple"
-									variant="outline"
-									onClick={() => setSelectedExam(undefined)}
-									className="w-32"
-								>
 									Cancel
 								</Button>
-								<Button
+								<Button color="purple" onClick={handleExamEdit} className="w-32 text-white flex items-center justify-center gap-2">
-									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,426 +29,597 @@ 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", ""]];
 
 export default function UserList({
-	user,
+  user,
-	filters = [],
+  filters = [],
-	type,
+  type,
-	renderHeader,
+  renderHeader,
 }: {
-	user: User;
+  user: User;
-	filters?: ((user: User) => boolean)[];
+  filters?: ((user: User) => boolean)[];
-	type?: Type;
+  type?: Type;
-	renderHeader?: (total: number) => JSX.Element;
+  renderHeader?: (total: number) => JSX.Element;
 }) {
-	const [showDemographicInformation, setShowDemographicInformation] = useState(false);
+  const [showDemographicInformation, setShowDemographicInformation] =
-	const [selectedUser, setSelectedUser] = useState<User>();
+    useState(false);
+  const [selectedUser, setSelectedUser] = useState<User>();
 
-	const { users, reload } = useEntitiesUsers(type)
+  const { users, isLoading, reload } = useEntitiesUsers(type);
-	const { entities } = useEntities()
+  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 entitiesViewStudents = useAllowedEntities(
-	const entitiesEditStudents = useAllowedEntities(user, entities, "edit_students")
+    user,
-	const entitiesDeleteStudents = useAllowedEntities(user, entities, "delete_students")
+    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 entitiesViewTeachers = useAllowedEntities(
-	const entitiesEditTeachers = useAllowedEntities(user, entities, "edit_teachers")
+    user,
-	const entitiesDeleteTeachers = useAllowedEntities(user, entities, "delete_teachers")
+    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 entitiesViewCorporates = useAllowedEntities(
-	const entitiesEditCorporates = useAllowedEntities(user, entities, "edit_corporates")
+    user,
-	const entitiesDeleteCorporates = useAllowedEntities(user, entities, "delete_corporates")
+    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 entitiesViewMasterCorporates = useAllowedEntities(
-	const entitiesEditMasterCorporates = useAllowedEntities(user, entities, "edit_mastercorporates")
+    user,
-	const entitiesDeleteMasterCorporates = useAllowedEntities(user, entities, "delete_mastercorporates")
+    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 appendUserFilters = useFilterStore((state) => state.appendUserFilter);
-	const router = useRouter();
+  const router = useRouter();
 
-	const expirationDateColor = (date: Date) => {
+  const expirationDateColor = (date: Date) => {
-		const momentDate = moment(date);
+    const momentDate = moment(date);
-		const today = moment(new Date());
+    const today = moment(new Date());
 
-		if (today.isAfter(momentDate)) return "!text-mti-red-light  font-bold line-through";
+    if (today.isAfter(momentDate))
-		if (today.add(1, "weeks").isAfter(momentDate)) return "!text-mti-red-light";
+      return "!text-mti-red-light  font-bold line-through";
-		if (today.add(2, "weeks").isAfter(momentDate)) return "!text-mti-rose-light";
+    if (today.add(1, "weeks").isAfter(momentDate)) return "!text-mti-red-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) => {
+  const allowedUsers = useMemo(
-		if (isAdmin) return true
+    () =>
-		if (u.id === user?.id) return false
+      users.filter((u) => {
+        if (isAdmin) return true;
+        if (u.id === user?.id) return false;
 
-		switch (u.type) {
+        switch (u.type) {
-			case "student": return mapBy((u.entities || []), 'id').some((id) => mapBy(entitiesViewStudents, 'id').includes(id))
+          case "student":
-			case "teacher": return mapBy((u.entities || []), 'id').some((id) => mapBy(entitiesViewTeachers, 'id').includes(id))
+            return mapBy(u.entities || [], "id").some((id) =>
-			case 'corporate': return mapBy((u.entities || []), 'id').some((id) => mapBy(entitiesViewCorporates, 'id').includes(id))
+              mapBy(entitiesViewStudents, "id").includes(id)
-			case 'mastercorporate': return mapBy((u.entities || []), 'id').some((id) => mapBy(entitiesViewMasterCorporates, 'id').includes(id))
+            );
-			default: return false
+          case "teacher":
-		}
+            return mapBy(u.entities || [], "id").some((id) =>
-	})
+              mapBy(entitiesViewTeachers, "id").includes(id)
-		, [entitiesViewCorporates, entitiesViewMasterCorporates, entitiesViewStudents, entitiesViewTeachers, isAdmin, user?.id, users])
+            );
+          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,
+    ]
+  );
 
-	const displayUsers = useMemo(() =>
+  const displayUsers = useMemo(
-		filters.length > 0 ? filters.reduce((d, f) => d.filter(f), allowedUsers) : allowedUsers,
+    () =>
-		[filters, allowedUsers])
+      filters.length > 0
+        ? filters.reduce((d, f) => d.filter(f), allowedUsers)
+        : allowedUsers,
+    [filters, allowedUsers]
+  );
 
-	const deleteAccount = (user: User) => {
+  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
+    axios
-			.delete<{ ok: boolean }>(`/api/user?id=${user.id}`)
+      .delete<{ ok: boolean }>(`/api/user?id=${user.id}`)
-			.then(() => {
+      .then(() => {
-				toast.success("User deleted successfully!");
+        toast.success("User deleted successfully!");
-				reload()
+        reload();
-			})
+      })
-			.catch(() => {
+      .catch(() => {
-				toast.error("Something went wrong!", { toastId: "delete-error" });
+        toast.error("Something went wrong!", { toastId: "delete-error" });
-			})
+      })
-			.finally(reload);
+      .finally(reload);
-	};
+  };
 
-	const verifyAccount = (user: User) => {
+  const verifyAccount = (user: User) => {
-		axios
+    axios
-			.post<{ user?: User; ok?: boolean }>(`/api/users/update?id=${user.id}`, {
+      .post<{ user?: User; ok?: boolean }>(`/api/users/update?id=${user.id}`, {
-				...user,
+        ...user,
-				isVerified: true,
+        isVerified: true,
-			})
+      })
-			.then(() => {
+      .then(() => {
-				toast.success("User verified successfully!");
+        toast.success("User verified successfully!");
-				reload();
+        reload();
-			})
+      })
-			.catch(() => {
+      .catch(() => {
-				toast.error("Something went wrong!", { toastId: "update-error" });
+        toast.error("Something went wrong!", { toastId: "update-error" });
-			});
+      });
-	};
+  };
 
-	const toggleDisableAccount = (user: User) => {
+  const toggleDisableAccount = (user: User) => {
-		if (
+    if (
-			!confirm(
+      !confirm(
-				`Are you sure you want to ${user.status === "disabled" ? "enable" : "disable"} ${user.name
+        `Are you sure you want to ${
-				}'s account? This change is usually related to their payment state.`,
+          user.status === "disabled" ? "enable" : "disable"
-			)
+        } ${
-		)
+          user.name
-			return;
+        }'s account? This change is usually related to their payment state.`
+      )
+    )
+      return;
 
-		axios
+    axios
-			.post<{ user?: User; ok?: boolean }>(`/api/users/update?id=${user.id}`, {
+      .post<{ user?: User; ok?: boolean }>(`/api/users/update?id=${user.id}`, {
-				...user,
+        ...user,
-				status: user.status === "disabled" ? "active" : "disabled",
+        status: user.status === "disabled" ? "active" : "disabled",
-			})
+      })
-			.then(() => {
+      .then(() => {
-				toast.success(`User ${user.status === "disabled" ? "enabled" : "disabled"} successfully!`);
+        toast.success(
-				reload();
+          `User ${
-			})
+            user.status === "disabled" ? "enabled" : "disabled"
-			.catch(() => {
+          } successfully!`
-				toast.error("Something went wrong!", { toastId: "update-error" });
+        );
-			});
+        reload();
-	};
+      })
+      .catch(() => {
+        toast.error("Something went wrong!", { toastId: "update-error" });
+      });
+  };
 
-	const getEditPermission = (type: Type) => {
+  const getEditPermission = (type: Type) => {
-		if (type === "student") return entitiesEditStudents
+    if (type === "student") return entitiesEditStudents;
-		if (type === "teacher") return entitiesEditTeachers
+    if (type === "teacher") return entitiesEditTeachers;
-		if (type === "corporate") return entitiesEditCorporates
+    if (type === "corporate") return entitiesEditCorporates;
-		if (type === "mastercorporate") return entitiesEditMasterCorporates
+    if (type === "mastercorporate") return entitiesEditMasterCorporates;
 
-		return []
+    return [];
-	}
+  };
 
-	const getDeletePermission = (type: Type) => {
+  const getDeletePermission = (type: Type) => {
-		if (type === "student") return entitiesDeleteStudents
+    if (type === "student") return entitiesDeleteStudents;
-		if (type === "teacher") return entitiesDeleteTeachers
+    if (type === "teacher") return entitiesDeleteTeachers;
-		if (type === "corporate") return entitiesDeleteCorporates
+    if (type === "corporate") return entitiesDeleteCorporates;
-		if (type === "mastercorporate") return entitiesDeleteMasterCorporates
+    if (type === "mastercorporate") return entitiesDeleteMasterCorporates;
 
-		return []
+    return [];
-	}
+  };
 
-	const canEditUser = (u: User) =>
+  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) =>
+  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 actionColumn = ({ row }: { row: { original: User } }) => {
-		const canEdit = canEditUser(row.original)
+    const canEdit = canEditUser(row.original);
-		const canDelete = canDeleteUser(row.original)
+    const canDelete = canDeleteUser(row.original);
 
-		return (
+    return (
-			<div className="flex gap-4">
+      <div className="flex gap-4">
-				{!row.original.isVerified && canEdit && (
+        {!row.original.isVerified && canEdit && (
-					<div data-tip="Verify User" className="cursor-pointer tooltip" onClick={() => verifyAccount(row.original)}>
+          <div
-						<BsCheck className="hover:text-mti-purple-light transition ease-in-out duration-300" />
+            data-tip="Verify User"
-					</div>
+            className="cursor-pointer tooltip"
-				)}
+            onClick={() => verifyAccount(row.original)}
-				{canEdit && (
+          >
-					<div
+            <BsCheck className="hover:text-mti-purple-light transition ease-in-out duration-300" />
-						data-tip={row.original.status === "disabled" ? "Enable User" : "Disable User"}
+          </div>
-						className="cursor-pointer tooltip"
+        )}
-						onClick={() => toggleDisableAccount(row.original)}>
+        {canEdit && (
-						{row.original.status === "disabled" ? (
+          <div
-							<BsCheckCircle className="hover:text-mti-purple-light transition ease-in-out duration-300" />
+            data-tip={
-						) : (
+              row.original.status === "disabled"
-							<BsFillExclamationOctagonFill className="hover:text-mti-purple-light transition ease-in-out duration-300" />
+                ? "Enable User"
-						)}
+                : "Disable User"
-					</div>
+            }
-				)}
+            className="cursor-pointer tooltip"
-				{canDelete && (
+            onClick={() => toggleDisableAccount(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" />
+            {row.original.status === "disabled" ? (
-					</div>
+              <BsCheckCircle className="hover:text-mti-purple-light transition ease-in-out duration-300" />
-				)}
+            ) : (
-			</div>
+              <BsFillExclamationOctagonFill className="hover:text-mti-purple-light transition ease-in-out duration-300" />
-		);
+            )}
-	};
+          </div>
+        )}
+        {canDelete && (
+          <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>
+        )}
+      </div>
+    );
+  };
 
-	const demographicColumns = [
+  const demographicColumns = [
-		columnHelper.accessor("name", {
+    columnHelper.accessor("name", {
-			header: "Name",
+      header: "Name",
-			cell: ({ row, getValue }) => (
+      cell: ({ row, getValue }) => (
-				<div
+        <div
-					className={clsx(
+          className={clsx(
-						canEditUser(row.original) &&
+            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={() =>
+          onClick={() =>
-						canEditUser(row.original) ? setSelectedUser(row.original) : null
+            canEditUser(row.original) ? setSelectedUser(row.original) : null
-					}>
+          }
-					{getValue()}
+        >
-				</div>
+          {getValue()}
-			),
+        </div>
-		}),
+      ),
-		columnHelper.accessor("demographicInformation.country", {
+    }),
-			header: "Country",
+    columnHelper.accessor("demographicInformation.country", {
-			cell: (info) =>
+      header: "Country",
-				info.getValue()
+      cell: (info) =>
-					? `${countryCodes.findOne("countryCode" as any, info.getValue())?.flag} ${countries[info.getValue() as unknown as keyof TCountries]?.name
+        info.getValue()
-					} (+${countryCodes.findOne("countryCode" as any, info.getValue())?.countryCallingCode})`
+          ? `${
-					: "N/A",
+              countryCodes.findOne("countryCode" as any, info.getValue())?.flag
-		}),
+            } ${
-		columnHelper.accessor("demographicInformation.phone", {
+              countries[info.getValue() as unknown as keyof TCountries]?.name
-			header: "Phone",
+            } (+${
-			cell: (info) => info.getValue() || "N/A",
+              countryCodes.findOne("countryCode" as any, info.getValue())
-			enableSorting: true,
+                ?.countryCallingCode
-		}),
+            })`
-		columnHelper.accessor(
+          : "N/A",
-			(x) =>
+    }),
-				x.type === "corporate" || x.type === "mastercorporate" ? x.demographicInformation?.position : x.demographicInformation?.employment,
+    columnHelper.accessor("demographicInformation.phone", {
-			{
+      header: "Phone",
-				id: "employment",
+      cell: (info) => info.getValue() || "N/A",
-				header: "Employment",
+      enableSorting: true,
-				cell: (info) => (info.row.original.type === "corporate" ? info.getValue() : capitalize(info.getValue())) || "N/A",
+    }),
-				enableSorting: true,
+    columnHelper.accessor(
-			},
+      (x) =>
-		),
+        x.type === "corporate" || x.type === "mastercorporate"
-		columnHelper.accessor("lastLogin", {
+          ? x.demographicInformation?.position
-			header: "Last Login",
+          : x.demographicInformation?.employment,
-			cell: (info) => (!!info.getValue() ? moment(info.getValue()).format("YYYY-MM-DD HH:mm") : "N/A"),
+      {
-		}),
+        id: "employment",
-		columnHelper.accessor("demographicInformation.gender", {
+        header: "Employment",
-			header: "Gender",
+        cell: (info) =>
-			cell: (info) => capitalize(info.getValue()) || "N/A",
+          (info.row.original.type === "corporate"
-			enableSorting: true,
+            ? info.getValue()
-		}),
+            : capitalize(info.getValue())) || "N/A",
-		{
+        enableSorting: true,
-			header: (
+      }
-				<span className="cursor-pointer" onClick={() => setShowDemographicInformation((prev) => !prev)}>
+    ),
-					Switch
+    columnHelper.accessor("lastLogin", {
-				</span>
+      header: "Last Login",
-			),
+      cell: (info) =>
-			id: "actions",
+        !!info.getValue()
-			cell: actionColumn,
+          ? moment(info.getValue()).format("YYYY-MM-DD HH:mm")
-			sortable: false
+          : "N/A",
-		},
+    }),
-	];
+    columnHelper.accessor("demographicInformation.gender", {
+      header: "Gender",
+      cell: (info) => capitalize(info.getValue()) || "N/A",
+      enableSorting: true,
+    }),
+    {
+      header: (
+        <span
+          className="cursor-pointer"
+          onClick={() => setShowDemographicInformation((prev) => !prev)}
+        >
+          Switch
+        </span>
+      ),
+      id: "actions",
+      cell: actionColumn,
+      sortable: false,
+    },
+  ];
 
-	const defaultColumns = [
+  const defaultColumns = [
-		columnHelper.accessor("name", {
+    columnHelper.accessor("name", {
-			header: "Name",
+      header: "Name",
-			cell: ({ row, getValue }) => (
+      cell: ({ row, getValue }) => (
-				<div
+        <div
-					className={clsx(
+          className={clsx(
-						canEditUser(row.original) &&
+            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={() =>
+          onClick={() =>
-						canEditUser(row.original) ? setSelectedUser(row.original) : null
+            canEditUser(row.original) ? setSelectedUser(row.original) : null
-					}>
+          }
-					{getValue()}
+        >
-				</div>
+          {getValue()}
-			),
+        </div>
-		}),
+      ),
-		columnHelper.accessor("email", {
+    }),
-			header: "E-mail",
+    columnHelper.accessor("email", {
-			cell: ({ row, getValue }) => (
+      header: "E-mail",
-				<div
+      cell: ({ row, getValue }) => (
-					className={clsx(
+        <div
-						canEditUser(row.original) &&
+          className={clsx(
-						"underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer",
+            canEditUser(row.original) &&
-					)}
+              "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()}
+          onClick={() =>
-				</div>
+            canEditUser(row.original) ? setSelectedUser(row.original) : null
-			),
+          }
-		}),
+        >
-		columnHelper.accessor("type", {
+          {getValue()}
-			header: "Type",
+        </div>
-			cell: (info) => USER_TYPE_LABELS[info.getValue()],
+      ),
-		}),
+    }),
-		columnHelper.accessor("studentID", {
+    columnHelper.accessor("type", {
-			header: "Student ID",
+      header: "Type",
-			cell: (info) => info.getValue() || "N/A",
+      cell: (info) => USER_TYPE_LABELS[info.getValue()],
-		}),
+    }),
-		columnHelper.accessor("entities", {
+    columnHelper.accessor("studentID", {
-			header: "Entities",
+      header: "Student ID",
-			cell: ({ getValue }) => mapBy(getValue(), 'label').join(', '),
+      cell: (info) => info.getValue() || "N/A",
-		}),
+    }),
-		columnHelper.accessor("subscriptionExpirationDate", {
+    columnHelper.accessor("entities", {
-			header: "Expiration",
+      header: "Entities",
-			cell: (info) => (
+      cell: ({ getValue }) => mapBy(getValue(), "label").join(", "),
-				<span className={clsx(info.getValue() ? expirationDateColor(moment(info.getValue()).toDate()) : "")}>
+    }),
-					{!info.getValue() ? "No expiry date" : moment(info.getValue()).format("DD/MM/YYYY")}
+    columnHelper.accessor("subscriptionExpirationDate", {
-				</span>
+      header: "Expiration",
-			),
+      cell: (info) => (
-		}),
+        <span
-		columnHelper.accessor("isVerified", {
+          className={clsx(
-			header: "Verified",
+            info.getValue()
-			cell: (info) => (
+              ? expirationDateColor(moment(info.getValue()).toDate())
-				<div className="flex gap-3 items-center text-mti-gray-dim text-sm self-center">
+              : ""
-					<div
+          )}
-						className={clsx(
+        >
-							"w-6 h-6 rounded-md flex items-center justify-center border border-mti-purple-light bg-white",
+          {!info.getValue()
-							"transition duration-300 ease-in-out",
+            ? "No expiry date"
-							info.getValue() && "!bg-mti-purple-light ",
+            : moment(info.getValue()).format("DD/MM/YYYY")}
-						)}>
+        </span>
-						<BsCheck color="white" className="w-full h-full" />
+      ),
-					</div>
+    }),
-				</div>
+    columnHelper.accessor("isVerified", {
-			),
+      header: "Verified",
-		}),
+      cell: (info) => (
-		{
+        <div className="flex gap-3 items-center text-mti-gray-dim text-sm self-center">
-			header: (
+          <div
-				<span className="cursor-pointer" onClick={() => setShowDemographicInformation((prev) => !prev)}>
+            className={clsx(
-					Switch
+              "w-6 h-6 rounded-md flex items-center justify-center border border-mti-purple-light bg-white",
-				</span>
+              "transition duration-300 ease-in-out",
-			),
+              info.getValue() && "!bg-mti-purple-light "
-			id: "actions",
+            )}
-			cell: actionColumn,
+          >
-			sortable: false
+            <BsCheck color="white" className="w-full h-full" />
-		},
+          </div>
-	];
+        </div>
+      ),
+    }),
+    {
+      header: (
+        <span
+          className="cursor-pointer"
+          onClick={() => setShowDemographicInformation((prev) => !prev)}
+        >
+          Switch
+        </span>
+      ),
+      id: "actions",
+      cell: actionColumn,
+      sortable: false,
+    },
+  ];
 
-	const downloadExcel = (rows: WithLabeledEntities<User>[]) => {
+  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) =>
-		const csv = exportListToExcel(allowedRows);
+      mapBy(r.entities, "id").some((e) =>
+        mapBy(entitiesDownloadUsers, "id").includes(e)
+      )
+    );
+    const csv = exportListToExcel(allowedRows);
 
-		const element = document.createElement("a");
+    const element = document.createElement("a");
-		const file = new Blob([csv], { type: "text/csv" });
+    const file = new Blob([csv], { type: "text/csv" });
-		element.href = URL.createObjectURL(file);
+    element.href = URL.createObjectURL(file);
-		element.download = "users.csv";
+    element.download = "users.csv";
-		document.body.appendChild(element);
+    document.body.appendChild(element);
-		element.click();
+    element.click();
-		document.body.removeChild(element);
+    document.body.removeChild(element);
-	};
+  };
 
-	const viewStudentFilter = (x: User) => x.type === "student";
+  const viewStudentFilter = (x: User) => x.type === "student";
-	const viewTeacherFilter = (x: User) => x.type === "teacher";
+  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 viewStudentFilterBelongsToAdmin = (x: User) =>
-	const viewTeacherFilterBelongsToAdmin = (x: User) => viewTeacherFilter(x) && belongsToAdminFilter(x);
+    viewStudentFilter(x) && belongsToAdminFilter(x);
+  const viewTeacherFilterBelongsToAdmin = (x: User) =>
+    viewTeacherFilter(x) && belongsToAdminFilter(x);
 
-	const renderUserCard = (selectedUser: User) => {
+  const renderUserCard = (selectedUser: User) => {
-		const studentsFromAdmin = users.filter(viewStudentFilterBelongsToAdmin);
+    const studentsFromAdmin = users.filter(viewStudentFilterBelongsToAdmin);
-		const teachersFromAdmin = users.filter(viewTeacherFilterBelongsToAdmin);
+    const teachersFromAdmin = users.filter(viewTeacherFilterBelongsToAdmin);
-		return (
+    return (
-			<div className="w-full flex flex-col gap-8">
+      <div className="w-full flex flex-col gap-8">
-				<UserCard
+        <UserCard
-					maxUserAmount={0}
+          maxUserAmount={0}
-					loggedInUser={user}
+          loggedInUser={user}
-					onViewStudents={
+          onViewStudents={
-						(selectedUser.type === "corporate" || selectedUser.type === "teacher") && studentsFromAdmin.length > 0
+            (selectedUser.type === "corporate" ||
-							? () => {
+              selectedUser.type === "teacher") &&
-								appendUserFilters({
+            studentsFromAdmin.length > 0
-									id: "view-students",
+              ? () => {
-									filter: viewStudentFilter,
+                  appendUserFilters({
-								});
+                    id: "view-students",
-								appendUserFilters({
+                    filter: viewStudentFilter,
-									id: "belongs-to-admin",
+                  });
-									filter: belongsToAdminFilter,
+                  appendUserFilters({
-								});
+                    id: "belongs-to-admin",
+                    filter: belongsToAdminFilter,
+                  });
 
-								router.push("/users");
+                  router.push("/users");
-							}
+                }
-							: undefined
+              : undefined
-					}
+          }
-					onViewTeachers={
+          onViewTeachers={
-						(selectedUser.type === "corporate" || selectedUser.type === "student") && teachersFromAdmin.length > 0
+            (selectedUser.type === "corporate" ||
-							? () => {
+              selectedUser.type === "student") &&
-								appendUserFilters({
+            teachersFromAdmin.length > 0
-									id: "view-teachers",
+              ? () => {
-									filter: viewTeacherFilter,
+                  appendUserFilters({
-								});
+                    id: "view-teachers",
-								appendUserFilters({
+                    filter: viewTeacherFilter,
-									id: "belongs-to-admin",
+                  });
-									filter: belongsToAdminFilter,
+                  appendUserFilters({
-								});
+                    id: "belongs-to-admin",
+                    filter: belongsToAdminFilter,
+                  });
 
-								router.push("/users");
+                  router.push("/users");
-							}
+                }
-							: undefined
+              : undefined
-					}
+          }
-					onViewCorporate={
+          onViewCorporate={
-						selectedUser.type === "teacher" || selectedUser.type === "student"
+            selectedUser.type === "teacher" || selectedUser.type === "student"
-							? () => {
+              ? () => {
-								appendUserFilters({
+                  appendUserFilters({
-									id: "view-corporate",
+                    id: "view-corporate",
-									filter: (x: User) => x.type === "corporate",
+                    filter: (x: User) => x.type === "corporate",
-								});
+                  });
-								appendUserFilters({
+                  appendUserFilters({
-									id: "belongs-to-admin",
+                    id: "belongs-to-admin",
-									filter: belongsToAdminFilter
+                    filter: belongsToAdminFilter,
-								});
+                  });
 
-								router.push("/users");
+                  router.push("/users");
-							}
+                }
-							: undefined
+              : undefined
-					}
+          }
-					onClose={(shouldReload) => {
+          onClose={(shouldReload) => {
-						setSelectedUser(undefined);
+            setSelectedUser(undefined);
-						if (shouldReload) reload();
+            if (shouldReload) reload();
-					}}
+          }}
-					user={selectedUser}
+          user={selectedUser}
-				/>
+        />
-			</div>
+      </div>
-		);
+    );
-	};
+  };
 
-	return (
+  return (
-		<>
+    <>
-			{renderHeader && renderHeader(displayUsers.length)}
+      {renderHeader && renderHeader(displayUsers.length)}
-			<div className="w-full">
+      <div className="w-full">
-				<Modal isOpen={!!selectedUser} onClose={() => setSelectedUser(undefined)}>
+        <Modal
-					{selectedUser && renderUserCard(selectedUser)}
+          isOpen={!!selectedUser}
-				</Modal>
+          onClose={() => setSelectedUser(undefined)}
-				<Table<WithLabeledEntities<User>>
+        >
-					data={displayUsers}
+          {selectedUser && renderUserCard(selectedUser)}
-					columns={(!showDemographicInformation ? defaultColumns : demographicColumns) as any}
+        </Modal>
-					searchFields={searchFields}
+        <Table<WithLabeledEntities<User>>
-					onDownload={entitiesDownloadUsers.length > 0 ? downloadExcel : undefined}
+          data={displayUsers}
-				/>
+          columns={
-			</div>
+            (!showDemographicInformation
-		</>
+              ? defaultColumns
-	);
+              : demographicColumns) as any
+          }
+          searchFields={searchFields}
+          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";
@@ -24,317 +27,436 @@ import useExamStore from "@/stores/exam";
 import useEvaluationPolling from "@/hooks/useEvaluationPolling";
 
 interface Props {
-	page: "exams" | "exercises";
+  page: "exams" | "exercises";
-	user: User;
+  user: User;
-	destination?: string
+  destination?: string;
-	hideSidebar?: boolean
+  hideSidebar?: boolean;
 }
 
-export default function ExamPage({ page, user, destination = "/", hideSidebar = false }: Props) {
+export default function ExamPage({
-	const router = useRouter();
+  page,
-	const [variant, setVariant] = useState<Variant>("full");
+  user,
-	const [avoidRepeated, setAvoidRepeated] = useState(false);
+  destination = "/",
-	const [showAbandonPopup, setShowAbandonPopup] = useState(false);
+  hideSidebar = false,
-	const [pendingExercises, setPendingExercises] = useState<string[]>([]);
+}: Props) {
+  const router = useRouter();
+  const [variant, setVariant] = useState<Variant>("full");
+  const [avoidRepeated, setAvoidRepeated] = useState(false);
+  const [showAbandonPopup, setShowAbandonPopup] = useState(false);
+  const [moduleLock, setModuleLock] = useState(false);
 
-	const {
+  const {
-		exam, setExam,
+    exam,
-		exams,
+    setExam,
-		sessionId, setSessionId, setPartIndex,
+    exams,
-		moduleIndex, setModuleIndex,
+    sessionId,
-		setQuestionIndex, setExerciseIndex,
+    setSessionId,
-		userSolutions, setUserSolutions,
+    setPartIndex,
-		showSolutions, setShowSolutions,
+    moduleIndex,
-		selectedModules, setSelectedModules,
+    setModuleIndex,
-		setUser,
+    setQuestionIndex,
-		inactivity,
+    setExerciseIndex,
-		timeSpent,
+    userSolutions,
-		assignment,
+    setUserSolutions,
-		bgColor,
+    showSolutions,
-		flags,
+    setShowSolutions,
-		dispatch,
+    selectedModules,
-		reset: resetStore,
+    setSelectedModules,
-		saveStats,
+    setUser,
-		saveSession,
+    inactivity,
-		setFlags,
+    timeSpent,
-		setShuffles,
+    assignment,
-		evaluated,
+    bgColor,
-	} = useExamStore();
+    flags,
+    dispatch,
+    reset: resetStore,
+    saveStats,
+    saveSession,
+    setFlags,
+    setShuffles,
+  } = useExamStore();
 
-	const [isFetchingExams, setIsFetchingExams] = useState(false);
+  const [isFetchingExams, setIsFetchingExams] = useState(false);
-	const [isExamLoaded, setIsExamLoaded] = useState(moduleIndex < selectedModules.length);
+  const [isExamLoaded, setIsExamLoaded] = useState(
+    moduleIndex < selectedModules.length
+  );
 
-	useEffect(() => {
+  useEffect(() => {
-		setIsExamLoaded(moduleIndex < selectedModules.length);
+    setIsExamLoaded(moduleIndex < selectedModules.length);
-	}, [showSolutions, moduleIndex, selectedModules]);
+  }, [showSolutions, moduleIndex, selectedModules]);
 
-	useEffect(() => {
+  useEffect(() => {
-		if (!showSolutions && sessionId.length === 0 && user?.id) {
+    if (!showSolutions && sessionId.length === 0 && user?.id) {
-			const shortUID = new ShortUniqueId();
+      const shortUID = new ShortUniqueId();
-			setUser(user.id);
+      setUser(user.id);
-			setSessionId(shortUID.randomUUID(8));
+      setSessionId(shortUID.randomUUID(8));
-		}
+    }
-	}, [setSessionId, isExamLoaded, sessionId, showSolutions, setUser, user?.id]);
+  }, [setSessionId, isExamLoaded, sessionId, showSolutions, setUser, user?.id]);
 
-	useEffect(() => {
+  useEffect(() => {
-		if (user?.type === "developer") console.log(exam);
+    if (user?.type === "developer") console.log(exam);
-	}, [exam, user]);
+  }, [exam, user]);
 
-	useEffect(() => {
+  useEffect(() => {
-		(async () => {
+    (async () => {
-			if (selectedModules.length > 0 && exams.length === 0) {
+      if (selectedModules.length > 0 && exams.length === 0) {
-				setIsFetchingExams(true);
+        setIsFetchingExams(true);
-				const examPromises = selectedModules.map((module) =>
+        const examPromises = selectedModules.map((module) =>
-					getExam(
+          getExam(
-						module,
+            module,
-						avoidRepeated,
+            avoidRepeated,
-						variant,
+            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)) {
+        Promise.all(examPromises).then((values) => {
-						dispatch({ type: 'INIT_EXAM', payload: { exams: values.map((x) => x!), modules: selectedModules } })
+          setIsFetchingExams(false);
-					} else {
+          if (values.every((x) => !!x)) {
-						toast.error("Something went wrong, please try again");
+            dispatch({
-						setTimeout(router.reload, 500);
+              type: "INIT_EXAM",
-					}
+              payload: {
-				});
+                exams: values.map((x) => x!),
-			}
+                modules: selectedModules,
-		})();
+              },
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+            });
-	}, [selectedModules, exams]);
+          } else {
+            toast.error("Something went wrong, please try again");
+            setTimeout(router.reload, 500);
+          }
+        });
+      }
+    })();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [selectedModules, exams]);
 
+  const reset = () => {
+    resetStore();
+    setVariant("full");
+    setAvoidRepeated(false);
+    setShowAbandonPopup(false);
+  };
 
-	const reset = () => {
+  useEvaluationPolling(sessionId ? [sessionId] : [], "exam", user?.id);
-		resetStore();
-		setVariant("full");
-		setAvoidRepeated(false);
-		setShowAbandonPopup(false);
-	};
 
-	useEffect(() => {
+  useEffect(() => {
-		if (flags.finalizeModule && !showSolutions && flags.pendingEvaluation) {
+    setModuleLock(true);
-			if (exam && (exam.module === "writing" || exam.module === "speaking") && userSolutions.length > 0 && !showSolutions) {
+  }, [flags.finalizeModule]);
-				const exercisesToEvaluate = exam.exercises
-					.map(exercise => exercise.id);
 
-				setPendingExercises(exercisesToEvaluate);
+  useEffect(() => {
-				(async () => {
+    if (flags.finalizeModule && !showSolutions) {
-					await Promise.all(
+      if (
-						exam.exercises.map(async (exercise, index) => {
+        exam &&
-							if (exercise.type === "writing")
+        (exam.module === "writing" || exam.module === "speaking") &&
-								await evaluateWritingAnswer(user.id, sessionId, exercise, index + 1, userSolutions.find((x) => x.exercise === exercise.id)!, exercise.attachment?.url);
+        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,
+                    userSolutions.find((x) => x.exercise === exercise.id)!,
+                    exercise.attachment?.url
+                  );
+                  return sol;
+                }
+                if (
+                  exercise.type === "interactiveSpeaking" ||
+                  exercise.type === "speaking"
+                ) {
+                  const sol = await evaluateSpeakingAnswer(
+                    user.id,
+                    sessionId,
+                    exercise,
+                    userSolutions.find((x) => x.exercise === exercise.id)!,
+                    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);
+              return completed || solution;
+            });
+            setUserSolutions(updatedSolutions);
+          } catch (error) {
+            console.error("Error during module evaluation:", error);
+          } finally {
+            setModuleLock(false);
+          }
+        })();
+      } else {
+        setModuleLock(false);
+      }
+    }
+  }, [
+    exam,
+    showSolutions,
+    userSolutions,
+    sessionId,
+    user.id,
+    flags.finalizeModule,
+    setUserSolutions,
+  ]);
 
-							if (exercise.type === "interactiveSpeaking" || exercise.type === "speaking") {
+  useEffect(() => {
-								await evaluateSpeakingAnswer(
+    if (flags.finalizeExam && moduleIndex !== -1 && !moduleLock) {
-									user.id,
+      (async () => {
-									sessionId,
+        setModuleIndex(-1);
-									exercise,
+        await saveStats();
-									userSolutions.find((x) => x.exercise === exercise.id)!,
+        await axios.get("/api/stats/update");
-									index + 1,
+      })();
-								);
+    }
-							}
+  }, [
-						}),
+    flags.finalizeExam,
-					)
+    moduleIndex,
-				})();
+    saveStats,
-			}
+    setModuleIndex,
-		}
+    userSolutions,
-	}, [exam, showSolutions, userSolutions, sessionId, user?.id, flags]);
+    moduleLock,
+    flags.finalizeModule,
+  ]);
 
-	useEvaluationPolling({ pendingExercises, setPendingExercises });
+  useEffect(() => {
+    if (
+      flags.finalizeExam &&
+      !userSolutions.some((s) => s.isDisabled) &&
+      !moduleLock
+    ) {
+      setShowSolutions(true);
+      setFlags({ finalizeExam: false });
+      dispatch({ type: "UPDATE_EXAMS" });
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [flags.finalizeExam, userSolutions, showSolutions, moduleLock]);
 
-	useEffect(() => {
+  const aggregateScoresByModule = (
-		if (flags.finalizeExam && moduleIndex !== -1) {
+    isPractice?: boolean
-			setModuleIndex(-1);
+  ): {
+    module: Module;
+    total: number;
+    missing: number;
+    correct: number;
+  }[] => {
+    const scores: {
+      [key in Module]: { total: number; missing: number; correct: number };
+    } = {
+      reading: {
+        total: 0,
+        correct: 0,
+        missing: 0,
+      },
+      listening: {
+        total: 0,
+        correct: 0,
+        missing: 0,
+      },
+      writing: {
+        total: 0,
+        correct: 0,
+        missing: 0,
+      },
+      speaking: {
+        total: 0,
+        correct: 0,
+        missing: 0,
+      },
+      level: {
+        total: 0,
+        correct: 0,
+        missing: 0,
+      },
+    };
 
+    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);
 
-		}
+        scores[examModule!] = {
-	}, [flags.finalizeExam, moduleIndex, setModuleIndex]);
+          total: scores[examModule!].total + x.score.total,
+          correct: scores[examModule!].correct + x.score.correct,
+          missing: scores[examModule!].missing + x.score.missing,
+        };
+      }
+    });
 
-	useEffect(() => {
+    return Object.keys(scores).reduce<
-		if (flags.finalizeExam && !flags.pendingEvaluation && pendingExercises.length === 0) {
+      { module: Module; total: number; missing: number; correct: number }[]
-			(async () => {
+    >((accm, x) => {
-				if (evaluated.length !== 0) {
+      if (scores[x as Module].total > 0)
-					setUserSolutions(
+        accm.push({ module: x as Module, ...scores[x as Module] });
-						userSolutions.map(solution => {
+      return accm;
-							const evaluatedSolution = evaluated.find(e => e.exercise === solution.exercise);
+    }, []);
-							if (evaluatedSolution) {
+  };
-								return { ...solution, ...evaluatedSolution };
-							}
-							return solution;
-						})
-					);
-				}
-				await saveStats();
-				await axios.get("/api/stats/update");
-				setShowSolutions(true);
-				setFlags({ finalizeExam: false });
-				dispatch({ type: "UPDATE_EXAMS" })
-			})();
-		}
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [saveStats, setFlags, setModuleIndex, evaluated, pendingExercises, setUserSolutions, flags]);
 
+  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>>,
+  };
 
-	const aggregateScoresByModule = (isPractice?: boolean): {
+  const CurrentExam = exam?.module ? ModuleExamMap[exam.module] : undefined;
-		module: Module;
-		total: number;
-		missing: number;
-		correct: number;
-	}[] => {
-		const scores: {
-			[key in Module]: { total: number; missing: number; correct: number };
-		} = {
-			reading: {
-				total: 0,
-				correct: 0,
-				missing: 0,
-			},
-			listening: {
-				total: 0,
-				correct: 0,
-				missing: 0,
-			},
-			writing: {
-				total: 0,
-				correct: 0,
-				missing: 0,
-			},
-			speaking: {
-				total: 0,
-				correct: 0,
-				missing: 0,
-			},
-			level: {
-				total: 0,
-				correct: 0,
-				missing: 0,
-			},
-		};
 
-		userSolutions.filter(x => isPractice ? x.isPractice : !x.isPractice).forEach((x) => {
+  const onAbandon = async () => {
-			const examModule =
+    await saveSession();
-				x.module || (x.type === "writing" ? "writing" : x.type === "speaking" || x.type === "interactiveSpeaking" ? "speaking" : undefined);
+    reset();
+  };
 
-			scores[examModule!] = {
+  const {
-				total: scores[examModule!].total + x.score.total,
+    setBgColor,
-				correct: scores[examModule!].correct + x.score.correct,
+    setHideSidebar,
-				missing: scores[examModule!].missing + x.score.missing,
+    setFocusMode,
-			};
+    setOnFocusLayerMouseEnter,
-		});
+  } = React.useContext(LayoutContext);
 
-		return Object.keys(scores)
+  useEffect(() => {
-			.filter((x) => scores[x as Module].total > 0)
+    setOnFocusLayerMouseEnter(() => () => setShowAbandonPopup(true));
-			.map((x) => ({ module: x as Module, ...scores[x as Module] }));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
-	};
+  }, []);
 
-	const ModuleExamMap: Record<Module, React.ComponentType<ExamProps<Exam>>> = {
+  useEffect(() => {
-		"reading": Reading as React.ComponentType<ExamProps<Exam>>,
+    setBgColor(bgColor);
-		"listening": Listening as React.ComponentType<ExamProps<Exam>>,
+    setHideSidebar(hideSidebar);
-		"writing": Writing as React.ComponentType<ExamProps<Exam>>,
+    setFocusMode(
-		"speaking": Speaking as React.ComponentType<ExamProps<Exam>>,
+      selectedModules.length !== 0 &&
-		"level": Level as React.ComponentType<ExamProps<Exam>>,
+        !showSolutions &&
-	}
+        moduleIndex < selectedModules.length
+    );
+  }, [
+    bgColor,
+    hideSidebar,
+    moduleIndex,
+    selectedModules.length,
+    setBgColor,
+    setFocusMode,
+    setHideSidebar,
+    showSolutions,
+  ]);
 
-	const CurrentExam = exam?.module ? ModuleExamMap[exam.module] : undefined;
+  return (
-
+    <>
-	const onAbandon = async () => {
+      <ToastContainer />
-		await saveSession();
+      {user && (
-		reset();
+        <>
-	};
+          {/* Modules weren't yet set by an INIT_EXAM or INIT_SOLUTIONS dispatch, show Selection component*/}
-
+          {selectedModules.length === 0 && (
-	return (
+            <Selection
-		<>
+              page={page}
-			<ToastContainer />
+              user={user!}
-			{user && (
+              onStart={(
-				<Layout
+                modules: Module[],
-					user={user}
+                avoid: boolean,
-					bgColor={bgColor}
+                variant: Variant
-					hideSidebar={hideSidebar}
+              ) => {
-					className="justify-between"
+                setModuleIndex(0);
-					focusMode={selectedModules.length !== 0 && !showSolutions && moduleIndex < selectedModules.length}
+                setAvoidRepeated(avoid);
-					onFocusLayerMouseEnter={() => setShowAbandonPopup(true)}>
+                setSelectedModules(modules);
-					<>
+                setVariant(variant);
-						{/* Modules weren't yet set by an INIT_EXAM or INIT_SOLUTIONS dispatch, show Selection component*/}
+              }}
-						{selectedModules.length === 0 && <Selection
+            />
-							page={page}
+          )}
-							user={user!}
+          {isFetchingExams && (
-							onStart={(modules: Module[], avoid: boolean, variant: Variant) => {
+            <div className="flex flex-grow flex-col items-center justify-center animate-pulse">
-								setModuleIndex(0);
+              <span
-								setAvoidRepeated(avoid);
+                className={`loading loading-infinity w-32 bg-ielts-${selectedModules[0]}`}
-								setSelectedModules(modules);
+              />
-								setVariant(variant);
+              <span
-							}}
+                className={`font-bold text-2xl text-ielts-${selectedModules[0]}`}
-						/>}
+              >
-						{isFetchingExams && (
+                Loading Exam ...
-							<div className="flex flex-grow flex-col items-center justify-center animate-pulse">
+              </span>
-								<span className={`loading loading-infinity w-32 bg-ielts-${selectedModules[0]}`} />
+            </div>
-								<span className={`font-bold text-2xl text-ielts-${selectedModules[0]}`}>Loading Exam ...</span>
+          )}
-							</div>
+          {moduleIndex === -1 && selectedModules.length !== 0 && (
-						)}
+            <Finish
-						{(moduleIndex === -1 && selectedModules.length !== 0) &&
+              isLoading={userSolutions.some((s) => s.isDisabled)}
-							<Finish
+              user={user!}
-								isLoading={flags.pendingEvaluation}
+              modules={selectedModules}
-								user={user!}
+              solutions={userSolutions}
-								modules={selectedModules}
+              assignment={assignment}
-								solutions={userSolutions}
+              information={{
-								assignment={assignment}
+                timeSpent,
-								information={{
+                inactivity,
-									timeSpent,
+              }}
-									inactivity,
+              destination={destination}
-								}}
+              onViewResults={(index?: number) => {
-								destination={destination}
+                if (exams[0].module === "level") {
-								onViewResults={(index?: number) => {
+                  const levelExam = exams[0] as LevelExam;
-									if (exams[0].module === "level") {
+                  const allExercises = levelExam.parts.flatMap(
-										const levelExam = exams[0] as LevelExam;
+                    (part) => part.exercises
-										const allExercises = levelExam.parts.flatMap((part) => part.exercises);
+                  );
-										const exerciseOrderMap = new Map(allExercises.map((ex, index) => [ex.id, index]));
+                  const exerciseOrderMap = new Map(
-										const orderedSolutions = userSolutions.slice().sort((a, b) => {
+                    allExercises.map((ex, index) => [ex.id, index])
-											const indexA = exerciseOrderMap.get(a.exercise) ?? Infinity;
+                  );
-											const indexB = exerciseOrderMap.get(b.exercise) ?? Infinity;
+                  const orderedSolutions = userSolutions
-											return indexA - indexB;
+                    .slice()
-										});
+                    .sort((a, b) => {
-										setUserSolutions(orderedSolutions);
+                      const indexA =
-									} else {
+                        exerciseOrderMap.get(a.exercise) ?? Infinity;
-										setUserSolutions(userSolutions);
+                      const indexB =
-									}
+                        exerciseOrderMap.get(b.exercise) ?? Infinity;
-									setShuffles([]);
+                      return indexA - indexB;
-									if (index === undefined) {
+                    });
-										setFlags({ reviewAll: true });
+                  setUserSolutions(orderedSolutions);
-										setModuleIndex(0);
+                } else {
-										setExam(exams[0]);
+                  setUserSolutions(userSolutions);
-									} else {
+                }
-										setModuleIndex(index);
+                setShuffles([]);
-										setExam(exams[index]);
+                if (index === undefined) {
-									}
+                  setFlags({ reviewAll: true });
-									setShowSolutions(true);
+                  setModuleIndex(0);
-									setQuestionIndex(0);
+                  setExam(exams[0]);
-									setExerciseIndex(0);
+                } else {
-									setPartIndex(0);
+                  setModuleIndex(index);
-								}}
+                  setExam(exams[index]);
-								scores={aggregateScoresByModule()}
+                }
-								practiceScores={aggregateScoresByModule(true)}
+                setShowSolutions(true);
-							/>}
+                setQuestionIndex(0);
-						{/* Exam is on going, display it and the abandon modal */}
+                setExerciseIndex(0);
-						{isExamLoaded && moduleIndex !== -1 && (
+                setPartIndex(0);
-							<>
+              }}
-								{exam && CurrentExam && <CurrentExam exam={exam} showSolutions={showSolutions} />}
+              scores={aggregateScoresByModule()}
-								{!showSolutions && <AbandonPopup
+              practiceScores={aggregateScoresByModule(true)}
-									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."
+          {/* Exam is on going, display it and the abandon modal */}
-									abandonConfirmButtonText="Confirm"
+          {isExamLoaded && moduleIndex !== -1 && (
-									onAbandon={onAbandon}
+            <>
-									onCancel={() => setShowAbandonPopup(false)}
+              {exam && CurrentExam && (
-								/>
+                <CurrentExam exam={exam} showSolutions={showSolutions} />
-								}
+              )}
-							</>
+              {!showSolutions && (
-						)}
+                <AbandonPopup
-					</>
+                  isOpen={showAbandonPopup}
-				</Layout>
+                  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."
-		</>
+                  abandonConfirmButtonText="Confirm"
-	);
+                  onAbandon={onAbandon}
+                  onCancel={() => setShowAbandonPopup(false)}
+                />
+              )}
+            </>
+          )}
+        </>
+      )}
+    </>
+  );
 }

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

src/pages/_app.tsx

@@ -1,35 +1,74 @@
 import "@/styles/globals.css";
 import "react-toastify/dist/ReactToastify.css";
-import type {AppProps} from "next/app";
+import type { AppProps } from "next/app";
 
 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 { Router, useRouter } from "next/router";
-import {useEffect} from "react";
+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);
 
-export default function App({Component, pageProps}: AppProps) {
+  const { reset } = useExamStore();
-	const {reset} = useExamStore();
-	const setIsSidebarMinimized = usePreferencesStore((state) => state.setSidebarMinimized);
 
-	const router = useRouter();
+  const setIsSidebarMinimized = usePreferencesStore(
+    (state) => state.setSidebarMinimized
+  );
 
-	useEffect(() => {
+  const router = useRouter();
-		if (router.pathname !== "/exam" && router.pathname !== "/exercises") reset();
-	}, [router.pathname, reset]);
 
-	useEffect(() => {
+  const { entities } = useEntities(!pageProps?.user?.id);
-		if (localStorage.getItem("isSidebarMinimized")) {
-			if (localStorage.getItem("isSidebarMinimized") === "true") {
-				setIsSidebarMinimized(true);
-			} else {
-				setIsSidebarMinimized(false);
-			}
-		}
-	}, [setIsSidebarMinimized]);
 
-	return <Component {...pageProps} />;
+  useEffect(() => {
+    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(() => {
+    if (localStorage.getItem("isSidebarMinimized")) {
+      if (localStorage.getItem("isSidebarMinimized") === "true") {
+        setIsSidebarMinimized(true);
+      } else {
+        setIsSidebarMinimized(false);
+      }
+    }
+  }, [setIsSidebarMinimized]);
+
+  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/evaluate/fetchSolutions.ts

@@ -4,21 +4,71 @@ import { withIronSessionApiRoute } from "iron-session/next";
 import { sessionOptions } from "@/lib/session";
 import { UserSolution } from "@/interfaces/exam";
 import { speakingReverseMarking, writingReverseMarking } from "@/utils/score";
+import { Stat } from "@/interfaces/user";
 
 const db = client.db(process.env.MONGODB_DB);
 
 export default withIronSessionApiRoute(handler, sessionOptions);
 
 async function handler(req: NextApiRequest, res: NextApiResponse) {
-    if (req.method === "POST") return post(req, res);
-}
-
-async function post(req: NextApiRequest, res: NextApiResponse) {
     if (!req.session.user) {
         res.status(401).json({ ok: false });
         return;
     }
-    const { sessionId, userId, userSolutions } = req.body;
+    try {
+        return await getSessionEvals(req, res);
+    } catch (error) {
+        console.error(error);
+        res.status(500).json({ ok: false });
+    }
+}
+
+function formatSolutionWithEval(userSolution: UserSolution | Stat, evaluation: any) {
+    if (userSolution.type === 'writing') {
+        return {
+            ...userSolution,
+            solutions: [{
+                ...userSolution.solutions[0],
+                evaluation: evaluation.result
+            }],
+            score: {
+                correct: writingReverseMarking[evaluation.result.overall],
+                total: 100,
+                missing: 0
+            },
+            isDisabled: false
+        };
+    }
+
+    if (userSolution.type === 'speaking' || userSolution.type === 'interactiveSpeaking') {
+        return {
+            ...userSolution,
+            solutions: [{
+                ...userSolution.solutions[0],
+                ...(
+                    userSolution.type === 'speaking'
+                        ? { fullPath: evaluation.result.fullPath }
+                        : { answer: evaluation.result.answer }
+                ),
+                evaluation: evaluation.result
+            }],
+            score: {
+                correct: speakingReverseMarking[evaluation.result.overall || 0] || 0,
+                total: 100,
+                missing: 0
+            },
+            isDisabled: false
+        };
+    }
+
+    return {
+        solution: userSolution,
+        evaluation
+    };
+}
+
+async function getSessionEvals(req: NextApiRequest, res: NextApiResponse) {
+    const { sessionId, userId, stats } = req.body;
     const completedEvals = await db.collection("evaluation").find({
         session_id: sessionId,
         user: userId,
@@ -29,52 +79,11 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
         completedEvals.map(e => [e.exercise_id, e])
     );
 
-    const solutionsWithEvals = userSolutions.filter((solution: UserSolution) =>
+    const statsWithEvals = stats
-        evalsByExercise.has(solution.exercise)
+        .filter((solution: UserSolution | Stat) => evalsByExercise.has(solution.exercise))
-    ).map((solution: any) => {
+        .map((solution: UserSolution | Stat) =>
-        const evaluation = evalsByExercise.get(solution.exercise)!;
+            formatSolutionWithEval(solution, evalsByExercise.get(solution.exercise)!)
+        );
 
-        if (solution.type === 'writing') {
+    res.status(200).json(statsWithEvals);
-            return {
-                ...solution,
-                solutions: [{
-                    ...solution.solutions[0],
-                    evaluation: evaluation.result
-                }],
-                score: {
-                    correct: writingReverseMarking[evaluation.result.overall],
-                    total: 100,
-                    missing: 0
-                },
-                isDisabled: false
-            };
-        }
-
-        if (solution.type === 'speaking' || solution.type === 'interactiveSpeaking') {
-            return {
-                ...solution,
-                solutions: [{
-                    ...solution.solutions[0],
-                    ...(
-                        solution.type === 'speaking'
-                            ? { fullPath: evaluation.result.fullPath }
-                            : { answer: evaluation.result.answer }
-                    ),
-                    evaluation: evaluation.result
-                }],
-                score: {
-                    correct: speakingReverseMarking[evaluation.result.overall || 0] || 0,
-                    total: 100,
-                    missing: 0
-                },
-                isDisabled: false
-            };
-        }
-        return {
-            solution,
-            evaluation
-        };
-    });
-
-    res.status(200).json(solutionsWithEvals)
 }

src/pages/api/evaluate/status.ts

@@ -11,19 +11,100 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
     if (req.method === "GET") return get(req, res);
 }
 
+type Query = {
+    op: string;
+    sessionId: string;
+    userId: string;
+}
+
 async function get(req: NextApiRequest, res: NextApiResponse) {
     if (!req.session.user) {
-        res.status(401).json({ ok: false });
+        return res.status(401).json({ ok: false });
-        return;
     }
 
-    const { sessionId, userId } = req.query;
+    const { sessionId, userId, op } = req.query as Query;
 
+    switch (op) {
+        case 'pending':
+            return getPendingEvaluation(userId, sessionId, res);
+        case 'disabled':
+            return getSessionsWIthDisabledWithPending(userId, res);
+        default:
+            return res.status(400).json({
+                ok: false,
+            });
+    }
+}
+
+async function getPendingEvaluation(
+    userId: string,
+    sessionId: string,
+    res: NextApiResponse
+) {
     const singleEval = await db.collection("evaluation").findOne({
         session_id: sessionId,
         user: userId,
         status: "pending",
     });
-
+    return res.status(200).json({ hasPendingEvaluation: singleEval !== null });
-    res.status(200).json({ hasPendingEvaluation: singleEval !== null});
+}
+
+async function getSessionsWIthDisabledWithPending(
+    userId: string,
+    res: NextApiResponse
+) {
+    const sessions = await db.collection("stats")
+        .aggregate([
+            {
+                $match: {
+                    user: userId,
+                    disabled: true
+                }
+            },
+            {
+                $project: {
+                    _id: 0,
+                    session: 1
+                }
+            },
+            {
+                $lookup: {
+                    from: "evaluation",
+                    let: { sessionId: "$session" },
+                    pipeline: [
+                        {
+                            $match: {
+                                $expr: {
+                                    $and: [
+                                        { $eq: ["$session", "$$sessionId"] },
+                                        { $eq: ["$user", userId] },
+                                        { $eq: ["$status", "pending"] }
+                                    ]
+                                }
+                            }
+                        },
+                        {
+                            $project: {
+                                _id: 1
+                            }
+                        }
+                    ],
+                    as: "pendingEvals"
+                }
+            },
+            {
+                $match: {
+                    "pendingEvals.0": { $exists: true }
+                }
+            },
+            {
+                $group: {
+                    id: "$session"
+                }
+            }
+        ]).toArray();
+
+    return res.status(200).json({
+        sessions: sessions.map(s => s.id)
+    });
 }

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 { Exam, ExamBase, InstructorGender, Variant } from "@/interfaces/exam";
-import { requestUser } from "@/utils/api";
+import { createApprovalWorkflowsOnExamCreation } from "@/lib/createWorkflowsOnExamCreation";
-import { isAdmin } from "@/utils/users";
+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(responseStatus).json({
+				message: responseMessage,
+			});
 		});
-
-		res.status(200).json(exam);
-
 	} catch (error) {
 		console.error("Transaction failed: ", error);
 		res.status(500).json({ ok: false, error: (error as any).message });

src/pages/api/stats/disabled.ts

@@ -3,37 +3,41 @@ import type { NextApiRequest, NextApiResponse } from "next";
 import client from "@/lib/mongodb";
 import { withIronSessionApiRoute } from "iron-session/next";
 import { sessionOptions } from "@/lib/session";
-import { Stat } from "@/interfaces/user";
 import { requestUser } from "@/utils/api";
 import { UserSolution } from "@/interfaces/exam";
+import { WithId } from "mongodb";
 
 const db = client.db(process.env.MONGODB_DB);
 
 export default withIronSessionApiRoute(handler, sessionOptions);
 
 async function handler(req: NextApiRequest, res: NextApiResponse) {
-    if (req.method === "POST") return post(req, res);
-}
-
-interface Body {
-    solutions: UserSolution[];
-    sessionID: string;
-}
-
-async function post(req: NextApiRequest, res: NextApiResponse) {
     const user = await requestUser(req, res)
     if (!user) return res.status(401).json({ ok: false });
 
-    const { solutions, sessionID } = req.body as Body;
+    if (req.method === "POST") return post(req, res);
+}
 
-    const disabledStats = await db.collection("stats").find({ user: user.id, session: sessionID, disabled: true }).toArray();
+
+interface Body {
+    solutions: UserSolution[];
+    sessionId: string;
+    userId: string;
+}
+
+async function post(req: NextApiRequest, res: NextApiResponse) {
+    const { userId, solutions, sessionId } = req.body as Body;
+    const disabledStats = await db.collection("stats").find(
+        { user: userId, session: sessionId, isDisabled: true }
+    ).toArray();
 
     await Promise.all(disabledStats.map(async (stat) => {
         const matchingSolution = solutions.find(s => s.exercise === stat.exercise);
         if (matchingSolution) {
+            const { _id, ...updateFields } = matchingSolution as WithId<UserSolution>;
             await db.collection("stats").updateOne(
                 { id: stat.id },
-                { $set: { ...matchingSolution } }
+                { $set: { ...updateFields } }
             );
         }
     }));

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

@@ -0,0 +1,21 @@
+// 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";
+
+const db = client.db(process.env.MONGODB_DB);
+
+export default withIronSessionApiRoute(handler, sessionOptions);
+
+async function handler(req: NextApiRequest, res: NextApiResponse) {
+	if (!req.session.user) {
+		res.status(401).json({ok: false});
+		return;
+	}
+
+	const {session} = req.query;
+	const snapshot = await db.collection("stats").find({ user: req.session.user.id, session }).toArray();
+
+	res.status(200).json(snapshot);
+}

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

@@ -1,24 +1,20 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
-import type {NextApiRequest, NextApiResponse} from "next";
+import type { NextApiRequest, NextApiResponse } from "next";
-import client from "@/lib/mongodb";
+import { withIronSessionApiRoute } from "iron-session/next";
-import {withIronSessionApiRoute} from "iron-session/next";
+import { sessionOptions } from "@/lib/session";
-import {sessionOptions} from "@/lib/session";
+import { getDetailedStatsByUser } from "../../../../utils/stats.be";
 
-const db = client.db(process.env.MONGODB_DB);
 
 export default withIronSessionApiRoute(handler, sessionOptions);
 
 async function handler(req: NextApiRequest, res: NextApiResponse) {
 	if (!req.session.user) {
-		res.status(401).json({ok: false});
+		res.status(401).json({ ok: false });
 		return;
 	}
 
-	const {user} = req.query;
+	const { user, query } = req.query as { user: string, query?: string };
-	const snapshot = await db.collection("stats").aggregate([
-		{ $match: { user: user } },
-		{ $sort: { "date": 1 } }
-	  ]).toArray();
 
+	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/index.tsx

@@ -1,229 +1,336 @@
-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 {
-	activeAssignmentFilter,
+  activeAssignmentFilter,
-	archivedAssignmentFilter,
+  archivedAssignmentFilter,
-	futureAssignmentFilter,
+  futureAssignmentFilter,
-	pastAssignmentFilter,
+  pastAssignmentFilter,
-	startHasExpiredAssignmentFilter,
+  startHasExpiredAssignmentFilter,
 } 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)
+  const user = await requestUser(req, res);
-	if (!user) return redirect("/login")
+  if (!user) return redirect("/login");
 
-	if (!checkAccess(user, ["admin", "developer", "corporate", "teacher", "mastercorporate"]))
+  if (
-		return redirect("/")
+    !checkAccess(user, [
+      "admin",
+      "developer",
+      "corporate",
+      "teacher",
+      "mastercorporate",
+    ])
+  )
+    return redirect("/");
+  const isAdmin = checkAccess(user, ["developer", "admin"]);
+  const entityIDS = mapBy(user.entities, "id") || [];
+  const entities = await (isAdmin
+    ? getEntitiesWithRoles()
+    : getEntitiesWithRoles(entityIDS));
 
-	const entityIDS = mapBy(user.entities, "id") || [];
+  const allowedEntities = findAllowedEntities(
-	const entities = await (checkAccess(user, ["developer", "admin"]) ? getEntitiesWithRoles() : getEntitiesWithRoles(entityIDS));
+    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 allowedEntities = findAllowedEntities(user, entities, "view_assignments")
+  return {
-
+    props: serialize({ user, users, entities: allowedEntities, assignments }),
-	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 }) };
 }, sessionOptions);
 
 const SEARCH_FIELDS = [["name"]];
 
 interface Props {
-	assignments: Assignment[];
+  assignments: Assignment[];
-	entities: EntityWithRoles[]
+  entities: EntityWithRoles[];
-	user: User;
+  user: User;
-	users: User[];
+  users: User[];
 }
 
-export default function AssignmentsPage({ assignments, entities, user, users }: Props) {
+export default function AssignmentsPage({
-	const entitiesAllowCreate = useAllowedEntities(user, entities, 'create_assignment')
+  assignments,
-	const entitiesAllowEdit = useAllowedEntities(user, entities, 'edit_assignment')
+  entities,
-	const entitiesAllowArchive = useAllowedEntities(user, entities, 'archive_assignment')
+  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 activeAssignments = useMemo(
-	const plannedAssignments = useMemo(() => assignments.filter(futureAssignmentFilter), [assignments]);
+    () => assignments.filter(activeAssignmentFilter),
-	const pastAssignments = useMemo(() => assignments.filter(pastAssignmentFilter), [assignments]);
+    [assignments]
-	const startExpiredAssignments = useMemo(() => assignments.filter(startHasExpiredAssignmentFilter), [assignments]);
+  );
-	const archivedAssignments = useMemo(() => assignments.filter(archivedAssignmentFilter), [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 router = useRouter();
 
-	const { rows: activeRows, renderSearch: renderActive } = useListSearch(SEARCH_FIELDS, activeAssignments);
+  const { rows: activeRows, renderSearch: renderActive } = useListSearch(
-	const { rows: plannedRows, renderSearch: renderPlanned } = useListSearch(SEARCH_FIELDS, plannedAssignments);
+    SEARCH_FIELDS,
-	const { rows: pastRows, renderSearch: renderPast } = useListSearch(SEARCH_FIELDS, pastAssignments);
+    activeAssignments
-	const { rows: expiredRows, renderSearch: renderExpired } = useListSearch(SEARCH_FIELDS, startExpiredAssignments);
+  );
-	const { rows: archivedRows, renderSearch: renderArchived } = useListSearch(SEARCH_FIELDS, archivedAssignments);
+  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: activeItems, renderMinimal: paginationActive } = usePagination(
-	const { items: plannedItems, renderMinimal: paginationPlanned } = usePagination(plannedRows, 16);
+    activeRows,
-	const { items: pastItems, renderMinimal: paginationPast } = usePagination(pastRows, 16);
+    16
-	const { items: expiredItems, renderMinimal: paginationExpired } = usePagination(expiredRows, 16);
+  );
-	const { items: archivedItems, renderMinimal: paginationArchived } = usePagination(archivedRows, 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 (
+  return (
-		<>
+    <>
-			<Head>
+      <Head>
-				<title>Assignments | EnCoach</title>
+        <title>Assignments | EnCoach</title>
-				<meta
+        <meta
-					name="description"
+          name="description"
-					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+          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" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
-				<link rel="icon" href="/favicon.ico" />
+        <link rel="icon" href="/favicon.ico" />
-			</Head>
+      </Head>
-			<Layout user={user}>
+      <>
-				<div className="flex flex-col gap-4">
+        <div className="flex flex-col gap-4">
-					<div className="flex items-center gap-2">
+          <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
-							<BsChevronLeft />
+              href="/dashboard"
-						</Link>
+              className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl"
-						<h2 className="font-bold text-2xl">Assignments</h2>
+            >
-					</div>
+              <BsChevronLeft />
-					<Separator />
+            </Link>
-				</div>
+            <h2 className="font-bold text-2xl">Assignments</h2>
-				<div className="flex flex-col gap-2">
+          </div>
-					<span className="text-lg font-bold">Active Assignments Status</span>
+          <Separator />
-					<div className="flex items-center gap-4">
+        </div>
-						<span>
+        <div className="flex flex-col gap-2">
-							<b>Total:</b> {activeAssignments.reduce((acc, curr) => acc + curr.results.length, 0)}/
+          <span className="text-lg font-bold">Active Assignments Status</span>
-							{activeAssignments.reduce((acc, curr) => curr.exams.length + acc, 0)}
+          <div className="flex items-center gap-4">
-						</span>
+            <span>
-					</div>
+              <b>Total:</b>{" "}
-				</div>
+              {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">
+        <section className="flex flex-col gap-4">
-					<h2 className="text-2xl font-semibold">Active Assignments ({activeAssignments.length})</h2>
+          <h2 className="text-2xl font-semibold">
-					<div className="w-full flex items-center gap-4">
+            Active Assignments ({activeAssignments.length})
-						{renderActive()}
+          </h2>
-						{paginationActive()}
+          <div className="w-full flex items-center gap-4">
-					</div>
+            {renderActive()}
-					<div className="flex flex-wrap gap-2">
+            {paginationActive()}
-						{activeItems.map((a) => (
+          </div>
-							<AssignmentCard {...a} entityObj={findBy(entities, 'id', a.entity)} users={users} onClick={() => router.push(`/assignments/${a.id}`)} key={a.id} />
+          <div className="flex flex-wrap gap-2">
-						))}
+            {activeItems.map((a) => (
-					</div>
+              <AssignmentCard
-				</section>
+                {...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">
+        <section className="flex flex-col gap-4">
-					<h2 className="text-2xl font-semibold">Planned Assignments ({plannedAssignments.length})</h2>
+          <h2 className="text-2xl font-semibold">
-					<div className="w-full flex items-center gap-4">
+            Planned Assignments ({plannedAssignments.length})
-						{renderPlanned()}
+          </h2>
-						{paginationPlanned()}
+          <div className="w-full flex items-center gap-4">
-					</div>
+            {renderPlanned()}
-					<div className="flex flex-wrap gap-2">
+            {paginationPlanned()}
-						<Link
+          </div>
-							href={entitiesAllowCreate.length > 0 ? "/assignments/creator" : ""}
+          <div className="flex flex-wrap gap-2">
-							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">
+            <Link
-							<BsPlus className="text-6xl" />
+              href={
-							<span className="text-lg">New Assignment</span>
+                entitiesAllowCreate.length > 0 ? "/assignments/creator" : ""
-						</Link>
+              }
-						{plannedItems.map((a) => (
+              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"
-							<AssignmentCard
+            >
-								{...a}
+              <BsPlus className="text-6xl" />
-								users={users}
+              <span className="text-lg">New Assignment</span>
-								entityObj={findBy(entities, 'id', a.entity)}
+            </Link>
-								onClick={
+            {plannedItems.map((a) => (
-									mapBy(entitiesAllowEdit, 'id').includes(a.entity || "")
+              <AssignmentCard
-										? () => router.push(`/assignments/creator/${a.id}`)
+                {...a}
-										: () => router.push(`/assignments/${a.id}`)
+                users={users}
-								}
+                entityObj={findBy(entities, "id", a.entity)}
-								key={a.id}
+                onClick={
-							/>
+                  mapBy(entitiesAllowEdit, "id").includes(a.entity || "")
-						))}
+                    ? () => router.push(`/assignments/creator/${a.id}`)
-					</div>
+                    : () => router.push(`/assignments/${a.id}`)
-				</section>
+                }
+                key={a.id}
+              />
+            ))}
+          </div>
+        </section>
 
-				<section className="flex flex-col gap-4">
+        <section className="flex flex-col gap-4">
-					<h2 className="text-2xl font-semibold">Past Assignments ({pastAssignments.length})</h2>
+          <h2 className="text-2xl font-semibold">
-					<div className="w-full flex items-center gap-4">
+            Past Assignments ({pastAssignments.length})
-						{renderPast()}
+          </h2>
-						{paginationPast()}
+          <div className="w-full flex items-center gap-4">
-					</div>
+            {renderPast()}
-					<div className="flex flex-wrap gap-2">
+            {paginationPast()}
-						{pastItems.map((a) => (
+          </div>
-							<AssignmentCard
+          <div className="flex flex-wrap gap-2">
-								{...a}
+            {pastItems.map((a) => (
-								users={users}
+              <AssignmentCard
-								entityObj={findBy(entities, 'id', a.entity)}
+                {...a}
-								onClick={() => router.push(`/assignments/${a.id}`)}
+                users={users}
-								key={a.id}
+                entityObj={findBy(entities, "id", a.entity)}
-								allowDownload
+                onClick={() => router.push(`/assignments/${a.id}`)}
-								allowArchive={mapBy(entitiesAllowArchive, 'id').includes(a.entity || "")}
+                key={a.id}
-								allowExcelDownload
+                allowDownload
-							/>
+                allowArchive={mapBy(entitiesAllowArchive, "id").includes(
-						))}
+                  a.entity || ""
-					</div>
+                )}
-				</section>
+                allowExcelDownload
-				<section className="flex flex-col gap-4">
+              />
-					<h2 className="text-2xl font-semibold">Assignments start expired ({startExpiredAssignments.length})</h2>
+            ))}
-					<div className="w-full flex items-center gap-4">
+          </div>
-						{renderExpired()}
+        </section>
-						{paginationExpired()}
+        <section className="flex flex-col gap-4">
-					</div>
+          <h2 className="text-2xl font-semibold">
-					<div className="flex flex-wrap gap-2">
+            Assignments start expired ({startExpiredAssignments.length})
-						{expiredItems.map((a) => (
+          </h2>
-							<AssignmentCard
+          <div className="w-full flex items-center gap-4">
-								{...a}
+            {renderExpired()}
-								users={users}
+            {paginationExpired()}
-								entityObj={findBy(entities, 'id', a.entity)}
+          </div>
-								onClick={() => router.push(`/assignments/${a.id}`)}
+          <div className="flex flex-wrap gap-2">
-								key={a.id}
+            {expiredItems.map((a) => (
-								allowDownload
+              <AssignmentCard
-								allowArchive={mapBy(entitiesAllowArchive, 'id').includes(a.entity || "")}
+                {...a}
-								allowExcelDownload
+                users={users}
-							/>
+                entityObj={findBy(entities, "id", a.entity)}
-						))}
+                onClick={() => router.push(`/assignments/${a.id}`)}
-					</div>
+                key={a.id}
-				</section>
+                allowDownload
-				<section className="flex flex-col gap-4">
+                allowArchive={mapBy(entitiesAllowArchive, "id").includes(
-					<h2 className="text-2xl font-semibold">Archived Assignments ({archivedAssignments.length})</h2>
+                  a.entity || ""
-					<div className="w-full flex items-center gap-4">
+                )}
-						{renderArchived()}
+                allowExcelDownload
-						{paginationArchived()}
+              />
-					</div>
+            ))}
-					<div className="flex flex-wrap gap-2">
+          </div>
-						{archivedItems.map((a) => (
+        </section>
-							<AssignmentCard
+        <section className="flex flex-col gap-4">
-								{...a}
+          <h2 className="text-2xl font-semibold">
-								users={users}
+            Archived Assignments ({archivedAssignments.length})
-								onClick={() => router.push(`/assignments/${a.id}`)}
+          </h2>
-								key={a.id}
+          <div className="w-full flex items-center gap-4">
-								entityObj={findBy(entities, 'id', a.entity)}
+            {renderArchived()}
-								allowDownload
+            {paginationArchived()}
-								allowUnarchive
+          </div>
-								allowExcelDownload
+          <div className="flex flex-wrap gap-2">
-							/>
+            {archivedItems.map((a) => (
-						))}
+              <AssignmentCard
-					</div>
+                {...a}
-				</section>
+                users={users}
-			</Layout>
+                onClick={() => router.push(`/assignments/${a.id}`)}
-		</>
+                key={a.id}
-	);
+                entityObj={findBy(entities, "id", a.entity)}
+                allowDownload
+                allowUnarchive
+                allowExcelDownload
+              />
+            ))}
+          </div>
+        </section>
+      </>
+    </>
+  );
 }

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,328 +18,476 @@ 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 }) => {
+export const getServerSideProps = withIronSessionSsr(
-	const user = await requestUser(req, res)
+  async ({ req, res, params }) => {
-	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 } = params as { id: string };
+    const { id } = params as { id: string };
 
-	const group = await getGroup(id);
+    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)
+    const entity = await getEntityWithRoles(group.entity);
-	if (!entity) return redirect("/classrooms")
+    if (!entity) return redirect("/classrooms");
 
-	const canView = doesEntityAllow(user, entity, "view_classrooms")
+    const canView = doesEntityAllow(user, entity, "view_classrooms");
-	if (!canView) return redirect("/")
+    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 groupWithUser = convertToUsers(group, users);
-	const users = await getSpecificUsers([...group.participants, group.admin]);
-	const groupWithUser = convertToUsers(group, users);
 
-	return {
+    return {
-		props: serialize({ user, group: groupWithUser, users: linkedUsers.filter(x => isAdmin(user) ? true : !isAdmin(x)), entity }),
+      props: serialize({
-	};
+        user,
-}, sessionOptions);
+        group: groupWithUser,
+        users: linkedUsers.filter((x) => (isAdmin(user) ? true : !isAdmin(x))),
+        entity,
+      }),
+    };
+  },
+  sessionOptions
+);
 
 interface Props {
-	user: User;
+  user: User;
-	group: GroupWithUsers;
+  group: GroupWithUsers;
-	users: User[];
+  users: User[];
-	entity: EntityWithRoles
+  entity: EntityWithRoles;
 }
 
 export default function Home({ user, group, users, entity }: Props) {
-	const [isAdding, setIsAdding] = useState(false);
+  const [isAdding, setIsAdding] = useState(false);
-	const [isLoading, setIsLoading] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
-	const [selectedUsers, setSelectedUsers] = useState<string[]>([]);
+  const [selectedUsers, setSelectedUsers] = useState<string[]>([]);
 
-	const canAddParticipants = useEntityPermission(user, entity, "add_to_classroom")
+  const canAddParticipants = useEntityPermission(
-	const canRemoveParticipants = useEntityPermission(user, entity, "remove_from_classroom")
+    user,
-	const canRenameClassroom = useEntityPermission(user, entity, "rename_classrooms")
+    entity,
-	const canDeleteClassroom = useEntityPermission(user, entity, "delete_classroom")
+    "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(
+  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>(
+  const { rows, renderSearch } = useListSearch<User>(
-		[["name"], ["corporateInformation", "companyInformation", "name"]],
+    [["name"], ["corporateInformation", "companyInformation", "name"]],
-		isAdding ? nonParticipantUsers : group.participants,
+    isAdding ? nonParticipantUsers : group.participants
-	);
+  );
-	const { items, renderMinimal } = usePagination<User>(rows, 20);
+  const { items, renderMinimal } = usePagination<User>(rows, 20);
 
-	const router = useRouter();
+  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 = () => {
+  const removeParticipants = () => {
-		if (selectedUsers.length === 0) return;
+    if (selectedUsers.length === 0) return;
-		if (!canRemoveParticipants) return;
+    if (!canRemoveParticipants) return;
-		if (!confirm(`Are you sure you want to remove ${selectedUsers.length} participant${selectedUsers.length === 1 ? "" : "s"} from this group?`))
+    if (
-			return;
+      !confirm(
+        `Are you sure you want to remove ${selectedUsers.length} participant${
+          selectedUsers.length === 1 ? "" : "s"
+        } from this group?`
+      )
+    )
+      return;
 
-		setIsLoading(true);
+    setIsLoading(true);
 
-		axios
+    axios
-			.patch(`/api/groups/${group.id}`, { participants: group.participants.map((x) => x.id).filter((x) => !selectedUsers.includes(x)) })
+      .patch(`/api/groups/${group.id}`, {
-			.then(() => {
+        participants: group.participants
-				toast.success("The group has been updated successfully!");
+          .map((x) => x.id)
-				router.replace(router.asPath);
+          .filter((x) => !selectedUsers.includes(x)),
-			})
+      })
-			.catch((e) => {
+      .then(() => {
-				console.error(e);
+        toast.success("The group has been updated successfully!");
-				toast.error("Something went wrong!");
+        router.replace(router.asPath);
-			})
+      })
-			.finally(() => setIsLoading(false));
+      .catch((e) => {
-	};
+        console.error(e);
+        toast.error("Something went wrong!");
+      })
+      .finally(() => setIsLoading(false));
+  };
 
-	const addParticipants = () => {
+  const addParticipants = () => {
-		if (selectedUsers.length === 0) return;
+    if (selectedUsers.length === 0) return;
-		if (!canAddParticipants || !isAdding) 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 (
-			return;
+      !confirm(
+        `Are you sure you want to add ${selectedUsers.length} participant${
+          selectedUsers.length === 1 ? "" : "s"
+        } to this group?`
+      )
+    )
+      return;
 
-		setIsLoading(true);
+    setIsLoading(true);
 
-		axios
+    axios
-			.patch(`/api/groups/${group.id}`, { participants: [...group.participants.map((x) => x.id), ...selectedUsers] })
+      .patch(`/api/groups/${group.id}`, {
-			.then(() => {
+        participants: [
-				toast.success("The group has been updated successfully!");
+          ...group.participants.map((x) => x.id),
-				router.replace(router.asPath);
+          ...selectedUsers,
-			})
+        ],
-			.catch((e) => {
+      })
-				console.error(e);
+      .then(() => {
-				toast.error("Something went wrong!");
+        toast.success("The group has been updated successfully!");
-			})
+        router.replace(router.asPath);
-			.finally(() => setIsLoading(false));
+      })
-	};
+      .catch((e) => {
+        console.error(e);
+        toast.error("Something went wrong!");
+      })
+      .finally(() => setIsLoading(false));
+  };
 
-	const renameGroup = () => {
+  const renameGroup = () => {
-		if (!canRenameClassroom) return;
+    if (!canRenameClassroom) return;
 
-		const name = prompt("Rename this classroom:", group.name);
+    const name = prompt("Rename this classroom:", group.name);
-		if (!name) return;
+    if (!name) return;
 
-		setIsLoading(true);
+    setIsLoading(true);
-		axios
+    axios
-			.patch(`/api/groups/${group.id}`, { name })
+      .patch(`/api/groups/${group.id}`, { name })
-			.then(() => {
+      .then(() => {
-				toast.success("The classroom has been updated successfully!");
+        toast.success("The classroom has been updated successfully!");
-				router.replace(router.asPath);
+        router.replace(router.asPath);
-			})
+      })
-			.catch((e) => {
+      .catch((e) => {
-				console.error(e);
+        console.error(e);
-				toast.error("Something went wrong!");
+        toast.error("Something went wrong!");
-			})
+      })
-			.finally(() => setIsLoading(false));
+      .finally(() => setIsLoading(false));
-	};
+  };
 
-	const deleteGroup = () => {
+  const deleteGroup = () => {
-		if (!canDeleteClassroom) return;
+    if (!canDeleteClassroom) return;
-		if (!confirm("Are you sure you want to delete this classroom?")) return;
+    if (!confirm("Are you sure you want to delete this classroom?")) return;
 
-		setIsLoading(true);
+    setIsLoading(true);
 
-		axios
+    axios
-			.delete(`/api/groups/${group.id}`)
+      .delete(`/api/groups/${group.id}`)
-			.then(() => {
+      .then(() => {
-				toast.success("This classroom has been successfully deleted!");
+        toast.success("This classroom has been successfully deleted!");
-				router.replace("/classrooms");
+        router.replace("/classrooms");
-			})
+      })
-			.catch((e) => {
+      .catch((e) => {
-				console.error(e);
+        console.error(e);
-				toast.error("Something went wrong!");
+        toast.error("Something went wrong!");
-			})
+      })
-			.finally(() => setIsLoading(false));
+      .finally(() => setIsLoading(false));
-	};
+  };
 
-	useEffect(() => setSelectedUsers([]), [isAdding]);
+  useEffect(() => setSelectedUsers([]), [isAdding]);
 
-	return (
+  return (
-		<>
+    <>
-			<Head>
+      <Head>
-				<title>{group.name} | EnCoach</title>
+        <title>{group.name} | EnCoach</title>
-				<meta
+        <meta
-					name="description"
+          name="description"
-					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+          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" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
-				<link rel="icon" href="/favicon.ico" />
+        <link rel="icon" href="/favicon.ico" />
-			</Head>
+      </Head>
-			<ToastContainer />
+      <ToastContainer />
-			{user && (
+      {user && (
-				<Layout user={user}>
+        <>
-					<section className="flex flex-col gap-0">
+          <section className="flex flex-col gap-0">
-						<div className="flex items-center justify-between">
+            <div className="flex items-center justify-between">
-							<div className="flex flex-col gap-3">
+              <div className="flex flex-col gap-3">
-								<div className="flex items-center gap-2">
+                <div className="flex items-center gap-2">
-									<Link
+                  <Link
-										href="/classrooms"
+                    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>
+                    <BsChevronLeft />
-									<h2 className="font-bold text-2xl">{group.name}</h2>
+                  </Link>
-								</div>
+                  <h2 className="font-bold text-2xl">{group.name}</h2>
+                </div>
 
-								{!isAdding && (
+                {!isAdding && (
-									<div className="flex items-center gap-2">
+                  <div className="flex items-center gap-2">
-										<button
+                    <button
-											onClick={renameGroup}
+                      onClick={renameGroup}
-											disabled={isLoading || !canRenameClassroom}
+                      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>
+                      <BsTag />
-										</button>
+                      <span className="text-xs">Rename Classroom</span>
-										<button
+                    </button>
-											onClick={deleteGroup}
+                    <button
-											disabled={isLoading || !canDeleteClassroom}
+                      onClick={deleteGroup}
-											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={isLoading || !canDeleteClassroom}
-											<BsTrash />
+                      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"
-											<span className="text-xs">Delete Classroom</span>
+                    >
-										</button>
+                      <BsTrash />
-									</div>
+                      <span className="text-xs">Delete Classroom</span>
-								)}
+                    </button>
-							</div>
+                  </div>
-							<div className="flex flex-col gap-2">
+                )}
-								<span className="flex items-center gap-2">
+              </div>
-									<BsBuilding className="text-xl" /> {entity.label}
+              <div className="flex flex-col gap-2">
-								</span>
+                <span className="flex items-center gap-2">
-								<span className="flex items-center gap-2">
+                  <BsBuilding className="text-xl" /> {entity.label}
-									<BsFillPersonVcardFill className="text-xl" /> {getUserName(group.admin)}
+                </span>
-								</span>
+                <span className="flex items-center gap-2">
-							</div>
+                  <BsFillPersonVcardFill className="text-xl" />{" "}
-						</div>
+                  {getUserName(group.admin)}
-						<Divider />
+                </span>
-						<div className="flex items-center justify-between mb-4">
+              </div>
-							<span className="font-semibold text-xl">Participants</span>
+            </div>
-							{!isAdding && (
+            <Divider />
-								<div className="flex items-center gap-2">
+            <div className="flex items-center justify-between mb-4">
-									<button
+              <span className="font-semibold text-xl">Participants</span>
-										onClick={() => setIsAdding(true)}
+              {!isAdding && (
-										disabled={isLoading || !canAddParticipants}
+                <div className="flex items-center gap-2">
-										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">
+                  <button
-										<BsPlus />
+                    onClick={() => setIsAdding(true)}
-										<span className="text-xs">Add Participants</span>
+                    disabled={isLoading || !canAddParticipants}
-									</button>
+                    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"
-									<button
+                  >
-										onClick={removeParticipants}
+                    <BsPlus />
-										disabled={selectedUsers.length === 0 || isLoading || !canRemoveParticipants}
+                    <span className="text-xs">Add Participants</span>
-										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">
+                  </button>
-										<BsTrash />
+                  <button
-										<span className="text-xs">Remove Participants</span>
+                    onClick={removeParticipants}
-									</button>
+                    disabled={
-								</div>
+                      selectedUsers.length === 0 ||
-							)}
+                      isLoading ||
-							{isAdding && (
+                      !canRemoveParticipants
-								<div className="flex items-center gap-2">
+                    }
-									<button
+                    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"
-										onClick={() => setIsAdding(false)}
+                  >
-										disabled={isLoading}
+                    <BsTrash />
-										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">
+                    <span className="text-xs">Remove Participants</span>
-										<BsX />
+                  </button>
-										<span className="text-xs">Discard Selection</span>
+                </div>
-									</button>
+              )}
-									<button
+              {isAdding && (
-										onClick={addParticipants}
+                <div className="flex items-center gap-2">
-										disabled={selectedUsers.length === 0 || isLoading || !canAddParticipants}
+                  <button
-										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">
+                    onClick={() => setIsAdding(false)}
-										<BsPlus />
+                    disabled={isLoading}
-										<span className="text-xs">Add Participants</span>
+                    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"
-									</button>
+                  >
-								</div>
+                    <BsX />
-							)}
+                    <span className="text-xs">Discard Selection</span>
-						</div>
+                  </button>
-						<div className="w-full flex items-center gap-4">
+                  <button
-							{renderSearch()}
+                    onClick={addParticipants}
-							{renderMinimal()}
+                    disabled={
-						</div>
+                      selectedUsers.length === 0 ||
-						<div className="flex items-center gap-2 mt-4">
+                      isLoading ||
-							{['student', 'teacher', 'corporate'].map((type) => (
+                      !canAddParticipants
-								<button
+                    }
-									key={type}
+                    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"
-									onClick={() => {
+                  >
-										const typeUsers = mapBy(filterBy(isAdding ? nonParticipantUsers : group.participants, 'type', type), 'id')
+                    <BsPlus />
-										if (typeUsers.every((u) => selectedUsers.includes(u))) {
+                    <span className="text-xs">Add Participants</span>
-											setSelectedUsers((prev) => prev.filter((a) => !typeUsers.includes(a)));
+                  </button>
-										} else {
+                </div>
-											setSelectedUsers((prev) => [...prev.filter((a) => !typeUsers.includes(a)), ...typeUsers]);
+              )}
-										}
+            </div>
-									}}
+            <div className="w-full flex items-center gap-4">
-									disabled={filterBy(isAdding ? nonParticipantUsers : group.participants, 'type', type).length === 0}
+              {renderSearch()}
-									className={clsx(
+              {renderMinimal()}
-										"bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",
+            </div>
-										"transition duration-300 ease-in-out",
+            <div className="flex items-center gap-2 mt-4">
-										"disabled:grayscale disabled:hover:bg-mti-purple-ultralight disabled:hover:text-mti-purple disabled:cursor-not-allowed",
+              {["student", "teacher", "corporate"].map((type) => (
-										filterBy(isAdding ? nonParticipantUsers : group.participants, 'type', type).length > 0 &&
+                <button
-										filterBy(isAdding ? nonParticipantUsers : group.participants, 'type', type).every((u) => selectedUsers.includes(u.id)) &&
+                  key={type}
-										"!bg-mti-purple-light !text-white",
+                  onClick={() => {
-									)}>
+                    const typeUsers = mapBy(
-									{capitalize(type)}
+                      filterBy(
-								</button>
+                        isAdding ? nonParticipantUsers : group.participants,
-							))}
+                        "type",
-						</div>
+                        type
-					</section>
+                      ),
+                      "id"
+                    );
+                    if (typeUsers.every((u) => selectedUsers.includes(u))) {
+                      setSelectedUsers((prev) =>
+                        prev.filter((a) => !typeUsers.includes(a))
+                      );
+                    } else {
+                      setSelectedUsers((prev) => [
+                        ...prev.filter((a) => !typeUsers.includes(a)),
+                        ...typeUsers,
+                      ]);
+                    }
+                  }}
+                  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"
+                  )}
+                >
+                  {capitalize(type)}
+                </button>
+              ))}
+            </div>
+          </section>
 
-					<section className="w-full h-full grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
+          <section className="w-full h-full grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
-						{items.map((u) => (
+            {items.map((u) => (
-							<button
+              <button
-								onClick={() => toggleUser(u)}
+                onClick={() => toggleUser(u)}
-								disabled={isAdding ? !canAddParticipants : !canRemoveParticipants}
+                disabled={
-								key={u.id}
+                  isAdding ? !canAddParticipants : !canRemoveParticipants
-								className={clsx(
+                }
-									"p-4 pr-6 h-48 relative border rounded-xl flex flex-col gap-3 justify-between text-left cursor-pointer",
+                key={u.id}
-									"hover:border-mti-purple transition ease-in-out duration-300",
+                className={clsx(
-									selectedUsers.includes(u.id) && "border-mti-purple",
+                  "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",
-								<div className="flex items-center gap-2">
+                  selectedUsers.includes(u.id) && "border-mti-purple"
-									<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 items-center gap-2">
-									<div className="flex flex-col">
+                  <div className="min-w-[3rem] min-h-[3rem] w-12 h-12 border flex items-center justify-center overflow-hidden rounded-full">
-										<span className="font-semibold">{getUserName(u)}</span>
+                    <img src={u.profilePicture} alt={u.name} />
-										<span className="opacity-80 text-sm">{USER_TYPE_LABELS[u.type]}</span>
+                  </div>
-									</div>
+                  <div className="flex flex-col">
-								</div>
+                    <span className="font-semibold">{getUserName(u)}</span>
+                    <span className="opacity-80 text-sm">
+                      {USER_TYPE_LABELS[u.type]}
+                    </span>
+                  </div>
+                </div>
 
-								<div className="flex flex-col gap-1">
+                <div className="flex flex-col gap-1">
-									<span className="flex items-center gap-2">
+                  <span className="flex items-center gap-2">
-										<Tooltip tooltip="E-mail address">
+                    <Tooltip tooltip="E-mail address">
-											<BsEnvelopeFill />
+                      <BsEnvelopeFill />
-										</Tooltip>
+                    </Tooltip>
-										{u.email}
+                    {u.email}
-									</span>
+                  </span>
-									<span className="flex items-center gap-2">
+                  <span className="flex items-center gap-2">
-										<Tooltip tooltip="Expiration Date">
+                    <Tooltip tooltip="Expiration Date">
-											<BsStopwatchFill />
+                      <BsStopwatchFill />
-										</Tooltip>
+                    </Tooltip>
-										{u.subscriptionExpirationDate ? moment(u.subscriptionExpirationDate).format("DD/MM/YYYY") : "Unlimited"}
+                    {u.subscriptionExpirationDate
-									</span>
+                      ? moment(u.subscriptionExpirationDate).format(
-									<span className="flex items-center gap-2">
+                          "DD/MM/YYYY"
-										<Tooltip tooltip="Last Login">
+                        )
-											<BsClockFill />
+                      : "Unlimited"}
-										</Tooltip>
+                  </span>
-										{u.lastLogin ? moment(u.lastLogin).format("DD/MM/YYYY - HH:mm") : "N/A"}
+                  <span className="flex items-center gap-2">
-									</span>
+                    <Tooltip tooltip="Last Login">
-								</div>
+                      <BsClockFill />
-							</button>
+                    </Tooltip>
-						))}
+                    {u.lastLogin
-					</section>
+                      ? moment(u.lastLogin).format("DD/MM/YYYY - HH:mm")
-				</Layout>
+                      : "N/A"}
-			)}
+                  </span>
-		</>
+                </div>
-	);
+              </button>
+            ))}
+          </section>
+        </>
+      )}
+    </>
+  );
 }

src/pages/classrooms/create.tsx

@@ -1,223 +1,309 @@
 /* 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 { 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 { User } from "@/interfaces/user";
-import {sessionOptions} from "@/lib/session";
+import { sessionOptions } from "@/lib/session";
-import {USER_TYPE_LABELS} from "@/resources/user";
+import { USER_TYPE_LABELS } from "@/resources/user";
-import {filterBy, mapBy, redirect, serialize} from "@/utils";
+import { filterBy, mapBy, redirect, serialize } from "@/utils";
-import {getEntities, getEntitiesWithRoles} from "@/utils/entities.be";
+import { getEntitiesWithRoles } from "@/utils/entities.be";
-import {shouldRedirectHome} from "@/utils/navigation.disabled";
+import { shouldRedirectHome } from "@/utils/navigation.disabled";
-import {getUserName, isAdmin} from "@/utils/users";
+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";
+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 { useRouter } from "next/router";
-import {Divider} from "primereact/divider";
+import { Divider } from "primereact/divider";
-import {useEffect, useMemo, useState} from "react";
+import { useEffect, useMemo, useState } from "react";
-import {BsCheck, BsChevronLeft, BsClockFill, BsEnvelopeFill, BsStopwatchFill} from "react-icons/bs";
+import {
-import {toast, ToastContainer} from "react-toastify";
+  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}) => {
+export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
+  const user = await requestUser(req, res);
-	if (!user) return redirect("/login")
+  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 entities = await getEntitiesWithRoles(
-	const users = await getEntitiesUsers(mapBy(entities, 'id'))
+    isAdmin(user) ? undefined : mapBy(user.entities, "id")
-	const allowedEntities = findAllowedEntities(user, entities, "create_classroom")
+  );
+  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 {
+  return {
-		props: serialize({user, entities: allowedEntities, users: users.filter((x) => x.id !== user.id)}),
+    props: serialize({
-	};
+      user,
+      entities: allowedEntities,
+      users: users,
+    }),
+  };
 }, sessionOptions);
 
 interface Props {
-	user: User;
+  user: User;
-	users: User[];
+  users: User[];
-	entities: EntityWithRoles[];
+  entities: EntityWithRoles[];
 }
 
-export default function Home({user, users, entities}: Props) {
+export default function Home({ user, users, entities }: Props) {
-	const [isLoading, setIsLoading] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
-	const [selectedUsers, setSelectedUsers] = useState<string[]>([]);
+  const [selectedUsers, setSelectedUsers] = useState<string[]>([]);
-	const [name, setName] = useState("");
+  const [name, setName] = useState("");
-	const [entity, setEntity] = useState<string | undefined>(entities[0]?.id);
+  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>(
+  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 { items, renderMinimal } = usePagination<User>(rows, 16);
 
-	const router = useRouter();
+  const router = useRouter();
 
-	useEffect(() => setSelectedUsers([]), [entity])
+  useEffect(() => setSelectedUsers([]), [entity]);
 
-	const createGroup = () => {
+  const createGroup = () => {
-		if (!name.trim()) return;
+    if (!name.trim()) return;
-		if (!entity) 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);
+    setIsLoading(true);
 
-		axios
+    axios
-			.post<{id: string}>(`/api/groups`, {name, participants: selectedUsers, admin: user.id, entity})
+      .post<{ id: string }>(`/api/groups`, {
-			.then((result) => {
+        name,
-				toast.success("Your group has been created successfully!");
+        participants: selectedUsers,
-				router.replace(`/classrooms/${result.data.id}`);
+        admin: user.id,
-			})
+        entity,
-			.catch((e) => {
+      })
-				console.error(e);
+      .then((result) => {
-				toast.error("Something went wrong!");
+        toast.success("Your group has been created successfully!");
-			})
+        router.replace(`/classrooms/${result.data.id}`);
-			.finally(() => setIsLoading(false));
+      })
-	};
+      .catch((e) => {
+        console.error(e);
+        toast.error("Something went wrong!");
+      })
+      .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 (
+  return (
-		<>
+    <>
-			<Head>
+      <Head>
-				<title>Create Group | EnCoach</title>
+        <title>Create Group | EnCoach</title>
-				<meta
+        <meta
-					name="description"
+          name="description"
-					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+          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" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
-				<link rel="icon" href="/favicon.ico" />
+        <link rel="icon" href="/favicon.ico" />
-			</Head>
+      </Head>
-			<ToastContainer />
+      <ToastContainer />
-			<Layout user={user}>
+      <>
-				<section className="flex flex-col gap-0">
+        <section className="flex flex-col gap-0">
-					<div className="flex gap-3 justify-between">
+          <div className="flex gap-3 justify-between">
-						<div className="flex items-center gap-2">
+            <div className="flex items-center gap-2">
-							<Link
+              <Link
-								href="/classrooms"
+                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>
+                <BsChevronLeft />
-							<h2 className="font-bold text-2xl">Create Classroom</h2>
+              </Link>
-						</div>
+              <h2 className="font-bold text-2xl">Create Classroom</h2>
-						<div className="flex items-center gap-4">
+            </div>
-							<button
+            <div className="flex items-center gap-4">
-								onClick={createGroup}
+              <button
-								disabled={!name.trim() || !entity || isLoading}
+                onClick={createGroup}
-								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={!name.trim() || !entity || isLoading}
-								<BsCheck />
+                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"
-								<span className="text-xs">Create Classroom</span>
+              >
-							</button>
+                <BsCheck />
-						</div>
+                <span className="text-xs">Create Classroom</span>
-					</div>
+              </button>
-					<Divider />
+            </div>
-					<div className="grid grid-cols-2 gap-4 place-items-end">
+          </div>
-						<div className="flex flex-col gap-4 w-full">
+          <Divider />
-							<span className="font-semibold text-xl">Classroom Name:</span>
+          <div className="grid grid-cols-2 gap-4 place-items-end">
-							<Input name="name" onChange={setName} type="text" placeholder="Classroom A" />
+            <div className="flex flex-col gap-4 w-full">
-						</div>
+              <span className="font-semibold text-xl">Classroom Name:</span>
-						<div className="flex flex-col gap-4 w-full">
+              <Input
-							<span className="font-semibold text-xl">Entity:</span>
+                name="name"
-							<Select
+                onChange={setName}
-								options={entities.map((e) => ({value: e.id, label: e.label}))}
+                type="text"
-								onChange={(v) => setEntity(v ? v.value! : undefined)}
+                placeholder="Classroom A"
-								defaultValue={{value: entities[0]?.id, label: entities[0]?.label}}
+              />
-							/>
+            </div>
-						</div>
+            <div className="flex flex-col gap-4 w-full">
-					</div>
+              <span className="font-semibold text-xl">Entity:</span>
-					<Divider />
+              <Select
-					<div className="flex items-center justify-between mb-4">
+                options={entities.map((e) => ({ value: e.id, label: e.label }))}
-						<span className="font-semibold text-xl">Participants ({selectedUsers.length} selected):</span>
+                onChange={(v) => setEntity(v ? v.value! : undefined)}
-					</div>
+                defaultValue={{
-					<div className="w-full flex items-center gap-4">
+                  value: entities[0]?.id,
-						{renderSearch()}
+                  label: entities[0]?.label,
-						{renderMinimal()}
+                }}
-					</div>
+              />
-					<div className="flex items-center gap-2 mt-4">
+            </div>
-						{['student', 'teacher', 'corporate'].map((type) => (
+          </div>
-							<button
+          <Divider />
-								key={type}
+          <div className="flex items-center justify-between mb-4">
-								onClick={() => {
+            <span className="font-semibold text-xl">
-									const typeUsers = mapBy(filterBy(entityUsers, 'type', type), 'id')
+              Participants ({selectedUsers.length} selected):
-									if (typeUsers.every((u) => selectedUsers.includes(u))) {
+            </span>
-										setSelectedUsers((prev) => prev.filter((a) => !typeUsers.includes(a)));
+          </div>
-									} else {
+          <div className="w-full flex items-center gap-4">
-										setSelectedUsers((prev) => [...prev.filter((a) => !typeUsers.includes(a)), ...typeUsers]);
+            {renderSearch()}
-									}
+            {renderMinimal()}
-								}}
+          </div>
-								disabled={filterBy(entityUsers, 'type', type).length === 0}
+          <div className="flex items-center gap-2 mt-4">
-								className={clsx(
+            {["student", "teacher", "corporate"].map((type) => (
-									"bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",
+              <button
-									"transition duration-300 ease-in-out",
+                key={type}
-									"disabled:grayscale disabled:hover:bg-mti-purple-ultralight disabled:hover:text-mti-purple disabled:cursor-not-allowed",
+                onClick={() => {
-									filterBy(entityUsers, 'type', type).length > 0 &&
+                  const typeUsers = mapBy(
-									filterBy(entityUsers, 'type', type).every((u) => selectedUsers.includes(u.id)) &&
+                    filterBy(entityUsers, "type", type),
-									"!bg-mti-purple-light !text-white",
+                    "id"
-								)}>
+                  );
-								{capitalize(type)}
+                  if (typeUsers.every((u) => selectedUsers.includes(u))) {
-							</button>
+                    setSelectedUsers((prev) =>
-						))}
+                      prev.filter((a) => !typeUsers.includes(a))
-					</div>
+                    );
-				</section>
+                  } else {
+                    setSelectedUsers((prev) => [
+                      ...prev.filter((a) => !typeUsers.includes(a)),
+                      ...typeUsers,
+                    ]);
+                  }
+                }}
+                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"
+                )}
+              >
+                {capitalize(type)}
+              </button>
+            ))}
+          </div>
+        </section>
 
-				<section className="w-full h-full grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
+        <section className="w-full h-full grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
-					{items.map((u) => (
+          {items.map((u) => (
-						<button
+            <button
-							onClick={() => toggleUser(u)}
+              onClick={() => toggleUser(u)}
-							disabled={isLoading}
+              disabled={isLoading}
-							key={u.id}
+              key={u.id}
-							className={clsx(
+              className={clsx(
-								"p-4 pr-6 h-48 relative border rounded-xl flex flex-col gap-3 justify-between text-left cursor-pointer",
+                "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",
+                "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">
+              <div className="flex items-center gap-2">
-									<img src={u.profilePicture} alt={u.name} />
+                <div className="min-w-[3rem] min-h-[3rem] w-12 h-12 border flex items-center justify-center overflow-hidden rounded-full">
-								</div>
+                  <img src={u.profilePicture} alt={u.name} />
-								<div className="flex flex-col">
+                </div>
-									<span className="font-semibold">{getUserName(u)}</span>
+                <div className="flex flex-col">
-									<span className="opacity-80 text-sm">{USER_TYPE_LABELS[u.type]}</span>
+                  <span className="font-semibold">{getUserName(u)}</span>
-								</div>
+                  <span className="opacity-80 text-sm">
-							</div>
+                    {USER_TYPE_LABELS[u.type]}
+                  </span>
+                </div>
+              </div>
 
-							<div className="flex flex-col gap-1">
+              <div className="flex flex-col gap-1">
-								<span className="flex items-center gap-2">
+                <span className="flex items-center gap-2">
-									<Tooltip tooltip="E-mail address">
+                  <Tooltip tooltip="E-mail address">
-										<BsEnvelopeFill />
+                    <BsEnvelopeFill />
-									</Tooltip>
+                  </Tooltip>
-									{u.email}
+                  {u.email}
-								</span>
+                </span>
-								<span className="flex items-center gap-2">
+                <span className="flex items-center gap-2">
-									<Tooltip tooltip="Expiration Date">
+                  <Tooltip tooltip="Expiration Date">
-										<BsStopwatchFill />
+                    <BsStopwatchFill />
-									</Tooltip>
+                  </Tooltip>
-									{u.subscriptionExpirationDate ? moment(u.subscriptionExpirationDate).format("DD/MM/YYYY") : "Unlimited"}
+                  {u.subscriptionExpirationDate
-								</span>
+                    ? moment(u.subscriptionExpirationDate).format("DD/MM/YYYY")
-								<span className="flex items-center gap-2">
+                    : "Unlimited"}
-									<Tooltip tooltip="Last Login">
+                </span>
-										<BsClockFill />
+                <span className="flex items-center gap-2">
-									</Tooltip>
+                  <Tooltip tooltip="Last Login">
-									{u.lastLogin ? moment(u.lastLogin).format("DD/MM/YYYY - HH:mm") : "N/A"}
+                    <BsClockFill />
-								</span>
+                  </Tooltip>
-							</div>
+                  {u.lastLogin
-						</button>
+                    ? moment(u.lastLogin).format("DD/MM/YYYY - HH:mm")
-					))}
+                    : "N/A"}
-				</section>
+                </span>
-			</Layout>
+              </div>
-		</>
+            </button>
-	);
+          ))}
+        </section>
+      </>
+    </>
+  );
 }

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,132 +27,182 @@ import StudentClassroomTransfer from "@/components/Imports/StudentClassroomTrans
 import Modal from "@/components/Modal";
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
+  const user = await requestUser(req, res);
-	if (!user) return redirect("/login")
+  if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user)) return redirect("/")
+  if (shouldRedirectHome(user)) return redirect("/");
 
-	const entityIDS = mapBy(user.entities, "id");
+  const entityIDS = mapBy(user.entities, "id");
-	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDS)
+  const entities = await getEntitiesWithRoles(
-	const allowedEntities = findAllowedEntities(user, entities, "view_classrooms")
+    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 groups = await getGroupsForEntities(mapBy(allowedEntities, "id"));
-	const groupsWithUsers: GroupWithUsers[] = groups.map((g) => convertToUsers(g, users.filter(x => isAdmin(user) ? true : !isAdmin(x))));
 
-	return {
+  const users = await getSpecificUsers(
-		props: serialize({ user, groups: groupsWithUsers, entities: allowedEntities }),
+    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,
+    }),
+  };
 }, sessionOptions);
 
 const SEARCH_FIELDS = [
-	["name"],
+  ["name"],
-	["admin", "name"],
+  ["admin", "name"],
-	["admin", "email"],
+  ["admin", "email"],
-	["admin", "corporateInformation", "companyInformation", "name"],
+  ["admin", "corporateInformation", "companyInformation", "name"],
-	["participants", "name"],
+  ["participants", "name"],
-	["participants", "email"],
+  ["participants", "email"],
-	["participants", "corporateInformation", "companyInformation", "name"],
+  ["participants", "corporateInformation", "companyInformation", "name"],
 ];
 
 interface Props {
-	user: User;
+  user: User;
-	groups: GroupWithUsers[];
+  groups: GroupWithUsers[];
-	entities: EntityWithRoles[]
+  entities: EntityWithRoles[];
 }
 export default function Home({ user, groups, entities }: Props) {
-	const entitiesAllowCreate = useAllowedEntities(user, entities, 'create_classroom');
+  const entitiesAllowCreate = useAllowedEntities(
-	const [showImport, setShowImport] = useState(false);
+    user,
+    entities,
+    "create_classroom"
+  );
+  const [showImport, setShowImport] = useState(false);
 
-	const renderCard = (group: GroupWithUsers) => (
+  const renderCard = (group: GroupWithUsers) => (
-		<Link
+    <Link
-			href={`/classrooms/${group.id}`}
+      href={`/classrooms/${group.id}`}
-			key={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">
+      <div className="flex flex-col gap-2 w-full">
-					<span className="bg-mti-purple text-white font-semibold px-2">Classroom</span>
+        <span className="flex items-center gap-1">
-					{group.name}
+          <span className="bg-mti-purple text-white font-semibold px-2">
-				</span>
+            Classroom
-				<span className="flex items-center gap-1">
+          </span>
-					<span className="bg-mti-purple text-white font-semibold px-2">Admin</span>
+          {group.name}
-					{getUserName(group.admin)}
+        </span>
-				</span>
+        <span className="flex items-center gap-1">
-				{!!group.entity && (
+          <span className="bg-mti-purple text-white font-semibold px-2">
-					<span className="flex items-center gap-1">
+            Admin
-						<span className="bg-mti-purple text-white font-semibold px-2">Entity</span>
+          </span>
-						{findBy(entities, 'id', group.entity)?.label}
+          {getUserName(group.admin)}
-					</span>
+        </span>
-				)}
+        {!!group.entity && (
-				<span className="flex items-center gap-1">
+          <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 text-white font-semibold px-2">
-					<span className="bg-mti-purple-light/50 px-2">{group.participants.length}</span>
+              Entity
-				</span>
+            </span>
-				<span>
+            {findBy(entities, "id", group.entity)?.label}
-					{group.participants.slice(0, 3).map(getUserName).join(", ")}{' '}
+          </span>
-					{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>
+        <span className="flex items-center gap-1">
-			</div>
+          <span className="bg-mti-purple text-white font-semibold px-2">
-			<div className="w-fit">
+            Participants
-				<FaPersonChalkboard className="w-full h-20 -translate-y-[15%] group-hover:text-mti-purple transition ease-in-out duration-300" />
+          </span>
-			</div>
+          <span className="bg-mti-purple-light/50 px-2">
-		</Link>
+            {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>
+          ) : (
+            ""
+          )}
+        </span>
+      </div>
+      <div className="w-fit">
+        <FaPersonChalkboard className="w-full h-20 -translate-y-[15%] group-hover:text-mti-purple transition ease-in-out duration-300" />
+      </div>
+    </Link>
+  );
 
-	const firstCard = () => (
+  const firstCard = () => (
-		<Link
+    <Link
-			href={`/classrooms/create`}
+      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>
+      <BsPlus size={40} />
-		</Link>
+      <span className="font-semibold">Create Classroom</span>
-	);
+    </Link>
+  );
 
-	return (
+  return (
-		<>
+    <>
-			<Head>
+      <Head>
-				<title>Classrooms | EnCoach</title>
+        <title>Classrooms | EnCoach</title>
-				<meta
+        <meta
-					name="description"
+          name="description"
-					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+          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" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
-				<link rel="icon" href="/favicon.ico" />
+        <link rel="icon" href="/favicon.ico" />
-			</Head>
+      </Head>
-			<ToastContainer />
+      <ToastContainer />
-			<Layout user={user} className="!gap-4">
+      <>
-				<section className="flex flex-col gap-4 w-full h-full">
+        <section className="flex flex-col gap-4 w-full h-full">
-					<Modal isOpen={showImport} onClose={() => setShowImport(false)} maxWidth="max-w-[85%]">
+          <Modal
-						<StudentClassroomTransfer user={user} entities={entities} onFinish={() => setShowImport(false)} />
+            isOpen={showImport}
-					</Modal>
+            onClose={() => setShowImport(false)}
-					<div className="flex flex-col gap-4">
+            maxWidth="max-w-[85%]"
-						<div className="flex justify-between">
+          >
-							<h2 className="font-bold text-2xl">Classrooms</h2>
+            <StudentClassroomTransfer
-							{entitiesAllowCreate.length !== 0 && <button
+              user={user}
-								className={clsx(
+              entities={entities}
-									"flex flex-row gap-3 items-center py-1.5 px-4 text-lg",
+              onFinish={() => setShowImport(false)}
-									"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",
+          </Modal>
-								)}
+          <div className="flex flex-col gap-4">
-								onClick={() => setShowImport(true)}
+            <div className="flex justify-between">
-							>
+              <h2 className="font-bold text-2xl">Classrooms</h2>
-								<FaFileUpload className="w-5 h-5" />
+              {entitiesAllowCreate.length !== 0 && (
-								Transfer Students
+                <button
-							</button>
+                  className={clsx(
-							}
+                    "flex flex-row gap-3 items-center py-1.5 px-4 text-lg",
-						</div>
+                    "bg-mti-purple-light border border-mti-purple-light rounded-xl text-white",
-						<Separator />
+                    "hover:bg-white hover:text-mti-purple-light transition duration-300 ease-in-out"
-					</div>
+                  )}
+                  onClick={() => setShowImport(true)}
+                >
+                  <FaFileUpload className="w-5 h-5" />
+                  Transfer Students
+                </button>
+              )}
+            </div>
+            <Separator />
+          </div>
 
-					<CardList<GroupWithUsers>
+          <CardList<GroupWithUsers>
-						list={groups}
+            list={groups}
-						searchFields={SEARCH_FIELDS}
+            searchFields={SEARCH_FIELDS}
-						renderCard={renderCard}
+            renderCard={renderCard}
-						firstCard={entitiesAllowCreate.length === 0 ? undefined : firstCard}
+            firstCard={entitiesAllowCreate.length === 0 ? undefined : firstCard}
-					/>
+          />
-				</section>
+        </section>
-			</Layout>
+      </>
-		</>
+    </>
-	);
+  );
 }

src/pages/dashboard/admin.tsx

@@ -1,191 +1,213 @@
 /* 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 { Stat, Type, User } from "@/interfaces/user";
-import { Group, 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 { countEntitiesAssignments } from "@/utils/assignments.be";
-import { getEntitiesWithRoles } from "@/utils/entities.be";
+import { getEntities } from "@/utils/entities.be";
-import { countGroups, getGroups } from "@/utils/groups.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,
+  BsBank,
-	BsClipboard2Data,
+  BsEnvelopePaper,
-	BsEnvelopePaper,
+  BsPencilSquare,
-	BsPencilSquare,
+  BsPeople,
-	BsPeople,
+  BsPeopleFill,
-	BsPeopleFill,
+  BsPersonFill,
-	BsPersonFill,
+  BsPersonFillGear,
-	BsPersonFillGear,
 } from "react-icons/bs";
 import { ToastContainer } from "react-toastify";
 
 interface Props {
-	user: User;
+  user: User;
-	students: User[];
+  students: User[];
-	latestStudents: User[]
+  latestStudents: User[];
-	latestTeachers: User[]
+  latestTeachers: User[];
-	entities: EntityWithRoles[];
+  entities: EntityWithRoles[];
-	usersCount: { [key in Type]: number }
+  usersCount: { [key in Type]: number };
-	assignmentsCount: number;
+  assignmentsCount: number;
-	stats: Stat[];
+  stats: Stat[];
-	groupsCount: number;
+  groupsCount: number;
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
+  const user = await requestUser(req, res);
-	if (!user || !user.isVerified) return redirect("/login")
+  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' });
+  return {
-	const usersCount = {
+    props: serialize({
-		student: await countUsers({ type: "student" }),
+      user,
-		teacher: await countUsers({ type: "teacher" }),
+      students,
-		corporate: await countUsers({ type: "corporate" }),
+      latestStudents,
-		mastercorporate: await countUsers({ type: "mastercorporate" }),
+      latestTeachers,
-	}
+      usersCount,
-
+      entities,
-	const latestStudents = await getUsers({ type: 'student' }, 10, { registrationDate: -1 })
+      assignmentsCount,
-	const latestTeachers = await getUsers({ type: 'teacher' }, 10, { registrationDate: -1 })
+      stats,
-
+      groupsCount,
-	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 }) };
 }, sessionOptions);
 
 export default function Dashboard({
-	user,
+  user,
-	students,
+  students,
-	latestStudents,
+  latestStudents,
-	latestTeachers,
+  latestTeachers,
-	usersCount,
+  usersCount,
-	entities,
+  entities,
-	assignmentsCount,
+  assignmentsCount,
-	stats,
+  stats,
-	groupsCount
+  groupsCount,
 }: Props) {
-	const router = useRouter();
+  const router = useRouter();
 
-	return (
+  return (
-		<>
+    <>
-			<Head>
+      <Head>
-				<title>EnCoach</title>
+        <title>EnCoach</title>
-				<meta
+        <meta
-					name="description"
+          name="description"
-					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+          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" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
-				<link rel="icon" href="/favicon.ico" />
+        <link rel="icon" href="/favicon.ico" />
-			</Head>
+      </Head>
-			<ToastContainer />
+      <ToastContainer />
-			<Layout user={user}>
+      <>
-				<section className="grid grid-cols-5 place-items-center -md:grid-cols-2 gap-4 text-center">
+        <section className="grid grid-cols-5 place-items-center -md:grid-cols-2 gap-4 text-center">
-					<IconCard
+          <IconCard
-						onClick={() => router.push("/users?type=student")}
+            onClick={() => router.push("/users?type=student")}
-						Icon={BsPersonFill}
+            Icon={BsPersonFill}
-						label="Students"
+            label="Students"
-						value={usersCount.student}
+            value={usersCount.student}
-						color="purple"
+            color="purple"
-					/>
+          />
-					<IconCard
+          <IconCard
-						onClick={() => router.push("/users?type=teacher")}
+            onClick={() => router.push("/users?type=teacher")}
-						Icon={BsPencilSquare}
+            Icon={BsPencilSquare}
-						label="Teachers"
+            label="Teachers"
-						value={usersCount.teacher}
+            value={usersCount.teacher}
-						color="purple"
+            color="purple"
-					/>
+          />
-					<IconCard
+          <IconCard
-						Icon={BsBank}
+            Icon={BsBank}
-						onClick={() => router.push("/users?type=corporate")}
+            onClick={() => router.push("/users?type=corporate")}
-						label="Corporates"
+            label="Corporates"
-						value={usersCount.corporate}
+            value={usersCount.corporate}
-						color="purple"
+            color="purple"
-					/>
+          />
-					<IconCard
+          <IconCard
-						Icon={BsBank}
+            Icon={BsBank}
-						onClick={() => router.push("/users?type=mastercorporate")}
+            onClick={() => router.push("/users?type=mastercorporate")}
-						label="Master Corporates"
+            label="Master Corporates"
-						value={usersCount.mastercorporate}
+            value={usersCount.mastercorporate}
-						color="purple"
+            color="purple"
-					/>
+          />
-					<IconCard
+          <IconCard
-						Icon={BsPeople}
+            Icon={BsPeople}
-						onClick={() => router.push("/classrooms")}
+            onClick={() => router.push("/classrooms")}
-						label="Classrooms"
+            label="Classrooms"
-						value={groupsCount}
+            value={groupsCount}
-						color="purple"
+            color="purple"
-					/>
+          />
-					<IconCard Icon={BsPeopleFill}
+          <IconCard
-						onClick={() => router.push("/entities")}
+            Icon={BsPeopleFill}
-						label="Entities"
+            onClick={() => router.push("/entities")}
-						value={entities.length}
+            label="Entities"
-						color="purple"
+            value={entities.length}
-					/>
+            color="purple"
-					<IconCard Icon={BsPersonFillGear}
+          />
-						onClick={() => router.push("/statistical")}
+          <IconCard
-						label="Entity Statistics"
+            Icon={BsPersonFillGear}
-						value={entities.length}
+            onClick={() => router.push("/statistical")}
-						color="purple"
+            label="Entity Statistics"
-					/>
+            value={entities.length}
-					<IconCard Icon={BsPersonFillGear}
+            color="purple"
-						onClick={() => router.push("/users/performance")}
+          />
-						label="Student Performance"
+          <IconCard
-						value={usersCount.student}
+            Icon={BsPersonFillGear}
-						color="purple"
+            onClick={() => router.push("/users/performance")}
-					/>
+            label="Student Performance"
-					<IconCard
+            value={usersCount.student}
-						Icon={BsEnvelopePaper}
+            color="purple"
-						onClick={() => router.push("/assignments")}
+          />
-						label="Assignments"
+          <IconCard
-						value={assignmentsCount}
+            Icon={BsEnvelopePaper}
-						color="purple"
+            onClick={() => router.push("/assignments")}
-					/>
+            label="Assignments"
-				</section>
+            value={assignmentsCount}
+            color="purple"
+          />
+        </section>
 
-				<section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
+        <section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
-					<UserDisplayList
+          <UserDisplayList users={latestStudents} title="Latest Students" />
-						users={latestStudents}
+          <UserDisplayList users={latestTeachers} title="Latest Teachers" />
-						title="Latest Students"
+          <UserDisplayList users={students} title="Highest level students" />
-					/>
+          <UserDisplayList
-					<UserDisplayList
+            users={students.sort(
-						users={latestTeachers}
+              (a, b) =>
-						title="Latest Teachers"
+                Object.keys(groupByExam(filterBy(stats, "user", b))).length -
-					/>
+                Object.keys(groupByExam(filterBy(stats, "user", a))).length
-					<UserDisplayList
+            )}
-						users={students.sort((a, b) => calculateAverageLevel(b.levels) - calculateAverageLevel(a.levels))}
+            title="Highest exam count students"
-						title="Highest level students"
+          />
-					/>
+        </section>
-					<UserDisplayList
+      </>
-						users={
+    </>
-							students
+  );
-								.sort(
-									(a, b) =>
-										Object.keys(groupByExam(filterBy(stats, "user", b))).length -
-										Object.keys(groupByExam(filterBy(stats, "user", a))).length,
-								)
-						}
-						title="Highest exam count students"
-					/>
-				</section>
-			</Layout>
-		</>
-	);
 }

src/pages/dashboard/corporate.tsx

@@ -1,194 +1,266 @@
 /* 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 {
-import { calculateAverageLevel } from "@/utils/score";
+  checkAccess,
+  groupAllowedEntitiesByPermissions,
+} from "@/utils/permissions";
 import { groupByExam } from "@/utils/stats";
-import { getStatsByUsers } from "@/utils/stats.be";
+import { countAllowedUsers, getUsers } from "@/utils/users.be";
-import { countAllowedUsers, filterAllowedUsers, 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,
-	BsClock,
+  BsEnvelopePaper,
-	BsEnvelopePaper,
+  BsPencilSquare,
-	BsPencilSquare,
+  BsPeople,
-	BsPeople,
+  BsPeopleFill,
-	BsPeopleFill,
+  BsPersonFill,
-	BsPersonFill,
+  BsPersonFillGear,
-	BsPersonFillGear,
 } from "react-icons/bs";
 import { ToastContainer } from "react-toastify";
 import { useAllowedEntities } from "@/hooks/useEntityPermissions";
 import { isAdmin } from "@/utils/users";
 
 interface Props {
-	user: User;
+  user: User;
-	students: StudentUser[]
+  students: StudentUser[];
-	latestStudents: User[]
+  latestStudents: User[];
-	latestTeachers: User[]
+  latestTeachers: User[];
-	userCounts: { [key in Type]: number }
+  userCounts: { [key in Type]: number };
-	entities: EntityWithRoles[];
+  entities: EntityWithRoles[];
-	assignmentsCount: number;
+  assignmentsCount: number;
-	stats: Stat[];
+  stats: Stat[];
-	groupsCount: number;
+  groupsCount: number;
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
+  const user = await requestUser(req, res);
-	if (!user || !user.isVerified) return redirect("/login")
+  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 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 {
-	const allowedTeacherEntities = findAllowedEntities(user, entities, "view_teachers")
+    ["view_students"]: allowedStudentEntities,
+    ["view_teachers"]: allowedTeacherEntities,
+  } = groupAllowedEntitiesByPermissions(user, entities, [
+    "view_students",
+    "view_teachers",
+  ]);
 
-	const students =
+  const allowedStudentEntitiesIDS = mapBy(allowedStudentEntities, "id");
-		await getUsers({ type: 'student', "entities.id": { $in: mapBy(allowedStudentEntities, 'id') } }, 10, { averageLevel: -1 });
+  const entitiesIDS = mapBy(entities, "id") || [];
-	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 userCounts = await countAllowedUsers(user, entities)
+  const [
-	const assignmentsCount = await countEntitiesAssignments(mapBy(entities, "id"), { archived: { $ne: true } });
+    students,
-	const groupsCount = await countGroupsByEntities(mapBy(entities, "id"));
+    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({
-	const totalCount = useMemo(() =>
+  user,
-		userCounts.corporate + userCounts.mastercorporate + userCounts.student + userCounts.teacher, [userCounts])
+  students,
-	const totalLicenses = useMemo(() => entities.reduce((acc, curr) => acc + parseInt(curr.licenses.toString()), 0), [entities])
+  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 totalLicenses = useMemo(
-	const allowedStudentPerformance = useAllowedEntities(user, entities, 'view_student_performance')
+    () =>
+      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"
+  );
 
-	return (
+  const router = useRouter();
-		<>
-			<Head>
-				<title>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 />
-			<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>
-						</div>
-					)}
-					<section className="grid grid-cols-5 -md:grid-cols-2 place-items-center gap-4 text-center">
-						<IconCard
-							onClick={() => router.push("/users?type=student")}
-							Icon={BsPersonFill}
-							label="Students"
-							value={userCounts.student}
-							color="purple"
-						/>
-						<IconCard
-							onClick={() => router.push("/users?type=teacher")}
-							Icon={BsPencilSquare}
-							label="Teachers"
-							value={userCounts.teacher}
-							color="purple"
-						/>
-						<IconCard
-							onClick={() => router.push("/classrooms")}
-							Icon={BsPeople}
-							label="Classrooms"
-							value={groupsCount}
-							color="purple"
-						/>
-						<IconCard Icon={BsPeopleFill}
-							onClick={() => router.push("/entities")}
-							label="Entities"
-							value={`${entities.length} - ${totalCount}/${totalLicenses}`}
-							color="purple"
-						/>
-						{allowedEntityStatistics.length > 0 && (
-							<IconCard Icon={BsPersonFillGear}
-								onClick={() => router.push("/statistical")}
-								label="Entity Statistics"
-								value={allowedEntityStatistics.length}
-								color="purple"
-							/>
-						)}
-						{allowedStudentPerformance.length > 0 && (
-							<IconCard Icon={BsPersonFillGear}
-								onClick={() => router.push("/users/performance")}
-								label="Student Performance"
-								value={userCounts.student}
-								color="purple"
-							/>
-						)}
-						<IconCard
-							Icon={BsClock}
-							label="Expiration Date"
-							value={user.subscriptionExpirationDate ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy") : "Unlimited"}
-							color="rose"
-						/>
-						<IconCard
-							Icon={BsEnvelopePaper}
-							className="col-span-2"
-							onClick={() => router.push("/assignments")}
-							label="Assignments"
-							value={assignmentsCount}
-							color="purple"
-						/>
-					</section>
-				</div>
 
-				<section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
+  return (
-					<UserDisplayList
+    <>
-						users={latestStudents}
+      <Head>
-						title="Latest Students"
+        <title>EnCoach</title>
-					/>
+        <meta
-					<UserDisplayList
+          name="description"
-						users={latestTeachers}
+          content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
-						title="Latest Teachers"
+        />
-					/>
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
-					<UserDisplayList
+        <link rel="icon" href="/favicon.ico" />
-						users={students}
+      </Head>
-						title="Highest level students"
+      <ToastContainer />
-					/>
+      <>
-					<UserDisplayList
+        <div className="w-full flex flex-col gap-4">
-						users={
+          {entities.length > 0 && (
-							students
+            <div className="w-fit self-end bg-neutral-200 px-2 rounded-lg py-1">
-								.sort(
+              <b>{mapBy(entities, "label")?.join(", ")}</b>
-									(a, b) =>
+            </div>
-										Object.keys(groupByExam(filterBy(stats, "user", b))).length -
+          )}
-										Object.keys(groupByExam(filterBy(stats, "user", a))).length,
+          <section className="grid grid-cols-5 -md:grid-cols-2 place-items-center gap-4 text-center">
-								)
+            <IconCard
-						}
+              onClick={() => router.push("/users?type=student")}
-						title="Highest exam count students"
+              Icon={BsPersonFill}
-					/>
+              label="Students"
-				</section>
+              value={userCounts.student}
-			</Layout>
+              color="purple"
-		</>
+            />
-	);
+            <IconCard
+              onClick={() => router.push("/users?type=teacher")}
+              Icon={BsPencilSquare}
+              label="Teachers"
+              value={userCounts.teacher}
+              color="purple"
+            />
+            <IconCard
+              onClick={() => router.push("/classrooms")}
+              Icon={BsPeople}
+              label="Classrooms"
+              value={groupsCount}
+              color="purple"
+            />
+            <IconCard
+              Icon={BsPeopleFill}
+              onClick={() => router.push("/entities")}
+              label="Entities"
+              value={`${entities.length} - ${totalCount}/${totalLicenses}`}
+              color="purple"
+            />
+            {allowedEntityStatistics.length > 0 && (
+              <IconCard
+                Icon={BsPersonFillGear}
+                onClick={() => router.push("/statistical")}
+                label="Entity Statistics"
+                value={allowedEntityStatistics.length}
+                color="purple"
+              />
+            )}
+            {allowedStudentPerformance.length > 0 && (
+              <IconCard
+                Icon={BsPersonFillGear}
+                onClick={() => router.push("/users/performance")}
+                label="Student Performance"
+                value={userCounts.student}
+                color="purple"
+              />
+            )}
+            <IconCard
+              Icon={BsClock}
+              label="Expiration Date"
+              value={
+                user.subscriptionExpirationDate
+                  ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy")
+                  : "Unlimited"
+              }
+              color="rose"
+            />
+            <IconCard
+              Icon={BsEnvelopePaper}
+              className="col-span-2"
+              onClick={() => router.push("/assignments")}
+              label="Assignments"
+              value={assignmentsCount}
+              color="purple"
+            />
+          </section>
+        </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={students.sort(
+              (a, b) =>
+                Object.keys(groupByExam(filterBy(stats, "user", b))).length -
+                Object.keys(groupByExam(filterBy(stats, "user", a))).length
+            )}
+            title="Highest exam count students"
+          />
+        </section>
+      </>
+    </>
+  );
 }

src/pages/dashboard/developer.tsx

@@ -1,189 +1,205 @@
 /* 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 { Stat, Type, User } from "@/interfaces/user";
-import { Group, 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, getAssignments } from "@/utils/assignments.be";
+import { countEntitiesAssignments } from "@/utils/assignments.be";
-import { getEntitiesWithRoles } from "@/utils/entities.be";
+import { getEntities } from "@/utils/entities.be";
-import { countGroups, getGroups } from "@/utils/groups.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 { countUsersByTypes, getUsers } from "@/utils/users.be";
-import { countUsers, getUser, 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,
+  BsBank,
-	BsClipboard2Data,
+  BsEnvelopePaper,
-	BsEnvelopePaper,
+  BsPencilSquare,
-	BsPencilSquare,
+  BsPeople,
-	BsPeople,
+  BsPeopleFill,
-	BsPeopleFill,
+  BsPersonFill,
-	BsPersonFill,
+  BsPersonFillGear,
-	BsPersonFillGear,
 } from "react-icons/bs";
 import { ToastContainer } from "react-toastify";
 
 interface Props {
-	user: User;
+  user: User;
-	students: User[];
+  students: User[];
-	latestStudents: User[]
+  latestStudents: User[];
-	latestTeachers: User[]
+  latestTeachers: User[];
-	entities: EntityWithRoles[];
+  entities: EntityWithRoles[];
-	usersCount: { [key in Type]: number }
+  usersCount: { [key in Type]: number };
-	assignmentsCount: number;
+  assignmentsCount: number;
-	stats: Stat[];
+  stats: Stat[];
-	groupsCount: number;
+  groupsCount: number;
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
+  const user = await requestUser(req, res);
-	if (!user || !user.isVerified) return redirect("/login")
+  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 [
-	const usersCount = {
+    students,
-		student: await countUsers({ type: "student" }),
+    latestStudents,
-		teacher: await countUsers({ type: "teacher" }),
+    latestTeachers,
-		corporate: await countUsers({ type: "corporate" }),
+    usersCount,
-		mastercorporate: await countUsers({ type: "mastercorporate" }),
+    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 assignmentsCount = await countEntitiesAssignments(
-	const latestTeachers = await getUsers({ type: 'teacher' }, 10, { registrationDate: -1 })
+    mapBy(entities, "id"),
+    { archived: { $ne: true } }
+  );
 
-	const entities = await getEntitiesWithRoles();
+  return {
-	const assignmentsCount = await countEntitiesAssignments(mapBy(entities, 'id'), { archived: { $ne: true } });
+    props: serialize({
-	const groupsCount = await countGroups();
+      user,
-
+      students,
-	return { props: serialize({ user, students, latestStudents, latestTeachers, usersCount, entities, assignmentsCount, groupsCount }) };
+      latestStudents,
+      latestTeachers,
+      usersCount,
+      entities,
+      assignmentsCount,
+      groupsCount,
+    }),
+  };
 }, sessionOptions);
 
 export default function Dashboard({
-	user,
+  user,
-	students = [],
+  students = [],
-	latestStudents,
+  latestStudents,
-	latestTeachers,
+  latestTeachers,
-	usersCount,
+  usersCount,
-	entities,
+  entities,
-	assignmentsCount,
+  assignmentsCount,
-	stats = [],
+  stats = [],
-	groupsCount
+  groupsCount,
 }: Props) {
-	const router = useRouter();
+  const router = useRouter();
 
-	return (
+  return (
-		<>
+    <>
-			<Head>
+      <Head>
-				<title>EnCoach</title>
+        <title>EnCoach</title>
-				<meta
+        <meta
-					name="description"
+          name="description"
-					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+          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" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
-				<link rel="icon" href="/favicon.ico" />
+        <link rel="icon" href="/favicon.ico" />
-			</Head>
+      </Head>
-			<ToastContainer />
+      <ToastContainer />
-			<Layout user={user}>
+      <>
-				<section className="grid grid-cols-5 place-items-center -md:grid-cols-2 gap-4 text-center">
+        <section className="grid grid-cols-5 place-items-center -md:grid-cols-2 gap-4 text-center">
-					<IconCard
+          <IconCard
-						onClick={() => router.push("/users?type=student")}
+            onClick={() => router.push("/users?type=student")}
-						Icon={BsPersonFill}
+            Icon={BsPersonFill}
-						label="Students"
+            label="Students"
-						value={usersCount.student}
+            value={usersCount.student}
-						color="purple"
+            color="purple"
-					/>
+          />
-					<IconCard
+          <IconCard
-						onClick={() => router.push("/users?type=teacher")}
+            onClick={() => router.push("/users?type=teacher")}
-						Icon={BsPencilSquare}
+            Icon={BsPencilSquare}
-						label="Teachers"
+            label="Teachers"
-						value={usersCount.teacher}
+            value={usersCount.teacher}
-						color="purple"
+            color="purple"
-					/>
+          />
-					<IconCard
+          <IconCard
-						Icon={BsBank}
+            Icon={BsBank}
-						onClick={() => router.push("/users?type=corporate")}
+            onClick={() => router.push("/users?type=corporate")}
-						label="Corporates"
+            label="Corporates"
-						value={usersCount.corporate}
+            value={usersCount.corporate}
-						color="purple"
+            color="purple"
-					/>
+          />
-					<IconCard
+          <IconCard
-						Icon={BsBank}
+            Icon={BsBank}
-						onClick={() => router.push("/users?type=mastercorporate")}
+            onClick={() => router.push("/users?type=mastercorporate")}
-						label="Master Corporates"
+            label="Master Corporates"
-						value={usersCount.mastercorporate}
+            value={usersCount.mastercorporate}
-						color="purple"
+            color="purple"
-					/>
+          />
-					<IconCard
+          <IconCard
-						Icon={BsPeople}
+            Icon={BsPeople}
-						onClick={() => router.push("/classrooms")}
+            onClick={() => router.push("/classrooms")}
-						label="Classrooms"
+            label="Classrooms"
-						value={groupsCount}
+            value={groupsCount}
-						color="purple"
+            color="purple"
-					/>
+          />
-					<IconCard Icon={BsPeopleFill}
+          <IconCard
-						onClick={() => router.push("/entities")}
+            Icon={BsPeopleFill}
-						label="Entities"
+            onClick={() => router.push("/entities")}
-						value={entities.length}
+            label="Entities"
-						color="purple"
+            value={entities.length}
-					/>
+            color="purple"
-					<IconCard Icon={BsPersonFillGear}
+          />
-						onClick={() => router.push("/statistical")}
+          <IconCard
-						label="Entity Statistics"
+            Icon={BsPersonFillGear}
-						value={entities.length}
+            onClick={() => router.push("/statistical")}
-						color="purple"
+            label="Entity Statistics"
-					/>
+            value={entities.length}
-					<IconCard Icon={BsPersonFillGear}
+            color="purple"
-						onClick={() => router.push("/users/performance")}
+          />
-						label="Student Performance"
+          <IconCard
-						value={usersCount.student}
+            Icon={BsPersonFillGear}
-						color="purple"
+            onClick={() => router.push("/users/performance")}
-					/>
+            label="Student Performance"
-					<IconCard
+            value={usersCount.student}
-						Icon={BsEnvelopePaper}
+            color="purple"
-						onClick={() => router.push("/assignments")}
+          />
-						label="Assignments"
+          <IconCard
-						value={assignmentsCount}
+            Icon={BsEnvelopePaper}
-						color="purple"
+            onClick={() => router.push("/assignments")}
-					/>
+            label="Assignments"
-				</section>
+            value={assignmentsCount}
+            color="purple"
+          />
+        </section>
 
-				<section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
+        <section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
-					<UserDisplayList
+          <UserDisplayList users={latestStudents} title="Latest Students" />
-						users={latestStudents}
+          <UserDisplayList users={latestTeachers} title="Latest Teachers" />
-						title="Latest Students"
+          <UserDisplayList users={students} title="Highest level students" />
-					/>
+          <UserDisplayList
-					<UserDisplayList
+            users={students.sort(
-						users={latestTeachers}
+              (a, b) =>
-						title="Latest Teachers"
+                Object.keys(groupByExam(filterBy(stats, "user", b.id))).length -
-					/>
+                Object.keys(groupByExam(filterBy(stats, "user", a.id))).length
-					<UserDisplayList
+            )}
-						users={students}
+            title="Highest exam count students"
-						title="Highest level students"
+          />
-					/>
+        </section>
-					<UserDisplayList
+      </>
-						users={
+    </>
-							students
+  );
-								.sort(
-									(a, b) =>
-										Object.keys(groupByExam(filterBy(stats, "user", b))).length -
-										Object.keys(groupByExam(filterBy(stats, "user", a))).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,203 +1,269 @@
 /* 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 { Stat, StudentUser, Type, User } from "@/interfaces/user";
-import { Group, 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 { countGroupsByEntities } from "@/utils/groups.be";
-import { checkAccess, findAllowedEntities } from "@/utils/permissions";
+import {
-import { calculateAverageLevel, calculateBandScore } from "@/utils/score";
+  checkAccess,
+  groupAllowedEntitiesByPermissions,
+} from "@/utils/permissions";
 import { groupByExam } from "@/utils/stats";
-import { getStatsByUsers } from "@/utils/stats.be";
+import { countAllowedUsers, getUsers } from "@/utils/users.be";
-import { countAllowedUsers, filterAllowedUsers, getUsers } from "@/utils/users.be";
-import { getEntitiesUsers } 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,
+  BsBank,
-	BsClipboard2Data,
+  BsClock,
-	BsClock,
+  BsEnvelopePaper,
-	BsEnvelopePaper,
+  BsPencilSquare,
-	BsPaperclip,
+  BsPeople,
-	BsPencilSquare,
+  BsPeopleFill,
-	BsPeople,
+  BsPersonFill,
-	BsPeopleFill,
+  BsPersonFillGear,
-	BsPersonFill,
-	BsPersonFillGear,
 } from "react-icons/bs";
 import { ToastContainer } from "react-toastify";
 import { isAdmin } from "@/utils/users";
 
 interface Props {
-	user: User;
+  user: User;
-	students: StudentUser[]
+  students: StudentUser[];
-	latestStudents: User[]
+  latestStudents: User[];
-	latestTeachers: User[]
+  latestTeachers: User[];
-	userCounts: { [key in Type]: number }
+  userCounts: { [key in Type]: number };
-	entities: EntityWithRoles[];
+  entities: EntityWithRoles[];
-	assignmentsCount: number;
+  assignmentsCount: number;
-	stats: Stat[];
+  stats: Stat[];
-	groupsCount: number;
+  groupsCount: number;
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
+  const user = await requestUser(req, res);
-	if (!user || !user.isVerified) return redirect("/login")
+  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 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 allowedStudentEntitiesIDS = mapBy(allowedStudentEntities, "id");
-	const allowedTeacherEntities = findAllowedEntities(user, entities, "view_teachers")
 
-	const students =
+  const entitiesIDS = mapBy(entities, "id") || [];
-		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 userCounts = await countAllowedUsers(user, entities)
+  const [
-	const assignmentsCount = await countEntitiesAssignments(mapBy(entities, "id"), { archived: { $ne: true } });
+    students,
-	const groupsCount = await countGroupsByEntities(mapBy(entities, "id"));
+    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(() =>
+  const totalLicenses = useMemo(
-		userCounts.corporate + userCounts.mastercorporate + userCounts.student + userCounts.teacher, [userCounts])
+    () =>
+      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 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')
+  return (
-	const allowedStudentPerformance = useAllowedEntities(user, entities, 'view_student_performance')
+    <>
+      <Head>
+        <title>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="grid grid-cols-5 place-items-center -md:grid-cols-2 gap-4 text-center">
+          <IconCard
+            onClick={() => router.push("/users?type=student")}
+            Icon={BsPersonFill}
+            label="Students"
+            value={userCounts.student}
+            color="purple"
+          />
+          <IconCard
+            onClick={() => router.push("/users?type=teacher")}
+            Icon={BsPencilSquare}
+            label="Teachers"
+            value={userCounts.teacher}
+            color="purple"
+          />
+          <IconCard
+            onClick={() => router.push("/users?type=corporate")}
+            Icon={BsBank}
+            label="Corporate Accounts"
+            value={userCounts.corporate}
+            color="purple"
+          />
+          <IconCard
+            Icon={BsPeople}
+            onClick={() => router.push("/classrooms")}
+            label="Classrooms"
+            value={groupsCount}
+            color="purple"
+          />
+          <IconCard
+            Icon={BsPeopleFill}
+            onClick={() => router.push("/entities")}
+            label="Entities"
+            value={`${entities.length} - ${totalCount}/${totalLicenses}`}
+            color="purple"
+          />
+          {allowedStudentPerformance.length > 0 && (
+            <IconCard
+              Icon={BsPersonFillGear}
+              onClick={() => router.push("/users/performance")}
+              label="Student Performance"
+              value={userCounts.student}
+              color="purple"
+            />
+          )}
+          {allowedEntityStatistics.length > 0 && (
+            <IconCard
+              Icon={BsPersonFillGear}
+              onClick={() => router.push("/statistical")}
+              label="Entity Statistics"
+              value={allowedEntityStatistics.length}
+              color="purple"
+            />
+          )}
+          <IconCard
+            Icon={BsEnvelopePaper}
+            onClick={() => router.push("/assignments")}
+            label="Assignments"
+            value={assignmentsCount}
+            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"
+            }
+            color="rose"
+          />
+        </section>
 
-	return (
+        <section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
-		<>
+          <UserDisplayList users={latestStudents} title="Latest Students" />
-			<Head>
+          <UserDisplayList users={latestTeachers} title="Latest Teachers" />
-				<title>EnCoach</title>
+          <UserDisplayList users={students} title="Highest level students" />
-				<meta
+          <UserDisplayList
-					name="description"
+            users={students.sort(
-					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+              (a, b) =>
-				/>
+                Object.keys(groupByExam(filterBy(stats, "user", b))).length -
-				<meta name="viewport" content="width=device-width, initial-scale=1" />
+                Object.keys(groupByExam(filterBy(stats, "user", a))).length
-				<link rel="icon" href="/favicon.ico" />
+            )}
-			</Head>
+            title="Highest exam count students"
-			<ToastContainer />
+          />
-			<Layout user={user}>
+        </section>
-				<section className="grid grid-cols-5 place-items-center -md:grid-cols-2 gap-4 text-center">
+      </>
-					<IconCard
+    </>
-						onClick={() => router.push("/users?type=student")}
+  );
-						Icon={BsPersonFill}
-						label="Students"
-						value={userCounts.student}
-						color="purple"
-					/>
-					<IconCard
-						onClick={() => router.push("/users?type=teacher")}
-						Icon={BsPencilSquare}
-						label="Teachers"
-						value={userCounts.teacher}
-						color="purple"
-					/>
-					<IconCard
-						onClick={() => router.push("/users?type=corporate")}
-						Icon={BsBank}
-						label="Corporate Accounts"
-						value={userCounts.corporate}
-						color="purple"
-					/>
-					<IconCard
-						Icon={BsPeople}
-						onClick={() => router.push("/classrooms")}
-						label="Classrooms"
-						value={groupsCount}
-						color="purple"
-					/>
-					<IconCard Icon={BsPeopleFill}
-						onClick={() => router.push("/entities")}
-						label="Entities"
-						value={`${entities.length} - ${totalCount}/${totalLicenses}`}
-						color="purple"
-					/>
-					{allowedStudentPerformance.length > 0 && (
-						<IconCard Icon={BsPersonFillGear}
-							onClick={() => router.push("/users/performance")}
-							label="Student Performance"
-							value={userCounts.student}
-							color="purple"
-						/>
-					)}
-					{allowedEntityStatistics.length > 0 && (
-						<IconCard Icon={BsPersonFillGear}
-							onClick={() => router.push("/statistical")}
-							label="Entity Statistics"
-							value={allowedEntityStatistics.length}
-							color="purple"
-						/>
-					)}
-					<IconCard
-						Icon={BsEnvelopePaper}
-						onClick={() => router.push("/assignments")}
-						label="Assignments"
-						value={assignmentsCount}
-						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"}
-						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={
-							students
-								.sort(
-									(a, b) =>
-										Object.keys(groupByExam(filterBy(stats, "user", b))).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 { Assignment, AssignmentWithHasResults } from "@/interfaces/results";
-import { Stat, User } from "@/interfaces/user";
+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 { getAssignmentsForStudent } from "@/utils/assignments.be";
-import { getAssignmentsByAssignee } from "@/utils/assignments.be";
-import { getEntitiesWithRoles, getEntityWithRoles } from "@/utils/entities.be";
 import { getExamsByIds } from "@/utils/exams.be";
 import { getGradingSystemByEntity } from "@/utils/grading.be";
-import { convertInvitersToEntity, getInvitesByInvitee } from "@/utils/invites.be";
+import {
-import { countExamModules, countFullExams, MODULE_ARRAY, sortByModule, sortByModuleName } from "@/utils/moduleUtils";
+  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 { getDetailedStatsByUser } from "@/utils/stats.be";
-import { getStatsByUser } from "@/utils/stats.be";
 import clsx from "clsx";
 import { withIronSessionSsr } from "iron-session/next";
 import { capitalize, uniqBy } from "lodash";
@@ -35,242 +34,353 @@ 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;
+  user: User;
-	entities: EntityWithRoles[];
+  entities: EntityWithRoles[];
-	assignments: Assignment[];
+  assignments: AssignmentWithHasResults[];
-	stats: Stat[];
+  stats: { fullExams: number; uniqueModules: number; averageScore: number };
-	exams: Exam[];
+  exams: Exam[];
-	sessions: Session[];
+  sessions: Session[];
-	invites: InviteWithEntity[];
+  invites: InviteWithEntity[];
-	grading: Grading;
+  grading: Grading;
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
+  const user = await requestUser(req, res);
-	if (!user || !user.isVerified) return redirect("/login")
+  if (!user || !user.isVerified) return redirect("/login");
 
-	if (!checkAccess(user, ["admin", "developer", "student"]))
+  if (!checkAccess(user, ["admin", "developer", "student"]))
-		return redirect("/")
+    return redirect("/");
 
-	const entityIDS = mapBy(user.entities, "id") || [];
+  const entityIDS = mapBy(user.entities, "id") || [];
+  const currentDate = moment().toISOString();
 
-	const entities = await getEntitiesWithRoles(entityIDS);
+  const [assignments, stats, invites, grading] = await Promise.all([
-	const assignments = await getAssignmentsByAssignee(user.id, { archived: { $ne: true } });
+    getAssignmentsForStudent(user.id, currentDate),
-	const stats = await getStatsByUser(user.id);
+    getDetailedStatsByUser(user.id, "stats"),
-	const sessions = await getSessionsByUser(user.id, 10);
+    getInvitesByInvitee(user.id),
-	const invites = await getInvitesByInvitee(user.id);
+    getGradingSystemByEntity(entityIDS[0] || "", {
-	const grading = await 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 formattedInvites = await Promise.all(invites.map(convertInvitersToEntity));
+  const examIDs = uniqBy(
+    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"
+  );
 
-	const examIDs = uniqBy(
+  const exams = examIDs.length > 0 ? await getExamsByIds(examIDs) : [];
-		assignments.flatMap((a) =>
-			a.exams.filter((e) => e.assignee === user.id).map((e) => ({ module: e.module, id: e.id, key: `${e.module}_${e.id}` })),
-		),
-		"key",
-	);
-	const exams = await getExamsByIds(examIDs);
 
-	return { props: serialize({ user, entities, assignments, stats, exams, sessions, invites: formattedInvites, grading }) };
+  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({
-	const router = useRouter();
+  user,
+  entities,
+  assignments,
+  stats,
+  invites,
+  grading,
+  sessions,
+  exams,
+}: Props) {
+  const router = useRouter();
 
-	const dispatch = useExamStore((state) => state.dispatch);
+  const dispatch = useExamStore((state) => state.dispatch);
 
-	const startAssignment = (assignment: Assignment) => {
+  const startAssignment = (assignment: Assignment) => {
-		const assignmentExams = exams.filter(e => {
+    const assignmentExams = exams.filter((e) => {
-			const exam = findBy(assignment.exams, 'id', e.id)
+      const exam = findBy(assignment.exams, "id", e.id);
-			return !!exam && exam.module === e.module
+      return !!exam && exam.module === e.module;
-		})
+    });
 
-		if (assignmentExams.every((x) => !!x)) {
+    if (assignmentExams.every((x) => !!x)) {
-			dispatch({
+      dispatch({
-				type: "INIT_EXAM", payload: {
+        type: "INIT_EXAM",
-					exams: assignmentExams.sort(sortByModule),
+        payload: {
-					modules: mapBy(assignmentExams.sort(sortByModule), 'module'),
+          exams: assignmentExams.sort(sortByModule),
-					assignment
+          modules: mapBy(assignmentExams.sort(sortByModule), "module"),
-				}
+          assignment,
-			})
+        },
+      });
 
-			router.push("/exam");
+      router.push("/exam");
-		}
+    }
-	};
+  };
 
-	const studentAssignments = useMemo(() => assignments.filter(activeAssignmentFilter), [assignments]);
+  const entitiesLabels = useMemo(
+    () => (entities.length > 0 ? mapBy(entities, "label")?.join(", ") : ""),
+    [entities]
+  );
 
-	return (
+  return (
-		<>
+    <>
-			<Head>
+      <Head>
-				<title>EnCoach</title>
+        <title>EnCoach</title>
-				<meta
+        <meta
-					name="description"
+          name="description"
-					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+          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" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
-				<link rel="icon" href="/favicon.ico" />
+        <link rel="icon" href="/favicon.ico" />
-			</Head>
+      </Head>
-			<ToastContainer />
+      <ToastContainer />
-			<Layout user={user}>
+      <>
-				{entities.length > 0 && (
+        {entities.length > 0 && (
-					<div className="absolute right-4 top-4 rounded-lg bg-neutral-200 px-2 py-1">
+          <div className="rounded-lg bg-neutral-200 px-2 py-1 ">
-						<b>{mapBy(entities, "label")?.join(", ")}</b>
+            <b>{entitiesLabels}</b>
-					</div>
+          </div>
-				)}
+        )}
 
-				<ProfileSummary
+        <ProfileSummary
-					user={user}
+          user={user}
-					items={[
+          items={[
-						{
+            {
-							icon: <BsFileEarmarkText className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />,
+              icon: (
-							value: countFullExams(stats),
+                <BsFileEarmarkText className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />
-							label: "Exams",
+              ),
-							tooltip: "Number of all conducted completed exams",
+              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),
+            {
-							label: "Modules",
+              icon: (
-							tooltip: "Number of all exam modules performed including Level Test",
+                <BsPencil className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />
-						},
+              ),
-						{
+              value: stats?.uniqueModules || 0,
-							icon: <BsStar className="text-mti-red-light h-6 w-6 md:h-8 md:w-8" />,
+              label: "Modules",
-							value: `${stats.length > 0 ? averageScore(stats) : 0}%`,
+              tooltip:
-							label: "Average Score",
+                "Number of all exam modules performed including Level Test",
-							tooltip: "Average success rate for questions responded",
+            },
-						},
+            {
-					]}
+              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",
+            },
+          ]}
+        />
 
-				{/* Assignments */}
+        {/* Assignments */}
-				<section className="flex flex-col gap-1 md:gap-3">
+        <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-black text-lg font-bold">Assignments</span>
-					<span className="text-mti-gray-taupe scrollbar-hide flex gap-8 overflow-x-scroll">
+          <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."}
+            {assignments.length === 0 &&
-						{studentAssignments
+              "Assignments will appear here. It seems that for now there are no assignments for you."}
-							.sort((a, b) => moment(a.startDate).diff(b.startDate))
+            {assignments.map((assignment) => (
-							.map((assignment) => (
+              <div
-								<div
+                className={clsx(
-									className={clsx(
+                  "border-mti-gray-anti-flash flex min-w-[350px] flex-col gap-6 rounded-xl border p-4",
-										"border-mti-gray-anti-flash flex min-w-[350px] flex-col gap-6 rounded-xl border p-4",
+                  assignment.hasResults && "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">
+                <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">
-										<span className="flex justify-between gap-1 text-lg">
+                    {assignment.name}
-											<span>{moment(assignment.startDate).format("DD/MM/YY, HH:mm")}</span>
+                  </h3>
-											<span>-</span>
+                  <span className="flex justify-between gap-1 text-lg">
-											<span>{moment(assignment.endDate).format("DD/MM/YY, HH:mm")}</span>
+                    <span>
-										</span>
+                      {moment(assignment.startDate).format("DD/MM/YY, HH:mm")}
-									</div>
+                    </span>
-									<div className="flex w-full items-center justify-between">
+                    <span>-</span>
-										<div className="-md:mt-2 grid w-fit min-w-[140px] grid-cols-2 grid-rows-2 place-items-center justify-between gap-4">
+                    <span>
-											{assignment.exams
+                      {moment(assignment.endDate).format("DD/MM/YY, HH:mm")}
-												.filter((e) => e.assignee === user.id)
+                    </span>
-												.map((e) => e.module)
+                  </span>
-												.sort(sortByModuleName)
+                </div>
-												.map((module) => (
+                <div className="flex w-full items-center justify-between">
-													<ModuleBadge className="scale-110 w-full" key={module} module={module} />
+                  <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.map((e) => (
-										</div>
+                      <ModuleBadge
-										{!assignment.results.map((r) => r.user).includes(user.id) && (
+                        className="scale-110 w-full"
-											<>
+                        key={e.module}
-												<div
+                        module={e.module}
-													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">
+                  </div>
-														Start
+                  {!assignment.hasResults && (
-													</Button>
+                    <>
-												</div>
+                      <div
-												<div
+                        className="tooltip flex h-full w-full items-center justify-end pl-8 md:hidden"
-													data-tip="You have already started this assignment!"
+                        data-tip="Your screen size is too small to perform an assignment"
-													className={clsx(
+                      >
-														"-md:hidden h-full w-full max-w-[50%] cursor-pointer",
+                        <Button
-														sessions.filter((x) => x.assignment?.id === assignment.id).length > 0 && "tooltip",
+                          className="h-full w-full !rounded-xl"
-													)}>
+                          variant="outline"
-													<Button
+                        >
-														className={clsx("w-full h-full !rounded-xl")}
+                          Start
-														onClick={() => startAssignment(assignment)}
+                        </Button>
-														variant="outline"
+                      </div>
-														disabled={sessions.filter((x) => x.assignment?.id === assignment.id).length > 0}>
+                      <div
-														Start
+                        data-tip="You have already started this assignment!"
-													</Button>
+                        className={clsx(
-												</div>
+                          "-md:hidden h-full w-full max-w-[50%] cursor-pointer",
-											</>
+                          sessions.filter(
-										)}
+                            (x) => x.assignment?.id === assignment.id
-										{assignment.results.map((r) => r.user).includes(user.id) && (
+                          ).length > 0 && "tooltip"
-											<Button
+                        )}
-												onClick={() => router.push("/record")}
+                      >
-												color="green"
+                        <Button
-												className="-md:hidden h-full w-full max-w-[50%] !rounded-xl"
+                          className={clsx("w-full h-full !rounded-xl")}
-												variant="outline">
+                          onClick={() => startAssignment(assignment)}
-												Submitted
+                          variant="outline"
-											</Button>
+                          disabled={
-										)}
+                            sessions.filter(
-									</div>
+                              (x) => x.assignment?.id === assignment.id
-								</div>
+                            ).length > 0
-							))}
+                          }
-					</span>
+                        >
-				</section>
+                          Start
+                        </Button>
+                      </div>
+                    </>
+                  )}
+                  {assignment.hasResults && (
+                    <Button
+                      onClick={() => router.push("/record")}
+                      color="green"
+                      className="-md:hidden h-full w-full max-w-[50%] !rounded-xl"
+                      variant="outline"
+                    >
+                      Submitted
+                    </Button>
+                  )}
+                </div>
+              </div>
+            ))}
+          </span>
+        </section>
 
-				{/* Invites */}
+        {/* Invites */}
-				{invites.length > 0 && (
+        {invites.length > 0 && (
-					<section className="flex flex-col gap-1 md:gap-3">
+          <section className="flex flex-col gap-1 md:gap-3">
-						<span className="text-mti-gray-taupe scrollbar-hide flex gap-8 overflow-x-scroll">
+            <span className="text-mti-gray-taupe scrollbar-hide flex gap-8 overflow-x-scroll">
-							{invites.map((invite) => (
+              {invites.map((invite) => (
-								<InviteWithUserCard key={invite.id} invite={invite} reload={() => router.replace(router.asPath)} />
+                <InviteWithUserCard
-							))}
+                  key={invite.id}
-						</span>
+                  invite={invite}
-					</section>
+                  reload={() => router.replace(router.asPath)}
-				)}
+                />
+              ))}
+            </span>
+          </section>
+        )}
 
-				{/* Score History */}
+        {/* Score History */}
-				<section className="flex flex-col gap-3">
+        <section className="flex flex-col gap-3">
-					<span className="text-lg font-bold">Score History</span>
+          <span className="text-lg font-bold">Score History</span>
-					<div className="-md:grid-rows-4 grid gap-6 md:grid-cols-2">
+          <div className="-md:grid-rows-4 grid gap-6 md:grid-cols-2">
-						{MODULE_ARRAY.map((module) => {
+            {MODULE_ARRAY.map((module) => {
-							const desiredLevel = user.desiredLevels[module] || 9;
+              const desiredLevel = user.desiredLevels[module] || 9;
-							const level = user.levels[module] || 0;
+              const level = user.levels[module] || 0;
-							return (
+              return (
-								<div className="border-mti-gray-anti-flash flex flex-col gap-2 rounded-xl border p-4" key={module}>
+                <div
-									<div className="flex items-center gap-2 md:gap-3">
+                  className="border-mti-gray-anti-flash flex flex-col gap-2 rounded-xl border p-4 w-full"
-										<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">
+                  key={module}
-											{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" />}
+                  <div className="flex items-center gap-2 md:gap-3">
-											{module === "writing" && <BsPen className="text-ielts-writing h-4 w-4 md:h-5 md:w-5" />}
+                    <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 === "speaking" && <BsMegaphone className="text-ielts-speaking h-4 w-4 md:h-5 md:w-5" />}
+                      {module === "reading" && (
-											{module === "level" && <BsClipboard className="text-ielts-level h-4 w-4 md:h-5 md:w-5" />}
+                        <BsBook className="text-ielts-reading h-4 w-4 md:h-5 md:w-5" />
-										</div>
+                      )}
-										<div className="flex w-full justify-between">
+                      {module === "listening" && (
-											<span className="text-sm font-bold md:font-extrabold">{capitalize(module)}</span>
+                        <BsHeadphones className="text-ielts-listening h-4 w-4 md:h-5 md:w-5" />
-											<span className="text-mti-gray-dim text-sm font-normal">
+                      )}
-												{module === "level" && !!grading && `English Level: ${getGradingLabel(level, grading.steps)}`}
+                      {module === "writing" && (
-												{module !== "level" && `Level ${level} / Level 9 (Desired Level: ${desiredLevel})`}
+                        <BsPen className="text-ielts-writing h-4 w-4 md:h-5 md:w-5" />
-											</span>
+                      )}
-										</div>
+                      {module === "speaking" && (
-									</div>
+                        <BsMegaphone className="text-ielts-speaking h-4 w-4 md:h-5 md:w-5" />
-									<div className="md:pl-14">
+                      )}
-										<ProgressBar
+                      {module === "level" && (
-											color={module}
+                        <BsClipboard className="text-ielts-level h-4 w-4 md:h-5 md:w-5" />
-											label=""
+                      )}
-											mark={module === "level" ? undefined : Math.round((desiredLevel * 100) / 9)}
+                    </div>
-											markLabel={`Desired Level: ${desiredLevel}`}
+                    <div className="flex w-full justify-between">
-											percentage={module === "level" ? level : Math.round((level * 100) / 9)}
+                      <span className="text-sm font-bold md:font-extrabold">
-											className="h-2 w-full"
+                        {capitalize(module)}
-										/>
+                      </span>
-									</div>
+                      <span className="text-mti-gray-dim text-sm font-normal">
-								</div>
+                        {module === "level" &&
-							);
+                          !!grading &&
-						})}
+                          `English Level: ${getGradingLabel(
-					</div>
+                            level,
-				</section>
+                            grading.steps
-			</Layout>
+                          )}`}
-		</>
+                        {module !== "level" &&
-	);
+                          `Level ${level} / Level 9 (Desired Level: ${desiredLevel})`}
+                      </span>
+                    </div>
+                  </div>
+                  <div className="md:pl-14">
+                    <ProgressBar
+                      color={module}
+                      label=""
+                      mark={
+                        module === "level"
+                          ? undefined
+                          : Math.round((desiredLevel * 100) / 9)
+                      }
+                      markLabel={`Desired Level: ${desiredLevel}`}
+                      percentage={
+                        module === "level"
+                          ? level
+                          : Math.round((level * 100) / 9)
+                      }
+                      className="h-2 w-full"
+                    />
+                  </div>
+                </div>
+              );
+            })}
+          </div>
+        </section>
+      </>
+    </>
+  );
 }

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,138 +10,189 @@ 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 {
-import { BsClipboard2Data, BsEnvelopePaper, BsPaperclip, BsPeople, BsPersonFill, BsPersonFillGear } from "react-icons/bs";
+  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;
+  user: User;
-	users: User[];
+  students: User[];
-	entities: EntityWithRoles[];
+  entities: EntityWithRoles[];
-	assignments: Assignment[];
+  assignments: Assignment[];
-	stats: Stat[];
+  stats: Stat[];
-	groups: Group[];
+  groups: Group[];
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
+  const user = await requestUser(req, res);
-	if (!user || !user.isVerified) return redirect("/login")
+  if (!user || !user.isVerified) return redirect("/login");
 
-	if (!checkAccess(user, ["admin", "developer", "teacher"]))
+  if (!checkAccess(user, ["admin", "developer", "teacher"]))
-		return redirect("/")
+    return redirect("/");
 
-	const entityIDS = mapBy(user.entities, "id") || [];
+  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 entities = await getEntitiesWithRoles(
-	const stats = await getStatsByUsers(users.map((u) => u.id));
+    isAdmin(user) ? undefined : entityIDS
-	const groups = await getGroupsByEntities(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) {
+export default function Dashboard({
-	const students = useMemo(() => users.filter((u) => u.type === "student"), [users]);
+  user,
-	const router = useRouter();
+  students,
+  entities,
+  assignments,
+  stats,
+  groups,
+}: Props) {
+  const router = useRouter();
 
-	const allowedEntityStatistics = useAllowedEntities(user, entities, 'view_entity_statistics')
+  const allowedEntityStatistics = useAllowedEntities(
-	const allowedStudentPerformance = useAllowedEntities(user, entities, 'view_student_performance')
+    user,
+    entities,
+    "view_entity_statistics"
+  );
+  const allowedStudentPerformance = useAllowedEntities(
+    user,
+    entities,
+    "view_student_performance"
+  );
+  const entitiesLabels = useMemo(
+    () => mapBy(entities, "label")?.join(", "),
+    [entities]
+  );
 
-	return (
+  return (
-		<>
+    <>
-			<Head>
+      <Head>
-				<title>EnCoach</title>
+        <title>EnCoach</title>
-				<meta
+        <meta
-					name="description"
+          name="description"
-					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+          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" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
-				<link rel="icon" href="/favicon.ico" />
+        <link rel="icon" href="/favicon.ico" />
-			</Head>
+      </Head>
-			<ToastContainer />
+      <ToastContainer />
-			<Layout user={user}>
+      <>
-				<div className="w-full flex flex-col gap-4">
+        <div className="w-full flex flex-col gap-4">
-					{entities.length > 0 && (
+          {entities.length > 0 && (
-						<div className="w-fit self-end bg-neutral-200 px-2 rounded-lg py-1">
+            <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>
+            </div>
-					)}
+          )}
-					<section className="grid grid-cols-5 -md:grid-cols-2 place-items-center gap-4 text-center">
+          <section className="grid grid-cols-5 -md:grid-cols-2 place-items-center gap-4 text-center">
-						<IconCard
+            <IconCard
-							Icon={BsPersonFill}
+              Icon={BsPersonFill}
-							onClick={() => router.push("/users?type=student")}
+              onClick={() => router.push("/users?type=student")}
-							label="Students"
+              label="Students"
-							value={students.length}
+              value={students.length}
-							color="purple"
+              color="purple"
-						/>
+            />
-						<IconCard
+            <IconCard
-							onClick={() => router.push("/classrooms")}
+              onClick={() => router.push("/classrooms")}
-							Icon={BsPeople}
+              Icon={BsPeople}
-							label="Classrooms"
+              label="Classrooms"
-							value={groups.length}
+              value={groups.length}
-							color="purple"
+              color="purple"
-						/>
+            />
-						{allowedStudentPerformance.length > 0 && (
+            {allowedStudentPerformance.length > 0 && (
-							<IconCard Icon={BsPersonFillGear}
+              <IconCard
-								onClick={() => router.push("/users/performance")}
+                Icon={BsPersonFillGear}
-								label="Student Performance"
+                onClick={() => router.push("/users/performance")}
-								value={students.length}
+                label="Student Performance"
-								color="purple"
+                value={students.length}
-							/>
+                color="purple"
-						)}
+              />
-						{allowedEntityStatistics.length > 0 && (
+            )}
-							<IconCard Icon={BsPersonFillGear}
+            {allowedEntityStatistics.length > 0 && (
-								onClick={() => router.push("/statistical")}
+              <IconCard
-								label="Entity Statistics"
+                Icon={BsPersonFillGear}
-								value={allowedEntityStatistics.length}
+                onClick={() => router.push("/statistical")}
-								color="purple"
+                label="Entity Statistics"
-							/>
+                value={allowedEntityStatistics.length}
-						)}
+                color="purple"
-						<IconCard
+              />
-							Icon={BsEnvelopePaper}
+            )}
-							onClick={() => router.push("/assignments")}
+            <IconCard
-							label="Assignments"
+              Icon={BsEnvelopePaper}
-							value={assignments.filter((a) => !a.archived).length}
+              onClick={() => router.push("/assignments")}
-							color="purple"
+              label="Assignments"
-						/>
+              value={assignments.filter((a) => !a.archived).length}
-					</section>
+              color="purple"
-				</div>
+            />
+          </section>
+        </div>
 
-				<section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
+        <section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
-					<UserDisplayList
+          <UserDisplayList
-						users={students.sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))}
+            users={students.sort((a, b) =>
-						title="Latest Students"
+              dateSorter(a, b, "desc", "registrationDate")
-					/>
+            )}
-					<UserDisplayList
+            title="Latest Students"
-						users={students.sort((a, b) => calculateAverageLevel(b.levels) - calculateAverageLevel(a.levels))}
+          />
-						title="Highest level students"
+          <UserDisplayList
-					/>
+            users={students.sort(
-					<UserDisplayList
+              (a, b) =>
-						users={
+                calculateAverageLevel(b.levels) -
-							students
+                calculateAverageLevel(a.levels)
-								.sort(
+            )}
-									(a, b) =>
+            title="Highest level students"
-										Object.keys(groupByExam(filterBy(stats, "user", b))).length -
+          />
-										Object.keys(groupByExam(filterBy(stats, "user", a))).length,
+          <UserDisplayList
-								)
+            users={students.sort(
-						}
+              (a, b) =>
-						title="Highest exam count students"
+                Object.keys(groupByExam(filterBy(stats, "user", b))).length -
-					/>
+                Object.keys(groupByExam(filterBy(stats, "user", a))).length
-				</section>
+            )}
-			</Layout>
+            title="Highest exam count students"
-		</>
+          />
-	);
+        </section>
+      </>
+    </>
+  );
 }

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

@@ -1,137 +1,139 @@
-import Layout from "@/components/High/Layout";
 import Checkbox from "@/components/Low/Checkbox";
 import Separator from "@/components/Low/Separator";
-import { useEntityPermission } from "@/hooks/useEntityPermissions";
+import {useEntityPermission} from "@/hooks/useEntityPermissions";
-import { EntityWithRoles, Role } from "@/interfaces/entity";
+import {EntityWithRoles, Role} from "@/interfaces/entity";
-import { User } from "@/interfaces/user";
+import {User} from "@/interfaces/user";
-import { sessionOptions } from "@/lib/session";
+import {sessionOptions} from "@/lib/session";
-import { RolePermission } from "@/resources/entityPermissions";
+import {RolePermission} from "@/resources/entityPermissions";
-import { findBy, mapBy, redirect, serialize } from "@/utils";
+import {findBy, mapBy, redirect, serialize} from "@/utils";
-import { requestUser } from "@/utils/api";
+import {requestUser} from "@/utils/api";
-import { getEntityWithRoles } from "@/utils/entities.be";
+import {getEntityWithRoles} from "@/utils/entities.be";
-import { shouldRedirectHome } from "@/utils/navigation.disabled";
+import {shouldRedirectHome} from "@/utils/navigation.disabled";
-import { doesEntityAllow } from "@/utils/permissions";
+import {doesEntityAllow} from "@/utils/permissions";
-import { isAdmin } from "@/utils/users";
+import {isAdmin} from "@/utils/users";
-import { countEntityUsers } from "@/utils/users.be";
+import {countEntityUsers} from "@/utils/users.be";
 import axios from "axios";
-import { withIronSessionSsr } from "iron-session/next";
+import {withIronSessionSsr} from "iron-session/next";
 import Head from "next/head";
 import Link from "next/link";
-import { useRouter } from "next/router";
+import {useRouter} from "next/router";
-import { Divider } from "primereact/divider";
+import {Divider} from "primereact/divider";
-import { useState } from "react";
+import {useState} from "react";
-import {
+import {BsCheck, BsChevronLeft, BsTag, BsTrash} from "react-icons/bs";
-	BsCheck,
+import {toast} from "react-toastify";
-	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" },
+	{label: "View Students", key: "view_students"},
-	{ label: "View Teachers", key: "view_teachers" },
+	{label: "View Teachers", key: "view_teachers"},
-	{ label: "View Corporate Accounts", key: "view_corporates" },
+	{label: "View Corporate Accounts", key: "view_corporates"},
-	{ label: "View Master Corporate Accounts", key: "view_mastercorporates" },
+	{label: "View Master Corporate Accounts", key: "view_mastercorporates"},
-	{ label: "Edit Students", key: "edit_students" },
+	{label: "Edit Students", key: "edit_students"},
-	{ label: "Edit Teachers", key: "edit_teachers" },
+	{label: "Edit Teachers", key: "edit_teachers"},
-	{ label: "Edit Corporate Accounts", key: "edit_corporates" },
+	{label: "Edit Corporate Accounts", key: "edit_corporates"},
-	{ label: "Edit Master Corporate Accounts", key: "edit_mastercorporates" },
+	{label: "Edit Master Corporate Accounts", key: "edit_mastercorporates"},
-	{ label: "Delete Students", key: "delete_students" },
+	{label: "Delete Students", key: "delete_students"},
-	{ label: "Delete Teachers", key: "delete_teachers" },
+	{label: "Delete Teachers", key: "delete_teachers"},
-	{ label: "Delete Corporate Accounts", key: "delete_corporates" },
+	{label: "Delete Corporate Accounts", key: "delete_corporates"},
-	{ label: "Delete Master Corporate Accounts", key: "delete_mastercorporates" },
+	{label: "Delete Master Corporate Accounts", key: "delete_mastercorporates"},
-	{ label: "Create a Single User", key: "create_user" },
+	{label: "Create a Single User", key: "create_user"},
-	{ label: "Create Users in Batch", key: "create_user_batch" },
+	{label: "Create Users in Batch", key: "create_user_batch"},
-	{ label: "Create a Single Code", key: "create_code" },
+	{label: "Create a Single Code", key: "create_code"},
-	{ label: "Create Codes in Batch", key: "create_code_batch" },
+	{label: "Create Codes in Batch", key: "create_code_batch"},
-	{ label: "Download User List", key: "download_user_list" },
+	{label: "Download User List", key: "download_user_list"},
-	{ label: "View Code List", key: "view_code_list" },
+	{label: "View Code List", key: "view_code_list"},
-	{ label: "Delete Code", key: "delete_code" },
+	{label: "Delete Code", key: "delete_code"},
-]
+];
 
 const EXAM_MANAGEMENT: PermissionLayout[] = [
-	{ label: "View Reading", key: "view_reading" },
+	{label: "View Reading", key: "view_reading"},
-	{ label: "Generate Reading", key: "generate_reading" },
+	{label: "Generate Reading", key: "generate_reading"},
-	{ label: "Delete Reading", key: "delete_reading" },
+	{label: "Delete Reading", key: "delete_reading"},
-	{ label: "View Listening", key: "view_listening" },
+	{label: "View Listening", key: "view_listening"},
-	{ label: "Generate Listening", key: "generate_listening" },
+	{label: "Generate Listening", key: "generate_listening"},
-	{ label: "Delete Listening", key: "delete_listening" },
+	{label: "Delete Listening", key: "delete_listening"},
-	{ label: "View Writing", key: "view_writing" },
+	{label: "View Writing", key: "view_writing"},
-	{ label: "Generate Writing", key: "generate_writing" },
+	{label: "Generate Writing", key: "generate_writing"},
-	{ label: "Delete Writing", key: "delete_writing" },
+	{label: "Delete Writing", key: "delete_writing"},
-	{ label: "View Speaking", key: "view_speaking" },
+	{label: "View Speaking", key: "view_speaking"},
-	{ label: "Generate Speaking", key: "generate_speaking" },
+	{label: "Generate Speaking", key: "generate_speaking"},
-	{ label: "Delete Speaking", key: "delete_speaking" },
+	{label: "Delete Speaking", key: "delete_speaking"},
-	{ label: "View Level", key: "view_level" },
+	{label: "View Level", key: "view_level"},
-	{ label: "Generate Level", key: "generate_level" },
+	{label: "Generate Level", key: "generate_level"},
-	{ label: "Delete Level", key: "delete_level" },
+	{label: "Delete Level", key: "delete_level"},
-	{ label: "View Statistics", key: "view_statistics" },
+	{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" },
+	{label: "View Classrooms", key: "view_classrooms"},
-	{ label: "Create Classrooms", key: "create_classroom" },
+	{label: "Create Classrooms", key: "create_classroom"},
-	{ label: "Rename Classrooms", key: "rename_classrooms" },
+	{label: "Rename Classrooms", key: "rename_classrooms"},
-	{ label: "Add to Classroom", key: "add_to_classroom" },
+	{label: "Add to Classroom", key: "add_to_classroom"},
-	{ label: "Upload to Classroom", key: "upload_classroom" },
+	{label: "Upload to Classroom", key: "upload_classroom"},
-	{ label: "Remove from Classroom", key: "remove_from_classroom" },
+	{label: "Remove from Classroom", key: "remove_from_classroom"},
-	{ label: "Delete Classroom", key: "delete_classroom" },
+	{label: "Delete Classroom", key: "delete_classroom"},
-	{ label: "View Student Record", key: "view_student_record" },
+	{label: "View Student Record", key: "view_student_record"},
-	{ label: "Download Student Report", key: "download_student_record" },
+	{label: "Download Student Report", key: "download_student_record"},
-]
+];
 
 const ENTITY_MANAGEMENT: PermissionLayout[] = [
-	{ label: "View Entities", key: "view_entities" },
+	{label: "View Entities", key: "view_entities"},
-	{ label: "View Entity Statistics", key: "view_entity_statistics" },
+	{label: "View Entity Statistics", key: "view_entity_statistics"},
-	{ label: "Rename Entity", key: "rename_entity" },
+	{label: "Rename Entity", key: "rename_entity"},
-	{ label: "Add to Entity", key: "add_to_entity" },
+	{label: "Add to Entity", key: "add_to_entity"},
-	{ label: "Remove from Entity", key: "remove_from_entity" },
+	{label: "Remove from Entity", key: "remove_from_entity"},
-	{ label: "Delete Entity", key: "delete_entity" },
+	{label: "Delete Entity", key: "delete_entity"},
-	{ label: "View Entity Roles", key: "view_entity_roles" },
+	{label: "View Entity Roles", key: "view_entity_roles"},
-	{ label: "Create Entity Role", key: "create_entity_role" },
+	{label: "Create Entity Role", key: "create_entity_role"},
-	{ label: "Rename Entity Role", key: "rename_entity_role" },
+	{label: "Rename Entity Role", key: "rename_entity_role"},
-	{ label: "Edit Role Permissions", key: "edit_role_permissions" },
+	{label: "Edit Role Permissions", key: "edit_role_permissions"},
-	{ label: "Assign Role to User", key: "assign_to_role" },
+	{label: "Assign Role to User", key: "assign_to_role"},
-	{ label: "Delete Entity Role", key: "delete_entity_role" },
+	{label: "Delete Entity Role", key: "delete_entity_role"},
-	{ label: "Download Statistics Report", key: "download_statistics_report" },
+	{label: "Download Statistics Report", key: "download_statistics_report"},
-	{ label: "Edit Grading System", key: "edit_grading_system" },
+	{label: "Edit Grading System", key: "edit_grading_system"},
-	{ label: "View Student Performance", key: "view_student_performance" },
+	{label: "View Student Performance", key: "view_student_performance"},
-	{ label: "Pay for Entity", key: "pay_entity" },
+	{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" },
+	{label: "View Assignments", key: "view_assignments"},
-	{ label: "Create Assignments", key: "create_assignment" },
+	{label: "Create Assignments", key: "create_assignment"},
-	{ label: "Start Assignments", key: "start_assignment" },
+	{label: "Start Assignments", key: "start_assignment"},
-	{ label: "Edit Assignments", key: "edit_assignment" },
+	{label: "Edit Assignments", key: "edit_assignment"},
-	{ label: "Delete Assignments", key: "delete_assignment" },
+	{label: "Delete Assignments", key: "delete_assignment"},
-	{ label: "Archive Assignments", key: "archive_assignment" },
+	{label: "Archive Assignments", key: "archive_assignment"},
-]
+];
 
-export const getServerSideProps = withIronSessionSsr(async ({ req, res, params }) => {
+const WORKFLOW_MANAGEMENT: PermissionLayout[] = [
-	const user = await requestUser(req, res)
+	{label: "View Workflows", key: "view_workflows"},
-	if (!user) return redirect("/login")
+	{label: "Configure Workflows", key: "configure_workflows"},
+	{label: "Edit Workflow", key: "edit_workflow"},
+	{label: "Delete Workflow", key: "delete_workflow"},
+];
 
-	if (shouldRedirectHome(user)) return redirect("/")
+export const getServerSideProps = withIronSessionSsr(async ({req, res, params}) => {
+	const user = await requestUser(req, res);
+	if (!user) return redirect("/login");
 
-	const { id, role } = params as { id: string, role: string };
+	if (shouldRedirectHome(user)) return redirect("/");
 
-	if (!mapBy(user.entities, 'id').includes(id) && !["admin", "developer"].includes(user.type)) return redirect("/entities")
+	const {id, role} = params as {id: string; role: string};
+
+	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)
+	const entityRole = findBy(entity.roles, "id", role);
-	if (!entityRole) return redirect(`/entities/${id}/roles`)
+	if (!entityRole) return redirect(`/entities/${id}/roles`);
 
-	if (!doesEntityAllow(user, entity, "view_entity_roles")) return redirect(`/entities/${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 disableEdit = !isAdmin(user) && findBy(user.entities, "id", entity.id)?.role === entityRole.id;
 
-	const userCount = await countEntityUsers(id, { "entities.role": role });
+	const userCount = await countEntityUsers(id, {"entities.role": role});
 
 	return {
 		props: serialize({
@@ -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) {
+export default function EntityRole({user, entity, role, userCount, disableEdit}: Props) {
-	const [permissions, setPermissions] = useState(role.permissions)
+	const [permissions, setPermissions] = useState(role.permissions);
 	const [isLoading, setIsLoading] = useState(false);
 
 	const router = useRouter();
 
-	const canEditPermissions = useEntityPermission(user, entity, "edit_role_permissions")
+	const canEditPermissions = useEntityPermission(user, entity, "edit_role_permissions");
-	const canRenameRole = useEntityPermission(user, entity, "rename_entity_role")
+	const canRenameRole = useEntityPermission(user, entity, "rename_entity_role");
-	const canDeleteRole = useEntityPermission(user, entity, "delete_entity_role")
+	const canDeleteRole = useEntityPermission(user, entity, "delete_entity_role");
-
 
 	const renameRole = () => {
 		if (!canRenameRole || disableEdit) return;
@@ -171,7 +172,7 @@ export default function Role({ user, entity, role, userCount, disableEdit }: Pro
 
 		setIsLoading(true);
 		axios
-			.patch(`/api/roles/${role.id}`, { label })
+			.patch(`/api/roles/${role.id}`, {label})
 			.then(() => {
 				toast.success("The role has been updated successfully!");
 				router.replace(router.asPath);
@@ -203,12 +204,12 @@ export default function Role({ user, entity, role, userCount, disableEdit }: Pro
 	};
 
 	const editPermissions = () => {
-		if (!canEditPermissions || disableEdit) return
+		if (!canEditPermissions || disableEdit) return;
 
 		setIsLoading(true);
 
 		axios
-			.patch(`/api/roles/${role.id}`, { permissions })
+			.patch(`/api/roles/${role.id}`, {permissions})
 			.then(() => {
 				toast.success("This role has been successfully updated!");
 				router.replace(router.asPath);
@@ -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
+		if (!canEditPermissions || disableEdit) return false;
-		return doesEntityAllow(user, entity, permission)
+		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))}
+									isChecked={mapBy(USER_MANAGEMENT, "key").every((k) => permissions.includes(k))}
-									onChange={() => toggleMultiplePermissions(mapBy(USER_MANAGEMENT, 'key').filter(enableCheckbox))}
+									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 }) => (
+								{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))}
+									isChecked={mapBy(EXAM_MANAGEMENT, "key").every((k) => permissions.includes(k))}
-									onChange={() => toggleMultiplePermissions(mapBy(EXAM_MANAGEMENT, 'key').filter(enableCheckbox))}
+									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 }) => (
+								{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))}
+									isChecked={mapBy(CLASSROOM_MANAGEMENT, "key").every((k) => permissions.includes(k))}
-									onChange={() => toggleMultiplePermissions(mapBy(CLASSROOM_MANAGEMENT, 'key').filter(enableCheckbox))}
+									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 }) => (
+								{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))}
+									isChecked={mapBy(ENTITY_MANAGEMENT, "key").every((k) => permissions.includes(k))}
-									onChange={() => toggleMultiplePermissions(mapBy(ENTITY_MANAGEMENT, 'key').filter(enableCheckbox))}
+									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 }) => (
+								{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))}
+									isChecked={mapBy(ASSIGNMENT_MANAGEMENT, "key").every((k) => permissions.includes(k))}
-									onChange={() => toggleMultiplePermissions(mapBy(ASSIGNMENT_MANAGEMENT, 'key').filter(enableCheckbox))}
+									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 }) => (
+								{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 { EntityWithRoles, Role} from "@/interfaces/entity";
-import usePagination from "@/hooks/usePagination";
+import { User} from "@/interfaces/user";
-import {Entity, EntityWithRoles, Role} from "@/interfaces/entity";
-import {GroupWithUsers, 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 { doesEntityAllow} from "@/utils/permissions";
-import {getUserName} from "@/utils/users";
+import {getEntityUsers} from "@/utils/users.be";
-import {getEntityUsers, getLinkedUsers, getSpecificUsers} 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 { redirect, serialize } from "@/utils";
-import { getEntities, getEntitiesWithRoles } from "@/utils/entities.be";
 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,162 +20,218 @@ 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)
+  const user = await requestUser(req, res);
-	if (!user) return redirect("/login")
+  if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user)) return redirect("/")
+  if (shouldRedirectHome(user)) return redirect("/");
-	if (!["admin", "developer"].includes(user.type)) return redirect("/entities")
+  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 {
+  return {
-		props: serialize({ user, users: users.filter((x) => x.id !== user.id) }),
+    props: serialize({ user, users }),
-	};
+  };
 }, sessionOptions);
 
 interface Props {
-	user: User;
+  user: User;
-	users: User[];
+  users: User[];
 }
 
 export default function Home({ user, users }: Props) {
-	const [isLoading, setIsLoading] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
-	const [selectedUsers, setSelectedUsers] = useState<string[]>([]);
+  const [selectedUsers, setSelectedUsers] = useState<string[]>([]);
-	const [label, setLabel] = useState("");
+  const [label, setLabel] = useState("");
-	const [licenses, setLicenses] = useState(0);
+  const [licenses, setLicenses] = useState(0);
 
-	const { rows, renderSearch } = useListSearch<User>([["name"], ["corporateInformation", "companyInformation", "name"]], users);
+  const { rows, renderSearch } = useListSearch<User>(
-	const { items, renderMinimal } = usePagination<User>(rows, 16);
+    [["name"], ["corporateInformation", "companyInformation", "name"]],
+    users
+  );
+  const { items, renderMinimal } = usePagination<User>(rows, 16);
 
-	const router = useRouter();
+  const router = useRouter();
 
-	const createGroup = () => {
+  const createGroup = () => {
-		if (!label.trim()) return;
+    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);
+    setIsLoading(true);
 
-		axios
+    axios
-			.post<Entity>(`/api/entities`, { label, licenses, members: selectedUsers })
+      .post<Entity>(`/api/entities`, {
-			.then((result) => {
+        label,
-				toast.success("Your entity has been created successfully!");
+        licenses,
-				router.replace(`/entities/${result.data.id}`);
+        members: selectedUsers,
-			})
+      })
-			.catch((e) => {
+      .then((result) => {
-				console.error(e);
+        toast.success("Your entity has been created successfully!");
-				toast.error("Something went wrong!");
+        router.replace(`/entities/${result.data.id}`);
-			})
+      })
-			.finally(() => setIsLoading(false));
+      .catch((e) => {
-	};
+        console.error(e);
+        toast.error("Something went wrong!");
+      })
+      .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 (
+  return (
-		<>
+    <>
-			<Head>
+      <Head>
-				<title>Create Entity | EnCoach</title>
+        <title>Create Entity | EnCoach</title>
-				<meta
+        <meta
-					name="description"
+          name="description"
-					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+          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" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
-				<link rel="icon" href="/favicon.ico" />
+        <link rel="icon" href="/favicon.ico" />
-			</Head>
+      </Head>
-			<ToastContainer />
+      <ToastContainer />
-			<Layout user={user}>
+      <>
-				<section className="flex flex-col gap-0">
+        <section className="flex flex-col gap-0">
-					<div className="flex gap-3 justify-between">
+          <div className="flex gap-3 justify-between">
-						<div className="flex items-center gap-2">
+            <div className="flex items-center gap-2">
-							<Link
+              <Link
-								href="/classrooms"
+                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>
+                <BsChevronLeft />
-							<h2 className="font-bold text-2xl">Create Entity</h2>
+              </Link>
-						</div>
+              <h2 className="font-bold text-2xl">Create Entity</h2>
-						<div className="flex items-center gap-4">
+            </div>
-							<button
+            <div className="flex items-center gap-4">
-								onClick={createGroup}
+              <button
-								disabled={!label.trim() || licenses <= 0 || isLoading}
+                onClick={createGroup}
-								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={!label.trim() || licenses <= 0 || isLoading}
-								<BsCheck />
+                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"
-								<span className="text-xs">Create Entity</span>
+              >
-							</button>
+                <BsCheck />
-						</div>
+                <span className="text-xs">Create Entity</span>
-					</div>
+              </button>
-					<Divider />
+            </div>
-					<div className="w-full grid grid-cols-2 gap-4">
+          </div>
-						<div className="flex flex-col gap-4 w-full">
+          <Divider />
-							<span className="font-semibold text-xl">Entity Label:</span>
+          <div className="w-full grid grid-cols-2 gap-4">
-							<Input name="name" onChange={setLabel} type="text" placeholder="Entity A" />
+            <div className="flex flex-col gap-4 w-full">
-						</div>
+              <span className="font-semibold text-xl">Entity Label:</span>
+              <Input
+                name="name"
+                onChange={setLabel}
+                type="text"
+                placeholder="Entity A"
+              />
+            </div>
 
-						<div className="flex flex-col gap-4 w-full">
+            <div className="flex flex-col gap-4 w-full">
-							<span className="font-semibold text-xl">Licenses:</span>
+              <span className="font-semibold text-xl">Licenses:</span>
-							<Input name="licenses" min={0} onChange={(v) => setLicenses(parseInt(v))} type="number" placeholder="12" />
+              <Input
-						</div>
+                name="licenses"
-					</div>
+                min={0}
-					<Divider />
+                onChange={(v) => setLicenses(parseInt(v))}
-					<div className="flex items-center justify-between mb-4">
+                type="number"
-						<span className="font-semibold text-xl">Members ({selectedUsers.length} selected):</span>
+                placeholder="12"
-					</div>
+              />
-					<div className="w-full flex items-center gap-4">
+            </div>
-						{renderSearch()}
+          </div>
-						{renderMinimal()}
+          <Divider />
-					</div>
+          <div className="flex items-center justify-between mb-4">
-				</section>
+            <span className="font-semibold text-xl">
+              Members ({selectedUsers.length} selected):
+            </span>
+          </div>
+          <div className="w-full flex items-center gap-4">
+            {renderSearch()}
+            {renderMinimal()}
+          </div>
+        </section>
 
-				<section className="w-full h-full grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
+        <section className="w-full h-full grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
-					{items.map((u) => (
+          {items.map((u) => (
-						<button
+            <button
-							onClick={() => toggleUser(u)}
+              onClick={() => toggleUser(u)}
-							disabled={isLoading}
+              disabled={isLoading}
-							key={u.id}
+              key={u.id}
-							className={clsx(
+              className={clsx(
-								"p-4 pr-6 h-48 relative border rounded-xl flex flex-col gap-3 justify-between text-left cursor-pointer",
+                "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",
+                "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">
+              <div className="flex items-center gap-2">
-									<img src={u.profilePicture} alt={u.name} />
+                <div className="min-w-[3rem] min-h-[3rem] w-12 h-12 border flex items-center justify-center overflow-hidden rounded-full">
-								</div>
+                  <img src={u.profilePicture} alt={u.name} />
-								<div className="flex flex-col">
+                </div>
-									<span className="font-semibold">{getUserName(u)}</span>
+                <div className="flex flex-col">
-									<span className="opacity-80 text-sm">{USER_TYPE_LABELS[u.type]}</span>
+                  <span className="font-semibold">{getUserName(u)}</span>
-								</div>
+                  <span className="opacity-80 text-sm">
-							</div>
+                    {USER_TYPE_LABELS[u.type]}
+                  </span>
+                </div>
+              </div>
 
-							<div className="flex flex-col gap-1">
+              <div className="flex flex-col gap-1">
-								<span className="flex items-center gap-2">
+                <span className="flex items-center gap-2">
-									<Tooltip tooltip="E-mail address">
+                  <Tooltip tooltip="E-mail address">
-										<BsEnvelopeFill />
+                    <BsEnvelopeFill />
-									</Tooltip>
+                  </Tooltip>
-									{u.email}
+                  {u.email}
-								</span>
+                </span>
-								<span className="flex items-center gap-2">
+                <span className="flex items-center gap-2">
-									<Tooltip tooltip="Expiration Date">
+                  <Tooltip tooltip="Expiration Date">
-										<BsStopwatchFill />
+                    <BsStopwatchFill />
-									</Tooltip>
+                  </Tooltip>
-									{u.subscriptionExpirationDate ? moment(u.subscriptionExpirationDate).format("DD/MM/YYYY") : "Unlimited"}
+                  {u.subscriptionExpirationDate
-								</span>
+                    ? moment(u.subscriptionExpirationDate).format("DD/MM/YYYY")
-								<span className="flex items-center gap-2">
+                    : "Unlimited"}
-									<Tooltip tooltip="Last Login">
+                </span>
-										<BsClockFill />
+                <span className="flex items-center gap-2">
-									</Tooltip>
+                  <Tooltip tooltip="Last Login">
-									{u.lastLogin ? moment(u.lastLogin).format("DD/MM/YYYY - HH:mm") : "N/A"}
+                    <BsClockFill />
-								</span>
+                  </Tooltip>
-							</div>
+                  {u.lastLogin
-						</button>
+                    ? moment(u.lastLogin).format("DD/MM/YYYY - HH:mm")
-					))}
+                    : "N/A"}
-				</section>
+                </span>
-			</Layout>
+              </div>
-		</>
+            </button>
-	);
+          ))}
+        </section>
+      </>
+    </>
+  );
 }

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 { User } from "@/interfaces/user";
-import { GroupWithUsers, 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 } from "@/utils/users.be";
-import { countEntityUsers, getEntityUsers, getSpecificUsers, getUsers } from "@/utils/users.be";
+import { findAllowedEntities } from "@/utils/permissions";
-import { checkAccess, findAllowedEntities, getTypesOfUser } 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,99 +17,144 @@ 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)
+  const user = await requestUser(req, res);
-	if (!user) return redirect("/login")
+  if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user)) return redirect("/")
+  if (shouldRedirectHome(user)) return redirect("/");
 
-	const entityIDs = mapBy(user.entities, 'id')
+  const entityIDs = mapBy(user.entities, "id");
-	const entities = await getEntitiesWithRoles(["admin", "developer"].includes(user.type) ? undefined : entityIDs);
+  const entities = await getEntitiesWithRoles(
-	const allowedEntities = findAllowedEntities(user, entities, 'view_entities')
+    ["admin", "developer"].includes(user.type) ? undefined : entityIDs
+  );
+  const allowedEntities = findAllowedEntities(user, entities, "view_entities");
 
-	const entitiesWithCount = await Promise.all(
+  const [counts, users] = await Promise.all([
-		allowedEntities.map(async (e) => ({
+    await Promise.all(
-			entity: e,
+      allowedEntities.map(async (e) =>
-			count: await countEntityUsers(e.id, { type: { $in: ["student", "teacher", "corporate", "mastercorporate"] } }),
+        countEntityUsers(e.id, {
-			users: await getEntityUsers(e.id, 5, { type: { $in: ["student", "teacher", "corporate", "mastercorporate"] } })
+          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 }
+        )
+      )
+    ),
+  ]);
 
-	return {
+  const entitiesWithCount = allowedEntities.map<{
-		props: serialize({ user, entities: entitiesWithCount }),
+    entity: EntityWithRoles;
-	};
+    users: User[];
+    count: number;
+  }>((e, i) => ({ entity: e, users: users[i], count: counts[i] }));
+
+  return {
+    props: serialize({ user, entities: entitiesWithCount }),
+  };
 }, sessionOptions);
 
 const SEARCH_FIELDS: string[][] = [["entity", "label"]];
 
 interface Props {
-	user: User;
+  user: User;
-	entities: EntitiesWithCount[];
+  entities: EntitiesWithCount[];
 }
 export default function Home({ user, entities }: Props) {
-	const renderCard = ({ entity, users, count }: EntitiesWithCount) => (
+  const renderCard = ({ entity, users, count }: EntitiesWithCount) => (
-		<Link
+    <Link
-			href={`/entities/${entity.id}`}
+      href={`/entities/${entity.id}`}
-			key={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">
+      <div className="flex flex-col gap-2 w-full">
-					<span className="bg-mti-purple text-white font-semibold px-2">Entity</span>
+        <span className="flex items-center gap-1">
-					{entity.label}
+          <span className="bg-mti-purple text-white font-semibold px-2">
-				</span>
+            Entity
-				<span className="flex items-center gap-1">
+          </span>
-					<span className="bg-mti-purple text-white font-semibold px-2">Members</span>
+          {entity.label}
-					<span className="bg-mti-purple-light/50 px-2">{count}{isAdmin(user) && ` / ${entity.licenses || 0}`}</span>
+        </span>
-				</span>
+        <span className="flex items-center gap-1">
-				<span>
+          <span className="bg-mti-purple text-white font-semibold px-2">
-					{users.map(getUserName).join(", ")}{' '}
+            Members
-					{count > 5 ? <span className="opacity-50 bg-mti-purple-light/50 px-1 text-sm">and {count - 5} more</span> : ""}
+          </span>
-				</span>
+          <span className="bg-mti-purple-light/50 px-2">
-			</div>
+            {count}
-			<div className="w-fit">
+            {isAdmin(user) && ` / ${entity.licenses || 0}`}
-				<BsBank className="w-full h-20 -translate-y-[15%] group-hover:text-mti-purple transition ease-in-out duration-300" />
+          </span>
-			</div>
+        </span>
-		</Link>
+        <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">
+        <BsBank className="w-full h-20 -translate-y-[15%] group-hover:text-mti-purple transition ease-in-out duration-300" />
+      </div>
+    </Link>
+  );
 
-	const firstCard = () => (
+  const firstCard = () => (
-		<Link
+    <Link
-			href={`/entities/create`}
+      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>
+      <BsPlus size={40} />
-		</Link>
+      <span className="font-semibold">Create Entity</span>
-	);
+    </Link>
+  );
 
-	return (
+  return (
-		<>
+    <>
-			<Head>
+      <Head>
-				<title>Entities | EnCoach</title>
+        <title>Entities | EnCoach</title>
-				<meta
+        <meta
-					name="description"
+          name="description"
-					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+          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" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
-				<link rel="icon" href="/favicon.ico" />
+        <link rel="icon" href="/favicon.ico" />
-			</Head>
+      </Head>
-			<ToastContainer />
+      <ToastContainer />
-			<Layout user={user} className="!gap-4">
+      <>
-				<section className="flex flex-col gap-4 w-full h-full">
+        <section className="flex flex-col gap-4 w-full h-full">
-					<div className="flex flex-col gap-4">
+          <div className="flex flex-col gap-4">
-						<h2 className="font-bold text-2xl">Entities</h2>
+            <h2 className="font-bold text-2xl">Entities</h2>
-						<Separator />
+            <Separator />
-					</div>
+          </div>
 
-					<CardList<EntitiesWithCount>
+          <CardList<EntitiesWithCount>
-						list={entities}
+            list={entities}
-						searchFields={SEARCH_FIELDS}
+            searchFields={SEARCH_FIELDS}
-						renderCard={renderCard}
+            renderCard={renderCard}
-						firstCard={["admin", "developer"].includes(user.type) ? firstCard : undefined}
+            firstCard={
-					/>
+              ["admin", "developer"].includes(user.type) ? firstCard : undefined
-				</section>
+            }
-			</Layout>
+          />
-		</>
+        </section>
-	);
+      </>
+    </>
+  );
 }

src/pages/exam.tsx

@@ -20,95 +20,125 @@ 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 }) => {
+export const getServerSideProps = withIronSessionSsr(
-	const user = await requestUser(req, res)
+  async ({ req, res, query }) => {
-	const loginDestination = Buffer.from(req.url || "/").toString("base64")
+    const user = await requestUser(req, res);
-	if (!user) return redirect(`/login?destination=${loginDestination}`)
+    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 { assignment: assignmentID, destination } = query as {
-	const destinationURL = !!destination ? Buffer.from(destination, 'base64').toString() : undefined
+      assignment?: string;
+      destination?: string;
+    };
+    const destinationURL = !!destination
+      ? Buffer.from(destination, "base64").toString()
+      : undefined;
 
-	if (!!assignmentID) {
+    if (!!assignmentID) {
-		const assignment = await getAssignment(assignmentID)
+      const assignment = await getAssignment(assignmentID);
 
-		if (!assignment) return redirect(destinationURL || "/exam")
+      if (!assignment) return redirect(destinationURL || "/exam");
-		if (!assignment.assignees.includes(user.id) && !["admin", "developer"].includes(user.type))
+      if (
-			return redirect(destinationURL || "/exam")
+        !assignment.assignees.includes(user.id) &&
+        !["admin", "developer"].includes(user.type)
+      )
+        return redirect(destinationURL || "/exam");
 
-		if (filterBy(assignment.results, 'user', user.id).length > 0)
+      if (filterBy(assignment.results, "user", user.id).length > 0)
-			return redirect(destinationURL || "/exam")
+			return redirect(destinationURL || "/exam");
+		
+      const [exams, session] = await Promise.all([
+        getExamsByIds(uniqBy(assignment.exams, "id")),
+        getSessionByAssignment(assignmentID),
+      ]);
 
-		const exams = await getExamsByIds(uniqBy(assignment.exams, "id"))
+      return {
-		const session = await getSessionByAssignment(assignmentID)
+        props: serialize({
+          user,
+          assignment,
+          exams,
+          destinationURL,
+          session: session ?? undefined,
+        }),
+      };
+    }
 
-		return {
+    return {
-			props: serialize({ user, assignment, exams, destinationURL, session: session ?? undefined })
+      props: serialize({ user, destinationURL }),
-		}
+    };
-	}
+  },
-
+  sessionOptions
-	return {
+);
-		props: serialize({ user, destinationURL }),
-	};
-}, sessionOptions);
 
 interface Props {
-	user: User;
+  user: User;
-	assignment?: Assignment
+  assignment?: Assignment;
-	exams?: Exam[]
+  exams?: Exam[];
-	session?: Session
+  session?: Session;
-	destinationURL?: string
+  destinationURL?: string;
 }
 
-const Page: React.FC<Props> = ({ user, assignment, exams = [], destinationURL = "/exam", session }) => {
+const Page: React.FC<Props> = ({
-	const router = useRouter()
+  user,
-	const { assignment: storeAssignment, dispatch } = useExamStore();
+  assignment,
+  exams = [],
+  destinationURL = "/exam",
+  session,
+}) => {
+  const router = useRouter();
+  const { assignment: storeAssignment, dispatch } = useExamStore();
 
-	useEffect(() => {
+  useEffect(() => {
-		if (assignment && exams.length > 0 && !storeAssignment && !session) {
+    if (assignment && exams.length > 0 && !storeAssignment && !session) {
-			if (!activeAssignmentFilter(assignment)) return
+      if (!activeAssignmentFilter(assignment)) return;
-			dispatch({
+      dispatch({
-				type: "INIT_EXAM", payload: {
+        type: "INIT_EXAM",
-					exams: exams.sort(sortByModule),
+        payload: {
-					modules: exams
+          exams: exams.sort(sortByModule),
-						.map((x) => x!)
+          modules: exams
-						.sort(sortByModule)
+            .map((x) => x!)
-						.map((x) => x!.module),
+            .sort(sortByModule)
-					assignment
+            .map((x) => x!.module),
-				}
+          assignment,
-			});
+        },
+      });
 
-			router.replace(router.asPath)
+      router.replace(router.asPath);
-		}
+    }
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [assignment, exams, session])
+  }, [assignment, exams, session]);
 
-	useEffect(() => {
+  useEffect(() => {
-		if (assignment && exams.length > 0 && !storeAssignment && !!session) {
+    if (assignment && exams.length > 0 && !storeAssignment && !!session) {
-			dispatch({ type: "SET_SESSION", payload: { session } })
+      dispatch({ type: "SET_SESSION", payload: { session } });
-			router.replace(router.asPath)
+      router.replace(router.asPath);
-		}
+    }
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [assignment, exams, session])
+  }, [assignment, exams, session]);
 
-	return (
+  return (
-		<>
+    <>
-			<Head>
+      <Head>
-				<title>Exams | EnCoach</title>
+        <title>Exams | EnCoach</title>
-				<meta
+        <meta
-					name="description"
+          name="description"
-					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+          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" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
-				<link rel="icon" href="/favicon.ico" />
+        <link rel="icon" href="/favicon.ico" />
-			</Head>
+      </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,92 +21,100 @@ import { getSessionByAssignment } from "@/utils/sessions.be";
 import { Session } from "@/hooks/useSessions";
 import moment from "moment";
 
-export const getServerSideProps = withIronSessionSsr(async ({ req, res, query }) => {
+export const getServerSideProps = withIronSessionSsr(
-	const user = await requestUser(req, res)
+  async ({ req, res, query }) => {
-	const destination = Buffer.from(req.url || "/").toString("base64")
+    const user = await requestUser(req, res);
-	if (!user) return redirect(`/login?destination=${destination}`)
+    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) {
+    if (assignmentID) {
-		const assignment = await getAssignment(assignmentID)
+      const assignment = await getAssignment(assignmentID);
 
-		if (!assignment) return redirect("/exam")
+      if (!assignment) return redirect("/exam");
-		if (!["admin", "developer"].includes(user.type) && !assignment.assignees.includes(user.id)) return redirect("/exercises")
+      if (
+        !["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");
+      const [exams, session] = await Promise.all([
+        getExamsByIds(uniqBy(assignment.exams, "id")),
+        getSessionByAssignment(assignmentID),
+      ]);
 
-		const exams = await getExamsByIds(uniqBy(assignment.exams, "id"))
+      return {
-		const session = await getSessionByAssignment(assignmentID)
+        props: serialize({ user, assignment, exams, session }),
+      };
+    }
 
-		if (
+    return {
-			filterBy(assignment.results, 'user', user.id) ||
+      props: serialize({ user }),
-			moment(assignment.startDate).isBefore(moment()) ||
+    };
-			moment(assignment.endDate).isAfter(moment())
+  },
-		)
+  sessionOptions
-			return redirect("/exam")
+);
-
-		return {
-			props: serialize({ user, assignment, exams, session })
-		}
-	}
-
-	return {
-		props: serialize({ user }),
-	};
-}, sessionOptions);
 
 interface Props {
-	user: User;
+  user: User;
-	assignment?: Assignment
+  assignment?: Assignment;
-	exams?: Exam[]
+  exams?: Exam[];
-	session?: Session
+  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(() => {
+  useEffect(() => {
-		if (assignment && exams.length > 0 && !storeAssignment && !session) {
+    if (assignment && exams.length > 0 && !storeAssignment && !session) {
-			dispatch({
+      dispatch({
-				type: "INIT_EXAM", payload: {
+        type: "INIT_EXAM",
-					exams: exams.sort(sortByModule),
+        payload: {
-					modules: exams
+          exams: exams.sort(sortByModule),
-						.map((x) => x!)
+          modules: exams
-						.sort(sortByModule)
+            .map((x) => x!)
-						.map((x) => x!.module),
+            .sort(sortByModule)
-					assignment
+            .map((x) => x!.module),
-				}
+          assignment,
-			})
+        },
+      });
 
-			router.replace(router.asPath)
+      router.replace(router.asPath);
-		}
+    }
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [assignment, exams, session])
+  }, [assignment, exams, session]);
 
-	useEffect(() => {
+  useEffect(() => {
-		if (assignment && exams.length > 0 && !storeAssignment && !!session) {
+    if (assignment && exams.length > 0 && !storeAssignment && !!session) {
-			dispatch({ type: "SET_SESSION", payload: { session } });
+      dispatch({ type: "SET_SESSION", payload: { session } });
 
-			router.replace(router.asPath)
+      router.replace(router.asPath);
-		}
+    }
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [assignment, exams, session])
+  }, [assignment, exams, session]);
 
-	return (
+  return (
-		<>
+    <>
-			<Head>
+      <Head>
-				<title>Exams | EnCoach</title>
+        <title>Exams | EnCoach</title>
-				<meta
+        <meta
-					name="description"
+          name="description"
-					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+          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" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
-				<link rel="icon" href="/favicon.ico" />
+        <link rel="icon" href="/favicon.ico" />
-			</Head>
+      </Head>
-			<ExamPage page="exams" user={user} hideSidebar={!!assignment} />
+      <ExamPage page="exams" user={user} hideSidebar={!!assignment} />
-		</>
+    </>
-	);
+  );
 }

src/pages/generation.tsx

@@ -1,41 +1,40 @@
 /* eslint-disable @next/next/no-img-element */
 import Head from "next/head";
-import { withIronSessionSsr } from "iron-session/next";
+import {withIronSessionSsr} from "iron-session/next";
-import { sessionOptions } from "@/lib/session";
+import {sessionOptions} from "@/lib/session";
-import { toast, ToastContainer } from "react-toastify";
+import {ToastContainer} from "react-toastify";
-import Layout from "@/components/High/Layout";
+import {shouldRedirectHome} from "@/utils/navigation.disabled";
-import { shouldRedirectHome } from "@/utils/navigation.disabled";
+import {Radio, RadioGroup} from "@headlessui/react";
-import { Radio, RadioGroup } from "@headlessui/react";
 import clsx from "clsx";
-import { MODULE_ARRAY } from "@/utils/moduleUtils";
+import {MODULE_ARRAY} from "@/utils/moduleUtils";
-import { capitalize } from "lodash";
+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 {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 { mapBy, redirect, serialize } from "@/utils";
+import {requestUser} from "@/utils/api";
-import { requestUser } from "@/utils/api";
+import {Module} from "@/interfaces";
-import { Module } from "@/interfaces";
+import {getExam} from "@/utils/exams.be";
-import { getExam, getExams } from "@/utils/exams.be";
+import {Exam, Exercise, InteractiveSpeakingExercise, ListeningPart, SpeakingExercise} from "@/interfaces/exam";
-import { Exam, Exercise, InteractiveSpeakingExercise, ListeningPart, SpeakingExercise } from "@/interfaces/exam";
+import {useEffect, useState} from "react";
-import { useEffect, useState } from "react";
+import {getEntitiesWithRoles} from "@/utils/entities.be";
-import { getEntitiesWithRoles } from "@/utils/entities.be";
+import {isAdmin} from "@/utils/users";
-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 }) => {
+export const getServerSideProps = withIronSessionSsr(async ({req, res, query}) => {
-	const user = await requestUser(req, res)
+	const user = await requestUser(req, res);
-	if (!user) return redirect("/login")
+	if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user)) return redirect("/")
+	if (shouldRedirectHome(user)) return redirect("/");
 
-	const entityIDs = mapBy(user.entities, 'id')
+	const entityIDs = mapBy(user.entities, "id");
-	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDs)
+	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("/");
-	if (!id || !examModule) return { props: serialize({ user, permissions }) };
+
+	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)
+	const exam = await getExam(examModule, id);
-	if (!exam) return redirect("/generation")
+	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({
-	const { title, currentModule, modules, dispatch } = useExamEditorStore();
+	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,16 +89,16 @@ export default function Generation({ id, user, exam, examModule, permissions }:
 			if (examModule === "level" && exam.module === "level") {
 				setExamLevelParts(exam.parts.length);
 			}
-			updateRoot({currentModule: examModule})
+			updateRoot({currentModule: examModule});
-			dispatch({ type: "INIT_EXAM_EDIT", payload: { exam, id, 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 () => {
 			const response = await axios.get("/api/exam/avatars");
-			updateRoot({ speakingAvatars: response.data });
+			updateRoot({speakingAvatars: response.data});
 		};
 
 		fetchAvatars();
@@ -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: {
+						type: "UPDATE_SECTION_SINGLE_FIELD",
-							sectionId: section.sectionId, module: "listening", field: "state", value: { ...listeningPart, audio: undefined }
+						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: {
+						type: "UPDATE_SECTION_SINGLE_FIELD",
-							sectionId: section.sectionId, module: "listening", field: "state", value: { ...speakingExercise, video_url: undefined }
+						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: {
+						type: "UPDATE_SECTION_SINGLE_FIELD",
-							sectionId: section.sectionId, module: "listening", field: "state", value: {
+						payload: {
-								...interactiveSpeaking, prompts: interactiveSpeaking.prompts.map((p) => ({ ...p, video_url: undefined }))
+							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
@@ -165,7 +194,7 @@ export default function Generation({ id, user, exam, examModule, permissions }:
 							placeholder="Insert a title here"
 							name="title"
 							label="Title"
-							onChange={(title) => updateRoot({ title })}
+							onChange={(title) => updateRoot({title})}
 							roundness="xl"
 							value={title}
 							defaultValue={title}
@@ -174,45 +203,47 @@ export default function Generation({ id, user, exam, examModule, permissions }:
 						<label className="font-normal text-base text-mti-gray-dim">Module</label>
 						<RadioGroup
 							value={currentModule}
-							onChange={(currentModule) => updateRoot({ currentModule })}
+							onChange={(currentModule) => updateRoot({currentModule})}
-							className="flex flex-row -2xl:flex-wrap w-full gap-4 -md:justify-center justify-between">
+							className="flex flex-row flex-wrap w-full gap-4 -md:justify-center justify-between">
-							{[...MODULE_ARRAY].filter(m => permissions[m]).map((x) => (
+							{[...MODULE_ARRAY]
-								<Radio value={x} key={x}>
+								.filter((m) => permissions[m])
-									{({ checked }) => (
+								.map((x) => (
-										<span
+									<Radio value={x} key={x}>
-											className={clsx(
+										{({checked}) => (
-												"px-6 py-4 w-64 h-[72px] flex justify-center items-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
+											<span
-												"transition duration-300 ease-in-out",
+												className={clsx(
-												x === "reading" &&
+													"px-6 py-4 w-64 h-[72px] flex justify-center items-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
-												(!checked
+													"transition duration-300 ease-in-out",
-													? "bg-white border-mti-gray-platinum"
+													x === "reading" &&
-													: "bg-ielts-reading/70 border-ielts-reading text-white"),
+														(!checked
-												x === "listening" &&
+															? "bg-white border-mti-gray-platinum"
-												(!checked
+															: "bg-ielts-reading/70 border-ielts-reading text-white"),
-													? "bg-white border-mti-gray-platinum"
+													x === "listening" &&
-													: "bg-ielts-listening/70 border-ielts-listening text-white"),
+														(!checked
-												x === "writing" &&
+															? "bg-white border-mti-gray-platinum"
-												(!checked
+															: "bg-ielts-listening/70 border-ielts-listening text-white"),
-													? "bg-white border-mti-gray-platinum"
+													x === "writing" &&
-													: "bg-ielts-writing/70 border-ielts-writing text-white"),
+														(!checked
-												x === "speaking" &&
+															? "bg-white border-mti-gray-platinum"
-												(!checked
+															: "bg-ielts-writing/70 border-ielts-writing text-white"),
-													? "bg-white border-mti-gray-platinum"
+													x === "speaking" &&
-													: "bg-ielts-speaking/70 border-ielts-speaking text-white"),
+														(!checked
-												x === "level" &&
+															? "bg-white border-mti-gray-platinum"
-												(!checked
+															: "bg-ielts-speaking/70 border-ielts-speaking text-white"),
-													? "bg-white border-mti-gray-platinum"
+													x === "level" &&
-													: "bg-ielts-level/70 border-ielts-level text-white"),
+														(!checked
-											)}>
+															? "bg-white border-mti-gray-platinum"
-											{capitalize(x)}
+															: "bg-ielts-level/70 border-ielts-level text-white"),
-										</span>
+												)}>
-									)}
+												{capitalize(x)}
-								</Radio>
+											</span>
-							))}
+										)}
+									</Radio>
+								))}
 						</RadioGroup>
 					</div>
-					<ExamEditor levelParts={examLevelParts} />
+					<ExamEditor levelParts={examLevelParts} entitiesAllowEditPrivacy={entitiesAllowEditPrivacy} />
-				</Layout>
+				</>
 			)}
 		</>
 	);

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";
@@ -34,142 +34,217 @@ import { BsArrowRepeat } from "react-icons/bs";
 import { ToastContainer } from "react-toastify";
 
 interface Props {
-	user: User;
+  user: User;
-	entities: EntityWithRoles[];
+  entities: EntityWithRoles[];
-	assignments: Assignment[];
+  assignments: Assignment[];
-	stats: Stat[];
+  stats: Stat[];
-	exams: Exam[];
+  exams: Exam[];
-	sessions: Session[];
+  sessions: Session[];
-	invites: InviteWithEntity[];
+  invites: InviteWithEntity[];
-	grading: Grading;
+  grading: Grading;
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
+  const user = await requestUser(req, res);
-	const destination = Buffer.from(req.url || "/").toString("base64")
+  const destination = Buffer.from(req.url || "/").toString("base64");
-	if (!user) return redirect(`/login?destination=${destination}`)
+  if (!user) return redirect(`/login?destination=${destination}`);
 
-	if (!checkAccess(user, ["admin", "developer", "student"]))
+  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 sessions = await getSessionsByUser(
+    user.id,
+    0,
+    {
+      "assignment.id": { $in: mapBy(assignments, "id") },
+    },
+    {
+      _id: 0,
+      id: 1,
+      assignment: 1,
+    }
+  );
 
-	const entities = await getEntitiesWithRoles(entityIDS);
+  const examIDs = uniqBy(
-	const assignments = await getAssignmentsByAssignee(user.id, { archived: { $ne: true } });
+    assignments.reduce<{ module: Module; id: string; key: string }[]>(
-	const sessions = await getSessionsByUser(user.id, 0, { "assignment.id": { $in: mapBy(assignments, 'id') } });
+      (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"
+  );
 
-	const examIDs = uniqBy(
+  const exams = await getExamsByIds(examIDs);
-		assignments.flatMap((a) =>
-			filterBy(a.exams, 'assignee', user.id).map((e) => ({ module: e.module, id: e.id, key: `${e.module}_${e.id}` })),
-		),
-		"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) {
+export default function OfficialExam({
-	const [isLoading, setIsLoading] = useState(false)
+  user,
+  entities,
+  assignments,
+  sessions,
+  exams,
+}: Props) {
+  const [isLoading, setIsLoading] = useState(false);
 
-	const router = useRouter();
+  const router = useRouter();
 
-	const dispatch = useExamStore((state) => state.dispatch);
+  const dispatch = useExamStore((state) => state.dispatch);
 
-	const reload = () => {
+  const reload = () => {
-		setIsLoading(true)
+    setIsLoading(true);
-		router.replace(router.asPath)
+    router.replace(router.asPath);
-		setTimeout(() => setIsLoading(false), 500)
+    setTimeout(() => setIsLoading(false), 500);
-	}
+  };
 
-	const startAssignment = (assignment: Assignment) => {
+  const startAssignment = (assignment: Assignment) => {
-		const assignmentExams = exams.filter(e => {
+    const assignmentExams = exams.filter((e) => {
-			const exam = findBy(assignment.exams, 'id', e.id)
+      const exam = findBy(assignment.exams, "id", e.id);
-			return !!exam && exam.module === e.module
+      return !!exam && exam.module === e.module;
-		})
+    });
 
-		if (assignmentExams.every((x) => !!x)) {
+    if (assignmentExams.every((x) => !!x)) {
-			dispatch({
+      const sortedAssignmentExams = assignmentExams.sort(sortByModule);
-				type: "INIT_EXAM", payload: {
+      dispatch({
-					exams: assignmentExams.sort(sortByModule),
+        type: "INIT_EXAM",
-					modules: mapBy(assignmentExams.sort(sortByModule), 'module'),
+        payload: {
-					assignment
+          exams: sortedAssignmentExams,
-				}
+          modules: mapBy(sortedAssignmentExams, "module"),
-			})
+          assignment,
-			router.push(`/exam?assignment=${assignment.id}&destination=${destination}`);
+        },
-		}
+      });
-	};
+      router.push(
+        `/exam?assignment=${assignment.id}&destination=${destination}`
+      );
+    }
+  };
 
-	const loadSession = async (session: Session) => {
+  const loadSession = async (session: Session) => {
-		dispatch({type: "SET_SESSION", payload: {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 () => {
+  const logout = async () => {
-		axios.post("/api/logout").finally(() => {
+    axios.post("/api/logout").finally(() => {
-			setTimeout(() => router.reload(), 500);
+      setTimeout(() => router.reload(), 500);
-		});
+    });
-	};
+  };
 
-	const studentAssignments = useMemo(() => [
+  const studentAssignments = useMemo(
-		...assignments.filter(activeAssignmentFilter), ...assignments.filter(futureAssignmentFilter)],
+    () => [
-		[assignments]
+      ...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]);
 
-	return (
+  const entityLabels = useMemo(
-		<>
+    () => mapBy(entities, "label")?.join(","),
-			<Head>
+    [entities]
-				<title>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 />
-			<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>
-					</div>
-				)}
 
-				<ProfileSummary user={user} items={[]} removeLevel />
+  return (
+    <>
+      <Head>
+        <title>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 />
+      <>
+        {entities.length > 0 && (
+          <div className="absolute right-4 top-4 rounded-lg bg-neutral-200 px-2 py-1">
+            <b>{entityLabels}</b>
+          </div>
+        )}
 
-				<Separator />
+        <ProfileSummary user={user} items={[]} removeLevel />
 
-				{/* Assignments */}
+        <Separator />
-				<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")} />
-					</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) =>
-								<AssignmentCard
-									key={a.id}
-									assignment={a}
-									user={user}
-									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>
+        {/* Assignments */}
-			</Layout>
+        <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")}
+            />
+          </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.map((a) => (
+              <AssignmentCard
+                key={a.id}
+                assignment={a}
+                user={user}
+                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>
+      </>
+    </>
+  );
 }

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 [entities, discounts, packages] = await Promise.all([
-	const packages = await db.collection<Package>("packages").find().toArray()
+		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,188 +1,216 @@
 /* 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 { withIronSessionSsr } from "iron-session/next";
-import {sessionOptions} from "@/lib/session";
+import { sessionOptions } from "@/lib/session";
-import {shouldRedirectHome} from "@/utils/navigation.disabled";
+import { shouldRedirectHome } from "@/utils/navigation.disabled";
-import {Permission, PermissionType} from "@/interfaces/permissions";
+import { Permission, PermissionType } from "@/interfaces/permissions";
-import {getPermissionDoc} from "@/utils/permissions.be";
+import { getPermissionDoc } from "@/utils/permissions.be";
-import {User} from "@/interfaces/user";
+import { User } from "@/interfaces/user";
-import Layout from "@/components/High/Layout";
+import { LayoutContext } from "@/components/High/Layout";
-import {getUsers} from "@/utils/users.be";
+import { getUsers } from "@/utils/users.be";
-import {BsTrash} from "react-icons/bs";
+import { BsTrash } from "react-icons/bs";
 import Select from "@/components/Low/Select";
 import Button from "@/components/Low/Button";
 import axios from "axios";
-import {toast, ToastContainer} from "react-toastify";
+import { toast, ToastContainer } from "react-toastify";
-import {Type as UserType} from "@/interfaces/user";
+import { Type as UserType } from "@/interfaces/user";
-import {getGroups} from "@/utils/groups.be";
+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;
+  id: string;
-	name: string;
+  name: string;
-	type: UserType;
+  type: UserType;
 }
 
 interface PermissionWithBasicUsers {
-	id: string;
+  id: string;
-	type: PermissionType;
+  type: PermissionType;
-	users: BasicUser[];
+  users: BasicUser[];
 }
 
-export const getServerSideProps = withIronSessionSsr(async ({req, res, params}) => {
+export const getServerSideProps = withIronSessionSsr(
-	const user = await requestUser(req, res)
+  async ({ req, res, params }) => {
-	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("/");
 
-	if (!params?.id) return redirect("/permissions")
+    if (!params?.id) return redirect("/permissions");
 
-	// Fetch data from external API
+    // Fetch data from external API
-	const permission: Permission = await getPermissionDoc(params.id as string);
+    const [permission, users, groups] = await Promise.all([
+      getPermissionDoc(params.id as string),
+      getUsers({}, 0, {}, { _id: 0, id: 1, name: 1, type: 1 }),
+      getGroups(),
+    ]);
 
-	const allUserData: User[] = await getUsers();
+    const userGroups = groups.filter((x) => x.admin === user.id);
-	const groups = await getGroups();
+    const userGroupsParticipants = userGroups.flatMap((x) => x.participants);
+    const filteredGroups =
+      user.type === "corporate"
+        ? userGroups
+        : user.type === "mastercorporate"
+        ? groups.filter((x) => userGroupsParticipants.includes(x.admin))
+        : groups;
+    const filteredGroupsParticipants = filteredGroups.flatMap(
+      (g) => g.participants
+    );
+    const filteredUsers = ["mastercorporate", "corporate"].includes(user.type)
+      ? users.filter((u) => filteredGroupsParticipants.includes(u.id))
+      : users;
 
-	const userGroups = groups.filter((x) => x.admin === user.id);
+    // const res = await fetch("api/permissions");
-	const filteredGroups =
+    // const permissions: Permission[] = await res.json();
-		user.type === "corporate"
+    // Pass data to the page via props
-			? userGroups
+    const usersData: BasicUser[] = permission.users.reduce(
-			: user.type === "mastercorporate"
+      (acc: BasicUser[], userId) => {
-			? groups.filter((x) => userGroups.flatMap((y) => y.participants).includes(x.admin))
+        const user = filteredUsers.find((u) => u.id === userId) as BasicUser;
-			: groups;
+        if (!!user) acc.push(user);
+        return acc;
+      },
+      []
+    );
 
-	const users = allUserData.map((u) => ({
+    return {
-		id: u.id,
+      props: {
-		name: u.name,
+        // permissions: permissions.map((p) => ({ id: p.id, type: p.type })),
-		type: u.type,
+        permission: {
-	})) as BasicUser[];
+          ...permission,
-
+          id: params.id,
-	const filteredUsers = ["mastercorporate", "corporate"].includes(user.type)
+          users: usersData,
-		? users.filter((u) => filteredGroups.flatMap((g) => g.participants).includes(u.id))
+        },
-		: users;
+        user,
-
+        users: filteredUsers,
-	// 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) => {
+  sessionOptions
-		const user = filteredUsers.find((u) => u.id === userId) as BasicUser;
+);
-		if (!!user) acc.push(user);
-		return acc;
-	}, []);
-
-	return {
-		props: {
-			// permissions: permissions.map((p) => ({ id: p.id, type: p.type })),
-			permission: {
-				...permission,
-				id: params.id,
-				users: usersData,
-			},
-			user,
-			users: filteredUsers,
-		},
-	};
-}, sessionOptions);
 
 interface Props {
-	permission: PermissionWithBasicUsers;
+  permission: PermissionWithBasicUsers;
-	user: User;
+  user: User;
-	users: BasicUser[];
+  users: BasicUser[];
 }
 
 export default function Page(props: Props) {
-	const {permission, user, users} = 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) => {
+  const onChange = (value: any) => {
-		setSelectedUsers((prev) => {
+    setSelectedUsers((prev) => {
-			if (value?.value) {
+      if (value?.value) {
-				return [...prev, value?.value];
+        return [...prev, value?.value];
-			}
+      }
-			return prev;
+      return prev;
-		});
+    });
-	};
+  };
-	const removeUser = (id: string) => {
+  const removeUser = (id: string) => {
-		setSelectedUsers((prev) => prev.filter((u) => u !== id));
+    setSelectedUsers((prev) => prev.filter((u) => u !== id));
-	};
+  };
 
-	const update = async () => {
+  const update = async () => {
-		try {
+    try {
-			await axios.patch(`/api/permissions/${permission.id}`, {
+      await axios.patch(`/api/permissions/${permission.id}`, {
-				users: selectedUsers,
+        users: selectedUsers,
-			});
+      });
-			toast.success("Permission updated");
+      toast.success("Permission updated");
-		} catch (err) {
+    } catch (err) {
-			toast.error("Failed to update permission");
+      toast.error("Failed to update permission");
-		}
+    }
-	};
+  };
 
-	return (
+  const { setClassName } = React.useContext(LayoutContext);
-		<>
+
-			<Head>
+  useEffect(() => {
-				<title>EnCoach</title>
+    setClassName("gap-6");
-				<meta
+    return () => setClassName("");
-					name="description"
+  }, [setClassName]);
-					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+
-				/>
+  return (
-				<meta name="viewport" content="width=device-width, initial-scale=1" />
+    <>
-				<link rel="icon" href="/favicon.ico" />
+      <Head>
-			</Head>
+        <title>EnCoach</title>
-			<ToastContainer />
+        <meta
-			<Layout user={user} className="gap-6">
+          name="description"
-				<div className="flex flex-col gap-6 w-full h-[88vh] overflow-y-scroll scrollbar-hide rounded-xl">
+          content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
-					<h1 className="text-2xl font-semibold">Permission: {permission.type as string}</h1>
+        />
-					<div className="flex gap-3">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
-						<Select
+        <link rel="icon" href="/favicon.ico" />
-							value={null}
+      </Head>
-							options={users
+      <ToastContainer />
-								.filter((u) => !selectedUsers.includes(u.id))
+      <>
-								.map((u) => ({
+        <div className="flex flex-col gap-6 w-full h-[88vh] overflow-y-scroll scrollbar-hide rounded-xl">
-									label: `${u?.type}-${u?.name}`,
+          <h1 className="text-2xl font-semibold">
-									value: u.id,
+            Permission: {permission.type as string}
-								}))}
+          </h1>
-							onChange={onChange}
+          <div className="flex gap-3">
-						/>
+            <Select
-						<Button onClick={update}>Update</Button>
+              value={null}
-					</div>
+              options={users.reduce<{ label: string; value: string }[]>(
-					<div className="flex flex-row justify-between">
+                (acc, u) => {
-						<div className="flex flex-col gap-3">
+                  if (!selectedUsers.includes(u.id))
-							<h2>Blacklisted Users</h2>
+                    acc.push({ label: `${u?.type}-${u?.name}`, value: u.id });
-							<div className="flex gap-3 flex-wrap">
+                  return acc;
-								{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}>
+              onChange={onChange}
-											<span className="text-base first-letter:uppercase">
+            />
-												{user?.type}-{user?.name}
+            <Button onClick={update}>Update</Button>
-											</span>
+          </div>
-											<BsTrash style={{cursor: "pointer"}} onClick={() => removeUser(userId)} size={20} />
+          <div className="flex flex-row justify-between">
-										</div>
+            <div className="flex flex-col gap-3">
-									);
+              <h2>Blacklisted Users</h2>
-								})}
+              <div className="flex gap-3 flex-wrap">
-							</div>
+                {selectedUsers.map((userId) => {
-						</div>
+                  const user = users.find((u) => u.id === userId);
-						<div className="flex flex-col gap-3">
+                  return (
-							<h2>Whitelisted Users</h2>
+                    <div
-							<div className="flex flex-col gap-3 flex-wrap">
+                      className="flex p-4 rounded-xl w-auto bg-mti-purple-light text-white gap-4"
-								{users
+                      key={userId}
-									.filter((user) => !selectedUsers.includes(user.id))
+                    >
-									.map((user) => {
+                      <span className="text-base first-letter:uppercase">
-										return (
+                        {user?.type}-{user?.name}
-											<div className="flex p-4 rounded-xl w-auto bg-mti-purple-light text-white gap-4" key={user.id}>
+                      </span>
-												<span className="text-base first-letter:uppercase">
+                      <BsTrash
-													{user?.type}-{user?.name}
+                        style={{ cursor: "pointer" }}
-												</span>
+                        onClick={() => removeUser(userId)}
-											</div>
+                        size={20}
-										);
+                      />
-									})}
+                    </div>
-							</div>
+                  );
-						</div>
+                })}
-					</div>
+              </div>
-				</div>
+            </div>
-			</Layout>
+            <div className="flex flex-col gap-3">
-		</>
+              <h2>Whitelisted Users</h2>
-	);
+              <div className="flex flex-col gap-3 flex-wrap">
+                {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}
+                      >
+                        <span className="text-base first-letter:uppercase">
+                          {user?.type}-{user?.name}
+                        </span>
+                      </div>
+                    );
+                  return null;
+                })}
+              </div>
+            </div>
+          </div>
+        </div>
+      </>
+    </>
+  );
 }

src/pages/permissions/index.tsx

@@ -1,73 +1,85 @@
 /* eslint-disable @next/next/no-img-element */
 import Head from "next/head";
-import {withIronSessionSsr} from "iron-session/next";
+import { withIronSessionSsr } from "iron-session/next";
-import {sessionOptions} from "@/lib/session";
+import { sessionOptions } from "@/lib/session";
-import {shouldRedirectHome} from "@/utils/navigation.disabled";
+import { shouldRedirectHome } from "@/utils/navigation.disabled";
-import {Permission} from "@/interfaces/permissions";
+import { Permission } from "@/interfaces/permissions";
-import {getPermissionDocs} from "@/utils/permissions.be";
+import { getPermissionDocs } from "@/utils/permissions.be";
-import {User} from "@/interfaces/user";
+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}) => {
+export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
+  const user = await requestUser(req, res);
-	if (!user) return redirect("/login")
+  if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user)) return redirect("/")
+  if (shouldRedirectHome(user)) return redirect("/");
 
-	// Fetch data from external API
+  // Fetch data from external API
-	const permissions: Permission[] = await getPermissionDocs();
+  const permissions: Permission[] = await getPermissionDocs();
-	const filteredPermissions = permissions.filter((p) => {
+  const filteredPermissions = permissions.filter((p) => {
-		const permissionType = p.type.toString().toLowerCase();
+    const permissionType = p.type.toString().toLowerCase();
 
-		if (user.type === "corporate") return !permissionType.includes("corporate") && !permissionType.includes("admin");
+    if (user.type === "corporate")
-		if (user.type === "mastercorporate") return !permissionType.includes("mastercorporate") && !permissionType.includes("admin");
+      return (
+        !permissionType.includes("corporate") &&
+        !permissionType.includes("admin")
+      );
+    if (user.type === "mastercorporate")
+      return (
+        !permissionType.includes("mastercorporate") &&
+        !permissionType.includes("admin")
+      );
 
-		return true;
+    return true;
-	});
+  });
 
-	// const res = await fetch("api/permissions");
+  // const res = await fetch("api/permissions");
-	// const permissions: Permission[] = await res.json();
+  // const permissions: Permission[] = await res.json();
-	// Pass data to the page via props
+  // Pass data to the page via props
-	return {
+  return {
-		props: {
+    props: {
-			// permissions: permissions.map((p) => ({ id: p.id, type: p.type })),
+      // permissions: permissions.map((p) => ({ id: p.id, type: p.type })),
-			permissions: filteredPermissions.map((p) => {
+      permissions: filteredPermissions.map((p) => {
-				const {users, ...rest} = p;
+        const { users, ...rest } = p;
-				return rest;
+        return rest;
-			}),
+      }),
-			user,
+      user,
-		},
+    },
-	};
+  };
 }, sessionOptions);
 
 interface Props {
-	permissions: Permission[];
+  permissions: Permission[];
-	user: User;
+  user: User;
 }
 
 export default function Page(props: Props) {
-	const {permissions, user} = props;
+  const { permissions, user } = props;
 
-	return (
+  const { setClassName } = React.useContext(LayoutContext);
-		<>
+  React.useEffect(() => setClassName("gap-6"), [setClassName]);
-			<Head>
+
-				<title>EnCoach</title>
+  return (
-				<meta
+    <>
-					name="description"
+      <Head>
-					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+        <title>EnCoach</title>
-				/>
+        <meta
-				<meta name="viewport" content="width=device-width, initial-scale=1" />
+          name="description"
-				<link rel="icon" href="/favicon.ico" />
+          content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
-			</Head>
+        />
-			<Layout user={user} className="gap-6">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
-				<h1 className="text-2xl font-semibold">Permissions</h1>
+        <link rel="icon" href="/favicon.ico" />
-				<div className="flex gap-3 flex-wrap overflow-y-scroll scrollbar-hide h-[80vh] rounded-xl">
+      </Head>
-					<PermissionList permissions={permissions} />
+      <>
-				</div>
+        <h1 className="text-2xl font-semibold">Permissions</h1>
-			</Layout>
+        <div className="flex gap-3 flex-wrap overflow-y-scroll scrollbar-hide h-[80vh] rounded-xl">
-		</>
+          <PermissionList permissions={permissions} />
-	);
+        </div>
+      </>
+    </>
+  );
 }

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,210 +23,284 @@ 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";
 import { requestUser } from "@/utils/api";
 import { useAllowedEntities } from "@/hooks/useEntityPermissions";
+import getPendingEvals from "@/utils/disabled.be";
+import useEvaluationPolling from "@/hooks/useEvaluationPolling";
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
+  const user = await requestUser(req, res);
-	if (!user) return redirect("/login")
+  if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user)) return redirect("/")
+  if (shouldRedirectHome(user)) return redirect("/");
 
-	const entityIDs = mapBy(user.entities, 'id')
+  const entityIDs = mapBy(user.entities, "id");
-	const isAdmin = checkAccess(user, ["admin", "developer"])
+  const isAdmin = checkAccess(user, ["admin", "developer"]);
 
-	const entities = await getEntitiesWithRoles(checkAccess(user, ["admin", "developer"]) ? undefined : entityIDs)
+  const entities = await getEntitiesWithRoles(isAdmin ? undefined : entityIDs);
-	const entitiesIds = mapBy(entities, 'id')
+  const entitiesIds = mapBy(entities, "id");
-	const users = await (isAdmin ? getUsers() : getEntitiesUsers(entitiesIds))
+  const [users, assignments, gradingSystems, pendingSessionIds] =
-	const assignments = await (isAdmin ? getAssignments() : getEntitiesAssignments(entitiesIds))
+    await Promise.all([
-	const gradingSystems = await getGradingSystemByEntities(entitiesIds)
+      isAdmin ? getUsers() : getEntitiesUsers(entitiesIds),
+      isAdmin ? getAssignments() : getEntitiesAssignments(entitiesIds),
+      getGradingSystemByEntities(entitiesIds),
+      getPendingEvals(user.id),
+    ]);
 
-	return {
+  return {
-		props: serialize({ user, users, assignments, entities, gradingSystems,isAdmin }),
+    props: serialize({
-	};
+      user,
+      users,
+      assignments,
+      entities,
+      gradingSystems,
+      isAdmin,
+      pendingSessionIds,
+    }),
+  };
 }, sessionOptions);
 
 type Filter = "months" | "weeks" | "days" | "assignments" | undefined;
 
 interface Props {
-	user: User;
+  user: User;
-	users: User[];
+  users: User[];
-	assignments: Assignment[];
+  assignments: Assignment[];
-	entities: EntityWithRoles[]
+  entities: EntityWithRoles[];
-	gradingSystems: Grading[]
+  gradingSystems: Grading[];
-	isAdmin:boolean
+  pendingSessionIds: string[];
+  isAdmin: boolean;
 }
 
 const MAX_TRAINING_EXAMS = 10;
 
-export default function History({ user, users, assignments, entities, gradingSystems,isAdmin }: Props) {
+export default function History({
-	const router = useRouter();
+  user,
-	const [statsUserId, setStatsUserId, training, setTraining] = useRecordStore((state) => [
+  users,
-		state.selectedUser,
+  assignments,
-		state.setSelectedUser,
+  entities,
-		state.training,
+  gradingSystems,
-		state.setTraining,
+  isAdmin,
-	]);
+  pendingSessionIds,
+}: Props) {
+  const router = useRouter();
+  const [statsUserId, setStatsUserId, training, setTraining] = useRecordStore(
+    (state) => [
+      state.selectedUser,
+      state.setSelectedUser,
+      state.training,
+      state.setTraining,
+    ]
+  );
 
-	const [filter, setFilter] = useState<Filter>();
+  const [filter, setFilter] = useState<Filter>();
 
-	const { data: stats, isLoading: isStatsLoading } = useFilterRecordsByUser<Stat[]>(statsUserId || user?.id);
+  const { data: stats, isLoading: isStatsLoading } = useFilterRecordsByUser<
-	const allowedDownloadEntities = useAllowedEntities(user, entities, 'download_student_record')
+    Stat[]
+  >(statsUserId || user?.id);
+  const allowedDownloadEntities = useAllowedEntities(
+    user,
+    entities,
+    "download_student_record"
+  );
 
-	const renderPdfIcon = usePDFDownload("stats");
+  const renderPdfIcon = usePDFDownload("stats");
 
-	const [selectedTrainingExams, setSelectedTrainingExams] = useState<string[]>([]);
+  const [selectedTrainingExams, setSelectedTrainingExams] = useState<string[]>(
-	const setTrainingStats = useTrainingContentStore((state) => state.setStats);
+    []
+  );
+  const setTrainingStats = useTrainingContentStore((state) => state.setStats);
 
-	const groupedStats = useMemo(() => groupByDate(
+  const groupedStats = useMemo(
-		stats.filter((x) => {
+    () =>
-			if (
+      groupByDate(
-				(x.module === "writing" || x.module === "speaking") &&
+        stats.filter((x) => {
-				!x.isDisabled &&
+          if (
-				!x.solutions.every((y) => Object.keys(y).includes("evaluation"))
+            (x.module === "writing" || x.module === "speaking") &&
-			)
+            !x.isDisabled &&
-				return false;
+            Array.isArray(x.solutions) &&
-			return true;
+            !x.solutions.every((y) => Object.keys(y).includes("evaluation"))
-		}),
+          )
-	), [stats])
+            return false;
+          return true;
+        })
+      ),
+    [stats]
+  );
 
-	useEffect(() => setStatsUserId(user.id), [setStatsUserId, user]);
+  useEffect(() => setStatsUserId(user.id), [setStatsUserId, user]);
 
-	useEffect(() => {
+  useEffect(() => {
-		const handleRouteChange = (url: string) => {
+    const handleRouteChange = (url: string) => {
-			setTraining(false);
+      setTraining(false);
-		};
+    };
-		router.events.on("routeChangeStart", handleRouteChange);
+    router.events.on("routeChangeStart", handleRouteChange);
-		return () => {
+    return () => {
-			router.events.off("routeChangeStart", handleRouteChange);
+      router.events.off("routeChangeStart", handleRouteChange);
-		};
+    };
-	}, [router.events, setTraining]);
+  }, [router.events, setTraining]);
 
-	const filterStatsByDate = (stats: { [key: string]: Stat[] }) => {
+  const filterStatsByDate = (stats: { [key: string]: Stat[] }) => {
-		if (filter && filter !== "assignments") {
+    if (filter && filter !== "assignments") {
-			const filterDate = moment()
+      const filterDate = moment()
-				.subtract({ [filter as string]: 1 })
+        .subtract({ [filter as string]: 1 })
-				.format("x");
+        .format("x");
-			const filteredStats: { [key: string]: Stat[] } = {};
+      const filteredStats: { [key: string]: Stat[] } = {};
 
-			Object.keys(stats).forEach((timestamp) => {
+      Object.keys(stats).forEach((timestamp) => {
-				if (timestamp >= filterDate) filteredStats[timestamp] = stats[timestamp];
+        if (timestamp >= filterDate)
-			});
+          filteredStats[timestamp] = stats[timestamp];
-			return filteredStats;
+      });
-		}
+      return filteredStats;
+    }
 
-		if (filter && filter === "assignments") {
+    if (filter && filter === "assignments") {
-			const filteredStats: { [key: string]: Stat[] } = {};
+      const filteredStats: { [key: string]: Stat[] } = {};
 
-			Object.keys(stats).forEach((timestamp) => {
+      Object.keys(stats).forEach((timestamp) => {
-				if (stats[timestamp].map((s) => s.assignment === undefined).includes(false))
+        if (
-					filteredStats[timestamp] = [...stats[timestamp].filter((s) => !!s.assignment)];
+          stats[timestamp]
-			});
+            .map((s) => s.assignment === undefined)
+            .includes(false)
+        )
+          filteredStats[timestamp] = [
+            ...stats[timestamp].filter((s) => !!s.assignment),
+          ];
+      });
 
-			return filteredStats;
+      return filteredStats;
-		}
+    }
 
-		return stats;
+    return stats;
-	};
+  };
 
-	const handleTrainingContentSubmission = () => {
+  const handleTrainingContentSubmission = () => {
-		if (groupedStats) {
+    if (groupedStats) {
-			const groupedStatsByDate = filterStatsByDate(groupedStats);
+      const groupedStatsByDate = filterStatsByDate(groupedStats);
-			const allStats = Object.keys(groupedStatsByDate);
+      const allStats = Object.keys(groupedStatsByDate);
-			const selectedStats = selectedTrainingExams.reduce<Record<string, Stat[]>>((accumulator, moduleAndTimestamp) => {
+      const selectedStats = selectedTrainingExams.reduce<
-				const timestamp = moduleAndTimestamp.split("-")[1];
+        Record<string, Stat[]>
-				if (allStats.includes(timestamp) && !accumulator.hasOwnProperty(timestamp)) {
+      >((accumulator, moduleAndTimestamp) => {
-					accumulator[timestamp] = groupedStatsByDate[timestamp];
+        const timestamp = moduleAndTimestamp.split("-")[1];
-				}
+        if (
-				return accumulator;
+          allStats.includes(timestamp) &&
-			}, {});
+          !accumulator.hasOwnProperty(timestamp)
-			setTrainingStats(Object.values(selectedStats).flat());
+        ) {
-			router.push("/training");
+          accumulator[timestamp] = groupedStatsByDate[timestamp];
-		}
+        }
-	};
+        return accumulator;
+      }, {});
+      setTrainingStats(Object.values(selectedStats).flat());
+      router.push("/training");
+    }
+  };
 
-	const filteredStats = useMemo(() =>
+  const filteredStats = useMemo(
-		Object.keys(filterStatsByDate(groupedStats))
+    () =>
-			.sort((a, b) => parseInt(b) - parseInt(a)),
+      Object.keys(filterStatsByDate(groupedStats)).sort(
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+        (a, b) => parseInt(b) - parseInt(a)
-		[groupedStats, filter])
+      ),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [groupedStats, filter]
+  );
 
-	const customContent = (timestamp: string) => {
+  const customContent = (timestamp: string) => {
-		const dateStats = groupedStats[timestamp];
+    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 (
+    return (
-			<StatsGridItem
+      <StatsGridItem
-				key={uuidv4()}
+        key={uuidv4()}
-				stats={dateStats}
+        stats={dateStats}
-				gradingSystems={gradingSystems}
+        gradingSystems={gradingSystems}
-				timestamp={timestamp}
+        timestamp={timestamp}
-				user={user}
+        user={user}
-				assignments={assignments}
+        assignments={assignments}
-				users={users}
+        users={users}
-				training={training}
+        training={training}
-				selectedTrainingExams={selectedTrainingExams}
+        selectedTrainingExams={selectedTrainingExams}
-				setSelectedTrainingExams={setSelectedTrainingExams}
+        setSelectedTrainingExams={setSelectedTrainingExams}
-				maxTrainingExams={MAX_TRAINING_EXAMS}
+        maxTrainingExams={MAX_TRAINING_EXAMS}
-				renderPdfIcon={canDownload ? renderPdfIcon : undefined}
+        renderPdfIcon={canDownload ? renderPdfIcon : undefined}
-			/>
+      />
-		);
+    );
-	};
+  };
 
-	return (
+  useEvaluationPolling(
-		<>
+    pendingSessionIds ? pendingSessionIds : [],
-			<Head>
+    "records",
-				<title>Record | EnCoach</title>
+    user.id
-				<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 />
-			{user && (
-				<Layout user={user}>
-					<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">
-									Select up to 10 exercises
-									{`(${selectedTrainingExams.length}/${MAX_TRAINING_EXAMS})`}
-								</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 disabled:cursor-not-allowed",
-										"transition duration-300 ease-in-out",
-									)}
-									disabled={selectedTrainingExams.length == 0}
-									onClick={handleTrainingContentSubmission}>
-									Submit
-								</button>
-							</div>
-						)}
-					</RecordFilter>
 
+  return (
+    <>
+      <Head>
+        <title>Record | 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 />
+      {user && (
+        <>
+          <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">
+                  Select up to 10 exercises
+                  {`(${selectedTrainingExams.length}/${MAX_TRAINING_EXAMS})`}
+                </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 disabled:cursor-not-allowed",
+                    "transition duration-300 ease-in-out"
+                  )}
+                  disabled={selectedTrainingExams.length == 0}
+                  onClick={handleTrainingContentSubmission}
+                >
+                  Submit
+                </button>
+              </div>
+            )}
+          </RecordFilter>
 
-					{filteredStats.length > 0 && !isStatsLoading && (
+          {filteredStats.length > 0 && !isStatsLoading && (
-						<CardList list={filteredStats} renderCard={customContent} searchFields={[]} pageSize={30} className="lg:!grid-cols-3" />
+            <CardList
-					)}
+              list={filteredStats}
-					{filteredStats.length === 0 && !isStatsLoading && (
+              renderCard={customContent}
-						<span className="font-semibold ml-1">No record to display...</span>
+              searchFields={[]}
-					)}
+              pageSize={30}
-					{isStatsLoading && (
+              className="lg:!grid-cols-3"
-						<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" />
+          )}
-						</div>
+          {filteredStats.length === 0 && !isStatsLoading && (
-					)}
+            <span className="font-semibold ml-1">No record to display...</span>
-				</Layout>
+          )}
-			)}
+          {isStatsLoading && (
-		</>
+            <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" />
+            </div>
+          )}
+        </>
+      )}
+    </>
+  );
 }

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,184 +3,266 @@ 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 } from "@/utils/entities.be";
-import { getEntitiesWithRoles, getEntityWithRoles } 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)
+  const user = await requestUser(req, res);
-	if (!user) return redirect("/login")
+  if (!user) return redirect("/login");
 
-	if (shouldRedirectHome(user) || !checkAccess(user, ["admin", "developer", "corporate", "teacher", "mastercorporate"]))
+  if (
-		return redirect("/")
+    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,
+      }
+  );
 
-	const permissions = await getUserPermissions(user.id);
+  return {
-	const entities = isAdmin(user) ? await getEntitiesWithRoles() : await getEntitiesWithRoles(mapBy(user.entities, 'id'))
+    props: serialize({
-	const allUsers = await getUsers()
+      user,
-	const gradingSystems = await getGradingSystemByEntities(mapBy(entities, 'id'))
+      permissions,
-	const entitiesGrading = entities.map(e => gradingSystems.find(g => g.entity === e.id) || { entity: e.id, steps: CEFR_STEPS })
+      entities,
-
+      allUsers,
-	return {
+      entitiesGrading,
-		props: serialize({ user, permissions, entities, allUsers, entitiesGrading }),
+    }),
-	};
+  };
 }, sessionOptions);
 
 interface Props {
-	user: User;
+  user: User;
-	permissions: PermissionType[];
+  permissions: PermissionType[];
-	entities: EntityWithRoles[];
+  entities: EntityWithRoles[];
-	allUsers: User[]
+  allUsers: User[];
-	entitiesGrading: Grading[]
+  entitiesGrading: Grading[];
 }
 
-export default function Admin({ user, entities, permissions, allUsers, entitiesGrading }: Props) {
+export default function Admin({
-	const [modalOpen, setModalOpen] = useState<string>();
+  user,
-	const router = useRouter()
+  entities,
+  permissions,
+  allUsers,
+  entitiesGrading,
+}: Props) {
+  const [modalOpen, setModalOpen] = useState<string>();
+  const router = useRouter();
 
-	const entitiesAllowCreateUser = useAllowedEntities(user, entities, 'create_user')
+  const entitiesAllowCreateUser = useAllowedEntities(
-	const entitiesAllowCreateUsers = useAllowedEntities(user, entities, 'create_user_batch')
+    user,
-	const entitiesAllowCreateCode = useAllowedEntities(user, entities, 'create_code')
+    entities,
-	const entitiesAllowCreateCodes = useAllowedEntities(user, entities, 'create_code_batch')
+    "create_user"
-	const entitiesAllowEditGrading = useAllowedEntities(user, entities, 'edit_grading_system')
+  );
+  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 (
+  return (
-		<>
+    <>
-			<Head>
+      <Head>
-				<title>Settings Panel | EnCoach</title>
+        <title>Settings Panel | EnCoach</title>
-				<meta
+        <meta
-					name="description"
+          name="description"
-					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+          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" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
-				<link rel="icon" href="/favicon.ico" />
+        <link rel="icon" href="/favicon.ico" />
-			</Head>
+      </Head>
-			<ToastContainer />
+      <ToastContainer />
-			<Layout user={user} className="gap-6">
+      <>
-				<Modal isOpen={modalOpen === "batchCreateUser"} onClose={() => setModalOpen(undefined)} maxWidth="max-w-[85%]">
+        <Modal
-					<BatchCreateUser
+          isOpen={modalOpen === "batchCreateUser"}
-						user={user}
+          onClose={() => setModalOpen(undefined)}
-						entities={entitiesAllowCreateUser}
+          maxWidth="max-w-[85%]"
-						permissions={permissions}
+        >
-						onFinish={() => setModalOpen(undefined)}
+          <BatchCreateUser
-					/>
+            user={user}
-				</Modal>
+            entities={entitiesAllowCreateUser}
-				<Modal isOpen={modalOpen === "batchCreateCode"} onClose={() => setModalOpen(undefined)}>
+            permissions={permissions}
-					<BatchCodeGenerator
+            onFinish={() => setModalOpen(undefined)}
-						entities={entitiesAllowCreateCodes}
+          />
-						user={user}
+        </Modal>
-						users={allUsers}
+        <Modal
-						permissions={permissions}
+          isOpen={modalOpen === "batchCreateCode"}
-						onFinish={() => setModalOpen(undefined)}
+          onClose={() => setModalOpen(undefined)}
-					/>
+        >
-				</Modal>
+          <BatchCodeGenerator
-				<Modal isOpen={modalOpen === "createCode"} onClose={() => setModalOpen(undefined)}>
+            entities={entitiesAllowCreateCodes}
-					<CodeGenerator
+            user={user}
-						entities={entitiesAllowCreateCode}
+            users={allUsers}
-						user={user}
+            permissions={permissions}
-						permissions={permissions}
+            onFinish={() => setModalOpen(undefined)}
-						onFinish={() => setModalOpen(undefined)}
+          />
-					/>
+        </Modal>
-				</Modal>
+        <Modal
-				<Modal isOpen={modalOpen === "createUser"} onClose={() => setModalOpen(undefined)}>
+          isOpen={modalOpen === "createCode"}
-					<UserCreator
+          onClose={() => setModalOpen(undefined)}
-						user={user}
+        >
-						entities={entitiesAllowCreateUsers}
+          <CodeGenerator
-						users={allUsers}
+            entities={entitiesAllowCreateCode}
-						permissions={permissions}
+            user={user}
-						onFinish={() => setModalOpen(undefined)}
+            permissions={permissions}
-					/>
+            onFinish={() => setModalOpen(undefined)}
-				</Modal>
+          />
-				<Modal isOpen={modalOpen === "gradingSystem"} onClose={() => setModalOpen(undefined)}>
+        </Modal>
-					<CorporateGradingSystem
+        <Modal
-						user={user}
+          isOpen={modalOpen === "createUser"}
-						entitiesGrading={entitiesGrading}
+          onClose={() => setModalOpen(undefined)}
-						entities={entitiesAllowEditGrading}
+        >
-						mutate={() => router.replace(router.asPath)}
+          <UserCreator
-					/>
+            user={user}
-				</Modal>
+            entities={entitiesAllowCreateUsers}
+            users={allUsers}
+            permissions={permissions}
+            onFinish={() => setModalOpen(undefined)}
+          />
+        </Modal>
+        <Modal
+          isOpen={modalOpen === "gradingSystem"}
+          onClose={() => setModalOpen(undefined)}
+        >
+          <CorporateGradingSystem
+            user={user}
+            entitiesGrading={entitiesGrading}
+            entities={entitiesAllowEditGrading}
+            mutate={() => router.replace(router.asPath)}
+          />
+        </Modal>
 
-				<section className="w-full grid grid-cols-2 -md:grid-cols-1 gap-8">
+        <section className="w-full grid grid-cols-2 -md:grid-cols-1 gap-8">
-					<ExamLoader />
+          <ExamLoader />
-					{checkAccess(user, getTypesOfUser(["teacher"]), permissions, "viewCodes") && (
+          {checkAccess(
-						<div className="w-full grid grid-cols-2 gap-4">
+            user,
-							<IconCard
+            getTypesOfUser(["teacher"]),
-								Icon={BsCode}
+            permissions,
-								label="Generate Single Code"
+            "viewCodes"
-								color="purple"
+          ) && (
-								className="w-full h-full"
+            <div className="w-full grid grid-cols-2 gap-4">
-								onClick={() => setModalOpen("createCode")}
+              <IconCard
-								disabled={entitiesAllowCreateCode.length === 0}
+                Icon={BsCode}
-							/>
+                label="Generate Single Code"
-							<IconCard
+                color="purple"
-								Icon={BsCodeSquare}
+                className="w-full h-full"
-								label="Generate Codes in Batch"
+                onClick={() => setModalOpen("createCode")}
-								color="purple"
+                disabled={entitiesAllowCreateCode.length === 0}
-								className="w-full h-full"
+              />
-								onClick={() => setModalOpen("batchCreateCode")}
+              <IconCard
-								disabled={entitiesAllowCreateCodes.length === 0}
+                Icon={BsCodeSquare}
-							/>
+                label="Generate Codes in Batch"
-							<IconCard
+                color="purple"
-								Icon={BsPersonFill}
+                className="w-full h-full"
-								label="Create Single User"
+                onClick={() => setModalOpen("batchCreateCode")}
-								color="purple"
+                disabled={entitiesAllowCreateCodes.length === 0}
-								className="w-full h-full"
+              />
-								onClick={() => setModalOpen("createUser")}
+              <IconCard
-								disabled={entitiesAllowCreateUser.length === 0}
+                Icon={BsPersonFill}
-							/>
+                label="Create Single User"
-							<IconCard
+                color="purple"
-								Icon={BsPeopleFill}
+                className="w-full h-full"
-								label="Create Users in Batch"
+                onClick={() => setModalOpen("createUser")}
-								color="purple"
+                disabled={entitiesAllowCreateUser.length === 0}
-								className="w-full h-full"
+              />
-								onClick={() => setModalOpen("batchCreateUser")}
+              <IconCard
-								disabled={entitiesAllowCreateUsers.length === 0}
+                Icon={BsPeopleFill}
-							/>
+                label="Create Users in Batch"
-							{checkAccess(user, ["admin", "corporate", "developer", "mastercorporate"]) && (
+                color="purple"
-								<IconCard
+                className="w-full h-full"
-									Icon={BsGearFill}
+                onClick={() => setModalOpen("batchCreateUser")}
-									label="Grading System"
+                disabled={entitiesAllowCreateUsers.length === 0}
-									color="purple"
+              />
-									className="w-full h-full col-span-2"
+              {checkAccess(user, [
-									onClick={() => setModalOpen("gradingSystem")}
+                "admin",
-									disabled={entitiesAllowEditGrading.length === 0}
+                "corporate",
-								/>
+                "developer",
-							)}
+                "mastercorporate",
-						</div>
+              ]) && (
-					)}
+                <IconCard
-				</section>
+                  Icon={BsGearFill}
-				<section className="w-full">
+                  label="Grading System"
-					<Lists user={user} entities={entities} permissions={permissions} />
+                  color="purple"
-				</section>
+                  className="w-full h-full col-span-2"
-			</Layout>
+                  onClick={() => setModalOpen("gradingSystem")}
-		</>
+                  disabled={entitiesAllowEditGrading.length === 0}
-	);
+                />
+              )}
+            </div>
+          )}
+        </section>
+        <section className="w-full">
+          <Lists user={user} entities={entities} permissions={permissions} />
+        </section>
+      </>
+    </>
+  );
 }

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 { findAllowedEntities } from "@/utils/permissions";
-import { getSessionsByAssignments, getSessionsByUser } from "@/utils/sessions.be";
+import { getSessionsByAssignments } from "@/utils/sessions.be";
-import { getStatsByUsers } from "@/utils/stats.be";
 import { isAdmin } from "@/utils/users";
 import { getEntitiesUsers } from "@/utils/users.be";
 import { createColumnHelper } from "@tanstack/react-table";
@@ -30,278 +28,399 @@ import Head from "next/head";
 import Link from "next/link";
 import { useEffect, useMemo, useState } from "react";
 import ReactDatePicker from "react-datepicker";
-import {
+import { BsBank, BsChevronLeft, BsX } from "react-icons/bs";
-	BsBank,
-	BsChevronLeft,
-	BsX,
-} from "react-icons/bs";
 
 interface Props {
-	user: User;
+  user: User;
-	students: StudentUser[];
+  students: StudentUser[];
-	entities: EntityWithRoles[];
+  entities: EntityWithRoles[];
-	assignments: Assignment[];
+  assignments: Assignment[];
-	sessions: Session[]
+  sessions: Session[];
-	exams: Exam[]
+  exams: Exam[];
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
-	const user = await requestUser(req, res)
+  const user = await requestUser(req, res);
-	if (!user) return redirect("/login")
+  if (!user) return redirect("/login");
 
-	const entityIDS = mapBy(user.entities, "id") || [];
+  const entityIDS = mapBy(user.entities, "id") || [];
-	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDS);
+  const entities = await getEntitiesWithRoles(
-	const allowedEntities = findAllowedEntities(user, entities, 'view_entity_statistics')
+    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 studentsAllowedEntities = findAllowedEntities(
-	const students = await getEntitiesUsers(mapBy(studentsAllowedEntities, 'id'), { type: "student" })
+    user,
+    entities,
+    "view_students"
+	);
+	
+  const [students, assignments] = await Promise.all([
+    getEntitiesUsers(mapBy(studentsAllowedEntities, "id"), { type: "student" }),
+    getEntitiesAssignments(mapBy(entities, "id")),
+  ]);
+	
+  const [sessions, exams] = await Promise.all([
+    getSessionsByAssignments(mapBy(assignments, "id")),
+    getExamsByIds(assignments.flatMap((a) => a.exams)),
+  ]);
 
-	const assignments = await getEntitiesAssignments(mapBy(entities, "id"));
+  return {
-	const sessions = await getSessionsByAssignments(mapBy(assignments, 'id'))
+    props: serialize({
-	const exams = await getExamsByIds(assignments.flatMap(a => a.exams))
+      user,
-
+      students,
-	return { props: serialize({ user, students, entities: allowedEntities, assignments, sessions, exams }) };
+      entities: allowedEntities,
+      assignments,
+      sessions,
+      exams,
+    }),
+  };
 }, sessionOptions);
 
 interface Item {
-	student: StudentUser
+  student: StudentUser;
-	result?: AssignmentResult
+  result?: AssignmentResult;
-	assignment: Assignment
+  assignment: Assignment;
-	exams: Exam[]
+  exams: Exam[];
-	entity: Entity
+  entity: Entity;
-	session?: Session
+  session?: Session;
 }
 
 const columnHelper = createColumnHelper<Item>();
 
-export default function Statistical({ user, students, entities, assignments, sessions, exams }: Props) {
+export default function Statistical({
-	const [startDate, setStartDate] = useState<Date>(new Date());
+  user,
-	const [endDate, setEndDate] = useState<Date | null>(moment().add(1, 'month').toDate());
+  students,
-	const [selectedEntities, setSelectedEntities] = useState<string[]>([])
+  entities,
-	const [isDownloading, setIsDownloading] = useState(false)
+  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 entitiesAllowDownload = useAllowedEntities(user, entities, 'download_statistics_report')
+  const entitiesAllowDownload = useAllowedEntities(
+    user,
+    entities,
+    "download_statistics_report"
+  );
 
-	const resetDateRange = () => {
+  const resetDateRange = () => {
-		const orderedAssignments = orderBy(assignments, ['startDate'], ['asc'])
+    const orderedAssignments = orderBy(assignments, ["startDate"], ["asc"]);
-		setStartDate(moment(orderedAssignments.shift()?.startDate || "2024-01-01T00:00:01.986Z").toDate())
+    setStartDate(
-		setEndDate(moment().add(1, 'month').toDate())
+      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 updateDateRange = (dates: [Date, Date | null]) => {
-		const [start, end] = dates;
+    const [start, end] = dates;
-		setStartDate(start!);
+    setStartDate(start!);
-		setEndDate(end);
+    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 renderAssignmentResolution = (entityID: string) => {
-		const entityAssignments = filterBy(assignments, 'entity', entityID)
+    const entityAssignments = filterBy(assignments, "entity", entityID);
-		const total = entityAssignments.reduce((acc, curr) => acc + curr.assignees.length, 0)
+    const total = entityAssignments.reduce(
-		const results = entityAssignments.reduce((acc, curr) => acc + curr.results.length, 0)
+      (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 totalAssignmentResolution = useMemo(() => {
-		const total = assignments.reduce((acc, curr) => acc + curr.assignees.length, 0)
+    const total = assignments.reduce(
-		const results = assignments.reduce((acc, curr) => acc + curr.results.length, 0)
+      (acc, curr) => acc + curr.assignees.length,
+      0
+    );
+    const results = assignments.reduce(
+      (acc, curr) => acc + curr.results.length,
+      0
+    );
 
-		return { results, total }
+    return { results, total };
-	}, [assignments])
+  }, [assignments]);
 
-	const filteredAssignments = useMemo(() => {
+  const filteredAssignments = useMemo(() => {
-		if (!startDate && !endDate) return assignments
+    if (!startDate && !endDate) return assignments;
-		const startDateFiltered = startDate ? assignments.filter(a => moment(a.startDate).isSameOrAfter(moment(startDate))) : assignments
+    const startDateFiltered = startDate
-		return endDate ? startDateFiltered.filter(a => moment(a.endDate).isSameOrBefore(moment(endDate))) : startDateFiltered
+      ? assignments.filter((a) =>
-	}, [startDate, endDate, assignments])
+          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(() =>
+  const data: Item[] = useMemo(
-		filteredAssignments.filter(a => selectedEntities.includes(a.entity || "")).flatMap(a => a.assignees.map(x => {
+    () =>
-			const result = findBy(a.results, 'user', x)
+      filteredAssignments
-			const student = findBy(students, 'id', x)
+        .filter((a) => selectedEntities.includes(a.entity || ""))
-			const entity = findBy(entities, 'id', a.entity)
+        .flatMap((a) =>
-			const assignmentExams = exams.filter(e => a.exams.map(x => `${x.id}_${x.module}`).includes(`${e.id}_${e.module}`))
+          a.assignees.map((x) => {
-			const session = sessions.find(s => s.assignment?.id === a.id && s.user === 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
+            if (!student) return undefined;
-			return { student, result, assignment: a, exams: assignmentExams, session, entity }
+            return {
-		})).filter(x => !!x) as Item[],
+              student,
-		[students, selectedEntities, filteredAssignments, exams, sessions, entities]
+              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 sortedData: Item[] = useMemo(
-		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
+      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
+        return bTotalScore - aTotalScore;
-	}), [data])
+      }),
+    [data]
+  );
 
-	const downloadExcel = async () => {
+  const downloadExcel = async () => {
-		setIsDownloading(true)
+    setIsDownloading(true);
 
-		const request = await axios.post("/api/statistical", {
+    const request = await axios.post(
-			entities: entities.filter(e => selectedEntities.includes(e.id)),
+      "/api/statistical",
-			items: data,
+      {
-			assignments: filteredAssignments,
+        entities: entities.filter((e) => selectedEntities.includes(e.id)),
-			startDate,
+        items: data,
-			endDate
+        assignments: filteredAssignments,
-		}, {
+        startDate,
-			responseType: 'blob'
+        endDate,
-		})
+      },
+      {
+        responseType: "blob",
+      }
+    );
 
-		const href = URL.createObjectURL(request.data)
+    const href = URL.createObjectURL(request.data);
-		const link = document.createElement('a');
+    const link = document.createElement("a");
-		link.href = href;
+    link.href = href;
-		link.setAttribute('download', `statistical_${new Date().toISOString()}.xlsx`);
+    link.setAttribute(
-		document.body.appendChild(link);
+      "download",
-		link.click();
+      `statistical_${new Date().toISOString()}.xlsx`
+    );
+    document.body.appendChild(link);
+    link.click();
 
-		document.body.removeChild(link);
+    document.body.removeChild(link);
-		URL.revokeObjectURL(href);
+    URL.revokeObjectURL(href);
 
-		setIsDownloading(false)
+    setIsDownloading(false);
-	}
+  };
 
-	const columns = [
+  const columns = [
-		columnHelper.accessor("student.name", {
+    columnHelper.accessor("student.name", {
-			header: "Student",
+      header: "Student",
-			cell: (info) => info.getValue(),
+      cell: (info) => info.getValue(),
-		}),
+    }),
-		columnHelper.accessor("student.studentID", {
+    columnHelper.accessor("student.studentID", {
-			header: "Student ID",
+      header: "Student ID",
-			cell: (info) => info.getValue(),
+      cell: (info) => info.getValue(),
-		}),
+    }),
-		columnHelper.accessor("student.email", {
+    columnHelper.accessor("student.email", {
-			header: "E-mail",
+      header: "E-mail",
-			cell: (info) => info.getValue(),
+      cell: (info) => info.getValue(),
-		}),
+    }),
-		columnHelper.accessor("entity.label", {
+    columnHelper.accessor("entity.label", {
-			header: "Entity",
+      header: "Entity",
-			cell: (info) => info.getValue(),
+      cell: (info) => info.getValue(),
-		}),
+    }),
-		columnHelper.accessor("assignment.name", {
+    columnHelper.accessor("assignment.name", {
-			header: "Assignment",
+      header: "Assignment",
-			cell: (info) => info.getValue(),
+      cell: (info) => info.getValue(),
-		}),
+    }),
-		columnHelper.accessor("assignment.startDate", {
+    columnHelper.accessor("assignment.startDate", {
-			header: "Date",
+      header: "Date",
-			cell: (info) => moment(info.getValue()).format("DD/MM/YYYY"),
+      cell: (info) => moment(info.getValue()).format("DD/MM/YYYY"),
-		}),
+    }),
-		columnHelper.accessor("result", {
+    columnHelper.accessor("result", {
-			header: "Progress",
+      header: "Progress",
-			cell: (info) => {
+      cell: (info) => {
-				const student = info.row.original.student
+        const student = info.row.original.student;
-				const session = info.row.original.session
+        const session = info.row.original.session;
 
-				if (!student.lastLogin) return <span className="text-mti-red-dark">Never logged in</span>
+        if (!student.lastLogin)
-				if (info.getValue()) return <span className="text-mti-green font-semibold">Submitted</span>
+          return <span className="text-mti-red-dark">Never logged in</span>;
-				if (!session) return <span className="text-mti-rose">Not started</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">
+        return (
-					{capitalize(session.exam?.module || "")} Module, Part {session.partIndex + 1}, Exercise {session.exerciseIndex + 1}
+          <span className="font-semibold">
-				</span>
+            {capitalize(session.exam?.module || "")} Module, Part{" "}
-			},
+            {session.partIndex + 1}, Exercise {session.exerciseIndex + 1}
-		})
+          </span>
-	]
+        );
+      },
+    }),
+  ];
 
-	return (
+  return (
-		<>
+    <>
-			<Head>
+      <Head>
-				<title>Statistical | EnCoach</title>
+        <title>Statistical | EnCoach</title>
-				<meta
+        <meta
-					name="description"
+          name="description"
-					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+          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" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
-				<link rel="icon" href="/favicon.ico" />
+        <link rel="icon" href="/favicon.ico" />
-			</Head>
+      </Head>
 
-			<Layout user={user}>
+      <>
-				<div className="flex flex-col gap-4">
+        <div className="flex flex-col gap-4">
-					<div className="flex items-center justify-between w-full">
+          <div className="flex items-center justify-between w-full">
-						<div className="flex items-center gap-2">
+            <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
-								<BsChevronLeft />
+                href="/dashboard"
-							</Link>
+                className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl"
-							<h2 className="font-bold text-2xl">Statistical</h2>
+              >
-						</div>
+                <BsChevronLeft />
-						<Checkbox
+              </Link>
-							onChange={value => setSelectedEntities(value ? mapBy(entities, 'id') : [])}
+              <h2 className="font-bold text-2xl">Statistical</h2>
-							isChecked={selectedEntities.length === entities.length}
+            </div>
-						>
+            <Checkbox
-							Select All
+              onChange={(value) =>
-						</Checkbox>
+                setSelectedEntities(value ? mapBy(entities, "id") : [])
-					</div>
+              }
-					<Separator />
+              isChecked={selectedEntities.length === entities.length}
-				</div>
+            >
+              Select All
+            </Checkbox>
+          </div>
+          <Separator />
+        </div>
 
-				<section className="flex flex-col gap-3">
+        <section className="flex flex-col gap-3">
-					<div className="w-full flex items-center justify-between gap-4 flex-wrap">
+          <div className="w-full flex items-center justify-between gap-4 flex-wrap">
-						{entities.map(entity => (
+            {entities.map((entity) => (
-							<button
+              <button
-								onClick={() => toggleEntity(entity.id)}
+                onClick={() => toggleEntity(entity.id)}
-								className={clsx(
+                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",
+                  "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",
+                  "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}
+                )}
-							>
+                key={entity.id}
-								<BsBank size={48} />
+              >
-								<div className="flex flex-col gap-1">
+                <BsBank size={48} />
-									<span>{entity.label}</span>
+                <div className="flex flex-col gap-1">
-									<span className={clsx("font-semibold")}>
+                  <span>{entity.label}</span>
-										{renderAssignmentResolution(entity.id)}
+                  <span className={clsx("font-semibold")}>
-									</span>
+                    {renderAssignmentResolution(entity.id)}
-								</div>
+                  </span>
-							</button>
+                </div>
-						))}
+              </button>
-					</div>
+            ))}
+          </div>
 
-					<div className="flex items-center justify-between">
+          <div className="flex items-center justify-between">
-						<div className="flex items-center gap-2">
+            <div className="flex items-center gap-2">
-							<ReactDatePicker
+              <ReactDatePicker
-								className={clsx(
+                className={clsx(
-									"p-6 px-12 w-full flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
+                  "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",
+                  "hover:border-mti-purple tooltip",
-									"transition duration-300 ease-in-out",
+                  "transition duration-300 ease-in-out"
-								)}
+                )}
-								dateFormat="dd/MM/yyyy"
+                dateFormat="dd/MM/yyyy"
-								selectsRange
+                selectsRange
-								selected={startDate}
+                selected={startDate}
-								onChange={updateDateRange}
+                onChange={updateDateRange}
-								startDate={startDate}
+                startDate={startDate}
-								endDate={endDate}
+                endDate={endDate}
-							/>
+              />
-							{startDate !== null && endDate !== null && (
+              {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
-									<BsX size={24} />
+                  onClick={resetDateRange}
-								</button>
+                  className="transition ease-in-out duration-300 rounded-full p-2 hover:bg-mti-gray-cool/10"
-							)}
+                >
-						</div>
+                  <BsX size={24} />
-						<span className="font-semibold text-lg pr-1">
+                </button>
-							Total: {totalAssignmentResolution.results} / {totalAssignmentResolution.total}
+              )}
-						</span>
+            </div>
-					</div>
+            <span className="font-semibold text-lg pr-1">
-				</section>
+              Total: {totalAssignmentResolution.results} /{" "}
+              {totalAssignmentResolution.total}
+            </span>
+          </div>
+        </section>
 
-				{selectedEntities.length > 0 && (
+        {selectedEntities.length > 0 && (
-					<Table
+          <Table
-						columns={columns}
+            columns={columns}
-						data={sortedData}
+            data={sortedData}
-						searchFields={[["student", "name"], ["student", "email"], ["student", "studentID"], ["exams", "id"], ["assignment", "name"]]}
+            searchFields={[
-						searchPlaceholder="Search by student, assignment or exam..."
+              ["student", "name"],
-						onDownload={entitiesAllowDownload.length > 0 ? downloadExcel : undefined}
+              ["student", "email"],
-						isDownloadLoading={isDownloading}
+              ["student", "studentID"],
-					/>
+              ["exams", "id"],
-				)}
+              ["assignment", "name"],
-			</Layout>
+            ]}
-		</>
+            searchPlaceholder="Search by student, assignment or exam..."
-	)
+            onDownload={
+              entitiesAllowDownload.length > 0 ? downloadExcel : undefined
+            }
+            isDownloadLoading={isDownloading}
+          />
+        )}
+      </>
+    </>
+  );
 }

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 {
+import { MODULE_ARRAY, sortByModule } from "@/utils/moduleUtils";
-  countExamModules,
-  countFullExams,
-  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[]>(
+  const {
-    statsUserId,
+    data: {
-    !statsUserId
+      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>
+        </>
       )}
     </>
   );