From 2113190c83bcf8d03d417bdab12fe09682a2648b Mon Sep 17 00:00:00 2001
From: Sebastian Mihalache <sebastian.mihalache@gmail.con>
Date: Tue, 17 Jul 2018 11:55:23 +0300
Subject: [PATCH] feat(deactivate-user): fixes
---
packages/component-helper-service/src/services/Email.js | 2 +-
.../component-invite/src/routes/fragmentsInvitations/get.js | 2 --
.../src/tests/fragmentsInvitations/get.test.js | 2 +-
.../src/components/Reviewers/ReviewersSelect.js | 4 +++-
packages/xpub-faraday/config/default.js | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/packages/component-helper-service/src/services/Email.js b/packages/component-helper-service/src/services/Email.js
index e201739d7..b3c246c49 100644
--- a/packages/component-helper-service/src/services/Email.js
+++ b/packages/component-helper-service/src/services/Email.js
@@ -171,7 +171,7 @@ class Email {
} else {
const fragment = await FragmentModel.find(id)
const userHelper = new User({ UserModel })
- const activeAuthors = userHelper.getActiveAuthors(fragment.authors)
+ const activeAuthors = await userHelper.getActiveAuthors(fragment.authors)
toAuthors = activeAuthors.map(author => ({
email: author.email,
diff --git a/packages/component-invite/src/routes/fragmentsInvitations/get.js b/packages/component-invite/src/routes/fragmentsInvitations/get.js
index deefedc85..31b4c6f7a 100644
--- a/packages/component-invite/src/routes/fragmentsInvitations/get.js
+++ b/packages/component-invite/src/routes/fragmentsInvitations/get.js
@@ -55,13 +55,11 @@ module.exports = models => async (req, res) => {
if (!members) return res.status(200).json([])
- // TO DO: handle case for when the invitationID is provided
const invitationHelper = new Invitation({ role })
const membersData = members.map(async member => {
const user = await models.User.find(member)
- if (!user.isActive) return null
invitationHelper.userId = user.id
const {
invitedOn,
diff --git a/packages/component-invite/src/tests/fragmentsInvitations/get.test.js b/packages/component-invite/src/tests/fragmentsInvitations/get.test.js
index 8a4045601..b6d6ac082 100644
--- a/packages/component-invite/src/tests/fragmentsInvitations/get.test.js
+++ b/packages/component-invite/src/tests/fragmentsInvitations/get.test.js
@@ -45,7 +45,7 @@ describe('Get fragment invitations route handler', () => {
expect(res.statusCode).toBe(200)
const data = JSON.parse(res._getData())
- expect(data).toHaveLength(1)
+ expect(data).toHaveLength(2)
})
it('should return an error when parameters are missing', async () => {
const { handlingEditor } = testFixtures.users
diff --git a/packages/components-faraday/src/components/Reviewers/ReviewersSelect.js b/packages/components-faraday/src/components/Reviewers/ReviewersSelect.js
index f30d64c2a..9c343cc69 100644
--- a/packages/components-faraday/src/components/Reviewers/ReviewersSelect.js
+++ b/packages/components-faraday/src/components/Reviewers/ReviewersSelect.js
@@ -33,7 +33,9 @@ const ReviewersSelect = ({
label = 'Email*',
}) => {
const active = !!get(formMeta, 'email.active')
- const filteredValues = values.filter(v => v.email.includes(reviewerEmail))
+ const filteredValues = values
+ .filter(v => v.isActive)
+ .filter(v => v.email.includes(reviewerEmail))
return (
<Root>
<FormLabel>{label}</FormLabel>
diff --git a/packages/xpub-faraday/config/default.js b/packages/xpub-faraday/config/default.js
index 522a8f83e..37367502a 100644
--- a/packages/xpub-faraday/config/default.js
+++ b/packages/xpub-faraday/config/default.js
@@ -46,7 +46,7 @@ module.exports = {
API_ENDPOINT: '/api',
baseUrl: process.env.CLIENT_BASE_URL || 'http://localhost:3000',
'login-redirect': '/',
- 'redux-log': false,
+ 'redux-log': true,
theme: process.env.PUBSWEET_THEME,
},
orcid: {
--
GitLab