diff --git a/packages/component-manuscript/src/components/ReviewsAndReports.js b/packages/component-manuscript/src/components/ReviewsAndReports.js index 7be2973820b3d11d61f8d5b5d39fef8a05dcaafd..bed0a757d2abb820fdd944e4e5fde7981e0b42c3 100644 --- a/packages/component-manuscript/src/components/ReviewsAndReports.js +++ b/packages/component-manuscript/src/components/ReviewsAndReports.js @@ -34,7 +34,7 @@ const ReviewsAndReports = ({ project, reviewers = [] }) => ( <Root> <Expandable label="Reviewers & Reports" - rightHTML={<ReviewerBreakdown values={project.invitations || []} />} + rightHTML={<ReviewerBreakdown type="reviewer" values={reviewers || []} />} startExpanded > <Tabs activeKey={1} sections={getTabSections(project.id, reviewers)} /> diff --git a/packages/components-faraday/src/components/Reviewers/ReviewersDetailsList.js b/packages/components-faraday/src/components/Reviewers/ReviewersDetailsList.js index c013add4b721980ea6e98195fe1cc797d15c3f53..36be6c4532cc966add2ec62226b4458d26daf45e 100644 --- a/packages/components-faraday/src/components/Reviewers/ReviewersDetailsList.js +++ b/packages/components-faraday/src/components/Reviewers/ReviewersDetailsList.js @@ -15,6 +15,7 @@ import { inviteReviewer, selectFetchingInvite, selectReviewersError, + getCollectionReviewers, } from '../../redux/reviewers' const ResendRevoke = withTheme( @@ -55,15 +56,13 @@ const TR = ({ </DateText> </td> <td> {r.submittedOn ? `: ${renderTimestamp(r.submittedOn)}` : ''} </td> - <td> - {r.status === 'pending' ? ( + <td width={100}> + {r.status === 'pending' && ( <ResendRevoke showConfirmResend={showConfirmResend(r)} showConfirmRevoke={showConfirmRevoke(r.invitationId)} status={r.status} /> - ) : ( - <div /> )} </td> </Row> @@ -116,7 +115,7 @@ const ModalWrapper = compose( )) export default compose( - connect(null, { inviteReviewer, revokeReviewer }), + connect(null, { inviteReviewer, revokeReviewer, getCollectionReviewers }), withModal2(props => ({ modalComponent: ModalWrapper, })), @@ -145,6 +144,7 @@ export default compose( goBackToReviewers, inviteReviewer, collectionId, + getCollectionReviewers, }) => reviewer => () => { showModal({ title: 'Resend reviewer invite', @@ -153,7 +153,9 @@ export default compose( inviteReviewer( pick(reviewer, ['email', 'firstName', 'lastName', 'affiliation']), collectionId, - ).then(hideModal) + ) + .then(() => getCollectionReviewers(collectionId)) + .then(hideModal) }, onCancel: hideModal, }) @@ -165,12 +167,15 @@ export default compose( goBackToReviewers, revokeReviewer, collectionId, + getCollectionReviewers, }) => invitationId => () => { showModal({ title: 'Unassign Reviewer', confirmText: 'Unassign', onConfirm: () => { - revokeReviewer(invitationId, collectionId).then(hideModal) + revokeReviewer(invitationId, collectionId) + .then(() => getCollectionReviewers(collectionId)) + .then(hideModal) }, onCancel: hideModal, })