fix: Eviter les filtres choisis pour sites fermés sur sites ouverts

refers to https://trello.com/c/QHJxfzxF/2052
MTES-MCT · Dec 6, 2023 · ed4acfc · ed4acfc
1 parent dfe26f0
commit ed4acfc
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 23 deletions.
diff --git a/packages/frontend/webapp/src/stores/towns.store.js b/packages/frontend/webapp/src/stores/towns.store.js
@@ -117,21 +117,22 @@ export const useTownsStore = defineStore("towns", () => {
         const userStore = useUserStore();
         const { search: searchFilter, data: locationFilter } =
             getDefaultLocationFilter(userStore.user);
-
+        // Filtres communs sites ouverts/sites fermés
         filters.search.value = searchFilter;
         filters.location.value = locationFilter;
         filters.status.value = "open";
-
         filters.properties.value.population = [];
         filters.properties.value.fieldType = [];
         filters.properties.value.justice = [];
         filters.properties.value.origin = [];
+        filters.properties.value.target = [];
+        // Filtres spécifiques aux sites ouverts
         filters.properties.value.conditions = [];
-        filters.properties.value.closingReason = [];
-        filters.properties.value.solvedOrClosed = [];
         filters.properties.value.actors = [];
-        filters.properties.value.target = [];
         filters.properties.value.heatwave = [];
+        // Filtres spécifiques aux sites fermés
+        filters.properties.value.closingReason = [];
+        filters.properties.value.solvedOrClosed = [];
     }
 
     function reset() {

diff --git a/packages/frontend/webapp/src/utils/filterShantytowns.js b/packages/frontend/webapp/src/utils/filterShantytowns.js
@@ -24,15 +24,15 @@ export default function (shantytowns, filters) {
         }
 
         if (
-            filters.fieldType.length > 0 &&
-            !checkFieldType(shantytown, filters.fieldType)
+            filters.population.length > 0 &&
+            !checkPopulation(shantytown, filters.population)
         ) {
             return false;
         }
 
         if (
-            filters.population.length > 0 &&
-            !checkPopulation(shantytown, filters.population)
+            filters.fieldType.length > 0 &&
+            !checkFieldType(shantytown, filters.fieldType)
         ) {
             return false;
         }
@@ -52,47 +52,53 @@ export default function (shantytowns, filters) {
         }
 
         if (
-            filters.conditions.length > 0 &&
-            !checkConditions(shantytown, filters.conditions)
+            filters.target.length > 0 &&
+            !checkTarget(shantytown, filters.target)
         ) {
             return false;
         }
 
+        // Filtres spécifiques aux sites ouverts
         if (
-            filters.closingReason.length > 0 &&
-            !checkClosingReason(shantytown, filters.closingReason)
+            filters.status === "open" &&
+            filters.conditions.length > 0 &&
+            !checkConditions(shantytown, filters.conditions)
         ) {
             return false;
         }
 
         if (
-            filters.solvedOrClosed.length > 0 &&
-            !checkSolvedOrClosed(shantytown, filters.solvedOrClosed)
+            filters.status === "open" &&
+            filters.actors.length > 0 &&
+            !checkActors(shantytown, filters.actors)
         ) {
             return false;
         }
 
         if (
-            filters.actors.length > 0 &&
-            !checkActors(shantytown, filters.actors)
+            filters.status === "open" &&
+            filters.heatwave.length > 0 &&
+            !checkHeatwave(shantytown, filters.heatwave)
         ) {
             return false;
         }
 
+        // Filtres spécifiques aux sites fermés
         if (
-            filters.target.length > 0 &&
-            !checkTarget(shantytown, filters.target)
+            filters.status === "close" &&
+            filters.closingReason.length > 0 &&
+            !checkClosingReason(shantytown, filters.closingReason)
         ) {
             return false;
         }
 
         if (
-            filters.heatwave.length > 0 &&
-            !checkHeatwave(shantytown, filters.heatwave)
+            filters.status === "close" &&
+            filters.solvedOrClosed.length > 0 &&
+            !checkSolvedOrClosed(shantytown, filters.solvedOrClosed)
         ) {
             return false;
         }
-
         return true;
     });
 }
@@ -208,7 +214,7 @@ function checkPopulation(shantytown, filters) {
  *
  */
 function checkJustice(shantytown, filters) {
-    return filters.some((value) => {
+    return filters.every((value) => {
         if (value === "ownerComplaint") {
             return shantytown.ownerComplaint === true;
         }