Skip to content

Commit e7f31ed

Browse files
committed
Fix: hid view submissions button
1 parent a037a52 commit e7f31ed

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

src/components/questions/question-details/action-buttons.jsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ const ActionButtons = ({ question, className, buttonClassName }) => {
1414
const navigate = useNavigate();
1515
const { data: { data: authUser } = {} } = useAuthUserQuery();
1616

17+
if (authUser?.role !== "ADMIN") return <></>;
18+
1719
return (
1820
<div className={twMerge("flex flex-col md:flex-row gap-3 mt-1", className)}>
1921
<Button
@@ -23,16 +25,14 @@ const ActionButtons = ({ question, className, buttonClassName }) => {
2325
>
2426
View submissions
2527
</Button>
26-
{authUser?.role == "ADMIN" && (
27-
<Button
28-
variant="secondary"
29-
className={twMerge("bg-transparent", buttonClassName)}
30-
onClick={() => onEditClick(question)}
31-
disabled={!question}
32-
>
33-
Edit
34-
</Button>
35-
)}
28+
<Button
29+
variant="secondary"
30+
className={twMerge("bg-transparent", buttonClassName)}
31+
onClick={() => onEditClick(question)}
32+
disabled={!question}
33+
>
34+
Edit
35+
</Button>
3636
</div>
3737
);
3838
};

src/pages/submissions.jsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
import { useState } from "react";
22
import { useMemo } from "react";
3+
import { useEffect } from "react";
34
import { useParams } from "react-router-dom";
5+
import { useNavigate } from "react-router-dom";
46
import { GradeDialog, Submission, SubmissionListSkeleton } from "@/components/submissions";
57
import { submissionFilters, submissionSorts } from "@/filters";
68
import { useTitle } from "@/hooks";
79
import {
10+
useAuthUserQuery,
811
useGetAllSubmissionsQuery,
912
useGetAllUsersQuery,
1013
useGetQuestionByIdQuery,
@@ -23,6 +26,7 @@ import { Body2 } from "@sliit-foss/bashaway-ui/typography";
2326
import { computeFilterQuery, computeSortQuery } from "@sliit-foss/bashaway-ui/utils";
2427

2528
const Submissions = () => {
29+
const navigate = useNavigate();
2630
const { id: questionId } = useParams();
2731

2832
const [page, setPage] = useState(1);
@@ -35,6 +39,8 @@ const Submissions = () => {
3539

3640
const { data: { data: teams } = {} } = useGetAllUsersQuery({ filters: `filter[role]=GROUP` });
3741

42+
const { data: { data: authUser } = {} } = useAuthUserQuery();
43+
3844
const {
3945
data: submissions,
4046
isFetching,
@@ -60,6 +66,12 @@ const Submissions = () => {
6066

6167
useTitle("Submissions | Bashaway");
6268

69+
useEffect(() => {
70+
if (authUser && authUser.role !== "ADMIN") {
71+
navigate("/");
72+
}
73+
}, [authUser]);
74+
6375
return (
6476
<>
6577
<BreadCrumbs

0 commit comments

Comments
 (0)