Merge branch 'develop' of https://bitbucket.org/ecropdev/ielts-ui into feature/training-content

package.json

@@ -12,6 +12,7 @@
   "dependencies": {
     "@beam-australia/react-env": "^3.1.1",
     "@dnd-kit/core": "^6.1.0",
+    "@firebase/util": "^1.9.7",
     "@headlessui/react": "^1.7.13",
     "@mdi/js": "^7.1.96",
     "@mdi/react": "^1.6.1",

src/components/Low/Select.tsx

@@ -4,7 +4,7 @@ import ReactSelect, {GroupBase, StylesConfig} from "react-select";
 
 interface Option {
 	[key: string]: any;
-	value: string;
+	value: string | null;
 	label: string;
 }
 

src/components/PermissionList.tsx

@@ -0,0 +1,62 @@
+import {Permission} from "@/interfaces/permissions";
+import {createColumnHelper, flexRender, getCoreRowModel, useReactTable} from "@tanstack/react-table";
+import Link from "next/link";
+import {convertCamelCaseToReadable} from "@/utils/string";
+
+interface Props {
+	permissions: Permission[];
+}
+
+const columnHelper = createColumnHelper<Permission>();
+
+const defaultColumns = [
+	columnHelper.accessor("type", {
+		header: () => <span>Type</span>,
+		cell: ({row, getValue}) => (
+			<Link
+				href={`/permissions/${row.original.id}`}
+				key={row.id}
+				className="underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer">
+				{convertCamelCaseToReadable(getValue() as string)}
+			</Link>
+		),
+	}),
+];
+
+export default function PermissionList({permissions}: Props) {
+	const table = useReactTable({
+		data: permissions,
+		columns: defaultColumns,
+		getCoreRowModel: getCoreRowModel(),
+	});
+	return (
+		<div className="w-full">
+			<div className="w-full flex flex-col gap-2">
+				<table className="rounded-xl bg-mti-purple-ultralight/40 w-full">
+					<thead>
+						{table.getHeaderGroups().map((headerGroup) => (
+							<tr key={headerGroup.id}>
+								{headerGroup.headers.map((header) => (
+									<th className="py-4 px-4 text-left" key={header.id}>
+										{header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+									</th>
+								))}
+							</tr>
+						))}
+					</thead>
+					<tbody className="px-2">
+						{table.getRowModel().rows.map((row) => (
+							<tr className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2" key={row.id}>
+								{row.getVisibleCells().map((cell) => (
+									<td className="px-4 py-2 items-center w-fit" key={cell.id}>
+										{flexRender(cell.column.columnDef.cell, cell.getContext())}
+									</td>
+								))}
+							</tr>
+						))}
+					</tbody>
+				</table>
+			</div>
+		</div>
+	);
+}

src/dashboards/AssignmentCreator.tsx

@@ -2,7 +2,7 @@ import Input from "@/components/Low/Input";
 import Modal from "@/components/Modal";
 import {Module} from "@/interfaces";
 import clsx from "clsx";
-import {useState} from "react";
+import {useEffect, useState} from "react";
 import {BsBook, BsCheckCircle, BsClipboard, BsHeadphones, BsMegaphone, BsPen, BsXCircle} from "react-icons/bs";
 import {generate} from "random-words";
 import {capitalize} from "lodash";
@@ -16,11 +16,11 @@ import moment from "moment";
 import axios from "axios";
 import {getExam} from "@/utils/exams";
 import {toast} from "react-toastify";
-import {uuidv4} from "@firebase/util";
 import {Assignment} from "@/interfaces/results";
 import Checkbox from "@/components/Low/Checkbox";
 import {InstructorGender, Variant} from "@/interfaces/exam";
 import Select from "@/components/Low/Select";
+import useExams from "@/hooks/useExams";
 
 interface Props {
 	isCreating: boolean;
@@ -44,6 +44,14 @@ export default function AssignmentCreator({isCreating, assignment, assigner, gro
 	const [instructorGender, setInstructorGender] = useState<InstructorGender>(assignment?.instructorGender || "varied");
 	// creates a new exam for each assignee or just one exam for all assignees
 	const [generateMultiple, setGenerateMultiple] = useState<boolean>(false);
+	const [useRandomExams, setUseRandomExams] = useState(true);
+	const [examIDs, setExamIDs] = useState<{id: string; module: Module}[]>([]);
+
+	const {exams} = useExams();
+
+	useEffect(() => {
+		setExamIDs((prev) => prev.filter((x) => selectedModules.includes(x.module)));
+	}, [selectedModules]);
 
 	const toggleModule = (module: Module) => {
 		const modules = selectedModules.filter((x) => x !== module);
@@ -61,6 +69,7 @@ export default function AssignmentCreator({isCreating, assignment, assigner, gro
 			assignees,
 			name,
 			startDate,
+			examIDs: !useRandomExams ? examIDs : undefined,
 			endDate,
 			selectedModules,
 			generateMultiple,
@@ -229,6 +238,7 @@ export default function AssignmentCreator({isCreating, assignment, assigner, gro
 					</div>
 				</div>
 
+				{selectedModules.includes("speaking") && (
 					<div className="flex flex-col gap-3 w-full">
 						<label className="font-normal text-base text-mti-gray-dim">Speaking Instructor&apos;s Gender</label>
 						<Select
@@ -242,6 +252,38 @@ export default function AssignmentCreator({isCreating, assignment, assigner, gro
 							]}
 						/>
 					</div>
+				)}
+
+				{selectedModules.length > 0 && (
+					<div className="flex flex-col gap-3 w-full">
+						<Checkbox isChecked={useRandomExams} onChange={setUseRandomExams}>
+							Random Exams
+						</Checkbox>
+						{!useRandomExams && (
+							<div className="grid md:grid-cols-2 w-full gap-4">
+								{selectedModules.map((module) => (
+									<div key={module} className="flex flex-col gap-3 w-full">
+										<label className="font-normal text-base text-mti-gray-dim">{capitalize(module)} Exam</label>
+										<Select
+											value={{
+												value: examIDs.find((e) => e.module === module)?.id || null,
+												label: examIDs.find((e) => e.module === module)?.id || "",
+											}}
+											onChange={(value) =>
+												value
+													? setExamIDs((prev) => [...prev.filter((x) => x.module !== module), {id: value.value!, module}])
+													: setExamIDs((prev) => prev.filter((x) => x.module !== module))
+											}
+											options={exams
+												.filter((x) => !x.isDiagnostic && x.module === module)
+												.map((x) => ({value: x.id, label: x.id}))}
+										/>
+									</div>
+								))}
+							</div>
+						)}
+					</div>
+				)}
 
 				<section className="w-full flex flex-col gap-3">
 					<span className="font-semibold">Assignees ({assignees.length} selected)</span>
@@ -323,7 +365,14 @@ export default function AssignmentCreator({isCreating, assignment, assigner, gro
 						</Button>
 					)}
 					<Button
-						disabled={selectedModules.length === 0 || !name || !startDate || !endDate || assignees.length === 0}
+						disabled={
+							selectedModules.length === 0 ||
+							!name ||
+							!startDate ||
+							!endDate ||
+							assignees.length === 0 ||
+							(!!examIDs && examIDs.length < selectedModules.length)
+						}
 						className="w-full max-w-[200px]"
 						onClick={createAssignment}
 						isLoading={isLoading}>

src/pages/(generation)/LevelGeneration.tsx

@@ -193,7 +193,7 @@ const TaskTab = ({section, setSection}: {section: LevelSection; setSection: (sec
 						<label className="font-normal text-base text-mti-gray-dim">Exercise Type</label>
 						<Select
 							options={Object.keys(TYPES).map((key) => ({value: key, label: TYPES[key]}))}
-							onChange={(e) => setSection({...section, type: e!.value})}
+							onChange={(e) => setSection({...section, type: e!.value!})}
 							value={{value: section?.type || "multiple_choice_4", label: TYPES[section?.type || "multiple_choice_4"]}}
 						/>
 					</div>
@@ -296,7 +296,7 @@ const LevelGeneration = () => {
 					module: "level",
 					difficulty,
 					variant: "full",
-					isDiagnostic: true,
+					isDiagnostic: false,
 					parts: parts
 						.map((part, index) => {
 							const currentExercise = result.data.exercises[`exercise_${index + 1}`] as any;

src/pages/(generation)/ListeningGeneration.tsx

@@ -15,6 +15,7 @@ import { useEffect, useState, Dispatch, SetStateAction } from "react";
 import {BsArrowRepeat, BsCheck} from "react-icons/bs";
 import {toast} from "react-toastify";
 import WriteBlanksEdit from "@/components/Generation/write.blanks.edit";
+import {generate} from "random-words";
 
 const DIFFICULTIES: Difficulty[] = ["easy", "medium", "hard"];
 
@@ -65,17 +66,10 @@ const PartTab = ({
 		setPart(undefined);
 		setIsLoading(true);
 		axios
-      .get(
+			.get(`/api/exam/listening/generate/listening_section_${index}${topic || types ? `?${url.toString()}` : ""}`)
-        `/api/exam/listening/generate/listening_section_${index}${
-          topic || types ? `?${url.toString()}` : ""
-        }`
-      )
 			.then((result) => {
 				playSound(typeof result.data === "string" ? "error" : "check");
-        if (typeof result.data === "string")
+				if (typeof result.data === "string") return toast.error("Something went wrong, please try to generate again.");
-          return toast.error(
-            "Something went wrong, please try to generate again."
-          );
 				setPart(result.data);
 			})
 			.catch((error) => {
@@ -98,9 +92,7 @@ const PartTab = ({
 								updateExercise={(data: any) =>
 									updatePart((part?: ListeningPart) => {
 										if (part) {
-                      const exercises = part.exercises.map((x) =>
+											const exercises = part.exercises.map((x) => (x.id === exercise.id ? {...x, ...data} : x)) as Exercise[];
-                        x.id === exercise.id ? { ...x, ...data } : x
-                      ) as Exercise[];
 											const updatedPart = {
 												...part,
 												exercises,
@@ -127,9 +119,7 @@ const PartTab = ({
 										if (part) {
 											return {
 												...part,
-                        exercises: part.exercises.map((x) =>
+												exercises: part.exercises.map((x) => (x.id === exercise.id ? {...x, ...data} : x)),
-                          x.id === exercise.id ? { ...x, ...data } : x
-                        ),
 											} as ListeningPart;
 										}
 
@@ -145,19 +135,12 @@ const PartTab = ({
 		});
 	};
 
-  const toggleType = (type: string) =>
+	const toggleType = (type: string) => setTypes((prev) => (prev.includes(type) ? [...prev.filter((x) => x !== type)] : [...prev, type]));
-    setTypes((prev) =>
-      prev.includes(type)
-        ? [...prev.filter((x) => x !== type)]
-        : [...prev, type]
-    );
 
 	return (
 		<Tab.Panel className="w-full bg-ielts-listening/20 min-h-[600px] h-full rounded-xl p-6 flex flex-col gap-4">
 			<div className="flex flex-col gap-3">
-        <label className="font-normal text-base text-mti-gray-dim">
+				<label className="font-normal text-base text-mti-gray-dim">Exercises</label>
-          Exercises
-        </label>
 				<div className="flex flex-row -2xl:flex-wrap w-full gap-4 -md:justify-center justify-between">
 					{availableTypes.map((x) => (
 						<span
@@ -168,24 +151,15 @@ const PartTab = ({
 								"transition duration-300 ease-in-out",
 								!types.includes(x.type)
 									? "bg-white border-mti-gray-platinum"
-                  : "bg-ielts-listening/70 border-ielts-listening text-white"
+									: "bg-ielts-listening/70 border-ielts-listening text-white",
-              )}
+							)}>
-            >
 							{x.label}
 						</span>
 					))}
 				</div>
 			</div>
 			<div className="flex gap-4 items-end">
-        <Input
+				<Input type="text" placeholder="Grand Canyon..." name="topic" label="Topic" onChange={setTopic} roundness="xl" defaultValue={topic} />
-          type="text"
-          placeholder="Grand Canyon..."
-          name="topic"
-          label="Topic"
-          onChange={setTopic}
-          roundness="xl"
-          defaultValue={topic}
-        />
 				<button
 					onClick={generate}
 					disabled={isLoading || types.length === 0}
@@ -194,9 +168,8 @@ const PartTab = ({
 						"bg-ielts-listening/70 border border-ielts-listening text-white w-full max-w-[200px] rounded-xl h-[70px]",
 						"hover:bg-ielts-listening disabled:bg-ielts-listening/40 disabled:cursor-not-allowed",
 						"transition ease-in-out duration-300",
-            isLoading && "tooltip"
+						isLoading && "tooltip",
-          )}
+					)}>
-        >
 					{isLoading ? (
 						<div className="flex items-center justify-center">
 							<BsArrowRepeat className="text-white animate-spin" size={25} />
@@ -208,14 +181,8 @@ const PartTab = ({
 			</div>
 			{isLoading && (
 				<div className="w-fit h-fit mt-12 self-center animate-pulse flex flex-col gap-8 items-center">
-          <span
+					<span className={clsx("loading loading-infinity w-32 text-ielts-listening")} />
-            className={clsx(
+					<span className={clsx("font-bold text-2xl text-ielts-listening")}>Generating...</span>
-              "loading loading-infinity w-32 text-ielts-listening"
-            )}
-          />
-          <span className={clsx("font-bold text-2xl text-ielts-listening")}>
-            Generating...
-          </span>
 				</div>
 			)}
 			{part && (
@@ -223,19 +190,12 @@ const PartTab = ({
 					<div className="flex flex-col gap-2 w-full overflow-y-scroll scrollbar-hide">
 						<div className="flex gap-4">
 							{part.exercises.map((x) => (
-                <span
+								<span className="rounded-xl bg-white border border-ielts-listening p-1 px-4" key={x.id}>
-                  className="rounded-xl bg-white border border-ielts-listening p-1 px-4"
-                  key={x.id}
-                >
 									{x.type && convertCamelCaseToReadable(x.type)}
 								</span>
 							))}
 						</div>
-            {typeof part.text === "string" && (
+						{typeof part.text === "string" && <span className="w-full h-96">{part.text.replaceAll("\n\n", " ")}</span>}
-              <span className="w-full h-96">
-                {part.text.replaceAll("\n\n", " ")}
-              </span>
-            )}
 						{typeof part.text !== "string" && (
 							<div className="w-full h-96 flex flex-col gap-2">
 								{part.text.conversation.map((x, index) => (
@@ -276,9 +236,7 @@ const ListeningGeneration = () => {
 	const [minTimer, setMinTimer] = useState(30);
 	const [isLoading, setIsLoading] = useState(false);
 	const [resultingExam, setResultingExam] = useState<ListeningExam>();
-  const [difficulty, setDifficulty] = useState<Difficulty>(
+	const [difficulty, setDifficulty] = useState<Difficulty>(sample(DIFFICULTIES)!);
-    sample(DIFFICULTIES)!
-  );
 
 	useEffect(() => {
 		const part1Timer = part1 ? 5 : 0;
@@ -298,13 +256,13 @@ const ListeningGeneration = () => {
 	const submitExam = () => {
 		const parts = [part1, part2, part3, part4].filter((x) => !!x);
 		console.log({parts});
-    if (parts.length === 0)
+		if (parts.length === 0) return toast.error("Please generate at least one section!");
-      return toast.error("Please generate at least one section!");
 
 		setIsLoading(true);
 
 		axios
 			.post(`/api/exam/listening/generate/listening`, {
+				id: generate({minLength: 4, maxLength: 8, min: 3, max: 5, join: " ", formatter: capitalize}),
 				parts,
 				minTimer,
 				difficulty,
@@ -312,9 +270,7 @@ const ListeningGeneration = () => {
 			.then((result) => {
 				playSound("sent");
 				console.log(`Generated Exam ID: ${result.data.id}`);
-        toast.success(
+				toast.success(`Generated Exam ID: ${result.data.id}`);
-          "This new exam has been generated successfully! Check the ID in our browser's console."
-        );
 				setResultingExam(result.data);
 
 				setPart1(undefined);
@@ -333,12 +289,9 @@ const ListeningGeneration = () => {
 	const loadExam = async (examId: string) => {
 		const exam = await getExamById("listening", examId.trim());
 		if (!exam) {
-      toast.error(
+			toast.error("Unknown Exam ID! Please make sure you selected the right module and entered the right exam ID", {
-        "Unknown Exam ID! Please make sure you selected the right module and entered the right exam ID",
-        {
 				toastId: "invalid-exam-id",
-        }
+			});
-      );
 
 			return;
 		}
@@ -353,9 +306,7 @@ const ListeningGeneration = () => {
 		<>
 			<div className="flex gap-4 w-1/2">
 				<div className="flex flex-col gap-3">
-          <label className="font-normal text-base text-mti-gray-dim">
+					<label className="font-normal text-base text-mti-gray-dim">Timer</label>
-            Timer
-          </label>
 					<Input
 						type="number"
 						name="minTimer"
@@ -365,17 +316,13 @@ const ListeningGeneration = () => {
 					/>
 				</div>
 				<div className="flex flex-col gap-3 w-full">
-          <label className="font-normal text-base text-mti-gray-dim">
+					<label className="font-normal text-base text-mti-gray-dim">Difficulty</label>
-            Difficulty
-          </label>
 					<Select
 						options={DIFFICULTIES.map((x) => ({
 							value: x,
 							label: capitalize(x),
 						}))}
-            onChange={(value) =>
+						onChange={(value) => (value ? setDifficulty(value.value as Difficulty) : null)}
-              value ? setDifficulty(value.value as Difficulty) : null
-            }
 						value={{value: difficulty, label: capitalize(difficulty)}}
 						disabled={!!part1 || !!part2 || !!part3 || !!part4}
 					/>
@@ -389,12 +336,9 @@ const ListeningGeneration = () => {
 								"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-listening/70 flex gap-2 items-center justify-center",
 								"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-listening focus:outline-none focus:ring-2",
 								"transition duration-300 ease-in-out",
-                selected
+								selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening",
-                  ? "bg-white shadow"
-                  : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening"
 							)
-            }
+						}>
-          >
 						Section 1 {part1 && <BsCheck />}
 					</Tab>
 					<Tab
@@ -403,12 +347,9 @@ const ListeningGeneration = () => {
 								"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-listening/70 flex gap-2 items-center justify-center",
 								"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-listening focus:outline-none focus:ring-2",
 								"transition duration-300 ease-in-out",
-                selected
+								selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening",
-                  ? "bg-white shadow"
-                  : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening"
 							)
-            }
+						}>
-          >
 						Section 2 {part2 && <BsCheck />}
 					</Tab>
 					<Tab
@@ -417,12 +358,9 @@ const ListeningGeneration = () => {
 								"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-listening/70 flex gap-2 items-center justify-center",
 								"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-listening focus:outline-none focus:ring-2",
 								"transition duration-300 ease-in-out",
-                selected
+								selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening",
-                  ? "bg-white shadow"
-                  : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening"
 							)
-            }
+						}>
-          >
 						Section 3 {part3 && <BsCheck />}
 					</Tab>
 					<Tab
@@ -431,12 +369,9 @@ const ListeningGeneration = () => {
 								"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-listening/70 flex gap-2 items-center justify-center",
 								"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-listening focus:outline-none focus:ring-2",
 								"transition duration-300 ease-in-out",
-                selected
+								selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening",
-                  ? "bg-white shadow"
-                  : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening"
 							)
-            }
+						}>
-          >
 						Section 4 {part4 && <BsCheck />}
 					</Tab>
 				</Tab.List>
@@ -445,12 +380,7 @@ const ListeningGeneration = () => {
 						{
 							part: part1,
 							setPart: setPart1,
-              types: [
+							types: [MULTIPLE_CHOICE, WRITE_BLANKS_QUESTIONS, WRITE_BLANKS_FILL, WRITE_BLANKS_FORM],
-                MULTIPLE_CHOICE,
-                WRITE_BLANKS_QUESTIONS,
-                WRITE_BLANKS_FILL,
-                WRITE_BLANKS_FORM,
-              ],
 						},
 						{
 							part: part2,
@@ -465,12 +395,7 @@ const ListeningGeneration = () => {
 						{
 							part: part4,
 							setPart: setPart4,
-              types: [
+							types: [MULTIPLE_CHOICE, WRITE_BLANKS_QUESTIONS, WRITE_BLANKS_FILL, WRITE_BLANKS_FORM],
-                MULTIPLE_CHOICE,
-                WRITE_BLANKS_QUESTIONS,
-                WRITE_BLANKS_FILL,
-                WRITE_BLANKS_FORM,
-              ],
 						},
 					].map(({part, setPart, types}, index) => (
 						<PartTab
@@ -493,9 +418,8 @@ const ListeningGeneration = () => {
 						className={clsx(
 							"bg-white border border-ielts-listening text-ielts-listening w-full max-w-[200px] rounded-xl h-[70px] self-end",
 							"hover:bg-ielts-listening hover:text-white disabled:bg-ielts-listening/40 disabled:cursor-not-allowed",
-              "transition ease-in-out duration-300"
+							"transition ease-in-out duration-300",
-            )}
+						)}>
-          >
 						Perform Exam
 					</button>
 				)}
@@ -507,9 +431,8 @@ const ListeningGeneration = () => {
 						"bg-ielts-listening/70 border border-ielts-listening text-white w-full max-w-[200px] rounded-xl h-[70px] self-end",
 						"hover:bg-ielts-listening disabled:bg-ielts-listening/40 disabled:cursor-not-allowed",
 						"transition ease-in-out duration-300",
-            !part1 && !part2 && !part3 && !part4 && "tooltip"
+						!part1 && !part2 && !part3 && !part4 && "tooltip",
-          )}
+					)}>
-        >
 					{isLoading ? (
 						<div className="flex items-center justify-center">
 							<BsArrowRepeat className="text-white animate-spin" size={25} />

src/pages/(generation)/ReadingGeneration.tsx

@@ -5,6 +5,7 @@ import useExamStore from "@/stores/examStore";
 import {getExamById} from "@/utils/exams";
 import {playSound} from "@/utils/sound";
 import {convertCamelCaseToReadable} from "@/utils/string";
+import {generate} from "random-words";
 import {Tab} from "@headlessui/react";
 import axios from "axios";
 import clsx from "clsx";
@@ -18,6 +19,7 @@ import FillBlanksEdit from "@/components/Generation/fill.blanks.edit";
 import TrueFalseEdit from "@/components/Generation/true.false.edit";
 import WriteBlanksEdit from "@/components/Generation/write.blanks.edit";
 import MatchSentencesEdit from "@/components/Generation/match.sentences.edit";
+import MultipleChoiceEdit from "@/components/Generation/multiple.choice.edit";
 
 const DIFFICULTIES: Difficulty[] = ["easy", "medium", "hard"];
 
@@ -118,6 +120,28 @@ const PartTab = ({
 							/>
 						</>
 					);
+				case "multipleChoice":
+					return (
+						<>
+							<h1>Exercise: True or False</h1>
+							<MultipleChoiceEdit
+								exercise={exercise}
+								key={exercise.id}
+								updateExercise={(data: any) => {
+									updatePart((part?: ReadingPart) => {
+										if (part) {
+											return {
+												...part,
+												exercises: part.exercises.map((x) => (x.id === exercise.id ? {...x, ...data} : x)),
+											} as ReadingPart;
+										}
+
+										return part;
+									});
+								}}
+							/>
+						</>
+					);
 				case "writeBlanks":
 					return (
 						<>
@@ -282,7 +306,7 @@ const ReadingGeneration = () => {
 			isDiagnostic: false,
 			minTimer,
 			module: "reading",
-			id: v4(),
+			id: generate({minLength: 4, maxLength: 8, min: 3, max: 5, join: " ", formatter: capitalize}),
 			type: "academic",
 			variant: parts.length === 3 ? "full" : "partial",
 			difficulty,
@@ -293,7 +317,7 @@ const ReadingGeneration = () => {
 			.then((result) => {
 				playSound("sent");
 				console.log(`Generated Exam ID: ${result.data.id}`);
-				toast.success("This new exam has been generated successfully! Check the ID in our browser's console.");
+				toast.success(`Generated Exam ID: ${result.data.id}`);
 				setResultingExam(result.data);
 
 				setPart1(undefined);

src/pages/(generation)/SpeakingGeneration.tsx

@@ -1,12 +1,6 @@
 import Input from "@/components/Low/Input";
 import Select from "@/components/Low/Select";
-import {
+import {Difficulty, Exercise, InteractiveSpeakingExercise, SpeakingExam, SpeakingExercise} from "@/interfaces/exam";
-  Difficulty,
-  Exercise,
-  InteractiveSpeakingExercise,
-  SpeakingExam,
-  SpeakingExercise,
-} from "@/interfaces/exam";
 import {AVATARS} from "@/resources/speakingAvatars";
 import useExamStore from "@/stores/examStore";
 import {getExamById} from "@/utils/exams";
@@ -18,6 +12,7 @@ import clsx from "clsx";
 import {capitalize, sample, uniq} from "lodash";
 import moment from "moment";
 import {useRouter} from "next/router";
+import {generate} from "random-words";
 import {useEffect, useState, Dispatch, SetStateAction} from "react";
 import {BsArrowRepeat, BsCheck} from "react-icons/bs";
 import {toast} from "react-toastify";
@@ -49,15 +44,10 @@ const PartTab = ({
 		url.append("difficulty", difficulty);
 
 		axios
-      .get(
+			.get(`/api/exam/speaking/generate/speaking_task_${index}?${url.toString()}`)
-        `/api/exam/speaking/generate/speaking_task_${index}?${url.toString()}`
-      )
 			.then((result) => {
 				playSound(typeof result.data === "string" ? "error" : "check");
-        if (typeof result.data === "string")
+				if (typeof result.data === "string") return toast.error("Something went wrong, please try to generate again.");
-          return toast.error(
-            "Something went wrong, please try to generate again."
-          );
 				console.log(result.data);
 				setPart(result.data);
 			})
@@ -69,13 +59,8 @@ const PartTab = ({
 	};
 
 	const generateVideo = async () => {
-    if (!part)
+		if (!part) return toast.error("Please generate the first part before generating the video!");
-      return toast.error(
+		toast.info("This will take quite a while, please do not leave this page or close the tab/window.");
-        "Please generate the first part before generating the video!"
-      );
-    toast.info(
-      "This will take quite a while, please do not leave this page or close the tab/window."
-    );
 
 		const avatar = sample(AVATARS.filter((x) => x.gender === gender));
 
@@ -88,16 +73,11 @@ const PartTab = ({
 				avatar: avatar?.id,
 			})
 			.then((result) => {
-        const isError =
+				const isError = typeof result.data === "string" || moment().diff(initialTime, "seconds") < 60;
-          typeof result.data === "string" ||
-          moment().diff(initialTime, "seconds") < 60;
 
 				playSound(isError ? "error" : "check");
 				console.log(result.data);
-        if (isError)
+				if (isError) return toast.error("Something went wrong, please try to generate the video again.");
-          return toast.error(
-            "Something went wrong, please try to generate the video again."
-          );
 				setPart({
 					...part,
 					result: {...result.data, topic: part?.topic},
@@ -115,18 +95,14 @@ const PartTab = ({
 	return (
 		<Tab.Panel className="w-full bg-ielts-speaking/20 min-h-[600px] h-full rounded-xl p-6 flex flex-col gap-4">
 			<div className="flex flex-col gap-3 w-full">
-        <label className="font-normal text-base text-mti-gray-dim">
+				<label className="font-normal text-base text-mti-gray-dim">Gender</label>
-          Gender
-        </label>
 				<Select
 					options={[
 						{value: "male", label: "Male"},
 						{value: "female", label: "Female"},
 					]}
 					value={{value: gender, label: capitalize(gender)}}
-          onChange={(value) =>
+					onChange={(value) => (value ? setGender(value.value as typeof gender) : null)}
-            value ? setGender(value.value as typeof gender) : null
-          }
 					disabled={isLoading}
 				/>
 			</div>
@@ -139,9 +115,8 @@ const PartTab = ({
 						"bg-ielts-speaking/70 border border-ielts-speaking text-white w-full rounded-xl h-[70px]",
 						"hover:bg-ielts-speaking disabled:bg-ielts-speaking/40 disabled:cursor-not-allowed",
 						"transition ease-in-out duration-300",
-            isLoading && "tooltip"
+						isLoading && "tooltip",
-          )}
+					)}>
-        >
 					{isLoading ? (
 						<div className="flex items-center justify-center">
 							<BsArrowRepeat className="text-white animate-spin" size={25} />
@@ -158,9 +133,8 @@ const PartTab = ({
 						"bg-ielts-speaking/70 border border-ielts-speaking text-white w-full rounded-xl h-[70px]",
 						"hover:bg-ielts-speaking disabled:bg-ielts-speaking/40 disabled:cursor-not-allowed",
 						"transition ease-in-out duration-300",
-            isLoading && "tooltip"
+						isLoading && "tooltip",
-          )}
+					)}>
-        >
 					{isLoading ? (
 						<div className="flex items-center justify-center">
 							<BsArrowRepeat className="text-white animate-spin" size={25} />
@@ -172,22 +146,14 @@ const PartTab = ({
 			</div>
 			{isLoading && (
 				<div className="w-fit h-fit mt-12 self-center animate-pulse flex flex-col gap-8 items-center">
-          <span
+					<span className={clsx("loading loading-infinity w-32 text-ielts-speaking")} />
-            className={clsx(
+					<span className={clsx("font-bold text-2xl text-ielts-speaking")}>Generating...</span>
-              "loading loading-infinity w-32 text-ielts-speaking"
-            )}
-          />
-          <span className={clsx("font-bold text-2xl text-ielts-speaking")}>
-            Generating...
-          </span>
 				</div>
 			)}
 			{part && !isLoading && (
 				<div className="flex flex-col gap-2 w-full overflow-y-scroll scrollbar-hide h-96">
 					<h3 className="text-xl font-semibold">
-            {!!part.first_topic && !!part.second_topic
+						{!!part.first_topic && !!part.second_topic ? `${part.first_topic} & ${part.second_topic}` : part.topic}
-              ? `${part.first_topic} & ${part.second_topic}`
-              : part.topic}
 					</h3>
 					{part.question && <span className="w-full">{part.question}</span>}
 					{part.questions && (
@@ -201,9 +167,7 @@ const PartTab = ({
 					)}
 					{part.prompts && (
 						<div className="flex flex-col gap-1">
-              <span className="font-medium">
+							<span className="font-medium">You should talk about the following things:</span>
-                You should talk about the following things:
-              </span>
 							{part.prompts.map((prompt, index) => (
 								<span className="w-full" key={index}>
 									- {prompt}
@@ -211,13 +175,10 @@ const PartTab = ({
 							))}
 						</div>
 					)}
-          {part.result && (
+					{part.result && <span className="font-bold mt-4">Video Generated: ✅</span>}
-            <span className="font-bold mt-4">Video Generated: ✅</span>
-          )}
 					{part.avatar && part.gender && (
 						<span>
-              <b>Instructor:</b> {part.avatar.name} -{" "}
+							<b>Instructor:</b> {part.avatar.name} - {capitalize(part.avatar.gender)}
-              {capitalize(part.avatar.gender)}
 						</span>
 					)}
 					{part.questions?.map((question, index) => (
@@ -228,15 +189,12 @@ const PartTab = ({
 							name="question"
 							required
 							value={question}
-              onChange={
+							onChange={(value) =>
-                (value) =>
 								updatePart((part?: SpeakingPart) => {
 									if (part) {
 										return {
 											...part,
-                        questions: part.questions?.map((x, xIndex) =>
+											questions: part.questions?.map((x, xIndex) => (xIndex === index ? value : x)),
-                          xIndex === index ? value : x
-                        ),
 										} as SpeakingPart;
 									}
 
@@ -270,9 +228,7 @@ const SpeakingGeneration = () => {
 	const [minTimer, setMinTimer] = useState(14);
 	const [isLoading, setIsLoading] = useState(false);
 	const [resultingExam, setResultingExam] = useState<SpeakingExam>();
-  const [difficulty, setDifficulty] = useState<Difficulty>(
+	const [difficulty, setDifficulty] = useState<Difficulty>(sample(DIFFICULTIES)!);
-    sample(DIFFICULTIES)!
-  );
 
 	useEffect(() => {
 		const parts = [part1, part2, part3].filter((x) => !!x);
@@ -285,40 +241,28 @@ const SpeakingGeneration = () => {
 	const setSelectedModules = useExamStore((state) => state.setSelectedModules);
 
 	const submitExam = () => {
-    if (!part1?.result && !part2?.result && !part3?.result)
+		if (!part1?.result && !part2?.result && !part3?.result) return toast.error("Please generate at least one task!");
-      return toast.error("Please generate at least one task!");
 
 		setIsLoading(true);
 
-    const genders = [part1?.gender, part2?.gender, part3?.gender].filter(
+		const genders = [part1?.gender, part2?.gender, part3?.gender].filter((x) => !!x);
-      (x) => !!x
-    );
 
 		const exercises = [part1?.result, part2?.result, part3?.result]
 			.filter((x) => !!x)
 			.map((x) => ({
 				...x,
-        first_title:
+				first_title: x?.type === "interactiveSpeaking" ? x.first_topic : undefined,
-          x?.type === "interactiveSpeaking" ? x.first_topic : undefined,
+				second_title: x?.type === "interactiveSpeaking" ? x.second_topic : undefined,
-        second_title:
-          x?.type === "interactiveSpeaking" ? x.second_topic : undefined,
 			}));
 
 		const exam: SpeakingExam = {
-      id: v4(),
+			id: generate({minLength: 4, maxLength: 8, min: 3, max: 5, join: " ", formatter: capitalize}),
 			isDiagnostic: false,
-      exercises: exercises as (
+			exercises: exercises as (SpeakingExercise | InteractiveSpeakingExercise)[],
-        | SpeakingExercise
-        | InteractiveSpeakingExercise
-      )[],
 			minTimer,
 			variant: minTimer >= 14 ? "full" : "partial",
 			module: "speaking",
-      instructorGender: genders.every((x) => x === "male")
+			instructorGender: genders.every((x) => x === "male") ? "male" : genders.every((x) => x === "female") ? "female" : "varied",
-        ? "male"
-        : genders.every((x) => x === "female")
-        ? "female"
-        : "varied",
 		};
 
 		axios
@@ -326,9 +270,7 @@ const SpeakingGeneration = () => {
 			.then((result) => {
 				playSound("sent");
 				console.log(`Generated Exam ID: ${result.data.id}`);
-        toast.success(
+				toast.success(`Generated Exam ID: ${result.data.id}`);
-          "This new exam has been generated successfully! Check the ID in our browser's console."
-        );
 				setResultingExam(result.data);
 
 				setPart1(undefined);
@@ -339,9 +281,7 @@ const SpeakingGeneration = () => {
 			})
 			.catch((error) => {
 				console.log(error);
-        toast.error(
+				toast.error("Something went wrong while generating, please try again later.");
-          "Something went wrong while generating, please try again later."
-        );
 			})
 			.finally(() => setIsLoading(false));
 	};
@@ -349,12 +289,9 @@ const SpeakingGeneration = () => {
 	const loadExam = async (examId: string) => {
 		const exam = await getExamById("speaking", examId.trim());
 		if (!exam) {
-      toast.error(
+			toast.error("Unknown Exam ID! Please make sure you selected the right module and entered the right exam ID", {
-        "Unknown Exam ID! Please make sure you selected the right module and entered the right exam ID",
-        {
 				toastId: "invalid-exam-id",
-        }
+			});
-      );
 
 			return;
 		}
@@ -369,9 +306,7 @@ const SpeakingGeneration = () => {
 		<>
 			<div className="flex gap-4 w-1/2">
 				<div className="flex flex-col gap-3">
-          <label className="font-normal text-base text-mti-gray-dim">
+					<label className="font-normal text-base text-mti-gray-dim">Timer</label>
-            Timer
-          </label>
 					<Input
 						type="number"
 						name="minTimer"
@@ -381,17 +316,13 @@ const SpeakingGeneration = () => {
 					/>
 				</div>
 				<div className="flex flex-col gap-3 w-full">
-          <label className="font-normal text-base text-mti-gray-dim">
+					<label className="font-normal text-base text-mti-gray-dim">Difficulty</label>
-            Difficulty
-          </label>
 					<Select
 						options={DIFFICULTIES.map((x) => ({
 							value: x,
 							label: capitalize(x),
 						}))}
-            onChange={(value) =>
+						onChange={(value) => (value ? setDifficulty(value.value as Difficulty) : null)}
-              value ? setDifficulty(value.value as Difficulty) : null
-            }
 						value={{value: difficulty, label: capitalize(difficulty)}}
 						disabled={!!part1 || !!part2 || !!part3}
 					/>
@@ -406,12 +337,9 @@ const SpeakingGeneration = () => {
 								"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/70 flex gap-2 items-center justify-center",
 								"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
 								"transition duration-300 ease-in-out",
-                selected
+								selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
-                  ? "bg-white shadow"
-                  : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking"
 							)
-            }
+						}>
-          >
 						Exercise 1 {part1 && part1.result && <BsCheck />}
 					</Tab>
 					<Tab
@@ -420,12 +348,9 @@ const SpeakingGeneration = () => {
 								"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/70 flex gap-2 items-center justify-center",
 								"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
 								"transition duration-300 ease-in-out",
-                selected
+								selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
-                  ? "bg-white shadow"
-                  : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking"
 							)
-            }
+						}>
-          >
 						Exercise 2 {part2 && part2.result && <BsCheck />}
 					</Tab>
 					<Tab
@@ -434,12 +359,9 @@ const SpeakingGeneration = () => {
 								"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/70 flex gap-2 items-center justify-center",
 								"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
 								"transition duration-300 ease-in-out",
-                selected
+								selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
-                  ? "bg-white shadow"
-                  : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking"
 							)
-            }
+						}>
-          >
 						Interactive {part3 && part3.result && <BsCheck />}
 					</Tab>
 				</Tab.List>
@@ -449,14 +371,7 @@ const SpeakingGeneration = () => {
 						{part: part2, setPart: setPart2},
 						{part: part3, setPart: setPart3},
 					].map(({part, setPart}, index) => (
-            <PartTab
+						<PartTab difficulty={difficulty} part={part} index={index + 1} key={index} setPart={setPart} updatePart={setPart} />
-              difficulty={difficulty}
-              part={part}
-              index={index + 1}
-              key={index}
-              setPart={setPart}
-              updatePart={setPart}
-            />
 					))}
 				</Tab.Panels>
 			</Tab.Group>
@@ -468,25 +383,21 @@ const SpeakingGeneration = () => {
 						className={clsx(
 							"bg-white border border-ielts-speaking text-ielts-speaking w-full max-w-[200px] rounded-xl h-[70px] self-end",
 							"hover:bg-ielts-speaking hover:text-white disabled:bg-ielts-speaking/40 disabled:cursor-not-allowed",
-              "transition ease-in-out duration-300"
+							"transition ease-in-out duration-300",
-            )}
+						)}>
-          >
 						Perform Exam
 					</button>
 				)}
 				<button
-          disabled={
+					disabled={(!part1?.result && !part2?.result && !part3?.result) || isLoading}
-            (!part1?.result && !part2?.result && !part3?.result) || isLoading
-          }
 					data-tip="Please generate all three passages"
 					onClick={submitExam}
 					className={clsx(
 						"bg-ielts-speaking/70 border border-ielts-speaking text-white w-full max-w-[200px] rounded-xl h-[70px] self-end",
 						"hover:bg-ielts-speaking disabled:bg-ielts-speaking/40 disabled:cursor-not-allowed",
 						"transition ease-in-out duration-300",
-            !part1 && !part2 && !part3 && "tooltip"
+						!part1 && !part2 && !part3 && "tooltip",
-          )}
+					)}>
-        >
 					{isLoading ? (
 						<div className="flex items-center justify-center">
 							<BsArrowRepeat className="text-white animate-spin" size={25} />

src/pages/(generation)/WritingGeneration.tsx

@@ -9,6 +9,7 @@ import axios from "axios";
 import clsx from "clsx";
 import {capitalize, sample} from "lodash";
 import {useRouter} from "next/router";
+import {generate} from "random-words";
 import {useEffect, useState} from "react";
 import {BsArrowRepeat, BsCheck} from "react-icons/bs";
 import {toast} from "react-toastify";
@@ -151,7 +152,7 @@ const WritingGeneration = () => {
 			minTimer,
 			module: "writing",
 			exercises: [...(exercise1 ? [exercise1] : []), ...(exercise2 ? [exercise2] : [])],
-			id: v4(),
+			id: generate({minLength: 4, maxLength: 8, min: 3, max: 5, join: " ", formatter: capitalize}),
 			variant: exercise1 && exercise2 ? "full" : "partial",
 			difficulty,
 		};
@@ -160,6 +161,7 @@ const WritingGeneration = () => {
 			.post(`/api/exam/writing`, exam)
 			.then((result) => {
 				console.log(`Generated Exam ID: ${result.data.id}`);
+				toast.success(`Generated Exam ID: ${result.data.id}`);
 				playSound("sent");
 				toast.success("This new exam has been generated successfully! Check the ID in our browser's console.");
 				setResultingExam(result.data);

src/pages/api/assignments/[id]/index.ts

@@ -4,7 +4,7 @@ import {app} from "@/firebase";
 import {getFirestore, collection, getDocs, query, where, setDoc, doc, getDoc, deleteDoc} from "firebase/firestore";
 import {withIronSessionApiRoute} from "iron-session/next";
 import {sessionOptions} from "@/lib/session";
-import {uuidv4} from "@firebase/util";
+
 
 const db = getFirestore(app);
 

src/pages/api/assignments/index.ts

@@ -102,6 +102,7 @@ const generateExams = async (
 
 async function POST(req: NextApiRequest, res: NextApiResponse) {
 	const {
+		examIDs,
 		selectedModules,
 		assignees,
 		// Generate multiple true would generate an unique exam for each user
@@ -111,6 +112,7 @@ async function POST(req: NextApiRequest, res: NextApiResponse) {
 		instructorGender,
 		...body
 	} = req.body as {
+		examIDs?: {id: string; module: Module}[];
 		selectedModules: Module[];
 		assignees: string[];
 		generateMultiple: Boolean;
@@ -121,7 +123,9 @@ async function POST(req: NextApiRequest, res: NextApiResponse) {
 		instructorGender?: InstructorGender;
 	};
 
-	const exams: ExamWithUser[] = await generateExams(generateMultiple, selectedModules, assignees, variant, instructorGender);
+	const exams: ExamWithUser[] = !!examIDs
+		? examIDs.flatMap((e) => assignees.map((a) => ({...e, assignee: a})))
+		: await generateExams(generateMultiple, selectedModules, assignees, variant, instructorGender);
 
 	if (exams.length === 0) {
 		res.status(400).json({ok: false, error: "No exams found for the selected modules"});

src/pages/permissions/[id].tsx

@@ -14,10 +14,11 @@ import Select from "@/components/Low/Select";
 import Button from "@/components/Low/Button";
 import axios from "axios";
 import { toast, ToastContainer } from "react-toastify";
-
+import {Type as UserType} from '@/interfaces/user'
 interface BasicUser {
   id: string;
   name: string;
+  type: UserType
 }
 
 interface PermissionWithBasicUsers {
@@ -61,9 +62,11 @@ export const getServerSideProps = withIronSessionSsr(async (context) => {
   const permission: Permission = await getPermissionDoc(params.id as string);
 
   const allUserData: User[] = await getUsers();
+  
   const users = allUserData.map((u) => ({
     id: u.id,
     name: u.name,
+    type: u.type
   })) as BasicUser[];
   
   // const res = await fetch("api/permissions");
@@ -101,16 +104,15 @@ interface Props {
 }
 
 export default function Page(props: Props) {
-  console.log("Props", props);
-
   const { permission, user, users } = props;
   
+  
   const [selectedUsers, setSelectedUsers] = useState<string[]>(() =>
     permission.users.map((u) => u.id)
   );
 
   const onChange = (value: any) => {
-    console.log("value", value);
+    
     setSelectedUsers((prev) => {
       if (value?.value) {
         return [...prev, value?.value];
@@ -123,7 +125,7 @@ export default function Page(props: Props) {
   };
 
   const update = async () => {
-    console.log("update", selectedUsers);
+    
     try {
       await axios.patch(`/api/permissions/${permission.id}`, {
         users: selectedUsers,
@@ -156,24 +158,25 @@ export default function Page(props: Props) {
             options={users
               .filter((u) => !selectedUsers.includes(u.id))
               .map((u) => ({
-                label: u.name,
+                label: `${u?.type}-${u?.name}`,
                 value: u.id,
               }))}
             onChange={onChange}
           />
           <Button onClick={update}>Update</Button>
         </div>
+        <div className="flex flex-row justify-between">
           <div className="flex flex-col gap-3">
           <h2>Blacklisted Users</h2>
           <div className="flex gap-3 flex-wrap">
             {selectedUsers.map((userId) => {
-              const name = users.find((u) => u.id === userId)?.name;
+              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}
                 >
-                  <span className="text-base">{name}</span>
+                  <span className="text-base first-letter:uppercase">{user?.type}-{user?.name}</span>
                   <BsTrash
                     style={{ cursor: "pointer" }}
                     onClick={() => removeUser(userId)}
@@ -184,6 +187,22 @@ export default function Page(props: Props) {
             })}
           </div>
         </div>
+        <div className="flex flex-col gap-3">
+          <h2>Whitelisted Users</h2>
+          <div className="flex flex-col gap-3 flex-wrap">
+            {users.filter(user => !selectedUsers.includes(user.id)).map((user) => {
+              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>
+              );
+            })}
+          </div>
+        </div>
+        </div>
       </Layout>
     </>
   );

src/pages/permissions/index.tsx

@@ -7,7 +7,7 @@ import { Permission } from "@/interfaces/permissions";
 import { getPermissionDocs } from "@/utils/permissions.be";
 import { User } from "@/interfaces/user";
 import Layout from "@/components/High/Layout";
-import Link from "next/link";
+import PermissionList from '@/components/PermissionList'
 
 export const getServerSideProps = withIronSessionSsr(async ({ req }) => {
   const user = req.session.user;
@@ -33,7 +33,6 @@ export const getServerSideProps = withIronSessionSsr(async ({ req }) => {
   // Fetch data from external API
   const permissions: Permission[] = await getPermissionDocs();
 
-  console.log("Permissions", permissions);
 
   // const res = await fetch("api/permissions");
   // const permissions: Permission[] = await res.json();
@@ -56,7 +55,6 @@ interface Props {
 }
 
 export default function Page(props: Props) {
-  console.log("Props", props);
   
   const { permissions, user } = props;
   
@@ -74,19 +72,7 @@ export default function Page(props: Props) {
       <Layout user={user} className="gap-6">
         <h1 className="text-2xl font-semibold">Permissions</h1>
         <div className="flex gap-3 flex-wrap">
-          {permissions.map((permission: Permission) => {
+          <PermissionList permissions={permissions} />
-            const id = permission.id as string;
-            const type = permission.type as string;
-            return (
-              <Link href={`/permissions/${id}`} key={id}>
-                <div className="card bg-primary text-primary-content">
-                  <div className="card-body">
-                    <h1 className="card-title">{type}</h1>
-                  </div>
-                </div>
-              </Link>
-            );
-          })}
         </div>
       </Layout>
     </>

src/pages/record.tsx

@@ -285,7 +285,7 @@ export default function History({ user }: { user: User }) {
 											label: `${x.name} - ${x.email}`,
 										}))}
 										value={selectedUserSelectValue}
-										onChange={(value) => setStatsUserId(value?.value)}
+										onChange={(value) => setStatsUserId(value?.value!)}
 										styles={{
 											menuPortal: (base) => ({ ...base, zIndex: 9999 }),
 											option: (styles, state) => ({
@@ -309,7 +309,7 @@ export default function History({ user }: { user: User }) {
 												label: `${x.name} - ${x.email}`,
 											}))}
 										value={selectedUserSelectValue}
-										onChange={(value) => setStatsUserId(value?.value)}
+										onChange={(value) => setStatsUserId(value?.value!)}
 										styles={{
 											menuPortal: (base) => ({ ...base, zIndex: 9999 }),
 											option: (styles, state) => ({

src/pages/tickets.tsx

@@ -70,27 +70,33 @@ const SOURCE_OPTIONS = [
 
 type CustomStatus = TicketStatus | "all" | "pending";
 
-const STATUS_OPTIONS = [{
+const STATUS_OPTIONS = [
-	label: 'Pending',
+	{
-	value: 'pending',
+		label: "Pending",
-	filter: (x: Ticket) => x.status !== 'completed',
+		value: "pending",
-}, {
+		filter: (x: Ticket) => x.status !== "completed",
-	label: 'All',
+	},
-	value: 'all',
+	{
+		label: "All",
+		value: "all",
 		filter: (x: Ticket) => true,
-}, {
+	},
-	label: 'Completed',
+	{
-	value: 'completed',
+		label: "Completed",
-	filter: (x: Ticket) => x.status === 'completed',
+		value: "completed",
-}, {
+		filter: (x: Ticket) => x.status === "completed",
-	label: 'In Progress',
+	},
-	value: 'in-progress',
+	{
-	filter: (x: Ticket) => x.status === 'in-progress',
+		label: "In Progress",
-}, {
+		value: "in-progress",
-	label: 'Submitted',
+		filter: (x: Ticket) => x.status === "in-progress",
-	value: 'submitted',
+	},
-	filter: (x: Ticket) => x.status === 'submitted',
+	{
-}]
+		label: "Submitted",
+		value: "submitted",
+		filter: (x: Ticket) => x.status === "submitted",
+	},
+];
 
 export default function Tickets() {
 	const [filteredTickets, setFilteredTickets] = useState<Ticket[]>([]);
@@ -101,7 +107,7 @@ export default function Tickets() {
 	const [dateSorting, setDateSorting] = useState<"asc" | "desc">("desc");
 
 	const [typeFilter, setTypeFilter] = useState<TicketType>();
-	const [statusFilter, setStatusFilter] = useState<CustomStatus>('pending');
+	const [statusFilter, setStatusFilter] = useState<CustomStatus>("pending");
 
 	const {user} = useUser({redirectTo: "/login"});
 	const {users} = useUsers();
@@ -116,7 +122,7 @@ export default function Tickets() {
 		if (user?.type === "agent") filters.push((x: Ticket) => x.assignedTo === user.id);
 		if (typeFilter) filters.push((x: Ticket) => x.type === typeFilter);
 		if (statusFilter) {
-			const filter = STATUS_OPTIONS.find(x => x.value === statusFilter)?.filter;
+			const filter = STATUS_OPTIONS.find((x) => x.value === statusFilter)?.filter;
 			if (filter) filters.push(filter);
 		}
 		if (assigneeFilter) filters.push((x: Ticket) => x.assignedTo === assigneeFilter);
@@ -242,9 +248,7 @@ export default function Tickets() {
 							<label className="text-mti-gray-dim text-base font-normal">Status</label>
 							<Select
 								options={STATUS_OPTIONS}
-								value={
+								value={STATUS_OPTIONS.find((x) => x.value === statusFilter)}
-									STATUS_OPTIONS.find((x) => x.value === statusFilter)
-								}
 								onChange={(value) => setStatusFilter((value?.value as TicketStatus) ?? undefined)}
 								isClearable
 								placeholder="Status..."
@@ -278,7 +282,7 @@ export default function Tickets() {
 								disabled={user.type === "agent"}
 								value={getAssigneeValue()}
 								onChange={(value) =>
-									value ? setAssigneeFilter(value.value === "me" ? user.id : value.value) : setAssigneeFilter(undefined)
+									value ? setAssigneeFilter(value.value === "me" ? user.id : value.value!) : setAssigneeFilter(undefined)
 								}
 								placeholder="Assignee..."
 								isClearable

yarn.lock

@@ -718,6 +718,13 @@
   dependencies:
     tslib "^2.1.0"
 
+"@firebase/util@^1.9.7":
+  version "1.9.7"
+  resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.9.7.tgz#c03b0ae065b3bba22800da0bd5314ef030848038"
+  integrity sha512-fBVNH/8bRbYjqlbIhZ+lBtdAAS4WqZumx03K06/u7fJSpz1TGjEMm1ImvKD47w+xaFKIP2ori6z8BrbakRfjJA==
+  dependencies:
+    tslib "^2.1.0"
+
 "@firebase/webchannel-wrapper@0.9.0":
   version "0.9.0"
   resolved "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.9.0.tgz"
@@ -6312,7 +6319,8 @@ wordwrap@^1.0.0:
   resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"
   integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+  name wrap-ansi-cjs
   version "7.0.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==