@openneuro/app 4.15.2-demo.1 → 4.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/app",
-  "version": "4.15.2-demo.1",
+  "version": "4.16.0",
   "description": "React JS web frontend for the OpenNeuro platform.",
   "license": "MIT",
   "main": "public/client.js",
@@ -20,9 +20,9 @@
     "@emotion/react": "11.6.0",
     "@emotion/styled": "11.6.0",
     "@niivue/niivue": "0.23.1",
-    "@openneuro/client": "^4.15.2-demo.1",
-    "@openneuro/components": "^4.15.2-demo.1",
-    "bids-validator": "1.9.9",
+    "@openneuro/client": "^4.16.0",
+    "@openneuro/components": "^4.16.0",
+    "bids-validator": "1.10.0",
     "bytes": "^3.0.0",
     "comlink": "^4.0.5",
     "date-fns": "^2.16.1",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "38094ea1b60e11a55425dbe597a10d872a4cb89e"
+  "gitHead": "e058ca8a6eda436e3c24cb4bc36579197d36aa79"
 }

package/src/scripts/authentication/regular-user.tsx

@@ -0,0 +1,20 @@
+import React from 'react'
+import { useCookies } from 'react-cookie'
+import { getProfile } from './profile.js'
+
+interface RegularUserProps {
+  children?: React.ReactNode
+}
+
+/**
+ * Render children if this is not an admin user
+ */
+export const RegularUser = ({ children }: RegularUserProps): JSX.Element => {
+  const [cookies] = useCookies()
+  const profile = getProfile(cookies)
+  if (profile?.admin) {
+    return null
+  } else {
+    return <>{children}</>
+  }
+}

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

