@openneuro/server 4.1.1 → 4.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.1.1",
+  "version": "4.2.2",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -16,13 +16,13 @@
   },
   "author": "Squishymedia",
   "dependencies": {
-    "@apollo/client": "3.3.14",
-    "@elastic/elasticsearch": "^7.5.1",
+    "@apollo/client": "3.4.17",
+    "@elastic/elasticsearch": "7.15.0",
     "@passport-next/passport-google-oauth2": "^1.0.0",
     "@sentry/node": "^4.5.3",
-    "apollo-server": "2.21.0",
+    "apollo-server": "2.25.3",
     "apollo-server-cache-redis": "1.4.0",
-    "apollo-server-express": "2.21.0",
+    "apollo-server-express": "2.25.3",
     "async": "^2.4.1",
     "base64url": "^3.0.0",
     "body-parser": "^1.18.2",
@@ -104,5 +104,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ccd765e908b6105fd73485cb6162597c1f62d16e"
+  "gitHead": "01f040e1d24d05b35ee769fd41593a9d2ebd6346"
 }

package/src/graphql/resolvers/__tests__/dataset.spec.js

@@ -114,6 +114,35 @@ describe('dataset resolvers', () => {
       expect(sorted[1].id).toBe('ds002680:1.1.0')
       expect(sorted[2].id).toBe('ds002680:1.2.0')
     })
+    it('sorts 000002 (legacy snapshots) before 1.0.1 (current format)', () => {
+      const testSnapshots = [
+        {
+          id: 'ds000247:00002',
+          created: '2018-07-18T02:27:39.000Z',
+          tag: '00002',
+        },
+        {
+          id: 'ds000247:00001',
+          created: '2018-07-18T02:35:37.000Z',
+          tag: '00001',
+        },
+        {
+          id: 'ds000247:1.0.0',
+          created: '2021-07-05T15:58:18.000Z',
+          tag: '1.0.0',
+        },
+        {
+          id: 'ds000247:1.0.1',
+          created: '2021-08-25T23:37:53.000Z',
+          tag: '1.0.1',
+        },
+      ]
+      const sorted = testSnapshots.sort(ds.snapshotCreationComparison)
+      expect(sorted[0].id).toBe('ds000247:00002')
+      expect(sorted[1].id).toBe('ds000247:00001')
+      expect(sorted[2].id).toBe('ds000247:1.0.0')
+      expect(sorted[3].id).toBe('ds000247:1.0.1')
+    })
   })
   describe('deleteFiles', () => {
     beforeEach(() => {

package/src/graphql/resolvers/__tests__/snapshots.spec.js

@@ -1,5 +1,5 @@
 jest.mock('../../../config')
-import { matchKnownObjects } from '../snapshots.js'
+import { matchKnownObjects, filterLatestSnapshot } from '../snapshots.js'
 
 describe('snapshot resolvers', () => {
   describe('matchKnownObjects()', () => {
@@ -23,4 +23,34 @@ describe('snapshot resolvers', () => {
       ])
     })
   })
+  describe('filterLatestSnapshot()', () => {
+    it('returns the latest snapshot', () => {
+      const testSnapshots = [
+        {
+          id: 'ds000247:00002',
+          created: '2018-07-18T02:27:39.000Z',
+          tag: '00002',
+        },
+        {
+          id: 'ds000247:00001',
+          created: '2018-07-18T02:35:37.000Z',
+          tag: '00001',
+        },
+        {
+          id: 'ds000247:1.0.0',
+          created: '2021-07-05T15:58:18.000Z',
+          tag: '1.0.0',
+        },
+        {
+          id: 'ds000247:1.0.1',
+          created: '2021-08-25T23:37:53.000Z',
+          tag: '1.0.1',
+        },
+      ]
+      expect(filterLatestSnapshot(testSnapshots)).toBe('1.0.1')
+    })
+    it('returns null with no snapshots', () => {
+      expect(filterLatestSnapshot([])).toBeNull()
+    })
+  })
 })

package/src/graphql/resolvers/snapshots.js

@@ -176,23 +176,31 @@ export const participantCount = (obj, { modality }) => {
   })
 }
 
-export const latestSnapshot = (obj, _, context) => {
-  return datalad.getSnapshots(obj.id).then(snapshots => {
-    if (snapshots.length) {
-      const sortedSnapshots = Array.prototype.sort.call(
-        snapshots,
-        snapshotCreationComparison,
-      )
-      return snapshot(
-        obj,
-        { datasetId: obj.id, tag: sortedSnapshots[0].tag },
-        context,
-      )
-    } else {
-      // In the case where there are no real snapshots, return HEAD as a snapshot
-      return snapshot(obj, { datasetId: obj.id, tag: 'HEAD' }, context)
-    }
-  })
+/**
+ * Select the most recent snapshot from an array of snapshots
+ * @param {*} snapshots Array of snapshot objects from datalad.getSnapshots
+ */
+export const filterLatestSnapshot = snapshots => {
+  if (snapshots.length) {
+    const sortedSnapshots = Array.prototype.sort.call(
+      snapshots,
+      snapshotCreationComparison,
+    )
+    return sortedSnapshots[sortedSnapshots.length - 1].tag
+  } else {
+    return null
+  }
+}
+
+export const latestSnapshot = async (obj, _, context) => {
+  const snapshots = await datalad.getSnapshots(obj.id)
+  const snapshotTag = filterLatestSnapshot(snapshots)
+  if (snapshotTag) {
+    return await snapshot(obj, { datasetId: obj.id, tag: snapshotTag }, context)
+  } else {
+    // In the case where there are no real snapshots, return HEAD as a snapshot
+    return await snapshot(obj, { datasetId: obj.id, tag: 'HEAD' }, context)
+  }
 }
 
 /**

package/src/routes.js

@@ -6,10 +6,6 @@ import * as datalad from './handlers/datalad'
 import * as comments from './handlers/comments'
 import { clientConfig } from './handlers/config.js'
 import * as subscriptions from './handlers/subscriptions'
-import {
-  setFlagRedesign2021,
-  unsetFlagRedesign2021,
-} from './handlers/feature-flags'
 import verifyUser from './libs/authentication/verifyUser.js'
 import * as google from './libs/authentication/google.js'
 import * as orcid from './libs/authentication/orcid.js'
@@ -169,17 +165,6 @@ const routes = [
     url: '/sitemap',
     handler: sitemapHandler,
   },
-  // feature flag setters and unsetters
-  {
-    method: 'get',
-    url: '/feature/redesign-2021/enable',
-    handler: unsetFlagRedesign2021,
-  },
-  {
-    method: 'get',
-    url: '/feature/redesign-2021/disable',
-    handler: setFlagRedesign2021,
-  },
 ]
 
 // initialize routes -------------------------------

package/src/handlers/feature-flags.js

@@ -1,12 +0,0 @@
-const feature = {
-  REDESIGN_2021: 'redesign-classic',
-}
-
-export const setFlagRedesign2021 = (req, res) => {
-  res.cookie(feature.REDESIGN_2021, true).redirect('/')
-}
-
-export const unsetFlagRedesign2021 = (req, res) => {
-  res.clearCookie(feature.REDESIGN_2021)
-  res.redirect('/')
-}