@openneuro/app 4.20.5 → 4.20.6-alpha.2

package/src/scripts/queries/dataset.ts

@@ -1,9 +1,9 @@
 /**
  * Top level dataset queries only, mutations may cause refetches of these
  */
-import { gql } from '@apollo/client'
-import * as DatasetQueryFragments from '../datalad/dataset/dataset-query-fragments.js'
-import { DATASET_COMMENTS } from '../datalad/dataset/comments-fragments.js'
+import { gql } from "@apollo/client"
+import * as DatasetQueryFragments from "../datalad/dataset/dataset-query-fragments.js"
+import { DATASET_COMMENTS } from "../datalad/dataset/comments-fragments.js"
 
 /**
  * Generate the dataset page query

package/src/scripts/resources/__tests__/kibana.spec.js

@@ -1,25 +1,25 @@
-import { getKibanaURL } from '../kibana'
-import { vi } from 'vitest'
+import { getKibanaURL } from "../kibana"
+import { vi } from "vitest"
 
-vi.mock('../../config.ts')
+vi.mock("../../config.ts")
 
-describe('getKibanaURL', () => {
-  it('returns a valid url when env var ELASTICSEARCH_CLOUD_ID exists', () => {
+describe("getKibanaURL", () => {
+  it("returns a valid url when env var ELASTICSEARCH_CLOUD_ID exists", () => {
     const config = {
       elasticsearch: {
         cloudID:
-          'openneuro-staging:dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRjYjQ2MWUyYzA5ZDU0MDVlODRmM2I0NDJiMDA0NmIzOSRhMjEzNmNkMGU2YjA0NTllOTVhMWU2MDRiNTViOTY0OA==',
+          "openneuro-staging:dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRjYjQ2MWUyYzA5ZDU0MDVlODRmM2I0NDJiMDA0NmIzOSRhMjEzNmNkMGU2YjA0NTllOTVhMWU2MDRiNTViOTY0OA==",
       },
     }
     const url = getKibanaURL(config)
     expect(url).toEqual(
-      'https://a2136cd0e6b0459e95a1e604b55b9648.us-east-1.aws.found.io:9243/app/discover#/',
+      "https://a2136cd0e6b0459e95a1e604b55b9648.us-east-1.aws.found.io:9243/app/discover#/",
     )
   })
 
-  it('returns a localhost url when ELASTICSEARCH_CLOUD_ID does not exist', () => {
+  it("returns a localhost url when ELASTICSEARCH_CLOUD_ID does not exist", () => {
     const config = {}
     const url = getKibanaURL(config)
-    expect(url).toEqual('http://localhost:5601/app/discover#/')
+    expect(url).toEqual("http://localhost:5601/app/discover#/")
   })
 })

package/src/scripts/resources/kibana.js

@@ -1,11 +1,11 @@
-import { config } from '../config'
+import { config } from "../config"
 
 /**
  * Extract kibana deployment uri from ELASTICSEARCH_CLOUD_ID (prod/staging)
  *   or use localhost url.
  * For localhost url to be available, the kibana service must be enabled (docker-compose).
  */
