@openneuro/app 4.2.5 → 4.3.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/app",
-  "version": "4.2.5",
+  "version": "4.3.0-alpha.4",
   "description": "React JS web frontend for the OpenNeuro platform.",
   "license": "MIT",
   "main": "public/client.js",
@@ -19,8 +19,8 @@
     "@elastic/apm-rum": "5.9.1",
     "@emotion/react": "11.6.0",
     "@emotion/styled": "11.6.0",
-    "@openneuro/client": "^4.2.5",
-    "@openneuro/components": "^4.2.5",
+    "@openneuro/client": "^4.3.0-alpha.4",
+    "@openneuro/components": "^4.3.0-alpha.4",
     "babel-runtime": "^6.26.0",
     "bids-validator": "1.8.8",
     "bytes": "^3.0.0",
@@ -32,6 +32,7 @@
     "email-validator": "^2.0.4",
     "express": "^4.17.1",
     "graphql": "14.7.0",
+    "history": "5.2.0",
     "jwt-decode": "^2.2.0",
     "markdown-to-jsx": "^7.1.2",
     "os-browserify": "^0.3.0",
@@ -115,5 +116,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d797003217a41a7755c6f8b721b7139dc1e52242"
+  "gitHead": "5637774c7c1a5497a8b4260f8de90ebfcc4d5e29"
 }

package/src/scripts/datalad/dataset/dataset-query-fragments.js