@@ -162,6 +162,14 @@ export const DatasetQueryHook = ({ datasetId, draft }) => {
     if (error.message === 'You do not have access to read this dataset.') {
       return <FourOThreePage />
     } else if (error.message.includes('has been deleted')) {
+      for (const err of error.graphQLErrors) {
+        if (
+          err.extensions.code === 'DELETED_DATASET' &&
+          err.extensions.redirect
+        ) {
+          navigate(err.extensions.redirect)
+        }
+      }
       return <FourOFourPage message={error.message} />
     } else {
       try {

package/src/scripts/dataset/routes/delete-page.tsx

@@ -3,7 +3,9 @@ import { useCookies } from 'react-cookie'
 import DeleteDatasetForm from '../mutations/delete-dataset-form.jsx'
 import DeleteDataset from '../mutations/delete.jsx'
 import LoggedIn from '../../authentication/logged-in.jsx'
-import { hasEditPermissions, getProfile } from '../../authentication/profile.js'
+import { getProfile } from '../../authentication/profile.js'
+import AdminUser from '../../authentication/admin-user.jsx'
+import { RegularUser } from '../../authentication/regular-user'
 import { DatasetPageBorder } from './styles/dataset-page-border'
 import { HeaderRow3 } from './styles/header-row'
 
@@ -28,30 +30,38 @@ const DeletePage = ({ dataset }: DeletePageProps): React.ReactElement => {
   }
   const [cookies] = useCookies()
   const user = getProfile(cookies)
-  const hasEdit =
-    (user && user.admin) ||
-    hasEditPermissions(dataset.permissions, user && user.sub)
+  const hasEdit = user && user.admin
   const datasetId = dataset.id
   return (
     <DatasetPageBorder>
       <HeaderRow3>Delete Dataset</HeaderRow3>
-      <DeleteDatasetForm
-        values={values}
-        onChange={handleInputChange}
-        hideDisabled={false}
-        hasEdit={hasEdit}
-      />
-      <p>
-        <small className="warning-text">
-          * Warning: this action will permanently remove this dataset along with
-          associated snapshots.
-        </small>
-      </p>
-      <div className=" dataset-form-controls">
-        <LoggedIn>
-          <DeleteDataset datasetId={datasetId} metadata={values} />
-        </LoggedIn>
-      </div>
+      <AdminUser>
+        <DeleteDatasetForm
+          values={values}
+          onChange={handleInputChange}
+          hideDisabled={false}
+          hasEdit={hasEdit}
+        />
+        <p>
+          <small className="warning-text">
+            * Warning: this action will permanently remove this dataset along
+            with associated snapshots.
+          </small>
+        </p>
+        <div className="dataset-form-controls">
+          <LoggedIn>
+            <DeleteDataset datasetId={datasetId} metadata={values} />
+          </LoggedIn>
+        </div>
+      </AdminUser>
+      <RegularUser>
+        <p>
+          Please contact support to permanently remove a dataset and all
+          versions of it. Provide a reason for the removal request and if the
+          dataset is a duplicate or has been supplanted by another provide that
+          information for a redirect to be created.
+        </p>
+      </RegularUser>
     </DatasetPageBorder>
   )
 }

package/src/scripts/uploader/upload-issues.jsx

@@ -65,7 +65,7 @@ class UploadValidator extends React.Component {
     }
     const options = {
       config: {
-        error: ['NO_AUTHORS'],
+        error: ['NO_AUTHORS', 'EMPTY_DATASET_NAME'],
         ignoreSubjectConsistency: true,
         blacklistModalities: ['Microscopy'],
       },

package/src/scripts/validation/validation-results.issues.jsx

@@ -11,7 +11,7 @@ class Issues extends React.Component {
   render() {
     const issueFiles = this.props.issues
     const issues = issueFiles.map((issue, index) => {
-      let totalFiles = issue.files.length || issue.files.size
+      let totalFiles = issue.files.length
       if (issue.additionalFileCount) {
         totalFiles += issue.additionalFileCount
       }
@@ -32,7 +32,7 @@ class Issues extends React.Component {
       )
 
       // issue sub-errors
-      const subErrors = Array.from(issue.files).map((error, index2) => {
+      const subErrors = issue.files.map((error, index2) => {
         return error ? (
           <Issue
             type={this.props.issueType}

package/src/scripts/validation/validation-results.jsx

@@ -78,7 +78,7 @@ class ValidationResults extends React.Component {
   _countFiles(issues) {
     let numFiles = 0
     for (const issue of issues) {
-      numFiles += Array.from(issue.files).length
+      numFiles += issue.files.length
       if (issue.additionalFileCount) {
         numFiles += issue.additionalFileCount
       }

package/src/scripts/workers/validate.worker.ts

@@ -1,25 +1,22 @@
 /* eslint-env worker */
-import { validate, fileListToTree } from '../utils/schema-validator.js'
+import validate from 'bids-validator'
 import { BIDSValidatorIssues } from './worker-interface'
 
+const asyncValidateBIDS = (files, options): Promise<BIDSValidatorIssues> =>
+  new Promise(resolve => {
+    validate.BIDS(files, options, (issues, summary) =>
+      resolve({ issues, summary }),
+    )
+  })
+
 export async function runValidator(
   files,
   options,
   cb,
 ): Promise<BIDSValidatorIssues> {
   let error, output: BIDSValidatorIssues
-  output = { issues: { errors: [], warnings: [] }, summary: {} }
   try {
-    const tree = await fileListToTree(files)
-    const result = await validate(tree, { json: true })
-    const issues = Array.from(result.issues, ([key, value]) => value)
-    console.log(issues)
-    output.issues.warnings = issues.filter(
-      issue => issue.severity === 'warning',
-    )
-    output.issues.errors = issues.filter(issue => issue.severity === 'error')
-    output.summary = result.summary
-    console.log(output)
+    output = await asyncValidateBIDS(files, options)
   } catch (err) {
     error = err
   }

package/src/scripts/workers/worker-interface.ts

@@ -1,8 +1,5 @@
 // Shared interface for BIDSValidatorIssues shared without cross import for validate and validate.worker
 export interface BIDSValidatorIssues {
-  issues: {
-    errors: Record<string, unknown>[]
-    warnings: Record<string, unknown>[]
-  }
+  issues: Record<string, unknown>[]
   summary: Record<string, unknown>
 }

package/vite.config.js

@@ -7,7 +7,6 @@ export default defineConfig({
   server: {
     port: 80,
     host: '0.0.0.0',
-    cors: true,
   },
   build: {
     sourcemap: true,