@openneuro/app 4.4.9 → 4.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/app",
-  "version": "4.4.9",
+  "version": "4.5.1",
   "description": "React JS web frontend for the OpenNeuro platform.",
   "license": "MIT",
   "main": "public/client.js",
@@ -19,10 +19,10 @@
     "@elastic/apm-rum": "5.9.1",
     "@emotion/react": "11.6.0",
     "@emotion/styled": "11.6.0",
-    "@openneuro/client": "^4.4.9",
-    "@openneuro/components": "^4.4.9",
+    "@openneuro/client": "^4.5.1",
+    "@openneuro/components": "^4.5.1",
     "babel-runtime": "^6.26.0",
-    "bids-validator": "1.8.8",
+    "bids-validator": "1.9.3",
     "bytes": "^3.0.0",
     "comlink": "^4.0.5",
     "core-js": "^3.3.2",
@@ -116,5 +116,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "af313c7d80f6aade5786075853d00023c52db60e"
+  "gitHead": "92a2879d0f00400c240bfe3319f26c38db8ef866"
 }

package/src/scripts/app.tsx

@@ -1,6 +1,6 @@
 import React, { FC, ReactNode } from 'react'
 import Helmet from 'react-helmet'
-import { frontPage } from './front-page/front-page-content'
+import { frontPage } from './pages/front-page/front-page-content'
 import { CookiesProvider, Cookies } from 'react-cookie'
 import { ToastContainer } from 'react-toastify'
 import { MediaContextProvider } from './styles/media'

package/src/scripts/{refactor_2021/authentication → authentication}/loginUrls.ts

