ENCOA-89, ENCOA-91, ENCOA-92, ENCOA-95

All changes related to permissions towards types of users

src/components/UserCard.tsx

@@ -248,7 +248,7 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
 							onChange={setCompanyName}
 							placeholder="Enter corporate name"
 							defaultValue={companyName}
-							disabled={disabled}
+							disabled={disabled || checkAccess(loggedInUser, getTypesOfUser(["developer", "admin"]))}
 						/>
 						<Input
 							label="Number of Users"
@@ -257,7 +257,7 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
 							onChange={(e) => setUserAmount(e ? parseInt(e) : undefined)}
 							placeholder="Enter number of users"
 							defaultValue={userAmount}
-							disabled={disabled}
+							disabled={disabled || checkAccess(loggedInUser, getTypesOfUser(["developer", "admin"]))}
 						/>
 						<Input
 							label="Monthly Duration"
@@ -266,7 +266,7 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
 							onChange={(e) => setMonthlyDuration(e ? parseInt(e) : undefined)}
 							placeholder="Enter monthly duration"
 							defaultValue={monthlyDuration}
-							disabled={disabled}
+							disabled={disabled || checkAccess(loggedInUser, getTypesOfUser(["developer", "admin"]))}
 						/>
 						<div className="flex flex-col gap-3 w-full lg:col-span-3">
 							<label className="font-normal text-base text-mti-gray-dim">Pricing</label>

src/constants/userPermissions.ts

@@ -1,91 +1,91 @@
-import { Type } from "@/interfaces/user";
+import {Type} from "@/interfaces/user";
 
 export const PERMISSIONS = {
-  generateCode: {
-    student: ["corporate", "developer", "admin", "mastercorporate"],
-    teacher: ["corporate", "developer", "admin", "mastercorporate"],
-    corporate: ["admin", "developer"],
-    mastercorporate: ["admin", "developer"],
+	generateCode: {
+		student: ["corporate", "developer", "admin", "mastercorporate"],
+		teacher: ["corporate", "developer", "admin", "mastercorporate"],
+		corporate: ["admin", "developer"],
+		mastercorporate: ["admin", "developer"],
 
-    admin: ["developer", "admin"],
-    agent: ["developer", "admin"],
-    developer: ["developer"],
-  },
-  deleteUser: {
-    student: {
-      perm: "deleteStudent",
-      list: ["corporate", "developer", "admin", "mastercorporate"],
-    },
-    teacher: {
-      perm: "deleteTeacher",
-      list: ["corporate", "developer", "admin", "mastercorporate"],
-    },
-    corporate: {
-      perm: "deleteCorporate",
-      list: ["admin", "developer"],
-    },
-    mastercorporate: {
-      perm: undefined,
-      list: ["admin", "developer"],
-    },
+		admin: ["developer", "admin"],
+		agent: ["developer", "admin"],
+		developer: ["developer"],
+	},
+	deleteUser: {
+		student: {
+			perm: "deleteStudent",
+			list: ["corporate", "developer", "admin", "mastercorporate"],
+		},
+		teacher: {
+			perm: "deleteTeacher",
+			list: ["corporate", "developer", "admin", "mastercorporate"],
+		},
+		corporate: {
+			perm: "deleteCorporate",
+			list: ["admin", "developer"],
+		},
+		mastercorporate: {
+			perm: undefined,
+			list: ["admin", "developer"],
+		},
 
-    admin: {
-      perm: "deleteAdmin",
-      list: ["developer", "admin"],
-    },
-    agent: {
-      perm: "deleteCountryManager",
-      list: ["developer", "admin"],
-    },
-    developer: {
-      perm: undefined,
-      list: ["developer"],
-    },
-  },
-  updateUser: {
-    student: {
-      perm: "editStudent",
-      list: ["developer", "admin"],
-    },
-    teacher: {
-      perm: "editTeacher",
-      list: ["developer", "admin"],
-    },
+		admin: {
+			perm: "deleteAdmin",
+			list: ["developer", "admin"],
+		},
+		agent: {
+			perm: "deleteCountryManager",
+			list: ["developer", "admin"],
+		},
+		developer: {
+			perm: undefined,
+			list: ["developer"],
+		},
+	},
+	updateUser: {
+		student: {
+			perm: "editStudent",
+			list: ["developer", "admin", "corporate", "mastercorporate", "teacher"],
+		},
+		teacher: {
+			perm: "editTeacher",
+			list: ["developer", "admin", "corporate", "mastercorporate"],
+		},
 
-    corporate: {
-      perm: "editCorporate",
-      list: ["admin", "developer"],
-    },
-    mastercorporate: {
-      perm: undefined,
-      list: ["admin", "developer"],
-    },
+		corporate: {
+			perm: "editCorporate",
+			list: ["developer", "admin", "mastercorporate"],
+		},
+		mastercorporate: {
+			perm: undefined,
+			list: ["admin", "developer"],
+		},
 
-    admin: {
-      perm: "editAdmin",
-      list: ["developer", "admin"],
-    },
+		admin: {
+			perm: "editAdmin",
+			list: ["developer", "admin"],
+		},
 
-    agent: {
-      perm: "editCountryManager",
-      list: ["developer", "admin"],
-    },
-    developer: {
-      perm: undefined,
-      list: ["developer"],
-    },
-  },
-  updateExpiryDate: {
-    student: ["developer", "admin"],
-    teacher: ["developer", "admin"],
-    corporate: ["admin", "developer"],
-    mastercorporate: ["admin", "developer"],
+		agent: {
+			perm: "editCountryManager",
+			list: ["developer", "admin"],
+		},
+		developer: {
+			perm: undefined,
+			list: ["developer"],
+		},
+	},
+	updateExpiryDate: {
+		student: ["developer", "admin"],
+		teacher: ["developer", "admin"],
+		corporate: ["admin", "developer"],
+		mastercorporate: ["admin", "developer"],
 
-    admin: ["developer", "admin"],
-    agent: ["developer", "admin"],
-    developer: ["developer"],
-  },
-  examManagement: {
-    delete: ["developer", "admin"],
-  },
+		admin: ["developer", "admin"],
+		agent: ["developer", "admin"],
+		developer: ["developer"],
+	},
+	examManagement: {
+		delete: ["developer", "admin"],
+	},
 };

