fix: unselect scope when select all

octree-gva · Nov 4, 2024 · 302fa05 · 302fa05
1 parent af869fd
commit 302fa05
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/app/packs/src/decidim/geo/stores/filterStore.js b/app/packs/src/decidim/geo/stores/filterStore.js
@@ -128,11 +128,13 @@ const onFilteredByScope = (filters) => {
     if (previousScope && `${scopeId}` === `${previousScope?.id}`) return;
     const selectedScope = scopeForId(scopeId);
     if (selectedScope) selectScope(selectedScope);
+    else selectScope(null)
   } else {
-    if (previousScope) {
-      previousScope.repaint();
-    }
+    const toRepaintScope = scopeForId(previousScope.id)
     selectScope(null);
+    if (toRepaintScope) {
+      toRepaintScope.repaint();
+    }
   }
 };
 
@@ -146,8 +148,8 @@ store.subscribe(
     // Select/Unselect scopes if a scopeFilter is present
     if (activeFilters) {
       await pointStore.getState().pointsForFilters(activeFilters);
-      onFilteredByScope(activeFilters);
     }
+    onFilteredByScope(activeFilters);
 
     // Update the filter modal state
     const { toFilterOptions } = store.getState();

diff --git a/lib/decidim/geo/proposal/proposal_filter.rb b/lib/decidim/geo/proposal/proposal_filter.rb
@@ -16,6 +16,7 @@ def filter_active(query)
           query.where(
             "(resource_type = ? AND resource_status NOT IN ('rejected', 'withdrawn')) OR (resource_type = ? AND (end_date >= ? OR end_date IS NULL))",
             manifest_name,
+            manifest_name,
             15.days.ago.to_date
           )
         end