From 348a020e7f7bdbc965cbfb2858c703740f9c4793 Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Fri, 13 Oct 2023 13:53:18 +0100
Subject: [PATCH] Solved issues related to the build

---
 src/pages/(admin)/BatchCodeGenerator.tsx | 66 ++++++++++++------------
 src/pages/(admin)/CodeGenerator.tsx      | 66 ++++++++++++------------
 src/pages/(admin)/Lists/UserList.tsx     |  7 ++-
 3 files changed, 73 insertions(+), 66 deletions(-)

diff --git a/src/pages/(admin)/BatchCodeGenerator.tsx b/src/pages/(admin)/BatchCodeGenerator.tsx
index 5c961f16..0e079fef 100644
--- a/src/pages/(admin)/BatchCodeGenerator.tsx
+++ b/src/pages/(admin)/BatchCodeGenerator.tsx
@@ -24,7 +24,7 @@ export default function BatchCodeGenerator({user}: {user: User}) {
 	});
 
 	useEffect(() => {
-		if (user.type === "admin" || user.type === "teacher") {
+		if (user && (user.type === "admin" || user.type === "teacher")) {
 			setExpiryDate(user.subscriptionExpirationDate || null);
 		}
 	}, [user]);
@@ -83,7 +83,7 @@ export default function BatchCodeGenerator({user}: {user: User}) {
 			<Button onClick={openFilePicker} isLoading={isLoading} disabled={isLoading}>
 				{filesContent.length > 0 ? filesContent[0].name : "Choose a file"}
 			</Button>
-			{(user.type === "developer" || user.type === "owner") && (
+			{user && (user.type === "developer" || user.type === "owner") && (
 				<>
 					<div className="flex items-center justify-between">
 						<label className="font-normal text-base text-mti-gray-dim">Expiry Date</label>
@@ -107,36 +107,38 @@ export default function BatchCodeGenerator({user}: {user: User}) {
 				</>
 			)}
 			<label className="font-normal text-base text-mti-gray-dim">Select the type of user they should be</label>
-			<div className="grid grid-cols-2 gap-4">
-				<Button
-					className="w-48"
-					variant="outline"
-					onClick={() => generateCode("student")}
-					disabled={emails.length === 0 || isLoading || !PERMISSIONS.generateCode.student.includes(user.type)}>
-					Student
-				</Button>
-				<Button
-					className="w-48"
-					variant="outline"
-					onClick={() => generateCode("teacher")}
-					disabled={emails.length === 0 || isLoading || !PERMISSIONS.generateCode.teacher.includes(user.type)}>
-					Teacher
-				</Button>
-				<Button
-					className="w-48"
-					variant="outline"
-					onClick={() => generateCode("admin")}
-					disabled={emails.length === 0 || isLoading || !PERMISSIONS.generateCode.admin.includes(user.type)}>
-					Admin
-				</Button>
-				<Button
-					className="w-48"
-					variant="outline"
-					onClick={() => generateCode("owner")}
-					disabled={emails.length === 0 || isLoading || !PERMISSIONS.generateCode.owner.includes(user.type)}>
-					Owner
-				</Button>
-			</div>
+			{user && (
+				<div className="grid grid-cols-2 gap-4">
+					<Button
+						className="w-48"
+						variant="outline"
+						onClick={() => generateCode("student")}
+						disabled={emails.length === 0 || isLoading || !PERMISSIONS.generateCode.student.includes(user.type)}>
+						Student
+					</Button>
+					<Button
+						className="w-48"
+						variant="outline"
+						onClick={() => generateCode("teacher")}
+						disabled={emails.length === 0 || isLoading || !PERMISSIONS.generateCode.teacher.includes(user.type)}>
+						Teacher
+					</Button>
+					<Button
+						className="w-48"
+						variant="outline"
+						onClick={() => generateCode("admin")}
+						disabled={emails.length === 0 || isLoading || !PERMISSIONS.generateCode.admin.includes(user.type)}>
+						Admin
+					</Button>
+					<Button
+						className="w-48"
+						variant="outline"
+						onClick={() => generateCode("owner")}
+						disabled={emails.length === 0 || isLoading || !PERMISSIONS.generateCode.owner.includes(user.type)}>
+						Owner
+					</Button>
+				</div>
+			)}
 		</div>
 	);
 }
diff --git a/src/pages/(admin)/CodeGenerator.tsx b/src/pages/(admin)/CodeGenerator.tsx
index cd80729d..b13480c0 100644
--- a/src/pages/(admin)/CodeGenerator.tsx
+++ b/src/pages/(admin)/CodeGenerator.tsx
@@ -17,7 +17,7 @@ export default function CodeGenerator({user}: {user: User}) {
 	const [isExpiryDateEnabled, setIsExpiryDateEnabled] = useState(true);
 
 	useEffect(() => {
-		if (user.type === "admin" || user.type === "teacher") {
+		if (user && (user.type === "admin" || user.type === "teacher")) {
 			setExpiryDate(user.subscriptionExpirationDate || null);
 		}
 	}, [user]);
@@ -56,37 +56,39 @@ export default function CodeGenerator({user}: {user: User}) {
 	return (
 		<div className="flex flex-col gap-4 border p-4 border-mti-gray-platinum rounded-xl">
 			<label className="font-normal text-base text-mti-gray-dim">User Code Generator</label>
-			<div className="grid grid-cols-2 gap-4">
-				<Button
-					className="w-48"
-					variant="outline"
-					onClick={() => generateCode("student")}
-					disabled={!PERMISSIONS.generateCode.student.includes(user.type) || (isExpiryDateEnabled && expiryDate === null)}>
-					Student
-				</Button>
-				<Button
-					className="w-48"
-					variant="outline"
-					onClick={() => generateCode("teacher")}
-					disabled={!PERMISSIONS.generateCode.teacher.includes(user.type) || (isExpiryDateEnabled && expiryDate === null)}>
-					Teacher
-				</Button>
-				<Button
-					className="w-48"
-					variant="outline"
-					onClick={() => generateCode("admin")}
-					disabled={!PERMISSIONS.generateCode.admin.includes(user.type) || (isExpiryDateEnabled && expiryDate === null)}>
-					Admin
-				</Button>
-				<Button
-					className="w-48"
-					variant="outline"
-					onClick={() => generateCode("owner")}
-					disabled={!PERMISSIONS.generateCode.owner.includes(user.type) || (isExpiryDateEnabled && expiryDate === null)}>
-					Owner
-				</Button>
-			</div>
-			{(user.type === "developer" || user.type === "owner") && (
+			{user && (
+				<div className="grid grid-cols-2 gap-4">
+					<Button
+						className="w-48"
+						variant="outline"
+						onClick={() => generateCode("student")}
+						disabled={!PERMISSIONS.generateCode.student.includes(user.type) || (isExpiryDateEnabled && expiryDate === null)}>
+						Student
+					</Button>
+					<Button
+						className="w-48"
+						variant="outline"
+						onClick={() => generateCode("teacher")}
+						disabled={!PERMISSIONS.generateCode.teacher.includes(user.type) || (isExpiryDateEnabled && expiryDate === null)}>
+						Teacher
+					</Button>
+					<Button
+						className="w-48"
+						variant="outline"
+						onClick={() => generateCode("admin")}
+						disabled={!PERMISSIONS.generateCode.admin.includes(user.type) || (isExpiryDateEnabled && expiryDate === null)}>
+						Admin
+					</Button>
+					<Button
+						className="w-48"
+						variant="outline"
+						onClick={() => generateCode("owner")}
+						disabled={!PERMISSIONS.generateCode.owner.includes(user.type) || (isExpiryDateEnabled && expiryDate === null)}>
+						Owner
+					</Button>
+				</div>
+			)}
+			{user && (user.type === "developer" || user.type === "owner") && (
 				<>
 					<div className="flex items-center justify-between">
 						<label className="font-normal text-base text-mti-gray-dim">Expiry Date</label>
diff --git a/src/pages/(admin)/Lists/UserList.tsx b/src/pages/(admin)/Lists/UserList.tsx
index 7ade2583..97a18538 100644
--- a/src/pages/(admin)/Lists/UserList.tsx
+++ b/src/pages/(admin)/Lists/UserList.tsx
@@ -21,7 +21,7 @@ export default function UserList({user}: {user: User}) {
 	const [showDemographicInformation, setShowDemographicInformation] = useState(false);
 
 	const {users, reload} = useUsers();
-	const {groups} = useGroups(user.id);
+	const {groups} = useGroups(user ? user.id : undefined);
 
 	const deleteAccount = (user: User) => {
 		if (!confirm(`Are you sure you want to delete ${user.name}'s account?`)) return;
@@ -245,7 +245,10 @@ export default function UserList({user}: {user: User}) {
 	];
 
 	const table = useReactTable({
-		data: user.type === "admin" || user.type === "student" ? users.filter((u) => groups.flatMap((g) => g.participants).includes(u.id)) : users,
+		data:
+			user && (user.type === "admin" || user.type === "student")
+				? users.filter((u) => groups.flatMap((g) => g.participants).includes(u.id))
+				: users,
 		columns: (!showDemographicInformation ? defaultColumns : demographicColumns) as any,
 		getCoreRowModel: getCoreRowModel(),
 	});