@openneuro/app 4.20.4 → 4.20.6-alpha.2

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

@@ -1,45 +1,45 @@
-import React, { FC, useContext, useEffect } from 'react'
-import { useLocation } from 'react-router-dom'
+import React, { FC, useContext, useEffect } from "react"
+import { useLocation } from "react-router-dom"
 import {
   SearchPage,
   SearchResultsList,
-} from '@openneuro/components/search-page'
+} from "@openneuro/components/search-page"
 import {
   getUnexpiredProfile,
   hasEditPermissions,
-} from '../authentication/profile'
-import { Button } from '@openneuro/components/button'
-import { Loading } from '@openneuro/components/loading'
+} from "../authentication/profile"
+import { Button } from "@openneuro/components/button"
+import { Loading } from "@openneuro/components/loading"
 import {
-  KeywordInput,
-  AllDatasetsToggle,
-  ModalitySelect,
-  ShowDatasetRadios,
   AgeRangeInput,
-  SubjectCountRangeInput,
-  DiagnosisSelect,
-  TaskInput,
+  AllDatasetsToggle,
   AuthorInput,
-  SexRadios,
-  DateRadios,
-  SpeciesSelect,
-  SectionSelect,
-  StudyDomainInput,
   BodyPartsInput,
+  DateRadios,
+  DiagnosisSelect,
+  KeywordInput,
+  ModalitySelect,
   ScannerManufacturers,
   ScannerManufacturersModelNames,
+  SectionSelect,
+  SexRadios,
+  ShowDatasetRadios,
+  SortBySelect,
+  SpeciesSelect,
+  StudyDomainInput,
+  SubjectCountRangeInput,
+  TaskInput,
   TracerNames,
   TracerRadionuclides,
-  SortBySelect,
-} from './inputs'
-import FiltersBlockContainer from './filters-block-container'
-import AggregateCountsContainer from '../pages/front-page/aggregate-queries/aggregate-counts-container'
-import { useCookies } from 'react-cookie'
-import { useSearchResults } from './use-search-results'
-import { SearchParamsCtx } from './search-params-ctx'
-import { SearchParams } from './initial-search-params'
-import Helmet from 'react-helmet'
-import AdminUser from '../authentication/admin-user.jsx'
+} from "./inputs"
+import FiltersBlockContainer from "./filters-block-container"
+import AggregateCountsContainer from "../pages/front-page/aggregate-queries/aggregate-counts-container"
+import { useCookies } from "react-cookie"
+import { useSearchResults } from "./use-search-results"
+import { SearchParamsCtx } from "./search-params-ctx"
+import { SearchParams } from "./initial-search-params"
+import Helmet from "react-helmet"
+import AdminUser from "../authentication/admin-user.jsx"
 
 export interface SearchContainerProps {
   portalContent?: Record<string, any>
@@ -54,29 +54,29 @@ export const setDefaultSearch = (
   setSearchParams: (newParams: Record<string, any>) => void,
   query: URLSearchParams,
 ): void => {
-  if (query.has('mydatasets')) {
+  if (query.has("mydatasets")) {
     setSearchParams(
       (prevState: SearchParams): SearchParams => ({
         ...prevState,
-        datasetType_selected: 'My Datasets',
+        datasetType_selected: "My Datasets",
       }),
     )
   }
-  if (query.has('bookmarks')) {
+  if (query.has("bookmarks")) {
     setSearchParams(
       (prevState: SearchParams): SearchParams => ({
         ...prevState,
-        datasetType_selected: 'My Bookmarks',
+        datasetType_selected: "My Bookmarks",
       }),
     )
   }
 
   const modalitiesWithSecondaries = {
-    MRI: ['MRI', 'Diffusion', 'Structural', 'Functional', 'ASL Perfusion'],
-    PET: ['PET', 'Static', 'Dynamic'],
-    EEG: ['EEG'],
-    iEEG: ['iEEG'],
-    MEG: ['MEG'],
+    MRI: ["MRI", "Diffusion", "Structural", "Functional", "ASL Perfusion"],
+    PET: ["PET", "Static", "Dynamic"],
+    EEG: ["EEG"],
+    iEEG: ["iEEG"],
+    MEG: ["MEG"],
   }
   if (
     modality &&
@@ -111,22 +111,20 @@ const SearchContainer: FC<SearchContainerProps> = ({ portalContent }) => {
 
   const { loading, data, fetchMore, refetch, variables, error } =
     useSearchResults()
-  const loadMore = loading
-    ? () => {}
-    : () => {
-        fetchMore({
-          variables: {
-            // ...variables,
-            cursor: data?.datasets?.pageInfo.endCursor,
-          },
-        })
-      }
+  const loadMore = loading ? () => {} : () => {
+    fetchMore({
+      variables: {
+        // ...variables,
+        cursor: data?.datasets?.pageInfo.endCursor,
+      },
+    })
+  }
   let numTotalResults = 0
   let resultsList = []
   let hasNextPage = false
 
   if (data?.datasets) {
-    const edges = data.datasets.edges.filter(edge => edge)
+    const edges = data.datasets.edges.filter((edge) => edge)
     numTotalResults = data.datasets.pageInfo.count
     resultsList = edges
     hasNextPage = data.datasets.pageInfo.hasNextPage
@@ -135,7 +133,7 @@ const SearchContainer: FC<SearchContainerProps> = ({ portalContent }) => {
   return (
     <>
       <Helmet>
-        <title>OpenNeuro - {portalContent ? modality : ''} Search</title>
+        <title>OpenNeuro - {portalContent ? modality : ""} Search</title>
       </Helmet>
       <SearchPage
         portalContent={portalContent}
@@ -152,8 +150,8 @@ const SearchContainer: FC<SearchContainerProps> = ({ portalContent }) => {
         renderSearchHeader={() => (
           <>
             {portalContent
-              ? 'Search ' + modality + ' Portal'
-              : 'Search All Datasets'}
+              ? "Search " + modality + " Portal"
+              : "Search All Datasets"}
           </>
         )}
         renderSearchFacets={() => (
@@ -163,11 +161,9 @@ const SearchContainer: FC<SearchContainerProps> = ({ portalContent }) => {
               <AllDatasetsToggle />
             </AdminUser>
             {!searchParams.searchAllDatasets && <ShowDatasetRadios />}
-            {!portalContent ? (
-              <ModalitySelect portalStyles={true} label="Modalities" />
-            ) : (
-              <ModalitySelect portalStyles={false} label="Choose Modality" />
-            )}
+            {!portalContent
+              ? <ModalitySelect portalStyles={true} label="Modalities" />
+              : <ModalitySelect portalStyles={false} label="Choose Modality" />}
             <AgeRangeInput />
             <SubjectCountRangeInput />
             <DiagnosisSelect />
@@ -179,12 +175,12 @@ const SearchContainer: FC<SearchContainerProps> = ({ portalContent }) => {
             <SectionSelect />
             <StudyDomainInput />
             {(portalContent === undefined ||
-              portalContent?.modality === 'PET') && (
+              portalContent?.modality === "PET") && (
               <>
                 <TracerNames />
               </>
             )}
-            {portalContent?.modality === 'PET' && (
+            {portalContent?.modality === "PET" && (
               <>
                 <BodyPartsInput />
                 <ScannerManufacturers />
@@ -195,34 +191,36 @@ const SearchContainer: FC<SearchContainerProps> = ({ portalContent }) => {
           </>
         )}
         renderLoading={() =>
-          loading ? (
-            <div className="search-loading">
-              <Loading />
-            </div>
-          ) : null
-        }
-        renderSearchResultsList={() =>
-          !loading && numTotalResults === 0 ? (
-            <h3>No results: please broaden your search.</h3>
-          ) : (
-            <>
-              <SearchResultsList
-                hasEditPermissions={hasEditPermissions}
-                items={resultsList}
-                profile={profile}
-                datasetTypeSelected={searchParams.datasetType_selected}
-              />
-              {/* TODO: make div below into display component. */}
-              <div className="grid grid-nogutter" style={{ width: '100%' }}>
-                {resultsList.length == 0 || !hasNextPage ? null : (
-                  <div className="col col-12 load-more m-t-10">
-                    <Button label="Load More" onClick={loadMore} />
-                  </div>
-                )}
+          loading
+            ? (
+              <div className="search-loading">
+                <Loading />
               </div>
-            </>
-          )
-        }
+            )
+            : null}
+        renderSearchResultsList={() =>
+          !loading && numTotalResults === 0
+            ? <h3>No results: please broaden your search.</h3>
+            : (
+              <>
+                <SearchResultsList
+                  hasEditPermissions={hasEditPermissions}
+                  items={resultsList}
+                  profile={profile}
+                  datasetTypeSelected={searchParams.datasetType_selected}
+                />
+                {/* TODO: make div below into display component. */}
+                <div className="grid grid-nogutter" style={{ width: "100%" }}>
+                  {resultsList.length == 0 || !hasNextPage
+                    ? null
+                    : (
+                      <div className="col col-12 load-more m-t-10">
+                        <Button label="Load More" onClick={loadMore} />
+                      </div>
+                    )}
+                </div>
+              </>
+            )}
       />
     </>
   )

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, { SearchParams } from './initial-search-params'
+import React, { createContext, FC, ReactNode, useContext } from "react"
+import { useSearchParams } from "react-router-dom"
+import initialSearchParams, { SearchParams } from "./initial-search-params"
 
 export const SearchParamsCtx = createContext(null)
 
@@ -15,7 +15,7 @@ export const SearchParamsProvider: FC<SearchParamsProviderProps> = ({
 
   let searchParams
   try {
-    const query = searchQuery.get('query')
+    const query = searchQuery.get("query")
     if (query) {
       searchParams = JSON.parse(query)
     }
@@ -26,10 +26,9 @@ export const SearchParamsProvider: FC<SearchParamsProviderProps> = ({
   const setSearchParams = (
     newParams: SearchParams | ((prevState: SearchParams) => SearchParams),
   ): void => {
-    const merged =
-      typeof newParams == 'function'
-        ? { ...searchParams, ...newParams(searchParams) }
-        : { ...searchParams, ...newParams }
+    const merged = typeof newParams == "function"
+      ? { ...searchParams, ...newParams(searchParams) }
+      : { ...searchParams, ...newParams }
     setSearch(
       {
         query: JSON.stringify(merged),
@@ -43,51 +42,53 @@ export const SearchParamsProvider: FC<SearchParamsProviderProps> = ({
       value={{
         searchParams: { ...initialSearchParams, ...searchParams },
         setSearchParams,
-      }}>
+      }}
+    >
       {children}
     </SearchParamsCtx.Provider>
   )
 }
 
-export const removeFilterItem = setSearchParams => (param, value) => {
+export const removeFilterItem = (setSearchParams) => (param, value) => {
   const updatedParams = {}
   switch (param) {
     /* Handle simple filter resets. */
-    case 'datasetType_selected':
+    case "datasetType_selected":
       // when datasetType is unset, unset datasetStatus as well
-      updatedParams['datasetStatus_selected'] =
-        initialSearchParams['datasetStatus_selected']
-    case 'modality_selected':
-    case 'datasetStatus_selected':
-    case 'ageRange':
-    case 'subjectCountRange':
-    case 'sex_selected':
-    case 'date_selected':
-    case 'diagnosis_selected':
-    case 'section_selected':
-    case 'species_selected':
+      updatedParams["datasetStatus_selected"] =
+        initialSearchParams["datasetStatus_selected"]
+    case "modality_selected":
+    case "datasetStatus_selected":
+    case "ageRange":
+    case "subjectCountRange":
+    case "sex_selected":
+    case "date_selected":
+    case "diagnosis_selected":
+    case "section_selected":
+    case "species_selected":
       updatedParams[param] = initialSearchParams[param]
-      setSearchParams(prevState => ({
+      setSearchParams((prevState) => ({
         ...prevState,
         ...updatedParams,
       }))
       break
 
     /* Handle removal of filters in arrays. */
-    case 'keywords':
-    case 'authors':
-    case 'tasks':
-    case 'bodyParts':
-    case 'scannerManufacturers':
-    case 'scannerManufacturersModelNames':
-    case 'tracerNames':
-    case 'tracerRadionuclides':
-    case 'studyDomains':
-      setSearchParams(prevState => {
+    case "keywords":
+    case "authors":
+    case "tasks":
+    case "bodyParts":
+    case "scannerManufacturers":
+    case "scannerManufacturersModelNames":
+    case "tracerNames":
+    case "tracerRadionuclides":
+    case "studyDomains":
+      setSearchParams((prevState) => {
         const list = prevState[param]
         const i = list.indexOf(value)
-        const newList =
-          i === -1 ? list : [...list.slice(0, i), ...list.slice(i + 1)]
+        const newList = i === -1
+          ? list
+          : [...list.slice(0, i), ...list.slice(i + 1)]
         return {
           ...prevState,
           [param]: newList,
@@ -152,14 +153,15 @@ export const useCheckIfParamsAreSelected = (ignore: string[]): boolean => {
   const { searchParams } = useContext(SearchParamsCtx)
   const selectedParams = getSelectParams(searchParams)
 
-  const someParamsAreSelected = Object.keys(selectedParams).some(key => {
+  const someParamsAreSelected = Object.keys(selectedParams).some((key) => {
     if (ignore.includes(key)) return false
     // check if a search param has been changed from it's initial value
-    else
+    else {
       return (
         JSON.stringify(selectedParams[key]) !==
-        JSON.stringify(initialSearchParams[key])
+          JSON.stringify(initialSearchParams[key])
       )
+    }
   })
   return someParamsAreSelected
 }

package/src/scripts/search/search-routes.tsx

@@ -1,7 +1,7 @@
-import React, { FC } from 'react'
-import { Route, Routes } from 'react-router-dom'
-import SearchContainer from './search-container'
-import { portalContent } from '@openneuro/components/content'
+import React, { FC } from "react"
+import { Route, Routes } from "react-router-dom"
+import SearchContainer from "./search-container"
+import { portalContent } from "@openneuro/components/content"
 
 const SearchRoutes: FC = () => (
   <Routes>