From 0de3f9736563760d441315d5df1123b4b5dc6562 Mon Sep 17 00:00:00 2001
From: Iosif Boanca <iosif.boanca@thinslices.com>
Date: Thu, 18 Oct 2018 13:04:10 +0300
Subject: [PATCH] HIN-1006 after CR
---
.../component-faraday-selectors/src/index.js | 22 ++++++++------
.../src/contextualBoxes/AuthorReviews.js | 29 +++++++++++--------
2 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/packages/component-faraday-selectors/src/index.js b/packages/component-faraday-selectors/src/index.js
index 59273a4fd..68c0e9420 100644
--- a/packages/component-faraday-selectors/src/index.js
+++ b/packages/component-faraday-selectors/src/index.js
@@ -62,21 +62,25 @@ export const canViewReviewersDetails = (state, collection = {}) => {
return canViewReports(state, collection.id)
}
-const authorCannotViewReportsDetails = ['rejected', 'revisionRequested']
+const authorCanViewReportsDetailsStatuses = [
+ 'revisionRequested',
+ 'pendingApproval',
+ 'rejected',
+ 'accepted',
+ 'inQa',
+]
export const authorCanViewReportsDetails = (
state,
collection = {},
fragmentId,
) => {
- if (
- authorCannotViewReportsDetails.includes(get(collection, 'status', false)) &&
- currentUserIsAuthor(state, fragmentId)
- ) {
- return true
- }
-
- return false
+ const isAuthor = currentUserIsAuthor(state, fragmentId)
+ return (
+ authorCanViewReportsDetailsStatuses.includes(
+ get(collection, 'status', 'draft'),
+ ) && isAuthor
+ )
}
const canHeViewEditorialCommentsStatuses = [
diff --git a/packages/component-faraday-ui/src/contextualBoxes/AuthorReviews.js b/packages/component-faraday-ui/src/contextualBoxes/AuthorReviews.js
index 4c6f55363..447a7614b 100644
--- a/packages/component-faraday-ui/src/contextualBoxes/AuthorReviews.js
+++ b/packages/component-faraday-ui/src/contextualBoxes/AuthorReviews.js
@@ -15,17 +15,22 @@ const SubmittedReportsNumberForAuthorReviews = ({ reports }) => (
</Row>
)
-const AuthorReviews = ({ invitations, journal, reports, fragment }) => (
- <ContextualBox
- label="Review Reports"
- rightChildren={
- <SubmittedReportsNumberForAuthorReviews reports={reports.length} />
- }
- >
- {reports.map((r, i) => (
- <ReviewerReportAuthor journal={journal} key={r.id} report={reports[i]} />
- ))}
- </ContextualBox>
-)
+const AuthorReviews = ({ invitations, journal, reports, fragment }) =>
+ reports.length && (
+ <ContextualBox
+ label="Review Reports"
+ rightChildren={
+ <SubmittedReportsNumberForAuthorReviews reports={reports.length} />
+ }
+ >
+ {reports.map((r, i) => (
+ <ReviewerReportAuthor
+ journal={journal}
+ key={r.id}
+ report={reports[i]}
+ />
+ ))}
+ </ContextualBox>
+ )
export default compose(withProps())(AuthorReviews)
--
GitLab