Merge branch 'develop' of gitlab.coko.foundation:xpub/xpub-faraday into develop

packages/components-faraday/src/components/SignUp/ReviewerDecline.js

+import React from 'react'
+import { connect } from 'react-redux'
+import { compose, lifecycle } from 'recompose'
+
+import { reviewerDecline } from '../../redux/reviewers'
+
+const ReviewerDecline = props => <div>I decline textul de la Matt</div>
+
+export default compose(
+  connect(null, { reviewerDecline }),
+  lifecycle({
+    componentDidMount() {
+      const {
+        collectionId,
+        invitationId,
+        invitationToken,
+        reviewerDecline,
+      } = this.props
+      reviewerDecline(invitationId, collectionId, invitationToken)
+    },
+  }),
+)(ReviewerDecline)

packages/components-faraday/src/components/SignUp/ReviewerInviteDecision.js

+import React from 'react'
+import { get } from 'lodash'
+import { connect } from 'react-redux'
+import { reduxForm, SubmissionError } 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 {
+  Row,
+  Err,
+  Title,
+  Label,
+  Email,
+  RowItem,
+  Subtitle,
+  RootContainer,
+  FormContainer,
+} from './FormItems'
+import { reviewerDecision, setReviewerPassword } from '../../redux/reviewers'
+
+const agreeText = `You have been invited to review a manuscript on the Hindawi platform. Please set a password and proceed to the manuscript.`
+const declineText = `You have decline to work on a manuscript.`
+
+const min8Chars = minChars(8)
+const ReviewerInviteDecision = ({
+  handleSubmit,
+  error,
+  reviewerEmail,
+  agree,
+}) => (
+  <RootContainer>
+    <Title>Hindawi Invitation</Title>
+    <Subtitle>{agree === 'true' ? agreeText : declineText}</Subtitle>
+    <Email>{reviewerEmail}</Email>
+    {agree === 'true' && (
+      <FormContainer onSubmit={handleSubmit}>
+        <Row>
+          <RowItem>
+            <Label> Password </Label>
+            <ValidatedField
+              component={input => <TextField {...input} type="password" />}
+              name="password"
+              validate={[required, min8Chars]}
+            />
+          </RowItem>
+        </Row>
+        {error && (
+          <Row>
+            <RowItem>
+              <Err>Token expired or Something went wrong.</Err>
+            </RowItem>
+          </Row>
+        )}
+        <Row>
+          <Button primary type="submit">
+            CONFIRM
+          </Button>
+        </Row>
+      </FormContainer>
+    )}
+    {agree === 'false' && <div>nu i-a placut</div>}
+  </RootContainer>
+)
+
+export default compose(
+  withState('reviewerEmail', 'setEmail', ''),
+  connect(null, { push, loginUser, setReviewerPassword, reviewerDecision }),
+  lifecycle({
+    componentDidMount() {
+      const {
+        agree,
+        email,
+        setEmail,
+        collectionId,
+        invitationId,
+        reviewerDecision,
+      } = this.props
+      setEmail(email)
+
+      if (agree === 'false') {
+        reviewerDecision(invitationId, collectionId, false)
+      }
+    },
+  }),
+  reduxForm({
+    form: 'invite-reviewer',
+    onSubmit: (
+      { password },
+      dispatch,
+      {
+        push,
+        email,
+        token,
+        location,
+        loginUser,
+        fragmentId,
+        collectionId,
+        invitationId,
+        setReviewerPassword,
+      },
+    ) =>
+      setReviewerPassword({
+        email,
+        token,
+        password,
+      })
+        .then(() => {
+          loginUser(
+            { username: email, password },
+            `/projects/${collectionId}/versions/${fragmentId}/details?agree=${true}&invitationId=${invitationId}`,
+          )
+        })
+        .catch(error => {
+          const err = get(error, 'response')
+          if (err) {
+            const errorMessage = get(JSON.parse(err), 'error')
+            throw new SubmissionError({
+              _error: errorMessage || 'Something went wrong',
+            })
+          }
+        }),
+  }),
+)(ReviewerInviteDecision)

packages/components-faraday/src/components/SignUp/ReviewerSignUp.js

 import React from 'react'
-import { get } from 'lodash'
-import { connect } from 'react-redux'
-import { reduxForm, SubmissionError } 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 { isEmpty } from 'lodash'
+import { Route } from 'react-router-dom'
+import { AuthenticatedComponent } from 'pubsweet-client'
 
-import {
-  Row,
-  Err,
-  Title,
-  Label,
-  Email,
-  RowItem,
-  Subtitle,
-  RootContainer,
-  FormContainer,
-} from './FormItems'
+import { ReviewerInviteDecision, ReviewerDecline } from './'
 import { parseSearchParams } from './utils'
-import { reviewerDecision, setReviewerPassword } from '../../redux/reviewers'
 
