@openneuro/app 4.4.9 → 4.5.1

package/src/scripts/{refactor_2021/dataset → dataset}/files/viewers/file-viewer-nifti.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import Papaya from '../../../../common/partials/papaya.jsx'
+import Papaya from '../../../common/partials/papaya.jsx'
 import styled from '@emotion/styled'
 
 const StyleWrapper = styled.div`

package/src/scripts/{refactor_2021/dataset → dataset}/fragments/__tests__/doi-link.spec.tsx

@@ -5,9 +5,12 @@ import { MemoryRouter } from 'react-router-dom'
 
 describe('DoiLink component', () => {
   it('Renders usable link with raw DOI value', () => {
-    render(<DOILink DOI="10.18112/openneuro.ds000001.v1.0.0" />, {
-      wrapper: MemoryRouter,
-    })
+    render(
+      <DOILink DOI="10.18112/openneuro.ds000001.v1.0.0" datasetId="ds000001" />,
+      {
+        wrapper: MemoryRouter,
+      },
+    )
     expect(screen.getByRole('link')).toHaveTextContent(
       'doi:10.18112/openneuro.ds000001.v1.0.0',
     )
@@ -17,26 +20,53 @@ describe('DoiLink component', () => {
     )
   })
   it('Renders usable link with URI DOI value', () => {
-    render(<DOILink DOI="doi:10.18112/openneuro.ds000001.v1.0.0" />, {
-      wrapper: MemoryRouter,
-    })
+    render(
+      <DOILink
+        DOI="doi:10.18112/openneuro.ds000001.v1.0.0"
+        datasetId="ds000001"
+      />,
+      {
+        wrapper: MemoryRouter,
+      },
+    )
     expect(screen.getByRole('link')).toHaveTextContent(
       'doi:10.18112/openneuro.ds000001.v1.0.0',
     )
   })
   it('Renders usage link with URL DOI value', () => {
     render(
-      <DOILink DOI="https://doi.org/10.18112/openneuro.ds000001.v1.0.0" />,
+      <DOILink
+        DOI="https://doi.org/10.18112/openneuro.ds000001.v1.0.0"
+        datasetId="ds000001"
+      />,
       { wrapper: MemoryRouter },
     )
     expect(screen.getByRole('link')).toHaveTextContent(
       'doi:10.18112/openneuro.ds000001.v1.0.0',
     )
   })
+  it('Renders fallback link with invalid DOI value', () => {
+    render(<DOILink DOI="doi:x" datasetId="ds000001" />, {
+      wrapper: MemoryRouter,
+    })
+    expect(screen.getByRole('link')).toHaveTextContent(
+      'Create a new snapshot to obtain a DOI for the snapshot.',
+    )
+    expect(screen.getByRole('link')).toHaveAttribute(
+      'href',
+      '/datasets/ds000001/snapshot',
+    )
+  })
   it('Renders fallback text if no valid DOI string is found', () => {
-    render(<DOILink DOI={null} />, { wrapper: MemoryRouter })
+    render(<DOILink DOI={null} datasetId="ds000001" />, {
+      wrapper: MemoryRouter,
+    })
     expect(screen.getByRole('link')).toHaveTextContent(
       'Create a new snapshot to obtain a DOI for the snapshot.',
     )
+    expect(screen.getByRole('link')).toHaveAttribute(
+      'href',
+      '/datasets/ds000001/snapshot',
+    )
   })
 })

package/src/scripts/{refactor_2021/dataset → dataset}/fragments/dataset-citation.jsx

@@ -61,13 +61,11 @@ const DatasetCitation = ({ snapshot }) => {
           />
           <Tooltip
             tooltip={'Copy ' + style + ' to clipboard'}
-            className="tooltip"
-          >
+            className="tooltip">
             <CopyToClipboard
               text={citation}
               onCopy={() => copiedTimeout()}
-              className="on-button on-button--small on-button--nobg "
-            >
+              className="on-button on-button--small on-button--nobg ">
               <span className="copy-key">
                 <i className="fa fa-link" aria-hidden="true" />{' '}
                 {copied ? <span>Copied to clipboard</span> : <span>Copy</span>}

package/src/scripts/{refactor_2021/dataset → dataset}/fragments/dataset-reviewers.ts

@@ -8,4 +8,4 @@ export const DATASET_REVIEWERS = gql`
       id
     }
   }
