Merge branch 'fix/process_groups_hide_scope' into 'main'

refact: add is_group param to make things simpler See merge request decidim/decidim-module-geo!171
octree-gva · Dec 11, 2024 · 67d8150 · 67d8150
2 parents fc5e999 + d4f361e
commit 67d8150
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 18 deletions.
diff --git a/app/cells/decidim/geo/content_blocks/geo_maps_cell.rb b/app/cells/decidim/geo/content_blocks/geo_maps_cell.rb
@@ -27,7 +27,7 @@ def data_count
           @data_count ||= ::Decidim::Geo::Api::GeoQuery.new(
             current_organization,
             current_user,
-            { filters: filters, is_index: index? },
+            { filters: filters, is_index: index?, is_group: group? },
             current_locale
           ).results_count
         end
@@ -50,7 +50,8 @@ def insert_map
             filters: (@options[:filters] || []).concat([{ timeFilter: { time: "active" } }]),
             map_config: map_config,
             active_manifests: ::Decidim::Geo.registry.active_manifests(&:keys),
-            is_index: index?
+            is_index: index?,
+            is_group: @options[:is_group] || false,
           }.with_indifferent_access
 
           content_tag(
@@ -71,6 +72,10 @@ def index?
           @options.has_key?(:is_index) ? @options[:is_index] : true
         end
 
+        def group?
+          @options.has_key?(:is_group) ? @options[:is_group] : false
+        end
+
         def insert_scopes_mobile
           content_tag(:div, "", class: ["js-decidimgeo"])
         end

diff --git a/app/controllers/decidim/geo/points_controller.rb b/app/controllers/decidim/geo/points_controller.rb
@@ -44,7 +44,7 @@ def index
       private
 
       def permitted_params
-        @permitted_params ||= params.permit(:first, :after, :locale, :is_index, :format, fields: [], filters: [])
+        @permitted_params ||= params.permit(:first, :after, :locale, :is_index, :is_group, :format, fields: [], filters: [])
       end
 
       def first_params
@@ -61,14 +61,19 @@ def query
           current_user,
           {
             filters: filters_params,
-            is_index: index_params?
+            is_index: index?,
+            is_group: group?
           },
           locale_param
         ).results
       end
 
-      def index_params?
-        @index_params ||= permitted_params[:is_index] || false
+      def index?
+        @index ||= permitted_params[:is_index] || false
+      end
+
+      def group?
+        @group ||= permitted_params[:is_group] || false
       end
 
       def locale_param

diff --git a/...idim/participatory_processes/participatory_process_groups/show/insert_map.html.erb.deface b/...idim/participatory_processes/participatory_process_groups/show/insert_map.html.erb.deface
@@ -3,5 +3,6 @@
     id: "ProcessGroup",
     filters:  @group.participatory_processes.map {|process|  { processFilter: { id: process.id } } },
     scopes: @group.participatory_processes.scope.map{|s| s.id},
-    is_index: true
+    is_index: true,
+    is_group: true
 ) %>
diff --git a/app/overrides/layouts/decidim/_assembly_header/insert_map.html.erb.deface b/app/overrides/layouts/decidim/_assembly_header/insert_map.html.erb.deface
@@ -12,6 +12,7 @@ iter_children(current_participatory_space, assemblies) unless current_participat
     id: "Assembly",
     hide_empty: true,
     is_index: false,
