Skip to content

Commit 4d2e245

Browse files
authored
Merge branch 'develop' into feature-2615/CertBadgeCorrections
2 parents 4a46b3e + 52a42d6 commit 4d2e245

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -782,13 +782,17 @@ const TeamReviews = ({ onBack, periodId }) => {
782782
};
783783

784784
const renderReviewer = (member, reviewer) => {
785+
const hasReviewer = !!reviewer.name;
785786
const backgroundColor = reviewer.approved ?
786787
'var(--checkins-palette-action-green)' :
787-
'var(--checkins-palette-action-yellow)';
788+
(hasReviewer ?
789+
'var(--checkins-palette-action-yellow)' :
790+
'var(--checkins-palette-action-red)');
788791
const request = getReviewRequest(member, reviewer);
789792
const selfReviewRequest = getSelfReviewRequest(member);
790793
const variant = 'outlined';
791-
const statusLabel = `${reviewer.name}: ${getReviewStatus(request)}`;
794+
const reviewerName = reviewer.name ?? "No Reviewer";
795+
const statusLabel = `${reviewerName}: ${getReviewStatus(request)}`;
792796
const url = getReviewerURL(request, selfReviewRequest);
793797

794798
return (url ?
@@ -802,9 +806,9 @@ const TeamReviews = ({ onBack, periodId }) => {
802806
</Link> :
803807
<Chip
804808
key={reviewer.id}
805-
label={openMode ? statusLabel : reviewer.name}
809+
label={openMode ? statusLabel : reviewerName}
806810
variant={variant}
807-
onDelete={canUpdate && !openMode ?
811+
onDelete={canUpdate && !openMode && hasReviewer ?
808812
() => deleteReviewer(member, reviewer) : null}
809813
style={{backgroundColor: backgroundColor}}
810814
/>);

web-ui/src/styles/variables.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
--checkins-palette-action-disabled: var(--action-disabled);
6767
--checkins-palette-action-yellow: lightyellow;
6868
--checkins-palette-action-green: lightgreen;
69+
--checkins-palette-action-red: darkred;
6970

7071
&[data-mui-color-scheme='dark'] {
7172
--primary-text: color-mix(in oklab, var(--white), var(--black) 10%);

0 commit comments

Comments
 (0)