Skip to content

If there is no reviewer, display a red chip that says "No Reviewer". #2634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkimberlin merged 1 commit into from
Oct 15, 2024
Merged

If there is no reviewer, display a red chip that says "No Reviewer". #2634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions web-ui/src/components/reviews/TeamReviews.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,13 +782,17 @@ const TeamReviews = ({ onBack, periodId }) => {
};

const renderReviewer = (member, reviewer) => {
const hasReviewer = !!reviewer.name;
const backgroundColor = reviewer.approved ?
'var(--checkins-palette-action-green)' :
'var(--checkins-palette-action-yellow)';
(hasReviewer ?
'var(--checkins-palette-action-yellow)' :
'var(--checkins-palette-action-red)');
const request = getReviewRequest(member, reviewer);
const selfReviewRequest = getSelfReviewRequest(member);
const variant = 'outlined';
const statusLabel = `${reviewer.name}: ${getReviewStatus(request)}`;
const reviewerName = reviewer.name ?? "No Reviewer";
const statusLabel = `${reviewerName}: ${getReviewStatus(request)}`;
const url = getReviewerURL(request, selfReviewRequest);

return (url ?
Expand All @@ -802,9 +806,9 @@ const TeamReviews = ({ onBack, periodId }) => {
</Link> :
<Chip
key={reviewer.id}
label={openMode ? statusLabel : reviewer.name}
label={openMode ? statusLabel : reviewerName}
variant={variant}
onDelete={canUpdate && !openMode ?
onDelete={canUpdate && !openMode && hasReviewer ?
() => deleteReviewer(member, reviewer) : null}
style={{backgroundColor: backgroundColor}}
/>);
Expand Down
1 change: 1 addition & 0 deletions web-ui/src/styles/variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
--checkins-palette-action-disabled: var(--action-disabled);
--checkins-palette-action-yellow: lightyellow;
--checkins-palette-action-green: lightgreen;
--checkins-palette-action-red: darkred;

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