diff --git a/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #0.png b/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #0.png index 287ea08d4..65a335961 100644 Binary files a/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #0.png and b/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #0.png differ diff --git a/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #1.png b/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #1.png index ba563be75..c43e1f478 100644 Binary files a/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #1.png and b/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #1.png differ diff --git a/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #2.png b/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #2.png index dad4eb9af..782f84448 100644 Binary files a/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #2.png and b/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #2.png differ diff --git a/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #3.png b/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #3.png index bf7858e91..c43e1f478 100644 Binary files a/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #3.png and b/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #3.png differ diff --git a/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #4.png b/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #4.png index dad4eb9af..e5acf5a86 100644 Binary files a/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #4.png and b/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #4.png differ diff --git a/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #5.png b/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #5.png index bf7858e91..bc6638590 100644 Binary files a/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #5.png and b/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #5.png differ diff --git a/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #6.png b/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #6.png index dad4eb9af..e5acf5a86 100644 Binary files a/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #6.png and b/frontend/cypress/e2e/main_window/layerTree/__image_snapshots__/LayerTree Regulatory Layers A regulation Should be searched, added to My Zones and showed on the map with the Zone button #6.png differ diff --git a/frontend/cypress/e2e/main_window/layerTree/amp_layers.spec.ts b/frontend/cypress/e2e/main_window/layerTree/amp_layers.spec.ts index 18b5818a6..84a5310fe 100644 --- a/frontend/cypress/e2e/main_window/layerTree/amp_layers.spec.ts +++ b/frontend/cypress/e2e/main_window/layerTree/amp_layers.spec.ts @@ -12,7 +12,8 @@ context('Main Window > AMP Layers', () => { cy.fill("Type d'AMP", ['Natura 2000']) cy.getDataCy('amp-results-list-button').click() cy.getDataCy('amp-result-list').find('li').first().click() - cy.clickButton('Sélectionner la/les zone(s)') + cy.wait(1000) + cy.getDataCy('amp-zone-check').first().click() cy.getDataCy('my-amp-layers-zones').click({ force: true }) cy.getDataCy('my-amp-zones-list').should('have.length', 1) diff --git a/frontend/cypress/e2e/main_window/layerTree/vigilance_area_layers.spec.ts b/frontend/cypress/e2e/main_window/layerTree/vigilance_area_layers.spec.ts index 56cbc5199..6694e6f5d 100644 --- a/frontend/cypress/e2e/main_window/layerTree/vigilance_area_layers.spec.ts +++ b/frontend/cypress/e2e/main_window/layerTree/vigilance_area_layers.spec.ts @@ -15,7 +15,6 @@ context('LayerTree > Vigilance Area Layers', () => { }) it('A vigilance area Should be searched, added to My Zones and showed on the map with the Zone button', () => { cy.clickButton('Définir la zone de recherche et afficher les tracés') - // cy.getDataCy('vigilance-area-results-list-button').contains('5 résultats') cy.fill('Rechercher une zone', 'Lorem ipsum') // "Lorem ipsum" is in comments of vigilance area cy.getDataCy('vigilance-area-results-list-button').contains('1 résultat').click() diff --git a/frontend/src/features/layersSelector/search/ResultsList/AMPLayerGroup/AMPLayer.tsx b/frontend/src/features/layersSelector/search/ResultsList/AMPLayerGroup/AMPLayer.tsx index 2368d93fd..94270044c 100644 --- a/frontend/src/features/layersSelector/search/ResultsList/AMPLayerGroup/AMPLayer.tsx +++ b/frontend/src/features/layersSelector/search/ResultsList/AMPLayerGroup/AMPLayer.tsx @@ -89,26 +89,26 @@ export function AMPLayer({ layerId, searchedText }: { layerId: number; searchedT searchWords={searchedText && searchedText.length > 0 ? searchedText.split(' ') : []} textToHighlight={layer?.type ?? ''} /> - {layer?.type ?? 'AUCUN TYPE'} + {!layer?.type && 'AUCUN NOM'} {isLinkingAMPToVigilanceArea ? ( ) : ( )} diff --git a/frontend/src/features/layersSelector/search/ResultsList/ResultListLayerGroup.tsx b/frontend/src/features/layersSelector/search/ResultsList/ResultListLayerGroup.tsx index 2ac74a1aa..9a016bfac 100644 --- a/frontend/src/features/layersSelector/search/ResultsList/ResultListLayerGroup.tsx +++ b/frontend/src/features/layersSelector/search/ResultsList/ResultListLayerGroup.tsx @@ -100,7 +100,6 @@ export function ResultListLayerGroup({ {isLinkingZonesToVigilanceArea ? (