+    is_group: false,
     filters: if current_participatory_space.scope.present?
         [
           { scopeFilter: { scopeId: current_participatory_space.scope.id } }

diff --git a/app/overrides/layouts/decidim/_process_header/insert_map.html.erb.deface b/app/overrides/layouts/decidim/_process_header/insert_map.html.erb.deface
@@ -4,6 +4,7 @@
       id: "Process",
       hide_empty: true,
       is_index: false,
+      is_group: false,
       filters: if current_participatory_space.scope.present?
         # If the process has a scope, filter by its scope
         [

diff --git a/app/overrides/layouts/decidim/_wrapper/insert_map.html.erb.deface b/app/overrides/layouts/decidim/_wrapper/insert_map.html.erb.deface
@@ -3,5 +3,6 @@
     "decidim/geo/geo_collection_map", 
     id: "Indexes",
     hide_empty: true,
-    is_index: false
+    is_index: true,
+    is_group: false
 ) %>
diff --git a/app/packs/src/decidim/geo/api/countGeoDataSource.js b/app/packs/src/decidim/geo/api/countGeoDataSource.js
@@ -1,7 +1,7 @@
 import { _getGeoDataSource, _getGeoDataSourceIds } from "./queries";
 
 const countGeoDataSource = async (params = {}, callback = undefined) => {
-  const { filters = [], locale, isIndex = false, after = 0, first = 50 } = params;
+  const { filters = [], locale, isIndex = false, isGroup=false, after = 0, first = 50 } = params;
   const fields = [];
 
   const searchParams = new URLSearchParams({
@@ -12,6 +12,9 @@ const countGeoDataSource = async (params = {}, callback = undefined) => {
   if(isIndex){
     searchParams.append("is_index", "true")
   }
+  if(isGroup){
+    searchParams.append("is_group", "true")
+  }
   filters.forEach((f) => {
     searchParams.append("filters[]", JSON.stringify(f));
   });

diff --git a/app/packs/src/decidim/geo/api/getGeoDataSource.js b/app/packs/src/decidim/geo/api/getGeoDataSource.js
@@ -1,7 +1,7 @@
 import { _getGeoDataSource, _getGeoDataSourceIds } from "./queries";
 
 const getGeoDataSource = async (params = {}, fetchAll = true, callback) => {
-  const { filters = [], locale, isIndex = false, after = 0, first = 50 } = params;
+  const { filters = [], locale, isIndex = false, isGroup=false, after = 0, first = 50 } = params;
   const fields = fetchAll
     ? [
         "resourceUrl",
@@ -33,6 +33,9 @@ const getGeoDataSource = async (params = {}, fetchAll = true, callback) => {
   if(isIndex){
     searchParams.append("is_index", "true")
   }
+  if(isGroup){
+    searchParams.append("is_group", "true")
+  }
   filters.forEach((f) => {
     searchParams.append("filters[]", JSON.stringify(f));
   });

diff --git a/app/packs/src/decidim/geo/stores/configStore.js b/app/packs/src/decidim/geo/stores/configStore.js
@@ -58,6 +58,7 @@ const store = createStore(
         i18n: mapConfig.i18n,
         images: mapConfig.images || {},
         isIndex: mapConfig.is_index === "true" || mapConfig.is_index === true,
+        isGroup: mapConfig.is_group === "true" || mapConfig.is_group === true,
         activeManifests: mapConfig.active_manifests
       }));
 

diff --git a/app/packs/src/decidim/geo/stores/pointCounterStore.js b/app/packs/src/decidim/geo/stores/pointCounterStore.js
@@ -20,9 +20,9 @@ const store = createStore(
     isLoading: false,
 
     async fetchCount(filters) {
-      const { locale, isIndex } = configStore.getState();
+      const { locale, isIndex, isGroup } = configStore.getState();
       set(() => ({ isLoading: true }));
-      const count = await countGeoDataSource({ filters, locale: locale, isIndex });
+      const count = await countGeoDataSource({ filters, locale: locale, isIndex, isGroup});
       set(() => ({ isLoading: false }));
       return count;
     },

diff --git a/app/packs/src/decidim/geo/stores/pointStore.js b/app/packs/src/decidim/geo/stores/pointStore.js
@@ -96,15 +96,15 @@ const store = createStore(
       const { points: fetchedPoints } = store.getState();
       if (fetchedPoints.length > 0) return;
 
-      const { locale, isIndex } = configStore.getState();
+      const { locale, isIndex, isGroup} = configStore.getState();
 
       const promises = [];
       const filterWithoutTime = filters.filter(
         (f) => typeof f.timeFilter === "undefined"
       );
       set(({ fetchesRunning }) => ({ fetchesRunning: fetchesRunning + 1 }));
       await getGeoDataSource(
-        { filters: filterWithoutTime, locale, isIndex },
+        { filters: filterWithoutTime, locale, isIndex, isGroup },
         true,
         (data, hasMore, meta) => {
           const points = data.map(mapNodeToPoint).filter(Boolean);
@@ -140,7 +140,7 @@ const store = createStore(
     },
 
     pointsForFilters: async (filters = [], forceRefresh = false) => {
-      const { locale, isIndex } = configStore.getState();
+      const { locale, isIndex, isGroup } = configStore.getState();
       const { _lastFilter: lastFilter, _lastResponse: lastResponse } = store.getState();
       const cacheKey = JSON.stringify(filters);
       // cache
@@ -153,7 +153,7 @@ const store = createStore(
       }));
       filteredIdsStore.setState(() => ({ activeFilterIds: [] }));
 
-      await getGeoDataSource({ filters, locale: locale, isIndex }, false, (data, hasMore) => {
+      await getGeoDataSource({ filters, locale: locale, isIndex, isGroup }, false, (data, hasMore) => {
         filteredIdsStore.setState(({ activeFilterIds }) => ({
           activeFilterIds: activeFilterIds.concat(data || [])
         }));

diff --git a/lib/decidim/geo/filters/geo_query.rb b/lib/decidim/geo/filters/geo_query.rb
@@ -85,7 +85,6 @@ def results
 
         def indexed_query(query)
           return query.indexed unless process_groups?
-
           query.indexed.or(query.where(
                              participatory_space_id: process_params,
                              avoid_index: true
@@ -119,7 +118,7 @@ def only_indexed?
         end
 
         def process_groups?
-          process_params.size > 1
+          params.has_key?(:is_group) && params[:is_group]
         end
 
         def assembly_groups?