@openneuro/app 4.17.2 → 4.18.1

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

@@ -20,7 +20,7 @@ class Issue extends React.Component {
     if (error.character) {
       errLocation += 'Character: ' + error.character + ''
     }
-    if (errLocation == '' && error.evidence) {
+    if (errLocation === '' && error.evidence) {
       errLocation = 'Evidence: '
     }
     if (errLocation) {

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
+      let totalFiles = issue.files.length || issue.files.size
       if (issue.additionalFileCount) {
         totalFiles += issue.additionalFileCount
       }
@@ -32,16 +32,32 @@ class Issues extends React.Component {
       )
 
       // issue sub-errors
-      const subErrors = issue.files.map((error, index2) => {
-        return error ? (
-          <Issue
-            type={this.props.issueType}
-            file={issue.file}
-            error={error}
-            index={index2}
-            key={index2}
-          />
-        ) : null
+      const subErrors = Array.from(issue.files).map((error, index2) => {
+        // Schema validator returns multiple files here
+        // map those to the old sub-issue model to display them
+        if (error?.length) {
+          return error.filter(Boolean).map((i, index3) => {
+            return (
+              <Issue
+                type={this.props.issueType}
+                file={i.file}
+                error={i}
+                index={index3}
+                key={index3}
+              />
+            )
+          })
+        } else {
+          return error ? (
+            <Issue
+              type={this.props.issueType}
+              file={issue.file}
+              error={error}
+              index={index2}
+              key={index2}
+            />
+          ) : null
+        }
       })
 
       if (issue.additionalFileCount > 0) {

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 += issue.files.length
+      numFiles += Array.from(issue.files).length
       if (issue.additionalFileCount) {
         numFiles += issue.additionalFileCount
       }

package/src/scripts/workers/schema.ts

@@ -0,0 +1,13 @@
+import { runValidator } from './schema.worker' // eslint-disable-line import/no-unresolved
+import { BIDSValidatorIssues } from './worker-interface'
+
+function init(files, options): Promise<BIDSValidatorIssues> {
+  return new Promise((resolve, reject) => {
+    void runValidator(files, options, ({ error, output }) => {
+      if (error) reject(error)
+      else resolve(output)
+    })
+  })
+}
+
+export default init

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

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

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

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

package/vite.config.js

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