Merge pull request eclipsesource#434 from eneufeld/fix_change_validator

edgarmueller · web-flow · commit bbff268e62fd · 2016-10-11T11:13:44.000+02:00
Change validator to ajv
diff --git a/examples/app/masterdetail/masterdetail.controller.js b/examples/app/masterdetail/masterdetail.controller.js
@@ -24,8 +24,8 @@ angular.module('makeithappen').controller('MasterDetailController', function() {
         "definitions": {
             "folder": {
               "type": "object",
+              "id": "#folder_array",
               "properties": {
-                  "id": "folder",
                   "name": {
                       "type": "string",
                       "minLength": 3
@@ -50,8 +50,8 @@ angular.module('makeithappen').controller('MasterDetailController', function() {
             },
             "file": {
                 "type": "object",
+                "id": "#file_array",
                 "properties": {
-                    "id": "file",
                     "name": {
                         "type": "string",
                         "minLength": 3
@@ -61,8 +61,8 @@ angular.module('makeithappen').controller('MasterDetailController', function() {
             },
             "drive": {
                 "type": "object",
+                "id": "#drive_array",
                 "properties": {
-                    "id": "drive",
                     "name": {
                         "type": "string",
                         "minLength": 3
@@ -86,6 +86,7 @@ angular.module('makeithappen').controller('MasterDetailController', function() {
             }
         },
         "type":"array",
+        "id": "drives#",
         "items":
         {
             "$ref": "#/definitions/drive"
@@ -97,8 +98,22 @@ angular.module('makeithappen').controller('MasterDetailController', function() {
             "$ref": "#"
         },
         "options":{
-            "labelProvider":{"drive":"name","folder":"name","file":"name"},
-            "imageProvider":{"folder":"app/masterdetail/icons/folder.png","file":"app/masterdetail/icons/page.png","drive":"app/masterdetail/icons/drive.png"}
+            "labelProvider":{
+              "#drive_array":"name",
+              "#folder_array":"name",
+              "#file_array":"name",
+              "#drive_object":"name",
+              "#folder_object":"name",
+              "#file_object":"name"
+              },
+            "imageProvider":{
+              "#folder_array":"app/masterdetail/icons/folder.png",
+              "#file_array":"app/masterdetail/icons/page.png",
+              "#drive_array":"app/masterdetail/icons/drive.png",
+              "#folder_object":"app/masterdetail/icons/folder.png",
+              "#file_object":"app/masterdetail/icons/page.png",
+              "#drive_object":"app/masterdetail/icons/drive.png"
+            }
         }
     };
 
@@ -185,8 +200,8 @@ angular.module('makeithappen').controller('MasterDetailController', function() {
         "definitions": {
             "folder": {
               "type": "object",
+              "id": "#folder_object",
               "properties": {
-                  "id": "folder",
                   "name": {
                       "type": "string",
                       "minLength": 3
@@ -211,8 +226,8 @@ angular.module('makeithappen').controller('MasterDetailController', function() {
             },
             "file": {
                 "type": "object",
+                "id": "#file_object",
                 "properties": {
-                    "id": "file",
                     "name": {
                         "type": "string",
                         "minLength": 3
@@ -222,8 +237,8 @@ angular.module('makeithappen').controller('MasterDetailController', function() {
             }
         },
         "type": "object",
+        "id": "drive_object#",
         "properties": {
-            "id": "drive",
             "name": {
                 "type": "string",
                 "minLength": 3
diff --git a/examples/app/person/person.controller.js b/examples/app/person/person.controller.js
@@ -7,8 +7,8 @@ angular.module('makeithappen').controller('PersonController', function() {
     var vm = this;
     vm.schema = {
         "type": "object",
+        "id": "user.json",
         "properties": {
-            "id": "user.json",
             "name": {
                 "type": "string",
                 "minLength": 3
diff --git a/package.json b/package.json
@@ -39,8 +39,7 @@
     "json-refs": "2.1.5",
     "lodash": "4.0.1",
     "pluralize": "3.0.0",
-    "tv4": "^1.2.7",
-    "tv4-formats": "2.2.0"
+    "ajv": "4.7.7"
   },
   "devDependencies": {
     "angular-mocks": "1.5.0",
diff --git a/src/components/renderers/layouts/masterdetail/masterdetail.directive.spec.ts b/src/components/renderers/layouts/masterdetail/masterdetail.directive.spec.ts
@@ -92,8 +92,8 @@ describe('MasterDetail', () => {
                         'type': 'array',
                         'items': {
                             'type': 'object',
+                            'id': 'a',
                             'properties': {
-                                'id': 'a',
                                 'custom': {
                                     'type': 'string'
                                 },
@@ -104,8 +104,8 @@ describe('MasterDetail', () => {
                         'type': 'array',
                         'items': {
                             'type': 'object',
+                            'id': 'c',
                             'properties': {
-                                'id': 'c',
                                 'custom': {
                                     'type': 'string'
                                 },
diff --git a/src/components/renderers/layouts/masterdetail/masterdetail.directives.ts b/src/components/renderers/layouts/masterdetail/masterdetail.directives.ts
@@ -102,14 +102,14 @@ class MasterDetailCollectionController {
         return _.keys(this.getArraySubSchemas(dataSchema.items)).length !== 0;
     }
     public getLabel(data, dataSchema): string {
-        let labelProperty = this.labelProvider[dataSchema.items.properties.id];
+        let labelProperty = this.labelProvider[dataSchema.items.id];
         if (labelProperty !== undefined) {
             return data[labelProperty];
         }
         return data.name || data.id || JSON.stringify(data);
     }
     public getImage(dataSchema): string {
-        let imageUrl = this.imageProvider[dataSchema.items.properties.id];
+        let imageUrl = this.imageProvider[dataSchema.items.id];
         if (imageUrl !== undefined) {
             return imageUrl;
         }
diff --git a/src/components/services/services.ts b/src/components/services/services.ts
@@ -3,15 +3,8 @@ import {IUISchemaElement} from '../../uischema';
 import {PathUtil} from './pathutil';
 
 // TODO: replace
-let tv4 = require('tv4');
-let formats = require('tv4-formats');
-let validator;
-if (tv4 != null) {
-  validator = tv4.freshApi();
-  if (formats != null) {
-    validator.addFormat(formats);
-  }
-}
+let Ajv = require('ajv');
+let ajv = new Ajv({allErrors: true, jsonPointers: true});
 // TODO: remove
 class HashTable {
 
@@ -99,20 +92,23 @@ export class ValidationService implements IValidationService {
 
     validate(instance: any, schema: SchemaElement): void {
 
-        if (validator === undefined) {
+        if (ajv === undefined) {
             return;
         }
 
         this.convertAllDates(instance);
         this.checkObjects = [];
         this.clear(instance);
         // TODO
-        let results = validator.validateMultiple(instance, schema);
-
-        results['errors'].forEach((error) => {
+        let valid = ajv.validate(schema, instance);
+        if (valid) {
+          this.validationResults.put(instance, undefined);
+          return;
+        }
+        ajv['errors'].forEach((error) => {
             if (error['schemaPath'].indexOf('required') !== -1) {
-                let propName = error['dataPath'] + '/' + error['params']['key'];
-                this.validationResults.get(instance)[propName] = `${PathUtil.beautifiedLastFragment(error['params']['key'])} is a required field`;
+                let propName = error['dataPath'] + '/' + error['params']['missingProperty'];
+                this.validationResults.get(instance)[propName] = error['message'];
             } else {
                 this.validationResults.get(instance)[error['dataPath']] = error['message'];
             }

Original file line number	Diff line number	Diff line change
`@@ -102,14 +102,14 @@ class MasterDetailCollectionController {`
`102`	`102`	`return _.keys(this.getArraySubSchemas(dataSchema.items)).length !== 0;`
`103`	`103`	`}`
`104`	`104`	`public getLabel(data, dataSchema): string {`
`105`		`- let labelProperty = this.labelProvider[dataSchema.items.properties.id];`
	`105`	`+ let labelProperty = this.labelProvider[dataSchema.items.id];`
`106`	`106`	`if (labelProperty !== undefined) {`
`107`	`107`	`return data[labelProperty];`
`108`	`108`	`}`
`109`	`109`	`return data.name \|\| data.id \|\| JSON.stringify(data);`
`110`	`110`	`}`
`111`	`111`	`public getImage(dataSchema): string {`
`112`		`- let imageUrl = this.imageProvider[dataSchema.items.properties.id];`
	`112`	`+ let imageUrl = this.imageProvider[dataSchema.items.id];`
`113`	`113`	`if (imageUrl !== undefined) {`
`114`	`114`	`return imageUrl;`
`115`	`115`	`}`