Merge branch 'HIN-816' into 'develop'

feat(reject): show reject button on manuscript status submitted

See merge request !22

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

@@ -60,15 +60,13 @@ export const getHERecommendation = (state, collectionId, fragmentId) => {
   )
 }
 
-const cantMakeDecisionStatuses = ['rejected', 'published', 'draft']
+const canMakeDecisionStatuses = ['submitted', 'pendingApproval']
 export const canMakeDecision = (state, collection, fragment = {}) => {
   if (fragment.id !== last(collection.fragments)) return false
   const status = get(collection, 'status')
 
-  if (!status || cantMakeDecisionStatuses.includes(status)) return false
-
   const isEIC = currentUserIs(state, 'adminEiC')
-  return isEIC && status
+  return isEIC && canMakeDecisionStatuses.includes(status)
 }
 
 export const canSeeReviewersReports = (state, collectionId) => {

packages/component-manuscript-manager/src/routes/fragmentsRecommendations/notifications/notifications.js

@@ -64,8 +64,10 @@ module.exports = {
 
       comments = eicComments
     }
-
-    if (isEditorInChief || newRecommendation.recommendationType === 'review') {
+    if (
+      (isEditorInChief || newRecommendation.recommendationType === 'review') &&
+      collection.status !== 'rejected'
+    ) {
       // the request came from either the Editor in Chief or a reviewer, so the HE needs to be notified
       sendHandlingEditorEmail({
         email,
@@ -95,28 +97,29 @@ module.exports = {
         subjectBaseText,
         newRecommendation,
       })
+      if (collection.status !== 'rejected') {
+        sendReviewersEmail({
+          email,
+          baseUrl,
+          UserModel,
+          titleText,
+          fragmentHelper,
+          isEditorInChief,
+          subjectBaseText,
+          recommendation: newRecommendation.recommendation,
+          handlingEditorName: get(collection, 'handlingEditor.name', 'N/A'),
+        })
 
-      sendReviewersEmail({
-        email,
-        baseUrl,
-        UserModel,
-        titleText,
-        fragmentHelper,
-        isEditorInChief,
-        subjectBaseText,
-        recommendation: newRecommendation.recommendation,
-        handlingEditorName: get(collection, 'handlingEditor.name', 'N/A'),
-      })
-
-      sendEiCEmail({
-        email,
-        baseUrl,
-        eicName,
-        eicEmail,
-        titleText,
-        subjectBaseText,
-        recommendation: newRecommendation,
-      })
+        sendEiCEmail({
+          email,
+          baseUrl,
+          eicName,
+          eicEmail,
+          titleText,
+          subjectBaseText,
+          recommendation: newRecommendation,
+        })
+      }
     }
   },
 }

packages/components-faraday/src/components/Dashboard/DashboardCard.js

@@ -66,6 +66,7 @@ const DashboardCard = ({
                   collectionId={project.id}
                   fragmentId={version.id}
                   modalKey={`decide-${version.id}`}
+                  status={project.status}
                 />
               )}
               {canMakeRecommendation && (

packages/components-faraday/src/components/MakeDecision/Decision.js

 import React from 'react'
 import { th } from '@pubsweet/ui'
+import { connect } from 'react-redux'
 import styled from 'styled-components'
-import { compose, withHandlers, setDisplayName } from 'recompose'
+import { actions } from 'pubsweet-client'
+import { compose, withHandlers, setDisplayName, withProps } from 'recompose'
 
 import {
   ConfirmationModal,
   withModal,
 } from 'pubsweet-component-modal/src/components'
+import { handleError } from '../utils'
+import { createRecommendation } from '../../redux/recommendations'
 
 import { DecisionForm } from './'
 
-const Decision = ({ showDecisionModal }) => (
-  <Root onClick={showDecisionModal}>Make decision</Root>
+const Decision = ({ showDecisionModal, buttonText }) => (
+  <Root onClick={showDecisionModal}>{buttonText}</Root>
 )
 
 const ModalComponent = ({ type, ...rest }) => {
@@ -28,19 +32,55 @@ export default compose(
   withModal(() => ({
     modalComponent: ModalComponent,
   })),
+  connect(null, {
+    createRecommendation,
+    getFragments: actions.getFragments,
+    getCollections: actions.getCollections,
+  }),
+  withProps(({ status }) => ({
+    buttonText: status === 'submitted' ? 'Reject' : 'Make Decision',
+  })),
   withHandlers({
     showDecisionModal: ({
+      status,
       showModal,
       hideModal,
       fragmentId,
       collectionId,
+      getFragments,
+      setModalError,
+      getCollections,
+      createRecommendation,
     }) => () => {
-      showModal({
-        type: 'decision',
-        hideModal,
-        fragmentId,
-        collectionId,
-      })
+      status !== 'submitted'
+        ? showModal({
+            type: 'decision',
+            hideModal,
+            fragmentId,
+            collectionId,
+          })
+        : showModal({
+            hideModal,
+            fragmentId,
+            collectionId,
+            title: 'Reject Manuscript?',
+            confirmText: 'Reject',
+            onConfirm: () => {
+              const recommendation = {
+                recommendation: 'reject',
+                recommendationType: 'editorRecommendation',
+              }
+              createRecommendation(
+                collectionId,
+                fragmentId,
+                recommendation,
+              ).then(() => {
+                getCollections()
+                getFragments()
+                hideModal()
+              }, handleError(setModalError))
+            },
+          })
     },
   }),
 )(Decision)

packages/components-faraday/src/components/MakeDecision/DecisionForm.js

@@ -27,7 +27,6 @@ const {
 const Form = RootContainer.withComponent(FormContainer)
 
 const DecisionForm = ({
-  aHERec,
   decision,
   hideModal,
   handleSubmit,