Skip to content
Snippets Groups Projects
Commit fee6f9d3 authored by Mihail Hagiu's avatar Mihail Hagiu
Browse files

fix(ReviewerNumbering): Reviewer number now appears for author too

parent 22a38b74
No related branches found
No related tags found
4 merge requests!176Sprint 24,!171Sprint 24,!164Hin 1115 author reviewer numbering,!163Hin 1115
import React from 'react' import React from 'react'
import { withProps, compose } from 'recompose' 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 }) => ( const SubmittedReportsNumberForAuthorReviews = ({ reports }) => (
<Row fitContent justify="flex-end"> <Row fitContent justify="flex-end">
...@@ -16,12 +23,13 @@ const SubmittedReportsNumberForAuthorReviews = ({ reports }) => ( ...@@ -16,12 +23,13 @@ const SubmittedReportsNumberForAuthorReviews = ({ reports }) => (
) )
const AuthorReviews = ({ const AuthorReviews = ({
invitations, token,
journal, journal,
reports, reports,
fragment, fragment,
token, invitations,
getSignedUrl, getSignedUrl,
reviewerReports,
}) => }) =>
reports.length > 0 && ( reports.length > 0 && (
<ContextualBox <ContextualBox
...@@ -43,4 +51,24 @@ const AuthorReviews = ({ ...@@ -43,4 +51,24 @@ const AuthorReviews = ({
</ContextualBox> </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)
...@@ -126,7 +126,7 @@ const ReviewerDetails = ({ ...@@ -126,7 +126,7 @@ const ReviewerDetails = ({
onDownload={downloadFile} onDownload={downloadFile}
onPreview={previewFile} onPreview={previewFile}
report={report} report={report}
reviewerIndex={report.reviewerNumber} reviewerNumber={report.reviewerNumber}
showOwner showOwner
/> />
))} ))}
......
...@@ -122,8 +122,9 @@ const ManuscriptLayout = ({ ...@@ -122,8 +122,9 @@ const ManuscriptLayout = ({
<AuthorReviews <AuthorReviews
currentUser={currentUser} currentUser={currentUser}
getSignedUrl={getSignedUrl} getSignedUrl={getSignedUrl}
invitations={invitationsWithReviewers}
journal={journal} journal={journal}
reports={reviewerReports} reviewerReports={reviewerReports}
token={get(currentUser, 'token')} token={get(currentUser, 'token')}
/> />
)} )}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment