@openneuro/app 4.32.0 → 4.33.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/app",
-  "version": "4.32.0",
+  "version": "4.33.0",
   "description": "React JS web frontend for the OpenNeuro platform.",
   "license": "MIT",
   "main": "public/client.js",
@@ -20,7 +20,7 @@
     "@emotion/react": "11.11.1",
     "@emotion/styled": "11.11.0",
     "@niivue/niivue": "0.45.1",
-    "@openneuro/components": "^4.32.0",
+    "@openneuro/components": "^4.33.0",
     "@sentry/react": "^8.25.0",
     "@tanstack/react-table": "^8.9.3",
     "buffer": "^6.0.3",
@@ -74,5 +74,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3dd549a9ec43bbbf00a295a35b30f43cb7c29ffd"
+  "gitHead": "ea2d4e9d00382b967075fb8fb206dce4f2a480af"
 }

package/src/scripts/dataset/components/ValidationBlock.tsx

@@ -50,7 +50,7 @@ export const ValidationBlock: React.FC<ValidationBlockProps> = ({
     )
   } else {
     // If data exists, populate this. Otherwise we show pending.
-    if (validation?.warnings + validation?.errors > 0) {
+    if (validation) {
       return (
         <div className="validation-accordion">
           <Validation

package/src/scripts/dataset/components/__tests__/ValidationBlock.spec.tsx

@@ -44,4 +44,14 @@ describe("ValidationBlock component", () => {
     render(<ValidationBlock datasetId="ds000031" />)
     expect(screen.getByText("Validation Pending")).toBeInTheDocument()
   })
+  it("renders validation if `validation` is present but errors and warnings are zero", () => {
+    render(
+      <ValidationBlock
+        datasetId="ds000031"
+        validation={{ errors: 0, warnings: 0, issues: [], codeMessages: [] }}
+      />,
+    )
+    expect(screen.getByText("Valid")).toBeInTheDocument()
+    expect(screen.queryByText("Validation Pending")).not.toBeInTheDocument()
+  })
 })

package/src/scripts/pages/front-page/aggregate-queries/aggregate-counts-container.tsx

@@ -29,13 +29,16 @@ const AggregateCountsContainer: React.FC<AggregateCountsContainerProps> = ({
   else {
     return (
       <>
-        <AggregateCount
-          type="participants"
-          count={participantData.participantCount}
-        />
+        {participantData.participantCount > 0 && (
+          <AggregateCount
+            type="participants"
+            count={participantData.participantCount}
+          />
+        )}
         <AggregateCount
           type="publicDataset"
-          count={publicDatasetsData.datasets?.pageInfo?.count || 0}
+          count={publicDatasetsData.datasets?.pageInfo?.count ||
+            publicDatasetsData.advancedSearch?.pageInfo.count || 0}
         />
       </>
     )

package/src/scripts/pages/front-page/aggregate-queries/use-publicDatasets-count.ts

@@ -10,9 +10,31 @@ const PUBLIC_DATASETS_COUNT = gql`
   }
 `
 
+const BRAIN_INITIATIVE_COUNT = gql`
+  query AdvancedSearch($query: JSON!, $datasetType: String!) {
+    advancedSearch(query: $query, datasetType: $datasetType) {
+      pageInfo {
+        count
+      }
+    }
+  }
+`
+
 const usePublicDatasetsCount = (modality?: string) => {
-  return useQuery(PUBLIC_DATASETS_COUNT, {
-    variables: { modality },
+  const isNIH = modality === "NIH"
+
+  const query = isNIH ? BRAIN_INITIATIVE_COUNT : PUBLIC_DATASETS_COUNT
+  const variables = isNIH
+    ? {
+      query: {
+        bool: { filter: [{ match: { brainInitiative: { query: "true" } } }] },
+      },
+      datasetType: "public",
+    }
+    : { modality }
+
+  return useQuery(query, {
+    variables,
     errorPolicy: "all",
   })
 }