fix(submit-revision): fix bugs

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

@@ -74,7 +74,7 @@ module.exports = models => async (req, res) => {
       if (!['pendingApproval', 'revisionRequested'].includes(collection.status))
         collectionHelper.updateStatus({ newStatus: 'reviewCompleted' })
     }
-
+    await fragment.save()
     return res.status(200).json(recommendation)
   } catch (e) {
     const notFoundError = await services.handleNotFoundError(e, 'Item')

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

@@ -7,8 +7,12 @@ import { Authors, Files } from './'
 import { Expandable } from '../molecules/'
 
 const ManuscriptDetails = ({
-  collection: { authors = [] },
-  fragment: { conflicts = {}, files = {}, metadata: { abstract = '' } },
+  fragment: {
+    files = {},
+    authors = [],
+    conflicts = {},
+    metadata: { abstract = '' },
+  },
 }) => (
   <Root>
     <Expandable label="Details" startExpanded>

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

@@ -53,7 +53,7 @@ const ManuscriptLayout = ({
             project={project}
             version={version}
           />
-          <ManuscriptDetails collection={project} fragment={version} />
+          <ManuscriptDetails fragment={version} />
           <ReviewsAndReports project={project} version={version} />
           {canSeeEditorialComments &&
             editorialRecommendations.length > 0 && (

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

 import moment from 'moment'
-import { get, find, capitalize, omit, isEmpty, isEqual, debounce } from 'lodash'
+import { get, find, capitalize, omit, isEmpty, debounce } from 'lodash'
 
 import { actions } from 'pubsweet-client/src'
 import { change as changeForm } from 'redux-form'
@@ -137,25 +137,23 @@ const onChange = (
   values,
   dispatch,
   { project, version, createRecommendation, updateRecommendation },
-  previousValues,
 ) => {
   const newValues = parseReviewRequest(values)
-  const prevValues = parseReviewRequest(previousValues)
-  if (!isEqual(newValues, prevValues)) {
-    dispatch(autosaveRequest())
-    if (newValues.id) {
-      updateRecommendation(project.id, version.id, newValues)
-        .then(r => dispatch(autosaveSuccess(get(r, 'updatedOn'))))
-        .catch(e => dispatch(autosaveFailure(e)))
-    } else {
-      createRecommendation(project.id, version.id, newValues)
-        .then(r => {
-          dispatch(changeForm('reviewerReport', 'id', r.id))
-          return dispatch(autosaveSuccess(get(r, 'updatedOn')))
-        })
-        .catch(e => dispatch(autosaveFailure(e)))
-    }
+  // if (!isEqual(newValues, prevValues)) {
+  dispatch(autosaveRequest())
+  if (newValues.id) {
+    updateRecommendation(project.id, version.id, newValues)
+      .then(r => dispatch(autosaveSuccess(get(r, 'updatedOn'))))
+      .catch(e => dispatch(autosaveFailure(e)))
+  } else {
+    createRecommendation(project.id, version.id, newValues)
+      .then(r => {
+        dispatch(changeForm('reviewerReport', 'id', r.id))
+        return dispatch(autosaveSuccess(get(r, 'updatedOn')))
+      })
+      .catch(e => dispatch(autosaveFailure(e)))
   }
+  // }
 }
 
 export const onReviewChange = debounce(onChange, 1000, { maxWait: 5000 })
@@ -183,7 +181,7 @@ export const onReviewSubmit = (
       updateRecommendation(project.id, version.id, newValues)
         .then(r => dispatch(autosaveSuccess(get(r, 'updatedOn'))))
         .then(() => {
-          dispatch(actions.getFragments())
+          dispatch(actions.getFragments({ id: project.id }))
           hideModal()
         })
     },

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

@@ -73,13 +73,19 @@ const submitFragmentRevision = ({
   history,
   redirectPath = '/',
 }) => {
-  submitRevision(project.id, version.id).then(() => {
-    history.push(redirectPath, {
-      project: project.id,
-      customId: project.customId,
-      version: version.id,
+  submitRevision(project.id, version.id)
+    .then(() => {
+      history.push(redirectPath, {
+        project: project.id,
+        customId: project.customId,
+        version: version.id,
+      })
+    })
+    .catch(error => {
+      if (error.validationErrors) {
+        throw new SubmissionError()
+      }
     })
-  })
 }
 
 const onSubmit = (

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

@@ -143,7 +143,7 @@ const DashboardCard = ({
         project.status !== 'draft' && (
           <DetailsView>
             <Top>
-              <AuthorsWithTooltip authors={project.authors} />
+              <AuthorsWithTooltip authors={version.authors} />
             </Top>
             <Bottom>
               <LeftDetails flex={4}>

packages/components-faraday/src/components/Files/Files.js

-import React from 'react'
+import React, { Fragment } from 'react'
 import { th } from '@pubsweet/ui'
 import PropTypes from 'prop-types'
 import { get, isEqual } from 'lodash'
@@ -6,6 +6,7 @@ import { connect } from 'react-redux'
 import styled from 'styled-components'
 import { withRouter } from 'react-router-dom'
 import { change as changeForm } from 'redux-form'
+import { selectCurrentVersion } from 'xpub-selectors'
 import {
   compose,
   lifecycle,
@@ -35,7 +36,7 @@ const Files = ({
   isRevisionFlow,
   dropSortableFile,
 }) => (
-  <div>
+  <Fragment>
     <Error show={error}> File error, please try again.</Error>
     <FileSection
       addFile={addFile('manuscripts')}
@@ -89,12 +90,11 @@ const Files = ({
         title="Response to reviewers"
       />
     )}
-  </div>
+  </Fragment>
 )
 
 export default compose(
   getContext({
-    version: PropTypes.object,
     project: PropTypes.object,
   }),
   withRouter,
@@ -102,6 +102,7 @@ export default compose(
     (state, { project, version }) => ({
       error: getFileError(state),
       isFetching: getRequestStatus(state),
+      version: selectCurrentVersion(state, project),
       isRevisionFlow: isRevisionFlow(state, project, version),
     }),
     {