fix(hindawi-app): fix contextual boxes and expanded states, fix modal close and other minor issues

packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js

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