-const agreeText = `You have been invited to review a manuscript on the Hindawi platform. Please set a password and proceed to the manuscript.`
-const declineText = `You have decline to work on a manuscript.`
-
-const min8Chars = minChars(8)
-const ReviewerSignUp = ({
-  searchParams: { agree },
-  handleSubmit,
-  error,
-  reviewer,
-}) => (
-  <RootContainer>
-    <Title>Hindawi Invitation</Title>
-    <Subtitle>{agree ? agreeText : declineText}</Subtitle>
-    <Email>{reviewer.email}</Email>
-    {agree && (
-      <FormContainer onSubmit={handleSubmit}>
-        <Row>
-          <RowItem>
-            <Label> Password </Label>
-            <ValidatedField
-              component={input => <TextField {...input} type="password" />}
-              name="password"
-              validate={[required, min8Chars]}
-            />
-          </RowItem>
-        </Row>
-        {error && (
-          <Row>
-            <RowItem>
-              <Err>Token expired or Something went wrong.</Err>
-            </RowItem>
-          </Row>
-        )}
-        <Row>
-          <Button primary type="submit">
-            CONFIRM
-          </Button>
-        </Row>
-      </FormContainer>
-    )}
-  </RootContainer>
+const PrivateRoute = ({ component: Component, token, ...rest }) => (
+  <Route
+    render={props =>
+      isEmpty(token) ? (
+        <AuthenticatedComponent>
+          <Component {...props} {...rest} />
+        </AuthenticatedComponent>
+      ) : (
+        <Component {...props} {...rest} token={token} />
+      )
+    }
+  />
 )
 
-export default compose(
-  withState('searchParams', 'setParams', { agree: true }),
-  withState('reviewer', 'setReviewer', {}),
-  connect(null, { push, loginUser, setReviewerPassword, reviewerDecision }),
-  lifecycle({
-    componentDidMount() {
-      const { setParams, location, setReviewer, reviewerDecision } = this.props
-      const {
-        agree,
-        collectionId,
-        invitationId,
-        fragmentId,
-        ...reviewerBody
-      } = parseSearchParams(location.search)
-      setParams(v => ({
-        agree: agree === 'true',
-        collectionId,
-        invitationId,
-        fragmentId,
-      }))
+const ReviewerSignUp = ({ location }) => {
+  const { invitationToken, ...rest } = parseSearchParams(location.search)
+  return isEmpty(invitationToken) ? (
+    <PrivateRoute component={ReviewerInviteDecision} {...rest} />
+  ) : (
+    <Route
+      component={props => (
+        <ReviewerDecline
+          {...props}
+          invitationToken={invitationToken}
+          {...rest}
+        />
+      )}
+    />
+  )
+}
 
-      if (agree === 'true') {
-        setReviewer(reviewerBody)
-      } else {
-        reviewerDecision(invitationId, collectionId, false)
-      }
-    },
-  }),
-  reduxForm({
-    form: 'invite-reviewer',
-    onSubmit: (
-      { password },
-      dispatch,
-      {
-        push,
-        loginUser,
-        searchParams,
-        reviewer,
-        location,
-        setReviewerPassword,
-      },
-    ) => {
-      const { collectionId, fragmentId, agree, invitationId } = searchParams
-      return setReviewerPassword({
-        ...reviewer,
-        password,
-      })
-        .then(() => {
-          loginUser(
-            { username: reviewer.email, password },
-            `/projects/${collectionId}/versions/${fragmentId}/details?agree=${agree}&invitationId=${invitationId}`,
-          )
-        })
-        .catch(error => {
-          const err = get(error, 'response')
-          if (err) {
-            const errorMessage = get(JSON.parse(err), 'error')
-            throw new SubmissionError({
-              _error: errorMessage || 'Something went wrong',
-            })
-          }
-        })
-    },
-  }),
-)(ReviewerSignUp)
+export default ReviewerSignUp

packages/components-faraday/src/components/SignUp/index.js

 export { default as ReviewerSignUp } from './ReviewerSignUp'
+export { default as ReviewerDecline } from './ReviewerDecline'
 export { default as SignUpInvitationPage } from './SignUpInvitationPage'
+export { default as ReviewerInviteDecision } from './ReviewerInviteDecision'

packages/components-faraday/src/redux/reviewers.js

@@ -132,7 +132,30 @@ export const reviewerDecision = (
     },
     err => {
       dispatch(reviewerDecisionError(err.message))
-      return err
+      throw err
+    },
+  )
+}
+
+export const reviewerDecline = (
+  invitationId,
+  collectionId,
+  invitationToken,
+) => dispatch => {
+  dispatch(reviewerDecisionRequest())
+  return update(
+    `/collections/${collectionId}/invitations/${invitationId}/decline`,
+    {
+      invitationToken,
+    },
+  ).then(
+    res => {
+      dispatch(reviewerDecisionSuccess())
+      return res
+    },
+    err => {
+      dispatch(reviewerDecisionError(err.message))
+      throw err
     },
   )
 }