Merge branch 'HIN-1221' into 'develop'

fix(manuscriptPage): Your Editorial Decision/Recommendation box, Your report…

See merge request !199

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

@@ -79,11 +79,14 @@ const HERecommendation = ({
   handleSubmit,
   formValues,
   highlight,
+  ...rest
 }) => (
   <ContextualBox
+    expanded
     highlight={highlight}
     label="Your Editorial Recommendation"
     mb={2}
+    {...rest}
   >
     <Root>
       <Row justify="flex-start">

packages/component-faraday-ui/src/manuscriptDetails/ManuscriptMetadata.js

@@ -16,14 +16,22 @@ const ManuscriptMetadata = ({
   getSignedUrl,
   currentUser: { token },
   fragment: { files = {}, conflicts = {}, metadata: { abstract = '' } },
+  abstractMetadataExpanded,
+  toggleAbstractMetadata,
+  toggleConflictsOfInterest,
+  conflictsOfInterestExpanded,
+  filesMetadataExpanded,
+  toggleFilesMetadata,
 }) => (
   <Fragment>
     {!!abstract && (
       <Item mb={1}>
         <ContextualBox
           data-test-id="abstract-tab"
+          expanded={abstractMetadataExpanded}
           label="Abstract"
           startExpanded
+          toggle={toggleAbstractMetadata}
           transparent
         >
           <Text mb={1} mt={1}>
@@ -36,7 +44,9 @@ const ManuscriptMetadata = ({
       <Item mb={1}>
         <ContextualBox
           data-test-id="conflict-of-interest-tab"
+          expanded={conflictsOfInterestExpanded}
           label="Conflict of Interest"
+          toggle={toggleConflictsOfInterest}
           transparent
         >
           <Row alignItems="center" justify="flex-start">
@@ -68,7 +78,13 @@ const ManuscriptMetadata = ({
     )}
     {!isEmpty(files) && (
       <Item mb={1}>
-        <ContextualBox data-test-id="files-tab" label={filesLabel} transparent>
+        <ContextualBox
+          data-test-id="files-tab"
+          expanded={filesMetadataExpanded}
+          label={filesLabel}
+          toggle={toggleFilesMetadata}
+          transparent
+        >
           <ManuscriptFileList
             files={files}
             getSignedUrl={getSignedUrl}

packages/component-manuscript/src/components/ManuscriptLayout.js

@@ -55,15 +55,27 @@ const ManuscriptLayout = ({
   handlingEditors,
   canHEOnlyReject,
   toggleHEResponse,
+  toggleEicDecision,
   heResponseExpanded,
+  toggleReviewReport,
+  eicDecisionExpanded,
+  reviewReportExpanded,
   inviteHandlingEditor,
   toggleReviewerDetails,
-  isFetchingFromAutosave,
   recommendationHandler,
+  isFetchingFromAutosave,
+  toggleHERecommentation,
   toggleReviewerResponse,
   reviewerDetailsExpanded,
   toggleEditorialComments,
+  toggleAbstractMetadata,
+  abstractMetadataExpanded,
+  toggleConflictsOfInterest,
+  conflictsOfInterestExpanded,
+  toggleFilesMetadata,
+  filesMetadataExpanded,
   reviewerRecommendations,
+  HERecommendationExpanded,
   invitationsWithReviewers,
   reviewerResponseExpanded,
   pendingOwnRecommendation,
@@ -105,9 +117,15 @@ const ManuscriptLayout = ({
           versions={versions}
         />
         <ManuscriptMetadata
+          abstractMetadataExpanded={abstractMetadataExpanded}
+          conflictsOfInterestExpanded={conflictsOfInterestExpanded}
           currentUser={currentUser}
+          filesMetadataExpanded={filesMetadataExpanded}
           fragment={fragment}
           getSignedUrl={getSignedUrl}
+          toggleAbstractMetadata={toggleAbstractMetadata}
+          toggleConflictsOfInterest={toggleConflictsOfInterest}
+          toggleFilesMetadata={toggleFilesMetadata}
         />
 
         {get(currentUser, 'permissions.canViewEditorialComments', true) && (
@@ -138,11 +156,13 @@ const ManuscriptLayout = ({
         ) && (
           <ReviewerReports
             currentUser={currentUser}
+            expanded={reviewReportExpanded}
             getSignedUrl={getSignedUrl}
             invitations={invitationsWithReviewers}
             isLatestVersion={isLatestVersion}
             journal={journal}
             reviewerReports={reviewerRecommendations}
+            toggle={toggleReviewReport}
             token={get(currentUser, 'token')}
           />
         )}
@@ -248,24 +268,27 @@ const ManuscriptLayout = ({
                 canHEMakeRecommendationToPublish
               }
               canHEOnlyReject={canHEOnlyReject}
+              expanded={HERecommendationExpanded}
               formValues={get(formValues, 'editorialRecommendation', {})}
               highlight={reviewerRecommendations.length > 0}
               modalKey="heRecommendation"
               onRecommendationSubmit={
                 recommendationHandler.onEditorialRecommendation
               }
+              toggle={toggleHERecommentation}
             />
           )}
-
         {isLatestVersion &&
           get(currentUser, 'permissions.canMakeDecision', false) && (
             <ManuscriptEicDecision
               collection={collection}
+              expanded={eicDecisionExpanded}
               formValues={get(formValues, 'eicDecision')}
               highlight={editorialRecommendations.length > 0}
               messagesLabel={messagesLabel}
               mt={2}
               submitDecision={recommendationHandler.createRecommendation}
+              toggle={toggleEicDecision}
             />
           )}
       </Fragment>

packages/component-manuscript/src/components/ManuscriptPage.js

@@ -293,6 +293,30 @@ export default compose(
       }
     },
   }),
+  fromRenderProps(RemoteOpener, ({ toggle, expanded }) => ({
+    toggleAbstractMetadata: toggle,
+    abstractMetadataExpanded: expanded,
+  })),
+  fromRenderProps(RemoteOpener, ({ toggle, expanded }) => ({
+    toggleConflictsOfInterest: toggle,
+    conflictsOfInterestExpanded: expanded,
+  })),
+  fromRenderProps(RemoteOpener, ({ toggle, expanded }) => ({
+    toggleFilesMetadata: toggle,
+    filesMetadataExpanded: expanded,
+  })),
+  fromRenderProps(RemoteOpener, ({ toggle, expanded }) => ({
+    toggleReviewReport: toggle,
+    reviewReportExpanded: expanded,
+  })),
+  fromRenderProps(RemoteOpener, ({ toggle, expanded }) => ({
+    toggleHERecommentation: toggle,
+    HERecommendationExpanded: expanded,
+  })),
+  fromRenderProps(RemoteOpener, ({ toggle, expanded }) => ({
+    toggleEicDecision: toggle,
+    eicDecisionExpanded: expanded,
+  })),
   fromRenderProps(RemoteOpener, ({ toggle, expanded }) => ({
     toggleAssignHE: toggle,
     heExpanded: expanded,
@@ -344,8 +368,10 @@ export default compose(
         fetchUpdatedCollection,
         editorialRecommendations,
         fragment,
+        collection: { status },
         currentUser: {
           isEIC,
+          isReviewer,
           isInvitedHE,
           isInvitedToReview,
           isHEToManuscript,
@@ -372,6 +398,15 @@ export default compose(
         setEditorInChief(head(res.users)),
       )
 
+      if (isEIC && status === 'pendingApproval') {
+        this.props.toggleEicDecision()
+      }
+      if (isReviewer && status === 'reviewCompleted')
+        this.props.toggleReviewReport()
+
+      if (isHEToManuscript && status === 'reviewCompleted')
+        this.props.toggleHERecommentation()
+
       if (canInviteReviewers) {
         getPublonsReviewers(fragmentId, setError)
       }

packages/component-manuscript/src/components/ReviewerReports.js

@@ -33,12 +33,14 @@ const ReviewerReports = ({
   token,
   invitations,
   reviwerReports,
+  ...rest
 }) => (
   <ContextualBox
     label={isLatestVersion ? 'Your Report' : 'Reviewer Reports'}
     mb={2}
     rightChildren={<SubmittedReports reports={reports.length} />}
     startExpanded
+    {...rest}
   >
     {reports.map(report => (
       <ReviewerReport