@openneuro/app 4.47.6 → 5.0.0-alpha.0

package/src/scripts/queries/datasetEvents.ts

@@ -53,7 +53,7 @@ export const PROCESS_CONTRIBUTOR_REQUEST_MUTATION = gql`
     $datasetId: ID!
     $requestId: ID!
     $targetUserId: ID!
-    $resolutionStatus: String!
+    $resolutionStatus: ResponseStatusType!
     $reason: String
   ) {
     processContributorRequest(
@@ -153,7 +153,7 @@ export const CREATE_CONTRIBUTOR_CITATION_EVENT = gql`
 `
 
 export const PROCESS_CONTRIBUTOR_CITATION_MUTATION = gql`
-  mutation ProcessContributorCitation($eventId: ID!, $status: String!) {
+  mutation ProcessContributorCitation($eventId: ID!, $status: ResponseStatusType!) {
     processContributorCitation(eventId: $eventId, status: $status) {
       id
       timestamp

package/src/scripts/queries/user.ts

@@ -1,4 +1,3 @@
-import { useEffect } from "react"
 import { gql, useQuery } from "@apollo/client"
 import { useCookies } from "react-cookie"
 import { getProfile } from "../authentication/profile"
@@ -97,18 +96,16 @@ export const UPDATE_USER = gql`
 
 export const ADVANCED_SEARCH_DATASETS_QUERY = gql`
   query advancedSearchDatasets(
-    $query: JSON!
+    $query: DatasetSearchInput!
     $cursor: String
     $allDatasets: Boolean
     $datasetStatus: String
-    $sortBy: JSON
     $first: Int!
   ) {
     datasets: advancedSearch(
       query: $query
       allDatasets: $allDatasets
       datasetStatus: $datasetStatus
-      sortBy: $sortBy
       first: $first
       after: $cursor
     ) {
@@ -212,7 +209,7 @@ export const ADVANCED_SEARCH_DATASETS_QUERY = gql`
 
 // Reusable hook to fetch user data
 export const useUser = (userId?: string) => {
-  const [cookies, , removeCookie] = useCookies()
+  const [cookies] = useCookies()
   const profile = getProfile(cookies)
   const profileSub = profile?.sub
 
@@ -231,13 +228,6 @@ export const useUser = (userId?: string) => {
     Sentry.captureException(userError)
   }
 
-  // Clear invalid session: cookie exists but query failed or returned no user
-  useEffect(() => {
-    if (!userLoading && profile && (userError || !userData?.user)) {
-      removeCookie("accessToken", { path: "/" })
-    }
-  }, [userLoading, profile, userError, userData?.user, removeCookie])
-
   return {
     user: userData?.user,
     loading: userLoading,

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

@@ -10,7 +10,7 @@ const providerProps = {
 
 describe("SortBySelect component", () => {
   it("displays Newest when parameters are set to default", () => {
-    searchRender(<SortBySelect variables={{ query: { bool: {} } }} />, {
+    searchRender(<SortBySelect variables={{ query: {} }} />, {
       providerProps,
     })
     expect(screen.getByText("SORT BY:").closest("div")).toHaveTextContent(
@@ -22,17 +22,7 @@ describe("SortBySelect component", () => {
       <SortBySelect
         variables={{
           query: {
-            bool: {
-              filter: [
-                {
-                  match: {
-                    "latestSnapshot.summary.modalities": {
-                      query: "mri",
-                    },
-                  },
-                },
-              ],
-            },
+            modality: "mri",
           },
         }}
       />,
@@ -46,7 +36,7 @@ describe("SortBySelect component", () => {
   })
   it("displays Relevance when any non-modality parameters are set away from default", () => {
     searchRender(
-      <SortBySelect variables={{ query: { bool: { species: "Human" } } }} />,
+      <SortBySelect variables={{ query: { species: "Human" } }} />,
       { providerProps },
     )
     expect(screen.getByText("SORT BY:").closest("div")).toHaveTextContent(
@@ -58,19 +48,7 @@ describe("SortBySelect component", () => {
       <SortBySelect
         variables={{
           query: {
-            bool: {
-              filter: [
-                {
-                  range: {
-                    "latestSnapshot.summary.subjectMetadata.age": {
-                      gte: 10,
-                      lte: 100,
-                      relation: "INTERSECTS",
-                    },
-                  },
-                },
-              ],
-            },
+            ageRange: [10, 100],
           },
         }}
       />,

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

@@ -20,13 +20,13 @@ const SortBySelect: FC<SortBySelectProps> = ({
       sortBy_selected,
     }))
 
-  // If no query or only modality is set, ignore "relevance" option
+  // If no query or only modality/sortBy is set, ignore "relevance" option
+  const queryKeys = Object.keys(variables.query).filter(
+    (k) => k !== "sortBy",
+  )
   if (
-    Object.keys(variables.query.bool).length === 0 ||
-    (Object.keys(variables.query.bool).length === 1 &&
-      variables.query.bool?.filter?.every(
-        (f) => f?.match?.["latestSnapshot.summary.modalities"],
-      ))
+    queryKeys.length === 0 ||
+    (queryKeys.length === 1 && queryKeys[0] === "modality")
   ) {
     const available = sortBy_available.filter(
       (item) => item.value !== "relevance",

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

@@ -1,33 +1,20 @@
 import { useContext } from "react"
 import { gql, useQuery } from "@apollo/client"
 import { SearchParamsCtx } from "./search-params-ctx"
-import initialSearchParams from "./initial-search-params"
-import {
-  BoolQuery,
-  joinWithOR,
-  matchQuery,
-  multiMatchQuery,
-  rangeListLengthQuery,
-  rangeQuery,
-  simpleQueryString,
-  sqsJoinWithAND,
-} from "./es-query-builders"
 
 const searchQuery = gql`
   query advancedSearchDatasets(
-    $query: JSON!
+    $query: DatasetSearchInput!
     $cursor: String
     $allDatasets: Boolean
     $datasetType: String
     $datasetStatus: String
-    $sortBy: JSON
   ) {
     datasets: advancedSearch(
       query: $query
       allDatasets: $allDatasets
       datasetType: $datasetType
       datasetStatus: $datasetStatus
-      sortBy: $sortBy
       first: 25
       after: $cursor
     ) {
@@ -100,9 +87,9 @@ const searchQuery = gql`
             }
             contributors {
               name
-              givenName 
-              familyName 
-              orcid 
+              givenName
+              familyName
+              orcid
               contributorType
             }
           }
@@ -136,8 +123,8 @@ const searchQuery = gql`
   }
 `
 
-const isActiveRange = (range) =>
-  JSON.stringify(range) !== JSON.stringify([null, null])
+const isActiveRange = (range: (number | null)[]): boolean =>
+  range[0] !== null || range[1] !== null
 
 export const useSearchResults = () => {
   const { searchParams } = useContext(SearchParamsCtx)
@@ -167,248 +154,43 @@ export const useSearchResults = () => {
     brain_initiative,
   } = searchParams
 
-  const boolQuery = new BoolQuery()
-  if (keywords.length) {
-    boolQuery.addClause(
-      "must",
-      simpleQueryString(sqsJoinWithAND(keywords), [
-        "id^20",
-        "latestSnapshot.readme",
-        "latestSnapshot.description.Name^6",
-        "latestSnapshot.description.Authors^3", // TODO: Nell - do we need this still?
-        "latestSnapshot.contributors.name^2",
-      ]),
-    )
-  }
-  if (modality_selected) {
-    const secondaryModalities = {
-      Diffusion: {
-        secondary: "mri_diffusion",
-        primary: "mri",
-      },
-      Structural: {
-        secondary: "mri_structural",
-        primary: "mri",
-      },
-      Functional: {
-        secondary: "mri_functional",
-        primary: "mri",
-      },
-      Perfusion: {
-        secondary: "mri_perfusion",
-        primary: "mri",
-      },
-      Static: {
-        secondary: "pet_static",
-        primary: "pet",
-      },
-      Dynamic: {
-        secondary: "pet_dynamic",
-        primary: "pet",
-      },
-    }
-    if (Object.keys(secondaryModalities).includes(modality_selected)) {
-      boolQuery.addClause(
-        "filter",
-        matchQuery(
-          "latestSnapshot.summary.secondaryModalities",
-          secondaryModalities[modality_selected].secondary,
-        ),
-      )
-    } else {
-      boolQuery.addClause(
-        "filter",
-        matchQuery("latestSnapshot.summary.modalities", modality_selected),
-      )
-    }
-  }
+  // Build the structured search input
+  const query: Record<string, unknown> = {}
 
-  if (isActiveRange(ageRange)) {
-    boolQuery.addClause(
-      "filter",
-      rangeQuery("latestSnapshot.summary.subjectMetadata.age", ...ageRange),
-    )
-  }
+  if (keywords.length) query.keywords = keywords
+  if (modality_selected) query.modality = modality_selected
+  if (isActiveRange(ageRange)) query.ageRange = ageRange
   if (isActiveRange(subjectCountRange)) {
-    boolQuery.addClause(
-      "filter",
-      rangeListLengthQuery(
-        "latestSnapshot.summary.subjects",
-        subjectCountRange[0] || 0,
-        subjectCountRange[1] || 1000000,
-      ),
-    )
-  }
-  if (diagnosis_selected) {
-    boolQuery.addClause(
-      "filter",
-      matchQuery("metadata.dxStatus", diagnosis_selected),
-    )
-  }
-  if (bidsDatasetType_selected) {
-    boolQuery.addClause(
-      "filter",
-      matchQuery(
-        "latestSnapshot.description.DatasetType",
-        bidsDatasetType_selected,
-      ),
-    )
-  }
-  if (brain_initiative) {
-    boolQuery.addClause(
-      "filter",
-      matchQuery(
-        "brainInitiative",
-        brain_initiative,
-      ),
-    )
-  }
-  if (tasks.length) {
-    boolQuery.addClause(
-      "must",
-      simpleQueryString(sqsJoinWithAND(tasks), [
-        "latestSnapshot.summary.tasks",
-      ]),
-    )
-  }
-  if (authors.length) { // TODO - NELL - does this look right?
-    const authorQuery = matchQuery(
-      "latestSnapshot.contributors.name",
-      joinWithOR(authors),
-      "2",
-    )
-    boolQuery.addClause(
-      "must",
-      {
-        bool: {
-          should: [authorQuery],
-        },
-      },
-    )
-  }
-  if (sex_selected !== "All") {
-    // Possible values for this field are specified here:
-    // https://bids-specification.readthedocs.io/en/stable/glossary.html#objects.columns.sex
-    let queryStrings = []
-    if (sex_selected == "Male") {
-      queryStrings = ["male", "m", "M", "MALE", "Male"]
-    } else if (sex_selected == "Female") {
-      queryStrings = ["female", "f", "F", "FEMALE", "Female"]
-    }
-    boolQuery.addClause(
-      "filter",
-      multiMatchQuery(
-        "latestSnapshot.summary.subjectMetadata.sex",
-        queryStrings,
-      ),
-    )
-  }
-  if (date_selected !== "All Time") {
-    let d: number
-    if (date_selected === "Last 30 days") {
-      d = 30
-    } else if (date_selected === "Last 180 days") {
-      d = 180
-    } else {
-      d = 365
-    }
-    boolQuery.addClause("filter", rangeQuery("created", `now-${d}d/d`, "now/d"))
-  }
-  if (species_selected) {
-    if (species_selected === "Other") {
-      // if species is 'Other', search for every species that isn't an available option
-      const species = initialSearchParams.species_available
-        .filter((s) => s !== "Other")
-        .join(" ")
-      boolQuery.addClause(
-        "must_not",
-        matchQuery("metadata.species", species, "AUTO", "OR"),
-      )
-    } else if (species_selected === "Human") {
-      // if species is 'Human', search for Human or null values (BIDS assumes human by default)
-      boolQuery.query.bool["should"] = [
-        matchQuery("metadata.species", "Human", "AUTO"),
-        { term: { _content: "" } },
-      ]
-    } else {
-      boolQuery.addClause(
-        "filter",
-        matchQuery("metadata.species", species_selected, "AUTO"),
-      )
-    }
-  }
-  if (section_selected) {
-    boolQuery.addClause(
-      "filter",
-      matchQuery("metadata.studyLongitudinal", section_selected, "AUTO"),
-    )
-  }
-  if (studyDomains.length) {
-    boolQuery.addClause(
-      "must",
-      matchQuery("metadata.studyDomain", joinWithOR(studyDomains)),
-    )
-  }
-  if (modality_selected === "pet" || modality_selected === null) {
-    if (bodyParts.length) {
-      boolQuery.addClause(
-        "must",
-        simpleQueryString(sqsJoinWithAND(bodyParts), [
-          "latestSnapshot.summary.pet.BodyPart",
-        ]),
-      )
-    }
-    if (scannerManufacturers.length) {
-      boolQuery.addClause(
-        "must",
-        simpleQueryString(sqsJoinWithAND(scannerManufacturers), [
-          "latestSnapshot.summary.pet.ScannerManufacturer",
-        ]),
-      )
-    }
-    if (scannerManufacturersModelNames.length) {
-      boolQuery.addClause(
-        "must",
-        simpleQueryString(sqsJoinWithAND(scannerManufacturersModelNames), [
-          "latestSnapshot.summary.pet.ScannerManufacturersModelName",
-        ]),
-      )
-    }
-    if (tracerNames.length) {
-      boolQuery.addClause(
-        "must",
-        simpleQueryString(sqsJoinWithAND(tracerNames), [
-          "latestSnapshot.summary.pet.TracerName",
-        ]),
-      )
-    }
-    if (tracerRadionuclides.length) {
-      boolQuery.addClause(
-        "must",
-        simpleQueryString(sqsJoinWithAND(tracerRadionuclides), [
-          "latestSnapshot.summary.pet.TracerRadionuclide",
-        ]),
-      )
-    }
-  }
+    query.subjectCountRange = subjectCountRange
+  }
+  if (diagnosis_selected) query.diagnosis = diagnosis_selected
+  if (tasks.length) query.tasks = tasks
+  if (authors.length) query.authors = authors
+  if (sex_selected && sex_selected !== "All") query.sex = sex_selected
+  if (date_selected && date_selected !== "All Time") {
+    query.dateRange = date_selected
+  }
+  if (species_selected) query.species = species_selected
+  if (section_selected) query.studyStructure = section_selected
+  if (studyDomains.length) query.studyDomains = studyDomains
+  if (bidsDatasetType_selected) query.bidsDatasetType = bidsDatasetType_selected
+  if (brain_initiative) query.brainInitiative = true
+  if (bodyParts.length) query.bodyParts = bodyParts
+  if (scannerManufacturers.length) {
+    query.scannerManufacturers = scannerManufacturers
+  }
+  if (scannerManufacturersModelNames.length) {
+    query.scannerManufacturersModelNames = scannerManufacturersModelNames
+  }
+  if (tracerNames.length) query.tracerNames = tracerNames
+  if (tracerRadionuclides.length) {
+    query.tracerRadionuclides = tracerRadionuclides
+  }
+  if (sortBy_selected) query.sortBy = sortBy_selected.value
 
-  let sortBy
-  if (sortBy_selected.label === "Relevance") {
-    // If filters are set, sort by relevance (default sort),
-    //   otherwise, sort from newest to oldest
-    sortBy = boolQuery.isEmpty() ? { created: "desc" } : null
-  } else if (sortBy_selected.label === "Newest") {
-    sortBy = { created: "desc" }
-  } else if (sortBy_selected.label === "Oldest") {
-    sortBy = { created: "asc" }
-  } else if (sortBy_selected.label === "Activity") {
-    // TODO: figure out
-    sortBy = { "analytics.downloads": "desc" }
-  }
   return useQuery(searchQuery, {
     variables: {
-      query: boolQuery.get(),
-      sortBy,
+      query,
       allDatasets: searchAllDatasets,
       datasetType: datasetType_selected,
       datasetStatus: datasetStatus_selected,

package/src/scripts/types/event-types.ts

@@ -1,6 +1,19 @@
 import type { User } from "./user-types"
 
-export type RequestStatus = "pending" | "accepted" | "denied"
+export type RequestStatus = "PENDING" | "ACCEPTED" | "DENIED"
+
+/**
+ * Format a RequestStatus or compatible string for display in user-facing UI.
+ * The type-level representation uses uppercase (matching the GraphQL
+ * ResponseStatusType enum), but UI rendering uses lowercase ("accepted",
+ * "denied", "pending") for readability. Call this at every display site
+ * so that the convention stays consistent if new sites are added.
+ */
+export function formatStatusForDisplay(
+  status: string | null | undefined,
+): string {
+  return status ? status.toLowerCase() : ""
+}
 
 export interface ContributorData {
   name?: string
@@ -53,7 +66,7 @@ export interface MappedNotification {
   content: string
   status: "unread" | "saved" | "archived"
   type: EventDescription["type"]
-  approval?: "pending" | "accepted" | "denied"
+  approval?: RequestStatus
   originalNotification: Event
   datasetId?: string
   needsReview?: boolean
@@ -94,8 +107,8 @@ export const mapRawEventToMappedNotification = (
       title = "is requesting to be added to"
       requesterUser = user // user initiating the request (admin)
       targetUser = target || rawNotification.user // fallback
-      approval = resolutionStatus ?? "pending"
-      needsReview = approval === "pending"
+      approval = resolutionStatus ?? "PENDING"
+      needsReview = approval === "PENDING"
       break
     case "contributorCitation":
       title = "added"
@@ -110,22 +123,22 @@ export const mapRawEventToMappedNotification = (
             email: "",
             orcid: "",
           })
-      approval = resolutionStatus ?? "pending"
-      needsReview = approval === "pending"
+      approval = resolutionStatus ?? "PENDING"
+      needsReview = approval === "PENDING"
       break
 
     case "contributorRequestResponse":
       title = "responded to a contributor request"
       adminUser = user
       targetUser = target
-      approval = resolutionStatus ?? "pending"
+      approval = resolutionStatus ?? "PENDING"
       break
 
     case "contributorCitationResponse":
       title = "had their citation request for"
       adminUser = user
       targetUser = target
-      approval = resolutionStatus ?? "pending"
+      approval = resolutionStatus ?? "PENDING"
       break
 
     case "note":

package/src/scripts/users/__tests__/user-routes.spec.tsx

@@ -35,18 +35,9 @@ const setupUserRoutes = (
         variables: {
           first: 26,
           query: {
-            bool: {
-              filter: [
-                {
-                  terms: {
-                    "permissions.userPermissions.user.id": [orcidUser.id],
-                  },
-                },
-              ],
-              must: [{ match_all: {} }],
-            },
+            userId: orcidUser.id,
+            sortBy: "last_updated",
           },
-          sortBy: null,
           cursor: null,
           allDatasets: true,
           datasetStatus: undefined,

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

@@ -10,7 +10,7 @@ interface NotificationActionButtonsProps {
   notification: MappedNotification
   isProcessing: boolean
   onUpdate: (id: string, updates: Partial<MappedNotification>) => void
-  handleProcessAction: (action: "accepted" | "denied") => void
+  handleProcessAction: (action: "ACCEPTED" | "DENIED") => void
   handleStatusChange: (
     newStatus: "unread" | "saved" | "archived",
   ) => Promise<void>
@@ -32,16 +32,16 @@ export const NotificationActionButtons: React.FC<
         <>
           <button
             className={`${styles.notificationapprove}`}
-            onClick={() => handleProcessAction("accepted")}
-            disabled={approval === "accepted" || isProcessing}
+            onClick={() => handleProcessAction("ACCEPTED")}
+            disabled={approval === "ACCEPTED" || isProcessing}
           >
             <i className="fa fa-check" /> Accept
           </button>
 
           <button
             className={`${styles.notificationdeny}`}
-            onClick={() => handleProcessAction("denied")}
-            disabled={approval === "denied" || isProcessing}
+            onClick={() => handleProcessAction("DENIED")}
+            disabled={approval === "DENIED" || isProcessing}
           >
             <i className="fa fa-times" /> Deny
           </button>

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

@@ -1,4 +1,5 @@
 import React from "react"
+import { formatStatusForDisplay } from "../../types/event-types"
 import type { User } from "../../types/user-types"
 import { Username } from "../username"
 import styles from "./scss/usernotifications.module.scss"
@@ -63,7 +64,9 @@ export const NotificationHeader: React.FC<NotificationHeaderProps> = ({
           <a href={datasetLink} className={styles.titlelink}>
             {datasetId}
           </a>{" "}
-          {type != "contributorCitation" ? resStatus : ""}
+          {type != "contributorCitation"
+            ? formatStatusForDisplay(resStatus)
+            : ""}
         </span>
       )
     }

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

@@ -15,7 +15,10 @@ import { NotificationActionButtons } from "./user-notification-accordion-actions
 import ToastContent from "../../common/partials/toast-content"
 import styles from "./scss/usernotifications.module.scss"
 
-import type { MappedNotification } from "../../types/event-types"
+import {
+  formatStatusForDisplay,
+  type MappedNotification,
+} from "../../types/event-types"
 
 export const NotificationAccordion = ({
   notification,
@@ -53,7 +56,7 @@ export const NotificationAccordion = ({
   const [showReasonInput, setShowReasonInput] = useState(false)
   const [reasonInput, setReasonInput] = useState("")
   const [currentApprovalAction, setCurrentApprovalAction] = useState<
-    "accepted" | "denied" | null
+    "ACCEPTED" | "DENIED" | null
   >(null)
 
   const [processContributorRequest, { loading: processRequestLoading }] =
@@ -78,7 +81,7 @@ export const NotificationAccordion = ({
     }
   }, [isOpen])
 
-  const handleProcessAction = useCallback((action: "accepted" | "denied") => {
+  const handleProcessAction = useCallback((action: "ACCEPTED" | "DENIED") => {
     setIsOpen(true)
     setShowReasonInput(true)
     setReasonInput("")
@@ -120,7 +123,9 @@ export const NotificationAccordion = ({
         toast.success(
           <ToastContent
             title="Contributor Request Processed"
-            body={`Request has been ${currentApprovalAction}.`}
+            body={`Request has been ${
+              formatStatusForDisplay(currentApprovalAction)
+            }.`}
           />,
         )
       } else if (isContributorCitation) {
@@ -144,7 +149,9 @@ export const NotificationAccordion = ({
         toast.success(
           <ToastContent
             title="Contributor Citation Processed"
-            body={`Citation has been ${currentApprovalAction}.`}
+            body={`Citation has been ${
+              formatStatusForDisplay(currentApprovalAction)
+            }.`}
           />,
         )
       }