@openneuro/app 4.12.0 → 4.12.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/app",
-  "version": "4.12.0",
+  "version": "4.12.2",
   "description": "React JS web frontend for the OpenNeuro platform.",
   "license": "MIT",
   "main": "public/client.js",
@@ -20,8 +20,8 @@
     "@emotion/react": "11.6.0",
     "@emotion/styled": "11.6.0",
     "@niivue/niivue": "0.23.1",
-    "@openneuro/client": "^4.12.0",
-    "@openneuro/components": "^4.12.0",
+    "@openneuro/client": "^4.12.2",
+    "@openneuro/components": "^4.12.2",
     "bids-validator": "1.9.9",
     "bytes": "^3.0.0",
     "comlink": "^4.0.5",
@@ -104,5 +104,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "611c84329ef63f730878f701aafaa1bc4c703ea4"
+  "gitHead": "d36002753b049a7d4d2fc8edd904c57a0bd35596"
 }

package/src/scripts/datalad/dataset/dataset-query-fragments.js

@@ -59,6 +59,7 @@ export const DRAFT_FILES_FRAGMENT = gql`
         size
         directory
         annexed
+        urls
       }
     }
   }
@@ -162,6 +163,7 @@ export const SNAPSHOT_FIELDS = gql`
       size
       directory
       annexed
+      urls
     }
     summary {
       modalities

package/src/scripts/dataset/files/file-tree-unloaded-directory.jsx

@@ -15,6 +15,7 @@ export const DRAFT_FILES_QUERY = gql`
           size
           directory
           annexed
+          urls
         }
       }
     }
@@ -31,6 +32,7 @@ export const SNAPSHOT_FILES_QUERY = gql`
         size
         directory
         annexed
+        urls
       }
     }
   }

package/src/scripts/dataset/files/file-tree.tsx

@@ -37,10 +37,11 @@ export function fileTreeLevels(
     if (path === '' ? f.filename.includes(':') : lowerPath.includes(':')) {
       // At the top level, use the directory component (first segment)
       // Below that, use all paths before the filename (sub-01:anat) for (sub-01:anat:sub-01_T1w.nii.gz)
+      const components = f.filename.split(':')
       const childPath =
         path === ''
-          ? f.filename.split(':')[0]
-          : f.filename.split(':').slice(0, -1).join(':')
+          ? components[0]
+          : components.slice(0, path.split(':').length + 1).join(':')
       if (childFiles.hasOwnProperty(childPath)) {
         childFiles[childPath].push(f)
       } else {

package/src/scripts/search/__helpers__/search-render.tsx

@@ -0,0 +1,15 @@
+import React from 'react'
+import { SearchParamsCtx } from '../search-params-ctx'
+import { render } from '@testing-library/react'
+
+/**
+ * Render with SearchParamsCtx state
+ */
+export const searchRender = (ui, { providerProps, ...renderOptions }) => {
+  return render(
+    <SearchParamsCtx.Provider {...providerProps}>
+      {ui}
+    </SearchParamsCtx.Provider>,
+    renderOptions,
+  )
+}

package/src/scripts/search/__tests__/search-params-ctx.spec.tsx

@@ -2,21 +2,10 @@ import React from 'react'
 import { render, screen, fireEvent } from '@testing-library/react'
 import { SearchParamsProvider, SearchParamsCtx } from '../search-params-ctx'
 import AuthorInput from '../inputs/author-input'
+import initialSearchParams from '../initial-search-params'
 import { MemoryRouter } from 'react-router-dom'
 import '@testing-library/jest-dom'
 
-/**
- * Render with SearchParamsCtx state
- */
-export const searchRender = (ui, { providerProps, ...renderOptions }) => {
-  return render(
-    <SearchParamsCtx.Provider {...providerProps}>
-      {ui}
-    </SearchParamsCtx.Provider>,
-    renderOptions,
-  )
-}
-
 describe('SearchParamsProvider', () => {
   it('restores URL searchParams state', () => {
     const route = '/search?query={"authors"%3A["Test+Author"]}'
@@ -61,4 +50,29 @@ describe('SearchParamsProvider', () => {
       'Received: Test Author, New Author',
     )
   })
+  it('setSearchParams is callable with object argument', () => {
+    const route = '/search?query={"authors"%3A["Test+Author"]}'
+    const wrapper = ({ children }) => (
+      <MemoryRouter initialEntries={[route]}>
+        <SearchParamsProvider>{children}</SearchParamsProvider>
+      </MemoryRouter>
+    )
+
+    let setSearchParams
+
+    render(
+      <SearchParamsCtx.Consumer>
+        {value => {
+          setSearchParams = value.setSearchParams
+          return <span>Received: {value.searchParams.authors.pop()}</span>
+        }}
+      </SearchParamsCtx.Consumer>,
+      { wrapper },
+    )
+    expect(screen.getByText(/^Received:/).textContent).toBe(
+      'Received: Test Author',
+    )
+
+    expect(() => setSearchParams(initialSearchParams)).not.toThrow()
+  })
 })

package/src/scripts/search/inputs/__tests__/sort-by-select.spec.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { screen } from '@testing-library/react'
-import { searchRender } from '../../__tests__/search-params-ctx.spec'
+import { searchRender } from '../../__helpers__/search-render'
 import SortBySelect from '../sort-by-select'
 import initialSearchParams from '../../initial-search-params'
 

package/src/scripts/search/search-params-ctx.tsx

@@ -1,6 +1,6 @@
 import React, { createContext, useContext, FC, ReactNode } from 'react'
 import { useSearchParams } from 'react-router-dom'
-import initialSearchParams from './initial-search-params'
+import initialSearchParams, { SearchParams } from './initial-search-params'
 
 export const SearchParamsCtx = createContext(null)
 
@@ -23,8 +23,13 @@ export const SearchParamsProvider: FC<SearchParamsProviderProps> = ({
     console.error(err)
   }
 
-  const setSearchParams = newParamsCall => {
-    const merged = { ...searchParams, ...newParamsCall(searchParams) }
+  const setSearchParams = (
+    newParams: SearchParams | ((prevState: SearchParams) => SearchParams),
+  ): void => {
+    const merged =
+      typeof newParams == 'function'
+        ? { ...searchParams, ...newParams(searchParams) }
+        : { ...searchParams, ...newParams }
     setSearch(
       {
         query: JSON.stringify(merged),