Fix a bug in validateDefinedFields where non-relation fields with the same name as relation fields would be accepted

Author: tkleinke

core/src/model/configuration/field.ts

@@ -147,6 +147,7 @@ export module Field {
         export const SIMPLE_INPUT_TYPES = [SIMPLE_INPUT, SIMPLE_MULTIINPUT];
         export const SUBFIELD_INPUT_TYPES = [INPUT, SIMPLE_INPUT, TEXT, BOOLEAN, DROPDOWN, RADIO, CHECKBOXES,
             FLOAT, UNSIGNEDFLOAT, INT, UNSIGNEDINT, DATE, URL];
+        export const RELATION_INPUT_TYPES = [RELATION, INSTANCE_OF, DERIVED_RELATION];
 
         const INTERCHANGEABLE_INPUT_TYPES: Array<Array<InputType>> = [
             [INPUT, SIMPLE_INPUT, TEXT, DROPDOWN, RADIO],

desktop/src/app/model/validations.ts

@@ -411,15 +411,15 @@ export module Validations {
             { name: 'scanCode' } as Field
         ];
 
-        const definedFields: Array<any> = projectFields.concat(defaultFields);
-
-        const invalidFields: Array<any> = [];
+        const definedFields: Array<Field> = projectFields.concat(defaultFields);
+        const invalidFields: string[] = [];
 
         for (let resourceField in resource) {
             if (resource.hasOwnProperty(resourceField)) {
                 let fieldFound: boolean = false;
                 for (let definedField of definedFields) {
-                    if (definedField.name === resourceField) {
+                    if (definedField.name === resourceField
+                            && !Field.InputType.RELATION_INPUT_TYPES.includes(definedField.inputType)) {
                         fieldFound = true;
                         break;
                     }

desktop/test/unit/components/model/validations.spec.ts

@@ -60,7 +60,8 @@ describe('Validations', () => {
                         { name: 'period4', label: 'period4', inputType: InputType.DROPDOWNRANGE },
                         { name: 'beginningDate', label: 'beginningDate', inputType: 'date' },
                         { name: 'endDate', label: 'endDate', inputType: 'date' },
-                        { name: 'shortInput', label: 'shortInput', inputType: 'input', maxCharacters: 10 }
+                        { name: 'shortInput', label: 'shortInput', inputType: 'input', maxCharacters: 10 },
+                        { name: 'isBelow', label: 'isBelow', inputType: 'relation' }
                     ]
 
             }]}, []],
@@ -119,7 +120,7 @@ describe('Validations', () => {
 
     it('validate defined fields', () => {
 
-        const datastore = jasmine.createSpyObj('datastore',['find']);
+        const datastore = jasmine.createSpyObj('datastore', ['find']);
         datastore.find.and.returnValues(Promise.resolve({ totalCount: 0, documents: [] }));
 
         const doc = {
@@ -157,6 +158,26 @@ describe('Validations', () => {
     });
 
 
+    it('validate defined fields - do not allow non-relation fields with the same name as relation fields', () => {
+
+        const datastore = jasmine.createSpyObj('datastore', ['find']);
+        datastore.find.and.returnValues(Promise.resolve({ totalCount: 0, documents: [] }));
+
+        const doc = {
+            resource: {
+                id: '1',
+                category: 'T',
+                mandatory: 'm',
+                isBelow: 'test',
+                relations: { isBelow: ['0'] },
+            }
+        };
+
+        const undefinedFields = Validations.validateDefinedFields(doc.resource as any, projectConfiguration);
+        expect(undefinedFields).toContain('isBelow');
+    });
+
+
     it('should report nothing when omitting optional property', () => {
 
         const datastore = jasmine.createSpyObj('datastore',['find']);