From 55965d3c6bd7430e19525acd68a778bba7d8675a Mon Sep 17 00:00:00 2001
From: Tania Fecheta <tania.fecheta@thinslices.com>
Date: Thu, 22 Nov 2018 12:22:29 +0200
Subject: [PATCH] feat(reviewerReports): filter reccomendations reviwers see
---
packages/component-faraday-selectors/src/index.js | 1 +
.../src/components/ReviewerReports.js | 8 +++++---
packages/xpub-faraday/config/authsome-helpers.js | 8 +++-----
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/packages/component-faraday-selectors/src/index.js b/packages/component-faraday-selectors/src/index.js
index cd9e312e0..52fc13ab5 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 a9b33e8eb..2e146ac63 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 1dc69faf3..878312bff 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 },
)
--
GitLab