Merge branch 'HIN-991' of gitlab.coko.foundation:xpub/xpub-faraday into HIN-1100

packages/component-faraday-selectors/src/index.js

@@ -372,6 +372,9 @@ export const canMakeHERecommendation = (state, { collection, statuses }) => {
   return statusImportance > 1 && statusImportance < 9 && validHE
 }
 
+export const getFragmentAuthorResponse = (state, fragmentId) =>
+  get(state, `fragments.${fragmentId}.responseToReviewers`, {})
+
 // #region Editorial and reviewer recommendations
 export const getFragmentRecommendations = (state, fragmentId) =>
   get(state, `fragments.${fragmentId}.recommendations`, [])

packages/component-faraday-ui/src/AuthorReply.js

@@ -33,17 +33,14 @@ const AuthorReply = ({ reply, authorName, submittedOn }) => (
   </Root>
 )
 
-export default withProps(
-  ({ fragment: { authors, submitted, responseToReviewers } }) => ({
-    reply: responseToReviewers.content,
-    submittedOn: submitted,
-    authorName: `${get(submittingAuthor(authors), 'firstName', '')} ${get(
-      submittingAuthor(authors),
-      'lastName',
-      '',
-    )}`,
-  }),
-)(AuthorReply)
+export default withProps(({ fragment: { authors, submitted } }) => ({
+  submittedOn: submitted,
+  authorName: `${get(submittingAuthor(authors), 'firstName', '')} ${get(
+    submittingAuthor(authors),
+    'lastName',
+    '',
+  )}`,
+}))(AuthorReply)
 
 // #region styles
 const Root = styled.div`

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

@@ -2,9 +2,9 @@ import React from 'react'
 
 import { ContextualBox, AuthorReply } from '../'
 
-const ResponseToRevisionRequest = ({ fragment }) => (
+const ResponseToRevisionRequest = ({ fragment, authorReply }) => (
   <ContextualBox label="Response to Revision Request" mb={2}>
-    <AuthorReply fragment={fragment} />
+    <AuthorReply fragment={fragment} reply={authorReply} />
   </ContextualBox>
 )
 

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

@@ -4,8 +4,9 @@ import { isEmpty, get } from 'lodash'
 import {
   Text,
   paddingHelper,
-  ReviewerDetails,
   AuthorReviews,
+  SubmitRevision,
+  ReviewerDetails,
   HERecommendation,
   ManuscriptHeader,
   ManuscriptAssignHE,
@@ -13,7 +14,7 @@ import {
   ManuscriptDetailsTop,
   ResponseToInvitation,
   ManuscriptEicDecision,
-  SubmitRevision,
+  ResponseToRevisionRequest,
 } from 'pubsweet-component-faraday-ui'
 
 import ReviewerReportCard from './ReviewReportCard'
@@ -54,6 +55,7 @@ const ManuscriptLayout = ({
   pendingOwnRecommendation,
   toggleReviewerRecommendations,
   reviewerRecommendationExpanded,
+  authorResponseToRevisonRequest,
   shouldReview,
   submittedOwnRecommendation,
   reviewerReports,
@@ -126,6 +128,13 @@ const ManuscriptLayout = ({
           />
         )}
 
+        {authorResponseToRevisonRequest.content && (
+          <ResponseToRevisionRequest
+            authorReply={authorResponseToRevisonRequest.content}
+            fragment={fragment}
+          />
+        )}
+
         {shouldReview && (
           <ReviewerReportForm
             changeForm={changeForm}

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

@@ -47,6 +47,7 @@ import {
   canViewReviewersDetails,
   canViewEditorialComments,
   pendingReviewerInvitation,
+  getFragmentAuthorResponse,
   canOverrideTechnicalChecks,
   authorCanViewReportsDetails,
   getOwnPendingRecommendation,
@@ -125,6 +126,10 @@ export default compose(
         state,
         match.params.version,
       ),
+      authorResponseToRevisonRequest: getFragmentAuthorResponse(
+        state,
+        match.params.version,
+      ),
     }),
     {
       changeForm,