src/pages/(admin)/BatchCodeGenerator.tsx

@@ -34,15 +34,15 @@ const USER_TYPE_PERMISSIONS: {
 	},
 	agent: {
 		perm: "createCodeCountryManager",
-		list: [],
+		list: ["student", "teacher", "corporate", "mastercorporate"],
 	},
 	corporate: {
 		perm: "createCodeCorporate",
-		list: ["student", "teacher"],
+		list: ["student", "teacher", "corporate"],
 	},
 	mastercorporate: {
 		perm: undefined,
-		list: ["student", "teacher", "corporate"],
+		list: ["student", "teacher", "corporate", "mastercorporate"],
 	},
 	admin: {
 		perm: "createCodeAdmin",

src/pages/(admin)/BatchCreateUser.tsx

@@ -11,10 +11,11 @@ import Modal from "@/components/Modal";
 import {BsQuestionCircleFill} from "react-icons/bs";
 import {PermissionType} from "@/interfaces/permissions";
 import moment from "moment";
-import {checkAccess} from "@/utils/permissions";
+import {checkAccess, getTypesOfUser} from "@/utils/permissions";
 import Checkbox from "@/components/Low/Checkbox";
 import ReactDatePicker from "react-datepicker";
 import clsx from "clsx";
+import usePermissions from "@/hooks/usePermissions";
 const EMAIL_REGEX = new RegExp(/^[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*@[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*$/);
 
 type Type = Exclude<UserType, "admin" | "developer" | "agent" | "mastercorporate">;
@@ -26,7 +27,7 @@ const USER_TYPE_LABELS: {[key in Type]: string} = {
 };
 
 const USER_TYPE_PERMISSIONS: {
-	[key in Type]: {perm: PermissionType | undefined; list: Type[]};
+	[key in UserType]: {perm: PermissionType | undefined; list: UserType[]};
 } = {
 	student: {
 		perm: "createCodeStudent",
@@ -36,9 +37,25 @@ const USER_TYPE_PERMISSIONS: {
 		perm: "createCodeTeacher",
 		list: [],
 	},
+	agent: {
+		perm: "createCodeCountryManager",
+		list: ["student", "teacher", "corporate", "mastercorporate"],
+	},
 	corporate: {
 		perm: "createCodeCorporate",
-		list: ["student", "teacher"],
+		list: ["student", "teacher", "corporate"],
+	},
+	mastercorporate: {
+		perm: undefined,
+		list: ["student", "teacher", "corporate", "mastercorporate"],
+	},
+	admin: {
+		perm: "createCodeAdmin",
+		list: ["student", "teacher", "agent", "corporate", "admin", "mastercorporate"],
+	},
+	developer: {
+		perm: undefined,
+		list: ["student", "teacher", "agent", "corporate", "admin", "developer", "mastercorporate"],
 	},
 };
 
@@ -65,6 +82,7 @@ export default function BatchCreateUser({user}: {user: User}) {
 	const [showHelp, setShowHelp] = useState(false);
 
 	const {users} = useUsers();
+	const {permissions} = usePermissions(user?.id || "");
 
 	const {openFilePicker, filesContent, clear} = useFilePicker({
 		accept: ".xlsx",
@@ -214,11 +232,17 @@ export default function BatchCreateUser({user}: {user: User}) {
 						defaultValue="student"
 						onChange={(e) => setType(e.target.value as Type)}
 						className="flex min-h-[70px] w-full min-w-[350px] cursor-pointer justify-center rounded-full border bg-white p-6 text-sm font-normal focus:outline-none">
-						{Object.keys(USER_TYPE_LABELS).map((type) => (
-							<option key={type} value={type}>
-								{USER_TYPE_LABELS[type as keyof typeof USER_TYPE_LABELS]}
-							</option>
-						))}
+						{Object.keys(USER_TYPE_LABELS)
+							.filter((x) => {
+								const {list, perm} = USER_TYPE_PERMISSIONS[x as Type];
+								// if (x === "corporate") console.log(list, perm, checkAccess(user, list, permissions, perm));
+								return checkAccess(user, getTypesOfUser(list), permissions, perm);
+							})
+							.map((type) => (
+								<option key={type} value={type}>
+									{USER_TYPE_LABELS[type as keyof typeof USER_TYPE_LABELS]}
+								</option>
+							))}
 					</select>
 				)}
 				<Button className="my-auto" onClick={makeUsers} disabled={infos.length === 0}>

src/pages/(admin)/CodeGenerator.tsx

@@ -11,7 +11,7 @@ import {useEffect, useState} from "react";
 import ReactDatePicker from "react-datepicker";
 import {toast} from "react-toastify";
 import ShortUniqueId from "short-unique-id";
-import {checkAccess} from "@/utils/permissions";
+import {checkAccess, getTypesOfUser} from "@/utils/permissions";
 import {PermissionType} from "@/interfaces/permissions";
 import usePermissions from "@/hooks/usePermissions";
 
@@ -28,15 +28,15 @@ const USER_TYPE_PERMISSIONS: {
 	},
 	agent: {
 		perm: "createCodeCountryManager",
-		list: [],
+		list: ["student", "teacher", "corporate", "mastercorporate"],
 	},
 	corporate: {
 		perm: "createCodeCorporate",
-		list: ["student", "teacher"],
+		list: ["student", "teacher", "corporate"],
 	},
 	mastercorporate: {
 		perm: undefined,
-		list: ["student", "teacher", "corporate"],
+		list: ["student", "teacher", "corporate", "mastercorporate"],
 	},
 	admin: {
 		perm: "createCodeAdmin",
@@ -103,7 +103,7 @@ export default function CodeGenerator({user}: {user: User}) {
 					{Object.keys(USER_TYPE_LABELS)
 						.filter((x) => {
 							const {list, perm} = USER_TYPE_PERMISSIONS[x as Type];
-							return checkAccess(user, list, permissions, perm);
+							return checkAccess(user, getTypesOfUser(list), permissions, perm);
 						})
 						.map((type) => (
 							<option key={type} value={type}>

src/pages/settings.tsx

@@ -62,9 +62,9 @@ export default function Admin() {
 				<Layout user={user} className="gap-6">
 					<section className="w-full grid grid-cols-2 -md:grid-cols-1 gap-8">
 						<ExamLoader />
-						<BatchCreateUser user={user} />
 						{checkAccess(user, getTypesOfUser(["teacher"]), permissions, "viewCodes") && (
 							<>
+								<BatchCreateUser user={user} />
 								<CodeGenerator user={user} />
 								<BatchCodeGenerator user={user} />
 							</>