Skip to content
Snippets Groups Projects

fix(HERecommendation): Message for Author box should be mandatory when selecting…

Merged Anca Ursachi requested to merge HIN-1220 into develop
3 files
+ 55
14
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -79,6 +79,10 @@ const HERecommendation = ({
@@ -79,6 +79,10 @@ const HERecommendation = ({
handleSubmit,
handleSubmit,
formValues,
formValues,
highlight,
highlight,
 
rejectRecommendation,
 
publishRecommendation,
 
minorRevisionRecommendation,
 
majorRevisionRecommendation,
...rest
...rest
}) => (
}) => (
<ContextualBox
<ContextualBox
@@ -111,31 +115,38 @@ const HERecommendation = ({
@@ -111,31 +115,38 @@ const HERecommendation = ({
/>
/>
</ItemOverrideAlert>
</ItemOverrideAlert>
</Row>
</Row>
{get(formValues, 'recommendation') === 'minor' ||
{(minorRevisionRecommendation || majorRevisionRecommendation) && (
get(formValues, 'recommendation') === 'major' ? (
<Row mt={2}>
<Row mt={2}>
<ResponsiveItem
<ResponsiveItem
data-test-id="editorial-recommendation-message-for-author"
data-test-id="editorial-recommendation-message-for-author"
mr={1}
mr={1}
vertical
vertical
>
>
<Label>
<Label required>Message for Author</Label>
Message for Author <Text secondary>Optional</Text>
<ValidatedField
</Label>
component={Textarea}
<ValidatedField component={Textarea} name="public" />
name="public"
 
validate={[required]}
 
/>
</ResponsiveItem>
</ResponsiveItem>
</Row>
</Row>
) : (
)}
 
{(publishRecommendation || rejectRecommendation) && (
<ResponsiveRow mt={2}>
<ResponsiveRow mt={2}>
<ResponsiveItem
<ResponsiveItem
data-test-id="editorial-recommendation-message-for-author"
data-test-id="editorial-recommendation-message-for-author"
mr={1}
mr={1}
vertical
vertical
>
>
<Label>
<Label required={!!rejectRecommendation}>
Message for Author <Text secondary>Optional</Text>
Message for Author{' '}
 
{publishRecommendation ? <Text secondary> Optional</Text> : ''}
</Label>
</Label>
<ValidatedField component={Textarea} name="public" />
<ValidatedField
 
component={Textarea}
 
name="public"
 
validate={rejectRecommendation ? [required] : false}
 
/>
</ResponsiveItem>
</ResponsiveItem>
<ResponsiveItem
<ResponsiveItem
@@ -199,9 +210,14 @@ export default compose(
@@ -199,9 +210,14 @@ export default compose(
confirmMessage: options.find(
confirmMessage: options.find(
o => o.value === get(formValues, 'recommendation', 'publish'),
o => o.value === get(formValues, 'recommendation', 'publish'),
).button,
).button,
 
rejectRecommendation: get(formValues, 'recommendation') === 'reject',
 
publishRecommendation: get(formValues, 'recommendation') === 'publish',
 
minorRevisionRecommendation: get(formValues, 'recommendation') === 'minor',
 
majorRevisionRecommendation: get(formValues, 'recommendation') === 'major',
})),
})),
reduxForm({
reduxForm({
form: 'HERecommendation',
form: 'HERecommendation',
 
destroyOnUnmount: false,
onSubmit: (
onSubmit: (
values,
values,
dispatch,
dispatch,