feat(reviewerDetails): change highlight and expanded due to different statusses

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

@@ -5,7 +5,7 @@ export const isHEToManuscript = (state, collectionId) => {
   const { id = '', isAccepted = false } = chain(state)
     .get('collections', [])
     .find(c => c.id === collectionId)
-    .get('handlingEditor.id', '')
+    .get('handlingEditor', '')
     .value()
   return isAccepted && id === get(state, 'currentUser.user.id')
 }

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

@@ -15,7 +15,7 @@ const EditorialReportCard = ({
   recommendation,
   reviewerName,
   reviewerRole,
-  report: { submittedOn, reviewer },
+  report: { createdOn, reviewer },
 }) => (
   <Root>
     <Row justify="space-between" mb={2}>
@@ -31,7 +31,7 @@ const EditorialReportCard = ({
             <Tag mr={2}>{reviewerRole}</Tag>
           </Fragment>
         )}
-        <DateParser timestamp={submittedOn}>
+        <DateParser timestamp={createdOn}>
           {date => <Text>{date}</Text>}
         </DateParser>
       </Item>

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

@@ -40,8 +40,17 @@ const parseFormValues = ({ recommendation, ...rest }) => {
   }
 }
 
-const HERecommendation = ({ formValues, handleSubmit, hasReviewerReports }) => (
-  <ContextualBox highlight label="Your Editorial Recommendation" mb={2}>
+const HERecommendation = ({
+  formValues,
+  handleSubmit,
+  hasReviewerReports,
+  highlight,
+}) => (
+  <ContextualBox
+    highlight={!!hasReviewerReports}
+    label="Your Editorial Recommendation"
+    mb={2}
+  >
     <Root>
       <Row justify="flex-start">
         <ItemOverrideAlert flex={0} vertical>

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

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

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

@@ -162,29 +162,6 @@ const ManuscriptLayout = ({
           toggle={toggleAssignHE}
         />
 
-        {get(currentUser, 'permissions.canMakeDecision', false) && (
-          <ManuscriptEicDecision
-            formValues={get(formValues, 'eicDecision')}
-            messagesLabel={messagesLabel}
-            mt={2}
-            options={
-              get(collection, 'status', 'submitted') === 'submitted'
-                ? [last(eicDecisions)]
-                : eicDecisions
-            }
-            submitDecision={createRecommendation}
-          />
-        )}
-
-        {get(currentUser, 'permissions.canMakeHERecommendation', false) && (
-          <HERecommendation
-            formValues={get(formValues, 'editorialRecommendation', {})}
-            hasReviewerReports={reviewerRecommendations.length > 0}
-            modalKey="heRecommendation"
-            onRecommendationSubmit={onEditorialRecommendation}
-          />
-        )}
-
         {get(currentUser, 'permissions.canViewReviewersDetails', false) && (
           <ReviewerDetails
             currentUser={currentUser}
@@ -193,14 +170,39 @@ const ManuscriptLayout = ({
             getSignedUrl={getSignedUrl}
             invitations={invitationsWithReviewers}
             journal={journal}
+            mb={2}
             mt={2}
             onInviteReviewer={onInviteReviewer}
             onResendReviewerInvite={onResendReviewerInvite}
             onRevokeReviewerInvite={onRevokeReviewerInvite}
             reviewerReports={reviewerReports}
+            scrollIntoView
             toggle={toggleReviewerDetails}
           />
         )}
+
+        {get(currentUser, 'permissions.canMakeHERecommendation', false) && (
+          <HERecommendation
+            formValues={get(formValues, 'editorialRecommendation', {})}
+            hasReviewerReports={reviewerRecommendations.length > 0}
+            modalKey="heRecommendation"
+            onRecommendationSubmit={onEditorialRecommendation}
+          />
+        )}
+
+        {get(currentUser, 'permissions.canMakeDecision', false) && (
+          <ManuscriptEicDecision
+            formValues={get(formValues, 'eicDecision')}
+            messagesLabel={messagesLabel}
+            mt={2}
+            options={
+              get(collection, 'status', 'submitted') === 'submitted'
+                ? [last(eicDecisions)]
+                : eicDecisions
+            }
+            submitDecision={createRecommendation}
+          />
+        )}
       </Fragment>
     ) : (
       <Text>Loading...</Text>