From cb3189a4db379eb9880379044a2159c06d044e67 Mon Sep 17 00:00:00 2001
From: Alexandru Munteanu <alexandru.munteanu@thinslices.com>
Date: Thu, 18 Jan 2018 17:37:59 +0200
Subject: [PATCH] Refactor
---
.../src/components/AuthorList.js | 10 ++++++++--
.../src/components/WizardPage.js | 17 +----------------
2 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/packages/component-wizard/src/components/AuthorList.js b/packages/component-wizard/src/components/AuthorList.js
index d3b9896ad..dc7b29bb8 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 2e331f13f..edc85ab08 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 } } }) => () =>
--
GitLab