Merge pull request #405 from rvsia/fixOrCondition

fix(renderer): do not fail when using or

Author: Hyperkid123

packages/react-form-renderer/src/files/default-schema-validator.js

@@ -31,10 +31,10 @@ const checkCondition = (condition, fieldName) => {
     `);
   }
 
-  if (condition.hasOwnProperty('or') && !Array.isArray(condition.and)) {
+  if (condition.hasOwnProperty('or') && !Array.isArray(condition.or)) {
     throw new DefaultSchemaError(`
       Error occured in field definition with "name" property: "${fieldName}".
-      'or' propery in a field condition must be an array! Received: ${typeof condition.and}.
+      'or' property in a field condition must be an array! Received: ${typeof condition.or}.
     `);
   }
 

packages/react-form-renderer/src/tests/parsers/__snapshots__/default-schema-validator.test.js.snap

@@ -127,7 +127,7 @@ exports[`Default schema validator should fail validation when using "and" and "o
 exports[`Default schema validator should fail validation when using "and" and "or" conditions 2`] = `
 "
       Error occured in field definition with \\"name\\" property: \\"foo\\".
-      'or' propery in a field condition must be an array! Received: undefined.
+      'or' property in a field condition must be an array! Received: object.
     "
 `;
 

packages/react-form-renderer/src/tests/parsers/default-schema-validator.test.js

@@ -482,6 +482,46 @@ describe('Default schema validator', () => {
     });
   });
 
+  it('should not fail validation using "and" and "or" conditions', () => {
+    expect(() =>
+      defaultSchemaValidator(
+        {
+          fields: [
+            {
+              component: 'foo',
+              name: 'foo',
+              condition: {
+                and: [{ when: 'x', is: 'y' }]
+              }
+            }
+          ]
+        },
+        componentMapper,
+        [],
+        []
+      )
+    ).not.toThrow();
+
+    expect(() =>
+      defaultSchemaValidator(
+        {
+          fields: [
+            {
+              component: 'foo',
+              name: 'foo',
+              condition: {
+                or: [{ when: 'x', is: 'y' }]
+              }
+            }
+          ]
+        },
+        componentMapper,
+        [],
+        []
+      )
+    ).not.toThrow();
+  });
+
   it('should fail validation when using "and" and "or" conditions', () => {
     expect(() =>
       defaultSchemaValidator(