@openneuro/app 4.5.0 → 4.5.1

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}/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>

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

@@ -1,6 +1,6 @@
 import React from 'react'
 import { gql, useQuery } from '@apollo/client'
-import DatasetQueryContext from '../../datalad/dataset/dataset-query-context.js'
+import DatasetQueryContext from '../datalad/dataset/dataset-query-context.js'
 import Markdown from 'markdown-to-jsx'
 import { Link, useLocation } from 'react-router-dom'
 import pluralize from 'pluralize'
@@ -9,7 +9,7 @@ import parseISO from 'date-fns/parseISO'
 
 import Files from './files'
 import Validation from '../validation/validation.jsx'
-import { config } from '../../config'
+import { config } from '../config'
 import Comments from './comments/comments.jsx'
 import DatasetCitation from './fragments/dataset-citation.jsx'
 import { DatasetAlertVersion } from './fragments/dataset-alert-version'
@@ -40,7 +40,7 @@ import { ReadMore } from '@openneuro/components/read-more'
 import { FollowDataset } from './mutations/follow'
 import { StarDataset } from './mutations/star'
 
-import { SNAPSHOT_FIELDS } from '../../datalad/dataset/dataset-query-fragments.js'
+import { SNAPSHOT_FIELDS } from '../datalad/dataset/dataset-query-fragments.js'
 import { DOILink } from './fragments/doi-link'
 
 const formatDate = dateObject =>

