devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Solved issues related to the build

Browse Source
This commit is contained in:
Tiago Ribeiro
2023-10-13 13:53:18 +01:00
parent ca96b37303
commit 348a020e7f
3 changed files with 73 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/pages/(admin)/BatchCodeGenerator.tsx
View File

@@ -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>
);
}

66
src/pages/(admin)/CodeGenerator.tsx
View File

@@ -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>

7
src/pages/(admin)/Lists/UserList.tsx
View File

@@ -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(),
});