feat(component-invite): fix confilcts

packages/component-invite/src/controllers/assignCollectionRole.js

@@ -72,16 +72,23 @@ module.exports = async (
     user.invitations = user.invitations || []
     user.invitations.push(invitation)
     user = await user.save()
-    await mailService.setupAssignEmail(
-      user.email,
-      'assign-handling-editor',
-      url,
-    )
 
     await teamHelper.setupManuscriptTeam(models, user, collectionId, role)
 
     user = await models.User.find(user)
-    return res.status(200).json(user)
+
+    try {
+      await mailService.setupAssignEmail(
+        user.email,
+        'assign-handling-editor',
+        url,
+      )
+
+      return res.status(200).json(user)
+    } catch (e) {
+      logger.error(e)
+      return res.status(500).json({ error: 'Mailing could not be sent.' })
+    }
   } catch (e) {
     const notFoundError = await helpers.handleNotFoundError(e, 'user')
     return res.status(notFoundError.status).json({

packages/component-invite/src/controllers/inviteGlobalRole.js

@@ -37,14 +37,18 @@ module.exports = async (body, models, res, url) => {
       models.User,
       role,
     )
-
-    await mailService.setupInviteEmail(
-      newUser.email,
-      'invite',
-      newUser.passwordResetToken,
-      url,
-    )
-
-    return res.status(200).json(newUser)
+    try {
+      await mailService.setupInviteEmail(
+        newUser.email,
+        'invite',
+        newUser.passwordResetToken,
+        url,
+      )
+
+      return res.status(200).json(newUser)
+    } catch (e) {
+      logger.error(e)
+      return res.status(500).json({ error: 'Mailing could not be sent.' })
+    }
   }
 }

packages/component-mail-service/src/Mail.js

@@ -27,7 +27,7 @@ module.exports = {
 
     const { htmlBody, textBody } = getEmailBody(emailType, replacements)
 
-    await Email.send(email, subject, textBody, htmlBody)
+    return Email.send(email, subject, textBody, htmlBody)
   },
   setupAssignEmail: async (email, emailType, dashBoardUrl) => {
     let subject
@@ -46,7 +46,7 @@ module.exports = {
 
     const { htmlBody, textBody } = getEmailBody(emailType, replacements)
 
-    Email.send(email, subject, textBody, htmlBody)
+    return Email.send(email, subject, textBody, htmlBody)
   },
 }
 

packages/xpub-faraday/app/FaradayApp.js

@@ -29,6 +29,9 @@ export default compose(
 
 const Root = styled.div`
   font-family: ${props => props.theme.fontInterface};
+  div[open] {
+    width: auto;
+  }
 `
 
 const MainContainer = styled.div`