diff --git a/src/constants/userPermissions.ts b/src/constants/userPermissions.ts index 46d548ef..3fdb9e97 100644 --- a/src/constants/userPermissions.ts +++ b/src/constants/userPermissions.ts @@ -2,30 +2,30 @@ import {Type} from "@/interfaces/user"; export const PERMISSIONS = { generateCode: { - student: ["teacher", "admin", "developer", "owner"], - teacher: ["admin", "developer", "owner"], - admin: ["owner", "developer"], + student: ["teacher", "corporate", "developer", "owner"], + teacher: ["corporate", "developer", "owner"], + corporate: ["owner", "developer"], owner: ["developer", "owner"], developer: ["developer"], }, deleteUser: { - student: ["teacher", "admin", "developer", "owner"], - teacher: ["admin", "developer", "owner"], - admin: ["owner", "developer"], + student: ["teacher", "corporate", "developer", "owner"], + teacher: ["corporate", "developer", "owner"], + corporate: ["owner", "developer"], owner: ["developer", "owner"], developer: ["developer"], }, updateUser: { - student: ["teacher", "admin", "developer", "owner"], - teacher: ["admin", "developer", "owner"], - admin: ["owner", "developer"], + student: ["teacher", "corporate", "developer", "owner"], + teacher: ["corporate", "developer", "owner"], + corporate: ["owner", "developer"], owner: ["developer", "owner"], developer: ["developer"], }, updateExpiryDate: { student: ["developer", "owner"], teacher: ["developer", "owner"], - admin: ["owner", "developer"], + corporate: ["owner", "developer"], owner: ["developer", "owner"], developer: ["developer"], }, diff --git a/src/dashboards/Owner.tsx b/src/dashboards/Owner.tsx index 5d104808..e00856e5 100644 --- a/src/dashboards/Owner.tsx +++ b/src/dashboards/Owner.tsx @@ -103,10 +103,10 @@ export default function OwnerDashboard({user}: Props) { Back -

Corporate ({users.filter((x) => x.type === "admin").length})

+

Corporate ({users.filter((x) => x.type === "corporate").length})

- x.type === "admin"} /> + x.type === "corporate"} /> ); @@ -131,7 +131,7 @@ export default function OwnerDashboard({user}: Props) { }; const InactiveCorporateList = () => { - const filter = (x: User) => x.type === "admin" && (x.isDisabled || moment().isAfter(x.subscriptionExpirationDate)); + const filter = (x: User) => x.type === "corporate" && (x.isDisabled || moment().isAfter(x.subscriptionExpirationDate)); return ( <> @@ -177,7 +177,7 @@ export default function OwnerDashboard({user}: Props) { Corporate - {users.filter((x) => x.type === "admin").length} + {users.filter((x) => x.type === "corporate").length}
@@ -207,7 +207,7 @@ export default function OwnerDashboard({user}: Props) { Inactive Corporate - {users.filter((x) => x.type === "admin" && (x.isDisabled || moment().isAfter(x.subscriptionExpirationDate))).length} + {users.filter((x) => x.type === "corporate" && (x.isDisabled || moment().isAfter(x.subscriptionExpirationDate))).length}
@@ -229,7 +229,7 @@ export default function OwnerDashboard({user}: Props) { Latest corporate
{users - .filter((x) => x.type === "admin") + .filter((x) => x.type === "corporate") .sort((a, b) => dateSorter(a, b, "asc", "registrationDate")) .map((x) => ( @@ -240,7 +240,7 @@ export default function OwnerDashboard({user}: Props) { Disabled Corporate
{users - .filter((x) => x.type === "admin" && x.isDisabled) + .filter((x) => x.type === "corporate" && x.isDisabled) .map((x) => ( ))} @@ -282,7 +282,7 @@ export default function OwnerDashboard({user}: Props) { {users .filter( (x) => - x.type === "admin" && + x.type === "corporate" && x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")), ) @@ -307,9 +307,9 @@ export default function OwnerDashboard({user}: Props) { if (shouldReload) reload(); }} onViewStudents={ - selectedUser.type === "admin" || selectedUser.type === "teacher" ? () => setPage("students") : undefined + selectedUser.type === "corporate" || selectedUser.type === "teacher" ? () => setPage("students") : undefined } - onViewTeachers={selectedUser.type === "admin" ? () => setPage("teachers") : undefined} + onViewTeachers={selectedUser.type === "corporate" ? () => setPage("teachers") : undefined} {...selectedUser} />
diff --git a/src/interfaces/user.ts b/src/interfaces/user.ts index 7234b733..e1f149f5 100644 --- a/src/interfaces/user.ts +++ b/src/interfaces/user.ts @@ -65,5 +65,5 @@ export interface Group { disableEditing?: boolean; } -export type Type = "student" | "teacher" | "admin" | "owner" | "developer"; -export const userTypes: Type[] = ["student", "teacher", "admin", "owner", "developer"]; +export type Type = "student" | "teacher" | "corporate" | "owner" | "developer"; +export const userTypes: Type[] = ["student", "teacher", "corporate", "owner", "developer"]; diff --git a/src/pages/(admin)/BatchCodeGenerator.tsx b/src/pages/(admin)/BatchCodeGenerator.tsx index 2a28634c..4cfe020b 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 && (user.type === "admin" || user.type === "teacher")) { + if (user && (user.type === "corporate" || user.type === "teacher")) { setExpiryDate(user.subscriptionExpirationDate || null); } }, [user]); @@ -126,8 +126,8 @@ export default function BatchCodeGenerator({user}: {user: User}) {