Merged develop into feature/level-file-upload

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

@@ -1,4 +1,4 @@
-import {useMemo} from "react";
+import {useMemo, useState} from "react";
 import {PERMISSIONS} from "@/constants/userPermissions";
 import useExams from "@/hooks/useExams";
 import useUsers from "@/hooks/useUsers";
@@ -11,11 +11,15 @@ import {countExercises} from "@/utils/moduleUtils";
 import {createColumnHelper, flexRender, getCoreRowModel, useReactTable} from "@tanstack/react-table";
 import axios from "axios";
 import clsx from "clsx";
-import {capitalize} from "lodash";
+import {capitalize, uniq} from "lodash";
 import {useRouter} from "next/router";
-import {BsBan, BsBanFill, BsCheck, BsCircle, BsStop, 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 {useListSearch} from "@/hooks/useListSearch";
+import Modal from "@/components/Modal";
+import {checkAccess} from "@/utils/permissions";
+import useGroups from "@/hooks/useGroups";
+import Button from "@/components/Low/Button";
 
 const searchFields = [["module"], ["id"], ["createdBy"]];
 
@@ -29,9 +33,40 @@ const CLASSES: {[key in Module]: string} = {
 
 const columnHelper = createColumnHelper<Exam>();
 
+const ExamOwnerSelector = ({options, exam, onSave}: {options: User[]; exam: Exam; onSave: (owners: string[]) => void}) => {
+	const [owners, setOwners] = useState(exam.owners || []);
+
+	return (
+		<div className="w-full flex flex-col gap-4">
+			<div className="grid grid-cols-4 mt-4">
+				{options.map((c) => (
+					<Button
+						variant={owners.includes(c.id) ? "solid" : "outline"}
+						onClick={() => setOwners((prev) => (prev.includes(c.id) ? prev.filter((x) => x !== c.id) : [...prev, c.id]))}
+						className="max-w-[200px] w-full"
+						key={c.id}>
+						{c.name}
+					</Button>
+				))}
+			</div>
+			<Button onClick={() => onSave(owners)} className="w-full max-w-[200px] self-end">
+				Save
+			</Button>
+		</div>
+	);
+};
+
 export default function ExamList({user}: {user: User}) {
+	const [selectedExam, setSelectedExam] = useState<Exam>();
+
 	const {exams, reload} = useExams();
 	const {users} = useUsers();
+	const {groups} = useGroups({admin: user?.id, userType: user?.type});
+
+	const filteredCorporates = useMemo(() => {
+		const participantsAndAdmins = uniq(groups.flatMap((x) => [...x.participants, x.admin])).filter((x) => x !== user?.id);
+		return users.filter((x) => participantsAndAdmins.includes(x.id) && x.type === "corporate");
+	}, [users, groups, user]);
 
 	const parsedExams = useMemo(() => {
 		return exams.map((exam) => {
@@ -94,6 +129,29 @@ export default function ExamList({user}: {user: User}) {
 			.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;
 
@@ -166,12 +224,21 @@ export default function ExamList({user}: {user: User}) {
 			cell: ({row}: {row: {original: Exam}}) => {
 				return (
 					<div className="flex gap-4">
-						<button
-							data-tip={row.original.private ? "Set as public" : "Set as private"}
-							onClick={async () => await privatizeExam(row.original)}
-							className="cursor-pointer tooltip">
-							{row.original.private ? <BsCircle /> : <BsBan />}
-						</button>
+						{(row.original.owners?.includes(user.id) || checkAccess(user, ["admin", "developer"])) && (
+							<>
+								<button
+									data-tip={row.original.private ? "Set as public" : "Set as private"}
+									onClick={async () => await privatizeExam(row.original)}
+									className="cursor-pointer tooltip">
+									{row.original.private ? <BsCircle /> : <BsBan />}
+								</button>
+								{checkAccess(user, ["admin", "developer", "mastercorporate"]) && (
+									<button data-tip="Edit owners" onClick={() => setSelectedExam(row.original)} className="cursor-pointer tooltip">
+										<BsPencil />
+									</button>
+								)}
+							</>
+						)}
 						<button
 							data-tip="Load exam"
 							className="cursor-pointer tooltip"
@@ -198,6 +265,13 @@ export default function ExamList({user}: {user: User}) {
 	return (
 		<div className="flex flex-col gap-4 w-full h-full">
 			{renderSearch()}
+			<Modal isOpen={!!selectedExam} title={`Edit Exam Owners - ${selectedExam?.id}`} onClose={() => setSelectedExam(undefined)}>
+				{!!selectedExam ? (
+					<ExamOwnerSelector options={filteredCorporates} exam={selectedExam} onSave={(owners) => updateExam(selectedExam, {owners})} />
+				) : (
+					<div />
+				)}
+			</Modal>
 			<table className="rounded-xl bg-mti-purple-ultralight/40 w-full">
 				<thead>
 					{table.getHeaderGroups().map((headerGroup) => (

src/pages/(exam)/ExamPage.tsx

@@ -214,7 +214,7 @@ export default function ExamPage({page, user}: Props) {
 			if (selectedModules.length > 0 && exams.length > 0 && moduleIndex < selectedModules.length) {
 				const nextExam = exams[moduleIndex];
 
-				if (partIndex === -1 && nextExam.module !== "listening") setPartIndex(0);
+				if (partIndex === -1 && nextExam?.module !== "listening") setPartIndex(0);
 				if (exerciseIndex === -1 && !["reading", "listening"].includes(nextExam?.module)) setExerciseIndex(0);
 				setExam(nextExam ? updateExamWithUserSolutions(nextExam) : undefined);
 			}

src/pages/api/assignments/index.ts

@@ -12,7 +12,7 @@ import {capitalize, flatten, uniqBy} from "lodash";
 import {User} from "@/interfaces/user";
 import moment from "moment";
 import {sendEmail} from "@/email";
-import { release } from "os";
+import {release} from "os";
 
 const db = getFirestore(app);
 
@@ -57,6 +57,7 @@ const generateExams = async (
 	generateMultiple: Boolean,
 	selectedModules: Module[],
 	assignees: string[],
+	userId: string,
 	variant?: Variant,
 	instructorGender?: InstructorGender,
 ): Promise<ExamWithUser[]> => {
@@ -87,7 +88,7 @@ const generateExams = async (
 	}
 
 	const selectedModulePromises = selectedModules.map(async (module: Module) => {
-		const exams: Exam[] = await getExams(db, module, "false", undefined, variant, instructorGender);
+		const exams: Exam[] = await getExams(db, module, "false", userId, variant, instructorGender);
 		const exam = exams[getRandomIndex(exams)];
 
 		if (exam) {
@@ -122,11 +123,12 @@ async function POST(req: NextApiRequest, res: NextApiResponse) {
 		endDate: string;
 		variant?: Variant;
 		instructorGender?: InstructorGender;
+		released: boolean;
 	};
 
 	const exams: ExamWithUser[] = !!examIDs
 		? examIDs.flatMap((e) => assignees.map((a) => ({...e, assignee: a})))
-		: await generateExams(generateMultiple, selectedModules, assignees, variant, instructorGender);
+		: await generateExams(generateMultiple, selectedModules, assignees, req.session.user!.id, variant, instructorGender);
 
 	if (exams.length === 0) {
 		res.status(400).json({ok: false, error: "No exams found for the selected modules"});
@@ -139,7 +141,6 @@ async function POST(req: NextApiRequest, res: NextApiResponse) {
 		results: [],
 		exams,
 		instructorGender,
-		released: false,
 		...body,
 	});
 

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

@@ -7,6 +7,7 @@ import {sessionOptions} from "@/lib/session";
 import {Exam, InstructorGender, Variant} from "@/interfaces/exam";
 import {getExams} from "@/utils/exams.be";
 import {Module} from "@/interfaces";
+import {getUserCorporate} from "@/utils/groups.be";
 const db = getFirestore(app);
 
 export default withIronSessionApiRoute(handler, sessionOptions);
@@ -42,11 +43,16 @@ async function POST(req: NextApiRequest, res: NextApiResponse) {
 	}
 
 	const {module} = req.query as {module: string};
+	const corporate = await getUserCorporate(req.session.user.id);
 
 	try {
 		const exam = {
 			...req.body,
 			module: module,
+			owners: [
+				...(["mastercorporate", "corporate"].includes(req.session.user.type) ? [req.session.user.id] : []),
+				...(!!corporate ? [corporate.id] : []),
+			],
 			createdBy: req.session.user.id,
 			createdAt: new Date().toISOString(),
 		};

src/pages/record.tsx

@@ -24,6 +24,7 @@ import useTrainingContentStore from "@/stores/trainingContentStore";
 import {Assignment} from "@/interfaces/results";
 import {getUsers} from "@/utils/users.be";
 import {getAssignments, getAssignmentsByAssigner} from "@/utils/assignments.be";
+import useGradingSystem from "@/hooks/useGrading";
 
 export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
 	const user = req.session.user;
@@ -76,6 +77,7 @@ export default function History({user, users, assignments}: Props) {
 	const [filter, setFilter] = useState<Filter>();
 
 	const {data: stats, isLoading: isStatsLoading} = useFilterRecordsByUser<Stat[]>(statsUserId || user?.id);
+	const {gradingSystem} = useGradingSystem();
 
 	const setExams = useExamStore((state) => state.setExams);
 	const setShowSolutions = useExamStore((state) => state.setShowSolutions);
@@ -185,6 +187,7 @@ export default function History({user, users, assignments}: Props) {
 				setSelectedTrainingExams={setSelectedTrainingExams}
 				maxTrainingExams={MAX_TRAINING_EXAMS}
 				setExams={setExams}
+				gradingSystem={gradingSystem?.steps}
 				setShowSolutions={setShowSolutions}
 				setUserSolutions={setUserSolutions}
 				setSelectedModules={setSelectedModules}