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

abb8644e · Sebastian Mihalache · 6e292ff3 · 249391a3 · abb8644e · abb8644e
Commit abb8644e authored 6 years ago by Sebastian Mihalache
--- a/packages/component-manuscript-manager/src/routes/technicalChecks/patch.js
+++ b/packages/component-manuscript-manager/src/routes/technicalChecks/patch.js
@@ -40,12 +40,14 @@ module.exports = ({ Collection, Fragment, User }) => async (req, res) => {
    collection.status = setNewStatus(step, agree)
    await collection.save()

-    sendNotifications({
-      User,
-      Fragment,
-      collection,
-      baseUrl: services.getBaseUrl(req),
-    })
+    if (agree) {
+      sendNotifications({
+        User,
+        Fragment,
+        collection,
+        baseUrl: services.getBaseUrl(req),
+      })
+    }

    return res.status(200).json(collection)
  } catch (e) {

--- a/packages/components-faraday/src/components/UIComponents/EQSDecisionPage.js
+++ b/packages/components-faraday/src/components/UIComponents/EQSDecisionPage.js
@@ -98,7 +98,9 @@ export default compose(
          })
            .then(() => {
              setSuccess(
-                'Manuscript accepted. Thank you for your technical check!',
+                `Manuscript ${
+                  decision ? 'accepted' : 'rejected'
+                }. Thank you for your technical check!`,
              )
              hideModal()
            })

--- a/packages/xpub-faraday/app/index-production.html
+++ b/packages/xpub-faraday/app/index-production.html
 <!DOCTYPE html>
 <html>
+
 <head>
+    <!--
+        Build time: <%= htmlWebpackPlugin.options.buildTime %>
+    -->
    <meta charset=utf-8>
-    <title><%= htmlWebpackPlugin.options.title %></title>
+    <title>
+        <%= htmlWebpackPlugin.options.title %>
+    </title>
 </head>
+
 <body>
-<div id="root"></div>
+    <div id="root"></div>
 </body>
-</html>
+
+</html>
\ No newline at end of file
--- a/packages/xpub-faraday/config/default.js
+++ b/packages/xpub-faraday/config/default.js
@@ -46,7 +46,7 @@ module.exports = {
    API_ENDPOINT: '/api',
    baseUrl: process.env.CLIENT_BASE_URL || 'http://localhost:3000',
    'login-redirect': '/',
-    'redux-log': true,
+    'redux-log': process.env.NODE_ENV === 'development',
    theme: process.env.PUBSWEET_THEME,
  },
  orcid: {
@@ -114,13 +114,7 @@ module.exports = {
    path: `${__dirname}/mailer`,
    editorialAssistant: 'hindawi@thinslices.com',
  },
-  publicKeys: [
-    'pubsweet-client',
-    'authsome',
-    'validations',
-    'pubsweet-component-aws-s3',
-    'pubsweet-component-aws-ses',
-  ],
+  publicKeys: ['pubsweet-client', 'authsome', 'validations'],
  statuses: {
    draft: {
      importance: 1,

--- a/packages/xpub-faraday/webpack/webpack.production.config.js
+++ b/packages/xpub-faraday/webpack/webpack.production.config.js
@@ -36,7 +36,8 @@ module.exports = [
        root: path.join(__dirname, '..', '_build'),
      }),
      new HtmlWebpackPlugin({
-        title: 'xpub',
+        title: 'Faraday',
+        buildTime: new Date().toString(),
        template: '../app/index-production.html',
        inject: 'body',
      }),