@openneuro/app 4.4.10 → 4.6.0-alpha.0

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/dataset/fragments/dataset-history.jsx

@@ -0,0 +1,99 @@
+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'
+import UpdateRef from '../mutations/update-ref.jsx'
+
+const GET_HISTORY = gql`
+  query getHistory($datasetId: ID!) {
+    dataset(id: $datasetId) {
+      id
+      history {
+        id
+        authorName
+        authorEmail
+        date
+        references
+        message
+      }
+      worker
+    }
+  }
+`
+
+const DatasetHistoryTable = styled.div`
+  .row {
+    line-height: 1.2em;
+  }
+  .row:nth-of-type(2n) {
+    padding-top: 1em;
+  }
+  .row:nth-of-type(2n + 1) {
+    padding-bottom: 1em;
+  }
+  .row:nth-of-type(4n),
+  .row:nth-of-type(4n + 1) {
+    background: #f4f4f4;
+  }
+`
+
+const DatasetHistory = ({ datasetId }) => {
+  const { loading, data } = useQuery(GET_HISTORY, {
+    variables: { datasetId },
+    errorPolicy: 'all',
+  })
+  if (loading) {
+    return <div className="dataset-history">Loading...</div>
+  } else {
+    return (
+      <div className="dataset-history">
+        <h4>Worker Assignment</h4> {data.dataset.worker}
+        <h4>Git History</h4>
+        <DatasetHistoryTable>
+          <div className="grid faux-table-header">
+            <h4 className="col-lg col col-2">Commit</h4>
+            <h4 className="col-lg col col-3">Date</h4>
+            <h4 className="col-lg col col-3">Author</h4>
+            <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 => (
+            <React.Fragment key={commit.id}>
+              <div className="grid faux-table">
+                <div className="commit col-lg col col-2">
+                  <label>Commit: </label>
+                  {commit.id.slice(0, 8)}
+                </div>
+                <div className="col-lg col col-3">
+                  <label>Date: </label>
+                  {commit.date}
+                </div>
+                <div className="col-lg col col-3">
+                  <label>Author: </label>
+                  {commit.authorName} &lt;{commit.authorEmail}&gt;
+                </div>
+                <div className="col-lg col col-2">
+                  <label>References: </label>
+                  {commit.references}
+                </div>
+                <div className="col-lg col col-2 grid actions">
+                  <Revalidate datasetId={datasetId} revision={commit.id} />
+                  <UpdateRef datasetId={datasetId} revision={commit.id} />
+                </div>
+                <div className="col-lg col col-12">{commit.message}</div>
+              </div>
+            </React.Fragment>
+          ))}
+        </DatasetHistoryTable>
+      </div>
+    )
+  }
+}
+
+DatasetHistory.propTypes = {
+  datasetId: PropTypes.string,
+}
+
+export default DatasetHistory

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/dataset/mutations/admin-exports.jsx

@@ -0,0 +1,70 @@
+import React from 'react'
+import { gql, useMutation } from '@apollo/client'
+import PropTypes from 'prop-types'
+import { reexporterLogsURL } from '../../resources/kibana'
+import { Button } from '@openneuro/components/button'
+import styled from '@emotion/styled'
+
+const ButtonRow = styled.div`
+  display: grid;
+  grid-template-columns: auto minmax(0, 1fr);
+  grid-gap: 1.3em;
+  place-items: start;
+`
+
+const SuccessMessage = styled.p({
+  color: 'rgb(92, 184, 92)',
+})
+const InProgressMessage = styled.p({
+  color: 'orange',
+})
+const ErrorMessage = styled.p({
+  color: 'red',
+})
+
+const REEXPORT_REMOTES = gql`
+  mutation reexportRemotes($datasetId: ID!) {
+    reexportRemotes(datasetId: $datasetId)
+  }
+`
+
+const AdminExports = ({ dataset }) => {
+  const [reexportRemotes, { data, loading, error }] =
+    useMutation(REEXPORT_REMOTES)
+  const success = data && data.reexportRemotes
+  return (
+    <div className="dataset-form">
+      {loading && (
+        <InProgressMessage>Your export is starting.</InProgressMessage>
+      )}
+      {error && <ErrorMessage>An error has occurred.</ErrorMessage>}
+      {success && <SuccessMessage>Your export has begun.</SuccessMessage>}
+      <ButtonRow>
+        <Button
+          icon="fa fa-rocket"
+          label="Run Export"
+          primary={true}
+          size="small"
+          onClick={() => {
+            reexportRemotes({ variables: { datasetId: dataset.id } })
+          }}
+        />
+        <Button
+          icon="fa fa-file-text"
+          label="View Export Logs"
+          secondary={true}
+          size="small"
+          onClick={() => {
+            window.open(reexporterLogsURL, '_blank')
+          }}
+        />
+      </ButtonRow>
+    </div>
+  )
+}
+
+AdminExports.propTypes = {
+  dataset: PropTypes.object,
+}
+
+export default AdminExports

