fix(mapping) fix mandatory field on synthese import

PnX-SI · Dec 9, 2024 · d5990f8 · d5990f8
1 parent 2ae5a3b
commit d5990f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/frontend/src/app/GN2CommonModule/form/form.service.ts b/frontend/src/app/GN2CommonModule/form/form.service.ts
@@ -203,6 +203,7 @@ export class FormService {
     currentControl: AbstractControl
   ): boolean {
     let result = false;
+    if (referenceControlNames.length === 0) return true;
     referenceControlNames.forEach((referenceControlName) => {
       const referenceControl = currentControl.parent.get(referenceControlName);
 

diff --git a/frontend/src/app/modules/imports/services/mappings/field-mapping.service.ts b/frontend/src/app/modules/imports/services/mappings/field-mapping.service.ts
@@ -267,7 +267,7 @@ export class FieldMappingService {
             .setValidators(
               this._formservice.RequiredIfControlIsNotNullValidator(
                 mandatory_conditions,
-                this.fieldsByEntity.get(entity.label)
+                this.targetFieldsData.length > 1 ? this.fieldsByEntity.get(entity.label) : []
               )
             );
         }
@@ -277,14 +277,16 @@ export class FieldMappingService {
             .setValidators(
               this._formservice.NotRequiredIfControlIsNotNullValidator(
                 optional_conditions,
-                this.fieldsByEntity.get(entity.label)
+                this.targetFieldsData.length > 1 ? this.fieldsByEntity.get(entity.label) : []
               )
             );
         } else if (mandatory) {
           this.mappingFormGroup
             .get(name_field)
             .setValidators(
-              this._formservice.NotRequiredIfNoOther(this.fieldsByEntity.get(entity.label))
+              this._formservice.NotRequiredIfNoOther(
+                this.targetFieldsData.length > 1 ? this.fieldsByEntity.get(entity.label) : []
+              )
             );
         }