FIO-8690: Add small fixes

formio · Oct 30, 2024 · b3387fc · b3387fc
1 parent 78114ae
commit b3387fc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/utils/conditions.ts b/src/utils/conditions.ts
@@ -4,6 +4,7 @@ import { flattenComponents, getComponent, getComponentActualValue } from './form
 import { has, isObject, map, every, some, find, filter, isBoolean, split } from 'lodash';
 import ConditionOperators from './operators';
 import _ from 'lodash';
+import { checkComponentType } from './utils';
 
 export const isJSONConditional = (conditional: any): conditional is JSONConditional => {
   return conditional && conditional.json && isObject(conditional.json);
@@ -118,7 +119,7 @@ function isConditionPotentiallyBasedOnValuePath(condition: any = {}) {
   );
 }
 
-function getConditionalPathsRecursive(conditionPaths: any, data: any): any {
+function getConditionalPathsRecursive(conditionPaths: string[], data: any): any {
   let currentGlobalIndex = 0;
   const conditionalPathsArray: string[] = [];
   const getConditionalPaths = (data: any, currentPath = '', localIndex = 0) => {
@@ -225,12 +226,12 @@ export function checkSimpleConditional(
       const isParentGrid = (component?.parent?.type || instance?.parent?.type) === 'datagrid' || (component?.parent?.type || instance?.parent?.type) === 'editgrid'
       const conditionalPaths = isParentGrid ? [] : getConditionalPathsRecursive(splittedConditionPath, data);
 
-      if (conditionComponent?.component?.type === "checkbox") {
+      if (checkComponentType(conditionComponent, "checkbox")) {
         if (typeof comparedValue === 'string') {
           comparedValue = comparedValue === 'true'
         }
       }
-      if (conditionComponent?.type === 'select') {
+      if (checkComponentType(conditionComponent, "select")) {
         conditionComponent = conditionComponent?.component || conditionComponent;
       }
       if (conditionalPaths.length > 0) {

diff --git a/src/utils/formUtil/index.ts b/src/utils/formUtil/index.ts
@@ -46,6 +46,7 @@ import { eachComponent } from './eachComponent';
 import { eachComponentData } from './eachComponentData';
 import { eachComponentAsync } from './eachComponentAsync';
 import { eachComponentDataAsync } from './eachComponentDataAsync';
+import { checkComponentType } from 'utils/utils';
 
 /**
  * Flatten the form components for data manipulation.
@@ -360,7 +361,7 @@ export function getComponentActualValue(
   let value = null;
   if (data) {
     value = get(data, compPath);
-    if(component?.type === 'address') {
+    if(checkComponentType(component, "address")) {
       const addressIgnoreProperties = ['mode', 'address'];
       const result = Object.values(omit(value, addressIgnoreProperties)).some(Boolean);
       if(!result) {

diff --git a/src/utils/utils.ts b/src/utils/utils.ts
@@ -126,3 +126,7 @@ export function resetEphemeralState(component: Component) {
     delete component.ephemeralState;
   }
 }
+
+export function checkComponentType(component: Component | undefined, type:string) {
+  return component?.type === type;
+}