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

packages/component-email-templating/src/templates/partials/invButtons.hbs

@@ -12,7 +12,7 @@
       <td width="300.000px" valign="top" style="padding: 0px 0px 0px 0px;border-collapse: collapse;" >
     <![endif]-->
 
-      <table width="300.000" style="width:300.000px;border-spacing:0;border-collapse:collapse;margin:0px 0px 0px 0px;"
+      <table width="300.000" style="width:'50%';border-spacing:0;border-collapse:collapse;margin:0px 0px 0px 0px;"
         cellpadding="0" cellspacing="0" align="left" border="0" bgcolor="" class="column column-0 of-2
                   empty">
         <tr>
@@ -21,7 +21,7 @@
               role="module" style="table-layout:fixed" width="100%">
               <tbody>
                 <tr>
-                  <td align="center" class="outer-td" style="padding:0px 0px 0px 50px">
+                  <td align="center" class="outer-td padding-decline">
                     <table border="0" cellPadding="0" cellSpacing="0" class="button-css__deep-table___2OZyb wrapper-mobile"
                       style="text-align:center">
                       <tbody>
@@ -47,7 +47,7 @@
       <td width="300.000px" valign="top" style="padding: 0px 0px 0px 0px;border-collapse: collapse;" >
     <![endif]-->
 
-      <table width="300.000" style="width:300.000px;border-spacing:0;border-collapse:collapse;margin:0px 0px 0px 0px;"
+      <table width="300.000" style="width:'50%';border-spacing:0;border-collapse:collapse;margin:0px 0px 0px 0px;"
         cellpadding="0" cellspacing="0" align="left" border="0" bgcolor="" class="column column-1 of-2
                   empty">
         <tr>
@@ -56,7 +56,7 @@
               role="module" style="table-layout:fixed" width="100%">
               <tbody>
                 <tr>
-                  <td align="center" class="outer-td" style="padding:0px 50px 0px 0px">
+                  <td align="center" class="outer-td padding-agree">
                     <table border="0" cellPadding="0" cellSpacing="0" class="button-css__deep-table___2OZyb wrapper-mobile"
                       style="text-align:center">
                       <tbody>

packages/component-email-templating/src/templates/partials/invHeader.hbs

@@ -76,6 +76,14 @@
       text-decoration: none;
     }
 
+    .padding-decline {
+      padding:0px 0px 0px 50px;
+    }
+
+    .padding-agree {
+      padding:0px 50px 0px 0px;
+    }
+
     @media screen and (max-width:480px) {
 
       .preheader .rightColumnContent,
@@ -126,6 +134,14 @@
         margin-left: 0 !important;
         margin-right: 0 !important;
       }
+
+      .padding-decline {
+        padding: 0px;
+      }
+
+      .padding-agree {
+        padding: 10px 0px 0px 0px;
+      }
     }
   </style>
   <!--user entered Head Start-->

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

 import { selectCurrentUser } from 'xpub-selectors'
