Fixing plagiarism icon permissions checking.

ReCodEx · Jan 26, 2024 · 786361e · 786361e
1 parent b4b931f
commit 786361e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/components/Assignments/SolutionsTable/SolutionTableRowIcons.js b/src/components/Assignments/SolutionsTable/SolutionTableRowIcons.js
@@ -15,7 +15,7 @@ const SolutionTableRowIcons = ({
   id,
   assignmentId,
   solution,
-  isReviewer = false,
+  permissionHints = {},
   links: { SOLUTION_PLAGIARISMS_URI_FACTORY },
 }) => {
   const { review = null, commentsStats = null, plagiarism = null } = solution;
@@ -24,9 +24,9 @@ const SolutionTableRowIcons = ({
     <>
       <SolutionStatusIcon id={id} solution={solution} />
 
-      {review && <SolutionReviewIcon id={`review-${id}`} review={review} isReviewer={isReviewer} gapLeft />}
+      {review && <SolutionReviewIcon id={`review-${id}`} review={review} isReviewer={permissionHints.review} gapLeft />}
 
-      {Boolean(plagiarism) && isReviewer && (
+      {Boolean(plagiarism) && permissionHints.viewDetectedPlagiarisms && (
         <Link to={SOLUTION_PLAGIARISMS_URI_FACTORY(assignmentId, id)}>
           <OverlayTrigger
             placement="right"
@@ -60,7 +60,10 @@ SolutionTableRowIcons.propTypes = {
     }),
     plagiarism: PropTypes.string,
   }).isRequired,
-  isReviewer: PropTypes.bool,
+  permissionHints: PropTypes.PropTypes.shape({
+    review: PropTypes.bool,
+    viewDetectedPlagiarisms: PropTypes.bool,
+  }),
   links: PropTypes.object,
 };
 

diff --git a/src/components/Assignments/SolutionsTable/SolutionsTableRow.js b/src/components/Assignments/SolutionsTable/SolutionsTableRow.js
@@ -83,7 +83,7 @@ const SolutionsTableRow = ({
             id={id}
             assignmentId={assignmentId}
             solution={solution}
-            isReviewer={permissionHints && permissionHints.review}
+            permissionHints={permissionHints}
           />
         </td>
 

diff --git a/src/pages/AssignmentSolutions/AssignmentSolutions.js b/src/pages/AssignmentSolutions/AssignmentSolutions.js
@@ -133,7 +133,7 @@ const prepareTableColumnDescriptors = defaultMemoize((loggedUserId, assignmentId
           id={solution.id}
           assignmentId={assignmentId}
           solution={solution}
-          isReviewer={solution.permissionHints && solution.permissionHints.review}
+          permissionHints={solution.permissionHints}
         />
       ),
     }),

diff --git a/src/pages/GroupUserSolutions/GroupUserSolutions.js b/src/pages/GroupUserSolutions/GroupUserSolutions.js
@@ -93,7 +93,7 @@ const prepareTableColumnDescriptors = defaultMemoize((assignments, groupId, loca
           id={solution.id}
           assignmentId={solution.assignmentId}
           solution={solution}
-          isReviewer={solution.permissionHints && solution.permissionHints.review}
+          permissionHints={solution.permissionHints}
         />
       ),
     }),