diff --git a/packages/component-faraday-selectors/src/index.js b/packages/component-faraday-selectors/src/index.js index cd9e312e08bc3a6877b828087413e57a0b4897f6..52fc13ab5df270d8acefe7625393fd65daf3c0d5 100644 --- a/packages/component-faraday-selectors/src/index.js +++ b/packages/component-faraday-selectors/src/index.js @@ -69,6 +69,7 @@ export const canViewReviewersDetails = (state, collection = {}) => { const authorAndReviewersCanViewReportsDetailsStatuses = [ 'revisionRequested', + 'underReview', 'pendingApproval', 'rejected', 'accepted', diff --git a/packages/component-manuscript/src/components/ReviewerReports.js b/packages/component-manuscript/src/components/ReviewerReports.js index a9b33e8eb9be49743cdb95b770c28bdb14de54cf..2e146ac63c39ae86dffdd0df256436a02282e9e2 100644 --- a/packages/component-manuscript/src/components/ReviewerReports.js +++ b/packages/component-manuscript/src/components/ReviewerReports.js @@ -1,4 +1,5 @@ import React from 'react' +import { compose } from 'recompose' import { ReviewerReport, ContextualBox, @@ -20,12 +21,13 @@ const SubmittedReports = ({ reports }) => ( </Row> ) -const ReviewReportCard = ({ +const ReviewerReports = ({ journal, reports, previewFile, downloadFile, isLatestVersion, + currentUser, }) => ( <ContextualBox label={isLatestVersion ? 'Your Report' : 'Reviewer Reports'} @@ -41,10 +43,10 @@ const ReviewReportCard = ({ onPreview={previewFile} report={report} reviewerIndex={index + 1} - showOwner + showOwner={report.userId === currentUser.id} /> ))} </ContextualBox> ) -export default withFileDownload(withFilePreview(ReviewReportCard)) +export default compose(withFileDownload, withFilePreview)(ReviewerReports) diff --git a/packages/xpub-faraday/config/authsome-helpers.js b/packages/xpub-faraday/config/authsome-helpers.js index 1dc69faf314e2ee068343ef50fae8681f614a2f1..878312bff4cfc3d135f07e03810eda75af11cebd 100644 --- a/packages/xpub-faraday/config/authsome-helpers.js +++ b/packages/xpub-faraday/config/authsome-helpers.js @@ -73,17 +73,15 @@ const filterAuthorRecommendations = (recommendations, status, isLast) => { } const filterReviewerRecommendations = (recommendations, user) => { - const ownRecommendationFromCurrentFragment = recommendations.find( - r => r.userId === user.id, - ) - if (ownRecommendationFromCurrentFragment) + const ownRecommendation = recommendations.find(r => r.userId === user.id) + if (ownRecommendation) return recommendations .filter( r => r.submittedOn || r.recommendationType === 'editorRecommendation', ) .map( r => - r.userId !== ownRecommendationFromCurrentFragment.userId + r.userId !== ownRecommendation.userId ? { ...r, comments: r.comments.filter(c => c.public === true) } : { ...r }, )