Did some fixes related to master corporates
This commit is contained in:
@@ -1,30 +1,31 @@
|
|||||||
import Button from "@/components/Low/Button";
|
import Button from "@/components/Low/Button";
|
||||||
import Checkbox from "@/components/Low/Checkbox";
|
import Checkbox from "@/components/Low/Checkbox";
|
||||||
import { PERMISSIONS } from "@/constants/userPermissions";
|
import {PERMISSIONS} from "@/constants/userPermissions";
|
||||||
import { CorporateUser, TeacherUser, Type, User } from "@/interfaces/user";
|
import {CorporateUser, TeacherUser, Type, User} from "@/interfaces/user";
|
||||||
import { USER_TYPE_LABELS } from "@/resources/user";
|
import {USER_TYPE_LABELS} from "@/resources/user";
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import clsx from "clsx";
|
import clsx from "clsx";
|
||||||
import { capitalize, uniqBy } from "lodash";
|
import {capitalize, uniqBy} from "lodash";
|
||||||
import moment from "moment";
|
import moment from "moment";
|
||||||
import { useEffect, useState } from "react";
|
import {useEffect, useState} from "react";
|
||||||
import ReactDatePicker from "react-datepicker";
|
import ReactDatePicker from "react-datepicker";
|
||||||
import { toast } from "react-toastify";
|
import {toast} from "react-toastify";
|
||||||
import ShortUniqueId from "short-unique-id";
|
import ShortUniqueId from "short-unique-id";
|
||||||
import { checkAccess, getTypesOfUser } from "@/utils/permissions";
|
import {checkAccess, getTypesOfUser} from "@/utils/permissions";
|
||||||
import { PermissionType } from "@/interfaces/permissions";
|
import {PermissionType} from "@/interfaces/permissions";
|
||||||
import usePermissions from "@/hooks/usePermissions";
|
import usePermissions from "@/hooks/usePermissions";
|
||||||
import Input from "@/components/Low/Input";
|
import Input from "@/components/Low/Input";
|
||||||
import CountrySelect from "@/components/Low/CountrySelect";
|
import CountrySelect from "@/components/Low/CountrySelect";
|
||||||
import useGroups from "@/hooks/useGroups";
|
import useGroups from "@/hooks/useGroups";
|
||||||
import useUsers from "@/hooks/useUsers";
|
import useUsers from "@/hooks/useUsers";
|
||||||
import { getUserName } from "@/utils/users";
|
import {getUserName} from "@/utils/users";
|
||||||
import Select from "@/components/Low/Select";
|
import Select from "@/components/Low/Select";
|
||||||
import { EntityWithRoles } from "@/interfaces/entity";
|
import {EntityWithRoles} from "@/interfaces/entity";
|
||||||
import useEntitiesGroups from "@/hooks/useEntitiesGroups";
|
import useEntitiesGroups from "@/hooks/useEntitiesGroups";
|
||||||
|
import {mapBy} from "@/utils";
|
||||||
|
|
||||||
const USER_TYPE_PERMISSIONS: {
|
const USER_TYPE_PERMISSIONS: {
|
||||||
[key in Type]: { perm: PermissionType | undefined; list: Type[] };
|
[key in Type]: {perm: PermissionType | undefined; list: Type[]};
|
||||||
} = {
|
} = {
|
||||||
student: {
|
student: {
|
||||||
perm: "createCodeStudent",
|
perm: "createCodeStudent",
|
||||||
@@ -59,12 +60,12 @@ const USER_TYPE_PERMISSIONS: {
|
|||||||
interface Props {
|
interface Props {
|
||||||
user: User;
|
user: User;
|
||||||
users: User[];
|
users: User[];
|
||||||
entities: EntityWithRoles[]
|
entities: EntityWithRoles[];
|
||||||
permissions: PermissionType[];
|
permissions: PermissionType[];
|
||||||
onFinish: () => void;
|
onFinish: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function UserCreator({ user, users, entities = [], permissions, onFinish }: Props) {
|
export default function UserCreator({user, users, entities = [], permissions, onFinish}: Props) {
|
||||||
const [name, setName] = useState<string>();
|
const [name, setName] = useState<string>();
|
||||||
const [email, setEmail] = useState<string>();
|
const [email, setEmail] = useState<string>();
|
||||||
const [phone, setPhone] = useState<string>();
|
const [phone, setPhone] = useState<string>();
|
||||||
@@ -81,9 +82,9 @@ export default function UserCreator({ user, users, entities = [], permissions, o
|
|||||||
const [isLoading, setIsLoading] = useState(false);
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
const [type, setType] = useState<Type>("student");
|
const [type, setType] = useState<Type>("student");
|
||||||
const [position, setPosition] = useState<string>();
|
const [position, setPosition] = useState<string>();
|
||||||
const [entity, setEntity] = useState((entities || [])[0]?.id || undefined)
|
const [entity, setEntity] = useState((entities || [])[0]?.id || undefined);
|
||||||
|
|
||||||
const { groups } = useEntitiesGroups();
|
const {groups} = useEntitiesGroups();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!isExpiryDateEnabled) setExpiryDate(null);
|
if (!isExpiryDateEnabled) setExpiryDate(null);
|
||||||
@@ -128,7 +129,7 @@ export default function UserCreator({ user, users, entities = [], permissions, o
|
|||||||
setStudentID("");
|
setStudentID("");
|
||||||
setCountry(user?.demographicInformation?.country);
|
setCountry(user?.demographicInformation?.country);
|
||||||
setGroup(null);
|
setGroup(null);
|
||||||
setEntity((entities || [])[0]?.id || undefined)
|
setEntity((entities || [])[0]?.id || undefined);
|
||||||
setExpiryDate(user?.subscriptionExpirationDate ? moment(user?.subscriptionExpirationDate).toDate() : null);
|
setExpiryDate(user?.subscriptionExpirationDate ? moment(user?.subscriptionExpirationDate).toDate() : null);
|
||||||
setIsExpiryDateEnabled(true);
|
setIsExpiryDateEnabled(true);
|
||||||
setType("student");
|
setType("student");
|
||||||
@@ -184,8 +185,8 @@ export default function UserCreator({ user, users, entities = [], permissions, o
|
|||||||
<div className={clsx("flex flex-col gap-4")}>
|
<div className={clsx("flex flex-col gap-4")}>
|
||||||
<label className="font-normal text-base text-mti-gray-dim">Entity</label>
|
<label className="font-normal text-base text-mti-gray-dim">Entity</label>
|
||||||
<Select
|
<Select
|
||||||
defaultValue={{ value: (entities || [])[0]?.id, label: (entities || [])[0]?.label }}
|
defaultValue={{value: (entities || [])[0]?.id, label: (entities || [])[0]?.label}}
|
||||||
options={entities.map((e) => ({ value: e.id, label: e.label }))}
|
options={entities.map((e) => ({value: e.id, label: e.label}))}
|
||||||
onChange={(e) => setEntity(e?.value || undefined)}
|
onChange={(e) => setEntity(e?.value || undefined)}
|
||||||
isClearable={checkAccess(user, ["admin", "developer"])}
|
isClearable={checkAccess(user, ["admin", "developer"])}
|
||||||
/>
|
/>
|
||||||
@@ -198,9 +199,7 @@ export default function UserCreator({ user, users, entities = [], permissions, o
|
|||||||
<div className={clsx("flex flex-col gap-4")}>
|
<div className={clsx("flex flex-col gap-4")}>
|
||||||
<label className="font-normal text-base text-mti-gray-dim">Classroom</label>
|
<label className="font-normal text-base text-mti-gray-dim">Classroom</label>
|
||||||
<Select
|
<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)}
|
onChange={(e) => setGroup(e?.value || undefined)}
|
||||||
isClearable
|
isClearable
|
||||||
/>
|
/>
|
||||||
@@ -220,7 +219,7 @@ export default function UserCreator({ user, users, entities = [], permissions, o
|
|||||||
className="p-6 w-full min-w-[350px] min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer bg-white">
|
className="p-6 w-full min-w-[350px] min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer bg-white">
|
||||||
{Object.keys(USER_TYPE_LABELS)
|
{Object.keys(USER_TYPE_LABELS)
|
||||||
.filter((x) => {
|
.filter((x) => {
|
||||||
const { list, perm } = USER_TYPE_PERMISSIONS[x as Type];
|
const {list, perm} = USER_TYPE_PERMISSIONS[x as Type];
|
||||||
return checkAccess(user, getTypesOfUser(list), permissions, perm);
|
return checkAccess(user, getTypesOfUser(list), permissions, perm);
|
||||||
})
|
})
|
||||||
.map((type) => (
|
.map((type) => (
|
||||||
|
|||||||
@@ -1,67 +1,49 @@
|
|||||||
/* eslint-disable @next/next/no-img-element */
|
/* eslint-disable @next/next/no-img-element */
|
||||||
import UserDisplayList from "@/components/UserDisplayList";
|
import UserDisplayList from "@/components/UserDisplayList";
|
||||||
import IconCard from "@/components/IconCard";
|
import IconCard from "@/components/IconCard";
|
||||||
import { useAllowedEntities } from "@/hooks/useEntityPermissions";
|
import {useAllowedEntities} from "@/hooks/useEntityPermissions";
|
||||||
import { EntityWithRoles } from "@/interfaces/entity";
|
import {EntityWithRoles} from "@/interfaces/entity";
|
||||||
import { Stat, StudentUser, Type, User } from "@/interfaces/user";
|
import {Stat, StudentUser, Type, User} from "@/interfaces/user";
|
||||||
import { sessionOptions } from "@/lib/session";
|
import {sessionOptions} from "@/lib/session";
|
||||||
import { filterBy, mapBy, redirect, serialize } from "@/utils";
|
import {filterBy, mapBy, redirect, serialize} from "@/utils";
|
||||||
import { requestUser } from "@/utils/api";
|
import {requestUser} from "@/utils/api";
|
||||||
import { countEntitiesAssignments } from "@/utils/assignments.be";
|
import {countEntitiesAssignments} from "@/utils/assignments.be";
|
||||||
import { getEntitiesWithRoles } from "@/utils/entities.be";
|
import {getEntitiesWithRoles} from "@/utils/entities.be";
|
||||||
import { countGroupsByEntities } from "@/utils/groups.be";
|
import {countGroupsByEntities} from "@/utils/groups.be";
|
||||||
import {
|
import {checkAccess, groupAllowedEntitiesByPermissions} from "@/utils/permissions";
|
||||||
checkAccess,
|
import {groupByExam} from "@/utils/stats";
|
||||||
groupAllowedEntitiesByPermissions,
|
import {countAllowedUsers, getUsers} from "@/utils/users.be";
|
||||||
} from "@/utils/permissions";
|
import {clsx} from "clsx";
|
||||||
import { groupByExam } from "@/utils/stats";
|
import {withIronSessionSsr} from "iron-session/next";
|
||||||
import { countAllowedUsers, getUsers } from "@/utils/users.be";
|
|
||||||
import { clsx } from "clsx";
|
|
||||||
import { withIronSessionSsr } from "iron-session/next";
|
|
||||||
import moment from "moment";
|
import moment from "moment";
|
||||||
import Head from "next/head";
|
import Head from "next/head";
|
||||||
import { useRouter } from "next/router";
|
import {useRouter} from "next/router";
|
||||||
import { useMemo } from "react";
|
import {useMemo} from "react";
|
||||||
import {
|
import {BsBank, BsClock, BsEnvelopePaper, BsPencilSquare, BsPeople, BsPeopleFill, BsPersonFill, BsPersonFillGear} from "react-icons/bs";
|
||||||
BsBank,
|
import {ToastContainer} from "react-toastify";
|
||||||
BsClock,
|
import {isAdmin} from "@/utils/users";
|
||||||
BsEnvelopePaper,
|
|
||||||
BsPencilSquare,
|
|
||||||
BsPeople,
|
|
||||||
BsPeopleFill,
|
|
||||||
BsPersonFill,
|
|
||||||
BsPersonFillGear,
|
|
||||||
} from "react-icons/bs";
|
|
||||||
import { ToastContainer } from "react-toastify";
|
|
||||||
import { isAdmin } from "@/utils/users";
|
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
user: User;
|
user: User;
|
||||||
students: StudentUser[];
|
students: StudentUser[];
|
||||||
latestStudents: User[];
|
latestStudents: User[];
|
||||||
latestTeachers: User[];
|
latestTeachers: User[];
|
||||||
userCounts: { [key in Type]: number };
|
userCounts: {[key in Type]: number};
|
||||||
entities: EntityWithRoles[];
|
entities: EntityWithRoles[];
|
||||||
assignmentsCount: number;
|
assignmentsCount: number;
|
||||||
stats: Stat[];
|
stats: Stat[];
|
||||||
groupsCount: number;
|
groupsCount: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
|
export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
|
||||||
const user = await requestUser(req, res);
|
const user = await requestUser(req, res);
|
||||||
if (!user || !user.isVerified) return redirect("/login");
|
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 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_students",
|
||||||
"view_teachers",
|
"view_teachers",
|
||||||
]);
|
]);
|
||||||
@@ -70,37 +52,30 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
|
|||||||
|
|
||||||
const entitiesIDS = mapBy(entities, "id") || [];
|
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(
|
getUsers(
|
||||||
{ type: "student", "entities.id": { $in: allowedStudentEntitiesIDS } },
|
{type: "student", "entities.id": {$in: allowedStudentEntitiesIDS}},
|
||||||
10,
|
10,
|
||||||
{ averageLevel: -1 },
|
{averageLevel: -1},
|
||||||
{ _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
|
{_id: 0, id: 1, name: 1, email: 1, profilePicture: 1},
|
||||||
),
|
),
|
||||||
getUsers(
|
getUsers(
|
||||||
{ type: "student", "entities.id": { $in: allowedStudentEntitiesIDS } },
|
{type: "student", "entities.id": {$in: allowedStudentEntitiesIDS}},
|
||||||
10,
|
10,
|
||||||
{ registrationDate: -1 },
|
{registrationDate: -1},
|
||||||
{ _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
|
{_id: 0, id: 1, name: 1, email: 1, profilePicture: 1},
|
||||||
),
|
),
|
||||||
getUsers(
|
getUsers(
|
||||||
{
|
{
|
||||||
type: "teacher",
|
type: "teacher",
|
||||||
"entities.id": { $in: mapBy(allowedTeacherEntities, "id") },
|
"entities.id": {$in: mapBy(allowedTeacherEntities, "id")},
|
||||||
},
|
},
|
||||||
10,
|
10,
|
||||||
{ registrationDate: -1 },
|
{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),
|
countAllowedUsers(user, entities),
|
||||||
countEntitiesAssignments(entitiesIDS, { archived: { $ne: true } }),
|
countEntitiesAssignments(entitiesIDS, {archived: {$ne: true}}),
|
||||||
countGroupsByEntities(entitiesIDS),
|
countGroupsByEntities(entitiesIDS),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
@@ -129,37 +104,14 @@ export default function Dashboard({
|
|||||||
stats = [],
|
stats = [],
|
||||||
groupsCount,
|
groupsCount,
|
||||||
}: Props) {
|
}: 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 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 (
|
return (
|
||||||
<>
|
<>
|
||||||
@@ -197,12 +149,13 @@ export default function Dashboard({
|
|||||||
color="purple"
|
color="purple"
|
||||||
/>
|
/>
|
||||||
<IconCard
|
<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"
|
color="purple"
|
||||||
/>
|
/>
|
||||||
|
<IconCard Icon={BsPeople} onClick={() => router.push("/classrooms")} label="Classrooms" value={groupsCount} color="purple" />
|
||||||
<IconCard
|
<IconCard
|
||||||
Icon={BsPeopleFill}
|
Icon={BsPeopleFill}
|
||||||
onClick={() => router.push("/entities")}
|
onClick={() => router.push("/entities")}
|
||||||
@@ -233,19 +186,13 @@ export default function Dashboard({
|
|||||||
onClick={() => router.push("/assignments")}
|
onClick={() => router.push("/assignments")}
|
||||||
label="Assignments"
|
label="Assignments"
|
||||||
value={assignmentsCount}
|
value={assignmentsCount}
|
||||||
className={clsx(
|
className={clsx(allowedEntityStatistics.length === 0 && "col-span-2")}
|
||||||
allowedEntityStatistics.length === 0 && "col-span-2"
|
|
||||||
)}
|
|
||||||
color="purple"
|
color="purple"
|
||||||
/>
|
/>
|
||||||
<IconCard
|
<IconCard
|
||||||
Icon={BsClock}
|
Icon={BsClock}
|
||||||
label="Expiration Date"
|
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"
|
color="rose"
|
||||||
/>
|
/>
|
||||||
</section>
|
</section>
|
||||||
@@ -258,7 +205,7 @@ export default function Dashboard({
|
|||||||
users={students.sort(
|
users={students.sort(
|
||||||
(a, b) =>
|
(a, b) =>
|
||||||
Object.keys(groupByExam(filterBy(stats, "user", b))).length -
|
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"
|
title="Highest exam count students"
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -1,76 +1,53 @@
|
|||||||
/* eslint-disable @next/next/no-img-element */
|
/* eslint-disable @next/next/no-img-element */
|
||||||
import Head from "next/head";
|
import Head from "next/head";
|
||||||
import { withIronSessionSsr } from "iron-session/next";
|
import {withIronSessionSsr} from "iron-session/next";
|
||||||
import { sessionOptions } from "@/lib/session";
|
import {sessionOptions} from "@/lib/session";
|
||||||
import { ToastContainer } from "react-toastify";
|
import {ToastContainer} from "react-toastify";
|
||||||
import CodeGenerator from "./(admin)/CodeGenerator";
|
import CodeGenerator from "./(admin)/CodeGenerator";
|
||||||
import ExamLoader from "./(admin)/ExamLoader";
|
import ExamLoader from "./(admin)/ExamLoader";
|
||||||
import Lists from "./(admin)/Lists";
|
import Lists from "./(admin)/Lists";
|
||||||
import BatchCodeGenerator from "./(admin)/BatchCodeGenerator";
|
import BatchCodeGenerator from "./(admin)/BatchCodeGenerator";
|
||||||
import { shouldRedirectHome } from "@/utils/navigation.disabled";
|
import {shouldRedirectHome} from "@/utils/navigation.disabled";
|
||||||
import BatchCreateUser from "./(admin)/Lists/BatchCreateUser";
|
import BatchCreateUser from "./(admin)/Lists/BatchCreateUser";
|
||||||
import { checkAccess, getTypesOfUser } from "@/utils/permissions";
|
import {checkAccess, getTypesOfUser} from "@/utils/permissions";
|
||||||
import { useState } from "react";
|
import {useEffect, useState} from "react";
|
||||||
import Modal from "@/components/Modal";
|
import Modal from "@/components/Modal";
|
||||||
import IconCard from "@/components/IconCard";
|
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 UserCreator from "./(admin)/UserCreator";
|
||||||
import CorporateGradingSystem from "./(admin)/CorporateGradingSystem";
|
import CorporateGradingSystem from "./(admin)/CorporateGradingSystem";
|
||||||
import { CEFR_STEPS } from "@/resources/grading";
|
import {CEFR_STEPS} from "@/resources/grading";
|
||||||
import { User } from "@/interfaces/user";
|
import {User} from "@/interfaces/user";
|
||||||
import { getUserPermissions } from "@/utils/permissions.be";
|
import {getUserPermissions} from "@/utils/permissions.be";
|
||||||
import { PermissionType } from "@/interfaces/permissions";
|
import {PermissionType} from "@/interfaces/permissions";
|
||||||
import { getUsers } from "@/utils/users.be";
|
import {getUsers} from "@/utils/users.be";
|
||||||
import { getEntitiesWithRoles } from "@/utils/entities.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 {EntityWithRoles} from "@/interfaces/entity";
|
||||||
import { requestUser } from "@/utils/api";
|
import {requestUser} from "@/utils/api";
|
||||||
import { isAdmin } from "@/utils/users";
|
import {isAdmin} from "@/utils/users";
|
||||||
import {
|
import {getGradingSystemByEntities, getGradingSystemByEntity} from "@/utils/grading.be";
|
||||||
getGradingSystemByEntities,
|
import {Grading} from "@/interfaces";
|
||||||
getGradingSystemByEntity,
|
import {useRouter} from "next/router";
|
||||||
} from "@/utils/grading.be";
|
import {useAllowedEntities} from "@/hooks/useEntityPermissions";
|
||||||
import { Grading } from "@/interfaces";
|
|
||||||
import { useRouter } from "next/router";
|
|
||||||
import { useAllowedEntities } from "@/hooks/useEntityPermissions";
|
|
||||||
|
|
||||||
export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
|
export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
|
||||||
const user = await requestUser(req, res);
|
const user = await requestUser(req, res);
|
||||||
if (!user) return redirect("/login");
|
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([
|
const [permissions, entities, allUsers] = await Promise.all([
|
||||||
getUserPermissions(user.id),
|
getUserPermissions(user.id),
|
||||||
isAdmin(user)
|
isAdmin(user) ? await getEntitiesWithRoles() : await getEntitiesWithRoles(mapBy(user.entities, "id")),
|
||||||
? await getEntitiesWithRoles()
|
|
||||||
: await getEntitiesWithRoles(mapBy(user.entities, "id")),
|
|
||||||
getUsers(),
|
getUsers(),
|
||||||
]);
|
]);
|
||||||
const gradingSystems = await getGradingSystemByEntities(
|
const gradingSystems = await getGradingSystemByEntities(mapBy(entities, "id"));
|
||||||
mapBy(entities, "id")
|
|
||||||
);
|
|
||||||
const entitiesGrading = entities.map(
|
const entitiesGrading = entities.map(
|
||||||
(e) =>
|
(e) =>
|
||||||
gradingSystems.find((g) => g.entity === e.id) || {
|
gradingSystems.find((g) => g.entity === e.id) || {
|
||||||
entity: e.id,
|
entity: e.id,
|
||||||
steps: CEFR_STEPS,
|
steps: CEFR_STEPS,
|
||||||
}
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -92,41 +69,15 @@ interface Props {
|
|||||||
entitiesGrading: Grading[];
|
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 [modalOpen, setModalOpen] = useState<string>();
|
||||||
const router = useRouter();
|
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 (
|
return (
|
||||||
<>
|
<>
|
||||||
@@ -141,22 +92,19 @@ export default function Admin({
|
|||||||
</Head>
|
</Head>
|
||||||
<ToastContainer />
|
<ToastContainer />
|
||||||
<>
|
<>
|
||||||
<Modal
|
<Modal isOpen={modalOpen === "batchCreateUser"} onClose={() => setModalOpen(undefined)} maxWidth="max-w-[85%]">
|
||||||
isOpen={modalOpen === "batchCreateUser"}
|
|
||||||
onClose={() => setModalOpen(undefined)}
|
|
||||||
maxWidth="max-w-[85%]"
|
|
||||||
>
|
|
||||||
<BatchCreateUser
|
<BatchCreateUser
|
||||||
user={user}
|
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}
|
permissions={permissions}
|
||||||
onFinish={() => setModalOpen(undefined)}
|
onFinish={() => setModalOpen(undefined)}
|
||||||
/>
|
/>
|
||||||
</Modal>
|
</Modal>
|
||||||
<Modal
|
<Modal isOpen={modalOpen === "batchCreateCode"} onClose={() => setModalOpen(undefined)}>
|
||||||
isOpen={modalOpen === "batchCreateCode"}
|
|
||||||
onClose={() => setModalOpen(undefined)}
|
|
||||||
>
|
|
||||||
<BatchCodeGenerator
|
<BatchCodeGenerator
|
||||||
entities={entitiesAllowCreateCodes}
|
entities={entitiesAllowCreateCodes}
|
||||||
user={user}
|
user={user}
|
||||||
@@ -165,10 +113,7 @@ export default function Admin({
|
|||||||
onFinish={() => setModalOpen(undefined)}
|
onFinish={() => setModalOpen(undefined)}
|
||||||
/>
|
/>
|
||||||
</Modal>
|
</Modal>
|
||||||
<Modal
|
<Modal isOpen={modalOpen === "createCode"} onClose={() => setModalOpen(undefined)}>
|
||||||
isOpen={modalOpen === "createCode"}
|
|
||||||
onClose={() => setModalOpen(undefined)}
|
|
||||||
>
|
|
||||||
<CodeGenerator
|
<CodeGenerator
|
||||||
entities={entitiesAllowCreateCode}
|
entities={entitiesAllowCreateCode}
|
||||||
user={user}
|
user={user}
|
||||||
@@ -176,22 +121,20 @@ export default function Admin({
|
|||||||
onFinish={() => setModalOpen(undefined)}
|
onFinish={() => setModalOpen(undefined)}
|
||||||
/>
|
/>
|
||||||
</Modal>
|
</Modal>
|
||||||
<Modal
|
<Modal isOpen={modalOpen === "createUser"} onClose={() => setModalOpen(undefined)}>
|
||||||
isOpen={modalOpen === "createUser"}
|
|
||||||
onClose={() => setModalOpen(undefined)}
|
|
||||||
>
|
|
||||||
<UserCreator
|
<UserCreator
|
||||||
user={user}
|
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}
|
users={allUsers}
|
||||||
permissions={permissions}
|
permissions={permissions}
|
||||||
onFinish={() => setModalOpen(undefined)}
|
onFinish={() => setModalOpen(undefined)}
|
||||||
/>
|
/>
|
||||||
</Modal>
|
</Modal>
|
||||||
<Modal
|
<Modal isOpen={modalOpen === "gradingSystem"} onClose={() => setModalOpen(undefined)}>
|
||||||
isOpen={modalOpen === "gradingSystem"}
|
|
||||||
onClose={() => setModalOpen(undefined)}
|
|
||||||
>
|
|
||||||
<CorporateGradingSystem
|
<CorporateGradingSystem
|
||||||
user={user}
|
user={user}
|
||||||
entitiesGrading={entitiesGrading}
|
entitiesGrading={entitiesGrading}
|
||||||
@@ -202,12 +145,7 @@ export default function Admin({
|
|||||||
|
|
||||||
<section className="w-full grid grid-cols-2 -md:grid-cols-1 gap-8">
|
<section className="w-full grid grid-cols-2 -md:grid-cols-1 gap-8">
|
||||||
<ExamLoader />
|
<ExamLoader />
|
||||||
{checkAccess(
|
{checkAccess(user, getTypesOfUser(["teacher"]), permissions, "viewCodes") && (
|
||||||
user,
|
|
||||||
getTypesOfUser(["teacher"]),
|
|
||||||
permissions,
|
|
||||||
"viewCodes"
|
|
||||||
) && (
|
|
||||||
<div className="w-full grid grid-cols-2 gap-4">
|
<div className="w-full grid grid-cols-2 gap-4">
|
||||||
<IconCard
|
<IconCard
|
||||||
Icon={BsCode}
|
Icon={BsCode}
|
||||||
@@ -241,12 +179,7 @@ export default function Admin({
|
|||||||
onClick={() => setModalOpen("batchCreateUser")}
|
onClick={() => setModalOpen("batchCreateUser")}
|
||||||
disabled={entitiesAllowCreateUsers.length === 0}
|
disabled={entitiesAllowCreateUsers.length === 0}
|
||||||
/>
|
/>
|
||||||
{checkAccess(user, [
|
{checkAccess(user, ["admin", "corporate", "developer", "mastercorporate"]) && (
|
||||||
"admin",
|
|
||||||
"corporate",
|
|
||||||
"developer",
|
|
||||||
"mastercorporate",
|
|
||||||
]) && (
|
|
||||||
<IconCard
|
<IconCard
|
||||||
Icon={BsGearFill}
|
Icon={BsGearFill}
|
||||||
label="Grading System"
|
label="Grading System"
|
||||||
|
|||||||
Reference in New Issue
Block a user