@openneuro/app 4.20.4 → 4.20.6-alpha.2

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

@@ -1,11 +1,11 @@
-import React from 'react'
-import PropTypes from 'prop-types'
+import React from "react"
+import PropTypes from "prop-types"
 
 const UploadStepCol = ({ active, text }) => {
   const activeClasses = active
-    ? ['upload-step', 'upload-step-active']
-    : ['upload-step']
-  return <div className={'col col-3 ' + activeClasses.join(' ')}>{text}</div>
+    ? ["upload-step", "upload-step-active"]
+    : ["upload-step"]
+  return <div className={"col col-3 " + activeClasses.join(" ")}>{text}</div>
 }
 
 UploadStepCol.propTypes = {
@@ -17,19 +17,19 @@ const UploadStep = ({ location }) => (
   <div className="grid">
     <UploadStepCol
       text="Step 1: Select Files"
-      active={location.pathname === '/upload'}
+      active={location.pathname === "/upload"}
     />
     <UploadStepCol
       text="Step 2: Validation"
-      active={location.pathname === '/upload/issues'}
+      active={location.pathname === "/upload/issues"}
     />
     <UploadStepCol
       text="Step 3: Metadata"
-      active={location.pathname === '/upload/metadata'}
+      active={location.pathname === "/upload/metadata"}
     />
     <UploadStepCol
       text="Step 4: Accept Terms"
-      active={location.pathname === '/upload/disclaimer'}
+      active={location.pathname === "/upload/disclaimer"}
     />
   </div>
 )

package/src/scripts/uploader/uploader-context.js

@@ -1,4 +1,4 @@
-import React from 'react'
+import React from "react"
 
 // Defaults are in the Uploader component
 const UploaderContext = React.createContext(undefined)

package/src/scripts/uploader/uploader-location.js

@@ -1,5 +1,5 @@
 // Helper functions for navigating the uploader dialog
-export const locationFactory = pathname => ({
+export const locationFactory = (pathname) => ({
   pathname,
   state: { uploader: true },
 })

package/src/scripts/uploader/uploader-modal.jsx

@@ -1,14 +1,15 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import { Modal } from '@openneuro/components/modal'
+import React from "react"
+import PropTypes from "prop-types"
+import { Modal } from "@openneuro/components/modal"
 
 // Show is always {true} because the router unmounts this otherwise
 const UploaderModal = ({ setLocation, location, children, footer }) => (
   <Modal
-    isOpen={location.pathname !== '/hidden' ? true : false}
-    toggle={() => setLocation('/hidden')}
-    closeText={'close'}
-    className="upload-modal">
+    isOpen={location.pathname !== "/hidden" ? true : false}
+    toggle={() => setLocation("/hidden")}
+    closeText={"close"}
+    className="upload-modal"
+  >
     <h3>Upload Dataset</h3>
     {children}
     {footer ? footer : null}

package/src/scripts/uploader/uploader-setup-routes.jsx

@@ -1,14 +1,14 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import { Route, Routes } from 'react-router-dom'
-import UploaderModal from './uploader-modal.jsx'
-import UploadStep from './upload-step.jsx'
-import UploadSelect from './upload-select.jsx'
-import UploadIssues from './upload-issues.jsx'
-import UploadMetadata from './upload-metadata.jsx'
-import UploadDisclaimer from './upload-disclaimer.jsx'
+import React from "react"
+import PropTypes from "prop-types"
+import { Route, Routes } from "react-router-dom"
+import UploaderModal from "./uploader-modal.jsx"
+import UploadStep from "./upload-step.jsx"
+import UploadSelect from "./upload-select.jsx"
+import UploadIssues from "./upload-issues.jsx"
+import UploadMetadata from "./upload-metadata.jsx"
+import UploadDisclaimer from "./upload-disclaimer.jsx"
 
-const UploaderSetupRoutes = props => (
+const UploaderSetupRoutes = (props) => (
   <UploaderModal {...props}>
     <UploadStep location={props.location} />
     <div className="tasks-col fade-in">

package/src/scripts/uploader/uploader-status-routes.jsx

@@ -1,10 +1,10 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import { Route, Routes } from 'react-router-dom'
-import UploaderModal from './uploader-modal.jsx'
-import UploadStatus from './upload-status.jsx'
+import React from "react"
+import PropTypes from "prop-types"
+import { Route, Routes } from "react-router-dom"
+import UploaderModal from "./uploader-modal.jsx"
+import UploadStatus from "./upload-status.jsx"
 
-const UploaderStatusRoutes = props => (
+const UploaderStatusRoutes = (props) => (
   <UploaderModal {...props}>
     <div className="tasks-col fade-in">
       <div id="upload-tabs" className="uploader">

package/src/scripts/uploader/uploader-view.jsx

@@ -1,7 +1,7 @@
-import React from 'react'
-import BlockNavigation from '../common/partials/block-navigation.jsx'
-import UploaderSetupRoutes from './uploader-setup-routes.jsx'
-import UploaderStatusRoutes from './uploader-status-routes.jsx'
+import React from "react"
+import BlockNavigation from "../common/partials/block-navigation.jsx"
+import UploaderSetupRoutes from "./uploader-setup-routes.jsx"
+import UploaderStatusRoutes from "./uploader-status-routes.jsx"
 
 const UploaderView = ({ uploader }) => {
   if (uploader.uploading) {

package/src/scripts/uploader/uploader.jsx

@@ -1,19 +1,19 @@
-import { apm } from '../apm'
-import { toast } from 'react-toastify'
-import ToastContent from '../common/partials/toast-content.jsx'
-import React from 'react'
-import PropTypes from 'prop-types'
-import { ApolloConsumer } from '@apollo/client'
-import * as gtag from '../utils/gtag'
-import UploaderContext from './uploader-context.js'
-import FileSelect from './file-select'
-import { locationFactory } from './uploader-location.js'
-import * as mutation from './upload-mutation.js'
-import { datasets, uploads } from '@openneuro/client'
-import { useNavigate } from 'react-router-dom'
-import { uploadFiles } from './file-upload.js'
-import { UploadProgress } from './upload-progress-class'
-import { addPathToFiles } from './add-path-to-files.js'
+import { apm } from "../apm"
+import { toast } from "react-toastify"
+import ToastContent from "../common/partials/toast-content.jsx"
+import React from "react"
+import PropTypes from "prop-types"
+import { ApolloConsumer } from "@apollo/client"
+import * as gtag from "../utils/gtag"
+import UploaderContext from "./uploader-context.js"
+import FileSelect from "./file-select"
+import { locationFactory } from "./uploader-location.js"
+import * as mutation from "./upload-mutation.js"
+import { datasets, uploads } from "@openneuro/client"
+import { useNavigate } from "react-router-dom"
+import { uploadFiles } from "./file-upload.js"
+import { UploadProgress } from "./upload-progress-class"
+import { addPathToFiles } from "./add-path-to-files.js"
 
 /**
  * Stateful uploader workflow and status
@@ -29,13 +29,13 @@ export class UploadClient extends React.Component {
       // An upload is processing
       uploading: false,
       // Which step in the modal
-      location: locationFactory('/hidden'),
+      location: locationFactory("/hidden"),
       // List of files being uploaded
       files: [],
       // Files selected, regardless of if they will be uploaded
       selectedFiles: {},
       // Relabel dataset during upload
-      name: '',
+      name: "",
       // Dataset description - null if it doesn't exist
       description: null,
       progress: 0,
@@ -79,7 +79,7 @@ export class UploadClient extends React.Component {
    *
    * @param {string} path Virtual router path for upload modal
    */
-  setLocation = path => {
+  setLocation = (path) => {
     gtag.pageview(path)
     this.setState({ location: locationFactory(path) })
   }
@@ -145,16 +145,16 @@ export class UploadClient extends React.Component {
    */
   selectFiles = ({ files }) => {
     // First get the name from dataset_description.json
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
       const descriptionFile = [...files].find(
-        f => f.name === 'dataset_description.json',
+        (f) => f.name === "dataset_description.json",
       )
       if (!descriptionFile) {
         // Use directory name if no dataset_description
-        resolve(files[0].webkitRelativePath.split('/')[0])
+        resolve(files[0].webkitRelativePath.split("/")[0])
       }
       const descriptionReader = new FileReader()
-      descriptionReader.onload = event => {
+      descriptionReader.onload = (event) => {
         try {
           // Read Name field from dataset_description.json
           const description = JSON.parse(event.target.result.toString())
@@ -163,25 +163,25 @@ export class UploadClient extends React.Component {
           resolve(description.Name)
         } catch (e) {
           // Fallback to directory name if JSON parse failed
-          resolve(files[0].webkitRelativePath.split('/')[0])
+          resolve(files[0].webkitRelativePath.split("/")[0])
         }
       }
       descriptionReader.readAsText(descriptionFile)
-    }).then(name => {
+    }).then((name) => {
       if (files.length > 0) {
         this.setState({
           files,
           selectedFiles: files,
           name,
         })
-        this.setLocation('/upload/issues')
+        this.setLocation("/upload/issues")
       } else {
-        throw new Error('No files selected')
+        throw new Error("No files selected")
       }
     })
   }
 
-  captureMetadata = metadata => {
+  captureMetadata = (metadata) => {
     this.setState({
       metadata,
     })
@@ -196,15 +196,15 @@ export class UploadClient extends React.Component {
   upload = ({ affirmedDefaced, affirmedConsent }) => {
     // Track the start of uploads
     gtag.event({
-      category: 'Upload',
-      action: 'Started web upload',
+      category: "Upload",
+      action: "Started web upload",
       label: this.state.datasetId,
     })
     this.setState({
       uploading: true,
       abortController: new AbortController(),
     })
-    this.setLocation('/hidden')
+    this.setLocation("/hidden")
     if (this.state.resume && this.state.datasetId) {
       // Just add files since this is an existing dataset
       this._addFiles()
@@ -215,14 +215,14 @@ export class UploadClient extends React.Component {
           affirmedDefaced,
           affirmedConsent,
         })
-        .then(datasetId => {
+        .then((datasetId) => {
           // Note chain to this._addFiles
           this.setState({ datasetId }, () => {
             this.uploadMetadata()
             this._addFiles()
           })
         })
-        .catch(error => {
+        .catch((error) => {
           apm.captureError(error)
           toast.error(
             <ToastContent
@@ -235,7 +235,7 @@ export class UploadClient extends React.Component {
             error,
             uploading: false,
           })
-          this.setLocation('/hidden')
+          this.setLocation("/hidden")
         })
     }
   }
@@ -246,17 +246,17 @@ export class UploadClient extends React.Component {
   _includeChanges() {
     const files = [...this.state.files]
     // Determine if the files list has a CHANGES file already
-    const hasChanges = files.some(f => f.name === 'CHANGES')
+    const hasChanges = files.some((f) => f.name === "CHANGES")
 
     // Do nothing if the file already exists
     if (hasChanges) return files
 
     // Construct the initial CHANGES file and add to the files array
     const initialChangesFile = new Blob([], {
-      type: 'text/plain',
+      type: "text/plain",
     })
-    initialChangesFile.name = 'CHANGES'
-    initialChangesFile.webkitRelativePath = '/CHANGES'
+    initialChangesFile.name = "CHANGES"
+    initialChangesFile.webkitRelativePath = "/CHANGES"
     files.push(initialChangesFile)
     return files
   }
@@ -305,9 +305,10 @@ export class UploadClient extends React.Component {
       const toastId = toast.error(
         <ToastContent
           title="Dataset upload failed"
-          body="Please check your connection">
+          body="Please check your connection"
+        >
           <FileSelect
-            onChange={event => {
+            onChange={(event) => {
               toast.dismiss(toastId)
               this.resumeDataset(this.state.datasetId)(event)
             }}
@@ -320,7 +321,7 @@ export class UploadClient extends React.Component {
         error,
         uploading: false,
       })
-      this.setLocation('/hidden')
+      this.setLocation("/hidden")
       if (this.state.xhr) {
         try {
           this.state.xhr.abort()
@@ -334,19 +335,20 @@ export class UploadClient extends React.Component {
   uploadCompleteAction = () => {
     // Record upload finished successfully with Google Analytics
     gtag.event({
-      category: 'Upload',
-      action: 'Finished web upload',
+      category: "Upload",
+      action: "Finished web upload",
       label: this.state.datasetId,
     })
     const datasetURL = `/datasets/${this.state.datasetId}`
-    if (this.state.location.pathname !== locationFactory('/hidden').pathname) {
+    if (this.state.location.pathname !== locationFactory("/hidden").pathname) {
       this.props.navigate(datasetURL)
-      this.setLocation('/hidden')
+      this.setLocation("/hidden")
     } else {
       toast.success(
         <ToastContent
           title="Upload complete"
-          body="Dataset successfully uploaded">
+          body="Dataset successfully uploaded"
+        >
           <a href={datasetURL}>Click here to browse your dataset.</a>
         </ToastContent>,
         { autoClose: false },
@@ -354,7 +356,7 @@ export class UploadClient extends React.Component {
     }
   }
 
-  uploadProgress = state => {
+  uploadProgress = (state) => {
     this.setState(state)
   }
 
@@ -394,7 +396,7 @@ UploadClient.propTypes = {
 
 const Uploader = ({ children }) => (
   <ApolloConsumer>
-    {client => (
+    {(client) => (
       <div className="uploader">
         <UploadClientWithRouter client={client}>
           {children}

package/src/scripts/users/username.tsx

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

package/src/scripts/utils/__tests__/csv.spec.ts

@@ -1,37 +1,37 @@
-import { convertArrayToCSV } from '../csv'
+import { convertArrayToCSV } from "../csv"
 
-describe('utils/csv', () => {
-  it('converts to a valid CSV', () => {
+describe("utils/csv", () => {
+  it("converts to a valid CSV", () => {
     const obj = [
-      { exampleCol: 'test', exampleCol2: 'test2', __typename: 'example' },
-      { exampleCol: 'test4', exampleCol2: 'test3', __typename: 'example' },
+      { exampleCol: "test", exampleCol2: "test2", __typename: "example" },
+      { exampleCol: "test4", exampleCol2: "test3", __typename: "example" },
     ]
     expect(convertArrayToCSV(obj)).toEqual(
       'exampleCol,exampleCol2\n"test","test2"\n"test4","test3"',
     )
   })
-  it('escapes comma values correctly', () => {
+  it("escapes comma values correctly", () => {
     const obj = [
-      { exampleCol: 'test', modalities: 'PET,MRI', __typename: 'example' },
-      { exampleCol: 'test4', modalities: 'MRI', __typename: 'example' },
+      { exampleCol: "test", modalities: "PET,MRI", __typename: "example" },
+      { exampleCol: "test4", modalities: "MRI", __typename: "example" },
     ]
     expect(convertArrayToCSV(obj)).toEqual(
       'exampleCol,modalities\n"test","PET,MRI"\n"test4","MRI"',
     )
   })
-  it('escapes double quotes', () => {
+  it("escapes double quotes", () => {
     const obj = [
       {
-        exampleCol: 'test',
-        modalities: 'PET,MRI',
+        exampleCol: "test",
+        modalities: "PET,MRI",
         name: 'A "Dataset"',
-        __typename: 'example',
+        __typename: "example",
       },
       {
-        exampleCol: 'test4',
-        modalities: 'MRI',
-        name: 'Another Dataset',
-        __typename: 'example',
+        exampleCol: "test4",
+        modalities: "MRI",
+        name: "Another Dataset",
+        __typename: "example",
       },
     ]
     expect(convertArrayToCSV(obj)).toEqual(

package/src/scripts/utils/__tests__/date.spec.js

@@ -1,8 +1,8 @@
-import { formatDate } from '../date.js'
+import { formatDate } from "../date.js"
 
-describe('utils/date.js', () => {
-  it('returns an YYYY-MM-DD date', () => {
+describe("utils/date.js", () => {
+  it("returns an YYYY-MM-DD date", () => {
     const beginningOfTime = new Date(0)
-    expect(formatDate(beginningOfTime)).toBe('1970-01-01')
+    expect(formatDate(beginningOfTime)).toBe("1970-01-01")
   })
 })

package/src/scripts/utils/__tests__/json-ld.spec.js

@@ -1,25 +1,25 @@
-import schemaGenerator from '../json-ld.js'
+import schemaGenerator from "../json-ld.js"
 
-const mockDate = new Date('2020-08-11T20:53:56.110Z')
+const mockDate = new Date("2020-08-11T20:53:56.110Z")
 const mockSnapshot = {
-  id: 'ds000000:1.0.0',
+  id: "ds000000:1.0.0",
   created: mockDate,
   description: {
-    Name: 'Fake dataset',
-    Authors: ['Jane Doe', 'John Doe'],
+    Name: "Fake dataset",
+    Authors: ["Jane Doe", "John Doe"],
   },
-  readme: 'This is a test dataset',
-  tag: '1.0.0',
+  readme: "This is a test dataset",
+  tag: "1.0.0",
 }
 
-describe('schemaGenerator()', () => {
-  it('returns a valid license field', () => {
+describe("schemaGenerator()", () => {
+  it("returns a valid license field", () => {
     const jsonld = JSON.parse(schemaGenerator(mockSnapshot))
     expect(jsonld.license).toMatch(/https:\/\//)
   })
-  it('returns organization for publisher type', () => {
+  it("returns organization for publisher type", () => {
     const jsonld = JSON.parse(schemaGenerator(mockSnapshot))
-    expect(jsonld.publisher['@type']).toEqual('Organization')
-    expect(jsonld.publisher.name).toEqual('OpenNeuro')
+    expect(jsonld.publisher["@type"]).toEqual("Organization")
+    expect(jsonld.publisher.name).toEqual("OpenNeuro")
   })
 })

package/src/scripts/utils/__tests__/newid.spec.js

@@ -1,16 +1,16 @@
-import assert from 'assert'
-import newid from '../newid'
+import assert from "assert"
+import newid from "../newid"
 
-describe('utils/newid.js', () => {
+describe("utils/newid.js", () => {
   it("should iterate a new id every time it's called", () => {
-    assert.equal(newid(), 'id1')
-    assert.equal(newid(), 'id2')
-    assert.equal(newid(), 'id3')
+    assert.equal(newid(), "id1")
+    assert.equal(newid(), "id2")
+    assert.equal(newid(), "id3")
   })
 
   it('should accept an id prefix to replace the generic "id"', () => {
-    assert.equal(newid('my-prefix-'), 'my-prefix-1')
-    assert.equal(newid('my-prefix-'), 'my-prefix-2')
-    assert.equal(newid('my-prefix-'), 'my-prefix-3')
+    assert.equal(newid("my-prefix-"), "my-prefix-1")
+    assert.equal(newid("my-prefix-"), "my-prefix-2")
+    assert.equal(newid("my-prefix-"), "my-prefix-3")
   })
 })

package/src/scripts/utils/__tests__/userNotify.spec.js

@@ -1,28 +1,28 @@
-import { expiringBanner } from '../userNotify.js'
-import { toast } from 'react-toastify'
+import { expiringBanner } from "../userNotify.js"
+import { toast } from "react-toastify"
 
-vi.mock('react-toastify', () => ({
-  ...vi.importActual('react-toastify'),
+vi.mock("react-toastify", () => ({
+  ...vi.importActual("react-toastify"),
   toast: { warn: vi.fn() },
 }))
 
-describe('userNotify.js', () => {
-  describe('expiringBanner', () => {
+describe("userNotify.js", () => {
+  describe("expiringBanner", () => {
     afterEach(() => {
       vi.clearAllMocks()
     })
-    it('is displayed before expiration time', () => {
+    it("is displayed before expiration time", () => {
       const future = new Date()
       // Engage the flux capacitor
       future.setSeconds(future.getSeconds() + 30)
-      expiringBanner('message', future)
+      expiringBanner("message", future)
       expect(toast.warn).toHaveBeenCalled()
     })
-    it('is not displayed after expiration', () => {
+    it("is not displayed after expiration", () => {
       const past = new Date()
       // Rewind time 30 seconds
       past.setSeconds(past.getSeconds() - 30)
-      expiringBanner('message', past)
+      expiringBanner("message", past)
       expect(toast.warn).not.toHaveBeenCalled()
     })
   })

package/src/scripts/utils/analytics.tsx

@@ -1,6 +1,6 @@
-import React, { useEffect } from 'react'
-import { pageview } from '../utils/gtag'
-import { useLocation } from 'react-router-dom'
+import React, { useEffect } from "react"
+import { pageview } from "../utils/gtag"
+import { useLocation } from "react-router-dom"
 
 export const useAnalytics = (): void => {
   const location = useLocation()

package/src/scripts/utils/cookies.js

@@ -1,4 +1,4 @@
-import Cookies from 'universal-cookie'
+import Cookies from "universal-cookie"
 
 const cookies = new Cookies()
 

package/src/scripts/utils/csv.ts

@@ -4,22 +4,20 @@
  */
 export function convertArrayToCSV<T>(array: T[]): string {
   if (array.length === 0) {
-    return ''
+    return ""
   }
 
-  const keys = Object.keys(array[0]).filter(key => key !== '__typename')
-  const headerRow = keys.join(',') + '\n'
-  const dataRows = array.map(obj =>
+  const keys = Object.keys(array[0]).filter((key) => key !== "__typename")
+  const headerRow = keys.join(",") + "\n"
+  const dataRows = array.map((obj) =>
     keys
-      .map(key =>
-        obj[key]
-          ? `"${obj[key].toString().replace(/"/g, '""') as string}"`
-          : '',
+      .map((key) =>
+        obj[key] ? `"${obj[key].toString().replace(/"/g, '""') as string}"` : ""
       )
-      .join(','),
+      .join(",")
   )
 
-  return headerRow + dataRows.join('\n')
+  return headerRow + dataRows.join("\n")
 }
 
 /**
@@ -27,13 +25,13 @@ export function convertArrayToCSV<T>(array: T[]): string {
  */
 export function makeCsv<T>(rows: T[], filename: string): void {
   const csvContent = convertArrayToCSV(rows)
-  const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' })
-  const link = document.createElement('a')
+  const blob = new Blob([csvContent], { type: "text/csv;charset=utf-8;" })
+  const link = document.createElement("a")
   if (link.download !== undefined) {
     const url = URL.createObjectURL(blob)
-    link.setAttribute('href', url)
-    link.setAttribute('download', filename)
-    link.style.visibility = 'hidden'
+    link.setAttribute("href", url)
+    link.setAttribute("download", filename)
+    link.style.visibility = "hidden"
     document.body.appendChild(link)
     link.click()
     document.body.removeChild(link)