fix(AuthorEmail): Merged with origin

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

@@ -270,17 +270,9 @@ export const getHERecommendation = (state, collectionId, fragmentId) => {
   )
 }
 
-const canMakeDecisionStatuses = [
-  'submitted',
-  'pendingApproval',
-  'underReview',
-  'reviewCompleted',
-]
 export const canMakeDecision = (state, collection = {}) => {
-  const status = get(collection, 'status', 'draft')
-
   const isEIC = currentUserIs(state, 'adminEiC')
-  return isEIC && canMakeDecisionStatuses.includes(status)
+  return isEIC
 }
 
 const collectionReviewerReports = state =>

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

@@ -33,6 +33,12 @@ const eicDecisions = [
     modalTitle: 'Publish Manuscript',
     modalSubtitle: 'A publish decision is final',
   },
+  {
+    value: 'revision',
+    label: 'Request Revision',
+    modalTitle: 'Request Revision',
+    modalSubtitle: 'A request revision decision is final',
+  },
   {
     value: 'reject',
     label: 'Reject',
@@ -41,9 +47,17 @@ const eicDecisions = [
   },
 ]
 
+const filterOptions = (eicDecisions, status) => {
+  if (status === 'submitted') return eicDecisions.slice(2)
+  if (status === 'pendingApproval') return eicDecisions
+  return [last(eicDecisions)]
+}
 const ManuscriptEicDecision = ({
-  isFetching,
+  status,
+  options,
+  decision,
   formValues,
+  isFetching,
   handleSubmit,
   messagesLabel,
   collection = {},
@@ -59,32 +73,23 @@ const ManuscriptEicDecision = ({
         <ItemOverrideAlert flex={0} vertical>
           <Label required>Decision</Label>
           <ValidatedField
-            component={input => (
-              <Menu
-                {...input}
-                options={
-                  get(collection, 'status', 'submitted') !== 'pendingApproval'
-                    ? [last(eicDecisions)]
-                    : eicDecisions
-                }
-              />
-            )}
+            component={input => <Menu {...input} options={options} />}
             name="decision"
             validate={[required]}
           />
         </ItemOverrideAlert>
       </Row>
 
-      {get(formValues, 'decision') !== 'publish' && (
+      {decision !== 'publish' && (
         <Row mt={2}>
           <Item vertical>
-            <Label required>
+            <Label required={decision !== 'reject'}>
               {messagesLabel[get(formValues, 'decision', 'reject')]}
             </Label>
             <ValidatedField
               component={ValidatedTextArea}
               name="message"
-              validate={[required]}
+              validate={decision !== 'reject' ? [required] : undefined}
             />
           </Item>
         </Row>
@@ -106,13 +111,18 @@ export default compose(
     modalKey: 'eic-decision',
     modalComponent: MultiAction,
   })),
-  withProps(({ formValues }) => ({
+  withProps(({ formValues, collection }) => ({
     modalTitle: eicDecisions.find(
       o => o.value === get(formValues, 'decision', 'publish'),
     ).modalTitle,
     modalSubtitle: eicDecisions.find(
       o => o.value === get(formValues, 'decision', 'publish'),
     ).modalSubtitle,
+    decision: get(formValues, 'decision'),
+    options: filterOptions(
+      eicDecisions,
+      get(collection, 'status', 'submitted'),
+    ),
   })),
   reduxForm({
     form: 'eic-decision',

packages/component-manuscript-manager/src/routes/fragments/strategies/eicRequestRevision.js

+const { union } = require('lodash')
+
 module.exports = {
-  execute: async ({ models, fragmentHelper, collectionHelper }) => {
+  execute: async ({ models, TeamHelper, fragmentHelper, collectionHelper }) => {
     const eicRequestToRevision = fragmentHelper.getLatestEiCRequestToRevision()
     if (!eicRequestToRevision) {
       throw new Error('No Editor in Chief request to revision has been found.')
@@ -11,6 +13,32 @@ module.exports = {
 
     await fragmentHelper.removeRevision()
 
+    const teamHelper = new TeamHelper({
+      TeamModel: models.Team,
+      fragmentId: newFragment.id,
+    })
+
+    const authorIds = newFragment.authors.map(auth => {
+      const { id } = auth
+      return id
+    })
+
+    let authorsTeam = await teamHelper.getTeam({
+      role: 'author',
+      objectType: 'fragment',
+    })
+
+    if (!authorsTeam) {
+      authorsTeam = await teamHelper.createTeam({
+        role: 'author',
+        members: authorIds,
+        objectType: 'fragment',
+      })
+    } else {
+      authorsTeam.members = union(authorsTeam.members, authorIds)
+      await authorsTeam.save()
+    }
+
     await collectionHelper.updateStatus({ newStatus: 'submitted' })
 
     newFragment.submitted = Date.now()

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

@@ -24,6 +24,7 @@ import ReviewerReports from './ReviewerReports'
 const messagesLabel = {
   'return-to-handling-editor': 'Comments for Handling Editor',
   reject: 'Comments for Author',
+  revision: 'Comments for Author',
 }
 
 const cannotViewReviewersDetails = ['revisionRequested', 'pendingApproval']

packages/xpub-faraday/app/config/journal/recommendations.js

@@ -15,4 +15,8 @@ module.exports = [
     value: 'reject',
     label: 'Reject',
   },
+  {
+    value: 'revision',
+    label: 'Revision',
+  },
 ]

packages/xpub-faraday/config/validations.js

@@ -126,6 +126,7 @@ module.exports = {
             'reject',
             'publish',
             'revise',
+            'revision',
             'major',
             'minor',
             'return-to-handling-editor',