@@ -1,4 +1,4 @@
-import { config } from '../../config'
+import { config } from '../config'
 
 export default {
   google: `${config.api}auth/google`,

package/src/scripts/{refactor_2021 → common}/containers/header.tsx

@@ -1,23 +1,23 @@
 import React, { FC, useContext } from 'react'
 import useState from 'react-usestateref'
-import UploaderContext from '../uploader/uploader-context.js'
-import UploadProgress from '../uploader/upload-progress.jsx'
+import UploaderContext from '../../uploader/uploader-context.js'
+import UploadProgress from '../../uploader/upload-progress.jsx'
 import { Header, LandingExpandedHeader } from '@openneuro/components/header'
 import { Input } from '@openneuro/components/input'
-import ModalitySelect from '../search/inputs/modality-select'
-import { SearchParamsCtx } from '../search/search-params-ctx'
-import initialSearchParams from '../search/initial-search-params'
-import { UserModalOpenCtx } from '../user-login-modal-ctx'
+import ModalitySelect from '../../search/inputs/modality-select'
+import { SearchParamsCtx } from '../../search/search-params-ctx'
+import initialSearchParams from '../../search/initial-search-params'
+import { UserModalOpenCtx } from '../../utils/user-login-modal-ctx'
 import { useLocation, useHistory } from 'react-router-dom'
 import { useCookies } from 'react-cookie'
-import signOut from '../authentication/signOut'
-import { getUnexpiredProfile } from '../authentication/profile'
-import FreshdeskWidget from '../freshdesk-widget'
-import AggregateCountsContainer from '../aggregate-queries/aggregate-counts-container'
-import loginUrls from '../authentication/loginUrls'
-import UploaderView from '../uploader/uploader-view.jsx'
-import UploadButton from '../uploader/upload-button.jsx'
-import UploadProgressButton from '../uploader/upload-progress-button.jsx'
+import signOut from '../../authentication/signOut'
+import { getUnexpiredProfile } from '../../authentication/profile'
+import FreshdeskWidget from '../partials/freshdesk-widget'
+import AggregateCountsContainer from '../../pages/front-page/aggregate-queries/aggregate-counts-container'
+import loginUrls from '../../authentication/loginUrls'
+import UploaderView from '../../uploader/uploader-view.jsx'
+import UploadButton from '../../uploader/upload-button.jsx'
+import UploadProgressButton from '../../uploader/upload-progress-button.jsx'
 const HeaderContainer: FC = () => {
   const history = useHistory()
 
@@ -134,7 +134,9 @@ const HeaderContainer: FC = () => {
             onSearch={() => {
               handleSubmit()
             }}
-            clearSearchParams={() => { clearSearchParams() }}
+            clearSearchParams={() => {
+              clearSearchParams()
+            }}
           />
         )}
       />

package/src/scripts/{datalad/fragments → common/partials}/freshdesk-widget.jsx

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

package/src/scripts/common/partials/papaya.jsx

@@ -25,6 +25,7 @@ class Papaya extends React.Component {
       allowScroll: false,
       fullScreenPadding: false,
       showControlBar: true,
+      showOrientation: true,
       images: [this.props.image],
       kioskMode: true,
     }

package/src/scripts/{refactor_2021/dataset → dataset}/comments/comments.jsx

@@ -5,7 +5,7 @@ import Comment from './comment.jsx'
 import CommentEditor from './comment-editor.jsx'
 import LoggedIn from '../../authentication/logged-in.jsx'
 import LoggedOut from '../../authentication/logged-out.jsx'
-import ErrorBoundary from '../../../errors/errorBoundary.jsx'
+import ErrorBoundary from '../../errors/errorBoundary.jsx'
 
 import ToastContent from '../../common/partials/toast-content.jsx'
 

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

@@ -1,28 +1,28 @@
-import { apm } from '../../apm'
+import { apm } from '../apm'
 import React, { useEffect } from 'react'
 import PropTypes from 'prop-types'
 import { useQuery, gql, useApolloClient } from '@apollo/client'
 import { Loading } from '@openneuro/components/loading'
 
-import DatasetQueryContext from '../../datalad/dataset/dataset-query-context.js'
-import DatasetContext from '../../datalad/dataset/dataset-context.js'
+import DatasetQueryContext from '../datalad/dataset/dataset-query-context.js'
+import DatasetContext from '../datalad/dataset/dataset-context.js'
 import DatasetRoutes from './dataset-routes'
-import FilesSubscription from '../../datalad/subscriptions/files-subscription.jsx'
-import usePermissionsSubscription from '../../datalad/subscriptions/usePermissionsSubscription'
-import useSnapshotsUpdatedSubscriptions from '../../datalad/subscriptions/useSnapshotsUpdatedSubscriptions'
+import FilesSubscription from '../datalad/subscriptions/files-subscription.jsx'
+import usePermissionsSubscription from '../datalad/subscriptions/usePermissionsSubscription'
+import useSnapshotsUpdatedSubscriptions from '../datalad/subscriptions/useSnapshotsUpdatedSubscriptions'
 import useDatasetDeletedSubscription, {
   datasetDeletedToast,
-} from '../../datalad/subscriptions/useDatasetDeletedSubscription.jsx'
-import useDraftSubscription from '../../datalad/subscriptions/useDraftSubscription.js'
-import * as DatasetQueryFragments from '../../datalad/dataset/dataset-query-fragments.js'
-import { DATASET_COMMENTS } from '../../datalad/dataset/comments-fragments.js'
+} from '../datalad/subscriptions/useDatasetDeletedSubscription.jsx'
+import useDraftSubscription from '../datalad/subscriptions/useDraftSubscription.js'
+import * as DatasetQueryFragments from '../datalad/dataset/dataset-query-fragments.js'
+import { DATASET_COMMENTS } from '../datalad/dataset/comments-fragments.js'
 import ErrorBoundary, {
   ErrorBoundaryAssertionFailureException,
-} from '../../errors/errorBoundary.jsx'
-import DatasetRedirect from '../../datalad/routes/dataset-redirect'
-import { trackAnalytics } from '../../utils/datalad'
-import FourOFourPage from '../../errors/404page'
-import FourOThreePage from '../../errors/403page'
+} from '../errors/errorBoundary.jsx'
+import DatasetRedirect from '../datalad/routes/dataset-redirect'
+import { trackAnalytics } from '../utils/datalad'
+import FourOFourPage from '../errors/404page'
+import FourOThreePage from '../errors/403page'
 
 /**
  * Generate the dataset page query

package/src/scripts/{refactor_2021/dataset → dataset}/download/download-datalad.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { getConfig, config } from '../../../config'
+import { getConfig, config } from '../../config'
 import ShellExample from './shell-example.jsx'
 import {
   getUnexpiredProfile,

package/src/scripts/{refactor_2021/dataset → dataset}/download/download-native.js

@@ -9,7 +9,7 @@ import {
   downloadCompleteToast,
   requestFailureToast,
 } from './native-file-toast.jsx'
-import { apm } from '../../../apm.js'
+import { apm } from '../../apm.js'
 import { downloadDataset } from './download-query'
 
 /**

package/src/scripts/{refactor_2021/dataset → dataset}/download/download-s3.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import ShellExample from './shell-example.jsx'
-import { getConfig } from '../../../config'
+import { getConfig } from '../../config'
 
 export const DownloadSampleS3 = ({ datasetId, s3Bucket }) => (
   <ShellExample>