Skip to content
Snippets Groups Projects
Commit 59881d7f authored by Bogdan Cochior's avatar Bogdan Cochior
Browse files

refactor(profile): refactor profile form

parent 56a532f3
No related branches found
No related tags found
1 merge request!14Sprint #15
import React from 'react' import React from 'react'
import styled from 'styled-components' import styled from 'styled-components'
import { reduxForm } from 'redux-form'
import { withJournal } from 'xpub-journal' import { withJournal } from 'xpub-journal'
import { compose, withProps, withHandlers, withState } from 'recompose' import { compose, withHandlers, withState } from 'recompose'
import { onSubmitUser as onSubmit } from '../utils'
import AccountDetailsCard from './AccountDetailsCard' import AccountDetailsCard from './AccountDetailsCard'
import AccountDetailsEdit from './AccountDetailsEdit' import AccountDetailsEdit from './AccountDetailsEdit'
const AccountDetails = ({ const AccountDetails = ({ user, isEdit, setEditMode, journal }) => (
user,
isEdit,
setEditMode,
journal,
handleSubmit,
}) => (
<Root> <Root>
{isEdit ? ( {isEdit ? (
<form onSubmit={handleSubmit}> <AccountDetailsEdit
<AccountDetailsEdit journal={journal}
journal={journal} setEditMode={setEditMode}
setEditMode={setEditMode} user={user}
user={user} />
/>
</form>
) : ( ) : (
<AccountDetailsCard <AccountDetailsCard
journal={journal} journal={journal}
...@@ -40,11 +30,6 @@ export default compose( ...@@ -40,11 +30,6 @@ export default compose(
withHandlers({ withHandlers({
setEditMode: ({ setEdit }) => value => setEdit(value), setEditMode: ({ setEdit }) => value => setEdit(value),
}), }),
withProps(({ user }) => ({ initialValues: user })),
reduxForm({
form: 'userManagement',
onSubmit,
}),
)(AccountDetails) )(AccountDetails)
// #region styles // #region styles
......
import React from 'react' import React from 'react'
import styled from 'styled-components' import styled from 'styled-components'
import { Button, th } from '@pubsweet/ui' import { Button, th } from '@pubsweet/ui'
import { reduxForm } from 'redux-form'
import { compose, withProps } from 'recompose'
import { onSubmitUser as onSubmit } from '../utils'
import EditUserForm from '../Admin/EditUserForm' import EditUserForm from '../Admin/EditUserForm'
const AccountDetailsEdit = ({ journal, user, setEditMode }) => ( const AccountDetailsEdit = ({ journal, user, setEditMode, handleSubmit }) => (
<Root> <Root onSubmit={handleSubmit}>
<EditUserForm journal={journal} title="Edit account details" user={user} /> <EditUserForm journal={journal} title="Edit account details" user={user} />
<Row> <Row>
<Button onClick={() => setEditMode(false)}>Cancel</Button> <Button onClick={() => setEditMode(false)}>Cancel</Button>
...@@ -16,10 +19,16 @@ const AccountDetailsEdit = ({ journal, user, setEditMode }) => ( ...@@ -16,10 +19,16 @@ const AccountDetailsEdit = ({ journal, user, setEditMode }) => (
</Root> </Root>
) )
export default AccountDetailsEdit export default compose(
withProps(({ user }) => ({ initialValues: user })),
reduxForm({
form: 'userManagement',
onSubmit,
}),
)(AccountDetailsEdit)
// #region styles // #region styles
const Root = styled.div` const Root = styled.form`
background-color: ${th('colorBackground')}; background-color: ${th('colorBackground')};
padding: ${th('gridUnit')}; padding: ${th('gridUnit')};
border: ${th('borderDefault')}; border: ${th('borderDefault')};
......
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