Merge branch 'HIN-1102' into 'develop'

Hin 1102

See merge request !140

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

@@ -42,10 +42,10 @@ export const canInviteReviewers = (state, collection = {}) => {
     return false
 
   const { id: userId } = selectCurrentUser(state)
-  const isAdmin = currentUserIs(state, 'isAdmin')
+  const isAdminEiC = currentUserIs(state, 'adminEiC')
   const { isAccepted, id: heId } = get(collection, 'handlingEditor', {})
 
-  return isAccepted && (userId === heId || isAdmin)
+  return isAccepted && (userId === heId || isAdminEiC)
 }
 
 const cannotViewReviewersDetails = [
@@ -71,6 +71,7 @@ const authorCanViewReportsDetailsStatuses = [
   'pendingApproval',
   'rejected',
   'accepted',
+  'reviewCompleted',
   'inQa',
 ]
 
@@ -198,7 +199,12 @@ export const getHERecommendation = (state, collectionId, fragmentId) => {
   )
 }
 
-const canMakeDecisionStatuses = ['submitted', 'pendingApproval']
+const canMakeDecisionStatuses = [
+  'submitted',
+  'pendingApproval',
+  'underReview',
+  'reviewCompleted',
+]
 export const canMakeDecision = (state, collection = {}) => {
   const status = get(collection, 'status', 'draft')
 

packages/component-faraday-ui/src/manuscriptDetails/ManuscriptEicDecision.js

@@ -63,7 +63,7 @@ const ManuscriptEicDecision = ({
               <Menu
                 {...input}
                 options={
-                  get(collection, 'status', 'submitted') === 'submitted'
+                  get(collection, 'status', 'submitted') !== 'pendingApproval'
                     ? [last(eicDecisions)]
                     : eicDecisions
                 }

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

@@ -146,19 +146,20 @@ const ManuscriptLayout = ({
           />
         )}
 
-        {get(currentUser, 'permissions.canReview', false) && (
-          <ReviewerReportForm
-            changeForm={changeForm}
-            expanded={reviewerRecommendationExpanded}
-            formValues={get(formValues, 'reviewerReport', {})}
-            modalKey="reviewer-report"
-            project={collection}
-            review={pendingOwnRecommendation}
-            toggle={toggleReviewerRecommendations}
-            token={get(currentUser, 'token')}
-            version={fragment}
-          />
-        )}
+        {isLatestVersion &&
+          get(currentUser, 'permissions.canReview', false) && (
+            <ReviewerReportForm
+              changeForm={changeForm}
+              expanded={reviewerRecommendationExpanded}
+              formValues={get(formValues, 'reviewerReport', {})}
+              modalKey="reviewer-report"
+              project={collection}
+              review={pendingOwnRecommendation}
+              toggle={toggleReviewerRecommendations}
+              token={get(currentUser, 'token')}
+              version={fragment}
+            />
+          )}
 
         {get(currentUser, 'isInvitedHE', false) && (
           <ResponseToInvitation
@@ -200,6 +201,7 @@ const ManuscriptLayout = ({
             getSignedUrl={getSignedUrl}
             highlight={
               reviewerReports.length === 0 &&
+              currentUser.handlingEditor &&
               !cannotViewReviewersDetails.includes(
                 get(collection, 'status', 'draft'),
               )

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

@@ -377,7 +377,10 @@ export default compose(
         this.props.toggleEditorialComments()
       }
 
-      if (get(fragment, 'responseToReviewers.content', false)) {
+      if (
+        get(fragment, 'responseToReviewers.content', false) &&
+        !editorialRecommendations.length
+      ) {
         this.props.toggleResponseToRevisionRequest()
       }
     },