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

feat(reviewer-email): accept to work from email

parent aba46fd2
No related branches found
No related tags found
1 merge request!6Agree/Decline to work on a manuscript
......@@ -5,7 +5,7 @@ import { compose, lifecycle } from 'recompose'
import { selectCurrentUser } from 'xpub-selectors'
import { parseSearchParams } from './utils'
import { reviewerAccept } from '../../../components-faraday/src/redux/reviewers'
import { reviewerDecision } from '../../../components-faraday/src/redux/reviewers'
const Details = () => <div>eu sunt manuscript details</div>
......@@ -14,15 +14,15 @@ export default compose(
state => ({
currentUser: selectCurrentUser(state),
}),
{ reviewerAccept, replace },
{ reviewerDecision, replace },
),
lifecycle({
componentDidMount() {
const { reviewerAccept, location, match, replace } = this.props
const { reviewerDecision, location, match, replace } = this.props
const collectionId = match.params.project
const { agree, invitationId } = parseSearchParams(location.search)
if (agree === 'true') {
reviewerAccept(invitationId, collectionId)
reviewerDecision(invitationId, collectionId, true)
replace(location.pathname)
}
},
......
......@@ -4,6 +4,7 @@ import { reduxForm } from 'redux-form'
import { push } from 'react-router-redux'
import { required, minChars } from 'xpub-validators'
import { compose, withState, lifecycle } from 'recompose'
import { loginUser } from 'pubsweet-component-login/actions'
import { Button, ValidatedField, TextField } from '@pubsweet/ui'
import {
......@@ -68,7 +69,7 @@ const ReviewerSignUp = ({
export default compose(
withState('searchParams', 'setParams', { agree: true }),
withState('reviewer', 'setReviewer', {}),
connect(null, { push, setReviewerPassword, reviewerDecision }),
connect(null, { push, loginUser, setReviewerPassword, reviewerDecision }),
lifecycle({
componentDidMount() {
const { setParams, location, setReviewer, reviewerDecision } = this.props
......@@ -98,16 +99,25 @@ export default compose(
onSubmit: (
{ password },
dispatch,
{ push, searchParams, reviewer, location, setReviewerPassword },
{
push,
loginUser,
searchParams,
reviewer,
location,
setReviewerPassword,
},
) => {
// setReviewerPassword({
// ...reviewer,
// password,
// })
const { agree, collectionId, invitationId, fragmentId } = searchParams
push(
`/projects/${collectionId}/versions/${fragmentId}/details?agree=${agree}&invitationId=${invitationId}`,
)
const { collectionId, fragmentId, agree, invitationId } = searchParams
setReviewerPassword({
...reviewer,
password,
}).then(() => {
loginUser(
{ username: reviewer.email, password },
`/projects/${collectionId}/versions/${fragmentId}/details?agree=${agree}&invitationId=${invitationId}`,
)
})
},
}),
)(ReviewerSignUp)
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