From b7cdf747036bf4ec8b09df17e6b2d219b95329f9 Mon Sep 17 00:00:00 2001 From: Bogdan Cochior <bogdan.cochior@thinslices.com> Date: Wed, 25 Apr 2018 10:08:34 +0300 Subject: [PATCH] fix: change refused status to declined and wordings BREAKING CHANGE: applies for new invitations or purge db --- .../src/components/Dashboard/ReviewerDecision.js | 4 +++- .../src/components/Invitations/ReviewerBreakdown.js | 6 +++--- packages/components-faraday/src/redux/utils.js | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/components-faraday/src/components/Dashboard/ReviewerDecision.js b/packages/components-faraday/src/components/Dashboard/ReviewerDecision.js index 882d92faf..ac8a19493 100644 --- a/packages/components-faraday/src/components/Dashboard/ReviewerDecision.js +++ b/packages/components-faraday/src/components/Dashboard/ReviewerDecision.js @@ -14,7 +14,7 @@ const ReviewerDecision = ({ showAcceptModal, showDeclineModal, ...rest }) => ( <div> <DecisionButton onClick={showDeclineModal}>Decline</DecisionButton> <DecisionButton onClick={showAcceptModal} primary> - Accept + Agree </DecisionButton> </div> ) @@ -49,6 +49,7 @@ export default compose( }) => () => { showModal({ title: 'Agree to review Manuscript?', + confirmText: 'Agree', onConfirm: () => { reviewerDecision(invitation.id, project.id, true).then( decisionSuccess, @@ -65,6 +66,7 @@ export default compose( }) => () => { showModal({ title: 'Decline to review Manuscript?', + confirmText: 'Decline', onConfirm: () => { reviewerDecision(invitation.id, project.id, false).then( decisionSuccess, diff --git a/packages/components-faraday/src/components/Invitations/ReviewerBreakdown.js b/packages/components-faraday/src/components/Invitations/ReviewerBreakdown.js index d75c2509f..7aa400252 100644 --- a/packages/components-faraday/src/components/Invitations/ReviewerBreakdown.js +++ b/packages/components-faraday/src/components/Invitations/ReviewerBreakdown.js @@ -24,7 +24,7 @@ const reviewerReduce = (acc, r) => ({ }) const invitationReduce = (acc, i) => { - const key = i.isAccepted ? 'accepted' : 'refused' + const key = i.isAccepted ? 'accepted' : 'declined' return { ...acc, [key]: acc[key] + 1, @@ -60,7 +60,7 @@ export default compose( type === BREAKDOWN_TYPES.invitation ? invitationReduce : reviewerReduce, { accepted: 0, - refused: 0, + declined: 0, }, ) @@ -68,7 +68,7 @@ export default compose( <BreakdownText> <b>{values.length}</b> invited, <b> {report.accepted}</b> agreed, - <b> {report.refused}</b> declined + <b> {report.declined}</b> declined </BreakdownText> ) }, diff --git a/packages/components-faraday/src/redux/utils.js b/packages/components-faraday/src/redux/utils.js index 2f7f9cdca..14560f926 100644 --- a/packages/components-faraday/src/redux/utils.js +++ b/packages/components-faraday/src/redux/utils.js @@ -4,7 +4,7 @@ export const orderReviewers = r => { return -1 case 'accepted': return 0 - case 'refused': + case 'declined': default: return 1 } -- GitLab