Skip to content
Snippets Groups Projects
Commit fa2453c3 authored by Alexandru Munteanu's avatar Alexandru Munteanu
Browse files

feat(submit-revision): add submit revision function

git push
parent 9b72dfa5
No related branches found
No related tags found
1 merge request!14Sprint #15
...@@ -7,6 +7,7 @@ import { Authors, Files } from './' ...@@ -7,6 +7,7 @@ import { Authors, Files } from './'
import { Expandable } from '../molecules/' import { Expandable } from '../molecules/'
const ManuscriptDetails = ({ const ManuscriptDetails = ({
startExpanded,
fragment: { fragment: {
files = {}, files = {},
authors = [], authors = [],
...@@ -15,7 +16,7 @@ const ManuscriptDetails = ({ ...@@ -15,7 +16,7 @@ const ManuscriptDetails = ({
}, },
}) => ( }) => (
<Root> <Root>
<Expandable label="Details" startExpanded> <Expandable label="Details" startExpanded={startExpanded}>
{!!abstract && ( {!!abstract && (
<Expandable label="ABSTRACT" startExpanded> <Expandable label="ABSTRACT" startExpanded>
<Text dangerouslySetInnerHTML={{ __html: abstract }} /> <Text dangerouslySetInnerHTML={{ __html: abstract }} />
......
...@@ -52,7 +52,13 @@ const ManuscriptLayout = ({ ...@@ -52,7 +52,13 @@ const ManuscriptLayout = ({
project={project} project={project}
version={version} version={version}
/> />
<ManuscriptDetails fragment={version} /> <ManuscriptDetails
fragment={version}
startExpanded={isEmpty(version.revision)}
/>
{version.revision && (
<SubmitRevision project={project} version={version} />
)}
<ReviewsAndReports project={project} version={version} /> <ReviewsAndReports project={project} version={version} />
{editorialRecommendations.length > 0 && ( {editorialRecommendations.length > 0 && (
<EditorialComments <EditorialComments
...@@ -61,9 +67,6 @@ const ManuscriptLayout = ({ ...@@ -61,9 +67,6 @@ const ManuscriptLayout = ({
recommendations={editorialRecommendations} recommendations={editorialRecommendations}
/> />
)} )}
{version.revision && (
<SubmitRevision project={project} version={version} />
)}
</Container> </Container>
<SideBar flex={1}> <SideBar flex={1}>
<SideBarActions project={project} version={version} /> <SideBarActions project={project} version={version} />
......
...@@ -16,6 +16,7 @@ import HTML5Backend from 'react-dnd-html5-backend' ...@@ -16,6 +16,7 @@ import HTML5Backend from 'react-dnd-html5-backend'
import { ValidatedField, Button } from '@pubsweet/ui' import { ValidatedField, Button } from '@pubsweet/ui'
import { AbstractEditor, TitleEditor } from 'xpub-edit' import { AbstractEditor, TitleEditor } from 'xpub-edit'
import { AuthorList, Files } from 'pubsweet-components-faraday/src/components' import { AuthorList, Files } from 'pubsweet-components-faraday/src/components'
import { submitRevision } from 'pubsweet-component-wizard/src/redux/conversion'
import AutosaveIndicator from 'pubsweet-component-wizard/src/components/AutosaveIndicator' import AutosaveIndicator from 'pubsweet-component-wizard/src/components/AutosaveIndicator'
import { import {
toClass, toClass,
...@@ -31,7 +32,6 @@ import { ...@@ -31,7 +32,6 @@ import {
import { import {
uploadFile, uploadFile,
deleteFile, deleteFile,
getSignedUrl,
getRequestStatus, getRequestStatus,
} from 'pubsweet-components-faraday/src/redux/files' } from 'pubsweet-components-faraday/src/redux/files'
...@@ -79,7 +79,10 @@ const SubmitRevision = ({ ...@@ -79,7 +79,10 @@ const SubmitRevision = ({
<Title>Reply text*</Title> <Title>Reply text*</Title>
<Row> <Row>
<FullWidth className="full-width"> <FullWidth className="full-width">
<ValidatedField component={TextAreaField} name="response" /> <ValidatedField
component={TextAreaField}
name="commentsToReviewers"
/>
</FullWidth> </FullWidth>
</Row> </Row>
<Row left> <Row left>
...@@ -94,7 +97,7 @@ const SubmitRevision = ({ ...@@ -94,7 +97,7 @@ const SubmitRevision = ({
))} ))}
</Row> </Row>
<FilePicker <FilePicker
allowedFileExtensions={['pdf', 'doc', 'docx', 'png']} allowedFileExtensions={['pdf', 'doc', 'docx']}
onUpload={addFile} onUpload={addFile}
> >
<ActionText left={12}>Upload file</ActionText> <ActionText left={12}>Upload file</ActionText>
...@@ -140,8 +143,7 @@ export default compose( ...@@ -140,8 +143,7 @@ export default compose(
changeForm, changeForm,
uploadFile, uploadFile,
deleteFile, deleteFile,
getSignedUrl, submitRevision,
getRequestStatus,
}, },
), ),
withHandlers({ withHandlers({
...@@ -183,14 +185,16 @@ export default compose( ...@@ -183,14 +185,16 @@ export default compose(
}, },
authors: get(version, 'revision.authors'), authors: get(version, 'revision.authors'),
files: get(version, 'revision.files') || [], files: get(version, 'revision.files') || [],
response: get(version, 'revision.response'), commentsToReviewers: get(version, 'revision.commentsToReviewers'),
}, },
responseFiles: get(formValues, 'files.responseToReviewers') || [], responseFiles: get(formValues, 'files.responseToReviewers') || [],
})), })),
reduxForm({ reduxForm({
form: 'revision', form: 'revision',
onChange: debounce(onChange, 1000, { maxWait: 5000 }), onChange: debounce(onChange, 1000, { maxWait: 5000 }),
onSubmit: () => {}, onSubmit: (values, dispatch, { submitRevision, version, project }) => {
// submitRevision(project.id, version.id)
},
}), }),
DragDropContext(HTML5Backend), DragDropContext(HTML5Backend),
toClass, toClass,
......
...@@ -87,8 +87,8 @@ export const createRevision = ( ...@@ -87,8 +87,8 @@ export const createRevision = (
const { const {
id, id,
submitted, submitted,
recommendations,
invitations, invitations,
recommendations,
...prev ...prev
} = previousVersion } = previousVersion
return dispatch( return dispatch(
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment