@openneuro/app 4.15.2-alpha.9 → 4.15.2-demo.1

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,7 +32,7 @@ class Issues extends React.Component {
       )
 
       // issue sub-errors
-      const subErrors = issue.files.map((error, index2) => {
+      const subErrors = Array.from(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 += issue.files.length
+      numFiles += Array.from(issue.files).length
       if (issue.additionalFileCount) {
         numFiles += issue.additionalFileCount
       }

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

@@ -1,22 +1,25 @@
 /* eslint-env worker */
-import validate from 'bids-validator'
+import { validate, fileListToTree } from '../utils/schema-validator.js'
 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 {
-    output = await asyncValidateBIDS(files, options)
+    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)
   } catch (err) {
     error = err
   }

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,