From c2ad76a70ad4f21ca3c77e81eab3fc666e2af7b9 Mon Sep 17 00:00:00 2001
From: Anca Ursachi <anca.ursachi@thinslices.com>
Date: Thu, 11 Oct 2018 18:26:41 +0300
Subject: [PATCH] fix(heMakeRecomandation): editorial recomandation visible
before inviting reviewer
---
packages/component-faraday-ui/src/Tabs.js | 13 +++++-------
.../src/contextualBoxes/ReviewerDetails.js | 4 ++--
.../src/components/ManuscriptLayout.js | 20 ++++++++++---------
3 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/packages/component-faraday-ui/src/Tabs.js b/packages/component-faraday-ui/src/Tabs.js
index 76d0699c1..a7d90025d 100644
--- a/packages/component-faraday-ui/src/Tabs.js
+++ b/packages/component-faraday-ui/src/Tabs.js
@@ -4,12 +4,9 @@ const Tabs = ({ items, selectedTab, changeTab, children }) =>
children({ selectedTab, changeTab })
export default compose(
- withStateHandlers(
- { selectedTab: 0 },
- {
- changeTab: () => selectedTab => ({
- selectedTab,
- }),
- },
- ),
+ withStateHandlers(({ selectedTab = 0 }) => ({ selectedTab }), {
+ changeTab: () => selectedTab => ({
+ selectedTab,
+ }),
+ }),
)(Tabs)
diff --git a/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js b/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js
index 481269011..d64a8a58c 100644
--- a/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js
+++ b/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js
@@ -21,7 +21,7 @@ import {
const ReviewerDetails = ({
journal,
- reports,
+ reports = [],
fragment,
invitations,
previewFile,
@@ -47,7 +47,7 @@ const ReviewerDetails = ({
toggle={toggle}
{...rest}
>
- <Tabs>
+ <Tabs selectedTab={reports.length ? 1 : 0}>
{({ selectedTab, changeTab }) => (
<Fragment>
<TabsHeader>
diff --git a/packages/component-manuscript/src/components/ManuscriptLayout.js b/packages/component-manuscript/src/components/ManuscriptLayout.js
index 2450088df..fc006093c 100644
--- a/packages/component-manuscript/src/components/ManuscriptLayout.js
+++ b/packages/component-manuscript/src/components/ManuscriptLayout.js
@@ -181,15 +181,17 @@ const ManuscriptLayout = ({
/>
)}
- {get(currentUser, 'permissions.canMakeHERecommendation', false) && (
- <HERecommendation
- formValues={get(formValues, 'editorialRecommendation', {})}
- hasReviewerReports={reviewerRecommendations.length > 0}
- highlight={reviewerRecommendations.length > 0}
- modalKey="heRecommendation"
- onRecommendationSubmit={onEditorialRecommendation}
- />
- )}
+ {get(currentUser, 'permissions.canMakeHERecommendation', false) &&
+ (!invitationsWithReviewers.length ||
+ reviewerRecommendations.length > 0) && (
+ <HERecommendation
+ formValues={get(formValues, 'editorialRecommendation', {})}
+ hasReviewerReports={reviewerRecommendations.length > 0}
+ highlight={reviewerRecommendations.length > 0}
+ modalKey="heRecommendation"
+ onRecommendationSubmit={onEditorialRecommendation}
+ />
+ )}
{get(currentUser, 'permissions.canMakeDecision', false) && (
<ManuscriptEicDecision
--
GitLab