fix(import,mapping): fix form validation

PnX-SI · Jan 22, 2025 · d655a53 · d655a53
1 parent bfcf4a7
commit d655a53
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/frontend/src/app/modules/imports/components/import_list/import-list.component.scss b/frontend/src/app/modules/imports/components/import_list/import-list.component.scss
@@ -113,7 +113,7 @@ $icon-size: 19px;
 
     &__button {
       $button-disabled-opacity: 0.2;
-      padding: $icon-size / 4;
+      padding: calc($icon-size / 4);
       height: 2 * $icon-size !important;
       width: 2 * $icon-size !important;
 

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
@@ -309,7 +309,7 @@ export class FieldMappingService {
             .setValidators(
               this._formservice.RequiredIfControlIsNotNullValidator(
                 mandatory_conditions,
-                this.targetFieldsData.length > 1 ? this.fieldsByEntity.get(entity.label) : []
+                this.fieldsByEntity.get(entity.label)
               )
             );
         }
@@ -319,16 +319,14 @@ export class FieldMappingService {
             .setValidators(
               this._formservice.NotRequiredIfControlIsNotNullValidator(
                 optional_conditions,
-                this.targetFieldsData.length > 1 ? this.fieldsByEntity.get(entity.label) : []
+                this.fieldsByEntity.get(entity.label)
               )
             );
         } else if (mandatory) {
           this.mappingFormGroup
             .get(name_field)
             .setValidators(
-              this._formservice.NotRequiredIfNoOther(
-                this.targetFieldsData.length > 1 ? this.fieldsByEntity.get(entity.label) : []
-              )
+              this._formservice.NotRequiredIfNoOther(this.fieldsByEntity.get(entity.label))
             );
         }