Merge branch 'develop' of https://gitlab.coko.foundation/xpub/xpub-faraday into develop

packages/component-manuscript-manager/src/routes/fragmentsRecommendations/patch.js

@@ -45,7 +45,8 @@ module.exports = models => async (req, res) => {
         user,
         mailService,
       })
-      await collectionHelper.updateStatus(collection, 'reviewCompleted')
+      if (collection.status !== 'pendingApproval')
+        await collectionHelper.updateStatus(collection, 'reviewCompleted')
     }
     await fragment.save()
     return res.status(200).json(recommendation)

packages/component-manuscript-manager/src/routes/fragmentsRecommendations/post.js

@@ -50,7 +50,10 @@ module.exports = models => async (req, res) => {
 
   newRecommendation.recommendation = recommendation || undefined
   newRecommendation.comments = comments || undefined
-  if (recommendation === 'reject')
+  if (
+    ['reject', 'publish'].includes(recommendation) &&
+    recommendationType === 'editorRecommendation'
+  )
     await collectionHelper.updateStatus(collection, 'pendingApproval')
 
   fragment.recommendations.push(newRecommendation)