fix(core/models): remove forceFormula from evaluateExpression

gnucoop · Mar 22, 2023 · d0952ec · d0952ec
1 parent 4dd3ef4
commit d0952ec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/projects/core/forms/src/utils/validation/evaluate-validation.ts b/projects/core/forms/src/utils/validation/evaluate-validation.ts
@@ -31,10 +31,9 @@ import {AjfValidationResult} from '../../interface/validation/validation-results
 export function evaluateValidation(
   validation: AjfValidation,
   context?: AjfContext,
-  forceFormula?: string,
 ): AjfValidationResult {
   return {
-    result: evaluateExpression(validation.condition, context, forceFormula),
+    result: evaluateExpression(validation.condition, context),
     error: validation.errorMessage,
     clientValidation: validation.clientValidation,
   };

diff --git a/projects/core/forms/src/utils/warning/evaluate-warning.ts b/projects/core/forms/src/utils/warning/evaluate-warning.ts
@@ -28,10 +28,9 @@ import {AjfWarningResult} from '../../interface/warning/warning-result';
 export function evaluateWarning(
   warning: AjfWarning,
   context?: AjfContext,
-  forceFormula?: string,
 ): AjfWarningResult {
   return {
-    result: evaluateExpression(warning.condition, context, forceFormula),
+    result: evaluateExpression(warning.condition, context),
     warning: warning.warningMessage,
   };
 }
diff --git a/projects/core/models/src/utils/expression-utils.ts b/projects/core/models/src/utils/expression-utils.ts
@@ -201,12 +201,8 @@ function cloneMainForms(forms: MainForm[]): MainForm[] {
   return res;
 }
 
-export function evaluateExpression(
-  expression: string,
-  context?: AjfContext,
-  forceFormula?: string,
-): any {
-  return createFunction(forceFormula || expression)(context);
+export function evaluateExpression(expression: string, context?: AjfContext): any {
+  return createFunction(expression)(context);
 }
 
 type Func = (c?: AjfContext) => any;