From a7e947e35c9b1262f41122a9b363ecfe2439a2e2 Mon Sep 17 00:00:00 2001
From: David Borland <borland@renci.org>
Date: Fri, 9 Dec 2022 10:52:20 -0500
Subject: [PATCH] Feature/integrate available reviews (#221)

* Adjust getAssignments

* Remove print statements

* Adjusting assignment status color and reviewer message

* Use request_review_assignment parameter

* Remove print statements
---
 .../assignment-selection/refine-selection.js  |  4 ++--
 .../assignment-selection/review-selection.js  |  2 +-
 .../components/assignments/assignment.js      |  4 ++--
 client/src/utils/api.js                       | 22 ++++++++++++-------
 client/src/utils/assignment-utils.js          |  3 +++
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/client/src/modules/assignment/components/assignment-selection/refine-selection.js b/client/src/modules/assignment/components/assignment-selection/refine-selection.js
index b515d025..6f0157f6 100644
--- a/client/src/modules/assignment/components/assignment-selection/refine-selection.js
+++ b/client/src/modules/assignment/components/assignment-selection/refine-selection.js
@@ -41,12 +41,12 @@ export const RefineSelection = ({ assignments, training = false }) => {
           <Assignments 
             type='refine' 
             header={ 'Under review' }
-            assignments={ assignments.filter(({ status, reviewer }) => status !== 'active' && reviewer?.login) }
+            assignments={ assignments.filter(({ status }) => status === 'review') }
           />
           <Assignments 
             type='refine' 
             header={ 'Awaiting review' }
-            assignments={ assignments.filter(({ status, reviewer }) => status === 'waiting' && !reviewer?.login) }
+            assignments={ assignments.filter(({ status }) => status === 'waiting') }
           />
         </Column>
         <Column>
diff --git a/client/src/modules/assignment/components/assignment-selection/review-selection.js b/client/src/modules/assignment/components/assignment-selection/review-selection.js
index 7efa37c0..9a39335a 100644
--- a/client/src/modules/assignment/components/assignment-selection/review-selection.js
+++ b/client/src/modules/assignment/components/assignment-selection/review-selection.js
@@ -23,7 +23,7 @@ export const ReviewSelection = ({ review, waiting, volumes, training }) => {
       <Row>
         <Column>
           <Header as='h4'>
-            Your active { training && 'training' } reviews
+            Your { training && 'training' } reviews
             <Subheader>
               { reviewSubheader }
             </Subheader>
diff --git a/client/src/modules/assignment/components/assignments/assignment.js b/client/src/modules/assignment/components/assignments/assignment.js
index 140ba61e..7d55d8f7 100644
--- a/client/src/modules/assignment/components/assignments/assignment.js
+++ b/client/src/modules/assignment/components/assignments/assignment.js
@@ -21,7 +21,7 @@ export const Assignment = ({ assignment, enabled }) => {
   const onLoadClick = async () => {
     if (assignment.status === 'waiting') {
       try {
-        await api.requestAssignment(user._id, assignment.subvolumeId, assignment.id);
+        await api.requestAssignment(user._id, assignment.subvolumeId, assignment.id, true);
 
         const newAssignment = {
           ...assignment,
@@ -72,7 +72,7 @@ export const Assignment = ({ assignment, enabled }) => {
               <Label 
                 basic 
                 circular 
-                content='Reviewer' 
+                content={ assignment.status === 'review' ? 'Reviewer' : 'Latest reviewer' }
                 detail={ reviewer.login } 
               />
             </div>
diff --git a/client/src/utils/api.js b/client/src/utils/api.js
index eadab270..4538df95 100644
--- a/client/src/utils/api.js
+++ b/client/src/utils/api.js
@@ -258,6 +258,7 @@ export const api = {
       return assignments;
     }, {})).filter(({ status }) => 
       getAll ? true : 
+      reviewer ? status === 'active' || status === 'under review' :
       status === 'awaiting review' || status === 'active' || status === 'under review'
     );
 
@@ -287,13 +288,17 @@ export const api = {
         const reviewResponse = await axios.get(`/item/${ id }/available_items_for_review`);
 
         for (const review of reviewResponse.data) {
-          // Check we don't already have it
-          if (!assignments.find(({ id }) => id === review.id)) {
-            availableReviews[n - 1].assignments.push({
-              id: review.id,
-              needToLoad: true
-            });
+          const index = assignments.findIndex(({ id }) => id === review.id);
+
+          if (index !== -1) {
+            console.warn(`Assignment ${ review.id } in reviewer assignments and available for review`);
+            assignments.splice(index, 1);
           }
+          
+          availableReviews[n - 1].assignments.push({
+            id: review.id,
+            needToLoad: true
+          });          
         }
       }
     }
@@ -347,13 +352,14 @@ export const api = {
 
     return comments;
   },
-  requestAssignment: async (userId, subvolumeId, itemId) => {
+  requestAssignment: async (userId, subvolumeId, itemId, review = false) => {
     await axios.post(`/user/${ userId }/request_assignment`,
       null,
       {
         params: {
           subvolume_id: subvolumeId,
-          assign_item_id: itemId
+          assign_item_id: itemId,
+          request_review_assignment: review
         }
       }
     );
diff --git a/client/src/utils/assignment-utils.js b/client/src/utils/assignment-utils.js
index 484c775b..e209a393 100644
--- a/client/src/utils/assignment-utils.js
+++ b/client/src/utils/assignment-utils.js
@@ -29,11 +29,14 @@ export const statusDisplay = (status) => statusValues[status];
 export const statusOrder = (status) => statusValuesOrder[status];
 
 export const statusColor = (status, reviewer) => 
+  statusColors[status]
+/*
   // Need to check reviewer login because review status is not always set...
   status === 'active' || status === 'review' || status === 'completed' ? statusColors[status] :
   reviewer?.login ? statusColors['review'] :
   status === 'waiting' ? statusColors['waiting'] : 
   null;
+  */
 
 export const isActive = ({ status }) => status === 'active';