@openneuro/app 3.37.1 → 3.38.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/app",
-  "version": "3.37.1",
+  "version": "3.38.0",
   "description": "React JS web frontend for the OpenNeuro platform.",
   "license": "MIT",
   "main": "public/client.js",
@@ -21,8 +21,8 @@
     "@emotion/react": "^11.4.0",
     "@emotion/styled": "^10.0.4",
     "@loadable/component": "^5.7.0",
-    "@openneuro/client": "^3.37.1",
-    "@openneuro/components": "^3.37.1",
+    "@openneuro/client": "^3.38.0",
+    "@openneuro/components": "^3.38.0",
     "babel-runtime": "^6.26.0",
     "bids-validator": "1.8.4",
     "bytes": "^3.0.0",
@@ -130,5 +130,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2c1264c00c50a92de2418d91b1436892016c3a6f"
+  "gitHead": "7b65148258ba502c562b53665a165a6cdcfca0b2"
 }

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

@@ -20,6 +20,8 @@ import ErrorBoundary, {
   ErrorBoundaryAssertionFailureException,
 } from '../../errors/errorBoundary.jsx'
 import DatasetRedirect from '../routes/dataset-redirect'
+import FourOThreePage from '../../errors/403page'
+import FourOFourPage from '../../errors/404page'
 
 /**
  * Generate the dataset page query
@@ -110,7 +112,6 @@ export const DatasetQueryHook = ({ datasetId, draft, history }) => {
     draft ? getDraftPage : getDatasetPage,
     {
       variables: { datasetId },
-      errorPolicy: 'all',
       fetchPolicy: 'cache-and-network',
       nextFetchPolicy: 'cache-first',
     },
@@ -125,18 +126,19 @@ export const DatasetQueryHook = ({ datasetId, draft, history }) => {
   })
   useDraftSubscription(datasetId)
 
-  useEffect(() => {
-    if (error) {
-      if (data.dataset) {
-        // show dataset page
+  if (loading) return <Spinner text="Loading Dataset" active />
+  if (error) {
+    if (error.message === 'You do not have access to read this dataset.') {
+      return <FourOThreePage />
+    } else {
+      try {
         apm.captureError(error)
-      } else {
-        // direct to freshdesk
-        throw error
+      } catch (err) {
+        // Ignore failure to write to APM
       }
+      return <FourOFourPage />
     }
-  }, [error, data])
-  if (loading) return <Spinner text="Loading Dataset" active />
+  }
 
   return (
     <DatasetContext.Provider value={data.dataset}>
@@ -146,7 +148,8 @@ export const DatasetQueryHook = ({ datasetId, draft, history }) => {
             datasetId,
             fetchMore,
             error,
-          }}>
+          }}
+        >
           <DatasetPage dataset={data.dataset} />
           <FilesSubscription datasetId={datasetId} />
         </DatasetQueryContext.Provider>

package/src/scripts/errors/403page.tsx

@@ -0,0 +1,45 @@
+import React, { FC } from 'react'
+import { Link } from 'react-router-dom'
+import styled from '@emotion/styled'
+
+type ContainerProps = {
+  styleContext: string
+}
+const Container = styled.div<ContainerProps>(({ styleContext }) => {
+  switch (styleContext) {
+    case 'topLevel':
+      return {
+        margin: '50px 25px',
+      }
+    case 'dataset':
+      return {
+        margin: '20px 0',
+      }
+  }
+})
+
+interface FourOThreePageProps {
+  redirectRoute?: string
+  redirectRouteName?: string
+  theme?: string
+}
+
+const FourOThreePage: FC<FourOThreePageProps> = ({
+  redirectRoute = '/',
+  redirectRouteName = 'the home page',
+  theme = 'topLevel',
+}) => {
+  return (
+    <Container styleContext={theme}>
+      <h3>
+        403: You do not have access to this page, you may need to sign in.
+      </h3>
+      <p>
+        Click <Link to={redirectRoute}>here</Link> to go to
+        {' ' + redirectRouteName}.
+      </p>
+    </Container>
+  )
+}
+
+export default FourOThreePage

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

@@ -21,8 +21,8 @@ import ErrorBoundary, {
 } from '../../errors/errorBoundary.jsx'
 import DatasetRedirect from '../../datalad/routes/dataset-redirect'
 import { trackAnalytics } from '../../utils/datalad'
-
-//TODO imports
+import FourOFourPage from '../../errors/404page'
+import FourOThreePage from '../../errors/403page'
 
 /**
  * Generate the dataset page query
@@ -126,7 +126,6 @@ export const DatasetQueryHook = ({ datasetId, draft, history }) => {
     draft ? getDraftPage : getDatasetPage,
     {
       variables: { datasetId },
-      errorPolicy: 'all',
       fetchPolicy: 'cache-and-network',
       nextFetchPolicy: 'cache-first',
     },
@@ -141,17 +140,6 @@ export const DatasetQueryHook = ({ datasetId, draft, history }) => {
   })
   useDraftSubscription(datasetId)
 
-  useEffect(() => {
-    if (error) {
-      if (data.dataset) {
-        // show dataset page
-        apm.captureError(error)
-      } else {
-        // direct to freshdesk
-        throw error
-      }
-    }
-  }, [error, data])
   if (loading)
     return (
       <div className="loading-dataset">
@@ -159,6 +147,18 @@ export const DatasetQueryHook = ({ datasetId, draft, history }) => {
         Loading Dataset
       </div>
     )
+  if (error) {
+    if (error.message === 'You do not have access to read this dataset.') {
+      return <FourOThreePage />
+    } else {
+      try {
+        apm.captureError(error)
+      } catch (err) {
+        // Ignore failure to write to APM
+      }
+      return <FourOFourPage />
+    }
+  }
 
   return (
     <DatasetContext.Provider value={data.dataset}>

package/src/scripts/refactor_2021/dataset/mutations/update-file.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import UploaderContext from '../../../uploader/uploader-context.js'
+import UploaderContext from '../../uploader/uploader-context.js'
 import Tooltip from '../../../common/partials/tooltip.jsx'
 
 const UpdateFile = ({

package/src/scripts/refactor_2021/search/use-search-results.tsx

@@ -59,14 +59,6 @@ const searchQuery = gql`
             ages
           }
           latestSnapshot {
-            summary {
-              subjectMetadata {
-                age
-              }
-            }
-          }
-          draft {
-            id
             summary {
               modalities
               secondaryModalities