@@ -136,6 +136,12 @@ export const SNAPSHOT_FIELDS = gql`
     tag
     created
     readme
+    deprecated {
+      id
+      user
+      reason
+      timestamp
+    }
     description {
       Name
       Authors

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

@@ -172,8 +172,7 @@ export const DatasetQueryHook = ({ datasetId, draft, history }) => {
             datasetId,
             fetchMore,
             error,
-          }}
-        >
+          }}>
           <DatasetRoutes dataset={data.dataset} />
           <FilesSubscription datasetId={datasetId} />
         </DatasetQueryContext.Provider>
@@ -208,8 +207,7 @@ const DatasetQuery = ({ match, history }) => {
     <>
       <DatasetRedirect />
       <ErrorBoundaryAssertionFailureException
-        subject={'error in dataset query'}
-      >
+        subject={'error in dataset query'}>
         <DatasetQueryHook
           datasetId={datasetId}
           draft={!snapshotId}

package/src/scripts/refactor_2021/dataset/dataset-routes.jsx

@@ -12,6 +12,7 @@ import Share from './routes/manage-permissions.jsx'
 import Snapshot from './routes/snapshot.jsx'
 import AddMetadata from './routes/add-metadata.jsx'
 import DeletePage from './routes/delete-page'
+import { DeprecateSnapshotPage } from './routes/deprecate-snapshot-page'
 import { FileDisplay } from './files'
 
 //TODO imports
@@ -119,6 +120,11 @@ const DatasetRoutes = ({ dataset, error }) => {
           />
         )}
       />
+      <Route
+        exact
+        path="/datasets/:datasetId/versions/:snapshotTag/deprecate"
+        component={() => <DeprecateSnapshotPage />}
+      />
       <Route
         path="/datasets/:datasetId/versions/:snapshotTag/file-display/:filePath"
         render={({

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

@@ -11,9 +11,11 @@ import { config } from '../../config'
 import {
   getUnexpiredProfile,
   hasEditPermissions,
+  hasDatasetAdminPermissions,
 } from '../authentication/profile'
 import { useCookies } from 'react-cookie'
 import Comments from './comments/comments.jsx'
+import { DatasetAlertDraft } from './fragments/dataset-alert-draft'
 import {
   MetaDataBlock,
   ModalitiesMetaDataBlock,
@@ -21,14 +23,12 @@ import {
   ValidationBlock,
   CloneDropdown,
   DatasetHeader,
-  DatasetAlert,
   DatasetHeaderMeta,
   DatasetPage,
   DatasetGitAccess,
   VersionList,
   DatasetTools,
 } from '@openneuro/components/dataset'
-import { Modal } from '@openneuro/components/modal'
 import { ReadMore } from '@openneuro/components/read-more'
 
 import { FollowDataset } from './mutations/follow'
@@ -56,8 +56,6 @@ const DraftContainer: React.FC<DraftContainerProps> = ({ dataset }) => {
   const activeDataset = snapshotVersion(location) || 'draft'
 
   const [selectedVersion, setSelectedVersion] = React.useState(activeDataset)
-  const [deprecatedmodalIsOpen, setDeprecatedModalIsOpen] =
-    React.useState(false)
 
   const summary = dataset.draft.summary
   const description = dataset.draft.description
@@ -73,12 +71,7 @@ const DraftContainer: React.FC<DraftContainerProps> = ({ dataset }) => {
     parseISO(dataset.draft.modified),
   )
   const isSnapshot = activeDataset !== 'draft'
-  const rootPath = isSnapshot
-    ? `/datasets/${datasetId}/versions/${activeDataset}`
-    : `/datasets/${datasetId}`
 
-  //TODO deprecated needs to be added to the dataset snapshot obj and an admin needs to be able to say a version is deprecated somehow.
-  const isPublic = dataset.public === true
   const [cookies] = useCookies()
   const profile = getUnexpiredProfile(cookies)
   const isAdmin = profile?.admin
@@ -88,6 +81,8 @@ const DraftContainer: React.FC<DraftContainerProps> = ({ dataset }) => {
     dataset.snapshots.length === 0 ||
     dataset.draft.head !==
       dataset.snapshots[dataset.snapshots.length - 1].hexsha
+  const isDatasetAdmin =
+    hasDatasetAdminPermissions(dataset.permissions, profile?.sub) || isAdmin
 
   return (
     <>
@@ -122,7 +117,7 @@ const DraftContainer: React.FC<DraftContainerProps> = ({ dataset }) => {
         renderAlert={() => (
           <>
             {hasEdit && (
-              <DatasetAlert
+              <DatasetAlertDraft
                 isPrivate={!dataset.public}
                 datasetId={dataset.id}
                 hasDraftChanges={hasDraftChanges}
@@ -191,6 +186,7 @@ const DraftContainer: React.FC<DraftContainerProps> = ({ dataset }) => {
             datasetId={datasetId}
             isAdmin={isAdmin}
             hasSnapshot={dataset.snapshots.length !== 0}
+            isDatasetAdmin={isDatasetAdmin}
           />
         )}
         renderFiles={() => (
@@ -263,7 +259,6 @@ const DraftContainer: React.FC<DraftContainerProps> = ({ dataset }) => {
                     dateModified={dateModified}
                     selected={selectedVersion}
                     setSelected={setSelectedVersion}
-                    setDeprecatedModalIsOpen={setDeprecatedModalIsOpen}
                   />
                 </div>
               }
@@ -427,18 +422,6 @@ const DraftContainer: React.FC<DraftContainerProps> = ({ dataset }) => {
             </EditDescriptionList>
           </>
         )}
-        renderDeprecatedModal={() => (
-          <Modal
-            isOpen={deprecatedmodalIsOpen}
-            toggle={() => setDeprecatedModalIsOpen(prevIsOpen => !prevIsOpen)}
-            closeText={'close'}
-            className="deprecated-modal">
-            <p>
-              You have selected a deprecated version. The author of the dataset
-              does not recommend this specific version.
-            </p>
-          </Modal>
-        )}
         renderComments={() => (
           <Comments
             datasetId={dataset.id}

package/src/scripts/refactor_2021/dataset/fragments/__tests__/dataset-alert-draft.spec.tsx

@@ -0,0 +1,72 @@
+import React from 'react'
+import { render, screen } from '@testing-library/react'
+import '@testing-library/jest-dom/extend-expect'
+import { MemoryRouter } from 'react-router-dom'
+import { DatasetAlertDraft } from '../dataset-alert-draft'
+
+describe('DatasetAlertDraft component', () => {
+  it('renders the correct text for private drafts with changes', () => {
+    render(
+      <DatasetAlertDraft
+        isPrivate
+        hasSnapshot
+        hasDraftChanges
+        datasetId="test00001"
+      />,
+      { wrapper: MemoryRouter },
+    )
+
+    expect(
+      screen.queryByText(/there have been changes to the draft/i),
+    ).toBeInTheDocument()
+  })
+  it('renders the correct text for private drafts with no snapshots', () => {
+    render(
+      <DatasetAlertDraft
+        isPrivate
+        hasDraftChanges
+        hasSnapshot={false}
+        datasetId="test00001"
+      />,
+      { wrapper: MemoryRouter },
+    )
+
+    expect(
+      screen.queryByText(/before it can be published/i),
+    ).toBeInTheDocument()
+  })
+  it('renders the correct text for public drafts with changes', () => {
+    render(
+      <DatasetAlertDraft
+        hasDraftChanges
+        isPrivate={false}
+        hasSnapshot={false}
+        datasetId="test00001"
+      />,
+      {
+        wrapper: MemoryRouter,
+      },
+    )
+
+    expect(
+      screen.queryByText(/there are currently unsaved changes to this draft/i),
+    ).toBeInTheDocument()
+  })
+  it('renders the correct text for public drafts without changes', () => {
+    render(
+      <DatasetAlertDraft
+        hasDraftChanges={false}
+        isPrivate={false}
+        hasSnapshot={false}
+        datasetId="test00001"
+      />,
+      {
+        wrapper: MemoryRouter,
+      },
+    )
+
+    expect(
+      screen.queryByText(/you can make changes to this draft page/i),
+    ).toBeInTheDocument()
+  })
+})

package/src/scripts/refactor_2021/dataset/fragments/dataset-alert-draft.tsx

@@ -0,0 +1,79 @@
+import React from 'react'
+import { Link } from 'react-router-dom'
+import { DatasetAlert } from '@openneuro/components/dataset'
+
+export interface DatasetAlertDraftProps {
+  isPrivate: boolean
+  datasetId: string
+  hasDraftChanges: boolean
+  hasSnapshot: boolean
+}
+
+export const DatasetAlertDraft: React.FC<DatasetAlertDraftProps> = ({
+  isPrivate,
+  datasetId,
+  hasDraftChanges,
+  hasSnapshot,
+}) => {
+  if (isPrivate) {
+    if (hasSnapshot) {
+      return (
+        <DatasetAlert
+          alert="This dataset has not been published!"
+          footer={
+            hasDraftChanges &&
+            '* There have been changes to the draft since your last version'
+          }
+          level="warning">
+          <>
+            <Link
+              className="dataset-tool"
+              to={'/datasets/' + datasetId + '/publish'}>
+              Publish this dataset
+            </Link>
+            &#32; to make all versions available publicly.
+          </>
+        </DatasetAlert>
+      )
+    } else {
+      return (
+        <DatasetAlert
+          alert="This dataset has not been published!"
+          level="warning">
+          Before it can be published, please&#32;
+          <Link
+            className="dataset-tool"
+            to={'/datasets/' + datasetId + '/snapshot'}>
+            create a version
+          </Link>
+        </DatasetAlert>
+      )
+    }
+  } else {
+    if (hasDraftChanges) {
+      return (
+        <DatasetAlert alert="This dataset has been published!" level="warning">
+          There are currently unsaved changes to this Draft. Changes made here
+          become public when you&#32;
+          <Link
+            className="dataset-tool"
+            to={'/datasets/' + datasetId + '/snapshot'}>
+            create a new version.
+          </Link>
+        </DatasetAlert>
+      )
+    } else {
+      return (
+        <DatasetAlert alert="This dataset has been published!">
+          You can make changes to this Draft page, then&#32;
+          <Link
+            className="dataset-tool"
+            to={'/datasets/' + datasetId + '/snapshot'}>
+            create a new version
+          </Link>
+          &#32;to make them public.
+        </DatasetAlert>
+      )
+    }
+  }
+}

package/src/scripts/refactor_2021/dataset/fragments/dataset-alert-version.tsx

@@ -0,0 +1,24 @@
+import React from 'react'
+import { DatasetAlert } from '@openneuro/components/dataset'
+import { UndoDeprecateVersion } from '../mutations/undo-deprecate-version'
+
+export interface DatasetAlertVersionProps {
+  datasetId: string
+  tag: string
+  reason: string
+  hasEdit: boolean
+}
+
+export const DatasetAlertVersion: React.FC<DatasetAlertVersionProps> = ({
+  datasetId,
+  tag,
+  reason,
+  hasEdit,
+}) => (
+  <DatasetAlert
+    alert="This version has been deprecated!"
+    level="error"
+    footer={reason}>
+    {hasEdit && <UndoDeprecateVersion datasetId={datasetId} tag={tag} />}
+  </DatasetAlert>
+)

package/src/scripts/refactor_2021/dataset/mutations/__tests__/__snapshots__/deprecate-snapshot.spec.tsx.snap

@@ -0,0 +1,14 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DeprecateVersion mutation renders with typical props 1`] = `
+<DocumentFragment>
+  <button
+    aria-label="Deprecate Version"
+    class="on-button on-button--small on-button--primary  btn-modal-action"
+    role="button"
+    type="button"
+  >
+    Deprecate Version
+  </button>
+</DocumentFragment>
+`;

