From 4a853f4d76812c663db39646ce6cefc850ed98fa Mon Sep 17 00:00:00 2001
From: Bogdan Cochior <bogdan.cochior@thinslices.com>
Date: Mon, 7 May 2018 16:13:39 +0300
Subject: [PATCH] refactor(details): refactor showing Make decision button
---
.../src/components/ManuscriptLayout.js | 2 +-
.../src/components/ManuscriptPage.js | 2 ++
.../src/components/SideBarActions.js | 25 ++++++++-----------
3 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/packages/component-manuscript/src/components/ManuscriptLayout.js b/packages/component-manuscript/src/components/ManuscriptLayout.js
index a1cfcec16..811a048eb 100644
--- a/packages/component-manuscript/src/components/ManuscriptLayout.js
+++ b/packages/component-manuscript/src/components/ManuscriptLayout.js
@@ -60,7 +60,7 @@ const ManuscriptLayout = ({
</Container>
<SideBar flex={1}>
<SideBarActions
- currentUser={currentUser}
+ currentUserIs={currentUserIs}
project={project}
version={version}
/>
diff --git a/packages/component-manuscript/src/components/ManuscriptPage.js b/packages/component-manuscript/src/components/ManuscriptPage.js
index bef5a0809..7b130779b 100644
--- a/packages/component-manuscript/src/components/ManuscriptPage.js
+++ b/packages/component-manuscript/src/components/ManuscriptPage.js
@@ -96,6 +96,8 @@ export default compose(
switch (type) {
case 'staff':
return isAdmin || isEic || isHe
+ case 'adminEiC':
+ return isAdmin || isEic
default:
return false
}
diff --git a/packages/component-manuscript/src/components/SideBarActions.js b/packages/component-manuscript/src/components/SideBarActions.js
index f46181358..129ab2176 100644
--- a/packages/component-manuscript/src/components/SideBarActions.js
+++ b/packages/component-manuscript/src/components/SideBarActions.js
@@ -1,25 +1,20 @@
import React from 'react'
import { th, Icon } from '@pubsweet/ui'
import styled from 'styled-components'
-import { get } from 'lodash'
import ZipFiles from 'pubsweet-components-faraday/src/components/Dashboard/ZipFiles'
import { MakeDecision } from './'
-const SideBarActions = ({ project, version, currentUser }) => {
- const isAdmin = get(currentUser, 'admin')
- const isEic = get(currentUser, 'editorInChief')
- return (
- <Root>
- {isEic || isAdmin ? <MakeDecision /> : <div />}
- <ZipFiles archiveName={`ID-${project.customId}`} fragmentId={version.id}>
- <ClickableIcon>
- <Icon>download</Icon>
- </ClickableIcon>
- </ZipFiles>
- </Root>
- )
-}
+const SideBarActions = ({ project, version, currentUserIs }) => (
+ <Root>
+ {currentUserIs('adminEiC') ? <MakeDecision /> : <div />}
+ <ZipFiles archiveName={`ID-${project.customId}`} fragmentId={version.id}>
+ <ClickableIcon>
+ <Icon>download</Icon>
+ </ClickableIcon>
+ </ZipFiles>
+ </Root>
+)
export default SideBarActions
--
GitLab