Update ComponentDataCondition

packages/core/src/data_sources/model/conditional_variables/ComponentDataCondition.ts

@@ -7,8 +7,8 @@ export default class ComponentDataCondition extends Component {
   dataResolver: DataCondition;
 
   constructor(props: DataConditionProps, opt: ComponentOptions) {
-    const { condition, ifTrue, ifFalse } = props;
-    const dataConditionInstance = new DataCondition(condition, ifTrue, ifFalse, { em: opt.em });
+    const dataConditionInstance = new DataCondition(props, { em: opt.em });
+
     super(
       {
         ...props,
@@ -22,7 +22,6 @@ export default class ComponentDataCondition extends Component {
   }
 
   private handleConditionChange() {
-    this.dataResolver.reevaluate();
     this.components(this.dataResolver.getDataValue());
   }
 

packages/core/test/specs/data_sources/model/conditional_variables/ComponentConditionalVariable.ts

@@ -1,7 +1,7 @@
 import { Component, DataSourceManager, Editor } from '../../../../../src';
 import { DataVariableType } from '../../../../../src/data_sources/model/DataVariable';
 import { DataConditionType } from '../../../../../src/data_sources/model/conditional_variables/DataCondition';
-import { GenericOperation } from '../../../../../src/data_sources/model/conditional_variables/operators/GenericOperator';
+import { AnyTypeOperation } from '../../../../../src/data_sources/model/conditional_variables/operators/AnyTypeOperator';
 import { NumberOperation } from '../../../../../src/data_sources/model/conditional_variables/operators/NumberOperator';
 import ComponentDataConditionView from '../../../../../src/data_sources/view/ComponentDataConditionView';
 import ComponentWrapper from '../../../../../src/dom_components/model/ComponentWrapper';
@@ -97,7 +97,7 @@ describe('ComponentConditionalVariable', () => {
           type: DataVariableType,
           path: 'ds1.left_id.left',
         },
-        operator: GenericOperation.equals,
+        operator: AnyTypeOperation.equals,
         right: {
           type: DataVariableType,
           path: 'ds1.right_id.right',
@@ -146,7 +146,7 @@ describe('ComponentConditionalVariable', () => {
           type: DataVariableType,
           path: 'ds1.left_id.left',
         },
-        operator: GenericOperation.equals,
+        operator: AnyTypeOperation.equals,
         right: {
           type: DataVariableType,
           path: 'ds1.right_id.right',
@@ -162,7 +162,7 @@ describe('ComponentConditionalVariable', () => {
                 type: DataVariableType,
                 path: 'ds1.left_id.left',
               },
-              operator: GenericOperation.equals,
+              operator: AnyTypeOperation.equals,
               right: {
                 type: DataVariableType,
                 path: 'ds1.right_id.right',