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

packages/component-invite/src/helpers/Collection.js

@@ -20,10 +20,10 @@ module.exports = {
     await collection.save()
   },
   removeAssignedPeople: async (collection, email) => {
-    const assignedPeople = collection.assignedPeople.filter(
-      person => person.email !== email,
-    )
-    collection.assignedPeople = assignedPeople
+    const assignedPeople =
+      collection.assignedPeople &&
+      collection.assignedPeople.filter(person => person.email !== email)
+    collection.assignedPeople = assignedPeople || []
     await collection.save()
   },
   updateAssignedPeople: async (collection, email) => {

packages/component-invite/src/helpers/Invitation.js

 const revokeInvitation = async (user, collectionId, type) => {
-  const filteredInvitations = user.invitations.filter(
-    invitation =>
-      invitation.collectionId !== collectionId && invitation.type !== type,
-  )
+  const filteredInvitations =
+    user.invitations &&
+    user.invitations.filter(
+      invitation =>
+        invitation.collectionId !== collectionId && invitation.type !== type,
+    )
 
-  user.invitations = filteredInvitations
+  user.invitations = filteredInvitations || []
   await user.save()
 }
 

packages/component-invite/src/routes/deleteInvitation.js

@@ -36,7 +36,6 @@ module.exports = models => async (req, res) => {
       role,
       models.Team,
     )
-
     if (team === undefined) {
       res.status(400).json({
         error: `The requested collection does not have a ${role} Team`,

packages/component-invite/src/routes/getCollectionUsers.js

@@ -15,8 +15,8 @@ module.exports = models => async (req, res) => {
     res.status(400).json({ error: `Role ${role} is invalid` })
     return
   }
-
   const { collectionId } = req.params
+  console.log('req', role, collectionId)
   try {
     await models.Collection.find(collectionId)
     const members = await teamHelper.getTeamMembersByCollection(

packages/components-faraday/src/components/AuthorList/Author.js

@@ -5,6 +5,7 @@ import styled from 'styled-components'
 import { Label } from './FormItems'
 
 export default ({
+  id,
   firstName,
   middleName,
   lastName,
@@ -29,7 +30,10 @@ export default ({
         <Title>{parseAuthorType(isSubmitting, isCorresponding, index)}</Title>
         <ButtonContainer>
           {!isSubmitting && (
-            <ClickableIcon onClick={removeAuthor(email)} title="Delete author">
+            <ClickableIcon
+              onClick={removeAuthor(id, email)}
+              title="Delete author"
+            >
               <Icon size={3}>trash</Icon>
             </ClickableIcon>
           )}

packages/components-faraday/src/components/AuthorList/AuthorAdder.js

@@ -98,7 +98,6 @@ export default compose(
       { authors = [], addAuthor, setEditMode, setFormAuthors, reset, match },
     ) => {
       const collectionId = get(match, 'params.project')
-      const fragmentId = get(match, 'params.version')
       const isFirstAuthor = authors.length === 0
       addAuthor(
         {
@@ -107,7 +106,6 @@ export default compose(
           isCorresponding: isFirstAuthor,
         },
         collectionId,
-        fragmentId,
       ).then(author => {
         const newAuthors = [...authors, author]
         setEditMode(false)()

packages/components-faraday/src/components/AuthorList/AuthorList.js

@@ -15,7 +15,7 @@ import {
 import { change as changeForm } from 'redux-form'
 import { SortableList } from 'pubsweet-component-sortable-list/src/components'
 
-import { addAuthor } from '../../redux/authors'
+import { addAuthor, deleteAuthor, getAuthors } from '../../redux/authors'
 
 import Author from './Author'
 import countries from './countries'
@@ -81,6 +81,7 @@ export default compose(
     {
       addAuthor,
       changeForm,
+      deleteAuthor,
     },
   ),
   withState('authors', 'setAuthors', []),
@@ -113,17 +114,22 @@ export default compose(
       if (isCorresponding) return `#${index + 1} Corresponding author`
       return `#${index + 1} Author`
     },
-    moveAuthor: ({ authors, setAuthors, changeForm }) => (
+    moveAuthor: ({ authors, setFormAuthors, changeForm }) => (
       dragIndex,
       hoverIndex,
     ) => {
       const newAuthors = SortableList.moveItem(authors, dragIndex, hoverIndex)
-      setAuthors(newAuthors)
-    },
-    removeAuthor: ({ authors, setFormAuthors }) => authorEmail => () => {
-      const newAuthors = authors.filter(a => a.email !== authorEmail)
       setFormAuthors(newAuthors)
     },
+    removeAuthor: ({ authors, setFormAuthors, deleteAuthor, project }) => (
+      id,
+      authorEmail,
+    ) => () => {
+      deleteAuthor(project.id, id).then(() => {
+        const newAuthors = authors.filter(a => a.id !== id)
+        setFormAuthors(newAuthors)
+      })
+    },
     setAsCorresponding: ({ authors, setFormAuthors }) => authorEmail => () => {
       const newAuthors = authors.map(
         a =>
@@ -139,8 +145,8 @@ export default compose(
   }),
   lifecycle({
     componentDidMount() {
-      const { version, setAuthors } = this.props
-      setAuthors(version.authors)
+      const { setFormAuthors, project } = this.props
+      getAuthors(project.id).then(setFormAuthors)
     },
   }),
 )(Authors)

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

 import { get } from 'lodash'
+import { create, get as apiGet, remove } from 'pubsweet-client/src/helpers/api'
 
 // constants
 const REQUEST = 'authors/REQUEST'
@@ -19,8 +20,21 @@ export const authorSuccess = () => ({
   type: SUCCESS,
 })
 
-export const addAuthor = (author, collectionId, fragmentId) => dispatch =>
-  Promise.resolve(author)
+export const addAuthor = (author, collectionId) => dispatch => {
+  dispatch(authorRequest())
+  return create(`/users/invite/${collectionId}`, {
+    email: author.email,
+    role: 'author',
+    ...author,
+  })
+}
+
+export const deleteAuthor = (collectionId, userId) => dispatch =>
+  remove(`/collections/${collectionId}/users/${userId}?role=author`)
+// Promise.resolve(author)
+
+export const getAuthors = collectionId =>
+  apiGet(`/collections/${collectionId}/users?role=author`)
 
 // selectors
 export const getFragmentAuthors = (state, fragmentId) =>

packages/xpub-faraday/app/config/journal/submit-wizard.js

@@ -51,13 +51,7 @@ const uploadFile = input => uploadFileFn(input)
 
 export default {
   showProgress: true,
-  formSectionKeys: [
-    'metadata',
-    'declarations',
-    'conflicts',
-    'files',
-    'authors',
-  ],
+  formSectionKeys: ['metadata', 'declarations', 'conflicts', 'files'],
   submissionRedirect: '/confirmation-page',
   dispatchFunctions: [uploadFile],
   steps: [