From fee6f9d392ddef05b72302dc900b3881128cc36c Mon Sep 17 00:00:00 2001
From: Mihail Hagiu <mihail.hagiu@thinslices.com>
Date: Thu, 22 Nov 2018 13:50:10 +0200
Subject: [PATCH] fix(ReviewerNumbering): Reviewer number now appears for
author too
---
.../src/contextualBoxes/AuthorReviews.js | 36 ++++++++++++++++---
.../src/contextualBoxes/ReviewerDetails.js | 2 +-
.../src/components/ManuscriptLayout.js | 3 +-
3 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/packages/component-faraday-ui/src/contextualBoxes/AuthorReviews.js b/packages/component-faraday-ui/src/contextualBoxes/AuthorReviews.js
index 5518b3ebf..696e8a4e4 100644
--- a/packages/component-faraday-ui/src/contextualBoxes/AuthorReviews.js
+++ b/packages/component-faraday-ui/src/contextualBoxes/AuthorReviews.js
@@ -1,7 +1,14 @@
import React from 'react'
import { withProps, compose } from 'recompose'
+import { get } from 'lodash'
-import { ContextualBox, ReviewerReportAuthor, Row, Text } from '../'
+import {
+ ContextualBox,
+ ReviewerReportAuthor,
+ Row,
+ Text,
+ indexReviewers,
+} from '../'
const SubmittedReportsNumberForAuthorReviews = ({ reports }) => (
<Row fitContent justify="flex-end">
@@ -16,12 +23,13 @@ const SubmittedReportsNumberForAuthorReviews = ({ reports }) => (
)
const AuthorReviews = ({
- invitations,
+ token,
journal,
reports,
fragment,
- token,
+ invitations,
getSignedUrl,
+ reviewerReports,
}) =>
reports.length > 0 && (
<ContextualBox
@@ -43,4 +51,24 @@ const AuthorReviews = ({
</ContextualBox>
)
-export default compose(withProps())(AuthorReviews)
+export default compose(
+ withProps(
+ ({
+ invitations = [],
+ publonReviewers = [],
+ reviewerReports = [],
+ currentUser,
+ }) => ({
+ token: get(currentUser, 'token', ''),
+ publonReviewers,
+ invitations: invitations.map(i => ({
+ ...i,
+ review: reviewerReports.find(r => r.userId === i.userId),
+ })),
+ reports: indexReviewers(
+ reviewerReports.filter(r => r.submittedOn),
+ invitations,
+ ),
+ }),
+ ),
+)(AuthorReviews)
diff --git a/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js b/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js
index d1a9cbcff..987aa4a77 100644
--- a/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js
+++ b/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js
@@ -126,7 +126,7 @@ const ReviewerDetails = ({
onDownload={downloadFile}
onPreview={previewFile}
report={report}
- reviewerIndex={report.reviewerNumber}
+ reviewerNumber={report.reviewerNumber}
showOwner
/>
))}
diff --git a/packages/component-manuscript/src/components/ManuscriptLayout.js b/packages/component-manuscript/src/components/ManuscriptLayout.js
index 4953fa278..b8492c8be 100644
--- a/packages/component-manuscript/src/components/ManuscriptLayout.js
+++ b/packages/component-manuscript/src/components/ManuscriptLayout.js
@@ -122,8 +122,9 @@ const ManuscriptLayout = ({
<AuthorReviews
currentUser={currentUser}
getSignedUrl={getSignedUrl}
+ invitations={invitationsWithReviewers}
journal={journal}
- reports={reviewerReports}
+ reviewerReports={reviewerReports}
token={get(currentUser, 'token')}
/>
)}
--
GitLab