Skip to content

Commit cc80e2e

Browse files
authored
Merge pull request #2692 from objectcomputing/bugfix-2691/current-user-review-assignments
Show all reviewees and their self-review status for the current user.
2 parents 2d56520 + 775729d commit cc80e2e

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

web-ui/src/components/reviews/TeamReviews.jsx

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,18 @@ const TeamReviews = ({ onBack, periodId }) => {
219219
source = showAll
220220
? selectCurrentUserSubordinates(state)
221221
: selectTeamMembersBySupervisorId(state, myId);
222+
223+
// And others that the current user may be assigned to review.
224+
assignments.filter(a => a.reviewerId == currentUser.id)
225+
.forEach(a => {
226+
if (!source.some(s => s.id == a.revieweeId)) {
227+
// Add this user to the list of members to show by default.
228+
const member = currentMembers.find(m => m.id == a.revieweeId);
229+
if (member) {
230+
source.push(member);
231+
}
232+
}
233+
});
222234
}
223235

224236
// Always filter the members down to existing selected assignments.
@@ -802,7 +814,9 @@ const TeamReviews = ({ onBack, periodId }) => {
802814
const renderSelfReviewStatus = member => {
803815
const recipientProfile = selectProfile(state, member.id);
804816
const manages = recipientProfile.supervisorid == currentUser?.id;
805-
if (manages) {
817+
const request = getReviewRequest(member, currentUser);
818+
const isReviewer = request?.recipientId == currentUser?.id;
819+
if (manages || isReviewer) {
806820
const selfReviewRequest = getSelfReviewRequest(member);
807821
return (
808822
<Chip

0 commit comments

Comments
 (0)