Merge branch 'hin-restore-he-rec' of gitlab.coko.foundation:xpub/xpub-faraday...

Merge branch 'hin-restore-he-rec' of gitlab.coko.foundation:xpub/xpub-faraday into hin-restore-he-rec

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

@@ -236,15 +236,14 @@ export const getInvitationsWithReviewersForFragment = (state, fragmentId) =>
     .value()
 
 export const canMakeHERecommendation = (state, { collection, statuses }) => {
-  const { isAccepted, id: heId } = get(collection, 'handlingEditor', {})
-  const validHe = isAccepted && get(state, 'currentUser.user.id', '') === heId
+  const validHE = isHEToManuscript(state, get(collection, 'id', ''))
   const statusImportance = get(
     statuses,
     `${get(collection, 'status', 'draft')}.importance`,
     1,
   )
 
-  return statusImportance > 1 && statusImportance < 9 && validHe
+  return statusImportance > 1 && statusImportance < 9 && validHE
 }
 
 // #region Editorial and reviewer recommendations

packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js

@@ -47,7 +47,7 @@ const HERecommendation = ({
   highlight,
 }) => (
   <ContextualBox
-    highlight={!!hasReviewerReports}
+    highlight={highlight}
     label="Your Editorial Recommendation"
     mb={2}
   >

packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js

@@ -32,18 +32,18 @@ const ReviewerDetails = ({
   onRevokeReviewerInvite,
   toggle,
   expanded,
+  highlight,
   canViewReviewersDetails,
   ...rest
 }) =>
   canViewReviewersDetails ? (
     <ContextualBox
-      expanded={!!reports.length}
-      highlight={reports.length === 0}
+      expanded={expanded}
+      highlight={highlight}
       label="Reviewer Details & Reports"
       rightChildren={
         <ReviewerBreakdown fitContent fragment={fragment} mr={1} />
       }
-      startExpanded
       toggle={toggle}
       {...rest}
     >

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

@@ -168,10 +168,10 @@ const ManuscriptLayout = ({
             expanded={reviewerDetailsExpanded}
             fragment={fragment}
             getSignedUrl={getSignedUrl}
+            highlight={reviewerReports.length === 0}
             invitations={invitationsWithReviewers}
             journal={journal}
             mb={2}
-            mt={2}
             onInviteReviewer={onInviteReviewer}
             onResendReviewerInvite={onResendReviewerInvite}
             onRevokeReviewerInvite={onRevokeReviewerInvite}
@@ -185,6 +185,7 @@ const ManuscriptLayout = ({
           <HERecommendation
             formValues={get(formValues, 'editorialRecommendation', {})}
             hasReviewerReports={reviewerRecommendations.length > 0}
+            highlight={reviewerRecommendations.length > 0}
             modalKey="heRecommendation"
             onRecommendationSubmit={onEditorialRecommendation}
           />

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

@@ -146,10 +146,7 @@ export default compose(
         isInvitedHE: !isUndefined(pendingHEInvitation),
         isInvitedToReview: !isUndefined(pendingReviewerInvitation),
         isReviewer: currentUserIsReviewer(state, get(fragment, 'id', '')),
-        isHEToManuscript: isHEToManuscript(state, {
-          collectionId: get(collection, 'id', ''),
-          statuses: get(journal, 'statuses', {}),
-        }),
+        isHEToManuscript: isHEToManuscript(state, get(collection, 'id', '')),
         permissions: {
           canMakeHERecommendation: canMakeHERecommendation(state, {
             collection,
@@ -441,6 +438,7 @@ export default compose(
         history,
         location,
         shouldReview,
+        reviewerReports,
         setEditorInChief,
         clearCustomError,
         hasManuscriptFailure,
@@ -478,7 +476,7 @@ export default compose(
         this.props.toggleReviewerRecommendations()
       }
 
-      if (isHEToManuscript) {
+      if (isHEToManuscript && !!reviewerReports.length) {
         this.props.toggleReviewerDetails()
       }
     },