package/src/scripts/{refactor_2021/dataset → dataset}/mutations/create-anonymous-reviewer.tsx

@@ -61,9 +61,6 @@ export const CreateReviewLink: FC<CreateReviewLinkProps> = ({ datasetId }) => {
           size="small"
           onClick={() => CreateReviewLink({ variables: { datasetId } })}
         />
-        <Link className="return-link" to={`/datasets/${datasetId}`}>
-          Return to Dataset
-        </Link>
       </div>
     </>
   )

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

@@ -50,20 +50,9 @@ const deleteDatasetRelation = gql`
   }
 `
 
-const RightColumn = styled.div({
-  maxWidth: '700px',
-  float: 'right',
-})
-
-const InfoText = styled.p({
-  fontWeight: 100,
-  textAlign: 'right',
-})
-
 const TableContainer = styled.div({
   display: 'grid',
   gridTemplateColumns: '2fr 3fr 1fr',
-  textAlign: 'right',
 })
 
 const GridItem = styled.div({
@@ -96,7 +85,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 +96,7 @@ export const DatasetRelations = ({ datasetId, hasEdit }) => {
                         variables: { datasetId, doi: obj.id },
                       })
                       await refetch()
-                    }}
-                  >
+                    }}>
                     Delete
                   </button>
                 </GridItem>
@@ -121,15 +109,15 @@ export const DatasetRelations = ({ datasetId, hasEdit }) => {
       loadedData = <p>No related DOIs have been added.</p>
     }
     return (
-      <RightColumn>
-        <InfoText>
+      <>
+        <p>
           Add a related DOI such as other repositories where this dataset can be
           found. DOI values should be formatted according to the{' '}
           <a href="https://bids-specification.readthedocs.io/en/stable/02-common-principles.html#uniform-resource-indicator">
             BIDS recommended URI format
           </a>
           .
-        </InfoText>
+        </p>
         {loadedData}
         {hasEdit && (
           <div>
@@ -196,7 +184,7 @@ export const DatasetRelations = ({ datasetId, hasEdit }) => {
             />
           </div>
         )}
-      </RightColumn>
+      </>
     )
   } else {
     return null

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/metadata-form.jsx

@@ -321,7 +321,7 @@ const MetadataForm = ({
   hasEdit,
   validationErrors = [],
 }) => (
-  <Form id="metadata-form" className="col col-6">
+  <Form id="metadata-form">
     <InfoText>
       Incomplete fields in this form will make it more difficult for users to
       search for your dataset.

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/remove-annex-object.jsx

@@ -41,7 +41,6 @@ const RemoveAnnexObject = ({
           iconOnly={true}
           icon="fa-frown-o"
           className="edit-file"
-          tooltip={'Delete ' + name}
           onConfirmedClick={() => {
             removeAnnexObject({
               variables: {

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`
@@ -18,12 +18,14 @@ interface CreateSnapshotMutationProps {
   datasetId: string
   tag: string
   changes: Array<string>
+  disabled: boolean
 }
 
 const CreateSnapshotMutation = ({
   datasetId,
   tag,
   changes,
+  disabled,
 }: CreateSnapshotMutationProps) => {
   const history = useHistory()
   const [snapshotDataset, { loading, error }] = useMutation(CREATE_SNAPSHOT)
@@ -42,6 +44,7 @@ const CreateSnapshotMutation = ({
             variables: { datasetId, tag, changes },
           }).then(() => history.push(`/datasets/${datasetId}/versions/${tag}`))
         }}
+        disabled={disabled}
         label="Create Version"
       />
     )
@@ -52,11 +55,22 @@ interface SnapshotDatasetProps {
   datasetId: string
   tag: string
   changes: Array<string>
+  disabled: boolean
 }
 
-const SnapshotDataset = ({ datasetId, tag, changes }: SnapshotDatasetProps) => (
+const SnapshotDataset = ({
+  datasetId,
+  tag,
+  changes,
+  disabled,
+}: SnapshotDatasetProps) => (
   <ErrorBoundary subject="error creating version">
-    <CreateSnapshotMutation datasetId={datasetId} tag={tag} changes={changes} />
+    <CreateSnapshotMutation
+      datasetId={datasetId}
+      tag={tag}
+      changes={changes}
+      disabled={disabled}
+    />
   </ErrorBoundary>
 )
 

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!) {