-`
+`

package/src/scripts/{refactor_2021/dataset → dataset}/fragments/doi-link.tsx

@@ -4,7 +4,13 @@ import { Link } from 'react-router-dom'
 // See https://www.crossref.org/blog/dois-and-matching-regular-expressions/
 export const DOIPattern = /^10.\d{4,9}\/[-._;()/:A-Z0-9]+$/i
 
-export const DOILink = ({ DOI }) => {
+export const DOILinkFallback = ({ datasetId }) => (
+  <Link to={`/datasets/${datasetId}/snapshot`}>
+    Create a new snapshot to obtain a DOI for the snapshot.
+  </Link>
+)
+
+export const DOILink = ({ DOI, datasetId }) => {
   if (
     DOI &&
     (DOI.match(DOIPattern) ||
@@ -20,11 +26,8 @@ export const DOILink = ({ DOI }) => {
     if (DOI.startsWith('https://doi.org/')) {
       return <a href={DOI}>{`doi:${DOI.slice(16)}`}</a>
     }
+    return <DOILinkFallback datasetId={datasetId} />
   } else {
-    return (
-      <Link to="snapshot">
-        Create a new snapshot to obtain a DOI for the snapshot.
-      </Link>
-    )
+    return <DOILinkFallback datasetId={datasetId} />
   }
 }

package/src/scripts/{refactor_2021/dataset → dataset}/mutations/dataset-relations.tsx

@@ -96,7 +96,7 @@ export const DatasetRelations = ({ datasetId, hasEdit }) => {
             return (
               <React.Fragment key={obj.id}>
                 <GridItem>
-                  <DOILink DOI={obj.id} />
+                  <DOILink DOI={obj.id} datasetId={datasetId} />
                 </GridItem>
                 <GridItem>{obj.description}</GridItem>
                 <GridItem>
@@ -107,8 +107,7 @@ export const DatasetRelations = ({ datasetId, hasEdit }) => {
                         variables: { datasetId, doi: obj.id },
                       })
                       await refetch()
-                    }}
-                  >
+                    }}>
                     Delete
                   </button>
                 </GridItem>

package/src/scripts/{refactor_2021/dataset → dataset}/mutations/delete-comment.jsx

@@ -49,8 +49,7 @@ const DeleteComment = ({ datasetId, commentId }) => {
             comments: nextCommentsState,
           },
         })
-      }}
-    >
+      }}>
       {deleteComment => (
         <div className="col col-fixed">
           <a
@@ -62,8 +61,7 @@ const DeleteComment = ({ datasetId, commentId }) => {
                   deleteChildren: true,
                 },
               })
-            }}
-          >
+            }}>
             <Icon icon="fa fa-trash" label="Delete" />
           </a>
         </div>

package/src/scripts/{refactor_2021/dataset → dataset}/mutations/description.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import { gql } from '@apollo/client'
 import { Mutation } from '@apollo/client/react/components'
 import { SaveButton } from '../fragments/save-button'
