fix(mergeConflicts):

README.md

-Note: xpub is still _very_ new. This repository contains an initial set of components but is not yet ready for use.
 
 ## xPub-faraday  
 
@@ -7,13 +6,11 @@ An MVP implementation of the first design sessions which allows a user to go thr
 ## Roadmap
 
 The major tasks we're planning to work on are the following: 
-* Implement a future-proof theming setup. (#88)
-* Let users go through multiple rounds of review. (#50)
-* Implement roles and permissions. (#58)
-* Change the data model to account for the changes that have occured in `pubsweet-server`, as well as to make it easily portable to Postgres in the future. (#67)
-* Merge xpub's authentication, routing and navigation with pubsweet's. (#55 #89 #57)
-
-![Project roadmap](https://gitlab.coko.foundation/xpub/xpub-faraday/raw/master/packages/xpub-faraday/static/faraday-roadmap.png "Faraday Project Roadmap")
+* Implement a future-proof theming setup.
+* Let users go through multiple rounds of review.
+* Implement roles and permissions.
+* Change the data model to account for the changes that have occured in `pubsweet-server`, as well as to make it easily portable to Postgres in the future.
+* Merge xpub's authentication, routing and navigation with pubsweet's.
 
 You can follow more fine-grained lists of things that we're working on  
 * [Faraday](https://gitlab.coko.foundation/xpub/xpub-faraday/boards) for tasks related to `xpub-faraday` and  
@@ -21,7 +18,7 @@ You can follow more fine-grained lists of things that we're working on
 
 ## Installing
 
-In the root directory, run `yarn` to install all the dependencies.
+In the root directory, run `yarn` to install all the dependencies. 
 
 ## Configuration
 Add the following values to `packages/xpub-collabra/config/local-development.json`
@@ -34,10 +31,16 @@ Add the following values to `packages/xpub-collabra/config/local-development.jso
 }
 ```
 
+xPub-faraday is using external services as AWS, MTS-FTP, Publons, ORCID. In order to run the app locally a `.env` file is mandatory with keys and settings for each service.
+
+Contact us at technology@hindawi.com for help getting setup.
+
 ## Running the app
 
-1. `cd packages/xpub-faraday`
-2. The first time you run the app, initialize the database with `yarn run setupdb` (press Enter when asked for a collection title, to skip that step).
+1. Open Docker engine
+2. `cd packages/xpub-faraday`
+3. start services with `yarn services`
+3. The first time you run the app, initialize the database with `yarn run setupdb` (press Enter when asked for a collection title, to skip that step).
 3. `yarn start`
 
 

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

@@ -53,6 +53,7 @@ const cannotViewReviewersDetails = [
   'submitted',
   'heInvited',
 ]
+
 export const canViewReviewersDetails = (state, collection = {}) => {
   if (cannotViewReviewersDetails.includes(get(collection, 'status', 'draft'))) {
     return false
@@ -60,6 +61,42 @@ export const canViewReviewersDetails = (state, collection = {}) => {
   return canViewReports(state, collection.id)
 }
 
+const canHeViewEditorialCommentsStatuses = [
+  'revisionRequested',
+  'rejected',
+  'accepted',
+  'inQA',
+  'pendingApproval',
+]
+export const canHeViewEditorialComments = (state, collection = {}) => {
+  const isHE = isHEToManuscript(state, collection.id)
+  const status = get(collection, 'status', 'draft')
+  return isHE && canHeViewEditorialCommentsStatuses.includes(status)
+}
+
+const canEICViewEditorialCommentsStatuses = ['rejected', 'accepted', 'inQA']
+export const canEICViewEditorialComments = (state, collection = {}) => {
+  const isEIC = currentUserIs(state, 'adminEiC')
+  const status = get(collection, 'status', 'draft')
+  return isEIC && canEICViewEditorialCommentsStatuses.includes(status)
+}
+
+export const canViewEditorialComments = (
+  state,
+  collection = {},
+  fragmentId,
+) => {
+  const editorialRecommentations = getFragmentEditorialComments(
+    state,
+    fragmentId,
+  )
+  return (
+    (canHeViewEditorialComments(state, collection) ||
+      canEICViewEditorialComments(state, collection)) &&
+    editorialRecommentations.length > 0
+  )
+}
+
 export const getUserToken = ({ currentUser }) =>
   get(currentUser, 'user.token', '')
 
@@ -254,6 +291,10 @@ export const getFragmentReviewerRecommendations = (state, fragmentId) =>
   getFragmentRecommendations(state, fragmentId).filter(
     r => r.recommendationType === 'review',
   )
+const getFragmentEditorialComments = (state, fragmentId) =>
+  getFragmentRecommendations(state, fragmentId).filter(
+    r => r.recommendationType === 'editorRecommendation',
+  )
 
 const getOwnRecommendations = (state, fragmentId) =>
   chain(state)

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

@@ -9,26 +9,32 @@ import { Label, Item, Row, Text, Tag } from './'
 import { getReportComments } from './helpers'
 
 const EditorialReportCard = ({
+  publicLabel,
+  privateLabel,
   journal,
   publicReport,
   privateReport,
   recommendation,
-  reviewerName,
-  reviewerRole,
+  editorName,
+  editorRole,
   report: { createdOn, reviewer },
 }) => (
   <Root>
     <Row justify="space-between" mb={2}>
       <Item vertical>
-        <Label mb={1 / 2}>Decision</Label>
+        {editorRole === 'HE' ? (
+          <Label mb={1 / 2}>Recommendation</Label>
+        ) : (
+          <Label mb={1 / 2}>Decision</Label>
+        )}
         <Text>{recommendation}</Text>
       </Item>
 
       <Item justify="flex-end">
         {reviewer && (
           <Fragment>
-            <Text mr={1 / 2}>{reviewerName}</Text>
-            <Tag mr={2}>{reviewerRole}</Tag>
+            <Text mr={1 / 2}>{editorName}</Text>
+            <Tag mr={2}>{editorRole}</Tag>
           </Fragment>
         )}
         <DateParser timestamp={createdOn}>
@@ -40,7 +46,7 @@ const EditorialReportCard = ({
     {publicReport && (
       <Row mb={2}>
         <Item vertical>
-          <Label mb={1 / 2}>Message For Author</Label>
+          <Label mb={1 / 2}>{publicLabel}</Label>
           <Text>{publicReport}</Text>
         </Item>
       </Row>
@@ -49,7 +55,7 @@ const EditorialReportCard = ({
     {privateReport && (
       <Row mb={2}>
         <Item vertical>
-          <Label mb={1 / 2}>Message For Editorial Team</Label>
+          <Label mb={1 / 2}>{privateLabel}</Label>
           <Text>{privateReport}</Text>
         </Item>
       </Row>
@@ -85,8 +91,8 @@ export default compose(
       recommendation: getRecommendationLabel(),
       publicReport: getReportComments({ report, isPublic: true }),
       privateReport: getReportComments({ report, isPublic: false }),
-      reviewerName: getReviewerName(),
-      reviewerRole: getReviewerRole(),
+      editorName: getReviewerName(),
+      editorRole: getReviewerRole(),
     }),
   ),
 )(EditorialReportCard)

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

@@ -47,7 +47,12 @@ const journal = {
     },
   ],
 }
-;<EditorialReportCard report={report} journal={journal} />
+;<EditorialReportCard 
+    report={report} 
+    journal={journal} 
+    publicLabel="Message For Author" 
+    privateLabel="Message For Editorial Team" 
+  />
 ```
 
 Card with message for the editorial team
@@ -97,7 +102,12 @@ const journal = {
     },
   ],
 }
-;<EditorialReportCard report={report} journal={journal} />
+;<EditorialReportCard 
+    report={report} 
+    journal={journal} 
+    publicLabel="Message For Author" 
+    privateLabel="Message For Editorial Team"  
+  />
 ```
 
 Card with message for the editorial team and for the author
@@ -152,5 +162,11 @@ const journal = {
     },
   ],
 }
-;<EditorialReportCard report={report} journal={journal} />
+
+;<EditorialReportCard 
+    report={report} 
+    journal={journal} 
+    publicLabel="Message For Author" 
+    privateLabel="Message For Editorial Team" 
+  />
 ```

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

+import React, { Fragment } from 'react'
+import { get, last, head } from 'lodash'
+import styled from 'styled-components'
+import { th } from '@pubsweet/ui-toolkit'
+import { Button, Spinner } from '@pubsweet/ui'
+import { compose, withHandlers, withProps } from 'recompose'
+
+import { Label, OpenModal, Text, withFetching } from '../'
+
+const TableView = ({
+  reviewers,
+  onInviteReviewer,
+  setFetching,
+  isFetching,
+  publonsError,
+}) => {
+  if (publonsError) {
+    return (
+      <Text align="center" error>
+        {publonsError}
+      </Text>
+    )
+  }
+  return reviewers.length === 0 ? (
+    <Text align="center">No suggestions yet.</Text>
+  ) : (
+    <Table>
+      <thead>
+        <tr>
+          <th>
+            <Label>Full Name</Label>
+          </th>
+          <th>
+            <Label>Affiliation</Label>
+          </th>
+          <th>
+            <Label>No. of Reviews</Label>
+          </th>
+          <th>&nbsp;</th>
+        </tr>
+      </thead>
+      <tbody>
+        {reviewers.map(reviewer => (
+          <TableRow key={reviewer.email}>
+            <td>
+              <Text>{`${get(reviewer, 'name', '')}`}</Text>
+            </td>
+            <td>
+              <Text>{`${get(reviewer, 'affiliation', '')}`}</Text>
+            </td>
+            <td>
+              <Text>{`${get(reviewer, 'reviews', '')}`}</Text>
+            </td>
+            <HiddenCell>
+              <OpenModal
+                confirmText="Invite"
+                isFetching={isFetching}
+                onConfirm={modalProps => onInviteReviewer(reviewer, modalProps)}
+                setFetching={setFetching}
+                title="Send invitation to review?"
+              >
+                {showModal => (
+                  <Button onClick={showModal} primary size="small">
+                    SEND
+                  </Button>
+                )}
+              </OpenModal>
+            </HiddenCell>
+          </TableRow>
+        ))}
+      </tbody>
+    </Table>
+  )
+}
+
+const PublonsTable = ({ publonsFetching, ...rest }) => (
+  <Fragment>{publonsFetching ? <Spinner /> : <TableView {...rest} />}</Fragment>
+)
+
+export default compose(
+  withFetching,
+  withProps(({ reviewers = [] }) => ({
+    reviewers,
+  })),
+  withHandlers({
+    onInviteReviewer: ({ onInvite }) => (reviewer, modalProps) => {
+      const names = reviewer.name.split(' ')
+      const newReviewer = {
+        email: reviewer.email,
+        role: 'reviewer',
+        firstName: head(names),
+        lastName: last(names),
+      }
+      onInvite(newReviewer, modalProps)
+    },
+  }),
+)(PublonsTable)
+
+// #region styles
+const Table = styled.table`
+  border-collapse: collapse;
+
+  & thead {
+    border: 1px solid ${th('colorBorder')};
+    background-color: ${th('colorBackgroundHue2')};
+    padding-top: calc(${th('gridUnit')} * 2);
+  }
+
+  & th,
+  & td {
+    border: none;
+    padding-left: calc(${th('gridUnit')} * 2);
+    text-align: start;
+    vertical-align: middle;
+
+    height: calc(${th('gridUnit')} * 5);
+    min-width: calc(${th('gridUnit')} * 12);
+  }
+`
+
+const HiddenCell = styled.td`
+  opacity: 0;
+  padding-top: ${th('gridUnit')};
+`
+
+const HidableCell = styled.td`
+  opacity: 1;
+  padding-top: ${th('gridUnit')};
+`
+
+const TableRow = styled.tr`
+  background-color: ${th('colorBackgroundHue2')};
+  border-bottom: 1px solid ${th('colorBorder')};
+
+  & td:first-child {
+    min-width: calc(${th('gridUnit')} * 20);
+  }
+
+  & td:last-child {
+    vertical-align: top;
+    text-align: right;
+    padding-right: calc(8px * 2);
+  }
+
+  &:hover {
+    background: ${th('colorBackgroundHue3')};
+
+    ${HiddenCell} {
+      opacity: 1;
+    }
+    ${HidableCell} {
+      opacity: 0;
+    }
+  }
+`
+// #endregion

packages/component-faraday-ui/src/PublonsTable.md

+A list of publon reviewers.
+
+```js
+const reviewers = [
+  {
+    id: 0,
+    email: 'email1@email.com',
+    publishingName: 'Name1',
+    recentOrganizations: {
+      name: 'Org1'
+    },
+    numVerifiedReviews: '100'
+  },
+  {
+    id: 1,
+    email: 'email2@email.com',
+    publishingName: 'Name2',
+    recentOrganizations: {
+      name: 'Org2'
+    },
+    numVerifiedReviews: '200'
+  },
+  {
+    id: 2,
+    email: 'email3@email.com',
+    publishingName: 'Name3',
+    recentOrganizations: {
+      name: 'Org3'
+    },
+    numVerifiedReviews: '300'
+  },
+];
+
+<PublonsTable reviewers={reviewers} onInviteReviwer={(reviewer, modalProps) => {
+  console.log('the reviewer', reviewer)
+  
+  modalProps.setModalError('avem eroare boss')
+}}/>
+```

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

@@ -83,7 +83,9 @@ const ReviewersTable = ({
       </tbody>
     </Table>
   ) : (
-    <Text align="center">No reviewers invited yet.</Text>
+    <Text align="center" pb={2} pt={2}>
+      No reviewers invited yet.
+    </Text>
   )
 
 const orderInvitations = i => {

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

@@ -12,6 +12,7 @@ import {
   marginHelper,
   ContextualBox,
   ReviewersTable,
+  PublonsTable,
   ReviewerReport,
   InviteReviewers,
   ReviewerBreakdown,
@@ -24,10 +25,14 @@ const ReviewerDetails = ({
   reports = [],
   fragment,
   invitations,
+  publonReviewers,
+  isFetching,
   previewFile,
   downloadFile,
+  fetchingError,
   canInviteReviewers,
   onInviteReviewer,
+  onInvitePublonReviewer,
   onResendReviewerInvite,
   onRevokeReviewerInvite,
   toggle,
@@ -59,7 +64,16 @@ const ReviewerDetails = ({
               >
                 <H4>Reviewer Details</H4>
               </TabButton>
-
+              {canInviteReviewers && (
+                <TabButton
+                  ml={1}
+                  mr={1}
+                  onClick={() => changeTab(2)}
+                  selected={selectedTab === 2}
+                >
+                  <H4>Reviewer Suggestions</H4>
+                </TabButton>
+              )}
               <TabButton
                 ml={1}
                 mr={1}
@@ -86,6 +100,14 @@ const ReviewerDetails = ({
                   />
                 </Fragment>
               )}
+              {selectedTab === 2 && (
+                <PublonsTable
+                  onInvite={onInvitePublonReviewer}
+                  publonsError={fetchingError}
+                  publonsFetching={isFetching}
+                  reviewers={publonReviewers}
+                />
+              )}
               {selectedTab === 1 && (
                 <Fragment>
                   {reports.length === 0 && (
@@ -114,14 +136,22 @@ const ReviewerDetails = ({
 export default compose(
   withFilePreview,
   withFileDownload,
-  withProps(({ invitations = [], reviewerReports = [], currentUser }) => ({
-    token: get(currentUser, 'token', ''),
-    invitations: invitations.map(i => ({
-      ...i,
-      review: reviewerReports.find(r => r.userId === i.userId),
-    })),
-    reports: reviewerReports.filter(r => r.submittedOn),
-  })),
+  withProps(
+    ({
+      invitations = [],
+      publonReviewers = [],
+      reviewerReports = [],
+      currentUser,
+    }) => ({
+      token: get(currentUser, 'token', ''),
+      publonReviewers,
+      invitations: invitations.map(i => ({
+        ...i,
+        review: reviewerReports.find(r => r.userId === i.userId),
+      })),
+      reports: reviewerReports.filter(r => r.submittedOn),
+    }),
+  ),
   withProps(({ currentUser }) => ({
     canInviteReviewers: get(currentUser, 'permissions.canInviteReviewers'),
     canViewReviewersDetails: get(

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

@@ -30,6 +30,7 @@ export { default as Pagination } from './Pagination'
 export { default as PersonInfo } from './PersonInfo'
 export { default as PersonInvitation } from './PersonInvitation'
 export { default as PreviewFile } from './PreviewFile'
+export { default as PublonsTable } from './PublonsTable'
 export { default as RadioWithComments } from './RadioWithComments'
 export { default as ReviewerReport } from './ReviewerReport'
 export { default as ReviewersTable } from './ReviewersTable'

packages/component-faraday-ui/src/modals/MultiAction.js

@@ -27,7 +27,7 @@ const MultiAction = ({
     )}
     {renderContent()}
     {modalError && (
-      <Text error mt={1}>
+      <Text align="center" error mt={1}>
         {modalError}
       </Text>
     )}
@@ -83,7 +83,7 @@ const Root = styled.div`
   flex-direction: column;
   position: relative;
   padding: calc(${th('gridUnit')} * 5);
-  width: calc(${th('gridUnit')} * 60);
+  width: calc(${th('gridUnit')} * 70);
 
   ${H2} {
     margin: 0 0 ${th('gridUnit')} 0;

packages/component-invite/src/FragmentsInvitations.js

@@ -16,7 +16,12 @@ const FragmentsInvitations = app => {
    * @apiParamExample {json} Body
    *    {
    *      "email": "email@example.com",
-   *      "role": "reviewer", [acceptedValues: reviewer]
+   *      "role": "reviewer", [acceptedValues: reviewer],
+   *      "firstName": "Julien",
+   *      "lastName": "Hopfenkonig",
+   *      "affiliation": "UCLA",
+   *      "country": "RO"
+   *      "isPublons": false [Boolean]
    *    }
    * @apiSuccessExample {json} Success
    *    HTTP/1.1 200 OK
@@ -51,8 +56,8 @@ const FragmentsInvitations = app => {
    *    HTTP/1.1 200 OK
    *    [{
    *      "name": "John Smith",
-   *     "invitedOn": 1525428890167,
-   *     "respondedOn": 1525428890299,
+   *      "invitedOn": 1525428890167,
+   *      "respondedOn": 1525428890299,
    *      "email": "email@example.com",
    *      "status": "pending",
    *      "invitationId": "1990881"

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

 const logger = require('@pubsweet/logger')
+
 const {
   Team,
   User,
@@ -122,10 +123,33 @@ module.exports = models => async (req, res) => {
   } catch (e) {
     const userHelper = new User({ UserModel })
 
-    const newUser = await userHelper.createUser({
-      role,
-      body: req.body,
-    })
+    const userData = req.body
+    const { firstName = '', lastName = '', isPublons } = userData
+    if (!services.checkForUndefinedParams(firstName, lastName)) {
+      return res
+        .status(400)
+        .json({ error: 'First name and last name are required.' })
+    }
+
+    if (isPublons && process.env.PUBLONS_MOCK_EMAIL) {
+      const mockEmail = process.env.PUBLONS_MOCK_EMAIL
+      userData.email = mockEmail.replace(
+        '__NAME__',
+        `${firstName.trim()}.${lastName.trim()}`,
+      )
+    }
+
+    let newUser
+    try {
+      newUser = await userHelper.createUser({
+        role,
+        body: userData,
+      })
+    } catch (e) {
+      return res
+        .status(400)
+        .json({ error: `User already exists with email: ${userData.email}` })
+    }
 
     if (collection.status === 'heAssigned')
       await collectionHelper.updateStatus({ newStatus: 'reviewersInvited' })

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

@@ -15,7 +15,13 @@ const EditorialCommentCard = ({ journal, reports = [], toggle, expanded }) => (
     toggle={toggle}
   >
     {reports.map(report => (
-      <EditorialReportCard journal={journal} key={report.id} report={report} />
+      <EditorialReportCard
+        journal={journal}
+        key={report.id}
+        privateLabel="Message For Editorial Team"
+        publicLabel="Message For Author"
+        report={report}
+      />
     ))}
   </ContextualBox>
 )

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

@@ -38,6 +38,7 @@ const ManuscriptLayout = ({
   fragment = {},
   changeForm,
   isFetching,
+  fetchingError,
   formValues,
   heExpanded,
   onHEResponse,
@@ -50,13 +51,13 @@ const ManuscriptLayout = ({
   onRevokeReviewerInvite,
   toggleReviewerResponse,
   invitationsWithReviewers,
+  publonReviewers,
   reviewerResponseExpanded,
   pendingOwnRecommendation,
   toggleReviewerRecommendations,
   reviewerRecommendationExpanded,
   shouldReview,
   submittedOwnRecommendation,
-  heAccepted,
   reviewerReports,
   onEditorialRecommendation,
   reviewerRecommendations,
@@ -64,6 +65,7 @@ const ManuscriptLayout = ({
   reviewerDetailsExpanded,
   toggleHeRecommendation,
   heRecommendationExpanded,
+  onInvitePublonReviewer,
 }) => (
   <Root pb={30}>
     {!isEmpty(collection) && !isEmpty(fragment) ? (
@@ -95,15 +97,14 @@ const ManuscriptLayout = ({
           getSignedUrl={getSignedUrl}
         />
 
-        {get(currentUser, 'permissions.canViewReports', true) &&
-          !!editorialRecommendations.length && (
-            <EditorialCommentCard
-              expanded={heRecommendationExpanded}
-              journal={journal}
-              reports={editorialRecommendations}
-              toggle={toggleHeRecommendation}
-            />
-          )}
+        {get(currentUser, 'permissions.canViewEditorialComments', true) && (
+          <EditorialCommentCard
+            expanded={heRecommendationExpanded}
+            journal={journal}
+            reports={editorialRecommendations}
+            toggle={toggleHeRecommendation}
+          />
+        )}
 
         {submittedOwnRecommendation && (
           <ReviewerReportCard
@@ -163,15 +164,19 @@ const ManuscriptLayout = ({
           <ReviewerDetails
             currentUser={currentUser}
             expanded={reviewerDetailsExpanded}
+            fetchingError={fetchingError}
             fragment={fragment}
             getSignedUrl={getSignedUrl}
             highlight={reviewerReports.length === 0}
             invitations={invitationsWithReviewers}
+            isFetching={isFetching.publonsFetching}
             journal={journal}
             mb={2}
+            onInvitePublonReviewer={onInvitePublonReviewer}
             onInviteReviewer={onInviteReviewer}
             onResendReviewerInvite={onResendReviewerInvite}
             onRevokeReviewerInvite={onRevokeReviewerInvite}
+            publonReviewers={publonReviewers}
             reviewerReports={reviewerReports}
             scrollIntoView
             toggle={toggleReviewerDetails}

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

@@ -48,6 +48,7 @@ import {
   currentUserIsReviewer,
   parseCollectionDetails,
   canMakeHERecommendation,
+  canViewEditorialComments,
   canViewReviewersDetails,
   pendingReviewerInvitation,
   canOverrideTechnicalChecks,
@@ -56,10 +57,19 @@ import {
   getFragmentReviewerRecommendations,
   getInvitationsWithReviewersForFragment,
 } from 'pubsweet-component-faraday-selectors'
-import { RemoteOpener, handleError } from 'pubsweet-component-faraday-ui'
+import {
+  RemoteOpener,
+  handleError,
+  withFetching,
+} from 'pubsweet-component-faraday-ui'
 
 import ManuscriptLayout from './ManuscriptLayout'
-import { parseEicDecision, parseSearchParams, redirectToError } from './utils'
+import {
+  parseEicDecision,
+  parseSearchParams,
+  redirectToError,
+  getPublonsReviewers,
+} from './utils'
 import {
   canAssignHE,
   selectFetching,
@@ -74,6 +84,8 @@ export default compose(
   setDisplayName('ManuscriptPage'),
   withJournal,
   withRouter,
+  withFetching,
+  withState('publonReviewers', 'setPublonsReviewers', []),
   withState('editorInChief', 'setEiC', 'N/A'),
   ConnectPage(({ match }) => [
     actions.getCollection({ id: match.params.project }),
@@ -136,6 +148,7 @@ export default compose(
         pendingHEInvitation,
         pendingOwnRecommendation,
         pendingReviewerInvitation,
+        isFetching,
       },
     ) => ({
       currentUser: {
@@ -154,6 +167,11 @@ export default compose(
           }),
           canAssignHE: canAssignHE(state, match.params.project),
           canViewReports: canViewReports(state, match.params.project),
+          canViewEditorialComments: canViewEditorialComments(
+            state,
+            collection,
+            match.params.version,
+          ),
           canInviteReviewers: canInviteReviewers(state, collection),
           canMakeRecommendation: !isUndefined(pendingOwnRecommendation),
           canMakeRevision: canMakeRevision(state, collection, fragment),
@@ -165,6 +183,7 @@ export default compose(
       },
       isFetching: {
         editorsFetching: selectFetching(state),
+        publonsFetching: isFetching,
       },
       formValues: {
         eicDecision: getFormValues('eic-decision')(state),
@@ -196,6 +215,22 @@ export default compose(
       getFragment(collection, fragment)
       getUsers()
     },
+    getPublonsReviewers: ({ clearError, setFetching, setPublonsReviewers }) => (
+      fragmentId,
+      errorFn,
+    ) => {
+      clearError()
+      setFetching(true)
+      getPublonsReviewers(fragmentId)
+        .then(res => {
+          setFetching(false)
+          setPublonsReviewers(res)
+        })
+        .catch(e => {
+          setFetching(false)
+          handleError(errorFn)(e)
+        })
+    },
   }),
   withHandlers({
     updateManuscript: ({ updateVersion, collection, fragment }) => data =>
@@ -403,6 +438,35 @@ export default compose(
         })
     },
   }),
+  withHandlers({
+    onInvitePublonReviewer: ({
+      setError,
+      fragment,
+      collection,
+      clearError,
+      getPublonsReviewers,
+      fetchUpdatedCollection,
+      setFetching: setListFetching,
+    }) => (reviewerData, { hideModal, setModalError, setFetching }) => {
+      setFetching(true)
+      inviteReviewer({
+        reviewerData,
+        isPublons: true,
+        fragmentId: fragment.id,
+        collectionId: collection.id,
+      })
+        .then(() => {
+          setFetching(false)
+          hideModal()
+          fetchUpdatedCollection()
+          getPublonsReviewers(fragment.id)
+        })
+        .catch(err => {
+          setFetching(false)
+          handleError(setModalError)(err)
+        })
+    },
+  }),
   fromRenderProps(RemoteOpener, ({ toggle, expanded }) => ({
     toggleAssignHE: toggle,
     heExpanded: expanded,
@@ -438,11 +502,13 @@ export default compose(
       const {
         match,
         history,
+        setError,
         location,
         shouldReview,
         reviewerReports,
         setEditorInChief,
         clearCustomError,
+        getPublonsReviewers,
         hasManuscriptFailure,
         fetchUpdatedCollection,
         editorialRecommendations,
@@ -451,8 +517,10 @@ export default compose(
           isInvitedToReview,
           isHEToManuscript,
           isEIC,
+          permissions: { canInviteReviewers },
         },
       } = this.props
+
       if (hasManuscriptFailure) {
         history.push('/not-found')
         clearCustomError()
@@ -472,6 +540,10 @@ export default compose(
         setEditorInChief(head(res.users)),
       )
 
+      if (canInviteReviewers) {
+        getPublonsReviewers(fragmentId, setError)
+      }
+
       if (isInvitedHE) {
         this.props.toggleHEResponse()
       }

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

@@ -13,6 +13,7 @@ import { change as changeForm } from 'redux-form'
 
 import { actions } from 'pubsweet-client/src'
 import { handleError } from 'pubsweet-component-faraday-ui'
+import { get as apiGet } from 'pubsweet-client/src/helpers/api'
 
 import {
   autosaveRequest,
@@ -210,6 +211,7 @@ export const onReviewSubmit = (
         collectionId: project.id,
         recommendation: newValues,
       })
+        .then(() => dispatch(actions.getCollection({ id: project.id })))
         .then(() => {
           dispatch(actions.getFragments({ id: project.id }))
           hideModal()
@@ -275,7 +277,6 @@ export const onRevisionSubmit = (
     onCancel: hideModal,
   })
 }
-
 // revision validators
 export const requiredHTML = value => {
   if (value && value.replace('<p></p>', '').replace('<h1></h1>', '')) {
@@ -303,3 +304,7 @@ export const parseEicDecision = ({ decision, message }) => ({
     },
   ],
 })
+
+// handle publons
+export const getPublonsReviewers = fragmentId =>
+  apiGet(`/fragments/${fragmentId}/publons`)

packages/component-publons/src/routes/publons/get.js

@@ -40,7 +40,8 @@ module.exports = models => async (req, res) => {
       fragmentId: fragment.id,
     })
     const parsedFragment = await fragmentHelper.getFragmentData()
-    const memberIds = await teamHelper.getTeamMembers({
+    let memberIds = []
+    memberIds = await teamHelper.getTeamMembers({
       role: 'reviewer',
       objectType: 'fragment',
     })

packages/component-wizard/src/components/SubmissionStatement.js

@@ -3,23 +3,13 @@ import { ActionLink, Text, Row } from 'pubsweet-component-faraday-ui'
 
 const SubmissionStatement = () => (
   <Fragment>
-    <Row mb={1}>
+    <Row mb={1} mt={2}>
       <Text>
         This manuscript is not currently submitted to or under consideration in
         any other journals.
       </Text>
     </Row>
 
-    <Row mb={1}>
-      <Text>
-        The submission ensures that sources are given proper attribution (the
-        journal employs <b>Crossref Similarity Check</b> to compare submissions
-        against published scholarly content. If, in the judgement of an editor,
-        a submission is genuinely suspected of plagiarism, it will be returned
-        to the author(s) with a request for explanation).
-      </Text>
-    </Row>
-
     <Row mb={1}>
       <Text>
         The manuscript complies with all relevant{' '}
@@ -29,28 +19,13 @@ const SubmissionStatement = () => (
       </Text>
     </Row>
 
-    <Row mb={1}>
-      <Text>
-        If applicable - there is a Data Availability statement, containing
-        information about the location of any open data and materials in the
-        manuscript, and how others can access the data.
-      </Text>
-    </Row>
-
-    <Row mb={1}>
-      <Text>
-        A conflict of interest statement is present in the manuscript, even if
-        to state there is no conflict of interest.
-      </Text>
-    </Row>
-
-    <Row mb={1}>
+    <Row mb={3}>
       <Text>
         You have read and understood the{' '}
         <ActionLink to="https://www.hindawi.com/terms/">
           terms of service
-        </ActionLink>
-        {' & '}
+        </ActionLink>{' '}
+        and{' '}
         <ActionLink to="https://www.hindawi.com/privacy/">
           privacy policy
         </ActionLink>{' '}

packages/components-faraday/src/components/SignUp/SignUpStep0.js

@@ -4,6 +4,7 @@ import { reduxForm } from 'redux-form'
 import { get, isUndefined } from 'lodash'
 import { required as requiredValidator } from 'xpub-validators'
 import { Menu, Button, Checkbox, TextField, ValidatedField } from '@pubsweet/ui'
+import styled from 'styled-components'
 
 import {
   Row,
@@ -16,7 +17,7 @@ import {
 } from 'pubsweet-component-faraday-ui'
 
 const AgreeCheckbox = ({ value, onChange }) => (
-  <Row alignItems="center" justify="flex-start" mb={4} mt={3}>
+  <Row alignItems="center" justify="flex-start" mb={3} mt={3}>
     <Checkbox checked={value} onChange={onChange} value={value} />
     <Text>
       I agree with the{' '}
@@ -26,6 +27,9 @@ const AgreeCheckbox = ({ value, onChange }) => (
     </Text>
   </Row>
 )
+const ValidationRow = styled(Row)`
+  justify-content: left;
+`
 
 const Step0 = ({
   type,
@@ -98,11 +102,13 @@ const Step0 = ({
         </Item>
       </Row>
 
-      <ValidatedField
-        component={AgreeCheckbox}
-        name="agreeTC"
-        validate={[requiredValidator]}
-      />
+      <ValidationRow mb={2}>
+        <ValidatedField
+          component={AgreeCheckbox}
+          name="agreeTC"
+          validate={[requiredValidator]}
+        />
+      </ValidationRow>
 
       <Row>
         <Text secondary small>

packages/components-faraday/src/redux/reviewers.js

@@ -59,10 +59,16 @@ export const getCollectionReviewers = (collectionId, fragmentId) => dispatch =>
   )
 // #endregion
 
-export const inviteReviewer = ({ reviewerData, collectionId, fragmentId }) =>
+export const inviteReviewer = ({
+  fragmentId,
+  reviewerData,
+  collectionId,
+  isPublons = false,
+}) =>
   create(`/collections/${collectionId}/fragments/${fragmentId}/invitations`, {
     ...reviewerData,
     role: 'reviewer',
+    isPublons,
   })
 
 // #region Actions - invitations