Fix(mapping) fix mapping

PnX-SI · Sep 19, 2024 · d64cff9 · d64cff9
1 parent 50d271d
commit d64cff9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/frontend/cypress/e2e/import/step3-field-mapping-spec.js b/frontend/cypress/e2e/import/step3-field-mapping-spec.js
@@ -80,7 +80,7 @@ function fillTheFormRaw() {
 
 function fillTheForm() {
   // Fill in the form with mandatory field
-  cy.get(SELECTOR_IMPORT_FIELDMAPPING_VALIDATE).should('exist').should('not.be.enabled');
+  cy.get(SELECTOR_IMPORT_FIELDMAPPING_VALIDATE).should('exist');
 
   selectField(SELECTOR_IMPORT_FIELDMAPPING_DATE_MIN, 'date_debut');
   cy.get(SELECTOR_IMPORT_FIELDMAPPING_VALIDATE).should('exist').should('not.be.enabled');

diff --git a/frontend/cypress/e2e/import/step4-content-mapping-spec.js b/frontend/cypress/e2e/import/step4-content-mapping-spec.js
@@ -129,6 +129,7 @@ function runTheProcessForOcchab(user) {
   cy.configureImportFile();
   // cy.configureImportFieldMapping();
   selectFieldMappingField('import-fieldmapping-theme-date_min', 'error');
+  selectFieldMappingField('import-fieldmapping-theme-WKT', 'error');
   cy.get('#mat-tab-label-0-1').click();
   selectFieldMappingField('import-fieldmapping-theme-nom_cite', 'error');
   selectFieldMappingField('import-fieldmapping-theme-cd_hab', 'error');

diff --git a/frontend/src/app/GN2CommonModule/form/form.service.ts b/frontend/src/app/GN2CommonModule/form/form.service.ts
@@ -249,7 +249,7 @@ export class FormService {
       if (!this.areAnyRefControlsNotNull(entityControls, currentControl)) {
         return null;
       }
-      return this.areAllRefControlsNotNull(referenceControlNames, currentControl)
+      return this.areAnyRefControlsNotNull(referenceControlNames, currentControl)
         ? null
         : Validators.required(currentControl);
     };

diff --git a/frontend/src/app/modules/imports/components/import_report/import_report.component.html b/frontend/src/app/modules/imports/components/import_report/import_report.component.html
@@ -264,7 +264,7 @@ <h6>
             <mat-expansion-panel>
               <mat-expansion-panel-header [collapsedHeight]="expansionPanelHeight">
                 <mat-panel-title>
-                  <h6>{{ importErrors.length }} erreur(s)</h6>
+                  <h6 data-qa="import-report-errors-title">{{ importErrors.length }} erreur(s)</h6>
                 </mat-panel-title>
               </mat-expansion-panel-header>
               <table class="table table-responsive table-striped table-bordered">

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
@@ -184,7 +184,8 @@ export class FieldMappingService {
         this.fieldsByEntity.set(entity.label, entityFields);
       });
     });
-    this.fieldsByEntity = this.removeCommonStrings(this.fieldsByEntity);
+    if (this.fieldsByEntity.size > 1)
+      this.fieldsByEntity = this.removeCommonStrings(this.fieldsByEntity);
     return flattened;
   }