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

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

@@ -205,6 +205,15 @@ const collections = {
     status: 'revisionRequested',
     customId: chance.natural({ min: 999999, max: 9999999 }),
   },
+  noFragmentsCollection: {
+    id: chance.guid(),
+    title: chance.sentence(),
+    type: 'collection',
+    fragments: [],
+    owners: [user.id],
+    save: jest.fn(() => collections.collection),
+    customId: chance.natural({ min: 999999, max: 9999999 }),
+  },
 }
 
 module.exports = collections

packages/component-manuscript-manager/src/tests/collections/get.test.js

@@ -112,6 +112,8 @@ describe('Get collections route handler', () => {
     expect(res.statusCode).toBe(200)
     const data = JSON.parse(res._getData())
 
+    delete testFixtures.collections.noFragmentsCollection
+
     expect(data).toHaveLength(size(testFixtures.collections))
     expect(data[0].type).toEqual('collection')
     expect(data[0]).toHaveProperty('visibleStatus')

packages/components-faraday/package.json

@@ -10,7 +10,7 @@
     "country-list": "^1.1.0",
     "moment": "^2.22.1",
     "prop-types": "^15.5.10",
-    "pubsweet-component-login": "^1.1.11",
+    "pubsweet-component-login": "^1.2.0",
     "react": "^16.4.2",
     "react-dnd": "^2.5.4",
     "react-dnd-html5-backend": "^2.5.4",

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

 const config = require('config')
+const logger = require('@pubsweet/logger')
 const { get, pickBy, last, has, pick } = require('lodash')
 
 const statuses = config.get('statuses')
@@ -294,8 +295,13 @@ async function applyEditorInChiefPolicy(user, operation, object, context) {
 
     if (get(object, 'path') === '/api/collections') {
       const collections = await context.models.Collection.all()
-      return Promise.all(
+      const modifiedCollections = await Promise.all(
         collections.map(async coll => {
+          if (coll.fragments.length === 0) {
+            logger.error(`Collection ${coll.id} does not have any fragments!`)
+
+            return null
+          }
           const latestFragmentId = coll.fragments[coll.fragments.length - 1]
           coll.currentVersion = await context.models.Fragment.find(
             latestFragmentId,
@@ -306,6 +312,8 @@ async function applyEditorInChiefPolicy(user, operation, object, context) {
           return coll
         }),
       )
+
+      return modifiedCollections.filter(Boolean)
     }
   }
   return true

packages/xpub-faraday/config/components.json

 [
-  "pubsweet-component-login",
   "pubsweet-component-signup",
+  "pubsweet-component-login",
   "pubsweet-component-wizard",
   "pubsweet-component-modal",
   "pubsweet-components-faraday",

packages/xpub-faraday/package.json

@@ -28,7 +28,7 @@
     "prop-types": "^15.5.10",
     "pubsweet": "3.0.6",
     "pubsweet-client": "^4.0.4",
-    "pubsweet-component-login": "^1.1.0",
+    "pubsweet-component-login": "^1.2.0",
     "pubsweet-component-signup": "^1.0.0",
     "pubsweet-server": "10.0.1",
     "react": "^16.4.2",