Merge branch 'HIN-946-fixes' into 'develop'

Hin 946 fixes

See merge request !101

packages/component-faraday-selectors/src/index.js

@@ -55,7 +55,11 @@ const cannotViewReviewersDetails = [
 ]
 
 export const canViewReviewersDetails = (state, collection = {}) => {
-  if (cannotViewReviewersDetails.includes(get(collection, 'status', 'draft'))) {
+  const isHeAssigned = !!get(collection, 'handlingEditor', false)
+  if (
+    cannotViewReviewersDetails.includes(get(collection, 'status', 'draft')) ||
+    !isHeAssigned
+  ) {
     return false
   }
   return canViewReports(state, collection.id)
@@ -102,6 +106,7 @@ const canEICViewEditorialCommentsStatuses = [
   'accepted',
   'inQA',
   'pendingApproval',
+  'reviewCompleted',
 ]
 export const canEICViewEditorialComments = (state, collection = {}) => {
   const isEIC = currentUserIs(state, 'adminEiC')

packages/component-faraday-ui/src/EditorialReportCard.js

@@ -90,6 +90,7 @@ export default compose(
       get(
         recommendations.find(r => r.value === report.recommendation),
         'label',
+        'Return to HE',
       ),
   }),
   withProps(

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

@@ -12,7 +12,7 @@ const {
 
 const { features = {}, recommendations } = config
 
-const sendMTSPackage = async (collection, fragment) => {
+const sendMTSPackage = async (collection, fragment, isEQA = false) => {
   const s3Config = get(config, 'pubsweet-component-aws-s3', {})
   const mtsConfig = get(config, 'mts-service', {})
   const MTSService = require('pubsweet-component-mts-package')
@@ -27,7 +27,7 @@ const sendMTSPackage = async (collection, fragment) => {
     },
   }
 
-  await MTS.sendPackage({ fragment: packageFragment })
+  await MTS.sendPackage({ fragment: packageFragment, isEQA })
 }
 
 const notifications = require('./notifications/notifications')
@@ -112,7 +112,7 @@ module.exports = models => async (req, res) => {
     // the manuscript has not yet passed through the EQA process so we need to upload it to the FTP server
     if (isEditorInChief && recommendation === 'publish' && !hasEQA) {
       if (features.mts) {
-        await sendMTSPackage(collection, fragment)
+        await sendMTSPackage(collection, fragment, true)
       }
 
       collection.status = 'inQA'

packages/component-manuscript/src/components/ManuscriptLayout.js

@@ -23,6 +23,8 @@ const messagesLabel = {
   reject: 'Comments for Author',
 }
 
+const cannotViewReviewersDetails = ['revisionRequested', 'pendingApproval']
+
 const ManuscriptLayout = ({
   history,
   assignHE,
@@ -169,7 +171,9 @@ const ManuscriptLayout = ({
             getSignedUrl={getSignedUrl}
             highlight={
               reviewerReports.length === 0 &&
-              get(collection, 'status', 'draft') !== 'pendingApproval'
+              !cannotViewReviewersDetails.includes(
+                get(collection, 'status', 'draft'),
+              )
             }
             invitations={invitationsWithReviewers}
             isFetching={isFetching.publonsFetching}