@masterteam/form-builder 0.0.46 → 0.0.47

package/fesm2022/masterteam-form-builder.mjs

@@ -28,7 +28,7 @@ import { CrudStateBase, handleApiRequest, RadioCardsFieldConfig, ValidatorConfig
 import { DynamicForm } from '@masterteam/forms/dynamic-form';
 import { ToggleField } from '@masterteam/components/toggle-field';
 import { ModalRef } from '@masterteam/components/dialog';
-import { CONDITION_FUNCTION_CATEGORIES, CONDITION_OPERATORS, FormulaToolbar, FormulaEditor, serializeTokens, tokenizeFormulaTemplate } from '@masterteam/components/formula';
+import { CONDITION_FUNCTION_CATEGORIES, CONDITION_OPERATORS, FormulaToolbar, FormulaEditor, serializeTokens, tokenizeFormulaTemplate, serializeTokensForDisplay } from '@masterteam/components/formula';
 import { Tooltip } from '@masterteam/components/tooltip';
 import { ClientForm } from '@masterteam/forms/client-form';
 import { Table } from '@masterteam/components/table';
@@ -2161,7 +2161,12 @@ class FBValidationRuleForm {
             this.messageArControl.setValue(data.message?.ar ?? '');
             this.severityControl.setValue(data.severity ?? 'error');
             const builder = this.parseStoredFormulaTokens(data.formulaTokens);
-            const expression = data.formulaText?.trim() || serializeTokens(builder) || '';
+            // `formulaTokens` is the canonical formula payload; `formulaText` is only a
+            // human-readable preview (it may hold a friendly description, e.g.
+            // "Finish Date must be on or after Start Date", not a valid expression).
+            // Hydrate the editor from the tokens so the validator receives the real
+            // formula — fall back to `formulaText` only when no tokens are stored.
+            const expression = serializeTokens(builder) || data.formulaText?.trim() || '';
             this.formulaControl.setValue({
                 expression,
                 builder,
@@ -2233,13 +2238,17 @@ class FBValidationRuleForm {
         if (builder.length === 0 && expression) {
             builder = tokenizeFormulaTemplate(expression);
         }
-        const formulaText = expression || serializeTokens(builder);
-        if (!formulaText || builder.length === 0) {
+        // The back-end stores/compiles `formulaTokens` as the executable EXPRESSION
+        // string — a JSON token array is rejected with 400 VAL_001. `formulaText` is
+        // only a human-readable preview, so emit the friendly display-name
+        // serialization (falling back to the raw expression).
+        const formulaExpression = expression || serializeTokens(builder);
+        if (!formulaExpression || builder.length === 0) {
             return null;
         }
         return {
-            formulaTokens: JSON.stringify(builder),
-            formulaText,
+            formulaTokens: formulaExpression,
+            formulaText: serializeTokensForDisplay(builder) || formulaExpression,
         };
     }
     handleSaveError(error) {