LT-92: Criteria schema :: allow single item or array

Packages/ohif-measurements/client/conformance/CriteriaEvaluator.js

@@ -6,30 +6,12 @@ import Ajv from 'ajv';
 export class CriteriaEvaluator {
 
     constructor(criteriaObject) {
+        const criteriaValidator = this.getCriteriaValidator();
         this.criteria = [];
 
-        const schema = {
-            properties: {},
-            definitions: {
-                simpleArray: { type: 'array' }
-            }
-        };
-        _.each(Criteria, (Criterion, key) => {
-            if (Criterion.prototype instanceof BaseCriterion) {
-                const criterionkey = key.replace(/Criterion$/, '');
-                schema.definitions[criterionkey] = Criteria[`${criterionkey}Schema`];
-                schema.properties[criterionkey] = {
-                    oneOf: [
-                        { $ref: '#/definitions/simpleArray' },
-                        { $ref: `#/definitions/${criterionkey}` }
-                    ]
-                };
-            }
-        });
-        const validator = new Ajv().compile(schema);
-        if (!validator(criteriaObject)) {
+        if (!criteriaValidator(criteriaObject)) {
             let message = '';
-            _.each(validator.errors, error => {
+            _.each(criteriaValidator.errors, error => {
                 message += `\noptions${error.dataPath} ${error.message}`;
             });
             throw new Error(message);
@@ -42,6 +24,39 @@ export class CriteriaEvaluator {
         });
     }
 
+    getCriteriaValidator() {
+        if (CriteriaEvaluator.validator) {
+            return CriteriaEvaluator.validator;
+        }
+
+        const schema = {
+            properties: {},
+            definitions: {}
+        };
+
+        _.each(Criteria, (Criterion, key) => {
+            if (Criterion.prototype instanceof BaseCriterion) {
+                const criterionkey = key.replace(/Criterion$/, '');
+                const criterionDefinition = `#/definitions/${criterionkey}`;
+
+                schema.definitions[criterionkey] = Criteria[`${criterionkey}Schema`];
+                schema.properties[criterionkey] = {
+                    oneOf: [
+                        { $ref: criterionDefinition },
+                        {
+                            type: 'array',
+                            items: {
+                                $ref: criterionDefinition
+                            }
+                        }
+                    ]
+                };
+            }
+        });
+        
+        return CriteriaEvaluator.validator = new Ajv().compile(schema);
+    }
+
     evaluate(data) {
         const nonconformity = [];
         this.criteria.forEach(criterion => {

Packages/ohif-measurements/client/conformance/criteria/MaxTargets.js

@@ -2,6 +2,7 @@ import { BaseCriterion } from './BaseCriterion';
 import { _ } from 'meteor/underscore';
 
 export const MaxTargetsSchema = {
+    type: 'object',
     properties: {
         limit: {
             label: 'Max targets allowed in study',

Packages/ohif-measurements/client/conformance/criteria/MaxTargetsPerOrgan.js

@@ -1,6 +1,7 @@
 import { BaseCriterion } from './BaseCriterion';
 
 export const MaxTargetsPerOrganSchema = {
+    type: 'object',
     properties: {
         limit: {
             label: 'Max targets allowed per organ',

Packages/ohif-measurements/client/conformance/criteria/MeasurementsLength.js

@@ -1,6 +1,7 @@
 import { BaseCriterion } from './BaseCriterion';
 
 export const MeasurementsLengthSchema = {
+    type: 'object',
     properties: {
         longAxis: {
             label: 'Minimum length of long axis',

Packages/ohif-measurements/client/conformance/criteria/Modality.js

@@ -2,6 +2,7 @@ import { BaseCriterion } from './BaseCriterion';
 import { _ } from 'meteor/underscore';
 
 export const ModalitySchema = {
+    type: 'object',
     properties: {
         method: {
             label: 'Specify if it\'s goinig to "allow" or "deny" the modalities',

Packages/ohif-measurements/client/conformance/criteria/NonTargetResponse.js

@@ -1,6 +1,7 @@
 import { BaseCriterion } from './BaseCriterion';
 
 export const NonTargetResponseSchema = {
+    type: 'object'
 };
 
 /* NonTargetResponseCriterion

Packages/ohif-measurements/client/conformance/criteria/TargetType.js

@@ -1,6 +1,7 @@
 import { BaseCriterion } from './BaseCriterion';
 
 export const TargetTypeSchema = {
+    type: 'object'
 };
 
 /* TargetTypeCriterion