wip: custom validation implementation

bpmn-io · Apr 17, 2024 · 7cd649e · 7cd649e
1 parent 43dc6a0
commit 7cd649e
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/packages/form-js-viewer/src/core/Validator.js b/packages/form-js-viewer/src/core/Validator.js
@@ -76,6 +76,15 @@ export class Validator {
 
     errors = runPresetValidation(field, evaluatedValidation, value, errors);
 
+    if ('custom' in evaluatedValidation && value && evaluatedValidation.custom.length) {
+      const { custom } = evaluatedValidation;
+      custom.forEach(({ condition, message }) => {
+        if (condition && !runExpressionEvaluation(this._expressionLanguage, value, expressionContextInfo)) {
+          errors = [...errors, message];
+        }
+      });
+    }
+
     return errors;
   }
 }
@@ -199,7 +208,7 @@ function oldEvaluateFEELValues(validate, expressionLanguage, conditionChecker, f
 
     // replace validate property with evaluated value
     if (evaluatedValue) {
-      set(evaluatedValidate, path, evaluatedValue);
+      set(validate, propertyPath.split('.'), evaluatedValue);
     }
   });