fix(dynamic-form-builder): Add ValidatorOptions for nested objects va…

…lidations
EndyKaufman · Mar 9, 2018 · 95b4dfd · 95b4dfd
1 parent 739518d
commit 95b4dfd
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 18 deletions.
diff --git a/apps/demo/src/app/shared/models/exp-company.ts b/apps/demo/src/app/shared/models/exp-company.ts
@@ -5,9 +5,12 @@ export class ExpCompany {
 
     id: number;
     @Validate(TextLengthMore15, {
+        groups: ['user'],
         message: 'The company name must be longer than 15'
     })
-    @IsNotEmpty()
+    @IsNotEmpty({
+        groups: ['user']
+    })
     name: string;
 
     constructor(data?: any) {

diff --git a/apps/demo/src/app/shared/models/exp-department.ts b/apps/demo/src/app/shared/models/exp-department.ts
@@ -3,10 +3,16 @@ import { ExpCompany } from './exp-company';
 
 export class ExpDepartment {
     id: number;
-    @IsNotEmpty()
+    @IsNotEmpty({
+        groups: ['user']
+    })
     name: string;
-    @ValidateNested()
-    @IsOptional()
+    @ValidateNested({
+        groups: ['user']
+    })
+    @IsOptional({
+        groups: ['user']
+    })
     company: ExpCompany;
 
     constructor(data?: any) {

diff --git a/libs/ngx-dynamic-form-builder/src/shared/utils/dynamic-form-builder.ts b/libs/ngx-dynamic-form-builder/src/shared/utils/dynamic-form-builder.ts
@@ -51,20 +51,18 @@ export class DynamicFormBuilder extends FormBuilder {
             DynamicFormGroup.getClassValidators<TModel>(
                 factoryModel,
                 newControlsConfig,
-                '',
-                (extra &&
-                    extra.customValidatorOptions &&
-                    extra.customValidatorOptions.groups) ?
-                    extra.customValidatorOptions.groups :
-                    undefined
+                (extra && extra.customValidatorOptions) ? extra.customValidatorOptions : undefined
             )
             , extra
         );
         Object.keys(formGroup.controls).forEach(key => {
             dynamicFormGroup.addControl(key, formGroup.controls[key]);
         });
         dynamicFormGroup.valueChanges.subscribe(data => {
-            dynamicFormGroup.validate();
+            dynamicFormGroup.validate(
+                undefined,
+                (extra && extra.customValidatorOptions) ? extra.customValidatorOptions : undefined
+            );
         });
         return dynamicFormGroup;
     }

diff --git a/libs/ngx-dynamic-form-builder/src/shared/utils/dynamic-form-group.ts b/libs/ngx-dynamic-form-builder/src/shared/utils/dynamic-form-group.ts
@@ -11,6 +11,7 @@ import 'reflect-metadata';
 import { ClassType } from 'class-transformer/ClassTransformer';
 
 export class DynamicFormGroup<TModel> extends FormGroup {
+    public otherErrors: ValidationError[] = [];
     public customValidateErrors = new BehaviorSubject<any>({});
     private _object: TModel;
     constructor(
@@ -27,14 +28,13 @@ export class DynamicFormGroup<TModel> extends FormGroup {
         fields: {
             [key: string]: any
         },
-        targetSchema?: string,
-        groups?: string[]
+        validatorOptions?: ValidatorOptions
     ) {
         const validationMetadatas: ValidationMetadata[] =
             getFromContainer(MetadataStorage).getTargetValidationMetadatas(
                 factoryModel,
-                targetSchema ? targetSchema : '',
-                groups ? groups : undefined
+                '',
+                validatorOptions && validatorOptions.groups ? validatorOptions.groups : undefined
             );
         const formGroupFields = {};
         const validator = new Validator();
@@ -78,7 +78,7 @@ export class DynamicFormGroup<TModel> extends FormGroup {
                                             const isValid = (c.parent && c.parent.value) ?
                                                 validateSync(
                                                     c.value,
-                                                    { validationError: { target: false } }
+                                                    validatorOptions
                                                 ).length === 0 : true;
                                             return isValid ? null : {
                                                 nestedValidate: {
@@ -106,7 +106,7 @@ export class DynamicFormGroup<TModel> extends FormGroup {
                                             const validateErrors = (c.parent && c.parent.value) ?
                                                 validateSync(
                                                     object,
-                                                    { validationError: { target: false } }
+                                                    validatorOptions
                                                 ) : [];
                                             const isValid = validateErrors.filter((error: ValidationError) => {
                                                 if (error.children.length &&
@@ -236,7 +236,7 @@ export class DynamicFormGroup<TModel> extends FormGroup {
     }
     validate(otherErrors?: ValidationError[], validatorOptions?: ValidatorOptions) {
         if (otherErrors === undefined) {
-            otherErrors = [];
+            otherErrors = this.otherErrors;
         }
         const errors = validateSync(this.object, validatorOptions);
         this.customValidateErrors.next(