diff --git a/packages/component-helper-service/src/services/Email.js b/packages/component-helper-service/src/services/Email.js index e201739d7c36de4f50dd5f12903efb2679338ed1..b3c246c49b0f2a2776d2cbec1851fcf2d68f8447 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 deefedc85a031a62f0f77795924d60b1f8e17a0d..31b4c6f7af5c6676f897b2191a9cc80f892fbedc 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 8a404560117c36f037fcce6869998389f632da00..b6d6ac08293b0bd359f8ddb08c11ae0a91dcdd03 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 f30d64c2af5aa9e0535bce02058a761adf460671..9c343cc697b273e1432c2c5f36a35b7308dcbf69 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 522a8f83e554e5fd3085232ad640418d3bcba56b..37367502a5d21c4d8aeb99f715a44c9e8ec16614 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: {