-import { DRAFT_FRAGMENT } from '../../../datalad/dataset/dataset-query-fragments'
+import { DRAFT_FRAGMENT } from '../../datalad/dataset/dataset-query-fragments'
 import { datasetCacheId } from './cache-id.js'
 
 export const UPDATE_DESCRIPTION = gql`

package/src/scripts/{refactor_2021/dataset → dataset}/mutations/flag-annex-object.jsx

@@ -27,8 +27,7 @@ const FlagAnnexObject = ({ datasetId, snapshot, filepath, annexKey }) => (
       // fa-exclamation-triangle might be better
       <Tooltip
         className="flag-annex-object"
-        tooltip="Flag: use this to alert site admins if this file has been found to contain subject sensitive data."
-      >
+        tooltip="Flag: use this to alert site admins if this file has been found to contain subject sensitive data.">
         <WarnButton
           message=""
           icon="fa-exclamation-triangle"

package/src/scripts/{refactor_2021/dataset → dataset}/mutations/follow.tsx

@@ -1,9 +1,9 @@
 import React, { FC, useContext } from 'react'
 import { gql } from '@apollo/client'
 import { Mutation } from '@apollo/client/react/components'
-import { datasetCacheId } from '../../../datalad/mutations/cache-id.js'
+import { datasetCacheId } from '../../datalad/mutations/cache-id.js'
 import { CountToggle } from '@openneuro/components/count-toggle'
-import { UserModalOpenCtx } from '../../user-login-modal-ctx'
+import { UserModalOpenCtx } from '../../utils/user-login-modal-ctx'
 
 const FOLLOW_DATASET = gql`
   mutation followDataset($datasetId: ID!) {

package/src/scripts/{refactor_2021/dataset → dataset}/mutations/readme.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import { gql } from '@apollo/client'
 import { Mutation } from '@apollo/client/react/components'
 import { SaveButton } from '../fragments/save-button'
-import { DRAFT_FRAGMENT } from '../../../datalad/dataset/dataset-query-fragments'
+import { DRAFT_FRAGMENT } from '../../datalad/dataset/dataset-query-fragments'
 import { datasetCacheId } from './cache-id.js'
 
 const UPDATE_README = gql`

package/src/scripts/{refactor_2021/dataset → dataset}/mutations/snapshot.tsx

@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { gql, useMutation } from '@apollo/client'
 import { useHistory } from 'react-router-dom'
-import ErrorBoundary from '../../../errors/errorBoundary.jsx'
+import ErrorBoundary from '../../errors/errorBoundary.jsx'
 import { Button } from '@openneuro/components/button'
 
 const CREATE_SNAPSHOT = gql`

package/src/scripts/{refactor_2021/dataset → dataset}/mutations/star.tsx

@@ -1,9 +1,9 @@
 import React, { FC, useContext } from 'react'
 import { gql } from '@apollo/client'
 import { Mutation } from '@apollo/client/react/components'
-import { datasetCacheId } from '../../../datalad/mutations/cache-id.js'
+import { datasetCacheId } from '../../datalad/mutations/cache-id.js'
 import { CountToggle } from '@openneuro/components/count-toggle'
-import { UserModalOpenCtx } from '../../user-login-modal-ctx'
+import { UserModalOpenCtx } from '../../utils/user-login-modal-ctx'
 
 const STAR_DATASET = gql`
   mutation starDataset($datasetId: ID!) {

package/src/scripts/{refactor_2021/dataset → dataset}/mutations/submit-metadata.jsx

@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { gql } from '@apollo/client'
 import { Mutation } from '@apollo/client/react/components'
-import { DATASET_METADATA } from '../../../datalad/dataset/dataset-query-fragments'
+import { DATASET_METADATA } from '../../datalad/dataset/dataset-query-fragments'
 import { datasetCacheId } from './cache-id.js'
 import { Button } from '@openneuro/components/button'
 

package/src/scripts/{refactor_2021/dataset → dataset}/routes/add-metadata.jsx

@@ -7,7 +7,7 @@ import { DatasetRelations } from '../mutations/dataset-relations'
 import SubmitMetadata from '../mutations/submit-metadata.jsx'
 import LoggedIn from '../../authentication/logged-in.jsx'
 import { hasEditPermissions, getProfile } from '../../authentication/profile.js'
-import { getDatasetUrl } from '../../../utils/dataset-url'
+import { getDatasetUrl } from '../../utils/dataset-url'
 
 export const compileMetadata = dataset => {
   const getFromMetadata = key => dataset.metadata && dataset.metadata[key]

package/src/scripts/{refactor_2021/dataset → dataset}/routes/admin-exports.jsx

@@ -5,7 +5,7 @@ import { gql, useMutation } from '@apollo/client'
 import Helmet from 'react-helmet'
 import { Link } from 'react-router-dom'
 import PropTypes from 'prop-types'
-import { reexporterLogsURL } from '../../../resources/kibana'
+import { reexporterLogsURL } from '../../resources/kibana'
 import styled from '@emotion/styled'
 
 const ButtonsContainer = styled.div({
@@ -99,8 +99,7 @@ const AdminExports = ({ dataset }) => {
                 className="n-button on-button--primary"
                 onClick={() =>
                   reexportRemotes({ variables: { datasetId: dataset.id } })
-                }
-              >
+                }>
                 Run Export
               </NormalizedButton>
               <Divider text="or" />
@@ -108,8 +107,7 @@ const AdminExports = ({ dataset }) => {
                 className="on-button on-button--nobg"
                 onClick={() => {
                   window.open(reexporterLogsURL, '_blank')
-                }}
-              >
+                }}>
                 View Export Logs
               </NormalizedButton>
             </ButtonsContainer>