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

packages/component-faraday-ui/src/ManuscriptCard.js

@@ -76,7 +76,7 @@ const ManuscriptCard = ({
         <Row alignItems="center" justify="flex-start" mb={1}>
           <H4>Handling editor</H4>
           <Text ml={1} mr={3} whiteSpace="nowrap">
-            {get(handlingEditor, 'name', 'Unassigned')}
+            {get(handlingEditor, 'name', 'Undefined')}
           </Text>
           {canViewReports && (
             <Fragment>

packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js

@@ -170,7 +170,7 @@ export default compose(
           </Button>
         )
       }
-      return <Text ml={1}>Unassigned</Text>
+      return <Text ml={1}>Assigned</Text>
     },
   }),
   setDisplayName('ManuscriptHeader'),

packages/component-fixture-manager/src/fixtures/fragments.js

@@ -120,6 +120,27 @@ const fragments = {
         createdOn: chance.timestamp(),
         updatedOn: chance.timestamp(),
       },
+      {
+        recommendation: 'reject',
+        recommendationType: 'review',
+        comments: [
+          {
+            content: 'This is not submitted yet',
+            public: true,
+            files: [
+              {
+                id: chance.guid(),
+                name: 'file.pdf',
+                size: chance.natural(),
+              },
+            ],
+          },
+        ],
+        id: chance.guid(),
+        userId: reviewer.id,
+        createdOn: chance.timestamp(),
+        updatedOn: chance.timestamp(),
+      },
     ],
     authors: [
       {

packages/component-helper-service/src/services/Fragment.js

@@ -158,47 +158,54 @@ class Fragment {
     } = this.fragment
 
     const revAndEditorData = await Promise.all(
-      recommendations.map(async rec => {
-        const user = await UserModel.find(rec.userId)
-        let assignmentDate, isReviewer
-
-        if (rec.recommendationType === configRecommendations.type.editor) {
-          if (!collection.handlingEditor) {
-            throw new Error(
-              `Collection ${collection.id} does not have a Handling Editor`,
-            )
-          }
-          if (user.id === collection.handlingEditor.id) {
-            const editorInvitation = collection.invitations.find(
+      recommendations
+        .filter(
+          rec =>
+            rec.recommendationType === configRecommendations.type.editor ||
+            (rec.recommendationType === configRecommendations.type.review &&
+              rec.submittedOn),
+        )
+        .map(async rec => {
+          const user = await UserModel.find(rec.userId)
+          let assignmentDate, isReviewer
+
+          if (rec.recommendationType === configRecommendations.type.editor) {
+            if (!collection.handlingEditor) {
+              throw new Error(
+                `Collection ${collection.id} does not have a Handling Editor`,
+              )
+            }
+            if (user.id === collection.handlingEditor.id) {
+              const editorInvitation = collection.invitations.find(
+                inv => inv.userId === user.id,
+              )
+              assignmentDate = editorInvitation.respondedOn
+            } else {
+              assignmentDate = submitted
+            }
+
+            isReviewer = false
+          } else {
+            const reviewerInvitation = invitations.find(
               inv => inv.userId === user.id,
             )
-            assignmentDate = editorInvitation.respondedOn
-          } else {
-            assignmentDate = submitted
+            assignmentDate = reviewerInvitation.respondedOn
+            isReviewer = true
           }
 
-          isReviewer = false
-        } else {
-          const reviewerInvitation = invitations.find(
-            inv => inv.userId === user.id,
-          )
-          assignmentDate = reviewerInvitation.respondedOn
-          isReviewer = true
-        }
-
-        return {
-          isReviewer,
-          assignmentDate,
-          email: user.email,
-          title: user.title,
-          recommendation: rec,
-          country: user.country,
-          lastName: user.lastName,
-          firstName: user.firstName,
-          affiliation: user.affiliation,
-          submissionDate: rec.createdOn,
-        }
-      }),
+          return {
+            isReviewer,
+            assignmentDate,
+            email: user.email,
+            title: user.title,
+            recommendation: rec,
+            country: user.country,
+            lastName: user.lastName,
+            firstName: user.firstName,
+            affiliation: user.affiliation,
+            submissionDate: rec.createdOn,
+          }
+        }),
     )
 
     return revAndEditorData

packages/component-helper-service/src/tests/fragment.test.js

 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
 process.env.SUPPRESS_NO_CONFIG_WARNING = true
 
+const Chance = require('chance')
+const config = require('config')
 const { cloneDeep } = require('lodash')
 const fixturesService = require('pubsweet-component-fixture-service')
-const Chance = require('chance')
 
 const chance = new Chance()
 const { fixtures, Model } = fixturesService
 const { Fragment } = require('../Helper')
 
+const { recommendations: configRecommendations } = config
+
 const acceptedReviewerId = chance.guid()
 const submittedReviewerId1 = chance.guid()
 const submittedReviewerId2 = chance.guid()
@@ -240,7 +243,7 @@ describe('Fragment helper', () => {
     })
   })
   describe('getReviewersAndEditorsData', () => {
-    it('should return an array of users (reviewers, editors) that have a connection with the fragment', async () => {
+    it('should return an array of users (reviewers, editors) that have submitted a review', async () => {
       const { collection } = testFixtures.collections
       const { fragment } = testFixtures.fragments
       const fragmentHelper = new Fragment({ fragment })
@@ -251,7 +254,14 @@ describe('Fragment helper', () => {
       })
 
       expect(fragmentUsers.length).toBeGreaterThan(0)
-      expect(fragmentUsers).toHaveLength(fragment.recommendations.length)
+      const submittedRecommendations = fragment.recommendations.filter(
+        rec =>
+          rec.recommendationType === configRecommendations.type.editor ||
+          (rec.recommendationType === configRecommendations.type.review &&
+            rec.submittedOn),
+      )
+
+      expect(fragmentUsers).toHaveLength(submittedRecommendations.length)
     })
     it('should return an error when the collection does not have a handling editor', async () => {
       const { collection } = testFixtures.collections

packages/xpub-faraday/config/authsome-helpers.js

@@ -4,6 +4,8 @@ const { omit, get, last, chain } = require('lodash')
 
 const statuses = config.get('statuses')
 
+const keysToOmit = [`email`, `id`]
+const authorCannotViewHENameStatuses = ['heInvited']
 const authorAllowedStatuses = ['revisionRequested', 'rejected', 'accepted']
 
 const getTeamsByPermissions = async (
@@ -70,6 +72,23 @@ const filterAuthorRecommendations = (recommendations, status, isLast) => {
   return []
 }
 
+const stripeCollectionByRole = ({ collection = {}, role = '' }) => {
+  if (role === 'author') {
+    const { handlingEditor } = collection
+
+    if (authorCannotViewHENameStatuses.includes(collection.status)) {
+      return {
+        ...collection,
+        handlingEditor: handlingEditor &&
+          !handlingEditor.isAccepted && {
+            ...omit(handlingEditor, keysToOmit),
+            name: 'Assigned',
+          },
+      }
+    }
+  }
+  return collection
+}
 const stripeFragmentByRole = ({
   fragment = {},
   role = '',
@@ -142,23 +161,23 @@ const getCollections = async ({ user, models }) => {
   const userPermisssions = await getUserPermissions({ user, Team: models.Team })
 
   const collections = (await Promise.all(
-    userPermisssions.map(async up => {
+    userPermisssions.map(async userPermission => {
       let fragment = {}
       let collection = {}
       try {
-        if (up.objectType === 'collection') {
-          collection = await models.Collection.find(up.objectId)
+        if (userPermission.objectType === 'collection') {
+          collection = await models.Collection.find(userPermission.objectId)
           const latestFragmentId =
             collection.fragments[collection.fragments.length - 1]
           collection.currentVersion = await models.Fragment.find(
             latestFragmentId,
           )
         } else {
-          fragment = await models.Fragment.find(up.objectId)
+          fragment = await models.Fragment.find(userPermission.objectId)
           collection = await models.Collection.find(fragment.collectionId)
           collection.currentVersion = stripeFragmentByRole({
             fragment,
-            role: up.role,
+            role: userPermission.role,
             user,
           })
         }
@@ -167,17 +186,25 @@ const getCollections = async ({ user, models }) => {
         return null
       }
       const status = get(collection, 'status', 'draft')
-      collection.visibleStatus = get(statuses, `${status}.${up.role}.label`)
+      collection.visibleStatus = get(
+        statuses,
+        `${status}.${userPermission.role}.label`,
+      )
 
-      const role = get(up, 'role', 'author')
+      const role = get(userPermission, 'role', 'author')
       const parsedStatuses = await setCollectionStatus({
         role,
         user,
         collection,
         FragmentModel: models.Fragment,
       })
+      const stripedColl = stripeCollectionByRole({
+        collection,
+        role: userPermission.role,
+      })
+
       return {
-        ...collection,
+        ...stripedColl,
         ...parsedStatuses,
       }
     }),
@@ -275,5 +302,6 @@ module.exports = {
   setCollectionStatus,
   stripeFragmentByRole,
   getTeamsByPermissions,
+  stripeCollectionByRole,
   hasPermissionForObject,
 }

packages/xpub-faraday/tests/config/authsome-helpers.test.js

@@ -10,6 +10,91 @@ describe('Authsome Helpers', () => {
     models = fixturesService.Model.build(testFixtures)
   })
 
+  describe('stripeCollectionByRole', () => {
+    it('should return a collection', () => {
+      const { collection } = testFixtures.collections
+      const newCollection = ah.stripeCollectionByRole({
+        collection,
+      })
+      expect(newCollection).toBeTruthy()
+    })
+
+    it('Author should not see HE name on dashboard before HE accepts invitation', () => {
+      const { collection } = testFixtures.collections
+      collection.handlingEditor = {
+        ...collection.handlingEditor,
+        isAccepted: false,
+      }
+      collection.status = 'heInvited'
+      const role = 'author'
+      const newCollection = ah.stripeCollectionByRole({
+        collection,
+        role,
+      })
+      const { handlingEditor = {} } = newCollection
+
+      expect(handlingEditor.email).toBeFalsy()
+      expect(handlingEditor.name).toEqual('Assigned')
+    })
+
+    it('EIC and Admin should see HE name before HE accepts invitation', () => {
+      const { collection } = testFixtures.collections
+      collection.handlingEditor = {
+        ...collection.handlingEditor,
+        isAccepted: false,
+      }
+      collection.status = 'heInvited'
+      const role = 'admin'
+      const newCollection = ah.stripeCollectionByRole({
+        collection,
+        role,
+      })
+      const { handlingEditor = {} } = newCollection
+      expect(handlingEditor.email).toBeTruthy()
+      expect(handlingEditor.name).not.toEqual('Assigned')
+    })
+
+    it('EIC and Admin should see HE name after HE accepts invitation', () => {
+      const { collection } = testFixtures.collections
+      collection.handlingEditor = {
+        ...collection.handlingEditor,
+        isAccepted: true,
+      }
+      collection.status = 'heAssigned'
+      const role = 'admin'
+      const newCollection = ah.stripeCollectionByRole({
+        collection,
+        role,
+      })
+      const { handlingEditor = {} } = newCollection
+      expect(handlingEditor.email).toBeTruthy()
+      expect(handlingEditor.name).not.toEqual('Assigned')
+    })
+
+    it('Atuhor should see HE name on dashboard after HE accepts invitation', () => {
+      const { collection } = testFixtures.collections
+      collection.handlingEditor = {
+        ...collection.handlingEditor,
+        isAccepted: true,
+      }
+      collection.status = 'heAssigned'
+      const role = 'author'
+      const newCollection = ah.stripeCollectionByRole({
+        collection,
+        role,
+      })
+      const { handlingEditor = {} } = newCollection
+      expect(handlingEditor.name).not.toEqual('Assigned')
+    })
+    it('stripeCollection - returns if collection does not have HE', () => {
+      const { collection } = testFixtures.collections
+      delete collection.handlingEditor
+      const role = 'admin'
+      const newCollection = ah.stripeCollectionByRole({ collection, role })
+      expect(newCollection.handlingEditor).toBeFalsy()
+    })
+  })
+
   describe('stripeFragmentByRole', () => {
     it('reviewer should not see authors email', () => {
       const { fragment } = testFixtures.fragments