@openneuro/app 4.4.9 → 4.5.1

package/src/scripts/{refactor_2021/routes.tsx → routes.tsx}

@@ -6,15 +6,15 @@ import Dataset from './dataset/draft-snapshot-routes'
 //import PreRefactorDatasetProps from './dataset/dataset-pre-refactor-container'
 
 import { FAQS } from '@openneuro/components/faqs'
-import FrontPageContainer from './containers/front-page-container'
-import Admin from './admin/admin'
+import FrontPageContainer from './pages/front-page/front-page'
+import Admin from './pages/admin/admin'
 import SearchRoutes from './search/search-routes'
-import APIKey from './user/api'
-import ErrorRoute from '../errors/errorRoute'
-import { PETRedirect } from '../pet/redirect'
-import Citation from '../pages/citation-page'
-import FourOFourPage from '../errors/404page'
-import { ImportDataset } from '../pages/import-dataset'
+import APIKey from './pages/api'
+import ErrorRoute from './errors/errorRoute'
+import { PETRedirect } from './pages/pet-redirect'
+import Citation from './pages/citation-page'
+import FourOFourPage from './errors/404page'
+import { ImportDataset } from './pages/import-dataset'
 
 const Routes: React.VoidFunctionComponent = () => (
   <Switch>

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'

package/src/scripts/test-utils.js

@@ -1,4 +1,4 @@
-import cookies from './refactor_2021/utils/cookies.js'
+import cookies from './utils/cookies.js'
 
 /**
  * Sets a login cookie during a test run

package/src/scripts/{refactor_2021/uploader → uploader}/file-upload.js

@@ -1,4 +1,4 @@
-import { config } from '../../config'
+import { config } from '../config'
 import { uploads } from '@openneuro/client'
 
 /**

package/src/scripts/{refactor_2021/uploader → uploader}/upload-issues.jsx

@@ -4,7 +4,7 @@ import pluralize from 'pluralize'
 import { Loading } from '@openneuro/components/loading'
 import Results from '../validation/validation-results.jsx'
 import UploaderContext from './uploader-context.js'
-import validate from '../../workers/validate'
+import validate from '../workers/validate'
 
 const UploadValidatorStatus = ({ issues, next, reset }) => {
   const errorCount = issues.errors.length
@@ -67,6 +67,7 @@ class UploadValidator extends React.Component {
       config: {
         error: ['NO_AUTHORS'],
         ignoreSubjectConsistency: true,
+        blacklistModalities: ['Microscopy'],
       },
     }
     validate(this.props.files, options).then(this.done)

package/src/scripts/{refactor_2021/uploader → uploader}/uploader-view.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import BlockNavigation from '../../common/partials/block-navigation.jsx'
+import BlockNavigation from '../common/partials/block-navigation.jsx'
 import UploaderContext from './uploader-context.js'
 import UploaderSetupRoutes from './uploader-setup-routes.jsx'
 import UploaderStatusRoutes from './uploader-status-routes.jsx'

package/src/scripts/{refactor_2021/uploader → uploader}/uploader.jsx

@@ -1,4 +1,4 @@
-import { apm } from '../../apm'
+import { apm } from '../apm'
 import { toast } from 'react-toastify'
 import ToastContent from '../common/partials/toast-content.jsx'
 import React from 'react'

package/src/scripts/{refactor_2021 → utils}/user-login-modal-ctx.tsx

@@ -1,7 +1,6 @@
 import React, { createContext, useState, FC, ReactNode } from 'react'
 import { UserLoginModal } from '@openneuro/components/modal'
-import loginUrls from './authentication/loginUrls'
-import { useLocation } from 'react-router-dom'
+import loginUrls from '../authentication/loginUrls'
 
 export const UserModalOpenCtx = createContext(null)
 

package/src/scripts/{refactor_2021/validation → validation}/validation.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import ValidationStatus from './validation-status.jsx'
-import ErrorBoundary from '../../errors/errorBoundary.jsx'
+import ErrorBoundary from '../errors/errorBoundary.jsx'
 
 const Validation = ({ issues }) => (
   <>

package/src/scripts/mobile/collapsible-wrapper.tsx

@@ -1,93 +0,0 @@
-import React, { useState } from 'react'
-import PropTypes from 'prop-types'
-import styled from '@emotion/styled'
-
-interface IsOpenProps {
-  isOpen: boolean
-}
-
-// wrapper for collapsible content on mobile
-const Content = styled.div<IsOpenProps>`
-  height: 7em;
-  overflow: hidden;
-  text-align: left;
-  ${(props): string =>
-    props.isOpen &&
-    `
-      display: block;
-      height: auto;
-      overflow: auto;
-    `};
-`
-
-const Collapse = ({ children, isOpen }): React.ReactElement => {
-  return <Content isOpen={isOpen}>{children}</Content>
-}
-
-Collapse.propTypes = {
-  children: PropTypes.node.isRequired,
-  isOpen: PropTypes.bool,
-}
-
-Collapse.defaultProps = {
-  isOpen: undefined,
-}
-
-const Item = styled.button`
-  background-color: transparent;
-  border: 0;
-  font-weight: 700;
-  padding: 0;
-  &,
-  &:hover {
-    text-decoration: none;
-  }
-  &:focus {
-    outline: 0;
-  }
-`
-
-const Wrapper = styled.span`
-  display: flex;
-  align-items: center;
-`
-
-const Title = styled.p`
-  padding-right: 0.5rem;
-  cursor: pointer;
-  color: #00505c;
-  text-decoration: none;
-  font-family: 'Cabin', sans-serif;
-  font-size: 12px;
-`
-
-const Collapsible = ({ children, ...otherProps }): React.ReactElement => {
-  const [isOpen, setOpen] = useState(false)
-  const toggleItem = (): void => {
-    setOpen(prevState => !prevState)
-  }
-  return (
-    <>
-      <div>
-        <Collapse isOpen={isOpen}>{children}</Collapse>
-      </div>
-      <Item onClick={toggleItem}>
-        <Wrapper>
-          <Title>{!isOpen ? otherProps.title[0] : otherProps.title[1]}</Title>
-        </Wrapper>
-      </Item>
-    </>
-  )
-}
-
-Collapsible.propTypes = {
-  children: PropTypes.node.isRequired,
-  isOpen: PropTypes.bool,
-}
-
-Collapsible.defaultProps = {
-  icon: 'down-chevron',
-  isOpen: false,
-}
-
-export default Collapsible

package/src/scripts/refactor_2021/common/partials/toast-content.jsx

@@ -1,18 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-
-const ToastContent = ({ title, body, children }) => (
-  <span>
-    <h3>{title}</h3>
-    <h4>{body}</h4>
-    {children}
-  </span>
-)
-
-ToastContent.propTypes = {
-  title: PropTypes.string,
-  body: PropTypes.string,
-  children: PropTypes.node,
-}
-
-export default ToastContent