@openneuro/app 4.25.0 → 4.25.1-orcid-demo.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/app",
-  "version": "4.25.0",
+  "version": "4.25.1-orcid-demo.1",
   "description": "React JS web frontend for the OpenNeuro platform.",
   "license": "MIT",
   "main": "public/client.js",
@@ -20,8 +20,8 @@
     "@emotion/react": "11.11.1",
     "@emotion/styled": "11.11.0",
     "@niivue/niivue": "0.34.0",
-    "@openneuro/client": "^4.25.0",
-    "@openneuro/components": "^4.25.0",
+    "@openneuro/client": "^4.25.1-orcid-demo.1",
+    "@openneuro/components": "^4.25.1-orcid-demo.1",
     "@tanstack/react-table": "^8.9.3",
     "bids-validator": "1.14.6",
     "bytes": "^3.0.0",
@@ -74,5 +74,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "294a30606b3851318666efca9f987ccf8af8c5e7"
+  "gitHead": "5e0c24435dce4a9d3add4b79558e420383c99125"
 }

package/src/scripts/__mocks__/config.ts

@@ -17,6 +17,7 @@ export const config = {
     },
     orcid: {
       clientID: "orcid-client-id",
+      ORCID_API_ENDPOINT: "https://api.sandbox.orcid.org",
     },
   },
 

package/src/scripts/config.ts

@@ -13,8 +13,7 @@ export interface OpenNeuroConfig {
     }
     orcid?: {
       clientID: string
-      URI: string
-      redirectURI: string
+      ORCID_API_ENDPOINT: string
     }
     globus?: {
       clientID: string
@@ -45,8 +44,7 @@ export const config: OpenNeuroConfig = {
     },
     orcid: {
       clientID: globalThis.OpenNeuroConfig.ORCID_CLIENT_ID,
-      URI: globalThis.OpenNeuroConfig.ORCID_URI,
-      redirectURI: globalThis.OpenNeuroConfig.ORCID_REDIRECT_URI,
+      ORCID_API_ENDPOINT: globalThis.OpenNeuroConfig.ORCID_API_ENDPOINT,
     },
   },
   analytics: {

package/src/scripts/dataset/comments/__tests__/__snapshots__/comment.spec.jsx.snap

@@ -15,7 +15,7 @@ exports[`Comment component > renders an ORCID user comment 1`] = `
           Example Exampler
            
           <a
-            href="https://orcid.org/1234-5678-9101"
+            href="https://sandbox.orcid.org/1234-5678-9101"
           >
             <img
               alt="ORCID logo"
@@ -89,7 +89,7 @@ exports[`Comment component > renders an ORCID user comment 1`] = `
         Example Exampler
          
         <a
-          href="https://orcid.org/1234-5678-9101"
+          href="https://sandbox.orcid.org/1234-5678-9101"
         >
           <img
             alt="ORCID logo"

package/src/scripts/dataset/comments/__tests__/comment.spec.jsx

@@ -4,6 +4,7 @@ import Comment from "../comment.jsx"
 import formatDistanceToNow from "date-fns/formatDistanceToNow"
 
 vi.mock("date-fns/formatDistanceToNow")
+vi.mock("../../../config.ts")
 
 const emptyState =
   '{"blocks":[{"key":"3sm42","text":"","type":"unstyled","depth":0,"inlineStyleRanges":[],"entityRanges":[],"data":{}}],"entityMap":{}}'

package/src/scripts/errors/{errorRoute.jsx → errorRoute.tsx}

@@ -4,10 +4,7 @@
 import React from "react"
 import { Route, Routes } from "react-router-dom"
 import OrcidGeneral from "./orcid/general.jsx"
-import OrcidEmail from "./orcid/email.jsx"
-import OrcidGiven from "./orcid/given.jsx"
-import OrcidFamily from "./orcid/family.jsx"
-import FourOFourPage from "./404page"
+import FourOFourPage from "./404page.js"
 
 function ErrorRoute() {
   return (
@@ -15,9 +12,6 @@ function ErrorRoute() {
       <div className="panel">
         <Routes>
           <Route path="orcid" element={<OrcidGeneral />} />
-          <Route path="orcid/email" element={<OrcidEmail />} />
-          <Route path="orcid/given" element={<OrcidGiven />} />
-          <Route path="orcid/family" element={<OrcidFamily />} />
           <Route path="*" element={<FourOFourPage />} />
         </Routes>
       </div>

package/src/scripts/errors/orcid/general.jsx

@@ -2,7 +2,7 @@ import React from "react"
 
 const OrcidError = () => (
   <div className="panel-heading">
-    <h2>There was an issue authenticating with your ORCID account</h2>
+    <h2>There was an issue authenticating with your ORCID account.</h2>
   </div>
 )
 

package/src/scripts/scss/dataset/dataset-page.scss

@@ -273,7 +273,7 @@
           }
         }
         p {
-          display: inline-block;
+          display: inline;
         }
       }
     }

package/src/scripts/users/username.tsx

@@ -1,15 +1,20 @@
 import React from "react"
 import ORCIDiDLogo from "../../assets/ORCIDiD_iconvector.svg"
+import { config } from "../config"
 
 /**
  * Display component for usernames showing ORCID linking if connected
  */
 export const Username = ({ user }): JSX.Element => {
   if (user.orcid) {
+    let orcidURL = "https://orcid.org/"
+    if (config.auth.orcid.ORCID_API_ENDPOINT.includes("sandbox")) {
+      orcidURL = "https://sandbox.orcid.org/"
+    }
     return (
       <>
         {user.name}{" "}
-        <a href={`https://orcid.org/${user.orcid}`}>
+        <a href={`${orcidURL}${user.orcid}`}>
           <img src={ORCIDiDLogo} width="16" height="16" alt="ORCID logo" />
         </a>
       </>

package/src/scripts/errors/orcid/email.jsx

@@ -1,11 +0,0 @@
-import React from "react"
-
-const EmailError = () => (
-  <div className="panel-body">
-    Your ORCID account does not have an e-mail, or your e-mail is not public.
-    Visit your <a href="https://orcid.org/my-orcid">ORCID profile</a>{" "}
-    and verify you have a public e-mail address and try again.
-  </div>
-)
-
-export default EmailError

package/src/scripts/errors/orcid/family.jsx

@@ -1,12 +0,0 @@
-import React from "react"
-
-const FamilyError = () => (
-  <div className="panel-body">
-    Your ORCID account does not have a credit name or family name, or your name
-    is not public. Visit your{" "}
-    <a href="https://orcid.org/my-orcid">ORCID profile</a>{" "}
-    and verify verify you have a publicly available name set.
-  </div>
-)
-
-export default FamilyError

package/src/scripts/errors/orcid/given.jsx

@@ -1,12 +0,0 @@
-import React from "react"
-
-const GivenError = () => (
-  <div className="panel-body">
-    Your ORCID account does not have a credit name or given name, or your name
-    is not public. Visit your{" "}
-    <a href="https://orcid.org/my-orcid">ORCID profile</a>{" "}
-    and verify you have a publicly available name set.
-  </div>
-)
-
-export default GivenError