From 17326d21796b2b18d713bb40c893a67b09653ba7 Mon Sep 17 00:00:00 2001
From: Tania Fecheta <tania.fecheta@thinslices.com>
Date: Wed, 31 Oct 2018 10:48:55 +0200
Subject: [PATCH] feat(responseToRevisionRequest): expand Response to Revision
Request contextual box and colapse the
---
.../contextualBoxes/ResponseToRevisionRequest.js | 14 ++++++++++++--
.../src/components/ManuscriptLayout.js | 5 +++++
.../src/components/ManuscriptPage.js | 11 ++++++++++-
3 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/packages/component-faraday-ui/src/contextualBoxes/ResponseToRevisionRequest.js b/packages/component-faraday-ui/src/contextualBoxes/ResponseToRevisionRequest.js
index 812b986e6..487d83cb1 100644
--- a/packages/component-faraday-ui/src/contextualBoxes/ResponseToRevisionRequest.js
+++ b/packages/component-faraday-ui/src/contextualBoxes/ResponseToRevisionRequest.js
@@ -2,8 +2,18 @@ import React from 'react'
import { ContextualBox, AuthorReply } from '../'
-const ResponseToRevisionRequest = ({ fragment, authorReply }) => (
- <ContextualBox label="Response to Revision Request" mb={2}>
+const ResponseToRevisionRequest = ({
+ fragment,
+ authorReply,
+ expanded,
+ toggle,
+}) => (
+ <ContextualBox
+ expanded={expanded}
+ label="Response to Revision Request"
+ mb={2}
+ toggle={toggle}
+ >
<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 250226f55..9c39e9a6c 100644
--- a/packages/component-manuscript/src/components/ManuscriptLayout.js
+++ b/packages/component-manuscript/src/components/ManuscriptLayout.js
@@ -56,6 +56,8 @@ const ManuscriptLayout = ({
toggleReviewerRecommendations,
reviewerRecommendationExpanded,
authorResponseToRevisonRequest,
+ toggleResponeToRevisionRequest,
+ responseToRevisionRequestExpanded,
shouldReview,
submittedOwnRecommendation,
reviewerReports,
@@ -68,6 +70,7 @@ const ManuscriptLayout = ({
inviteReviewer,
recommendationHandler,
inviteHandlingEditor,
+
versions,
}) => (
<Root pb={30}>
@@ -131,7 +134,9 @@ const ManuscriptLayout = ({
{authorResponseToRevisonRequest.content && (
<ResponseToRevisionRequest
authorReply={authorResponseToRevisonRequest.content}
+ expanded={responseToRevisionRequestExpanded}
fragment={fragment}
+ toggle={toggleResponeToRevisionRequest}
/>
)}
diff --git a/packages/component-manuscript/src/components/ManuscriptPage.js b/packages/component-manuscript/src/components/ManuscriptPage.js
index 9f18761f4..f51c7f7ab 100644
--- a/packages/component-manuscript/src/components/ManuscriptPage.js
+++ b/packages/component-manuscript/src/components/ManuscriptPage.js
@@ -286,6 +286,10 @@ export default compose(
toggleEditorialComments: toggle,
editorialCommentsExpanded: expanded,
})),
+ fromRenderProps(RemoteOpener, ({ toggle, expanded }) => ({
+ toggleResponeToRevisionRequest: toggle,
+ responseToRevisionRequestExpanded: expanded,
+ })),
withProps(({ currentUser, collection, submittedOwnRecommendation }) => ({
getSignedUrl,
shouldReview:
@@ -311,6 +315,7 @@ export default compose(
hasManuscriptFailure,
fetchUpdatedCollection,
editorialRecommendations,
+ authorResponseToRevisonRequest,
currentUser: {
isEIC,
isInvitedHE,
@@ -351,7 +356,7 @@ export default compose(
this.props.toggleReviewerResponse()
}
- if (shouldReview) {
+ if (shouldReview && !authorResponseToRevisonRequest.content) {
this.props.toggleReviewerRecommendations()
}
@@ -370,6 +375,10 @@ export default compose(
if (canSubmitRevision) {
this.props.toggleEditorialComments()
}
+
+ if (authorResponseToRevisonRequest.content) {
+ this.props.toggleResponeToRevisionRequest()
+ }
},
componentDidUpdate(prevProps) {
const {
--
GitLab