From f48995c32a5713f428df3b5f19f35f196e722b64 Mon Sep 17 00:00:00 2001
From: Alexandru Munteanu <alexandru.munt@gmail.com>
Date: Thu, 4 Oct 2018 14:14:31 +0300
Subject: [PATCH] feat(he-recommendation): minor fixes and responsiveness
---
packages/component-faraday-ui/src/ReviewersTable.js | 4 +++-
...ditorialRecommendation.js => HERecommendation.js} | 12 ++++--------
...ditorialRecommendation.md => HERecommendation.md} | 3 +--
.../src/contextualBoxes/ReviewerDetails.js | 2 ++
.../src/contextualBoxes/index.js | 2 +-
.../src/components/ManuscriptLayout.js | 5 +++--
6 files changed, 14 insertions(+), 14 deletions(-)
rename packages/component-faraday-ui/src/contextualBoxes/{EditorialRecommendation.js => HERecommendation.js} (95%)
rename packages/component-faraday-ui/src/contextualBoxes/{EditorialRecommendation.md => HERecommendation.md} (91%)
diff --git a/packages/component-faraday-ui/src/ReviewersTable.js b/packages/component-faraday-ui/src/ReviewersTable.js
index 9dc2a45f1..901e657eb 100644
--- a/packages/component-faraday-ui/src/ReviewersTable.js
+++ b/packages/component-faraday-ui/src/ReviewersTable.js
@@ -14,7 +14,7 @@ const ReviewersTable = ({
onResendReviewerInvite,
onRevokeReviewerInvite,
}) =>
- invitations.length > 0 && (
+ invitations.length > 0 ? (
<Table>
<thead>
<tr>
@@ -82,6 +82,8 @@ const ReviewersTable = ({
))}
</tbody>
</Table>
+ ) : (
+ <Text align="center">No reviewers invited yet.</Text>
)
const orderInvitations = i => {
diff --git a/packages/component-faraday-ui/src/contextualBoxes/EditorialRecommendation.js b/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js
similarity index 95%
rename from packages/component-faraday-ui/src/contextualBoxes/EditorialRecommendation.js
rename to packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js
index beb1fcb68..2acbfa51e 100644
--- a/packages/component-faraday-ui/src/contextualBoxes/EditorialRecommendation.js
+++ b/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js
@@ -17,7 +17,7 @@ import {
ContextualBox,
ItemOverrideAlert,
withFetching,
-} from '../'
+} from 'pubsweet-component-faraday-ui/src'
const options = [
{ value: 'publish', label: 'Publish' },
@@ -40,11 +40,7 @@ const parseFormValues = ({ recommendation, ...rest }) => {
}
}
-const EditorialRecommendation = ({
- formValues,
- handleSubmit,
- hasReviewerReports,
-}) => (
+const HERecommendation = ({ formValues, handleSubmit, hasReviewerReports }) => (
<ContextualBox highlight label="Your Editorial Recommendation" mb={2}>
<Root>
<Row justify="flex-start">
@@ -114,7 +110,7 @@ export default compose(
).label,
})),
reduxForm({
- form: 'editorialRecommendation',
+ form: 'HERecommendation',
onSubmit: (
values,
dispatch,
@@ -131,7 +127,7 @@ export default compose(
})
},
}),
-)(EditorialRecommendation)
+)(HERecommendation)
// #region styles
const Root = styled.div`
diff --git a/packages/component-faraday-ui/src/contextualBoxes/EditorialRecommendation.md b/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.md
similarity index 91%
rename from packages/component-faraday-ui/src/contextualBoxes/EditorialRecommendation.md
rename to packages/component-faraday-ui/src/contextualBoxes/HERecommendation.md
index 0102ae846..004abbffa 100644
--- a/packages/component-faraday-ui/src/contextualBoxes/EditorialRecommendation.md
+++ b/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.md
@@ -4,8 +4,7 @@ HE recommendation.
const formValues = {
recommendation: 'minor-revision',
}
-
-;<EditorialRecommendation
+;<HERecommendation
formValues={formValues}
modalKey="heRecommendation"
onRecommendationSubmit={(values, props) => {
diff --git a/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js b/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js
index 68bec9548..57f93ebd8 100644
--- a/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js
+++ b/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js
@@ -33,6 +33,7 @@ const ReviewerDetails = ({
toggle,
expanded,
canViewReviewersDetails,
+ ...rest
}) =>
canViewReviewersDetails ? (
<ContextualBox
@@ -43,6 +44,7 @@ const ReviewerDetails = ({
}
startExpanded
toggle={toggle}
+ {...rest}
>
<Tabs>
{({ selectedTab, changeTab }) => (
diff --git a/packages/component-faraday-ui/src/contextualBoxes/index.js b/packages/component-faraday-ui/src/contextualBoxes/index.js
index a9311f90c..9cca1b83b 100644
--- a/packages/component-faraday-ui/src/contextualBoxes/index.js
+++ b/packages/component-faraday-ui/src/contextualBoxes/index.js
@@ -1,4 +1,4 @@
export { default as AssignHE } from './AssignHE'
export { default as ReviewerDetails } from './ReviewerDetails'
+export { default as HERecommendation } from './HERecommendation'
export { default as ReviewerReportForm } from './ReviewerReportForm'
-export { default as EditorialRecommendation } from './EditorialRecommendation'
diff --git a/packages/component-manuscript/src/components/ManuscriptLayout.js b/packages/component-manuscript/src/components/ManuscriptLayout.js
index 131e0cdc7..3ff4455f6 100644
--- a/packages/component-manuscript/src/components/ManuscriptLayout.js
+++ b/packages/component-manuscript/src/components/ManuscriptLayout.js
@@ -5,13 +5,13 @@ import {
Text,
paddingHelper,
ReviewerDetails,
+ HERecommendation,
ManuscriptHeader,
ManuscriptAssignHE,
ManuscriptMetadata,
ManuscriptDetailsTop,
ResponseToInvitation,
ManuscriptEicDecision,
- EditorialRecommendation,
} from 'pubsweet-component-faraday-ui'
import ReviewerReportCard from './ReviewReportCard'
@@ -177,7 +177,7 @@ const ManuscriptLayout = ({
)}
{get(currentUser, 'permissions.canMakeHERecommendation', false) && (
- <EditorialRecommendation
+ <HERecommendation
formValues={get(formValues, 'editorialRecommendation', {})}
hasReviewerReports={reviewerRecommendations.length > 0}
modalKey="heRecommendation"
@@ -193,6 +193,7 @@ const ManuscriptLayout = ({
getSignedUrl={getSignedUrl}
invitations={invitationsWithReviewers}
journal={journal}
+ mt={2}
onInviteReviewer={onInviteReviewer}
onResendReviewerInvite={onResendReviewerInvite}
onRevokeReviewerInvite={onRevokeReviewerInvite}
--
GitLab