@openneuro/app 4.14.0-alpha.1 → 4.14.1-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/app",
-  "version": "4.14.0-alpha.1",
+  "version": "4.14.1-alpha.0",
   "description": "React JS web frontend for the OpenNeuro platform.",
   "license": "MIT",
   "main": "public/client.js",
@@ -20,8 +20,8 @@
     "@emotion/react": "11.6.0",
     "@emotion/styled": "11.6.0",
     "@niivue/niivue": "0.23.1",
-    "@openneuro/client": "^4.14.0-alpha.1",
-    "@openneuro/components": "^4.14.0-alpha.1",
+    "@openneuro/client": "^4.14.1-alpha.0",
+    "@openneuro/components": "^4.14.1-alpha.0",
     "bids-validator": "1.9.9",
     "bytes": "^3.0.0",
     "comlink": "^4.0.5",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e901db29ed49827d7bf5e0cf3138b0b88749d851"
+  "gitHead": "fb10062e42c683b9fd5e44beaf570fd26c9caedc"
 }

package/src/@types/custom.d.ts

@@ -5,6 +5,12 @@ declare module '*.png' {
   export = value
 }
 
+// Allow .svg imports
+declare module '*.svg' {
+  const value: string
+  export = value
+}
+
 // Allow .scss imports
 declare module '*.scss' {
   const value: string

package/src/assets/ORCIDiD_iconvector.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 256 256" style="enable-background:new 0 0 256 256;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#A6CE39;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M256,128c0,70.7-57.3,128-128,128C57.3,256,0,198.7,0,128C0,57.3,57.3,0,128,0C198.7,0,256,57.3,256,128z"/>
+<g>
+	<path class="st1" d="M86.3,186.2H70.9V79.1h15.4v48.4V186.2z"/>
+	<path class="st1" d="M108.9,79.1h41.6c39.6,0,57,28.3,57,53.6c0,27.5-21.5,53.6-56.8,53.6h-41.8V79.1z M124.3,172.4h24.5
+		c34.9,0,42.9-26.5,42.9-39.7c0-21.5-13.7-39.7-43.7-39.7h-23.7V172.4z"/>
+	<path class="st1" d="M88.7,56.8c0,5.5-4.5,10.1-10.1,10.1c-5.6,0-10.1-4.6-10.1-10.1c0-5.6,4.5-10.1,10.1-10.1
+		C84.2,46.7,88.7,51.3,88.7,56.8z"/>
+</g>
+</svg>

package/src/scripts/dataset/__tests__/__snapshots__/snapshot-container.spec.tsx.snap

@@ -1454,7 +1454,7 @@ OCI-1131441 (R. Poldrack, PI) in any publications.
             >
               Uploaded by
             </h2>
-            Test User on 2021-12-17 - 12 months ago
+            Test User on 2021-12-17 - about 1 year ago
           </div>
           <div
             class="dataset-meta-block undefined"
@@ -1464,7 +1464,7 @@ OCI-1131441 (R. Poldrack, PI) in any publications.
             >
               Last Updated
             </h2>
-            2021-12-17 - 12 months ago
+            2021-12-17 - about 1 year ago
           </div>
           <div
             class="dataset-meta-block undefined"

package/src/scripts/dataset/dataset-query.jsx

@@ -53,6 +53,7 @@ export const getDatasetPage = gql`
         id
         name
         email
+        orcid
       }
       analytics {
         downloads
@@ -108,6 +109,7 @@ export const getDraftPage = gql`
         id
         name
         email
+        orcid
       }
       analytics {
         downloads

package/src/scripts/dataset/draft-container.tsx

@@ -28,6 +28,7 @@ import {
   VersionList,
   DatasetTools,
 } from '@openneuro/components/dataset'
+import { Username } from '../users/username'
 
 import { FollowDataset } from './mutations/follow'
 import { StarDataset } from './mutations/star'
@@ -283,7 +284,7 @@ const DraftContainer: React.FC<DraftContainerProps> = ({ dataset }) => {
                 heading="Uploaded by"
                 item={
                   <>
-                    {dataset.uploader.name} on {dateAdded} -{' '}
+                    <Username user={dataset.uploader} /> on {dateAdded} -{' '}
                     {dateAddedDifference} ago
                   </>
                 }

package/src/scripts/dataset/snapshot-container.tsx

@@ -25,6 +25,7 @@ import {
   VersionList,
   DatasetTools,
 } from '@openneuro/components/dataset'
+import { Username } from '../users/username'
 import { Loading } from '@openneuro/components/loading'
 
 import {
@@ -285,7 +286,7 @@ export const SnapshotContainer: React.FC<SnapshotContainerProps> = ({
                 heading="Uploaded by"
                 item={
                   <>
-                    {dataset.uploader.name} on {dateAdded} -{' '}
+                    <Username user={dataset.uploader} /> on {dateAdded} -{' '}
                     {dateAddedDifference} ago
                   </>
                 }

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

@@ -39,6 +39,7 @@ const searchQuery = gql`
           uploader {
             id
             name
+            orcid
           }
           public
           permissions {

package/src/scripts/users/username.tsx

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