diff --git a/packages/component-faraday-ui/src/WizardFiles.js b/packages/component-faraday-ui/src/WizardFiles.js
index 8f74a30d740ad314cb89255b3e3b8bd28c1e7343..9bd0591a7ff21c8ca020583682a8130d7b9da290 100644
--- a/packages/component-faraday-ui/src/WizardFiles.js
+++ b/packages/component-faraday-ui/src/WizardFiles.js
@@ -122,9 +122,8 @@ export default compose(
setFilesFetching(type, false)
})
},
- downloadFile: ({ downloadFile, token }) => file => {
- downloadFile(file)
- },
+ previewFile: ({ previewFile }) => previewFile,
+ downloadFile: ({ downloadFile, token }) => downloadFile,
deleteFile: ({
files,
deleteFile,
@@ -152,9 +151,6 @@ export default compose(
}
setFormFiles(newFiles)
},
- previewFile: ({ previewFile }) => file => {
- previewFile(file)
- },
changeList: ({ files, setFormFiles }) => (from, to, fileId) => {
const swappedFile = files[from].find(f => f.id === fileId)
diff --git a/packages/component-modal/src/components/withModal.js b/packages/component-modal/src/components/withModal.js
index 36ae1e091375496d158b4620cc37a4a2d1a038ed..a79c64635bc549950020e9251f5af02dbf82e796 100644
--- a/packages/component-modal/src/components/withModal.js
+++ b/packages/component-modal/src/components/withModal.js
@@ -15,7 +15,7 @@ const mapState = state => ({
const mapDispatch = (dispatch, props) => ({
hideModal: () => dispatch(hideModal()),
showModal: (modalProps = {}) =>
- dispatch(showModal(get(props, 'modalKey', 'modal'), modalProps)),
+ dispatch(showModal(get(props, 'modalKey'), modalProps)),
setModalError: errorMessage => dispatch(setModalError(errorMessage)),
})
diff --git a/packages/component-wizard/src/components/StepThree.js b/packages/component-wizard/src/components/StepThree.js
index 9a4a67aabed1c0cbe89bded838d20fa29f74fc3c..4b7666551a992a1a389bfdd0e050ee00a8bd3a19 100644
--- a/packages/component-wizard/src/components/StepThree.js
+++ b/packages/component-wizard/src/components/StepThree.js
@@ -9,8 +9,8 @@ import { Empty } from './'
const StepThree = ({
token,
- version,
- project,
+ fragment,
+ collection,
changeForm,
deleteFile,
uploadFile,
@@ -36,13 +36,13 @@ const StepThree = ({
<Field component={Empty} name="files" />
<WizardFiles
changeForm={changeForm}
+ collection={collection}
deleteFile={deleteFile}
- files={get(version, 'files', {})}
+ files={get(fragment, 'files', {})}
+ fragment={fragment}
getSignedUrl={getSignedUrl}
- project={project}
token={token}
uploadFile={uploadFile}
- version={version}
/>
{filesError && (
<Row justify="flex-start" mt={1}>
diff --git a/packages/component-wizard/src/components/StepTwo.js b/packages/component-wizard/src/components/StepTwo.js
index 79401f9696c5dfc71c2e124325dbcee1cde4f614..4060c434bfab905255b55fddf63e87f9d3548a8d 100644
--- a/packages/component-wizard/src/components/StepTwo.js
+++ b/packages/component-wizard/src/components/StepTwo.js
@@ -20,10 +20,10 @@ import { H2, Menu, TextField, ValidatedField } from '@pubsweet/ui'
import { Empty } from './'
const StepTwo = ({
- version,
- project,
+ fragment,
journal,
addAuthor,
+ collection,
changeForm,
formValues,
isAuthorEdit,
@@ -88,12 +88,12 @@ const StepTwo = ({
<Field component={Empty} name="authors" />
<WizardAuthors
addAuthor={addAuthor}
- authors={get(version, 'authors', [])}
+ authors={get(fragment, 'authors', [])}
changeForm={changeForm}
- collection={project}
+ collection={collection}
deleteAuthor={deleteAuthor}
error={authorsError}
- fragment={version}
+ fragment={fragment}
isAuthorEdit={isAuthorEdit}
isAuthorsFetching={isAuthorsFetching}
journal={journal}
diff --git a/packages/component-wizard/src/components/SubmissionWizard.js b/packages/component-wizard/src/components/SubmissionWizard.js
index b3a388c76b01e22779ce47ae57ef08b2fd406dee..24af5e9cb5c996ed57e57bd354d45dc09f5adf17 100644
--- a/packages/component-wizard/src/components/SubmissionWizard.js
+++ b/packages/component-wizard/src/components/SubmissionWizard.js
@@ -116,14 +116,14 @@ export default compose(
(state, { match }) => ({
token: getUserToken(state),
isFetching: getAutosaveFetching(state),
+ isFilesFetching: getFileFetching(state),
+ reduxAuthorError: getAuthorError(state),
formValues: getFormValues('submission')(state),
submitFailed: hasSubmitFailed('submission')(state),
formSyncErrors: getFormSyncErrors('submission')(state),
- version: selectFragment(state, get(match, 'params.version')),
- project: selectCollection(state, get(match, 'params.project')),
- isFilesFetching: getFileFetching(state),
+ fragment: selectFragment(state, get(match, 'params.version')),
+ collection: selectCollection(state, get(match, 'params.project')),
isAuthorsFetching: getAuthorFetching(state) || getAutosaveFetching(state),
- reduxAuthorError: getAuthorError(state),
}),
{
changeForm,
diff --git a/packages/component-wizard/src/components/utils.js b/packages/component-wizard/src/components/utils.js
index 9b922cfc1ee32ab719b35ab431cebafdac41cceb..eb333851dd032ea8341ef8b25144b3d2a0233e0d 100644
--- a/packages/component-wizard/src/components/utils.js
+++ b/packages/component-wizard/src/components/utils.js
@@ -17,21 +17,21 @@ import {
} from '../redux/autosave'
import { SubmissionStatement } from './'
-export const setInitialValues = ({ version }) => ({
+export const setInitialValues = ({ fragment }) => ({
initialValues: {
- files: get(version, 'files', {}),
- authors: get(version, 'authors', []),
- metadata: get(version, 'metadata', {}),
- conflicts: get(version, 'conflicts', {
+ files: get(fragment, 'files', {}),
+ authors: get(fragment, 'authors', []),
+ metadata: get(fragment, 'metadata', {}),
+ conflicts: get(fragment, 'conflicts', {
hasConflicts: 'no',
hasDataAvailability: '',
hasFunding: '',
}),
- declarations: get(version, 'declarations', { agree: false }),
+ declarations: get(fragment, 'declarations', { agree: false }),
},
})
-export const validate = (values, props) => {
+export const validate = values => {
const errors = {}
if (!get(values, 'declarations.agree')) {
@@ -57,8 +57,12 @@ export const validate = (values, props) => {
return errors
}
-const _onChange = (values, dispatch, { project, version, updateFragment }) => {
- const previousValues = pick(version, [
+const _onChange = (
+ values,
+ dispatch,
+ { collection, fragment, updateFragment },
+) => {
+ const previousValues = pick(fragment, [
'files',
'authors',
'metadata',
@@ -68,8 +72,8 @@ const _onChange = (values, dispatch, { project, version, updateFragment }) => {
const newValues = omit(values, ['agree', 'authorForm'])
if (!isEqual(newValues, previousValues)) {
dispatch(autosaveRequest())
- updateFragment(project, {
- ...version,
+ updateFragment(collection, {
+ ...fragment,
...newValues,
}).then(
() => dispatch(autosaveSuccess()),
@@ -92,8 +96,8 @@ export const onSubmit = (
isEditMode,
setModalError,
submitManuscript,
- version: { id: fragmentId },
- project: { id: collectionId, customId },
+ fragment: { id: fragmentId },
+ collection: { id: collectionId, customId },
},
) => {
if (step !== 2) {
@@ -107,14 +111,14 @@ export const onSubmit = (
cancelText: 'BACK TO SUBMISSION',
onConfirm: () => {
dispatch(autosaveRequest())
- submitManuscript(collectionId, fragmentId)
+ submitManuscript({ collectionId, fragmentId })
.then(r => {
hideModal()
dispatch(autosaveSuccess())
history.push('/confirmation-page', {
customId,
- version: fragmentId,
- project: collectionId,
+ fragment: fragmentId,
+ collection: collectionId,
})
})
.catch(err => {
diff --git a/packages/component-wizard/src/redux/conversion.js b/packages/component-wizard/src/redux/conversion.js
index 4b2f0a148bf7fe1810d78b38095843f5a8b8ce1b..12a1703c7baaa28ba973ea8ddf3ecb8d3ed2dc31 100644
--- a/packages/component-wizard/src/redux/conversion.js
+++ b/packages/component-wizard/src/redux/conversion.js
@@ -1,8 +1,8 @@
import moment from 'moment'
import { pick, get } from 'lodash'
import { actions } from 'pubsweet-client'
-import { create, update } from 'pubsweet-client/src/helpers/api'
import journalConfig from 'xpub-faraday/app/config/journal'
+import { create, update } from 'pubsweet-client/src/helpers/api'
/* constants */
export const CREATE_DRAFT_REQUEST = 'CREATE_DRAFT_REQUEST'
@@ -90,7 +90,7 @@ export const createDraftSubmission = history => (dispatch, getState) => {
})
}
-export const submitManuscript = (collectionId, fragmentId) => dispatch =>
+export const submitManuscript = ({ collectionId, fragmentId }) => dispatch =>
create(`/collections/${collectionId}/fragments/${fragmentId}/submit`)
export const createRevision = (