fix: test e2e

MTES-MCT · Dec 16, 2024 · 158ef6d · 158ef6d
1 parent 6a292cc
commit 158ef6d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/frontend/cypress/e2e/main_window/control_unit_dialog/contact_list.spec.ts b/frontend/cypress/e2e/main_window/control_unit_dialog/contact_list.spec.ts
@@ -152,7 +152,7 @@ context('Main Window > Control Unit Dialog > Contact List', () => {
 
     cy.contains('Unité DREAL Pays-de-La-Loire').should('be.visible')
 
-    cy.getDataCy('reinitialize-filters').scrollIntoView().click()
+    cy.clickButton('Réinitialiser les filtres')
   })
 
   it('Should open the current mission of the unit', () => {

diff --git a/frontend/cypress/e2e/side_window/mission_list/filters.spec.ts b/frontend/cypress/e2e/side_window/mission_list/filters.spec.ts
@@ -9,7 +9,7 @@ context('Side Window > Mission List > Filter Bar', () => {
   })
 
   afterEach(() => {
-    cy.getDataCy('reinitialize-filters').scrollIntoView().click()
+    cy.clickButton('Réinitialiser les filtres')
   })
 
   it('Should filter missions for the current week', () => {

diff --git a/frontend/cypress/e2e/side_window/mission_list/missions.spec.ts b/frontend/cypress/e2e/side_window/mission_list/missions.spec.ts
@@ -33,7 +33,7 @@ context('Missions', () => {
     cy.getDataCy('edit-mission-48').should('not.exist')
 
     cy.log('Initialize filters')
-    cy.getDataCy('reinitialize-filters').click()
+    cy.clickButton('Réinitialiser les filtres')
     cy.getDataCy('edit-mission-48').scrollIntoView().should('exist')
 
     cy.log('Units should be filtered')

diff --git a/frontend/cypress/e2e/side_window/reporting/filters.spec.ts b/frontend/cypress/e2e/side_window/reporting/filters.spec.ts
@@ -10,7 +10,7 @@ context('Reportings', () => {
     cy.wait('@getReportings')
   })
   afterEach(() => {
-    cy.getDataCy('reinitialize-filters').click({ force: true })
+    cy.clickButton('Réinitialiser les filtres')
   })
 
   it('Should filter reportings for the last seven days', () => {

diff --git a/frontend/cypress/e2e/side_window/vigilance_areas_list/filters.spec.ts b/frontend/cypress/e2e/side_window/vigilance_areas_list/filters.spec.ts
@@ -6,7 +6,7 @@ context('Side Window > Vigilance Areas List > Filter Bar', () => {
   })
 
   afterEach(() => {
-    cy.getDataCy('reinitialize-filters').scrollIntoView().click()
+    cy.clickButton('Réinitialiser les filtres')
   })
 
   const verifyVigilanceAreaRows = (expectedText: string) => {

diff --git a/frontend/src/features/commonComponents/ReinitializeFiltersButton.tsx b/frontend/src/features/commonComponents/ReinitializeFiltersButton.tsx
@@ -7,7 +7,7 @@ interface ReinitializeFiltersButtonProps {
 
 export function ReinitializeFiltersButton({ onClick }: ReinitializeFiltersButtonProps) {
   return (
-    <ResetFiltersButton data-cy="reinitialize-filters" onClick={onClick}>
+    <ResetFiltersButton onClick={onClick}>
       <Icon.Reset size={14} />
       <span>Réinitialiser les filtres</span>
     </ResetFiltersButton>

diff --git a/frontend/src/features/missions/components/Filters/index.tsx b/frontend/src/features/missions/components/Filters/index.tsx
@@ -75,8 +75,9 @@ export function MissionFilters({ context }: { context: MissionFilterContext }) {
 
   const controlUnitsAsOptions = useMemo(() => {
     const activeControlUnits = (legacyControlUnits ?? []).filter(isNotArchived)
-    const selectableControlUnits = activeControlUnits?.filter(activeControlUnit =>
-      selectedAdministrationNames?.includes(activeControlUnit.administration)
+    const selectableControlUnits = activeControlUnits?.filter(
+      activeControlUnit =>
+        !selectedAdministrationNames?.length || selectedAdministrationNames?.includes(activeControlUnit.administration)
     )
 
     return getOptionsFromIdAndName(selectableControlUnits) ?? []