package/src/scripts/{refactor_2021 → errors}/freshdesk-widget.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import { useCookies } from 'react-cookie'
-import { getProfile } from './authentication/profile'
+import { getProfile } from '../authentication/profile'
 import { config } from '../config'
 
 const buildCustomQuery = (customText, prepopulatedFields) => {

package/src/scripts/errors/freshdeskInterface.jsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react'
-import FreshdeskWidget from '../datalad/fragments/freshdesk-widget.jsx'
+import FreshdeskWidget from './freshdesk-widget.jsx'
 import {
   Overlay,
   ModalContainer,

package/src/scripts/index.tsx

@@ -1,10 +1,10 @@
 import React from 'react'
-import Uploader from './refactor_2021/uploader/uploader.jsx'
+import Uploader from './uploader/uploader.jsx'
 import Routes from './routes'
-import HeaderContainer from './refactor_2021/containers/header'
-import FooterContainer from './refactor_2021/containers/footer'
-import { SearchParamsProvider } from './refactor_2021/search/search-params-ctx'
-import { UserModalOpenProvider } from './refactor_2021/user-login-modal-ctx'
+import HeaderContainer from './common/containers/header'
+import FooterContainer from './common/containers/footer'
+import { SearchParamsProvider } from './search/search-params-ctx'
+import { UserModalOpenProvider } from './utils/user-login-modal-ctx'
 
 import '../assets/email-header.png'
 

package/src/scripts/pages/admin/admin.jsx

@@ -4,7 +4,7 @@ import React from 'react'
 import { Redirect, Switch, Route, NavLink } from 'react-router-dom'
 import Users from './users.jsx'
 import FlaggedFiles from './flagged-files.jsx'
-import AdminUser from '../../refactor_2021/authentication/admin-user.jsx'
+import AdminUser from '../../authentication/admin-user.jsx'
 
 class Dashboard extends React.Component {
   // life cycle events --------------------------------------------------

package/src/scripts/pages/admin/user-tools.tsx

@@ -2,7 +2,7 @@ import React, { FC, ReactElement } from 'react'
 import { gql } from '@apollo/client'
 import { Mutation } from '@apollo/client/react/components'
 import { WarnButton } from '@openneuro/components/warn-button'
-import { getProfile } from '../../refactor_2021/authentication/profile.js'
+import { getProfile } from '../../authentication/profile.js'
 import { useCookies } from 'react-cookie'
 import { USER_FRAGMENT } from './user-fragment'
 

package/src/scripts/{refactor_2021/user → pages}/api.jsx

@@ -2,9 +2,9 @@ import React from 'react'
 import { Loading } from '@openneuro/components/loading'
 import { CopyToClipboard } from 'react-copy-to-clipboard'
 import Helmet from 'react-helmet'
-import { pageTitle } from '../../resources/strings.js'
+import { pageTitle } from '../resources/strings.js'
 import { Button } from '@openneuro/components/button'
-import { config } from '../../config'
+import { config } from '../config'
 
 /**
  * Create API Key

package/src/scripts/{faq → pages/faq}/__tests__/__snapshots__/faq.spec.jsx.snap

@@ -221,7 +221,7 @@ exports[`faq/faq/Faq renders successfully 1`] = `
           <span>
             We offer two options for uploading data onto OpenNeuro. The first is to upload via the web interface. The second is to upload via our 
             <a
-              href="https://docs.openneuro.org/packages-openneuro-cli-readme"
+              href="https://docs.openneuro.org/openneuro-packages-openneuro-cli-readme"
             >
               command-line utility tool
             </a>

package/src/scripts/{faq → pages/faq}/faq-content.js

@@ -48,8 +48,7 @@ export const faq = [
       '[Ultimate consent form GDPR edition](https://open-brain-consent.readthedocs.io/en/stable/gdpr/ultimate_gdpr.html).',
   },
   {
-    faq:
-      'Do I need to format my data in some special way before uploading it to OpenNeuro?',
+    faq: 'Do I need to format my data in some special way before uploading it to OpenNeuro?',
     answer:
       'Yes! OpenNeuro only accepts data in the Brain Imaging Data Structure ' +
       '(BIDS) format. You can read about it more at ' +
@@ -58,8 +57,7 @@ export const faq = [
       'post them at [neurostars.org](https://neurostars.org/tags/bids).',
   },
   {
-    faq:
-      'Do I need to remove facial features from structural images before uploading the data?',
+    faq: 'Do I need to remove facial features from structural images before uploading the data?',
     answer:
       'OpenNeuro does not accept datasets that have not been defaced for ' +
       'privacy considerations. Datasets found to not have been defaced will ' +
@@ -80,7 +78,7 @@ export const faq = [
     answer:
       'We offer two options for uploading data onto OpenNeuro. ' +
       'The first is to upload via the web interface. ' +
-      'The second is to upload via our [command-line utility tool](https://docs.openneuro.org/packages-openneuro-cli-readme)',
+      'The second is to upload via our [command-line utility tool](https://docs.openneuro.org/openneuro-packages-openneuro-cli-readme)',
   },
   {
     faq: 'Why can I not use CC-BY (or other CC license)?',

package/src/scripts/{faq → pages/faq}/faq.jsx

@@ -4,7 +4,7 @@ import React from 'react'
 import Markdown from 'markdown-to-jsx'
 import { faq } from './faq-content'
 import Helmet from 'react-helmet'
-import { pageTitle } from '../resources/strings.js'
+import { pageTitle } from '../../resources/strings.js'
 
 class Faq extends React.Component {
   render() {

package/src/scripts/pages/import-dataset.tsx

@@ -1,11 +1,11 @@
 import React, { useState } from 'react'
 import styled from '@emotion/styled'
-import { ImportDatasetMutation } from '../refactor_2021/dataset/mutations/import-dataset'
+import { ImportDatasetMutation } from '../dataset/mutations/import-dataset'
 import { useLocation } from 'react-router-dom'
-import LoggedIn from '../refactor_2021/authentication/logged-in'
-import LoggedOut from '../refactor_2021/authentication/logged-out'
-import { testAffirmed } from '../refactor_2021/uploader/upload-disclaimer'
-import { UploadDisclaimerInput } from '../refactor_2021/uploader/upload-disclaimer-input'
+import LoggedIn from '../authentication/logged-in'
+import LoggedOut from '../authentication/logged-out'
+import { testAffirmed } from '../uploader/upload-disclaimer'
+import { UploadDisclaimerInput } from '../uploader/upload-disclaimer-input'
 
 function useQuery() {
   const { search } = useLocation()

package/src/scripts/routes.tsx

@@ -2,14 +2,14 @@ import React from 'react'
 import { Route, Switch, Redirect } from 'react-router-dom'
 
 // TODO - Re-enable code splitting these when we can
-import Dataset from './refactor_2021/dataset/draft-snapshot-routes'
+import Dataset from './dataset/draft-snapshot-routes'
 //import PreRefactorDatasetProps from './dataset/dataset-pre-refactor-container'
 
 import { FAQS } from '@openneuro/components/faqs'
 import FrontPageContainer from './pages/front-page/front-page'
 import Admin from './pages/admin/admin'
-import SearchRoutes from './refactor_2021/search/search-routes'
-import APIKey from './refactor_2021/user/api'
+import SearchRoutes from './search/search-routes'
+import APIKey from './pages/api'
 import ErrorRoute from './errors/errorRoute'
 import { PETRedirect } from './pages/pet-redirect'
 import Citation from './pages/citation-page'

package/src/scripts/{refactor_2021/search → search}/inputs/show-datasets-radios.tsx

@@ -35,8 +35,7 @@ const ShowDatasetsRadios: FC = () => {
         className={
           datasetType_selected.replace(/\s/g, '') +
           ' btn-group-wrapper facet-radio'
-        }
-      >
+        }>
         <RadioGroup
           radioArr={datasetType_available}
           layout="btn-group"
@@ -50,8 +49,7 @@ const ShowDatasetsRadios: FC = () => {
           <AccordionTab
             accordionStyle="plain"
             label="My Datasets Status"
-            startOpen={true}
-          >
+            startOpen={true}>
             <FacetSelect
               selected={datasetStatus_selected}
               setSelected={setShowMyUploadsSelected}

package/src/scripts/{refactor_2021/search → search}/search-container.tsx

@@ -33,7 +33,7 @@ import {
   SortBySelect,
 } from './inputs'
 import FiltersBlockContainer from './filters-block-container'
-import AggregateCountsContainer from '../aggregate-queries/aggregate-counts-container'
+import AggregateCountsContainer from '../pages/front-page/aggregate-queries/aggregate-counts-container'
 import { useCookies } from 'react-cookie'
 import { useSearchResults } from './use-search-results'
 import { SearchParamsCtx } from './search-params-ctx'