package/src/scripts/refactor_2021/dataset/mutations/__tests__/__snapshots__/deprecate-version.spec.tsx.snap

@@ -0,0 +1,14 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DeprecateVersion mutation renders with typical props 1`] = `
+<DocumentFragment>
+  <button
+    aria-label="Deprecate Version"
+    class="on-button on-button--small on-button--primary  btn-modal-action"
+    role="button"
+    type="button"
+  >
+    Deprecate Version
+  </button>
+</DocumentFragment>
+`;

package/src/scripts/refactor_2021/dataset/mutations/__tests__/deprecate-snapshot.spec.tsx

@@ -0,0 +1,71 @@
+import React from 'react'
+import { render, fireEvent, screen, waitFor } from '@testing-library/react'
+import { MockedProvider } from '@apollo/client/testing'
+import { Router } from 'react-router-dom'
+import { createMemoryHistory } from 'history'
+import { DeprecateVersion, DEPRECATE_VERSION } from '../deprecate-version'
+
+describe('DeprecateVersion mutation', () => {
+  it('renders with typical props', () => {
+    const { asFragment } = render(
+      <MockedProvider>
+        <DeprecateVersion
+          datasetId="test00001"
+          tag="1.0.0"
+          reason="This is a test suite."
+        />
+      </MockedProvider>,
+    )
+    expect(asFragment()).toMatchSnapshot()
+  })
+  it('calls the DEPRECATE_VERSION mutation when clicked and navigates to the snapshot on success', async () => {
+    const datasetId = 'test00001'
+    const tag = '1.0.0'
+    const reason = 'This is a test suite.'
+    const history = createMemoryHistory({
+      initialEntries: [`/datasets/${datasetId}/versions/${tag}/deprecate`],
+    })
+    const historyPushSpy = jest.spyOn(history, 'push')
+    const snapshotId = `${datasetId}:${tag}`
+    const deprecateSnapshotMock = {
+      request: {
+        query: DEPRECATE_VERSION,
+        variables: {
+          datasetId,
+          tag,
+          reason,
+        },
+      },
+      result: {
+        data: {
+          deprecateSnapshot: {
+            __typename: 'Snapshot',
+            id: snapshotId,
+            deprecated: {
+              __typename: 'DeprecatedSnapshot',
+              id: snapshotId,
+              user: '1245',
+              reason,
+            },
+          },
+        },
+      },
+    }
+
+    render(
+      <Router history={history}>
+        <MockedProvider mocks={[deprecateSnapshotMock]} addTypename={false}>
+          <DeprecateVersion datasetId={datasetId} tag={tag} reason={reason} />
+        </MockedProvider>
+      </Router>,
+    )
+
+    fireEvent.click(screen.getByLabelText(/Deprecate Version/i))
+
+    await waitFor(() => expect(historyPushSpy).toHaveBeenCalledTimes(1))
+
+    expect(history.location.pathname).toBe(
+      `/datasets/${datasetId}/versions/${tag}`,
+    )
+  })
+})

package/src/scripts/refactor_2021/dataset/mutations/__tests__/deprecate-version.spec.tsx

@@ -0,0 +1,71 @@
+import React from 'react'
+import { render, fireEvent, screen, waitFor } from '@testing-library/react'
+import { MockedProvider } from '@apollo/client/testing'
+import { Router } from 'react-router-dom'
+import { createMemoryHistory } from 'history'
+import { DeprecateVersion, DEPRECATE_VERSION } from '../deprecate-version'
+
+describe('DeprecateVersion mutation', () => {
+  it('renders with typical props', () => {
+    const { asFragment } = render(
+      <MockedProvider>
+        <DeprecateVersion
+          datasetId="test00001"
+          tag="1.0.0"
+          reason="This is a test suite."
+        />
+      </MockedProvider>,
+    )
+    expect(asFragment()).toMatchSnapshot()
+  })
+  it('calls the DEPRECATE_VERSION mutation when clicked and navigates to the snapshot on success', async () => {
+    const datasetId = 'test00001'
+    const tag = '1.0.0'
+    const reason = 'This is a test suite.'
+    const history = createMemoryHistory({
+      initialEntries: [`/datasets/${datasetId}/versions/${tag}/deprecate`],
+    })
+    const historyPushSpy = jest.spyOn(history, 'push')
+    const snapshotId = `${datasetId}:${tag}`
+    const deprecateSnapshotMock = {
+      request: {
+        query: DEPRECATE_VERSION,
+        variables: {
+          datasetId,
+          tag,
+          reason,
+        },
+      },
+      result: {
+        data: {
+          deprecateSnapshot: {
+            __typename: 'Snapshot',
+            id: snapshotId,
+            deprecated: {
+              __typename: 'DeprecatedSnapshot',
+              id: snapshotId,
+              user: '1245',
+              reason,
+            },
+          },
+        },
+      },
+    }
+
+    render(
+      <Router history={history}>
+        <MockedProvider mocks={[deprecateSnapshotMock]} addTypename={false}>
+          <DeprecateVersion datasetId={datasetId} tag={tag} reason={reason} />
+        </MockedProvider>
+      </Router>,
+    )
+
+    fireEvent.click(screen.getByLabelText(/Deprecate Version/i))
+
+    await waitFor(() => expect(historyPushSpy).toHaveBeenCalledTimes(1))
+
+    expect(history.location.pathname).toBe(
+      `/datasets/${datasetId}/versions/${tag}`,
+    )
+  })
+})

package/src/scripts/refactor_2021/dataset/mutations/deprecate-version.tsx

@@ -0,0 +1,46 @@
+import React, { FC } from 'react'
+import { gql, useMutation } from '@apollo/client'
+import { Button } from '@openneuro/components/button'
+import { useHistory } from 'react-router-dom'
+
+export const DEPRECATE_VERSION = gql`
+  mutation deprecateSnapshot($datasetId: ID!, $tag: String!, $reason: String!) {
+    deprecateSnapshot(datasetId: $datasetId, tag: $tag, reason: $reason) {
+      id
+      deprecated {
+        reason
+      }
+    }
+  }
+`
+
+interface DeprecateVersionProps {
+  datasetId: string
+  tag: string
+  reason: string
+}
+
+export const DeprecateVersion: FC<DeprecateVersionProps> = ({
+  datasetId,
+  tag,
+  reason,
+}) => {
+  const history = useHistory()
+  const [DeprecateVersionMutation] = useMutation(DEPRECATE_VERSION)
+
+  return (
+    <Button
+      className="btn-modal-action"
+      primary={true}
+      label="Deprecate Version"
+      size="small"
+      onClick={() =>
+        DeprecateVersionMutation({
+          variables: { datasetId, tag, reason },
+        }).then(() => {
+          history.push(`/datasets/${datasetId}/versions/${tag}`)
+        })
+      }
+    />
+  )
+}

package/src/scripts/refactor_2021/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 '../queries/dataset-query-fragments.js'
+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/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 '../queries/dataset-query-fragments.js'
+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/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 '../dataset-query-fragments.js'
+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/mutations/undo-deprecate-version.tsx

@@ -0,0 +1,43 @@
+import React, { FC } from 'react'
+import { gql, useMutation } from '@apollo/client'
+import { Button } from '@openneuro/components/button'
+import { Tooltip } from '@openneuro/components/tooltip'
+
+const UNDO_DEPRECATE_VERSION = gql`
+  mutation undoDeprecateSnapshot($datasetId: ID!, $tag: String!) {
+    undoDeprecateSnapshot(datasetId: $datasetId, tag: $tag) {
+      id
+      deprecated {
+        reason
+      }
+    }
+  }
+`
+
+interface UndoDeprecateVersionProps {
+  datasetId: string
+  tag: string
+}
+
+export const UndoDeprecateVersion: FC<UndoDeprecateVersionProps> = ({
+  datasetId,
+  tag,
+}) => {
+  const [UndoDeprecateVersion] = useMutation(UNDO_DEPRECATE_VERSION)
+
+  return (
+    <Tooltip tooltip="Undo Deprecation" flow="right">
+      <Button
+        icon="fa fa-undo"
+        iconOnly
+        label="Undo"
+        size="xsmall"
+        onClick={() =>
+          UndoDeprecateVersion({
+            variables: { datasetId, tag },
+          })
+        }
+      />
+    </Tooltip>
+  )
+}

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

@@ -112,7 +112,6 @@ const AddMetadata = ({ dataset }) => {
     const errors = runValidations(newValues)
     if (hasChanged(errors, validationErrors)) setValidationErrors(errors)
   }
-  // @ts-expect-error Weak type definition for state
   const submitPath = location.state && location.state.submitPath
   const user = getProfile(cookies)
   const hasEdit =

package/src/scripts/refactor_2021/dataset/routes/deprecate-snapshot-page.tsx

@@ -0,0 +1,46 @@
+import React, { useState } from 'react'
+import { Link, useRouteMatch } from 'react-router-dom'
+import { DeprecateVersion } from '../mutations/deprecate-version'
+import { Input } from '@openneuro/components/input'
+import LoggedIn from '../../authentication/logged-in.jsx'
+
+interface DeprecateSnapshotRouteParams {
+  datasetId: string
+  snapshotTag: string
+}
+
+export const DeprecateSnapshotPage = (): React.ReactElement => {
+  const {
+    params: { datasetId, snapshotTag },
+  } = useRouteMatch<DeprecateSnapshotRouteParams>()
+  const [reason, setReason] = useState('')
+
+  return (
+    <div className="container">
+      <h2>Deprecate Version</h2>
+      <p>
+        {`Deprecate ${datasetId} version ${snapshotTag} to let other users know about an issue with this version. The reason provided will be displayed for users visiting the version.`}
+      </p>
+      <Input
+        placeholder="Explanation for deprecation"
+        type="text"
+        name="front-page-search"
+        labelStyle="default"
+        setValue={setReason}
+      />
+      <hr />
+      <div className="dataset-form-controls">
+        <LoggedIn>
+          <DeprecateVersion
+            datasetId={datasetId}
+            tag={snapshotTag}
+            reason={reason}
+          />
+        </LoggedIn>
+        <Link className="return-link" to={`/datasets/${datasetId}`}>
+          Return to Dataset
+        </Link>
+      </div>
+    </div>
+  )
+}

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

@@ -12,6 +12,7 @@ import Validation from '../validation/validation.jsx'
 import { config } from '../../config'
 import Comments from './comments/comments.jsx'
 import DatasetCitation from './fragments/dataset-citation.jsx'
+import { DatasetAlertVersion } from './fragments/dataset-alert-version'
 
 import {
   ModalitiesMetaDataBlock,
@@ -31,16 +32,16 @@ import { Loading } from '@openneuro/components/loading'
 import {
   getUnexpiredProfile,
   hasEditPermissions,
+  hasDatasetAdminPermissions,
 } from '../authentication/profile'
 import { useCookies } from 'react-cookie'
-import { Modal } from '@openneuro/components/modal'
 
 import { ReadMore } from '@openneuro/components/read-more'
 
 import { FollowDataset } from './mutations/follow'
 import { StarDataset } from './mutations/star'
 
-import { SNAPSHOT_FIELDS } from './queries/dataset-query-fragments.js'
+import { SNAPSHOT_FIELDS } from '../../datalad/dataset/dataset-query-fragments.js'
 import { DOILink } from './fragments/doi-link'
 
 const formatDate = dateObject =>
@@ -67,8 +68,6 @@ const SnapshotContainer: React.FC<SnapshotContainerProps> = ({
   const activeDataset = snapshotVersion(location) || 'draft'
 
   const [selectedVersion, setSelectedVersion] = React.useState(activeDataset)
-  const [deprecatedmodalIsOpen, setDeprecatedModalIsOpen] =
-    React.useState(false)
 
   const summary = snapshot.summary
   const description = snapshot.description
@@ -81,18 +80,15 @@ const SnapshotContainer: React.FC<SnapshotContainerProps> = ({
   const dateAddedDifference = formatDistanceToNow(parseISO(dataset.created))
   const dateModified = formatDate(snapshot.created)
   const dateUpdatedDifference = formatDistanceToNow(parseISO(snapshot.created))
-  const rootPath = `/datasets/${datasetId}/versions/${activeDataset}`
 
-  //TODO deprecated needs to be added to the dataset snapshot obj and an admin needs to be able to say a version is deprecated somehow.
   const [cookies] = useCookies()
   const profile = getUnexpiredProfile(cookies)
   const isAdmin = profile?.admin
   const hasEdit =
     hasEditPermissions(dataset.permissions, profile?.sub) || isAdmin
-  const hasDraftChanges =
-    dataset.snapshots.length === 0 ||
-    dataset.draft.head !==
-      dataset.snapshots[dataset.snapshots.length - 1].hexsha
+  const isDatasetAdmin =
+    hasDatasetAdminPermissions(dataset.permissions, profile?.sub) || isAdmin
+
   return (
     <>
       <DatasetPage
@@ -107,6 +103,18 @@ const SnapshotContainer: React.FC<SnapshotContainerProps> = ({
             )}
           </>
         )}
+        renderAlert={() => (
+          <>
+            {snapshot?.deprecated && (
+              <DatasetAlertVersion
+                datasetId={dataset.id}
+                tag={snapshot.tag}
+                reason={snapshot.deprecated.reason}
+                hasEdit={hasEdit}
+              />
+            )}
+          </>
+        )}
         renderHeaderMeta={() => (
           <>
             {summary && (
@@ -166,6 +174,7 @@ const SnapshotContainer: React.FC<SnapshotContainerProps> = ({
             datasetId={datasetId}
             isSnapshot={true}
             isAdmin={isAdmin}
+            isDatasetAdmin={isDatasetAdmin}
           />
         )}
         renderFiles={() => (
@@ -233,7 +242,6 @@ const SnapshotContainer: React.FC<SnapshotContainerProps> = ({
                     dateModified={dateModified}
                     selected={selectedVersion}
                     setSelected={setSelectedVersion}
-                    setDeprecatedModalIsOpen={setDeprecatedModalIsOpen}
                   />
                 </div>
               }
@@ -371,18 +379,6 @@ const SnapshotContainer: React.FC<SnapshotContainerProps> = ({
             />
           </>
         )}
-        renderDeprecatedModal={() => (
-          <Modal
-            isOpen={deprecatedmodalIsOpen}
-            toggle={() => setDeprecatedModalIsOpen(prevIsOpen => !prevIsOpen)}
-            closeText={'close'}
-            className="deprecated-modal">
-            <p>
-              You have selected a deprecated version. The author of the dataset
-              does not recommend this specific version.
-            </p>
-          </Modal>
-        )}
         renderComments={() => (
           <Comments
             datasetId={dataset.id}

package/src/scripts/refactor_2021/dataset/dataset-query-fragments.js

@@ -1,220 +0,0 @@
-import { gql } from '@apollo/client'
-
-export const DRAFT_FRAGMENT = gql`
-  fragment DatasetDraft on Dataset {
-    id
-    draft {
-      id
-      modified
-      readme
-      head
-      description {
-        Name
-        Authors
-        DatasetDOI
-        License
-        Acknowledgements
-        HowToAcknowledge
-        Funding
-        ReferencesAndLinks
-        EthicsApprovals
-      }
-      summary {
-        modalities
-        secondaryModalities
-        sessions
-        subjects
-        subjectMetadata {
-          participantId
-          age
-          sex
-          group
-        }
-        tasks
-        size
-        totalFiles
-        dataProcessed
-        pet {
-          BodyPart
-          ScannerManufacturer
-          ScannerManufacturersModelName
-          TracerName
-          TracerRadionuclide
-        }
-      }
-    }
-  }
-`
-
-export const DRAFT_FILES_FRAGMENT = gql`
-  fragment DatasetDraftFiles on Dataset {
-    id
-    draft {
-      id
-      files {
-        id
-        key
-        filename
-        size
-        directory
-        annexed
-      }
-    }
-  }
-`
-
-export const PERMISSION_FRAGMENT = gql`
-  fragment DatasetPermissions on Dataset {
-    id
-    permissions {
-      id
-      userPermissions {
-        user {
-          id
-          email
-        }
-        level
-      }
-    }
-  }
-`
-
-export const DATASET_SNAPSHOTS = gql`
-  fragment DatasetSnapshots on Dataset {
-    id
-    snapshots {
-      id
-      tag
-      created
-      hexsha
-    }
-  }
-`
-
-export const ISSUE_FIELDS = `
-  severity
-  code
-  reason
-  files {
-    evidence
-    line
-    character
-    reason
-    file {
-      name
-      path
-      relativePath
-    }
-  }
-  additionalFileCount
-`
-
-export const DATASET_ISSUES = gql`
-  fragment DatasetIssues on Dataset {
-    id
-    draft {
-      id
-      issues { 
-        ${ISSUE_FIELDS}
-      }
-    }
-  }
-`
-
-export const SNAPSHOT_ISSUES = gql`
-  fragment SnapshotIssues on Snapshot {
-    id
-    issues {
-      ${ISSUE_FIELDS}
-    }
-  }
-`
-
-export const SNAPSHOT_FIELDS = gql`
-  fragment SnapshotFields on Snapshot {
-    id
-    tag
-    created
-    readme
-    description {
-      Name
-      Authors
-      DatasetDOI
-      License
-      Acknowledgements
-      HowToAcknowledge
-      Funding
-      ReferencesAndLinks
-      EthicsApprovals
-    }
-    files {
-      id
-      key
-      filename
-      size
-      directory
-      annexed
-    }
-    summary {
-      modalities
-      secondaryModalities
-      sessions
-      subjects
-      subjectMetadata {
-        participantId
-        age
-        sex
-        group
-      }
-      tasks
-      size
-      totalFiles
-      dataProcessed
-      pet {
-        BodyPart
-        ScannerManufacturer
-        ScannerManufacturersModelName
-        TracerName
-        TracerRadionuclide
-      }
-    }
-    analytics {
-      downloads
-      views
-    }
-    ...SnapshotIssues
-    hexsha
-  }
-  ${SNAPSHOT_ISSUES}
-`
-
-export const DATASET_METADATA = gql`
-  fragment DatasetMetadata on Dataset {
-    id
-    metadata {
-      datasetId
-      datasetUrl
-      datasetName
-      firstSnapshotCreatedAt
-      latestSnapshotCreatedAt
-      dxStatus
-      tasksCompleted
-      trialCount
-      grantFunderName
-      grantIdentifier
-      studyDesign
-      studyDomain
-      studyLongitudinal
-      dataProcessed
-      species
-      associatedPaperDOI
-      openneuroPaperDOI
-      seniorAuthor
-      adminUsers
-      ages
-      modalities
-      affirmedDefaced
-      affirmedConsent
-    }
-  }
-`

package/src/scripts/refactor_2021/dataset/queries/dataset-query-fragments.js

@@ -1,220 +0,0 @@
-import { gql } from '@apollo/client'
-
-export const DRAFT_FRAGMENT = gql`
-  fragment DatasetDraft on Dataset {
-    id
-    draft {
-      id
-      modified
-      readme
-      head
-      description {
-        Name
-        Authors
-        DatasetDOI
-        License
-        Acknowledgements
-        HowToAcknowledge
-        Funding
-        ReferencesAndLinks
-        EthicsApprovals
-      }
-      summary {
-        modalities
-        secondaryModalities
-        sessions
-        subjects
-        subjectMetadata {
-          participantId
-          age
-          sex
-          group
-        }
-        tasks
-        size
-        totalFiles
-        dataProcessed
-        pet {
-          BodyPart
-          ScannerManufacturer
-          ScannerManufacturersModelName
-          TracerName
-          TracerRadionuclide
-        }
-      }
-    }
-  }
-`
-
-export const DRAFT_FILES_FRAGMENT = gql`
-  fragment DatasetDraftFiles on Dataset {
-    id
-    draft {
-      id
-      files {
-        id
-        key
-        filename
-        size
-        directory
-        annexed
-      }
-    }
-  }
-`
-
-export const PERMISSION_FRAGMENT = gql`
-  fragment DatasetPermissions on Dataset {
-    id
-    permissions {
-      id
-      userPermissions {
-        user {
-          id
-          email
-        }
-        level
-      }
-    }
-  }
-`
-
-export const DATASET_SNAPSHOTS = gql`
-  fragment DatasetSnapshots on Dataset {
-    id
-    snapshots {
-      id
-      tag
-      created
-      hexsha
-    }
-  }
-`
-
-export const ISSUE_FIELDS = `
-  severity
-  code
-  reason
-  files {
-    evidence
-    line
-    character
-    reason
-    file {
-      name
-      path
-      relativePath
-    }
-  }
-  additionalFileCount
-`
-
-export const DATASET_ISSUES = gql`
-  fragment DatasetIssues on Dataset {
-    id
-    draft {
-      id
-      issues { 
-        ${ISSUE_FIELDS}
-      }
-    }
-  }
-`
-
-export const SNAPSHOT_ISSUES = gql`
-  fragment SnapshotIssues on Snapshot {
-    id
-    issues {
-      ${ISSUE_FIELDS}
-    }
-  }
-`
-
-export const SNAPSHOT_FIELDS = gql`
-  fragment SnapshotFields on Snapshot {
-    id
-    tag
-    created
-    readme
-    description {
-      Name
-      Authors
-      DatasetDOI
-      License
-      Acknowledgements
-      HowToAcknowledge
-      Funding
-      ReferencesAndLinks
-      EthicsApprovals
-    }
-    files {
-      id
-      key
-      filename
-      size
-      directory
-      annexed
-    }
-    summary {
-      modalities
-      secondaryModalities
-      sessions
-      subjects
-      subjectMetadata {
-        participantId
-        age
-        sex
-        group
-      }
-      tasks
-      size
-      totalFiles
-      dataProcessed
-      pet {
-        BodyPart
-        ScannerManufacturer
-        ScannerManufacturersModelName
-        TracerName
-        TracerRadionuclide
-      }
-    }
-    analytics {
-      downloads
-      views
-    }
-    ...SnapshotIssues
-    hexsha
-  }
-  ${SNAPSHOT_ISSUES}
-`
-
-export const DATASET_METADATA = gql`
-  fragment DatasetMetadata on Dataset {
-    id
-    metadata {
-      datasetId
-      datasetUrl
-      datasetName
-      firstSnapshotCreatedAt
-      latestSnapshotCreatedAt
-      dxStatus
-      tasksCompleted
-      trialCount
-      grantFunderName
-      grantIdentifier
-      studyDesign
-      studyDomain
-      studyLongitudinal
-      dataProcessed
-      species
-      associatedPaperDOI
-      openneuroPaperDOI
-      seniorAuthor
-      adminUsers
-      ages
-      modalities
-      affirmedDefaced
-      affirmedConsent
-    }
-  }
-`