diff --git a/packages/component-faraday-ui/src/AuthorReply.js b/packages/component-faraday-ui/src/AuthorReply.js index c9f8c6ca8b17ff2442df8b365eb70448eb48593a..22649c9636aba91856d4fef278b074951b73b6b7 100644 --- a/packages/component-faraday-ui/src/AuthorReply.js +++ b/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` diff --git a/packages/component-faraday-ui/src/contextualBoxes/ResponseToRevisionRequest.js b/packages/component-faraday-ui/src/contextualBoxes/ResponseToRevisionRequest.js index 3f6bbd424511aecaecc918240471772bef9057da..812b986e6585743c53c5e39f46000faf465dbc05 100644 --- a/packages/component-faraday-ui/src/contextualBoxes/ResponseToRevisionRequest.js +++ b/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> ) diff --git a/packages/component-manuscript/src/components/ManuscriptLayout.js b/packages/component-manuscript/src/components/ManuscriptLayout.js index bb1fdc576c68246c9a7a37cf2e22a2324afa0189..250226f55c9edd7842943b7d2f331958bd2f444d 100644 --- a/packages/component-manuscript/src/components/ManuscriptLayout.js +++ b/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' @@ -127,6 +128,13 @@ const ManuscriptLayout = ({ /> )} + {authorResponseToRevisonRequest.content && ( + <ResponseToRevisionRequest + authorReply={authorResponseToRevisonRequest.content} + fragment={fragment} + /> + )} + {shouldReview && ( <ReviewerReportForm changeForm={changeForm} @@ -196,7 +204,7 @@ const ManuscriptLayout = ({ {...inviteReviewer} /> )} - {console.log('fragment', fragment)} + {get(currentUser, 'permissions.canSubmitRevision', false) && ( <SubmitRevision {...submitRevision} /> )}