From 6f9468a89e044e891ddaf2bf84e2354560197163 Mon Sep 17 00:00:00 2001 From: Tania Fecheta <tania.fecheta@thinslices.com> Date: Fri, 12 Oct 2018 09:54:34 +0300 Subject: [PATCH] fix(heRecommendation): change button, modal title and modal button text according to recommendation --- .../src/contextualBoxes/HERecommendation.js | 52 ++++++++++++++++--- 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js b/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js index a8f501ee8..e5143cfe4 100644 --- a/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js +++ b/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js @@ -20,10 +20,30 @@ import { } from 'pubsweet-component-faraday-ui/src' const options = [ - { value: 'publish', label: 'Publish' }, - { value: 'reject', label: 'Reject' }, - { value: 'minor', label: 'Request Minor Revision' }, - { value: 'major', label: 'Request Major Revision' }, + { + value: 'publish', + label: 'Publish', + message: 'Recommend Manuscript for Publishing', + button: 'Submit Recommendation', + }, + { + value: 'reject', + label: 'Reject', + message: 'Recommend Manuscript for Rejection', + button: 'Submit Recommendation', + }, + { + value: 'minor', + label: 'Request Minor Revision', + message: 'Request Minor Revision', + button: 'Request Revision', + }, + { + value: 'major', + label: 'Request Major Revision', + message: 'Request Major Revision', + button: 'Request Revision', + }, ] const parseFormValues = ({ recommendation, ...rest }) => { @@ -98,7 +118,11 @@ const HERecommendation = ({ <Row justify="flex-end" mt={2}> <Button onClick={handleSubmit} primary size="medium"> - Submit recommendation + { + options.find( + o => o.value === get(formValues, 'recommendation', 'publish'), + ).button + } </Button> </Row> </Root> @@ -114,17 +138,31 @@ export default compose( withProps(({ formValues }) => ({ modalTitle: options.find( o => o.value === get(formValues, 'recommendation', 'publish'), - ).label, + ).message, + confirmMessage: options.find( + o => o.value === get(formValues, 'recommendation', 'publish'), + ).button, })), reduxForm({ form: 'HERecommendation', onSubmit: ( values, dispatch, - { onRecommendationSubmit, showModal, setFetching, modalTitle }, + { + onRecommendationSubmit, + showModal, + setFetching, + modalTitle, + confirmMessage, + }, ) => { showModal({ title: `${modalTitle}?`, + confirmText: + confirmMessage === 'Submit Recommendation' + ? 'Submit' + : confirmMessage, + onConfirm: props => { onRecommendationSubmit(parseFormValues(values), { ...props, -- GitLab