From 490b2cecdd158fabf1feffa64eaaf79070ee7b4b Mon Sep 17 00:00:00 2001
From: Bogdan Cochior <bogdan.cochior@thinslices.com>
Date: Tue, 27 Mar 2018 11:26:53 +0300
Subject: [PATCH] -mfix(admin):add handling editor management
---
.../src/components/Admin/AdminUsers.js | 5 +++--
.../src/components/Admin/EditUserForm.js | 11 +++++++++++
.../components-faraday/src/components/Admin/utils.js | 1 +
.../src/components/Dashboard/DashboardCard.js | 4 ++--
.../src/components/Dashboard/utils.js | 2 +-
5 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/packages/components-faraday/src/components/Admin/AdminUsers.js b/packages/components-faraday/src/components/Admin/AdminUsers.js
index 4185c022c..f81860a85 100644
--- a/packages/components-faraday/src/components/Admin/AdminUsers.js
+++ b/packages/components-faraday/src/components/Admin/AdminUsers.js
@@ -24,6 +24,7 @@ const TableRow = ({
affiliation,
isConfirmed,
editorInChief,
+ handlingEditor,
admin,
roleOptions,
}) => (
@@ -36,8 +37,8 @@ const TableRow = ({
<td>{affiliation}</td>
<td>
<Role>{`Author${isEqual(editorInChief, true) ? ', Editor in Chief' : ''}${
- isEqual(admin, true) ? ', Admin' : ''
- }`}</Role>
+ isEqual(handlingEditor, true) ? ', Handling Editor' : ''
+ }${isEqual(admin, true) ? ', Admin' : ''}`}</Role>
</td>
<td>
<Tag>{isConfirmed ? 'Confirmed' : 'Invited'}</Tag>
diff --git a/packages/components-faraday/src/components/Admin/EditUserForm.js b/packages/components-faraday/src/components/Admin/EditUserForm.js
index ecbef0d9a..afbe740a1 100644
--- a/packages/components-faraday/src/components/Admin/EditUserForm.js
+++ b/packages/components-faraday/src/components/Admin/EditUserForm.js
@@ -69,6 +69,17 @@ const EditUserForm = ({ roles, journal, user, error }) => (
)}
name="editorInChief"
/>
+ <ValidatedField
+ component={input => (
+ <Checkbox
+ checked={input.value}
+ type="checkbox"
+ {...input}
+ label="Handling Editor"
+ />
+ )}
+ name="handlingEditor"
+ />
<ValidatedField
component={input => (
<Checkbox
diff --git a/packages/components-faraday/src/components/Admin/utils.js b/packages/components-faraday/src/components/Admin/utils.js
index 18d686787..eb9b5cec9 100644
--- a/packages/components-faraday/src/components/Admin/utils.js
+++ b/packages/components-faraday/src/components/Admin/utils.js
@@ -24,6 +24,7 @@ export const parseUpdateUser = values => {
'roles',
'rev',
'editorInChief',
+ 'handlingEditor',
]
return pick(values, valuesToSave)
diff --git a/packages/components-faraday/src/components/Dashboard/DashboardCard.js b/packages/components-faraday/src/components/Dashboard/DashboardCard.js
index c3efeff71..5a0087a40 100644
--- a/packages/components-faraday/src/components/Dashboard/DashboardCard.js
+++ b/packages/components-faraday/src/components/Dashboard/DashboardCard.js
@@ -70,11 +70,11 @@ const DashboardCard = ({
</RightDetails>
</Top>
<Bottom>
- <LeftDetails flex="2">
+ <LeftDetails flex="3">
<Status>{mapStatusToLabel(status)}</Status>
<DateField>{submitted || ''}</DateField>
</LeftDetails>
- <RightDetails flex="5">
+ <RightDetails flex="4">
<ManuscriptType title={manuscriptMeta}>
{manuscriptMeta}
</ManuscriptType>
diff --git a/packages/components-faraday/src/components/Dashboard/utils.js b/packages/components-faraday/src/components/Dashboard/utils.js
index 3f8c72b5a..c3604010a 100644
--- a/packages/components-faraday/src/components/Dashboard/utils.js
+++ b/packages/components-faraday/src/components/Dashboard/utils.js
@@ -78,7 +78,7 @@ export const parseJournalIssue = (journal, metadata) =>
export const mapStatusToLabel = status => {
switch (status) {
case 'he-invited':
- return 'HE Invited'
+ return 'Handling Editor Invited'
default:
return 'Submitted'
}
--
GitLab