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

Updated the code to return to official-exam if they came from that page

Browse Source
This commit is contained in:
Tiago Ribeiro
2024-11-07 22:51:45 +00:00
parent 7ae91d7bc1
commit 065497dfa3
4 changed files with 74 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/pages/exam.tsx
View File

@@ -1,11 +1,11 @@
/* eslint-disable @next/next/no-img-element */
import {withIronSessionSsr} from "iron-session/next";
import {sessionOptions} from "@/lib/session";
import {shouldRedirectHome} from "@/utils/navigation.disabled";
import { withIronSessionSsr } from "iron-session/next";
import { sessionOptions } from "@/lib/session";
import { shouldRedirectHome } from "@/utils/navigation.disabled";
import ExamPage from "./(exam)/ExamPage";
import Head from "next/head";
import {User} from "@/interfaces/user";
import { User } from "@/interfaces/user";
import { filterBy, findBy, redirect, serialize } from "@/utils";
import { requestUser } from "@/utils/api";
import { getAssignment, getAssignments, getAssignmentsByAssignee } from "@/utils/assignments.be";
@@ -21,35 +21,36 @@ import { getSessionByAssignment, getSessionsByUser } from "@/utils/sessions.be";
import { Session } from "@/hooks/useSessions";
import moment from "moment";
export const getServerSideProps = withIronSessionSsr(async ({req, res, query}) => {
export const getServerSideProps = withIronSessionSsr(async ({ req, res, query }) => {
const user = await requestUser(req, res)
const destination = Buffer.from(req.url || "/").toString("base64")
if (!user) return redirect(`/login?destination=${destination}`)
const loginDestination = Buffer.from(req.url || "/").toString("base64")
if (!user) return redirect(`/login?destination=${loginDestination}`)
if (shouldRedirectHome(user)) return redirect("/")
const {assignment: assignmentID} = query as {assignment?: string}
const { assignment: assignmentID, destination } = query as { assignment?: string, destination?: string }
const destinationURL = !!destination ? Buffer.from(destination, 'base64').toString() : undefined
if (assignmentID) {
const assignment = await getAssignment(assignmentID)
if (!assignment) return redirect("/exam")
if (!assignment) return redirect(destinationURL || "/exam")
if (!assignment.assignees.includes(user.id) && !["admin", "developer"].includes(user.type))
return redirect("/exam")
return redirect(destinationURL || "/exam")
if (filterBy(assignment.results, 'user', user.id).length > 0)
return redirect("/exam")
return redirect(destinationURL || "/exam")
const exams = await getExamsByIds(uniqBy(assignment.exams, "id"))
const session = await getSessionByAssignment(assignmentID)
return {
props: serialize({user, assignment, exams, session: session ?? undefined})
props: serialize({ user, assignment, exams, destinationURL, session: session ?? undefined })
}
}
return {
props: serialize({user}),
props: serialize({ user, destinationURL }),
};
}, sessionOptions);
@@ -58,9 +59,10 @@ interface Props {
assignment?: Assignment
exams?: Exam[]
session?: Session
destinationURL?: string
}
export default function Page({user, assignment, exams = [], session}: Props) {
export default function Page({ user, assignment, exams = [], destinationURL = "/exam", session }: Props) {
const router = useRouter()
const state = useExamStore((state) => state)
@@ -82,12 +84,12 @@ export default function Page({user, assignment, exams = [], session}: Props) {
router.replace(router.asPath)
}
// eslint-disable-next-line react-hooks/exhaustive-deps
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [assignment, exams, session])
useEffect(() => {
if (assignment && exams.length > 0 && !state.assignment && !!session) {
state.setShuffles(session.userSolutions.map((x) => ({exerciseID: x.exercise, shuffles: x.shuffleMaps ? x.shuffleMaps : []})));
state.setShuffles(session.userSolutions.map((x) => ({ exerciseID: x.exercise, shuffles: x.shuffleMaps ? x.shuffleMaps : [] })));
state.setSelectedModules(session.selectedModules);
state.setExam(session.exam);
state.setExams(session.exams);
@@ -103,7 +105,7 @@ export default function Page({user, assignment, exams = [], session}: Props) {
router.replace(router.asPath)
}
// eslint-disable-next-line react-hooks/exhaustive-deps
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [assignment, exams, session])
return (
@@ -117,7 +119,7 @@ export default function Page({user, assignment, exams = [], session}: Props) {
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" href="/favicon.ico" />
</Head>
<ExamPage page="exams" user={user} hideSidebar={!!assignment || !!state.assignment} />
<ExamPage page="exams" destination={destinationURL} user={user} hideSidebar={!!assignment || !!state.assignment} />
</>
);
}