Merge branch 'dev' into 'master'

Dev

See merge request !415

server/scheduled-alerts/taggingAlert.js

@@ -145,8 +145,9 @@ ${listP
 }
 
 async function sendTaggingDelayAlert(list) {
-  const message = `Manuscripts awaiting tagging for more than 3 days: 
-  ${list.map(m => m.id).join('\n')}`
+  const message = `Manuscripts awaiting tagging for more than 3 days:\n\n${list
+    .map(m => m.id)
+    .join('\n')}`
   const subject = 'Tagging delay alert'
   await userMessage(ftpTagger.email, subject, message, null, null, system)
   return true

server/xpub-model/entities/manuscript/data-access.js

@@ -536,7 +536,6 @@ class Manuscript extends EpmcBaseModel {
           q.whereIn('id', manuscriptIds)
         }
       })
-      .whereNull('manuscript.deleted')
       .eager('[journal, notes, organization]')
       .modifyEager('notes', builder => {
         builder.whereNull('deleted')

server/xpub-model/entities/manuscript/index.js

@@ -429,7 +429,7 @@ const Manuscript = {
       )
       manuscript = manuscripts.pop()
     }
-    if (!ftp) {
+    if (manuscript && !ftp) {
       try {
         await authorization.can(userId, 'read', {
           id: manuscript.id,
@@ -493,11 +493,10 @@ const Manuscript = {
 
     const total = res.total || res.total === 0 ? res.total : res.length
     const manuscripts = res.results ? res.results : res
-    const rtn = {
+    return {
       total,
       manuscripts: manuscripts.map(manuscript => gManuscript(manuscript)),
     }
-    return rtn
   },
 
   findDeletionReady: async () => {