Did some fixes related to master corporates

src/pages/(admin)/UserCreator.tsx

@@ -22,6 +22,7 @@ import { getUserName } from "@/utils/users";
 import Select from "@/components/Low/Select";
 import {EntityWithRoles} from "@/interfaces/entity";
 import useEntitiesGroups from "@/hooks/useEntitiesGroups";
+import {mapBy} from "@/utils";
 
 const USER_TYPE_PERMISSIONS: {
 	[key in Type]: {perm: PermissionType | undefined; list: Type[]};
@@ -59,7 +60,7 @@ const USER_TYPE_PERMISSIONS: {
 interface Props {
 	user: User;
 	users: User[];
-  entities: EntityWithRoles[]
+	entities: EntityWithRoles[];
 	permissions: PermissionType[];
 	onFinish: () => void;
 }
@@ -81,7 +82,7 @@ export default function UserCreator({ user, users, entities = [], permissions, o
 	const [isLoading, setIsLoading] = useState(false);
 	const [type, setType] = useState<Type>("student");
 	const [position, setPosition] = useState<string>();
-  const [entity, setEntity] = useState((entities || [])[0]?.id || undefined)
+	const [entity, setEntity] = useState((entities || [])[0]?.id || undefined);
 
 	const {groups} = useEntitiesGroups();
 
@@ -128,7 +129,7 @@ export default function UserCreator({ user, users, entities = [], permissions, o
 				setStudentID("");
 				setCountry(user?.demographicInformation?.country);
 				setGroup(null);
-        setEntity((entities || [])[0]?.id || undefined)
+				setEntity((entities || [])[0]?.id || undefined);
 				setExpiryDate(user?.subscriptionExpirationDate ? moment(user?.subscriptionExpirationDate).toDate() : null);
 				setIsExpiryDateEnabled(true);
 				setType("student");
@@ -198,9 +199,7 @@ export default function UserCreator({ user, users, entities = [], permissions, o
 				<div className={clsx("flex flex-col gap-4")}>
 					<label className="font-normal text-base text-mti-gray-dim">Classroom</label>
 					<Select
-            options={groups
+						options={groups.filter((x) => x.entity?.id === entity).map((g) => ({value: g.id, label: g.name}))}
-              .filter((x) => x.entity?.id === entity)
-              .map((g) => ({ value: g.id, label: g.name }))}
 						onChange={(e) => setGroup(e?.value || undefined)}
 						isClearable
 					/>

src/pages/dashboard/mastercorporate.tsx

@@ -10,10 +10,7 @@ import { requestUser } from "@/utils/api";
 import {countEntitiesAssignments} from "@/utils/assignments.be";
 import {getEntitiesWithRoles} from "@/utils/entities.be";
 import {countGroupsByEntities} from "@/utils/groups.be";
-import {
+import {checkAccess, groupAllowedEntitiesByPermissions} from "@/utils/permissions";
-  checkAccess,
-  groupAllowedEntitiesByPermissions,
-} from "@/utils/permissions";
 import {groupByExam} from "@/utils/stats";
 import {countAllowedUsers, getUsers} from "@/utils/users.be";
 import {clsx} from "clsx";
@@ -22,16 +19,7 @@ import moment from "moment";
 import Head from "next/head";
 import {useRouter} from "next/router";
 import {useMemo} from "react";
-import {
+import {BsBank, BsClock, BsEnvelopePaper, BsPencilSquare, BsPeople, BsPeopleFill, BsPersonFill, BsPersonFillGear} from "react-icons/bs";
-  BsBank,
-  BsClock,
-  BsEnvelopePaper,
-  BsPencilSquare,
-  BsPeople,
-  BsPeopleFill,
-  BsPersonFill,
-  BsPersonFillGear,
-} from "react-icons/bs";
 import {ToastContainer} from "react-toastify";
 import {isAdmin} from "@/utils/users";
 
@@ -51,17 +39,11 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	const user = await requestUser(req, res);
 	if (!user || !user.isVerified) return redirect("/login");
 
-  if (!checkAccess(user, ["admin", "developer", "mastercorporate"]))
+	if (!checkAccess(user, ["admin", "developer", "mastercorporate"])) return redirect("/");
-    return redirect("/");
 
 	const entityIDS = mapBy(user.entities, "id") || [];
-  const entities = await getEntitiesWithRoles(
+	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDS);
-    isAdmin(user) ? undefined : entityIDS
+	const {["view_students"]: allowedStudentEntities, ["view_teachers"]: allowedTeacherEntities} = groupAllowedEntitiesByPermissions(user, entities, [
-  );
-  const {
-    ["view_students"]: allowedStudentEntities,
-    ["view_teachers"]: allowedTeacherEntities,
-  } = groupAllowedEntitiesByPermissions(user, entities, [
 		"view_students",
 		"view_teachers",
 	]);
@@ -70,25 +52,18 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 
 	const entitiesIDS = mapBy(entities, "id") || [];
 
-  const [
+	const [students, latestStudents, latestTeachers, userCounts, assignmentsCount, groupsCount] = await Promise.all([
-    students,
-    latestStudents,
-    latestTeachers,
-    userCounts,
-    assignmentsCount,
-    groupsCount,
-  ] = await Promise.all([
 		getUsers(
 			{type: "student", "entities.id": {$in: allowedStudentEntitiesIDS}},
 			10,
 			{averageLevel: -1},
-      { _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
+			{_id: 0, id: 1, name: 1, email: 1, profilePicture: 1},
 		),
 		getUsers(
 			{type: "student", "entities.id": {$in: allowedStudentEntitiesIDS}},
 			10,
 			{registrationDate: -1},
-      { _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
+			{_id: 0, id: 1, name: 1, email: 1, profilePicture: 1},
 		),
 		getUsers(
 			{
@@ -97,7 +72,7 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 			},
 			10,
 			{registrationDate: -1},
-      { _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
+			{_id: 0, id: 1, name: 1, email: 1, profilePicture: 1},
 		),
 		countAllowedUsers(user, entities),
 		countEntitiesAssignments(entitiesIDS, {archived: {$ne: true}}),
@@ -129,37 +104,14 @@ export default function Dashboard({
 	stats = [],
 	groupsCount,
 }: Props) {
+	const totalCount = useMemo(() => userCounts.corporate + userCounts.mastercorporate + userCounts.student + userCounts.teacher, [userCounts]);
 
-  const totalCount = useMemo(
+	const totalLicenses = useMemo(() => entities.reduce((acc, curr) => acc + parseInt(curr.licenses.toString()), 0), [entities]);
-    () =>
-      userCounts.corporate +
-      userCounts.mastercorporate +
-      userCounts.student +
-      userCounts.teacher,
-    [userCounts]
-  );
-
-  const totalLicenses = useMemo(
-    () =>
-      entities.reduce(
-        (acc, curr) => acc + parseInt(curr.licenses.toString()),
-        0
-      ),
-    [entities]
-  );
 
 	const router = useRouter();
 
-  const allowedEntityStatistics = useAllowedEntities(
+	const allowedEntityStatistics = useAllowedEntities(user, entities, "view_entity_statistics");
-    user,
+	const allowedStudentPerformance = useAllowedEntities(user, entities, "view_student_performance");
-    entities,
-    "view_entity_statistics"
-  );
-  const allowedStudentPerformance = useAllowedEntities(
-    user,
-    entities,
-    "view_student_performance"
-  );
 
 	return (
 		<>
@@ -197,12 +149,13 @@ export default function Dashboard({
 						color="purple"
 					/>
 					<IconCard
-            Icon={BsPeople}
+						Icon={BsBank}
-            onClick={() => router.push("/classrooms")}
+						onClick={() => router.push("/users?type=mastercorporate")}
-            label="Classrooms"
+						label="Master Corporates"
-            value={groupsCount}
+						value={userCounts.mastercorporate}
 						color="purple"
 					/>
+					<IconCard Icon={BsPeople} onClick={() => router.push("/classrooms")} label="Classrooms" value={groupsCount} color="purple" />
 					<IconCard
 						Icon={BsPeopleFill}
 						onClick={() => router.push("/entities")}
@@ -233,19 +186,13 @@ export default function Dashboard({
 						onClick={() => router.push("/assignments")}
 						label="Assignments"
 						value={assignmentsCount}
-            className={clsx(
+						className={clsx(allowedEntityStatistics.length === 0 && "col-span-2")}
-              allowedEntityStatistics.length === 0 && "col-span-2"
-            )}
 						color="purple"
 					/>
 					<IconCard
 						Icon={BsClock}
 						label="Expiration Date"
-            value={
+						value={user.subscriptionExpirationDate ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy") : "Unlimited"}
-              user.subscriptionExpirationDate
-                ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy")
-                : "Unlimited"
-            }
 						color="rose"
 					/>
 				</section>
@@ -258,7 +205,7 @@ export default function Dashboard({
 						users={students.sort(
 							(a, b) =>
 								Object.keys(groupByExam(filterBy(stats, "user", b))).length -
-                Object.keys(groupByExam(filterBy(stats, "user", a))).length
+								Object.keys(groupByExam(filterBy(stats, "user", a))).length,
 						)}
 						title="Highest exam count students"
 					/>

src/pages/settings.tsx

@@ -10,16 +10,10 @@ import BatchCodeGenerator from "./(admin)/BatchCodeGenerator";
 import {shouldRedirectHome} from "@/utils/navigation.disabled";
 import BatchCreateUser from "./(admin)/Lists/BatchCreateUser";
 import {checkAccess, getTypesOfUser} from "@/utils/permissions";
-import { useState } from "react";
+import {useEffect, useState} from "react";
 import Modal from "@/components/Modal";
 import IconCard from "@/components/IconCard";
-import {
+import {BsCode, BsCodeSquare, BsGearFill, BsPeopleFill, BsPersonFill} from "react-icons/bs";
-  BsCode,
-  BsCodeSquare,
-  BsGearFill,
-  BsPeopleFill,
-  BsPersonFill,
-} from "react-icons/bs";
 import UserCreator from "./(admin)/UserCreator";
 import CorporateGradingSystem from "./(admin)/CorporateGradingSystem";
 import {CEFR_STEPS} from "@/resources/grading";
@@ -28,14 +22,11 @@ import { getUserPermissions } from "@/utils/permissions.be";
 import {PermissionType} from "@/interfaces/permissions";
 import {getUsers} from "@/utils/users.be";
 import {getEntitiesWithRoles} from "@/utils/entities.be";
-import { mapBy, serialize, redirect } from "@/utils";
+import {mapBy, serialize, redirect, filterBy} from "@/utils";
 import {EntityWithRoles} from "@/interfaces/entity";
 import {requestUser} from "@/utils/api";
 import {isAdmin} from "@/utils/users";
-import {
+import {getGradingSystemByEntities, getGradingSystemByEntity} from "@/utils/grading.be";
-  getGradingSystemByEntities,
-  getGradingSystemByEntity,
-} from "@/utils/grading.be";
 import {Grading} from "@/interfaces";
 import {useRouter} from "next/router";
 import {useAllowedEntities} from "@/hooks/useEntityPermissions";
@@ -44,33 +35,19 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	const user = await requestUser(req, res);
 	if (!user) return redirect("/login");
 
-  if (
+	if (shouldRedirectHome(user) || !checkAccess(user, ["admin", "developer", "corporate", "teacher", "mastercorporate"])) return redirect("/");
-    shouldRedirectHome(user) ||
-    !checkAccess(user, [
-      "admin",
-      "developer",
-      "corporate",
-      "teacher",
-      "mastercorporate",
-    ])
-  )
-    return redirect("/");
 	const [permissions, entities, allUsers] = await Promise.all([
 		getUserPermissions(user.id),
-    isAdmin(user)
+		isAdmin(user) ? await getEntitiesWithRoles() : await getEntitiesWithRoles(mapBy(user.entities, "id")),
-      ? await getEntitiesWithRoles()
-      : await getEntitiesWithRoles(mapBy(user.entities, "id")),
 		getUsers(),
 	]);
-  const gradingSystems = await getGradingSystemByEntities(
+	const gradingSystems = await getGradingSystemByEntities(mapBy(entities, "id"));
-    mapBy(entities, "id")
-  );
 	const entitiesGrading = entities.map(
 		(e) =>
 			gradingSystems.find((g) => g.entity === e.id) || {
 				entity: e.id,
 				steps: CEFR_STEPS,
-      }
+			},
 	);
 
 	return {
@@ -92,41 +69,15 @@ interface Props {
 	entitiesGrading: Grading[];
 }
 
-export default function Admin({
+export default function Admin({user, entities, permissions, allUsers, entitiesGrading}: Props) {
-  user,
-  entities,
-  permissions,
-  allUsers,
-  entitiesGrading,
-}: Props) {
 	const [modalOpen, setModalOpen] = useState<string>();
 	const router = useRouter();
 
-  const entitiesAllowCreateUser = useAllowedEntities(
+	const entitiesAllowCreateUser = useAllowedEntities(user, entities, "create_user");
-    user,
+	const entitiesAllowCreateUsers = useAllowedEntities(user, entities, "create_user_batch");
-    entities,
+	const entitiesAllowCreateCode = useAllowedEntities(user, entities, "create_code");
-    "create_user"
+	const entitiesAllowCreateCodes = useAllowedEntities(user, entities, "create_code_batch");
-  );
+	const entitiesAllowEditGrading = useAllowedEntities(user, entities, "edit_grading_system");
-  const entitiesAllowCreateUsers = useAllowedEntities(
-    user,
-    entities,
-    "create_user_batch"
-  );
-  const entitiesAllowCreateCode = useAllowedEntities(
-    user,
-    entities,
-    "create_code"
-  );
-  const entitiesAllowCreateCodes = useAllowedEntities(
-    user,
-    entities,
-    "create_code_batch"
-  );
-  const entitiesAllowEditGrading = useAllowedEntities(
-    user,
-    entities,
-    "edit_grading_system"
-  );
 
 	return (
 		<>
@@ -141,22 +92,19 @@ export default function Admin({
 			</Head>
 			<ToastContainer />
 			<>
-        <Modal
+				<Modal isOpen={modalOpen === "batchCreateUser"} onClose={() => setModalOpen(undefined)} maxWidth="max-w-[85%]">
-          isOpen={modalOpen === "batchCreateUser"}
-          onClose={() => setModalOpen(undefined)}
-          maxWidth="max-w-[85%]"
-        >
 					<BatchCreateUser
 						user={user}
-            entities={entitiesAllowCreateUser}
+						entities={entitiesAllowCreateUsers.filter(
+							(e) =>
+								e.licenses > 0 &&
+								e.licenses > allUsers.filter((u) => !isAdmin(u) && (u.entities || []).some((ent) => ent.id === e.id)).length,
+						)}
 						permissions={permissions}
 						onFinish={() => setModalOpen(undefined)}
 					/>
 				</Modal>
-        <Modal
+				<Modal isOpen={modalOpen === "batchCreateCode"} onClose={() => setModalOpen(undefined)}>
-          isOpen={modalOpen === "batchCreateCode"}
-          onClose={() => setModalOpen(undefined)}
-        >
 					<BatchCodeGenerator
 						entities={entitiesAllowCreateCodes}
 						user={user}
@@ -165,10 +113,7 @@ export default function Admin({
 						onFinish={() => setModalOpen(undefined)}
 					/>
 				</Modal>
-        <Modal
+				<Modal isOpen={modalOpen === "createCode"} onClose={() => setModalOpen(undefined)}>
-          isOpen={modalOpen === "createCode"}
-          onClose={() => setModalOpen(undefined)}
-        >
 					<CodeGenerator
 						entities={entitiesAllowCreateCode}
 						user={user}
@@ -176,22 +121,20 @@ export default function Admin({
 						onFinish={() => setModalOpen(undefined)}
 					/>
 				</Modal>
-        <Modal
+				<Modal isOpen={modalOpen === "createUser"} onClose={() => setModalOpen(undefined)}>
-          isOpen={modalOpen === "createUser"}
-          onClose={() => setModalOpen(undefined)}
-        >
 					<UserCreator
 						user={user}
-            entities={entitiesAllowCreateUsers}
+						entities={entitiesAllowCreateUser.filter(
+							(e) =>
+								e.licenses > 0 &&
+								e.licenses > allUsers.filter((u) => !isAdmin(u) && (u.entities || []).some((ent) => ent.id === e.id)).length,
+						)}
 						users={allUsers}
 						permissions={permissions}
 						onFinish={() => setModalOpen(undefined)}
 					/>
 				</Modal>
-        <Modal
+				<Modal isOpen={modalOpen === "gradingSystem"} onClose={() => setModalOpen(undefined)}>
-          isOpen={modalOpen === "gradingSystem"}
-          onClose={() => setModalOpen(undefined)}
-        >
 					<CorporateGradingSystem
 						user={user}
 						entitiesGrading={entitiesGrading}
@@ -202,12 +145,7 @@ export default function Admin({
 
 				<section className="w-full grid grid-cols-2 -md:grid-cols-1 gap-8">
 					<ExamLoader />
-          {checkAccess(
+					{checkAccess(user, getTypesOfUser(["teacher"]), permissions, "viewCodes") && (
-            user,
-            getTypesOfUser(["teacher"]),
-            permissions,
-            "viewCodes"
-          ) && (
 						<div className="w-full grid grid-cols-2 gap-4">
 							<IconCard
 								Icon={BsCode}
@@ -241,12 +179,7 @@ export default function Admin({
 								onClick={() => setModalOpen("batchCreateUser")}
 								disabled={entitiesAllowCreateUsers.length === 0}
 							/>
-              {checkAccess(user, [
+							{checkAccess(user, ["admin", "corporate", "developer", "mastercorporate"]) && (
-                "admin",
-                "corporate",
-                "developer",
-                "mastercorporate",
-              ]) && (
 								<IconCard
 									Icon={BsGearFill}
 									label="Grading System"