diff --git a/src/apps/admin/src/lib/components/ReviewerList/ReviewerList.tsx b/src/apps/admin/src/lib/components/ReviewerList/ReviewerList.tsx index 5bf4444c1..a3e8cca39 100644 --- a/src/apps/admin/src/lib/components/ReviewerList/ReviewerList.tsx +++ b/src/apps/admin/src/lib/components/ReviewerList/ReviewerList.tsx @@ -43,7 +43,7 @@ const ApproveButton: FC<{ const isApproving = props.approvingReviewerId === props.reviewer.userId const isOtherApproving = props.approvingReviewerId > 0 const hideApproveButton - = props.openReviews < 1 || props.reviewer.applicationStatus === 'Approved' + = props.openReviews < 1 || props.reviewer.applicationStatus !== 'Pending' return ( <> @@ -157,10 +157,10 @@ const ReviewerList: FC = props => { { label: 'Open Review Opp', propertyName: '', - renderer: () => ( + renderer: (reviewer: Reviewer) => ( // eslint-disable-next-line jsx-a11y/anchor-is-valid
- {props.openReviews} + {reviewer.currentNumberOfReviewPositions}
), type: 'element', diff --git a/src/apps/admin/src/review-management/ManageReviewerPage/ManageReviewerPage.tsx b/src/apps/admin/src/review-management/ManageReviewerPage/ManageReviewerPage.tsx index 5870ce740..4c6716cfa 100644 --- a/src/apps/admin/src/review-management/ManageReviewerPage/ManageReviewerPage.tsx +++ b/src/apps/admin/src/review-management/ManageReviewerPage/ManageReviewerPage.tsx @@ -104,6 +104,14 @@ export const ManageReviewerPage: FC = () => { }) }) + const newSearch = useEventCallback((): void => { + doNewSearch() + .then(data => { + setReviewers(data) + window.scrollTo({ left: 0, top: 0 }) + }) + }) + const sortData = useEventCallback(() => { doSortData() .then(data => { @@ -114,19 +122,15 @@ export const ManageReviewerPage: FC = () => { const reject = useEventCallback((): void => { doReject() - .then(res => { - if (res) { - doNewSearch() - } + .then(() => { + newSearch() }) }) const approve = useEventCallback((reviewer: Reviewer): void => { doApprove(reviewer) - .then(res => { - if (res) { - doNewSearch() - } + .then(() => { + newSearch() }) })