Merge branch 'develop' of gitlab.coko.foundation:xpub/xpub-faraday into HIN-971

.gitlab-ci.yml

@@ -138,6 +138,23 @@ deploy:qa:
     - source deploy.sh
     - create_deployment
 
+deploy:styleguide:
+  image: pubsweet/deployer:latest
+  stage: deploy
+  when: manual
+  only:
+    - develop
+  variables:
+    PACKAGE_NAME: xpub-styleguide
+    IMAGE_REPO: $CI_ECR_URL
+    IMAGE_TAG: latest
+  environment:
+    name: styleguide
+    url: http://styleguide.review.hindawi.com
+  script:
+    - source deploy.sh
+    - create_deployment
+
 deploy:staging:
   image: pubsweet/deployer:latest
   stage: deploy

packages/component-faraday-ui/src/helpers/index.js

 import * as validators from './formValidators'
 
+export * from './utils'
+
 export { default as withFilePreview } from './withFilePreview'
 export * from './withFileDownload'
 export { default as withNativeFileDrop } from './withNativeFileDrop'

packages/component-faraday-ui/src/helpers/utils.js

+import { get } from 'lodash'
+
+export const handleError = fn => e => {
+  fn(get(JSON.parse(e.response), 'error', 'Oops! Something went wrong!'))
+}

packages/component-invite/src/routes/collectionsInvitations/post.js

@@ -69,7 +69,6 @@ module.exports = models => async (req, res) => {
 
   try {
     const user = await UserModel.findByEmail(email)
-    await teamHelper.setupTeam({ user, role, objectType: 'collection' })
     invitationHelper.userId = user.id
     let invitation = invitationHelper.getInvitation({
       invitations: collection.invitations,
@@ -89,6 +88,7 @@ module.exports = models => async (req, res) => {
     }
 
     invitation.invitedOn = Date.now()
+    await teamHelper.setupTeam({ user, role, objectType: 'collection' })
     await collection.save()
     await collectionHelper.addHandlingEditor({ user, invitation })
 

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

@@ -47,7 +47,7 @@ import {
   canOverrideTechnicalChecks,
   getInvitationsWithReviewersForFragment,
 } from 'pubsweet-component-faraday-selectors'
-import { RemoteOpener } from 'pubsweet-component-faraday-ui'
+import { RemoteOpener, handleError } from 'pubsweet-component-faraday-ui'
 
 import ManuscriptLayout from './ManuscriptLayout'
 import { parseEicDecision, parseSearchParams, redirectToError } from './utils'
@@ -200,7 +200,7 @@ export default compose(
           fetchUpdatedCollection()
           modalProps.hideModal()
         })
-        .catch(() => modalProps.setModalError('Oops! Something went wrong.')),
+        .catch(handleError(modalProps.setModalError)),
     revokeHE: ({
       getCollection,
       revokeHandlingEditor,
@@ -214,7 +214,7 @@ export default compose(
           getCollection({ id: collectionId })
           modalProps.hideModal()
         })
-        .catch(() => modalProps.setModalError('Oops! Something went wrong.')),
+        .catch(handleError(modalProps.setModalError)),
     createRecommendation: ({
       fragment,
       collection,
@@ -231,9 +231,7 @@ export default compose(
           fetchUpdatedCollection()
           modalProps.hideModal()
         })
-        .catch(() => {
-          modalProps.setModalError('Oops! Something went wrong.')
-        })
+        .catch(handleError(modalProps.setModalError))
     },
     onHEResponse: ({
       history,

packages/styleguide/src/webpack-config.js

@@ -18,7 +18,7 @@ module.exports = dir => {
     devServer: {
       compress: true,
       disableHostCheck: true,
-      public: 'styleguide.faraday.hindawi.com',
+      public: 'styleguide.review.hindawi.com',
     },
     entry: './src/index.js',
     module: {

packages/xpub-faraday/config/default.js

@@ -78,7 +78,7 @@ module.exports = {
       host: process.env.FTP_HOST,
       port: 21,
       localRoot: `./`,
-      remoteRoot: '/',
+      remoteRoot: '/BCA/',
       exclude: ['*.js'],
     },
   },