FIO-8769 added check for the simpleConditional properties state (#136)

formio · Aug 16, 2024 · 6c3ff4d · 6c3ff4d
1 parent c5e4245
commit 6c3ff4d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/utils/__tests__/formUtil.test.ts b/src/utils/__tests__/formUtil.test.ts
@@ -20,7 +20,8 @@ import {
     findComponents,
     getComponent,
     flattenComponents,
-    getComponentActualValue
+    getComponentActualValue,
+    hasCondition
 } from "../formUtil";
 import { fastCloneDeep } from 'utils/fastCloneDeep';
 
@@ -1795,4 +1796,22 @@ describe('getComponentActualValue', () => {
       expect(value).to.equal('yes');
     });
   });
+
+describe('hasCondition', () => {
+    it('Should return false if conditions is saved in invalid state', () => {
+        const component = {
+            label: 'Text Field',
+            hidden: true,
+            key: 'textField',
+            conditional: {
+              conjunction: 'all'
+            },
+            type: 'textfield',
+            input: true
+        }
+
+        const result = hasCondition(component as Component);
+        expect(result).to.equal(false);
+    })
+})
 
diff --git a/src/utils/formUtil.ts b/src/utils/formUtil.ts
@@ -14,7 +14,8 @@ import {
   isPlainObject,
   isArray,
   isEqual,
-  trim
+  trim,
+  isBoolean
 } from "lodash";
 import { compare, applyPatch } from 'fast-json-patch';
 import {
@@ -748,7 +749,7 @@ export function hasCondition(component: Component) {
     (component.conditional && (
       (component.conditional as LegacyConditional).when ||
       (component.conditional as JSONConditional).json ||
-      (component.conditional as SimpleConditional).conjunction
+      ((component.conditional as SimpleConditional).conjunction && isBoolean((component.conditional as SimpleConditional).show) && !isEmpty((component.conditional as SimpleConditional).conditions))
     ))
   );
 }