-export const getKibanaURL = config => {
+export const getKibanaURL = (config) => {
   if (config?.elasticsearch?.cloudID) {
     const ELASTICSEARCH_CLOUD_ID = config.elasticsearch.cloudID
     const base64 = /:(.+?==)$/.exec(ELASTICSEARCH_CLOUD_ID)[1]
@@ -13,7 +13,7 @@ export const getKibanaURL = config => {
     const [, hostname, deploymentId] = /^(.+?)\$.+?\$(.+?)$/.exec(decoded)
     return `https://${deploymentId}.${hostname}:9243/app/discover#/`
   } else {
-    return 'http://localhost:5601/app/discover#/'
+    return "http://localhost:5601/app/discover#/"
   }
 }
 const url = getKibanaURL(config)

package/src/scripts/resources/strings.js

@@ -1,3 +1,3 @@
-export const pageTitle = 'OpenNeuro'
+export const pageTitle = "OpenNeuro"
 export const pageDescription =
-  'A free and open platform for analyzing and sharing neuroimaging data'
+  "A free and open platform for analyzing and sharing neuroimaging data"

package/src/scripts/routes.tsx

@@ -1,21 +1,21 @@
-import React from 'react'
-import { Route, Routes, Navigate } from 'react-router-dom'
+import React from "react"
+import { Navigate, Route, Routes } from "react-router-dom"
 
 // TODO - Re-enable code splitting these when we can
-import DatasetQuery from './dataset/dataset-query'
+import DatasetQuery from "./dataset/dataset-query"
 //import PreRefactorDatasetProps from './dataset/dataset-pre-refactor-container'
 
-import FaqPage from './pages/faq/faq'
-import FrontPageContainer from './pages/front-page/front-page'
-import Admin from './pages/admin/admin'
-import SearchRoutes from './search/search-routes'
-import APIKey from './pages/api'
-import ErrorRoute from './errors/errorRoute'
-import { PETRedirect } from './pages/pet-redirect'
-import Citation from './pages/citation-page'
-import FourOFourPage from './errors/404page'
-import { ImportDataset } from './pages/import-dataset'
-import { DatasetMetadata } from './pages/metadata/dataset-metadata'
+import FaqPage from "./pages/faq/faq"
+import FrontPageContainer from "./pages/front-page/front-page"
+import Admin from "./pages/admin/admin"
+import SearchRoutes from "./search/search-routes"
+import APIKey from "./pages/api"
+import ErrorRoute from "./errors/errorRoute"
+import { PETRedirect } from "./pages/pet-redirect"
+import Citation from "./pages/citation-page"
+import FourOFourPage from "./errors/404page"
+import { ImportDataset } from "./pages/import-dataset"
+import { DatasetMetadata } from "./pages/metadata/dataset-metadata"
 
 const AppRoutes: React.VoidFunctionComponent = () => (
   <Routes>

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

@@ -1,6 +1,6 @@
-import React from 'react'
-import { SearchParamsCtx } from '../search-params-ctx'
-import { render } from '@testing-library/react'
+import React from "react"
+import { SearchParamsCtx } from "../search-params-ctx"
+import { render } from "@testing-library/react"
 
 /**
  * Render with SearchParamsCtx state

package/src/scripts/search/__tests__/search-container.spec.tsx

@@ -1,57 +1,57 @@
-import { describe, it, expect, vi } from 'vitest'
-import { setDefaultSearch } from '../search-container'
+import { describe, expect, it, vi } from "vitest"
+import { setDefaultSearch } from "../search-container"
 
-describe('SearchContainer component', () => {
-  describe('setDefaultSearch', () => {
-    it('updates default state when a modality is provided differing from the default', () => {
-      const context = { modality_selected: 'MRI' }
+describe("SearchContainer component", () => {
+  describe("setDefaultSearch", () => {
+    it("updates default state when a modality is provided differing from the default", () => {
+      const context = { modality_selected: "MRI" }
       const setContext = vi.fn()
       setDefaultSearch(
-        'MRI',
+        "MRI",
         context,
         setContext,
-        new URLSearchParams('/search'),
+        new URLSearchParams("/search"),
       )
       expect(setContext).not.toHaveBeenCalled()
       setDefaultSearch(
-        'PET',
+        "PET",
         context,
         setContext,
-        new URLSearchParams('/search'),
+        new URLSearchParams("/search"),
       )
       expect(setContext).toHaveBeenCalled()
     })
     it('sets datasetType_select to my datasets with "mydatasets" parameter', () => {
       let context = {
-        modality_selected: 'MRI',
-        datasetType_selected: 'All Public',
+        modality_selected: "MRI",
+        datasetType_selected: "All Public",
       }
-      const setContext = vi.fn().mockImplementation(arg => {
+      const setContext = vi.fn().mockImplementation((arg) => {
         context = arg(context)
       })
       setDefaultSearch(
-        'MRI',
+        "MRI",
         context,
         setContext,
-        new URLSearchParams('mydatasets'),
+        new URLSearchParams("mydatasets"),
       )
-      expect(context.datasetType_selected).toEqual('My Datasets')
+      expect(context.datasetType_selected).toEqual("My Datasets")
     })
     it('sets datasetType_select to my datasets with "bookmarks" parameter', () => {
       let context = {
-        modality_selected: 'PET',
-        datasetType_selected: 'All Public',
+        modality_selected: "PET",
+        datasetType_selected: "All Public",
       }
-      const setContext = vi.fn().mockImplementation(arg => {
+      const setContext = vi.fn().mockImplementation((arg) => {
         context = arg(context)
       })
       setDefaultSearch(
-        'MRI',
+        "MRI",
         context,
         setContext,
-        new URLSearchParams('bookmarks'),
+        new URLSearchParams("bookmarks"),
       )
-      expect(context.datasetType_selected).toEqual('My Bookmarks')
+      expect(context.datasetType_selected).toEqual("My Bookmarks")
     })
   })
 })

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

@@ -1,12 +1,12 @@
-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 React from "react"
+import { fireEvent, render, screen } from "@testing-library/react"
+import { SearchParamsCtx, SearchParamsProvider } from "../search-params-ctx"
+import AuthorInput from "../inputs/author-input"
+import initialSearchParams from "../initial-search-params"
+import { MemoryRouter } from "react-router-dom"
 
-describe('SearchParamsProvider', () => {
-  it('restores URL searchParams state', () => {
+describe("SearchParamsProvider", () => {
+  it("restores URL searchParams state", () => {
     const route = '/search?query={"authors"%3A["Test+Author"]}'
     const wrapper = ({ children }) => (
       <MemoryRouter initialEntries={[route]}>
@@ -15,15 +15,15 @@ describe('SearchParamsProvider', () => {
     )
     render(
       <SearchParamsCtx.Consumer>
-        {value => <span>Received: {value.searchParams.authors.pop()}</span>}
+        {(value) => <span>Received: {value.searchParams.authors.pop()}</span>}
       </SearchParamsCtx.Consumer>,
       { wrapper },
     )
     expect(screen.getByText(/^Received:/).textContent).toBe(
-      'Received: Test Author',
+      "Received: Test Author",
     )
   })
-  it('edits array fields correctly', () => {
+  it("edits array fields correctly", () => {
     const route = '/search?query={"authors"%3A["Test+Author"]}'
     const wrapper = ({ children }) => (
       <MemoryRouter initialEntries={[route]}>
@@ -32,24 +32,24 @@ describe('SearchParamsProvider', () => {
     )
     render(
       <SearchParamsCtx.Consumer>
-        {value => (
+        {(value) => (
           <>
             <AuthorInput />
-            <span>Received: {value.searchParams.authors.join(', ')}</span>
+            <span>Received: {value.searchParams.authors.join(", ")}</span>
           </>
         )}
       </SearchParamsCtx.Consumer>,
       { wrapper },
     )
-    const textInput = screen.getByRole('textbox')
-    const button = screen.getByRole('button')
-    fireEvent.change(textInput, { target: { value: 'New Author' } })
+    const textInput = screen.getByRole("textbox")
+    const button = screen.getByRole("button")
+    fireEvent.change(textInput, { target: { value: "New Author" } })
     fireEvent.click(button)
     expect(screen.getByText(/^Received:/).textContent).toBe(
-      'Received: Test Author, New Author',
+      "Received: Test Author, New Author",
     )
   })
-  it('setSearchParams is callable with object argument', () => {
+  it("setSearchParams is callable with object argument", () => {
     const route = '/search?query={"authors"%3A["Test+Author"]}'
     const wrapper = ({ children }) => (
       <MemoryRouter initialEntries={[route]}>
@@ -61,7 +61,7 @@ describe('SearchParamsProvider', () => {
 
     render(
       <SearchParamsCtx.Consumer>
-        {value => {
+        {(value) => {
           setSearchParams = value.setSearchParams
           return <span>Received: {value.searchParams.authors.pop()}</span>
         }}
@@ -69,7 +69,7 @@ describe('SearchParamsProvider', () => {
       { wrapper },
     )
     expect(screen.getByText(/^Received:/).textContent).toBe(
-      'Received: Test Author',
+      "Received: Test Author",
     )
 
     expect(() => setSearchParams(initialSearchParams)).not.toThrow()

package/src/scripts/search/es-query-builders.ts

@@ -30,7 +30,7 @@ export const simpleQueryString = (
   fuzzy = true,
 ) => ({
   simple_query_string: {
-    query: `${queryString}${fuzzy ? '~' : ''}`,
+    query: `${queryString}${fuzzy ? "~" : ""}`,
     fields,
   },
 })
@@ -50,11 +50,27 @@ export const matchQuery = (
   },
 })
 
+export const multiMatchQuery = (
+  field: string,
+  queryStrings: string[],
+  fuzziness?: string,
+  operator?: string,
+) => {
+  return {
+    bool: {
+      should: queryStrings.map((queryString) =>
+        matchQuery(field, queryString, fuzziness, operator)
+      ),
+      minimum_should_match: 1,
+    },
+  }
+}
+
 export const rangeQuery = (
   field,
   gte?: number | string,
   lte?: number | string,
-  relation: string = 'INTERSECTS',
+  relation: string = "INTERSECTS",
 ) => ({
   range: {
     [field]: {
@@ -69,7 +85,7 @@ export const rangeListLengthQuery = (field, gte: number, lte: number) => {
   return {
     script: {
       script: {
-        lang: 'painless',
+        lang: "painless",
         source: `
           if (doc[params.field].size() != 0) {
             return ( doc[params.field].size() >= params.gte && doc[params.field].size() <= params.lte )
@@ -86,6 +102,6 @@ export const rangeListLengthQuery = (field, gte: number, lte: number) => {
 
 /** SimpleQueryString join multiple terms with and `+`. */
 export const sqsJoinWithAND = (list: string[]) =>
-  list.map(str => `${str}`).join(' + ')
+  list.map((str) => `${str}`).join(" + ")
 export const joinWithOR = (list: string[]) =>
-  list.map(str => `${str}`).join(' | ')
+  list.map((str) => `${str}`).join(" | ")

package/src/scripts/search/filters-block-container.tsx

@@ -1,13 +1,13 @@
-import React, { FC, useContext } from 'react'
-import { useParams, useNavigate } from 'react-router-dom'
+import React, { FC, useContext } from "react"
+import { useNavigate, useParams } from "react-router-dom"
 import {
-  SearchParamsCtx,
-  removeFilterItem,
   getSelectParams,
+  removeFilterItem,
+  SearchParamsCtx,
   useCheckIfParamsAreSelected,
-} from './search-params-ctx'
-import { FiltersBlock } from '@openneuro/components/search-page'
-import initialSearchParams from './initial-search-params'
+} from "./search-params-ctx"
+import { FiltersBlock } from "@openneuro/components/search-page"
+import initialSearchParams from "./initial-search-params"
 
 interface FiltersBlockContainerProps {
   numTotalResults: number
@@ -21,22 +21,20 @@ const FiltersBlockContainer: FC<FiltersBlockContainerProps> = ({
   const { searchParams, setSearchParams } = useContext(SearchParamsCtx)
   const selectedParams = getSelectParams(searchParams)
 
-  const noFilters = !useCheckIfParamsAreSelected(['modality_selected'])
+  const noFilters = !useCheckIfParamsAreSelected(["modality_selected"])
 
   const navigate = useNavigate()
   const { path } = useParams()
-  const globalSearchPath = '/search'
+  const globalSearchPath = "/search"
 
-  const removeFilter =
-    (isModality: boolean) =>
-    (param, value): void => {
-      removeFilterItem(setSearchParams)(param, value)
-      if (isModality) navigate(globalSearchPath)
-    }
+  const removeFilter = (isModality: boolean) => (param, value): void => {
+    removeFilterItem(setSearchParams)(param, value)
+    if (isModality) navigate(globalSearchPath)
+  }
 
   const removeAllFilters = (): void => {
     // reset params to default values
-    setSearchParams(prevState => ({
+    setSearchParams((prevState) => ({
       ...prevState,
       ...getSelectParams(initialSearchParams),
     }))

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

@@ -1,16 +1,16 @@
-import { sortBy } from '@openneuro/components/content'
+import { sortBy } from "@openneuro/components/content"
 
 const datasetType_available = [
-  { label: 'All Public', value: 'All Public' },
-  { label: 'Following', value: 'Following' },
-  { label: 'My Datasets', value: 'My Datasets' },
-  { label: 'My Bookmarks', value: 'My Bookmarks' },
+  { label: "All Public", value: "All Public" },
+  { label: "Following", value: "Following" },
+  { label: "My Datasets", value: "My Datasets" },
+  { label: "My Bookmarks", value: "My Bookmarks" },
 ]
 
 const datasetStatus_available = [
-  { label: 'Public', value: 'Public' },
-  { label: 'Shared with Me', value: 'Shared with Me' },
-  { label: 'Invalid', value: 'Invalid' },
+  { label: "Public", value: "Public" },
+  { label: "Shared with Me", value: "Shared with Me" },
+  { label: "Invalid", value: "Invalid" },
 ]
 
 type ModalityOption = {
@@ -23,9 +23,9 @@ type ModalityOption = {
 
 export const modality_available: ModalityOption[] = [
   {
-    label: 'MRI',
-    value: 'MRI',
-    portalPath: '/search/modality/mri',
+    label: "MRI",
+    value: "MRI",
+    portalPath: "/search/modality/mri",
     count: null,
     // children: [
     //   {
@@ -55,9 +55,9 @@ export const modality_available: ModalityOption[] = [
     // ],
   },
   {
-    label: 'PET',
-    value: 'PET',
-    portalPath: '/search/modality/pet',
+    label: "PET",
+    value: "PET",
+    portalPath: "/search/modality/pet",
     count: null,
     // children: [
     //   {
@@ -75,21 +75,21 @@ export const modality_available: ModalityOption[] = [
     // ],
   },
   {
-    label: 'EEG',
-    value: 'EEG',
-    portalPath: '/search/modality/eeg',
+    label: "EEG",
+    value: "EEG",
+    portalPath: "/search/modality/eeg",
     count: null,
   },
   {
-    label: 'iEEG',
-    value: 'iEEG',
-    portalPath: '/search/modality/ieeg',
+    label: "iEEG",
+    value: "iEEG",
+    portalPath: "/search/modality/ieeg",
     count: null,
   },
   {
-    label: 'MEG',
-    value: 'MEG',
-    portalPath: '/search/modality/meg',
+    label: "MEG",
+    value: "MEG",
+    portalPath: "/search/modality/meg",
     count: null,
   },
 ]
@@ -109,16 +109,16 @@ export const flattenedModalities = modality_available.reduce(
 )
 
 export const sex_list = [
-  { label: 'All', value: 'All' },
-  { label: 'Male', value: 'Male' },
-  { label: 'Female', value: 'Female' },
+  { label: "All", value: "All" },
+  { label: "Male", value: "Male" },
+  { label: "Female", value: "Female" },
 ]
 
 export const date_list = [
-  { label: 'All Time', value: 'All Time' },
-  { label: 'Last 30 days', value: 'Last 30 days' },
-  { label: 'Last 180 days', value: 'Last 180 days' },
-  { label: 'Last 12 months', value: 'Last 12 months' },
+  { label: "All Time", value: "All Time" },
+  { label: "Last 30 days", value: "Last 30 days" },
+  { label: "Last 180 days", value: "Last 180 days" },
+  { label: "Last 12 months", value: "Last 12 months" },
 ]
 
 type OptionalNumberRange = [number | null, number | null]
@@ -198,7 +198,7 @@ const TEMPORARY_initialSearchParams: SearchParams = {
   keywords: [],
   searchAllDatasets: false,
   datasetType_available,
-  datasetType_selected: 'All Public',
+  datasetType_selected: "All Public",
   datasetStatus_available,
   datasetStatus_selected: null,
   modality_available,
@@ -206,28 +206,28 @@ const TEMPORARY_initialSearchParams: SearchParams = {
   ageRange: [null, null],
   subjectCountRange: [null, null],
   diagnosis_available: [
-    'Healthy / Control',
-    'Schizophrenia',
-    'ADD/ADHD',
-    'Alzheimers',
-    'Other',
+    "Healthy / Control",
+    "Schizophrenia",
+    "ADD/ADHD",
+    "Alzheimers",
+    "Other",
   ],
   diagnosis_selected: null,
   tasks: [],
   authors: [],
   // more
-  sex_available: ['All', 'Male', 'Female'],
-  sex_selected: 'All',
+  sex_available: ["All", "Male", "Female"],
+  sex_selected: "All",
   date_available: [
-    'All Time',
-    'Last 30 days',
-    'Last 180 days',
-    'Last 12 months',
+    "All Time",
+    "Last 30 days",
+    "Last 180 days",
+    "Last 12 months",
   ],
-  date_selected: 'All Time',
-  species_available: ['Human', 'Rat', 'Mouse', 'Other'],
+  date_selected: "All Time",
+  species_available: ["Human", "Rat", "Mouse", "Other"],
   species_selected: null,
-  section_available: ['Cross-Sectional', 'Longitudinal', 'Other'],
+  section_available: ["Cross-Sectional", "Longitudinal", "Other"],
   section_selected: null,
   studyDomains: [],
   bodyParts: [],