@openneuro/app 4.33.3 → 4.34.0-alpha.0

package/src/scripts/search/inputs/pet/scannerManufacturers_input.tsx

@@ -2,9 +2,10 @@ import React, { useContext } from "react"
 import type { FC } from "react"
 import useState from "react-usestateref"
 import { removeFilterItem, SearchParamsCtx } from "../../search-params-ctx"
-import { FacetSearch } from "@openneuro/components/facets"
-import { Icon } from "@openneuro/components/icon"
-import { AccordionTab, AccordionWrap } from "@openneuro/components/accordion"
+import { FacetSearch } from "../../../components/facets/FacetSearch"
+import { Icon } from "../../../components/icon/Icon"
+import { AccordionTab } from "../../../components/accordion/AccordionTab"
+import { AccordionWrap } from "../../../components/accordion/AccordionWrap"
 
 const ScannerManufacturersInput: FC = () => {
   const { searchParams, setSearchParams } = useContext(SearchParamsCtx)

package/src/scripts/search/inputs/pet/tracerNames_input.tsx

@@ -2,9 +2,10 @@ import React, { useContext } from "react"
 import type { FC } from "react"
 import useState from "react-usestateref"
 import { removeFilterItem, SearchParamsCtx } from "../../search-params-ctx"
-import { FacetSearch } from "@openneuro/components/facets"
-import { Icon } from "@openneuro/components/icon"
-import { AccordionTab, AccordionWrap } from "@openneuro/components/accordion"
+import { FacetSearch } from "../../../components/facets/FacetSearch"
+import { Icon } from "../../../components/icon/Icon"
+import { AccordionTab } from "../../../components/accordion/AccordionTab"
+import { AccordionWrap } from "../../../components/accordion/AccordionWrap"
 
 const TracerNamesInput: FC = () => {
   const { searchParams, setSearchParams } = useContext(SearchParamsCtx)

package/src/scripts/search/inputs/pet/tracerRadionuclides_input.tsx

@@ -2,9 +2,10 @@ import React, { useContext } from "react"
 import type { FC } from "react"
 import useState from "react-usestateref"
 import { removeFilterItem, SearchParamsCtx } from "../../search-params-ctx"
-import { FacetSearch } from "@openneuro/components/facets"
-import { Icon } from "@openneuro/components/icon"
-import { AccordionTab, AccordionWrap } from "@openneuro/components/accordion"
+import { FacetSearch } from "../../../components/facets/FacetSearch"
+import { Icon } from "../../../components/icon/Icon"
+import { AccordionTab } from "../../../components/accordion/AccordionTab"
+import { AccordionWrap } from "../../../components/accordion/AccordionWrap"
 
 const TracerRadionuclidesInput: FC = () => {
   const { searchParams, setSearchParams } = useContext(SearchParamsCtx)

package/src/scripts/search/inputs/section-select.tsx

@@ -1,8 +1,9 @@
 import React, { useContext } from "react"
 import type { FC } from "react"
 import { SearchParamsCtx } from "../search-params-ctx"
-import { FacetSelect } from "@openneuro/components/facets"
-import { AccordionTab, AccordionWrap } from "@openneuro/components/accordion"
+import { FacetSelect } from "../../components/facets/FacetSelect"
+import { AccordionTab } from "../../components/accordion/AccordionTab"
+import { AccordionWrap } from "../../components/accordion/AccordionWrap"
 
 const SectionSelect: FC = () => {
   const { searchParams, setSearchParams } = useContext(SearchParamsCtx)

package/src/scripts/search/inputs/sex-radios.tsx

@@ -1,8 +1,9 @@
 import React, { useContext } from "react"
 import type { FC } from "react"
 import { SearchParamsCtx } from "../search-params-ctx"
-import { FacetRadio } from "@openneuro/components/facets"
-import { AccordionTab, AccordionWrap } from "@openneuro/components/accordion"
+import { FacetRadio } from "../../components/facets/FacetRadio"
+import { AccordionTab } from "../../components/accordion/AccordionTab"
+import { AccordionWrap } from "../../components/accordion/AccordionWrap"
 
 const SexRadios: FC = () => {
   const { searchParams, setSearchParams } = useContext(SearchParamsCtx)

package/src/scripts/search/inputs/show-datasets-radios.tsx

@@ -1,11 +1,12 @@
 import React, { useContext } from "react"
 import type { FC } from "react"
 import { SearchParamsCtx } from "../search-params-ctx"
-import { RadioGroup } from "@openneuro/components/radio"
-import { FacetSelect } from "@openneuro/components/facets"
+import { RadioGroup } from "../../components/radio/RadioGroup"
+import { FacetSelect } from "../../components/facets/FacetSelect"
 import { useCookies } from "react-cookie"
 import { getUnexpiredProfile } from "../../authentication/profile"
-import { AccordionTab, AccordionWrap } from "@openneuro/components/accordion"
+import { AccordionTab } from "../../components/accordion/AccordionTab"
+import { AccordionWrap } from "../../components/accordion/AccordionWrap"
 
 const ShowDatasetsRadios: FC = () => {
   const [cookies] = useCookies()

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

@@ -1,7 +1,7 @@
 import React, { useContext } from "react"
 import type { FC } from "react"
 import { SearchParamsCtx } from "../search-params-ctx"
-import { SearchSort } from "@openneuro/components/search-page"
+import { SearchSort } from "../../components/search-page/SearchSort"
 
 interface SortBySelectProps {
   /* eslint-disable-next-line @typescript-eslint/no-explicit-any */

package/src/scripts/search/inputs/species-select.tsx

@@ -1,8 +1,9 @@
 import React, { useContext } from "react"
 import type { FC } from "react"
 import { SearchParamsCtx } from "../search-params-ctx"
-import { FacetSelect } from "@openneuro/components/facets"
-import { AccordionTab, AccordionWrap } from "@openneuro/components/accordion"
+import { FacetSelect } from "../../components/facets/FacetSelect"
+import { AccordionTab } from "../../components/accordion/AccordionTab"
+import { AccordionWrap } from "../../components/accordion/AccordionWrap"
 
 const SpeciesSelect: FC = () => {
   const { searchParams, setSearchParams } = useContext(SearchParamsCtx)

package/src/scripts/search/inputs/study-domain-input.tsx

@@ -2,9 +2,10 @@ import React, { useContext } from "react"
 import type { FC } from "react"
 import useState from "react-usestateref"
 import { removeFilterItem, SearchParamsCtx } from "../search-params-ctx"
-import { FacetSearch } from "@openneuro/components/facets"
-import { Icon } from "@openneuro/components/icon"
-import { AccordionTab, AccordionWrap } from "@openneuro/components/accordion"
+import { FacetSearch } from "../../components/facets/FacetSearch"
+import { Icon } from "../../components/icon/Icon"
+import { AccordionTab } from "../../components/accordion/AccordionTab"
+import { AccordionWrap } from "../../components/accordion/AccordionWrap"
 
 const StudyDomainInput: FC = () => {
   const { searchParams, setSearchParams } = useContext(SearchParamsCtx)

package/src/scripts/search/inputs/subject-count-range-input.tsx

@@ -1,8 +1,9 @@
 import React, { useContext } from "react"
 import type { FC } from "react"
 import { SearchParamsCtx } from "../search-params-ctx"
-import { FacetRange } from "@openneuro/components/facets"
-import { AccordionTab, AccordionWrap } from "@openneuro/components/accordion"
+import { FacetRange } from "../../components/facets/FacetRange"
+import { AccordionTab } from "../../components/accordion/AccordionTab"
+import { AccordionWrap } from "../../components/accordion/AccordionWrap"
 
 const SubjectCountRangeInput: FC = () => {
   const min = 0

package/src/scripts/search/inputs/task-input.tsx

@@ -2,9 +2,10 @@ import React, { useContext } from "react"
 import type { FC } from "react"
 import useState from "react-usestateref"
 import { removeFilterItem, SearchParamsCtx } from "../search-params-ctx"
-import { FacetSearch } from "@openneuro/components/facets"
-import { Icon } from "@openneuro/components/icon"
-import { AccordionTab, AccordionWrap } from "@openneuro/components/accordion"
+import { FacetSearch } from "../../components/facets/FacetSearch"
+import { Icon } from "../../components/icon/Icon"
+import { AccordionTab } from "../../components/accordion/AccordionTab"
+import { AccordionWrap } from "../../components/accordion/AccordionWrap"
 
 const TaskInput: FC = () => {
   const { searchParams, setSearchParams } = useContext(SearchParamsCtx)

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

@@ -1,17 +1,15 @@
 import React, { useContext, useEffect } from "react"
 import type { FC } from "react"
 import { useLocation } from "react-router-dom"
-import {
-  SearchPage,
-  SearchResultsList,
-} from "@openneuro/components/search-page"
+import { SearchPage } from "../components/search-page/SearchPage"
+import { SearchResultsList } from "../components/search-page/SearchResultsList"
+import { NeurobagelSearch } from "../components/search-page/NeurobagelSearch"
 import {
   getUnexpiredProfile,
   hasEditPermissions,
 } from "../authentication/profile"
-import { Button } from "@openneuro/components/button"
-import { Loading } from "@openneuro/components/loading"
-import { NeurobagelSearch } from "@openneuro/components/search-page"
+import { Button } from "../components/button/Button"
+import { Loading } from "../components/loading/Loading"
 import {
   AgeRangeInput,
   AllDatasetsToggle,
@@ -81,13 +79,13 @@ export const setDefaultSearch = (
   }
 
   const modalitiesWithSecondaries = {
-    MRI: ["MRI", "Diffusion", "Structural", "Functional", "ASL Perfusion"],
-    PET: ["PET", "Static", "Dynamic"],
-    EEG: ["EEG"],
-    iEEG: ["iEEG"],
-    MEG: ["MEG"],
-    NIRS: ["NIRS"],
-    NIH: ["NIH"],
+    mri: ["mri", "Diffusion", "Structural", "Functional", "ASL Perfusion"],
+    pet: ["pet", "Static", "Dynamic"],
+    eeg: ["eeg"],
+    ieeg: ["ieeg"],
+    meg: ["meg"],
+    nirs: ["nirs"],
+    nih: ["nih"],
   }
 
   if (
@@ -144,10 +142,9 @@ const SearchContainer: FC<SearchContainerProps> = ({ portalContent }) => {
   ])
 
   const { loading, data, fetchMore, variables } = useSearchResults()
-  const loadMore = loading ? () => {} : () => {
+  const loadMore = () => {
     fetchMore({
       variables: {
-        // ...variables,
         cursor: data?.datasets?.pageInfo.endCursor,
       },
     })
@@ -248,7 +245,7 @@ const SearchContainer: FC<SearchContainerProps> = ({ portalContent }) => {
                 />
                 {/* TODO: make div below into display component. */}
                 <div className="grid grid-nogutter" style={{ width: "100%" }}>
-                  {resultsList.length == 0 || !hasNextPage
+                  {resultsList.length > 0 || !hasNextPage
                     ? null
                     : (
                       <div className="col col-12 load-more m-t-10">

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

@@ -20,6 +20,12 @@ export const SearchParamsProvider: React.FC<SearchParamsProviderProps> = ({
     const query = searchQuery.get("query")
     if (query) {
       searchParams = JSON.parse(query)
+    } else {
+      Sentry.addBreadcrumb({
+        category: "routing",
+        message: "No query found in URL. Using initialSearchParams.",
+        level: "info"
+      })
     }
   } catch (err) {
     Sentry.captureException(err)
@@ -28,21 +34,37 @@ export const SearchParamsProvider: React.FC<SearchParamsProviderProps> = ({
   const setSearchParams = (
     newParams: SearchParams | ((prevState: SearchParams) => SearchParams),
   ): void => {
-    const merged = typeof newParams == "function"
-      ? { ...searchParams, ...newParams(searchParams) }
-      : { ...searchParams, ...newParams }
+    let computedNewParams
+    if (typeof newParams === "function") {
+      computedNewParams = newParams(searchParams)
+    } else {
+      computedNewParams = newParams
+    }
+    const merged = { ...searchParams, ...computedNewParams }
+
+    // Filter out keys that match the defaults from initialSearchParams
+    const filtered = Object.keys(merged).reduce((acc, key) => {
+      if (
+        JSON.stringify(merged[key]) !== JSON.stringify(initialSearchParams[key])
+      ) {
+        acc[key] = merged[key]
+      }
+      return acc
+    }, {} as Record<string, unknown>)
+
     setSearch(
       {
-        query: JSON.stringify(merged),
+        query: JSON.stringify(filtered),
       },
       { replace: true },
     )
   }
 
+  const finalSearchParams = { ...initialSearchParams, ...searchParams }
   return (
     <SearchParamsCtx.Provider
       value={{
-        searchParams: { ...initialSearchParams, ...searchParams },
+        searchParams: finalSearchParams,
         setSearchParams,
       }}
     >
@@ -61,6 +83,7 @@ export const removeFilterItem = (setSearchParams) => (param, value) => {
         initialSearchParams["datasetStatus_selected"]
       break
     case "modality_selected":
+    case "brain_initiative":
     case "datasetStatus_selected":
     case "ageRange":
     case "subjectCountRange":

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

@@ -2,10 +2,8 @@ import React from "react"
 import type { FC } from "react"
 import { Route, Routes } from "react-router-dom"
 import SearchContainer from "./search-container"
-import {
-  portalContent,
-  portalGrantContent,
-} from "@openneuro/components/content"
+import { portalContent } from "../common/content/portal-content"
+import { portalGrantContent } from "../common/content/portal-grant-content"
 
 const SearchRoutes: FC = () => (
   <Routes>

package/src/scripts/search/use-search-results.tsx

@@ -172,28 +172,28 @@ export const useSearchResults = () => {
   if (modality_selected) {
     const secondaryModalities = {
       Diffusion: {
-        secondary: "MRI_Diffusion",
-        primary: "MRI",
+        secondary: "mri_diffusion",
+        primary: "mri",
       },
       Structural: {
-        secondary: "MRI_Structural",
-        primary: "MRI",
+        secondary: "mri_structural",
+        primary: "mri",
       },
       Functional: {
-        secondary: "MRI_Functional",
-        primary: "MRI",
+        secondary: "mri_functional",
+        primary: "mri",
       },
       Perfusion: {
-        secondary: "MRI_Perfusion",
-        primary: "MRI",
+        secondary: "mri_perfusion",
+        primary: "mri",
       },
       Static: {
-        secondary: "PET_Static",
-        primary: "PET",
+        secondary: "pet_static",
+        primary: "pet",
       },
       Dynamic: {
-        secondary: "PET_Dynamic",
-        primary: "PET",
+        secondary: "pet_dynamic",
+        primary: "pet",
       },
     }
     if (Object.keys(secondaryModalities).includes(modality_selected)) {
@@ -333,7 +333,7 @@ export const useSearchResults = () => {
       matchQuery("metadata.studyDomain", joinWithOR(studyDomains)),
     )
   }
-  if (modality_selected === "PET" || modality_selected === null) {
+  if (modality_selected === "pet" || modality_selected === null) {
     if (bodyParts.length) {
       boolQuery.addClause(
         "must",
@@ -402,5 +402,6 @@ export const useSearchResults = () => {
     // TODO: find better solution
     fetchPolicy: "cache-and-network",
     nextFetchPolicy: "cache-first",
+    notifyOnNetworkStatusChange: true,
   })
 }

package/src/scripts/uploader/upload-issues.tsx

@@ -1,6 +1,6 @@
 import React from "react"
 import pluralize from "pluralize"
-import { Loading } from "@openneuro/components/loading"
+import { Loading } from "../components/loading/Loading"
 import { ValidationResultsDisplay } from "../validation/validation-results"
 import UploaderContext from "./uploader-context.js"
 import { validation } from "../workers/schema.js"

package/src/scripts/uploader/upload-progress.jsx

@@ -1,6 +1,6 @@
 import React from "react"
 import PropTypes from "prop-types"
-import { ProgressBar } from "@openneuro/components/progress-bar"
+import { ProgressBar } from "../components/progress-bar/ProgressBar"
 
 const UploadProgress = ({ progress }) => {
   return (

package/src/scripts/uploader/uploader-modal.jsx

@@ -1,6 +1,6 @@
 import React from "react"
 import PropTypes from "prop-types"
-import { Modal } from "@openneuro/components/modal"
+import { Modal } from "../components/modal/Modal"
 
 // Show is always {true} because the router unmounts this otherwise
 const UploaderModal = ({ setLocation, location, children, footer }) => (

package/src/scripts/users/components/close-button.tsx

@@ -1,6 +1,6 @@
 import React from "react"
 import type { FC } from "react"
-import { Button } from "@openneuro/components/button"
+import { Button } from "../../components/button/Button"
 
 /**
  * An edit button, calls action when clicked

package/src/scripts/users/components/edit-button.tsx

@@ -1,6 +1,6 @@
 import React from "react"
 import type { FC } from "react"
-import { Button } from "@openneuro/components/button"
+import { Button } from "../../components/button/Button"
 
 /**
  * An edit button, calls action when clicked

package/src/scripts/users/components/edit-list.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from "react"
-import { Button } from "@openneuro/components/button"
+import { Button } from "../../components/button/Button"
 import "../scss/user-meta-blocks.scss"
 
 interface EditListProps {

package/src/scripts/users/components/edit-string.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react"
-import { Button } from "@openneuro/components/button"
+import { Button } from "../../components/button/Button"
 import "../scss/user-meta-blocks.scss"
 
 interface EditStringProps {

package/src/scripts/users/dataset-card.tsx

@@ -1,8 +1,8 @@
 import React from "react"
 import { formatDistanceToNow, parseISO } from "date-fns"
 import activityPulseIcon from "../../assets/activity-icon.png"
-import { Tooltip } from "@openneuro/components/tooltip"
-import { Icon } from "@openneuro/components/icon"
+import { Tooltip } from "../components/tooltip/Tooltip"
+import { Icon } from "../components/icon/Icon"
 import styles from "./scss/datasetcard.module.scss"
 import type { DatasetCardProps } from "../types/user-types"
 

package/src/scripts/users/user-notification-accordion.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react"
 import styles from "./scss/usernotifications.module.scss"
-import { Tooltip } from "@openneuro/components/tooltip"
+import { Tooltip } from "../components/tooltip/Tooltip"
 import iconUnread from "../../assets/icon-unread.png"
 import iconSaved from "../../assets/icon-saved.png"
 import iconArchived from "../../assets/icon-archived.png"

package/src/scripts/utils/user-login-modal-ctx.tsx

@@ -1,5 +1,5 @@
 import React, { createContext, useState } from "react"
-import { UserLoginModal } from "@openneuro/components/modal"
+import { UserLoginModal } from "../components/modal/UserLoginModal"
 import loginUrls from "../authentication/loginUrls"
 
 export const UserModalOpenCtx = createContext(null)

package/src/scripts/validation/validation-issues.tsx

@@ -1,5 +1,6 @@
 import React from "react"
-import { AccordionTab, AccordionWrap } from "@openneuro/components/accordion"
+import { AccordionTab } from "../components/accordion/AccordionTab"
+import { AccordionWrap } from "../components/accordion/AccordionWrap"
 import type { DatasetIssues, Issue } from "@bids/validator/issues"
 
 interface IssueProps {

package/src/scripts/validation/validation-panel.tsx

@@ -1,5 +1,6 @@
 import React from "react"
-import { AccordionTab, AccordionWrap } from "@openneuro/components/accordion"
+import { AccordionTab } from "../components/accordion/AccordionTab"
+import { AccordionWrap } from "../components/accordion/AccordionWrap"
 
 interface ValidationPanelProps {
   heading: React.ReactNode

package/src/scripts/validation/validation-results.tsx

@@ -1,8 +1,9 @@
 import React from "react"
-import { AccordionTab, AccordionWrap } from "@openneuro/components/accordion"
+import { AccordionTab } from "../components/accordion/AccordionTab"
+import { AccordionWrap } from "../components/accordion/AccordionWrap"
 import { Issues } from "./validation-issues"
-import { RadioGroup } from "@openneuro/components/radio"
-import { Loading } from "@openneuro/components/loading"
+import { RadioGroup } from "../components/radio/RadioGroup"
+import { Loading } from "../components/loading/Loading"
 import styled from "@emotion/styled"
 import type { DatasetIssues } from "@bids/validator/issues"
 import { useValidationResults } from "./validation-results-query"

package/src/scripts/validation-legacy/validation-panel.jsx

@@ -1,6 +1,7 @@
 import React from "react"
 import PropTypes from "prop-types"
-import { AccordionTab, AccordionWrap } from "@openneuro/components/accordion"
+import { AccordionTab } from "../components/accordion/AccordionTab"
+import { AccordionWrap } from "../components/accordion/AccordionWrap"
 
 class ValidationPanel extends React.Component {
   constructor(props) {

package/src/scripts/validation-legacy/validation-results.issues.jsx

@@ -1,8 +1,7 @@
-// dependencies -----------------------------------------------------------
-
 import React from "react"
 import PropTypes from "prop-types"
-import { AccordionTab, AccordionWrap } from "@openneuro/components/accordion"
+import { AccordionTab } from "../components/accordion/AccordionTab"
+import { AccordionWrap } from "../components/accordion/AccordionWrap"
 
 import pluralize from "pluralize"
 import Issue from "./validation-results.issues.issue.jsx"

package/src/scripts/validation-legacy/validation-results.tsx

@@ -1,11 +1,10 @@
-// dependencies -----------------------------------------------------------
-
 import React from "react"
 import pluralize from "pluralize"
-import { AccordionTab, AccordionWrap } from "@openneuro/components/accordion"
+import { AccordionTab } from "../components/accordion/AccordionTab"
+import { AccordionWrap } from "../components/accordion/AccordionWrap"
 import Issues from "./validation-results.issues.jsx"
 import { useLegacyValidationResults } from "./validation-legacy-query.js"
-import { Loading } from "@openneuro/components/loading"
+import { Loading } from "../components/loading/Loading"
 
 function countFiles(issues) {
   let numFiles = 0

package/tsconfig.json

@@ -6,8 +6,5 @@
     "tsBuildInfoFile": "../../.build-cache/app.tsbuildinfo"
   },
   "include": ["./src"],
-  "files": ["./src/lerna.json", "./src/scripts/workers/validator-config.json"],
-  "references": [
-    { "path": "../openneuro-components" }
-  ]
+  "files": ["./src/lerna.json", "./src/scripts/workers/validator-config.json"]
 }