-// eslint-disable-next-line no-unused-vars
-import { get, has, last, chain, some, isEmpty, flatten } from 'lodash'
+import { get, has, last, chain, some, isEmpty, slice, find } from 'lodash'
 
 export const isHEToManuscript = (state, collectionId = '') => {
   const { id = '', isAccepted = false } = chain(state)
@@ -49,6 +48,29 @@ export const canInviteReviewers = (state, collection = {}) => {
   return isAccepted && (userId === heId || isAdminEiC)
 }
 
+const canViewContextualBoxOnOldVersionStatuses = [
+  'submitted',
+  'heInvited',
+  'heAssigned',
+]
+const canViewContextualBoxOnOldVersion = (collection, fragmentId) => {
+  const fragments = get(collection, 'fragments', [])
+  const oldVersions = slice(fragments, 0, fragments.length - 1)
+  const isOldVersion = !!find(oldVersions, fragment => fragment === fragmentId)
+  return (
+    isOldVersion &&
+    canViewContextualBoxOnOldVersionStatuses.includes(
+      get(collection, 'status', 'draft'),
+    )
+  )
+}
+
+const canHEViewContextualBoxOnOldVersion = (collection, fragmentId) => {
+  const fragments = get(collection, 'fragments', [])
+  const oldVersions = slice(fragments, 0, fragments.length - 1)
+  const isOldVersion = !!find(oldVersions, fragment => fragment === fragmentId)
+  return isOldVersion && get(collection, 'status', 'draft') === 'heInvited'
+}
 const cannotViewReviewersDetails = [
   'draft',
   'technicalChecks',
@@ -67,12 +89,14 @@ export const canViewReviewersDetails = (state, collection = {}) => {
   return canViewReports(state, get(collection, 'id', ''))
 }
 
-const authorCanViewReportsDetailsStatuses = [
+const authorAndReviewersCanViewReportsDetailsStatuses = [
   'revisionRequested',
+  'underReview',
   'pendingApproval',
   'rejected',
   'accepted',
   'reviewCompleted',
+  'reviewersInvited',
   'inQa',
 ]
 
@@ -83,9 +107,27 @@ export const authorCanViewReportsDetails = (
 ) => {
   const isAuthor = currentUserIsAuthor(state, fragmentId)
   return (
-    authorCanViewReportsDetailsStatuses.includes(
+    isAuthor &&
+    (authorAndReviewersCanViewReportsDetailsStatuses.includes(
       get(collection, 'status', 'draft'),
-    ) && isAuthor
+    ) ||
+      canViewContextualBoxOnOldVersion(collection, fragmentId))
+  )
+}
+
+export const reviewersCanViewReviewerReports = (
+  state,
+  collection = {},
+  fragmentId,
+) => {
+  const isReviewer = currentUserIsReviewer(state, fragmentId)
+  const reviewerReports = getFragmentReviewerRecommendations(state, fragmentId)
+  return (
+    isReviewer &&
+    authorAndReviewersCanViewReportsDetailsStatuses.includes(
+      get(collection, 'status', 'draft'),
+    ) &&
+    reviewerReports.length > 0
   )
 }
 
@@ -125,6 +167,7 @@ const canReviewerViewEditorialCommentsStatuses = [
   'reviewCompleted',
   'pendingApproval',
   'revisionRequested',
+  'reviewersInvited',
 ]
 export const canReviewerViewEditorialComments = (
   state,
@@ -176,8 +219,13 @@ export const canViewEditorialComments = (
     state,
     fragmentId,
   )
+  const isHE = currentUserIs(state, 'isHE')
+  const canViewEditorialCommentsOnOldVersion = isHE
+    ? !canHEViewContextualBoxOnOldVersion(collection, fragmentId)
+    : canViewContextualBoxOnOldVersion(collection, fragmentId)
   return (
-    (canHeViewEditorialComments(state, collection) ||
+    (canViewEditorialCommentsOnOldVersion ||
+      canHeViewEditorialComments(state, collection) ||
       canEICViewEditorialComments(state, collection) ||
       canReviewerViewEditorialComments(state, collection, fragment) ||
       canAuthorViewEditorialComments(state, collection, fragmentId)) &&
@@ -185,17 +233,22 @@ export const canViewEditorialComments = (
   )
 }
 
-const cannotViewResponseFromAuthorStatuses = ['reviewersInvited']
 export const canViewResponseFromAuthor = (state, collection, fragmentId) => {
   const authorResponseToRevisonRequest = getFragmentAuthorResponse(
     state,
     fragmentId,
   )
+  const canHEViewResponseFromAuthor =
+    currentUserIs(state, 'isHE') &&
+    get(collection, 'status', 'draft') === 'heInvited'
+
+  const canReviewerViewResponsefromAuthor =
+    currentUserIsReviewerInPending(state, fragmentId) &&
+    get(collection, 'status', 'draft') === 'reviewersInvited'
   return (
     !isEmpty(authorResponseToRevisonRequest) &&
-    !cannotViewResponseFromAuthorStatuses.includes(
-      get(collection, 'status', 'draft'),
-    )
+    !canHEViewResponseFromAuthor &&
+    !canReviewerViewResponsefromAuthor
   )
 }
 
@@ -326,6 +379,13 @@ export const pendingReviewerInvitation = (state, fragmentId) =>
     )
     .value()
 
+export const currentUserIsReviewerInPending = (state, fragmentId) => {
+  const currentUser = selectCurrentUser(state)
+  const invitations = get(state, `fragments.${fragmentId}.invitations`, [])
+  return !!invitations.find(
+    i => i.userId === currentUser.id && i.role === 'reviewer' && !i.isAccepted,
+  )
+}
 export const currentUserIsReviewer = (state, fragmentId) => {
   const currentUser = selectCurrentUser(state)
   const invitations = get(state, `fragments.${fragmentId}.invitations`, [])
@@ -496,11 +556,12 @@ export const getVersionOptions = (state, collection = {}) => {
 
 export const canReview = (state, collection = {}, fragment = {}) => {
   const fragmentId = get(fragment, 'id', false)
-
   if (!fragmentId) return false
-
+  const ownRecommendation = getOwnRecommendations(state, fragmentId)
   const isReviewer = currentUserIsReviewer(state, fragmentId)
   if (!isReviewer) return false
-
-  return get(collection, 'status', 'draft') === 'underReview'
+  return (
+    get(collection, 'status', 'draft') === 'underReview' &&
+    ownRecommendation.length === 0
+  )
 }

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

@@ -76,7 +76,7 @@ const ManuscriptCard = ({
         <Row alignItems="center" justify="flex-start" mb={1}>
           <H4>Handling editor</H4>
           <Text ml={1} mr={3} whiteSpace="nowrap">
-            {get(handlingEditor, 'name', 'Undefined')}
+            {get(handlingEditor, 'name', 'Unassigned')}
           </Text>
           {canViewReports && (
             <Fragment>

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

@@ -9,6 +9,7 @@ const PersonInvitation = ({
   withName,
   hasAnswer,
   isFetching,
+  isLatestVersion,
   revokeInvitation,
   resendInvitation,
   person: { name, email },
@@ -57,6 +58,29 @@ const PersonInvitation = ({
           </OpenModal>
         </Fragment>
       )}
+    {hasAnswer &&
+      isLatestVersion && (
+        <Fragment>
+          <OpenModal
+            confirmText="Revoke"
+            isFetching={isFetching}
+            modalKey={`remove-${id}`}
+            onConfirm={revokeInvitation}
+            subtitle="Deleting the handling editor at this moment will also remove all his work."
+            title="Revoke invitation?"
+          >
+            {showModal => (
+              <IconButton
+                icon="x-circle"
+                iconSize={2}
+                ml={2}
+                onClick={showModal}
+                secondary
+              />
+            )}
+          </OpenModal>
+        </Fragment>
+      )}
   </Root>
 )
 

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

@@ -11,10 +11,11 @@ const ReviewerReport = ({
   onPreview,
   onDownload,
   reportFile,
+  currentUser,
   publicReport,
   privateReport,
   reviewerName,
-  reviewerIndex,
+  reviewerNumber,
   recommendation,
   showOwner = false,
   report: { submittedOn },
@@ -27,14 +28,12 @@ const ReviewerReport = ({
       </Item>
 
       <Item justify="flex-end">
-        {showOwner && (
-          <Fragment>
-            <Text>{reviewerName}</Text>
-            <Text customId ml={1} mr={1}>
-              {`Reviewer ${reviewerIndex}`}
-            </Text>
-          </Fragment>
-        )}
+        <Fragment>
+          {showOwner && <Text>{reviewerName}</Text>}
+          <Text customId ml={1} mr={1}>
+            {`Reviewer ${reviewerNumber}`}
+          </Text>
+        </Fragment>
         <DateParser timestamp={submittedOn}>
           {date => <Text>{date}</Text>}
         </DateParser>
@@ -76,20 +75,22 @@ const ReviewerReport = ({
   </Root>
 )
 
-export default withProps(({ report, journal: { recommendations = [] } }) => ({
-  recommendation: get(
-    recommendations.find(r => r.value === report.recommendation),
-    'label',
-  ),
-  reportFile: get(report, 'comments.0.files.0'),
-  publicReport: get(report, 'comments.0.content'),
-  privateReport: get(report, 'comments.1.content'),
-  reviewerName: `${get(report, 'reviewer.firstName', '')} ${get(
-    report,
-    'reviewer.lastName',
-    '',
-  )}`,
-}))(ReviewerReport)
+export default withProps(
+  ({ report, currentUser, journal: { recommendations = [] } }) => ({
+    recommendation: get(
+      recommendations.find(r => r.value === report.recommendation),
+      'label',
+    ),
+    reportFile: get(report, 'comments.0.files.0'),
+    publicReport: get(report, 'comments.0.content'),
+    privateReport: get(report, 'comments.1.content'),
+    reviewerName: `${get(currentUser, 'firstName', '')} ${get(
+      currentUser,
+      'lastName',
+      '',
+    )}`,
+  }),
+)(ReviewerReport)
 
 // #region styles
 const Root = styled.div`

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

@@ -21,7 +21,7 @@ const ReviewerReportAuthor = ({
   downloadFile,
   publicReport,
   reviewerName,
-  reviewerIndex,
+  reviewerNumber,
   recommendation,
   showOwner = false,
   report: { submittedOn },
@@ -38,7 +38,7 @@ const ReviewerReportAuthor = ({
           </Row>
         )}
         <Text customId ml={1} mr={1} whiteSpace="nowrap">
-          {`Reviewer ${reviewerIndex}`}
+          {`Reviewer ${reviewerNumber}`}
         </Text>
         <DateParser timestamp={submittedOn}>
           {date => <Text>{date}</Text>}
@@ -78,7 +78,7 @@ export default compose(
       'reviewer.lastName',
       '',
     )}`,
-    reviewerIndex: get(report, 'reviewerIndex', ''),
+    reviewerNumber: get(report, 'reviewerNumber', ''),
   })),
 )(ReviewerReportAuthor)
 

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

@@ -29,7 +29,7 @@ const report = {
   submittedOn: 1538053600624,
   recommendation: 'publish',
   recommendationType: 'review',
-  reviewerIndex: 1
+  reviewerNumber: 1
 }
 
 const journal = {

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

@@ -41,9 +41,9 @@ const ReviewersTable = ({
                 invitation,
                 'person.lastName',
               )}`}</Text>
-              {invitation.isAccepted && (
+              {invitation.reviewerNumber && (
                 <Text customId ml={1}>
-                  {renderAcceptedLabel(index)}
+                  Reviewer {invitation.reviewerNumber}
                 </Text>
               )}
             </td>
@@ -102,12 +102,7 @@ export default compose(
   withProps(({ invitations = [] }) => ({
     invitations: orderBy(invitations, orderInvitations),
   })),
-  withProps(({ invitations = [] }) => ({
-    firstAccepted: invitations.findIndex(i => i.hasAnswer && i.isAccepted),
-  })),
   withHandlers({
-    renderAcceptedLabel: ({ firstAccepted, invitations }) => index =>
-      `Reviewer ${index - firstAccepted + 1}`,
     getInvitationStatus: () => ({ hasAnswer, isAccepted }) => {
       if (!hasAnswer) return 'PENDING'
       if (isAccepted) return 'ACCEPTED'

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

 import React from 'react'
 import { withProps, compose } from 'recompose'
+import { get } from 'lodash'
 
-import { ContextualBox, ReviewerReportAuthor, Row, Text } from '../'
+import {
+  ContextualBox,
+  ReviewerReportAuthor,
+  Row,
+  Text,
+  indexReviewers,
+} from '../'
 
 const SubmittedReportsNumberForAuthorReviews = ({ reports }) => (
   <Row fitContent justify="flex-end">
@@ -16,12 +23,13 @@ const SubmittedReportsNumberForAuthorReviews = ({ reports }) => (
 )
 
 const AuthorReviews = ({
-  invitations,
+  token,
   journal,
   reports,
   fragment,
-  token,
+  invitations,
   getSignedUrl,
+  reviewerReports,
 }) =>
   reports.length > 0 && (
     <ContextualBox
@@ -43,4 +51,24 @@ const AuthorReviews = ({
     </ContextualBox>
   )
 
-export default compose(withProps())(AuthorReviews)
+export default compose(
+  withProps(
+    ({
+      invitations = [],
+      publonReviewers = [],
+      reviewerReports = [],
+      currentUser,
+    }) => ({
+      token: get(currentUser, 'token', ''),
+      publonReviewers,
+      invitations: invitations.map(i => ({
+        ...i,
+        review: reviewerReports.find(r => r.userId === i.userId),
+      })),
+      reports: indexReviewers(
+        reviewerReports.filter(r => r.submittedOn),
+        invitations,
+      ),
+    }),
+  ),
+)(AuthorReviews)

packages/component-faraday-ui/src/contextualBoxes/AuthorReviews.md

@@ -28,7 +28,7 @@ const reports = [
     submittedOn: 1539339580826,
     recommendation: 'minor',
     recommendationType: 'review',
-    reviewerIndex: 1,
+    reviewerNumber: 1,
   },
   {
     id: '21258b47-aba5-4597-926e-765458c4fda2',
@@ -45,7 +45,7 @@ const reports = [
     submittedOn: 1539689169611,
     recommendation: 'publish',
     recommendationType: 'review',
-    reviewerIndex: 2,
+    reviewerNumber: 2,
   },
 ]
 

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

@@ -13,6 +13,7 @@ import {
   ContextualBox,
   ReviewersTable,
   PublonsTable,
+  indexReviewers,
   ReviewerReport,
   InviteReviewers,
   ReviewerBreakdown,
@@ -118,14 +119,14 @@ const ReviewerDetails = ({
                 {reports.length === 0 && (
                   <Text align="center">No reports submitted yet.</Text>
                 )}
-                {reports.map((report, index) => (
+                {reports.map(report => (
                   <ReviewerReport
                     journal={journal}
                     key={report.id}
                     onDownload={downloadFile}
                     onPreview={previewFile}
                     report={report}
-                    reviewerIndex={index + 1}
+                    reviewerNumber={report.reviewerNumber}
                     showOwner
                   />
                 ))}
@@ -154,7 +155,10 @@ export default compose(
         ...i,
         review: reviewerReports.find(r => r.userId === i.userId),
       })),
-      reports: reviewerReports.filter(r => r.submittedOn),
+      reports: indexReviewers(
+        reviewerReports.filter(r => r.submittedOn),
+        invitations,
+      ),
     }),
   ),
   withProps(({ currentUser }) => ({

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

-import { get, chain } from 'lodash'
+import { get, chain, find } from 'lodash'
 
 export const handleError = fn => e => {
   fn(get(JSON.parse(e.response), 'error', 'Oops! Something went wrong!'))
@@ -10,3 +10,14 @@ export const getReportComments = ({ report, isPublic = false }) =>
     .find(c => c.public === isPublic)
     .get('content')
     .value()
+
+export const indexReviewers = (reports = [], invitations = []) => {
+  reports.forEach(report => {
+    report.reviewerNumber = get(
+      find(invitations, ['userId', report.userId]),
+      'reviewerNumber',
+      0,
+    )
+  })
+  return reports
+}

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

 import React, { Fragment } from 'react'
-import { get, chain } from 'lodash'
+import { get, chain, isEmpty } from 'lodash'
 import { H2, H4, DateParser, Button } from '@pubsweet/ui'
 import {
   compose,
@@ -121,6 +121,7 @@ export default compose(
       revokeInvitation,
       pendingInvitation = {},
       handlingEditors = [],
+      isLatestVersion,
       currentUser: {
         permissions: { canAssignHE },
         id: currentUserId,
@@ -128,31 +129,45 @@ export default compose(
         editorInChief,
       },
       collection: { handlingEditor },
+      collection,
       currentUser,
     }) => () => {
       if (pendingInvitation.userId === currentUserId) {
         return <Text ml={1}>Invited</Text>
       }
-      if (pendingInvitation.userId && (admin || editorInChief)) {
+      const invitedHeId =
+        get(pendingInvitation, 'userId', false) ||
+        get(heInvitation, 'userId', false)
+
+      if (invitedHeId && (admin || editorInChief)) {
         const person = chain(handlingEditors)
-          .filter(he => he.id === pendingInvitation.userId)
+          .filter(he => he.id === invitedHeId)
           .map(he => ({ ...he, name: `${he.firstName} ${he.lastName}` }))
           .first()
           .value()
 
+        let invitedHe = {}
+        if (get(pendingInvitation, 'userId', false)) {
+          invitedHe = pendingInvitation
+        } else if (get(heInvitation, 'userId', false)) {
+          invitedHe = heInvitation
+        }
         return (
           <PersonInvitation
             isFetching={isFetching}
+            isLatestVersion={isLatestVersion}
             ml={1}
             withName
-            {...pendingInvitation}
+            {...invitedHe}
             onResend={resendInvitation}
             onRevoke={revokeInvitation}
             person={person}
           />
         )
       }
-
+      if (!isEmpty(pendingInvitation)) {
+        return <Text ml={1}>{handlingEditor.name}</Text>
+      }
       if (heInvitation) {
         return <Text ml={1}>{handlingEditor.name}</Text>
       }
@@ -170,7 +185,7 @@ export default compose(
           </Button>
         )
       }
-      return <Text ml={1}>Assigned</Text>
+      return <Text ml={1}>Unassigned</Text>
     },
   }),
   setDisplayName('ManuscriptHeader'),

packages/component-fixture-manager/src/fixtures/collectionIDs.js

@@ -7,5 +7,6 @@ module.exports = {
   collectionReviewCompletedID: chance.guid(),
   collectionNoInvitesID: chance.guid(),
   twoVersionsCollectionId: chance.guid(),
+  oneReviewedFragmentCollectionID: chance.guid(),
   noEditorRecomedationCollectionID: chance.guid(),
 }

packages/component-fixture-manager/src/fixtures/collections.js

@@ -17,6 +17,7 @@ const {
   collectionReviewCompletedID,
   collectionNoInvitesID,
   twoVersionsCollectionId,
+  oneReviewedFragmentCollectionID,
   noEditorRecomedationCollectionID,
 } = require('./collectionIDs')
 
@@ -30,6 +31,7 @@ const collections = {
     fragments: [fragment.id],
     owners: [user.id],
     save: jest.fn(() => collections.collection),
+    getFragments: jest.fn(() => [fragment]),
     invitations: [
       {
         id: chance.guid(),
@@ -73,6 +75,7 @@ const collections = {
     fragments: [fragment.id],
     owners: [user.id],
     save: jest.fn(() => collections.collection),
+    getFragments: jest.fn(() => [fragment]),
     invitations: [
       {
         id: chance.guid(),
@@ -115,6 +118,7 @@ const collections = {
     fragments: [fragment1.id, noInvitesFragment.id],
     owners: [user.id],
     save: jest.fn(() => collections.collection2),
+    getFragments: jest.fn(() => [fragment1, noInvitesFragment]),
     invitations: [
       {
         id: chance.guid(),
@@ -159,6 +163,7 @@ const collections = {
     created: chance.timestamp(),
     customId: '0000001',
     fragments: [reviewCompletedFragment.id],
+    getFragments: jest.fn(() => [reviewCompletedFragment]),
     invitations: [
       {
         id: chance.guid(),
@@ -189,6 +194,7 @@ const collections = {
     fragments: [fragment.id, reviewCompletedFragment.id],
     owners: [user.id],
     save: jest.fn(() => collections.collection),
+    getFragments: jest.fn(() => [fragment, reviewCompletedFragment]),
     invitations: [
       {
         id: chance.guid(),
@@ -219,6 +225,7 @@ const collections = {
     fragments: [],
     owners: [user.id],
     save: jest.fn(() => collections.collection),
+    getFragments: jest.fn(() => []),
     customId: chance.natural({ min: 999999, max: 9999999 }),
   },
   noEditorRecomedationCollection: {
@@ -228,6 +235,7 @@ const collections = {
     fragments: [noEditorRecomedationFragment.id],
     owners: [user.id],
     save: jest.fn(() => collections.noEditorRecomedationCollection),
+    getFragments: jest.fn(() => [noEditorRecomedationFragment]),
     invitations: [
       {
         id: chance.guid(),
@@ -263,6 +271,37 @@ const collections = {
     },
     status: 'reviewCompleted',
   },
+  oneReviewedFragmentCollection: {
+    id: oneReviewedFragmentCollectionID,
+    title: chance.sentence(),
+    type: 'collection',
+    fragments: [reviewCompletedFragment.id, noInvitesFragment.id],
+    owners: [user.id],
+    save: jest.fn(() => collections.collection),
+    getFragments: jest.fn(() => [reviewCompletedFragment, noInvitesFragment]),
+    invitations: [
+      {
+        id: chance.guid(),
+        role: 'handlingEditor',
+        hasAnswer: true,
+        isAccepted: false,
+        userId: handlingEditor.id,
+        invitedOn: chance.timestamp(),
+        respondedOn: null,
+      },
+    ],
+    handlingEditor: {
+      id: handlingEditor.id,
+      hasAnswer: false,
+      isAccepted: false,
+      email: handlingEditor.email,
+      invitedOn: chance.timestamp(),
+      respondedOn: null,
+      name: `${handlingEditor.firstName} ${handlingEditor.lastName}`,
+    },
+    status: 'revisionRequested',
+    customId: chance.natural({ min: 999999, max: 9999999 }),
+  },
 }
 
 module.exports = collections

packages/component-fixture-manager/src/fixtures/fragments.js

@@ -340,6 +340,7 @@ const fragments = {
         invitedOn: chance.timestamp(),
         isAccepted: true,
         respondedOn: chance.timestamp(),
+        reviewerNumber: 2,
       },
       {
         id: chance.guid(),

packages/component-helper-service/src/services/Collection.js

-const { findLast, get } = require('lodash')
+const { findLast, isEmpty, maxBy, get, flatMap } = require('lodash')
 
 const Fragment = require('./Fragment')
 
@@ -109,6 +109,27 @@ class Collection {
     return lastName || firstName
   }
 
+  async getReviewerNumber({ userId }) {
+    const allCollectionFragments = await this.collection.getFragments()
+    const allCollectionInvitations = flatMap(
+      allCollectionFragments,
+      fragment => fragment.invitations,
+    )
+    const allNumberedInvitationsForUser = allCollectionInvitations
+      .filter(invite => invite.userId === userId)
+      .filter(invite => invite.reviewerNumber)
+
+    if (isEmpty(allNumberedInvitationsForUser)) {
+      const maxReviewerNumber = get(
+        maxBy(allCollectionInvitations, 'reviewerNumber'),
+        'reviewerNumber',
+        0,
+      )
+      return maxReviewerNumber + 1
+    }
+    return allNumberedInvitationsForUser[0].reviewerNumber
+  }
+
   // eslint-disable-next-line class-methods-use-this
   hasAtLeastOneReviewReport(fragments) {
     return fragments.some(fragment =>
@@ -126,17 +147,19 @@ class Collection {
       [],
     )
 
-    const lastRecommendationByHE = findLast(
+    const lastEditorRecommendation = findLast(
       previousVersionRecommendations,
       recommendation =>
-        recommendation.userId === this.collection.handlingEditor.id &&
         recommendation.recommendationType === 'editorRecommendation',
     )
-    if (lastRecommendationByHE.recommendation === 'minor') {
+
+    if (lastEditorRecommendation.recommendation === 'minor') {
       return this.hasAtLeastOneReviewReport(fragments)
-    } else if (lastRecommendationByHE.recommendation === 'major') {
+    } else if (lastEditorRecommendation.recommendation === 'major') {
       return fragmentHelper.hasReviewReport()
     }
+
+    return false
   }
 
   async getAllFragments({ FragmentModel }) {

packages/component-helper-service/src/tests/collection.test.js

@@ -10,11 +10,65 @@ const { Collection, Fragment } = require('../Helper')
 describe('Collection helper', () => {
   let testFixtures = {}
   let models
+
   beforeEach(() => {
     testFixtures = cloneDeep(fixtures)
     models = Model.build(testFixtures)
   })
 
+  describe('getReviewerNumber', () => {
+    it('should assign reviewer number 1 on invitation if no other reviewer numbers exist', async () => {
+      const { collection } = testFixtures.collections
+      const { reviewer } = testFixtures.users
+      const collectionHelper = new Collection({ collection })
+
+      const reviewerNumber = await collectionHelper.getReviewerNumber({
+        userId: reviewer.id,
+      })
+
+      expect(reviewerNumber).toBe(1)
+    })
+    it('should assign next reviewer number on invitation if another reviewer numbers exist', async () => {
+      const { collectionReviewCompleted } = testFixtures.collections
+      const { reviewer } = testFixtures.users
+      const collectionHelper = new Collection({
+        collection: collectionReviewCompleted,
+      })
+
+      const reviewerNumber = await collectionHelper.getReviewerNumber({
+        userId: reviewer.id,
+      })
+
+      expect(reviewerNumber).toBe(3)
+    })
+    it('should keep reviewer number across fragment versions', async () => {
+      const { oneReviewedFragmentCollection } = testFixtures.collections
+      const { answerReviewer } = testFixtures.users
+      const collectionHelper = new Collection({
+        collection: oneReviewedFragmentCollection,
+      })
+
+      const reviewerNumber = await collectionHelper.getReviewerNumber({
+        userId: answerReviewer.id,
+      })
+
+      expect(reviewerNumber).toBe(2)
+    })
+    it('should assign next reviewer number across fragment versions', async () => {
+      const { oneReviewedFragmentCollection } = testFixtures.collections
+      const { reviewer } = testFixtures.users
+      const collectionHelper = new Collection({
+        collection: oneReviewedFragmentCollection,
+      })
+
+      const reviewerNumber = await collectionHelper.getReviewerNumber({
+        userId: reviewer.id,
+      })
+
+      expect(reviewerNumber).toBe(3)
+    })
+  })
+
   describe('hasAtLeastOneReviewReport', () => {
     it('should return true if collection has at least one report from reviewers.', async () => {
       const { collection } = testFixtures.collections

packages/component-invite/src/CollectionsInvitations.js

@@ -39,7 +39,7 @@ const CollectionsInvitations = app => {
     require(`${routePath}/post`)(app.locals.models),
   )
   /**
-   * @api {delete} /api/collections/:collectionId/invitations/:invitationId Delete invitation
+   * @api {delete} /api/collections/:collectionId/invitations/:invitationId Delete invitation (or revoke HE if invitation is accepted)
    * @apiGroup CollectionsInvitations
    * @apiParam {collectionId} collectionId Collection id
    * @apiParam {invitationId} invitationId Invitation id