@openneuro/server 4.14.1 → 4.14.2-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.14.1",
+  "version": "4.14.2-alpha.0",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -17,7 +17,7 @@
   "dependencies": {
     "@apollo/client": "3.7.2",
     "@elastic/elasticsearch": "7.15.0",
-    "@openneuro/search": "^4.14.1",
+    "@openneuro/search": "^4.14.2-alpha.0",
     "@passport-next/passport-google-oauth2": "^1.0.0",
     "@sentry/node": "^4.5.3",
     "apollo-server": "2.25.4",
@@ -92,5 +92,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "594ef5282269b36a749327f39bc39253dbdec83f"
+  "gitHead": "17f642273df2fdd5bbfd490d0eb9a51109b0ea4f"
 }

package/src/datalad/__tests__/description.spec.js

@@ -1,7 +1,6 @@
 import request from 'superagent'
 import {
   getDescriptionObject,
-  defaultDescription,
   repairDescriptionTypes,
   appendSeniorAuthor,
 } from '../description.js'
@@ -96,9 +95,7 @@ describe('datalad dataset descriptions', () => {
       body: { Name: 'Balloon Analog Risk-taking Task' },
       type: 'application/json',
     })
-    const description = await getDescriptionObject('ds000001')([
-      { filename: 'dataset_description.json', id: '12345' },
-    ])
+    const description = await getDescriptionObject('ds000001', '1.0.0')
     expect(description).toEqual({ Name: 'Balloon Analog Risk-taking Task' })
   })
   it('handles a corrupted response', async () => {
@@ -106,15 +103,11 @@ describe('datalad dataset descriptions', () => {
     request.__setMockResponse({
       body: Buffer.from('0x5f3759df', 'hex'),
     })
-    const description = await getDescriptionObject('ds000001')([
-      { filename: 'dataset_description.json', id: '12345' },
-    ])
-    expect(description).toEqual(defaultDescription)
+    const description = await getDescriptionObject('ds000001', '1.0.0')
+    expect(description).toEqual({ Name: 'ds000001', BIDSVersion: '1.8.0' })
   })
   it('works without a dataset_description.json being present', async () => {
-    const description = await getDescriptionObject('ds000001')([
-      { filename: 'LICENSE', id: '12345' },
-    ])
-    expect(description).toEqual(defaultDescription)
+    const description = await getDescriptionObject('ds000001', '1.0.0')
+    expect(description).toEqual({ Name: 'ds000001', BIDSVersion: '1.8.0' })
   })
 })

package/src/datalad/description.js

@@ -5,39 +5,33 @@ import config from '../config'
 import request from 'superagent'
 import { redis } from '../libs/redis.js'
 import { commitFiles } from './dataset.js'
-import { fileUrl, getFiles } from './files.js'
+import { fileUrl } from './files.js'
 import { generateDataladCookie } from '../libs/authentication/jwt'
 import { getDatasetWorker } from '../libs/datalad-service'
 import CacheItem, { CacheType } from '../cache/item'
 import { datasetOrSnapshot } from '../utils/datasetOrSnapshot'
 
-export const defaultDescription = {
-  Name: 'Unnamed Dataset',
-  BIDSVersion: '1.1.1',
-}
-
 /**
  * Find dataset_description.json id and fetch description object
  * @param {string} datasetId
- * @returns {(files: [Record<string, unknown>]) => Promise<Record<string, unknown>>} Promise resolving to dataset_description.json contents or defaults
+ * @returns {Promise<Record<string, unknown>>} Promise resolving to dataset_description.json contents or defaults
  */
-export const getDescriptionObject = datasetId => files => {
-  const file = files.find(f => f.filename === 'dataset_description.json')
-  if (file) {
-    return request
-      .get(fileUrl(datasetId, '', 'dataset_description.json'))
-      .then(({ body, type }) => {
-        // Guard against non-JSON responses
-        if (type === 'application/json') return body
-        else throw new Error('dataset_description.json is not JSON')
-      })
-      .catch(() => {
-        // dataset_description does not exist or is not JSON, return default fields
-        return defaultDescription
-      })
-  } else {
-    return Promise.resolve(defaultDescription)
+export const getDescriptionObject = (datasetId, revision) => {
+  const defaultDescription = {
+    Name: datasetId,
+    BIDSVersion: '1.8.0',
   }
+  return request
+    .get(fileUrl(datasetId, '', 'dataset_description.json', revision))
+    .then(({ body, type }) => {
+      // Guard against non-JSON responses
+      if (type === 'application/json') return body
+      else throw new Error('dataset_description.json is not JSON')
+    })
+    .catch(() => {
+      // dataset_description does not exist or is not JSON, return default fields
+      return defaultDescription
+    })
 }
 
 export const descriptionCacheKey = (datasetId, revision) => {
@@ -126,9 +120,9 @@ export const description = obj => {
   ])
   return cache
     .get(() => {
-      return getFiles(datasetId, revision)
-        .then(getDescriptionObject(datasetId))
-        .then(uncachedDescription => ({ id: revision, ...uncachedDescription }))
+      return getDescriptionObject(datasetId, revision).then(
+        uncachedDescription => ({ id: revision, ...uncachedDescription }),
+      )
     })
     .then(description => repairDescriptionTypes(description))
     .then(description => appendSeniorAuthor(description))

package/src/datalad/files.js

@@ -34,13 +34,19 @@ export const getFileName = (path, filename) => {
  * @param {String} datasetId
  * @param {String} path - Relative path for the file
  * @param {String} filename
+ * @param {String} [revision] - Git hash of commit or tree owning this file
  */
-export const fileUrl = (datasetId, path, filename) => {
+export const fileUrl = (datasetId, path, filename, revision) => {
   const fileName = getFileName(path, filename)
-  const url = `http://${getDatasetWorker(
-    datasetId,
-  )}/datasets/${datasetId}/files/${fileName}`
-  return url
+  if (revision) {
+    return `http://${getDatasetWorker(
+      datasetId,
+    )}/datasets/${datasetId}/snapshots/${revision}/files/${fileName}`
+  } else {
+    return `http://${getDatasetWorker(
+      datasetId,
+    )}/datasets/${datasetId}/files/${fileName}`
+  }
 }
 
 /**