From f260857cd1ac27c2ab4aaecb516281c2274761dd Mon Sep 17 00:00:00 2001 From: Iosif Boanca <iosif.boanca@thinslices.com> Date: Wed, 17 Oct 2018 18:39:19 +0300 Subject: [PATCH] auhtor can see reports --- .../component-faraday-selectors/src/index.js | 18 ++++++++++-------- .../src/components/ManuscriptLayout.js | 1 + .../src/components/ManuscriptPage.js | 1 + 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/component-faraday-selectors/src/index.js b/packages/component-faraday-selectors/src/index.js index 6480c91a4..59273a4fd 100644 --- a/packages/component-faraday-selectors/src/index.js +++ b/packages/component-faraday-selectors/src/index.js @@ -14,6 +14,7 @@ export const currentUserIs = ({ currentUser: { user } }, role) => { const isAdmin = get(user, 'admin') const isEic = get(user, 'editorInChief') const isHe = get(user, 'handlingEditor') + switch (role) { case 'isHE': return isHe @@ -63,18 +64,19 @@ export const canViewReviewersDetails = (state, collection = {}) => { const authorCannotViewReportsDetails = ['rejected', 'revisionRequested'] -export const authorCanViewReportsDetails = (state, collection = {}) => { +export const authorCanViewReportsDetails = ( + state, + collection = {}, + fragmentId, +) => { if ( - authorCannotViewReportsDetails.includes(get(collection, 'status', 'draft')) + authorCannotViewReportsDetails.includes(get(collection, 'status', false)) && + currentUserIsAuthor(state, fragmentId) ) { - return authorCanViewReports(state, collection.id) + return true } - return false -} -export const authorCanViewReports = (state, collectionId) => { - const isAuthor = currentUserIs(state, 'author') - return isAuthor + return false } const canHeViewEditorialCommentsStatuses = [ diff --git a/packages/component-manuscript/src/components/ManuscriptLayout.js b/packages/component-manuscript/src/components/ManuscriptLayout.js index 2bf4e61ac..5871a448e 100644 --- a/packages/component-manuscript/src/components/ManuscriptLayout.js +++ b/packages/component-manuscript/src/components/ManuscriptLayout.js @@ -186,6 +186,7 @@ const ManuscriptLayout = ({ toggle={toggleReviewerDetails} /> )} + {/* aici e treaba*/} {get(currentUser, 'permissions.authorCanViewReportsDetails', false) && ( <AuthorReviews currentUser={currentUser} diff --git a/packages/component-manuscript/src/components/ManuscriptPage.js b/packages/component-manuscript/src/components/ManuscriptPage.js index 6889be601..bc3c6fb6c 100644 --- a/packages/component-manuscript/src/components/ManuscriptPage.js +++ b/packages/component-manuscript/src/components/ManuscriptPage.js @@ -182,6 +182,7 @@ export default compose( authorCanViewReportsDetails: authorCanViewReportsDetails( state, collection, + fragment.id, ), canOverrideTechChecks: canOverrideTechnicalChecks(state, collection), }, -- GitLab