diff --git a/packages/component-mail-service/src/Mail.js b/packages/component-mail-service/src/Mail.js
index 56fd0af8b9e3376e3c51d3f78f4851e52b3fc5de..3289fe934e43e5ee282c5b778e8a3ca2dea4e3b6 100644
--- a/packages/component-mail-service/src/Mail.js
+++ b/packages/component-mail-service/src/Mail.js
@@ -261,11 +261,16 @@ module.exports = {
let subject, textBody
const emailTemplate = 'notification'
+ const detailsUrl = meta.baseUrl
+ ? helpers.createUrl(
+ meta.baseUrl,
+ `/projects/${meta.collection.id}/versions/${
+ meta.fragment.id
+ }/details`,
+ )
+ : ''
const replacements = {
- detailsUrl: helpers.createUrl(
- meta.baseUrl,
- `/projects/${meta.collection.id}/versions/${meta.fragment.id}/details`,
- ),
+ detailsUrl,
beforeAnchor: '',
afterAnchor: '',
hasLink: true,
@@ -380,7 +385,7 @@ module.exports = {
replacements.hasLink = false
replacements.previewText =
'a manuscript has received a recommendation based on reviews'
- replacements.intro = `Dear Dr. ${user.firstName} ${user.lastName}`
+ replacements.intro = `Dear Dr. ${meta.reviewerName}`
replacements.paragraph = `I appreciate any time you may have spent reviewing manuscript "${
meta.fragment.title
@@ -390,12 +395,11 @@ module.exports = {
If you have comments on this manuscript you believe the Editor should see, please email them to Hindawi as soon as possible. <br/>
Thank you for your interest and I hope you will consider reviewing for Hindawi again.`
delete replacements.detailsUrl
- replacements.signatureName = meta.handlingEditorName
+ replacements.signatureName = meta.editorName
textBody = `${replacements.intro} ${replacements.paragraph} ${
replacements.signatureName
}`
break
-
case 'no-response-reviewers-after-recommendation':
subject = meta.emailSubject
replacements.hasLink = false
@@ -464,6 +468,42 @@ module.exports = {
replacements.signatureName
}`
break
+ case 'he-manuscript-rejected':
+ subject = meta.emailSubject
+ replacements.hasLink = false
+ replacements.previewText = 'a manuscript has been rejected'
+ replacements.intro = `Dear Dr. ${meta.handlingEditorName}`
+
+ replacements.paragraph = `Thank you for your recommendation to reject the manuscript titled "${
+ meta.fragment.title
+ }" by ${
+ meta.fragment.authorName
+ } based on the reviews you received.<br/><br/>
+ I can confirm this article has now been rejected.`
+ delete replacements.detailsUrl
+ replacements.signatureName = meta.eicName
+ textBody = `${replacements.intro} ${replacements.paragraph} ${
+ replacements.signatureName
+ }`
+ break
+ case 'submitting-reviewers-after-decision':
+ subject = meta.emailSubject
+ replacements.hasLink = false
+ replacements.previewText = 'a decision has been made on a manuscript'
+ replacements.intro = `Dear Dr. ${meta.reviewerName}`
+
+ replacements.paragraph = `Thank you for your review on the manuscript titled "${
+ meta.fragment.title
+ }" by ${
+ meta.fragment.authorName
+ }. After taking into account the reviews and the recommendation of the Handling Editor, I can confirm this article has now been rejected.<br/><br/>
+ If you have any queries about this decision, then please email them to Hindawi as soon as possible.`
+ delete replacements.detailsUrl
+ replacements.signatureName = meta.editorName
+ textBody = `${replacements.intro} ${replacements.paragraph} ${
+ replacements.signatureName
+ }`
+ break
default:
subject = 'Hindawi Notification!'
break
diff --git a/packages/component-manuscript-manager/src/helpers/Collection.js b/packages/component-manuscript-manager/src/helpers/Collection.js
index ed03809ef15028150ce8f61a89368dcbce4f2429..b5e783c80c7fb320ef269fc863544fafd5604eed 100644
--- a/packages/component-manuscript-manager/src/helpers/Collection.js
+++ b/packages/component-manuscript-manager/src/helpers/Collection.js
@@ -43,7 +43,7 @@ const updateStatus = async (collection, newStatus) => {
const getFragmentAndAuthorData = async ({
UserModel,
fragment,
- collection: { fragments, authors, handlingEditor },
+ collection: { authors, handlingEditor },
}) => {
const heRecommendation = fragment.recommendations.find(
rec => rec.userId === handlingEditor.id,
diff --git a/packages/component-manuscript-manager/src/helpers/User.js b/packages/component-manuscript-manager/src/helpers/User.js
index 573e16978694c36d1348abd4f6a0873904115223..5d51a7ae79b9187e87dcc370a611945a7cb7858f 100644
--- a/packages/component-manuscript-manager/src/helpers/User.js
+++ b/packages/component-manuscript-manager/src/helpers/User.js
@@ -1,7 +1,7 @@
const collectionHelper = require('./Collection')
const get = require('lodash/get')
-const last = require('lodash/last')
const config = require('config')
+const mailService = require('pubsweet-component-mail-service')
const manuscriptTypes = config.get('manuscript-types')
const getEditorInChief = async UserModel => {
@@ -16,7 +16,6 @@ const setupReviewSubmittedEmailData = async ({
fragment: { id, title, submittingAuthor },
collection,
user,
- mailService,
}) => {
const eic = await getEditorInChief(UserModel)
const toEmail = collection.handlingEditor.email
@@ -40,14 +39,12 @@ const setupReviewSubmittedEmailData = async ({
})
}
-const setupAgreedReviewersEmailData = async ({
- baseUrl,
- fragment: { title, authorName },
+const setupReviewersEmail = async ({
+ fragment: { title, authorName, recommendations },
collection,
- mailService,
UserModel,
- FragmentModel,
recommendation,
+ isSubmitted = false,
}) => {
const agreedReviewerInvitations = collectionHelper.getAgreedReviewerInvitation(
collection.invitations,
@@ -56,28 +53,33 @@ const setupAgreedReviewersEmailData = async ({
rec.recommendationType === 'review' &&
rec.submittedOn &&
invUserId === rec.userId
- const userPromises = await agreedReviewerInvitations.map(async inv => {
- const fragmentId = last(collection.fragments)
- const fragment = await FragmentModel.find(fragmentId)
- const submittedReview = fragment.recommendations.find(hasReview(inv.userId))
- if (submittedReview === undefined) return UserModel.find(inv.userId)
+ const reviewerPromises = await agreedReviewerInvitations.map(async inv => {
+ const submittedReview = recommendations.find(hasReview(inv.userId))
+ const shouldReturnUser =
+ (isSubmitted && submittedReview) || (!isSubmitted && !submittedReview)
+ if (shouldReturnUser) return UserModel.find(inv.userId)
})
- let users = await Promise.all(userPromises)
- users = users.filter(Boolean)
- const subject = `${collection.customId}: Manuscript ${getSubject(
- recommendation,
- )}`
- users.forEach(user =>
+ let reviewers = await Promise.all(reviewerPromises)
+ reviewers = reviewers.filter(Boolean)
+ const subject = isSubmitted
+ ? `${collection.customId}: Manuscript Decision`
+ : `${collection.customId}: Manuscript ${getSubject(recommendation)}`
+ const emailType = isSubmitted
+ ? 'submitting-reviewers-after-decision'
+ : 'agreed-reviewers-after-recommendation'
+ const eic = await getEditorInChief(UserModel)
+ const editorName = isSubmitted
+ ? `${eic.firstName} ${eic.lastName}`
+ : collection.handlingEditor.name
+ reviewers.forEach(user =>
mailService.sendNotificationEmail({
toEmail: user.email,
- user,
- emailType: 'agreed-reviewers-after-recommendation',
+ emailType,
meta: {
- collection: { customId: collection.customId },
fragment: { title, authorName },
- handlingEditorName: collection.handlingEditor.name,
- baseUrl,
+ editorName,
emailSubject: subject,
+ reviewerName: `${user.firstName} ${user.lastName}`,
},
}),
)
@@ -87,7 +89,6 @@ const setupNoResponseReviewersEmailData = async ({
baseUrl,
fragment: { title, authorName, type },
collection,
- mailService,
UserModel,
}) => {
const invitations = collection.invitations.filter(
@@ -122,7 +123,6 @@ const setupEiCRecommendationEmailData = async ({
UserModel,
fragment: { id, title, authorName },
collection,
- mailService,
recommendation,
comments,
}) => {
@@ -172,7 +172,6 @@ const setupAuthorsEmailData = async ({
UserModel,
fragment: { id, title, submittingAuthor },
collection,
- mailService,
comments,
requestToRevision = false,
}) => {
@@ -217,6 +216,29 @@ const setupAuthorsEmailData = async ({
})
}
+const setupManuscriptRejectedEmailForHe = async ({
+ UserModel,
+ fragment: { title, submittingAuthor },
+ collection: { customId, handlingEditor },
+}) => {
+ const eic = await getEditorInChief(UserModel)
+ const toEmail = handlingEditor.email
+ await mailService.sendNotificationEmail({
+ toEmail,
+ emailType: 'he-manuscript-rejected',
+ meta: {
+ emailSubject: `${customId}: Manuscript Decision`,
+ fragment: {
+ title,
+ authorName: `${submittingAuthor.firstName} ${
+ submittingAuthor.lastName
+ }`,
+ },
+ handlingEditorName: handlingEditor.name,
+ eicName: `${eic.firstName} ${eic.lastName}`,
+ },
+ })
+}
const getSubject = recommendation =>
['minor', 'major'].includes(recommendation)
? 'Revision Requested'
@@ -233,8 +255,9 @@ const getHeRecommendation = recommendation => {
module.exports = {
getEditorInChief,
setupReviewSubmittedEmailData,
- setupAgreedReviewersEmailData,
+ setupReviewersEmail,
setupEiCRecommendationEmailData,
setupAuthorsEmailData,
setupNoResponseReviewersEmailData,
+ setupManuscriptRejectedEmailForHe,
}
diff --git a/packages/component-manuscript-manager/src/routes/fragmentsRecommendations/patch.js b/packages/component-manuscript-manager/src/routes/fragmentsRecommendations/patch.js
index 0fc06e4a4e88299b34d4fbbb0e0a5a023a507473..97ee0a9f2362a6ca6665257f9cd4419ea73e172c 100644
--- a/packages/component-manuscript-manager/src/routes/fragmentsRecommendations/patch.js
+++ b/packages/component-manuscript-manager/src/routes/fragmentsRecommendations/patch.js
@@ -2,7 +2,6 @@ const helpers = require('../../helpers/helpers')
const authsomeHelper = require('../../helpers/authsome')
const collectionHelper = require('../../helpers/Collection')
const userHelper = require('../../helpers/User')
-const mailService = require('pubsweet-component-mail-service')
module.exports = models => async (req, res) => {
const { collectionId, fragmentId, recommendationId } = req.params
@@ -51,7 +50,6 @@ module.exports = models => async (req, res) => {
fragment: { id: fragment.id, title, submittingAuthor },
collection,
user,
- mailService,
})
if (!['pendingApproval', 'revisionRequested'].includes(collection.status))
await collectionHelper.updateStatus(collection, 'reviewCompleted')
diff --git a/packages/component-manuscript-manager/src/routes/fragmentsRecommendations/post.js b/packages/component-manuscript-manager/src/routes/fragmentsRecommendations/post.js
index 6f568ec151e24cf315f5b7a4bafe194b2a59ca52..f3653eb33751c37e86fc16b235e4f9a4df0bdb08 100644
--- a/packages/component-manuscript-manager/src/routes/fragmentsRecommendations/post.js
+++ b/packages/component-manuscript-manager/src/routes/fragmentsRecommendations/post.js
@@ -3,7 +3,6 @@ const uuid = require('uuid')
const authsomeHelper = require('../../helpers/authsome')
const collectionHelper = require('../../helpers/Collection')
const userHelper = require('../../helpers/User')
-const mailService = require('pubsweet-component-mail-service')
const get = require('lodash/get')
module.exports = models => async (req, res) => {
@@ -51,18 +50,22 @@ module.exports = models => async (req, res) => {
newRecommendation.recommendation = recommendation || undefined
newRecommendation.comments = comments || undefined
+ const UserModel = models.User
+
const {
title,
submittingAuthor,
type,
heRecommendation,
} = await collectionHelper.getFragmentAndAuthorData({
- UserModel: models.User,
+ UserModel,
fragment,
collection,
})
const baseUrl = helpers.getBaseUrl(req)
-
+ const authorName = `${submittingAuthor.firstName} ${
+ submittingAuthor.lastName
+ }`
if (reqUser.editorInChief || reqUser.admin) {
if (recommendation === 'return-to-handling-editor')
await collectionHelper.updateStatus(collection, 'reviewCompleted')
@@ -71,45 +74,60 @@ module.exports = models => async (req, res) => {
collection,
recommendation,
)
- if (recommendation !== 'publish')
+ if (recommendation === 'reject') {
await userHelper.setupAuthorsEmailData({
baseUrl,
- UserModel: models.User,
+ UserModel,
collection,
- mailService,
fragment: { title, submittingAuthor },
comments: get(heRecommendation, 'comments'),
requestToRevision: false,
})
+ await userHelper.setupManuscriptRejectedEmailForHe({
+ UserModel,
+ fragment: { title, submittingAuthor },
+ collection: {
+ customId: collection.customId,
+ handlingEditor: collection.handlingEditor,
+ },
+ })
+ await userHelper.setupReviewersEmail({
+ UserModel,
+ collection,
+ fragment: {
+ title,
+ authorName,
+ recommendations: fragment.recommendations,
+ },
+ recommendation,
+ isSubmitted: true,
+ })
+ }
} else if (recommendationType === 'editorRecommendation') {
await collectionHelper.updateStatusByRecommendation(
collection,
recommendation,
)
- const authorName = `${submittingAuthor.firstName} ${
- submittingAuthor.lastName
- }`
- await userHelper.setupAgreedReviewersEmailData({
- baseUrl,
- UserModel: models.User,
- FragmentModel: models.Fragment,
+ await userHelper.setupReviewersEmail({
+ UserModel,
collection,
- mailService,
- fragment: { title, authorName },
+ fragment: {
+ title,
+ authorName,
+ recommendations: fragment.recommendations,
+ },
recommendation,
})
await userHelper.setupNoResponseReviewersEmailData({
baseUrl,
- UserModel: models.User,
+ UserModel,
collection,
- mailService,
fragment: { title, authorName, type },
})
await userHelper.setupEiCRecommendationEmailData({
baseUrl,
- UserModel: models.User,
+ UserModel,
collection,
- mailService,
recommendation,
fragment: { title, id: fragment.id, authorName },
comments: newRecommendation.comments,
@@ -117,9 +135,8 @@ module.exports = models => async (req, res) => {
if (['minor', 'major'].includes(recommendation))
await userHelper.setupAuthorsEmailData({
baseUrl,
- UserModel: models.User,
+ UserModel,
collection,
- mailService,
fragment: { title, id: fragment.id, submittingAuthor },
comments: newRecommendation.comments,
requestToRevision: true,
diff --git a/packages/component-user-manager/src/helpers/Collection.js b/packages/component-user-manager/src/helpers/Collection.js
index 44f6724a45c07e7d0f7141fd7282c8eb42682bd5..c2079945210b19e05c5db988777b7e29d22c70b5 100644
--- a/packages/component-user-manager/src/helpers/Collection.js
+++ b/packages/component-user-manager/src/helpers/Collection.js
@@ -27,7 +27,7 @@ module.exports = {
return res.status(200).json(user)
}
try {
- await mailService.sendSimpleEmail({
+ mailService.sendSimpleEmail({
toEmail: user.email,
user,
emailType: 'add-author',
diff --git a/packages/component-user-manager/src/helpers/User.js b/packages/component-user-manager/src/helpers/User.js
index aa2cfb6aa5221e229b9170b65edc75d9f807fa36..41077ba17fb36fd8cf22f62998901bccd630ec58 100644
--- a/packages/component-user-manager/src/helpers/User.js
+++ b/packages/component-user-manager/src/helpers/User.js
@@ -24,7 +24,7 @@ module.exports = {
)
try {
- await mailService.sendSimpleEmail({
+ mailService.sendSimpleEmail({
toEmail: newUser.email,
user: newUser,
emailType: invitationType,
diff --git a/packages/components-faraday/src/components/Dashboard/DashboardCard.js b/packages/components-faraday/src/components/Dashboard/DashboardCard.js
index a3d0cd20d2644651a6b315085ba12117ee8c24c0..82f9a8698c43046994924dcc4e59c40b0a313043 100644
--- a/packages/components-faraday/src/components/Dashboard/DashboardCard.js
+++ b/packages/components-faraday/src/components/Dashboard/DashboardCard.js
@@ -59,45 +59,45 @@ const DashboardCard = ({
title={title}
dangerouslySetInnerHTML={{ __html: title }} // eslint-disable-line
/>
- </LeftDetails>
- <RightDetails flex={2}>
- {canMakeDecision && (
- <Decision
- collectionId={project.id}
- fragmentId={version.id}
- modalKey={`decide-${version.id}`}
- />
- )}
- {canMakeRecommendation && (
- <Recommendation
+ <RightDetails flex="none">
+ {canMakeDecision && (
+ <Decision
+ collectionId={project.id}
+ fragmentId={version.id}
+ modalKey={`decide-${version.id}`}
+ />
+ )}
+ {canMakeRecommendation && (
+ <Recommendation
+ collectionId={project.id}
+ fragmentId={version.id}
+ modalKey={`recommend-${version.id}`}
+ />
+ )}
+ <ZipFiles
+ archiveName={`ID-${project.customId}`}
collectionId={project.id}
+ disabled={!hasFiles}
fragmentId={version.id}
- modalKey={`recommend-${version.id}`}
- />
- )}
- <ZipFiles
- archiveName={`ID-${project.customId}`}
- collectionId={project.id}
- disabled={!hasFiles}
- fragmentId={version.id}
- >
- <ClickableIcon disabled={!hasFiles}>
- <Icon>download</Icon>
- </ClickableIcon>
- </ZipFiles>
- {!project.status && (
- <ActionButtons
- data-test="button-resume-submission"
- onClick={() =>
- history.push(
- `/projects/${project.id}/versions/${version.id}/submit`,
- )
- }
>
- RESUME SUBMISSION
- </ActionButtons>
- )}
- </RightDetails>
+ <ClickableIcon disabled={!hasFiles}>
+ <Icon>download</Icon>
+ </ClickableIcon>
+ </ZipFiles>
+ {!project.status && (
+ <ActionButtons
+ data-test="button-resume-submission"
+ onClick={() =>
+ history.push(
+ `/projects/${project.id}/versions/${version.id}/submit`,
+ )
+ }
+ >
+ RESUME SUBMISSION
+ </ActionButtons>
+ )}
+ </RightDetails>
+ </LeftDetails>
</Top>
<Bottom>
<LeftDetails flex={3}>
@@ -215,6 +215,7 @@ const ActionButtons = styled(Button)`
height: calc(${th('subGridUnit')} * 5);
padding: calc(${th('subGridUnit')} / 2) ${th('subGridUnit')};
text-align: center;
+ white-space: nowrap;
`
const LeftDetails = styled.div`
@@ -224,6 +225,7 @@ const LeftDetails = styled.div`
justify-content: flex-start;
flex: ${({ flex }) => flex || 1};
flex-wrap: wrap;
+ max-width: 100%;
`
const RightDetails = styled.div`
@@ -335,6 +337,7 @@ const Title = styled.div`
white-space: nowrap;
overflow: hidden;
flex: 10;
+ padding-right: ${th('subGridUnit')};
`
const Status = styled.div`
diff --git a/packages/components-faraday/src/components/MakeDecision/Decision.js b/packages/components-faraday/src/components/MakeDecision/Decision.js
index a3a3b3b57f7b96f5cd33ab59990cd148fff55152..cf4279e1615dc66ec08c8deb6cd8fab98ca16207 100644
--- a/packages/components-faraday/src/components/MakeDecision/Decision.js
+++ b/packages/components-faraday/src/components/MakeDecision/Decision.js
@@ -58,5 +58,6 @@ const Root = styled.div`
justify-content: center;
padding: 0 calc(${th('subGridUnit')} * 2);
text-transform: uppercase;
+ white-space: nowrap;
`
// #endregion
diff --git a/packages/components-faraday/src/components/MakeRecommendation/Recommendation.js b/packages/components-faraday/src/components/MakeRecommendation/Recommendation.js
index 22fd9321be9b047bfef9283f7a11f13e2510f5c8..10d7fc6d98a6a1f1ce932aa5b6622015eee59530 100644
--- a/packages/components-faraday/src/components/MakeRecommendation/Recommendation.js
+++ b/packages/components-faraday/src/components/MakeRecommendation/Recommendation.js
@@ -59,5 +59,6 @@ const Root = styled.div`
min-width: 200px;
padding: 0 calc(${th('subGridUnit')} * 2);
text-transform: uppercase;
+ white-space: nowrap;
`
// #endregion