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

packages/component-email/src/routes/emails/notifications.js

@@ -25,6 +25,7 @@ module.exports = {
           lastName: user.lastName,
           affiliation: user.affiliation,
           title: user.title,
+          country: user.country,
         }),
         ctaText: 'CONFIRM ACCOUNT',
         signatureName: 'Hindawi',

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

@@ -72,7 +72,7 @@ export default compose(
 const RightContainer = styled.div`
   align-items: center;
   display: flex;
-  height ${th('appBar.height')};
+  height: ${th('appBar.height')};
   margin-right: ${th('gridUnit')};
   height: ${th('appBar.height')};
 
@@ -84,13 +84,15 @@ const RightContainer = styled.div`
 const LogoContainer = styled.div`
   align-items: center;
   display: flex;
-  height ${th('appBar.height')};
+  height: ${th('appBar.height')};
   margin-left: ${th('gridUnit')};
 
   position: absolute;
   top: 0;
   left: 0;
   z-index: 1;
+
+  cursor: pointer;
 `
 
 const JournalBackground = styled.div`

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

@@ -15,10 +15,10 @@ const AuthorTag = ({
   },
 }) => (
   <Root>
-    {affiliationNumber && <Superscript>{affiliationNumber}</Superscript>}
     <Text>{`${firstName} ${lastName}`}</Text>
     {isSubmitting && <Tag>SA</Tag>}
     {isCorresponding && <Tag>CA</Tag>}
+    {affiliationNumber && <Superscript>{affiliationNumber}</Superscript>}
   </Root>
 )
 

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

@@ -82,8 +82,8 @@ const AuthorTagList = ({
         <AffiliationRow>
           {affiliationList.map((a, i) => (
             <Item flex={1} key={a}>
-              <Superscript>{i + 1}</Superscript>
               <Text>{a}</Text>
+              <Superscript>{i + 1}</Superscript>
             </Item>
           ))}
         </AffiliationRow>
@@ -120,7 +120,6 @@ const Root = styled.div`
   font-family: ${th('fontReading')};
 `
 const AffiliationRow = styled(Row)`
-  border-left: 1px solid ${th('colorBackgroundHue')};
   padding-left: ${th('gridUnit')};
   flex-direction: column;
 `

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

@@ -47,7 +47,18 @@ const ResponseToInvitation = ({
         <Label required>{label}</Label>
         <ValidatedField
           component={input => (
-            <RadioGroup inline name="decision" options={options} {...input} />
+            <Row alignItems="center" justify="space-between">
+              <RadioGroup inline name="decision" options={options} {...input} />
+              <Button
+                mb={1.7}
+                mr={2.6}
+                onClick={handleSubmit}
+                primary
+                size="medium"
+              >
+                {buttonLabel}
+              </Button>
+            </Row>
           )}
           name="decision"
           validate={[required]}
@@ -68,12 +79,6 @@ const ResponseToInvitation = ({
         </Item>
       </RowOverrideAlert>
     )}
-
-    <Row justify="flex-end" mb={1} pr={1}>
-      <Button onClick={handleSubmit} primary size="medium">
-        {buttonLabel}
-      </Button>
-    </Row>
   </ContextualBox>
 )
 

packages/xpub-faraday/config/authsome-helpers.js

@@ -252,12 +252,14 @@ async function updateReviewerVisibleStatusByInvitation({
   const fragmentId = last(collection.fragments)
   const fragment = await FragmentModel.find(fragmentId)
   const invitation = fragment.invitations.find(inv => inv.userId === user.id)
-  const recommendationDone = fragment.recommendations.some(
-    rec =>
-      rec.recommendationType === 'review' &&
-      rec.userId === user.id &&
-      rec.submittedOn,
-  )
+  const recommendationDone =
+    fragment.recommendations &&
+    fragment.recommendations.some(
+      rec =>
+        rec.recommendationType === 'review' &&
+        rec.userId === user.id &&
+        rec.submittedOn,
+    )
 
   if (recommendationDone) {
     return get(statuses, `${collection.status}.reviewer.label`)