From 8354785aa90beae6dddeb9571e8e1ff50647d8aa Mon Sep 17 00:00:00 2001
From: Anca Ursachi <anca.ursachi@thinslices.com>
Date: Fri, 14 Dec 2018 11:13:21 +0200
Subject: [PATCH] fix(contextualBox): Make contextual boxes toggle again.
---
packages/component-faraday-ui/src/ContextualBox.js | 13 ++++++++++---
.../component-faraday-ui/src/EditorialReportCard.js | 1 -
.../src/components/ManuscriptPage.js | 11 -----------
.../src/components/ReviewerReports.js | 1 -
4 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/packages/component-faraday-ui/src/ContextualBox.js b/packages/component-faraday-ui/src/ContextualBox.js
index 188d9a4a3..d8ab44a43 100644
--- a/packages/component-faraday-ui/src/ContextualBox.js
+++ b/packages/component-faraday-ui/src/ContextualBox.js
@@ -34,7 +34,14 @@ const CustomHeader = ({
</Header>
)
-const ContextualBox = ({ label, children, rightChildren, ...props }) =>
+const ContextualBox = ({
+ label,
+ children,
+ rightChildren,
+ toggle,
+ expanded,
+ ...props
+}) =>
!isUndefined(props.expanded) ? (
<ControlledAccordion
header={CustomHeader}
@@ -75,8 +82,8 @@ ContextualBox.propTypes = {
ContextualBox.defaultProps = {
label: '',
rightChildren: undefined,
- expanded: false,
- toggle: () => {},
+ toggle: undefined,
+ expanded: undefined,
}
// #region styles
diff --git a/packages/component-faraday-ui/src/EditorialReportCard.js b/packages/component-faraday-ui/src/EditorialReportCard.js
index 649beafe6..cceeda0b6 100644
--- a/packages/component-faraday-ui/src/EditorialReportCard.js
+++ b/packages/component-faraday-ui/src/EditorialReportCard.js
@@ -28,7 +28,6 @@ const EditorialReportCard = ({
<Label mb={1 / 2}>
{editorRole === 'HE' ? 'Recommendation' : 'Decision'}
</Label>
- )
<Text>{recommendation}</Text>
</Item>
diff --git a/packages/component-manuscript/src/components/ManuscriptPage.js b/packages/component-manuscript/src/components/ManuscriptPage.js
index 9b9a3cf79..5d651d03a 100644
--- a/packages/component-manuscript/src/components/ManuscriptPage.js
+++ b/packages/component-manuscript/src/components/ManuscriptPage.js
@@ -368,10 +368,8 @@ export default compose(
fetchUpdatedCollection,
editorialRecommendations,
fragment,
- collection: { status },
currentUser: {
isEIC,
- isReviewer,
isInvitedHE,
isInvitedToReview,
isHEToManuscript,
@@ -398,15 +396,6 @@ 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)
}
diff --git a/packages/component-manuscript/src/components/ReviewerReports.js b/packages/component-manuscript/src/components/ReviewerReports.js
index 3533cbf90..8402e9431 100644
--- a/packages/component-manuscript/src/components/ReviewerReports.js
+++ b/packages/component-manuscript/src/components/ReviewerReports.js
@@ -17,7 +17,6 @@ const SubmittedReports = ({ reports }) => (
{reports}
</Text>
<Text mr={1 / 2} pr={1 / 2} secondary>
- {' '}
submitted
</Text>
</Row>
--
GitLab