fix(core/forms): notEmptyMessage reimplemented in retro-compatible way

gnucoop · Jul 7, 2023 · c3b9f94 · c3b9f94
1 parent e1a94a7
commit c3b9f94
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/projects/core/forms/src/interface/validation/validation-group.ts b/projects/core/forms/src/interface/validation/validation-group.ts
@@ -32,6 +32,7 @@ export interface AjfValidationGroup {
   maxValue?: AjfValidation;
   minValue?: AjfValidation;
   notEmpty?: AjfValidation;
+  notEmptyMessage?: string;
   maxDigits?: AjfValidation;
   minDigits?: AjfValidation;
   conditions: AjfValidation[];

diff --git a/projects/core/forms/src/utils/validation/evaluate-validation-not-empty.ts b/projects/core/forms/src/utils/validation/evaluate-validation-not-empty.ts
@@ -34,19 +34,16 @@ export function evaluateValidationNotEmpty(
   validation: AjfValidationGroup,
   value: any,
 ): AjfValidationResult | null {
-  let ne = validation.notEmpty as AjfValidation | boolean | string | undefined;
+  const ne = validation.notEmpty as AjfValidation | boolean | undefined;
   if (ne == null || ne === false) {
     return null;
   }
   if (ne === true) {
-    ne = 'Value must not be empty';
-  }
-  if (typeof ne === 'string') {
     return {
       result: notEmpty(value),
-      error: ne,
+      error: validation.notEmptyMessage || 'Value must not be empty',
       clientValidation: false,
     };
   }
-  return evaluateValidation(ne as AjfValidation, {'$value': value});
+  return evaluateValidation(ne, {'$value': value});
 }
diff --git a/projects/ionic/forms/src/forms.spec.ts b/projects/ionic/forms/src/forms.spec.ts
@@ -71,7 +71,7 @@ describe('AjfFormRenderer', () => {
               label: 'foo',
               nodeType: AjfNodeType.AjfField,
               fieldType: AjfFieldType.String,
-              validation: {notEmpty: "The field's value must not be empty."},
+              validation: {notEmpty: true, notEmptyMessage: "The field's value must not be empty."},
             } as any,
           ],
         },