@openneuro/app 4.35.0-alpha.0 → 4.35.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/app",
-  "version": "4.35.0-alpha.0",
+  "version": "4.35.0-alpha.1",
   "description": "React JS web frontend for the OpenNeuro platform.",
   "license": "MIT",
   "main": "public/client.js",
@@ -19,7 +19,7 @@
     "@bids/validator": "npm:@jsr/bids__validator@^2.0.3",
     "@emotion/react": "11.11.1",
     "@emotion/styled": "11.11.0",
-    "@niivue/niivue": "0.45.1",
+    "@niivue/niivue": "0.57.0",
     "@openneuro/components": "^4.33.4",
     "@sentry/react": "^8.25.0",
     "@tanstack/react-table": "^8.9.3",
@@ -75,5 +75,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "aef6b8ec1097cd7cd19ca9de82e17d8dfa87be71"
+  "gitHead": "ac9c013877e5d9c1fa9615a177f79e0da0747f84"
 }

package/src/scripts/components/scss/upload-modal.scss

@@ -146,6 +146,12 @@
     &:hover {
       background-color: var(--current-theme-primary-hover);
     }
+    &.disabled {
+      background-color: $rock;
+      &:hover {
+        background-color: $rock;
+      }
+    }
   }
   .fileupload-btn .multifile-select-btn {
     opacity: 0;

package/src/scripts/dataset/fragments/__tests__/dataset-history.spec.tsx

@@ -0,0 +1,155 @@
+import React from "react"
+import { render, screen } from "@testing-library/react"
+import { MockedProvider } from "@apollo/client/testing"
+import { DatasetHistory, GET_HISTORY } from "../dataset-history"
+
+describe("DatasetHistory", () => {
+  it("renders an example history correctly", async () => {
+    const dataset = {
+      id: "ds000001",
+      name: "Test Dataset",
+      created: "2023-01-01T00:00:00.000Z",
+      downloads: 0,
+      views: 0,
+      stars: 0,
+      size: 0,
+      history: [
+        {
+          id: "adbafb8cc26558e1fe2be02fa782bf9f1a6c2556",
+          date: "2023-01-01T00:00:00.000Z",
+          authorName: "Test Author",
+          authorEmail: "test@example.com",
+          references: "",
+          message: "Initial commit",
+        },
+        {
+          id: "adbafb8cc26558e1fe2be02fa782bf9f1a6c0313",
+          date: "2023-01-02T00:00:00.000Z",
+          authorName: "Test Author",
+          authorEmail: "test@example.com",
+          references: "1.0.0",
+          message: "Test snapshot",
+        },
+      ],
+      authors: [],
+      editors: [],
+      public: true,
+      uploader: null,
+      latestSnapshot: null,
+      relatedDatasets: [],
+      mriqcResults: null,
+      tasks: [],
+      modalities: [],
+      datasetSummary: null,
+      datasetDescription: null,
+      readme: null,
+      license: null,
+      funding: null,
+      acknowledgements: null,
+      howToAcknowledge: null,
+      ethicsApprovals: [],
+      publications: [],
+      datasetMetadata: [],
+      changelog: null,
+      issues: [],
+      starred: false,
+      followers: [],
+      hasOpenIssues: false,
+      createdAt: "2023-01-01T00:00:00.000Z",
+      updatedAt: "2023-01-01T00:00:00.000Z",
+      uploaderId: null,
+      orcid: null,
+      userId: null,
+      user: null,
+      isPrivate: false,
+      onboarded: false,
+      worker: 0,
+      __typename: "Dataset",
+    }
+    const mocks = [
+      {
+        request: {
+          query: GET_HISTORY,
+          variables: { datasetId: dataset.id },
+        },
+        result: {
+          data: {
+            dataset,
+          },
+        },
+      },
+    ]
+    await render(
+      <MockedProvider mocks={mocks}>
+        <DatasetHistory datasetId={dataset.id} />
+      </MockedProvider>,
+    )
+    expect(await screen.findByText("Initial commit")).toBeInTheDocument()
+    expect(await screen.findByText("Test snapshot")).toBeInTheDocument()
+  })
+  it("renders correctly when dataset.history is null", async () => {
+    const dataset = {
+      id: "ds000001",
+      name: "Test Dataset",
+      created: "2023-01-01T00:00:00.000Z",
+      downloads: 0,
+      views: 0,
+      stars: 0,
+      size: 0,
+      history: null,
+      authors: [],
+      editors: [],
+      public: true,
+      uploader: null,
+      latestSnapshot: null,
+      relatedDatasets: [],
+      mriqcResults: null,
+      tasks: [],
+      modalities: [],
+      datasetSummary: null,
+      datasetDescription: null,
+      readme: null,
+      license: null,
+      funding: null,
+      acknowledgements: null,
+      howToAcknowledge: null,
+      ethicsApprovals: [],
+      publications: [],
+      datasetMetadata: [],
+      changelog: null,
+      issues: [],
+      starred: false,
+      followers: [],
+      hasOpenIssues: false,
+      createdAt: "2023-01-01T00:00:00.000Z",
+      updatedAt: "2023-01-01T00:00:00.000Z",
+      uploaderId: null,
+      orcid: null,
+      userId: null,
+      user: null,
+      isPrivate: false,
+      onboarded: false,
+      worker: 0,
+      __typename: "Dataset",
+    }
+    const mocks = [
+      {
+        request: {
+          query: GET_HISTORY,
+          variables: { datasetId: dataset.id },
+        },
+        result: {
+          data: {
+            dataset,
+          },
+        },
+      },
+    ]
+    await render(
+      <MockedProvider mocks={mocks}>
+        <DatasetHistory datasetId={dataset.id} />
+      </MockedProvider>,
+    )
+    expect(await screen.findByText("No history available")).toBeInTheDocument()
+  })
+})

package/src/scripts/dataset/fragments/dataset-history.jsx

@@ -2,10 +2,9 @@ import React from "react"
 import PropTypes from "prop-types"
 import styled from "@emotion/styled"
 import { gql, useQuery } from "@apollo/client"
-
 import Revalidate from "../mutations/revalidate.jsx"
 
-const GET_HISTORY = gql`
+export const GET_HISTORY = gql`
   query getHistory($datasetId: ID!) {
     dataset(id: $datasetId) {
       id
@@ -29,16 +28,16 @@ const DatasetHistoryTable = styled.div`
   .row:nth-of-type(2n) {
     padding-top: 1em;
   }
-  .row:nth-of-type(2n + 1) {
+  .row:nth-of-type(2n+1) {
     padding-bottom: 1em;
   }
   .row:nth-of-type(4n),
-  .row:nth-of-type(4n + 1) {
+  .row:nth-of-type(4n+1) {
     background: #f4f4f4;
   }
 `
 
-const DatasetHistory = ({ datasetId }) => {
+export const DatasetHistory = ({ datasetId }) => {
   const { loading, data } = useQuery(GET_HISTORY, {
     variables: { datasetId },
     errorPolicy: "all",
@@ -58,7 +57,7 @@ const DatasetHistory = ({ datasetId }) => {
             <h4 className="col-lg col col-2">References</h4>
             <h4 className="col-lg col col-2 text--right">Action</h4>
           </div>
-          {data.dataset.history.map((commit) => (
+          {data.dataset?.history?.map((commit) => (
             <React.Fragment key={commit.id}>
               <div className="grid faux-table">
                 <div className="commit col-lg col col-2">
@@ -83,7 +82,7 @@ const DatasetHistory = ({ datasetId }) => {
                 <div className="col-lg col col-12">{commit.message}</div>
               </div>
             </React.Fragment>
-          ))}
+          )) || "No history available"}
         </DatasetHistoryTable>
       </div>
     )

package/src/scripts/errors/errorRoute.tsx

@@ -4,6 +4,7 @@
 import React from "react"
 import { Route, Routes } from "react-router-dom"
 import OrcidGeneral from "./orcid/general.jsx"
+import { OrcidEmailWarning } from "./orcid/email-warning.js"
 import FourOFourPage from "./404page.js"
 
 function ErrorRoute() {
@@ -12,6 +13,7 @@ function ErrorRoute() {
       <div className="panel">
         <Routes>
           <Route path="orcid" element={<OrcidGeneral />} />
+          <Route path="email-warning" element={<OrcidEmailWarning />} />
           <Route path="*" element={<FourOFourPage />} />
         </Routes>
       </div>

package/src/scripts/errors/orcid/email-warning.tsx

@@ -0,0 +1,21 @@
+import React from "react"
+
+export const OrcidEmailWarning = () => (
+  <div className="panel-heading">
+    <h2>No Email Provided</h2>
+    <p>
+      To make contributions to OpenNeuro, please provide a contact email
+      address.
+    </p>
+    <p>
+      Verify an email and make it available either publicly or to trusted
+      institutions to make contributions to OpenNeuro. See our{" "}
+      <a href="https://docs.openneuro.org/orcid.html#enabling-trusted-access-to-emails">
+        ORCID documentation
+      </a>{" "}
+      for detailed instructions.
+    </p>
+  </div>
+)
+
+export default OrcidEmailWarning

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

@@ -236,9 +236,8 @@ const SearchContainer: FC<SearchContainerProps> = ({ portalContent }) => {
                 />
                 {/* TODO: make div below into display component. */}
                 <div className="grid grid-nogutter" style={{ width: "100%" }}>
-                  {resultsList.length > 0 || !hasNextPage
-                    ? null
-                    : (
+                  {hasNextPage && resultsList.length > 0 &&
+                    (
                       <div className="col col-12 load-more m-t-10">
                         <Button label="Load More" onClick={loadMore} />
                       </div>

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

@@ -24,7 +24,7 @@ export const SearchParamsProvider: React.FC<SearchParamsProviderProps> = ({
       Sentry.addBreadcrumb({
         category: "routing",
         message: "No query found in URL. Using initialSearchParams.",
-        level: "info"
+        level: "info",
       })
     }
   } catch (err) {
@@ -79,8 +79,11 @@ export const removeFilterItem = (setSearchParams) => (param, value) => {
     /* Handle simple filter resets. */
     case "datasetType_selected":
       // when datasetType is unset, unset datasetStatus as well
-      updatedParams["datasetStatus_selected"] =
-        initialSearchParams["datasetStatus_selected"]
+      setSearchParams((prevState) => ({
+        ...prevState,
+        [param]: initialSearchParams[param],
+        "datasetStatus_selected": initialSearchParams["datasetStatus_selected"],
+      }))
       break
     case "modality_selected":
     case "brain_initiative":

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

@@ -266,7 +266,7 @@ export const useSearchResults = () => {
       matchQuery(
         "latestSnapshot.description.Authors",
         joinWithOR(authors),
-        "3",
+        "2",
       ),
     )
   }

package/src/scripts/uploader/file-select.tsx

@@ -24,7 +24,9 @@ class Upload extends React.Component<UploadProps> {
     const text = this.props.resume ? "Resume" : "Select folder"
 
     return (
-      <div className="fileupload-btn">
+      <div
+        className={"fileupload-btn" + (this.props.disabled ? " disabled" : "")}
+      >
         <span>
           {icon}
           {text}

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

@@ -1,30 +1,46 @@
 import React from "react"
 import FileSelect from "./file-select"
 import UploaderContext from "./uploader-context.js"
+import { useUser } from "../queries/user"
 
-const UploadSelect = () => (
-  <div>
-    <UploaderContext.Consumer>
-      {(uploader) => (
-        <div className="message fade-in">
-          <p>
-            To protect the privacy of the individuals who have been scanned, we
-            require that all scan data be defaced before publishing a dataset.
-          </p>
-          Select a{" "}
-          <a
-            href="http://bids.neuroimaging.io"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            BIDS dataset
-          </a>{" "}
-          to upload
-          <FileSelect onChange={uploader.selectFiles} />
-        </div>
-      )}
-    </UploaderContext.Consumer>
-  </div>
-)
+const UploadSelect = () => {
+  const { user, loading, error } = useUser()
+  const disabled = loading || Boolean(error) || !user || !user.email
+  const noEmail = !user.email
+  return (
+    <div>
+      <UploaderContext.Consumer>
+        {(uploader) => (
+          <div className="message fade-in">
+            <p>
+              To protect the privacy of the individuals who have been scanned,
+              we require that all scan data be defaced before publishing a
+              dataset.
+            </p>
+            Select a{" "}
+            <a
+              href="http://bids.neuroimaging.io"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              BIDS dataset
+            </a>{" "}
+            to upload
+            <FileSelect onChange={uploader.selectFiles} disabled={disabled} />
+            {noEmail && (
+              <p>
+                Connect a contact email to upload. See our{" "}
+                <a href="https://docs.openneuro.org/orcid.html#enabling-trusted-access-to-emails">
+                  ORCID documentation
+                </a>{" "}
+                for instructions.
+              </p>
+            )}
+          </div>
+        )}
+      </UploaderContext.Consumer>
+    </div>
+  )
+}
 
 export default UploadSelect