From 174b11b02c2c79de8d189b52afc6fe91624ec32b Mon Sep 17 00:00:00 2001 From: mohamedsalem401 Date: Wed, 5 Mar 2025 09:36:30 +0200 Subject: [PATCH] rename Operation to DataConditionOperation --- .../model/conditional_variables/ConditionStatement.ts | 6 +++--- .../model/conditional_variables/DataConditionEvaluator.ts | 4 ++-- .../model/conditional_variables/operators/BaseOperator.ts | 4 ++-- .../model/conditional_variables/operators/types.ts | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/core/src/data_sources/model/conditional_variables/ConditionStatement.ts b/packages/core/src/data_sources/model/conditional_variables/ConditionStatement.ts index 93c107532..a70c84de7 100644 --- a/packages/core/src/data_sources/model/conditional_variables/ConditionStatement.ts +++ b/packages/core/src/data_sources/model/conditional_variables/ConditionStatement.ts @@ -1,12 +1,12 @@ import { Operator } from './operators/BaseOperator'; -import { Operation } from './operators/types'; +import { DataConditionOperation } from './operators/types'; export class ConditionStatement { constructor( private leftValue: any, - private operator: Operator, + private operator: Operator, private rightValue: any, - ) {} + ) { } evaluate(): boolean { return this.operator.evaluate(this.leftValue, this.rightValue); diff --git a/packages/core/src/data_sources/model/conditional_variables/DataConditionEvaluator.ts b/packages/core/src/data_sources/model/conditional_variables/DataConditionEvaluator.ts index 8a9da6c4b..b8f5aba9b 100644 --- a/packages/core/src/data_sources/model/conditional_variables/DataConditionEvaluator.ts +++ b/packages/core/src/data_sources/model/conditional_variables/DataConditionEvaluator.ts @@ -9,7 +9,7 @@ import { BooleanOperator } from './operators/BooleanOperator'; import { NumberOperator, NumberOperation } from './operators/NumberOperator'; import { StringOperator, StringOperation } from './operators/StringOperator'; import { Model } from '../../../common'; -import { Operation } from './operators/types'; +import { DataConditionOperation } from './operators/types'; export type ConditionProps = ExpressionProps | LogicGroupProps | boolean; @@ -54,7 +54,7 @@ export class DataConditionEvaluator extends Model { /** * Factory method for creating operators based on the data type. */ - private getOperator(left: any, operator: string): Operator { + private getOperator(left: any, operator: string): Operator { const em = this.em; if (this.isOperatorInEnum(operator, AnyTypeOperation)) { diff --git a/packages/core/src/data_sources/model/conditional_variables/operators/BaseOperator.ts b/packages/core/src/data_sources/model/conditional_variables/operators/BaseOperator.ts index 55f556cab..4cde7626d 100644 --- a/packages/core/src/data_sources/model/conditional_variables/operators/BaseOperator.ts +++ b/packages/core/src/data_sources/model/conditional_variables/operators/BaseOperator.ts @@ -1,7 +1,7 @@ import EditorModel from '../../../../editor/model/Editor'; -import { Operation } from './types'; +import { DataConditionOperation } from './types'; -export abstract class Operator { +export abstract class Operator { protected em: EditorModel; protected operation: OperationType; diff --git a/packages/core/src/data_sources/model/conditional_variables/operators/types.ts b/packages/core/src/data_sources/model/conditional_variables/operators/types.ts index b0d87e2ae..483ca91bc 100644 --- a/packages/core/src/data_sources/model/conditional_variables/operators/types.ts +++ b/packages/core/src/data_sources/model/conditional_variables/operators/types.ts @@ -3,4 +3,4 @@ import { BooleanOperation } from './BooleanOperator'; import { NumberOperation } from './NumberOperator'; import { StringOperation } from './StringOperator'; -export type Operation = AnyTypeOperation | StringOperation | NumberOperation | BooleanOperation; +export type DataConditionOperation = AnyTypeOperation | StringOperation | NumberOperation | BooleanOperation;