diff --git a/packages/component-wizard/src/components/AuthorList.js b/packages/component-wizard/src/components/AuthorList.js index d3b9896adaa10ba72f65a9a4c5cb7a58e66babdc..dc7b29bb846b2af5883be01b11265d1508effbb1 100644 --- a/packages/component-wizard/src/components/AuthorList.js +++ b/packages/component-wizard/src/components/AuthorList.js @@ -6,7 +6,7 @@ import { get, debounce } from 'lodash' import { reduxForm } from 'redux-form' import { required } from 'xpub-validators' import { withRouter } from 'react-router-dom' -import { compose, withHandlers, getContext } from 'recompose' +import { compose, withHandlers, getContext, lifecycle } from 'recompose' import { TextField, Menu, Icon, ValidatedField, Button } from '@pubsweet/ui' import { actions } from 'pubsweet-client' @@ -178,13 +178,19 @@ const Authors = ({ export default compose( withRouter, + getContext({ version: PropTypes.object, project: PropTypes.object }), connect( (state, { match: { params: { version } } }) => ({ authors: getFragmentAuthors(state, version), }), { addAuthor, setAuthors, updateFragment: actions.updateFragment }, ), - getContext({ version: PropTypes.object, project: PropTypes.object }), + lifecycle({ + componentDidMount() { + const { version, setAuthors } = this.props + setAuthors(version.authors, version.id) + }, + }), withHandlers({ dropItem: ({ updateFragment, authors, project, version }) => debounce(() => { diff --git a/packages/component-wizard/src/components/WizardPage.js b/packages/component-wizard/src/components/WizardPage.js index 2e331f13f8e0e27e3d6dfe3bcff8673a3561b95c..edc85ab088e30063f98ab106ffa843bde4bd0b1e 100644 --- a/packages/component-wizard/src/components/WizardPage.js +++ b/packages/component-wizard/src/components/WizardPage.js @@ -5,16 +5,9 @@ import { actions } from 'pubsweet-client' import { withJournal } from 'xpub-journal' import { ConnectPage } from 'xpub-connect' import { selectCollection, selectFragment } from 'xpub-selectors' -import { - compose, - withHandlers, - withState, - withContext, - lifecycle, -} from 'recompose' +import { compose, withHandlers, withState, withContext } from 'recompose' import Wizard from './Wizard' -import { setAuthors } from '../redux/authors' export default compose( ConnectPage(({ match }) => [ @@ -37,16 +30,8 @@ export default compose( acc[f.name] = bindActionCreators(f, dispatch) return acc }, {}), - setAuthors: (authors, fragmentId) => - dispatch(setAuthors(authors, fragmentId)), }), ), - lifecycle({ - componentDidMount() { - const { version, setAuthors } = this.props - setAuthors(version.authors, version.id) - }, - }), withState('step', 'changeStep', 0), withHandlers({ getSteps: ({ journal: { wizard: { steps } } }) => () =>