Fix: hid view submissions button

sliit-foss · Sep 15, 2024 · e7f31ed · e7f31ed
1 parent a037a52
commit e7f31ed
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/src/components/questions/question-details/action-buttons.jsx b/src/components/questions/question-details/action-buttons.jsx
@@ -14,6 +14,8 @@ const ActionButtons = ({ question, className, buttonClassName }) => {
   const navigate = useNavigate();
   const { data: { data: authUser } = {} } = useAuthUserQuery();
 
+  if (authUser?.role !== "ADMIN") return <></>;
+
   return (
     <div className={twMerge("flex flex-col md:flex-row gap-3 mt-1", className)}>
       <Button
@@ -23,16 +25,14 @@ const ActionButtons = ({ question, className, buttonClassName }) => {
       >
         View submissions
       </Button>
-      {authUser?.role == "ADMIN" && (
-        <Button
-          variant="secondary"
-          className={twMerge("bg-transparent", buttonClassName)}
-          onClick={() => onEditClick(question)}
-          disabled={!question}
-        >
-          Edit
-        </Button>
-      )}
+      <Button
+        variant="secondary"
+        className={twMerge("bg-transparent", buttonClassName)}
+        onClick={() => onEditClick(question)}
+        disabled={!question}
+      >
+        Edit
+      </Button>
     </div>
   );
 };

diff --git a/src/pages/submissions.jsx b/src/pages/submissions.jsx
@@ -1,10 +1,13 @@
 import { useState } from "react";
 import { useMemo } from "react";
+import { useEffect } from "react";
 import { useParams } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import { GradeDialog, Submission, SubmissionListSkeleton } from "@/components/submissions";
 import { submissionFilters, submissionSorts } from "@/filters";
 import { useTitle } from "@/hooks";
 import {
+  useAuthUserQuery,
   useGetAllSubmissionsQuery,
   useGetAllUsersQuery,
   useGetQuestionByIdQuery,
@@ -23,6 +26,7 @@ import { Body2 } from "@sliit-foss/bashaway-ui/typography";
 import { computeFilterQuery, computeSortQuery } from "@sliit-foss/bashaway-ui/utils";
 
 const Submissions = () => {
+  const navigate = useNavigate();
   const { id: questionId } = useParams();
 
   const [page, setPage] = useState(1);
@@ -35,6 +39,8 @@ const Submissions = () => {
 
   const { data: { data: teams } = {} } = useGetAllUsersQuery({ filters: `filter[role]=GROUP` });
 
+  const { data: { data: authUser } = {} } = useAuthUserQuery();
+
   const {
     data: submissions,
     isFetching,
@@ -60,6 +66,12 @@ const Submissions = () => {
 
   useTitle("Submissions | Bashaway");
 
+  useEffect(() => {
+    if (authUser && authUser.role !== "ADMIN") {
+      navigate("/");
+    }
+  }, [authUser]);
+
   return (
     <>
       <BreadCrumbs