decidim-decidim_awesome 0.12.5 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6040a5cab606622ed2cc0b108db81f7c5f9d248d912ddc4114134d23558570b
-  data.tar.gz: ac4149f478ec1d884a20b5f5501b76a466fe1f53f345814800dcb29f73817b75
+  metadata.gz: ea1d742ed0d0071cd93cd52b08d6756e5797eea246f5eb8e27c7d9a91d8a5a23
+  data.tar.gz: bb011c398f7d9c878e968eb36d36e88ce9ca3ce49ecf7c88633f6b244d4f9eda
 SHA512:
-  metadata.gz: 28a535597361b171cf5144df3036ee4cf2d84c43eb5847570224348521533081dba61c8f8354af6ddefe7403a109003bd03e645159d838e2379bca202299f1f3
-  data.tar.gz: edbb6c2b87af2a4f4ddb3b81ec5ffd40b92932847c3c12de4b4e0f9b3dcb7c3101926dc30d50f93779e1c97284e4a3f659f7e72b2150f7657cb2feed93abe406
+  metadata.gz: a86de09cbead024b599913d5bd8fc84da6dad87561862a0b5700ed281b58307fe3561c9c9316ae75e45390257b92c7baafe537d3583517b3468262e3bd387247
+  data.tar.gz: f04b4d49541ff525a417cc4eccf2a64e4876b9c9b703c45a34310dc1a5bdf34649870430a1d3b6f44f1dcea26474a97ae73b725ae9e0babe2d459c044c0393dc

data/CHANGELOG.md

@@ -1,13 +1,25 @@
 CHANGELOG
 =========
 
-v0.12.5
+v0.13.1
 -------
+
 Compatibility:
-  - Decidim 0.29.x
+  - Decidim 0.30.x
 
 Fixes:
-  - Fix nil participatory_space error in SpaceConstraintFinder [#464](https://github.com/decidim-ice/decidim-module-decidim_awesome/pull/464)
+  - Fix access to surveys admin controller ([#460](https://github.com/decidim-ice/decidim-module-decidim_awesome/pull/460))
+  - Fix nil participatory_space error in SpaceConstraintFinder [#463](https://github.com/decidim-ice/decidim-module-decidim_awesome/pull/463)
+  - Correct module defaults link in README [#461](https://github.com/decidim-ice/decidim-module-decidim_awesome/pull/461)
+
+v0.13.0
+-------
+
+Compatibility:
+  - Decidim 0.30.x
+
+Features:
+  - Upgrade to Decidim v0.30
 
 v0.12.4
 -------
@@ -49,7 +61,7 @@ v0.12.1
 Compatibility:
   - Decidim 0.29.x
 
-Feature:
+Features:
   - Added formBuilder languages controller to avoid external CDN
   - Fix cache hash in the global menu override
   - Fix crash on updating empty boxes for scoped admins

data/README.md

@@ -65,7 +65,7 @@ Many scopes can be defined for every tweak. If a tweak is not scoped, it will be
 
 This is a component you can add in any participatory space. It retrieves all the geolocated content in that participatory space (meetings or proposals) and displays it in a big map.
 
-It also provides a simple search by category, each category is assigned to a different color.
+It also provides a simple search by taxonomy, each taxonomy is assigned to a different color.
 
 ![Awesome map](examples/awesome-map.png)
 
@@ -471,6 +471,7 @@ Depending on your Decidim version, choose the corresponding Awesome version to e
 
 | Awesome version | Compatible Decidim versions |
 |---|---|
+| 0.13.x | 0.30.x |
 | 0.12.x | 0.29.x |
 | 0.11.x | 0.28.x |
 | 0.10.x | >= 0.26.7, >= 0.27.x |
@@ -517,7 +518,7 @@ Decidim::DecidimAwesome.configure do |config|
 end
 ```
 
-For a complete list of options take a look at the [module defaults](lib/decidim/decidim_awesome.rb).
+For a complete list of options take a look at the [module defaults](lib/decidim/decidim_awesome/awesome.rb).
 
 ## Missing something?
 

data/Rakefile

@@ -5,21 +5,15 @@ require "fileutils"
 
 def install_module(path)
   Dir.chdir(path) do
-    system("bundle exec rake decidim_decidim_awesome:install:migrations")
-    system("bundle exec rake active_hashcash:install:migrations")
-    system("bundle exec rake db:migrate")
-  end
-end
-
-def override_webpacker_config_files(path)
-  Dir.chdir(path) do
-    system("bundle exec rake decidim_decidim_awesome:webpacker:install")
+    system("bundle exec rails decidim_decidim_awesome:install:migrations")
+    system("bundle exec rails active_hashcash:install:migrations")
+    system("bundle exec rails db:migrate")
   end
 end
 
 def seed_db(path)
   Dir.chdir(path) do
-    system("bundle exec rake db:seed")
+    system("bundle exec rails db:seed")
   end
 end
 
@@ -34,7 +28,6 @@ desc "Generates a dummy app for testing"
 task test_app: "decidim:generate_external_test_app" do
   ENV["RAILS_ENV"] = "test"
   install_module("spec/decidim_dummy_app")
-  override_webpacker_config_files("spec/decidim_dummy_app")
   copy_helpers
 end
 
@@ -53,7 +46,6 @@ task :development_app do
   end
 
   install_module("development_app")
-  override_webpacker_config_files("development_app")
   seed_db("development_app")
 end
 

data/app/cells/decidim/decidim_awesome/content_blocks/map/show.erb

@@ -2,6 +2,6 @@
   <%= content_tag("h3", section_title) if section_title.present? %>
 
   <%= awesome_map_for global_map_components do %>
-    <%= render partial: "decidim/decidim_awesome/map_component/map/map_template.html", locals: { categories: all_categories, map_height: model.settings.map_height } %>
+    <%= render partial: "decidim/decidim_awesome/map_component/map/map_template.html", locals: { taxonomies: all_taxonomies, map_height: model.settings.map_height } %>
   <% end %>
 </section>

data/app/cells/decidim/decidim_awesome/content_blocks/map_cell.rb

@@ -26,16 +26,8 @@ module Decidim
           true
         end
 
-        def all_categories
-          return if @all_categories.present?
-
-          @category_ids ||= Decidim::Category.pluck(:id, :decidim_participatory_space_type, :decidim_participatory_space_id).select do |category|
-            _id, space_type, space_id = category
-            space = space_type.constantize.find(space_id)
-            space.organization == current_organization
-          end.map(&:first)
-
-          @all_categories ||= Decidim::Category.where(id: @category_ids)
+        def all_taxonomies
+          Decidim::Taxonomy.find(settings.taxonomy_ids.reject(&:empty?))
         end
 
         def global_map_components

data/app/cells/decidim/decidim_awesome/content_blocks/map_form/show.erb

@@ -46,6 +46,19 @@
       <div><%= settings_fields.check_box :show_rejected, label: t("show_rejected", scope: i18n_scope) %></div>
       <div><%= settings_fields.check_box :menu_merge_components, label: t("menu_merge_components", scope: i18n_scope) %></div>
   </div>
+
+  <div class="row mt-6">
+    <%= settings_fields.select(
+        :taxonomy_ids,
+        options_from_collection_for_select(
+          Decidim::Taxonomy.roots.for(current_organization),
+          :id,
+          ->(taxonomy) { taxonomy.translated_name },
+          settings_fields.object.taxonomy_ids
+        ),
+        { label: t("taxonomies", scope: i18n_scope) },
+        { multiple: true }) %>
+  </div>
 <% end %>
 
 <style>

data/app/cells/decidim/decidim_awesome/voting/proposal_metadata_cell.rb

@@ -8,7 +8,7 @@ module Decidim
         private
 
         def proposal_items
-          [coauthors_item, comments_count_item, endorsements_count_item, weight_count_item, state_item, emendation_item]
+          [coauthors_item] + taxonomy_items + [comments_count_item, endorsements_count_item, weight_count_item, state_item, emendation_item]
         end
 
         def current_vote

data/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal/show.erb

@@ -29,7 +29,7 @@
     </p>
   <% elsif proposal.maximum_votes_reached? && !proposal.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
     <p class="text-center"><%= t("decidim.proposals.proposals.vote_button.maximum_votes_reached") %></p>
-  <% elsif vote_limit_enabled? && remaining_votes_count_for(current_user) <= 0 %>
+  <% elsif vote_limit_enabled? && remaining_votes_count_for_user <= 0 %>
     <p class="text-center"><%= t("decidim.proposals.proposals.vote_button.no_votes_remaining") %></p>
   <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
     <p class="text-center"><%= t("decidim.proposals.proposals.vote_button.votes_blocked") %></p>

data/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal_cell.rb

@@ -71,7 +71,7 @@ module Decidim
 
           return true if proposal.maximum_votes_reached? && !proposal.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user)
 
-          true if vote_limit_enabled? && remaining_votes_count_for(current_user) <= 0
+          true if vote_limit_enabled? && remaining_votes_count_for_user <= 0
         end
 
         def voted_for_any?

data/app/commands/decidim/decidim_awesome/admin/rename_scope_label.rb

@@ -8,7 +8,9 @@ module Decidim
         #
         # params - A constraint params
         def initialize(params, organization)
+          # rubocop:disable Style/SafeNavigationChainLength
           @text = params[:text]&.strip&.gsub(" ", "_")&.parameterize&.truncate(64)
+          # rubocop:enable Style/SafeNavigationChainLength
           @scope = params[:scope]
           @key = params[:key]
           @attribute = params[:attribute]

data/app/controllers/concerns/decidim/decidim_awesome/admin_accountability/admin/filterable.rb

@@ -43,7 +43,9 @@ module Decidim
             end
 
             def translated_participatory_space_type_eq(item_type)
+              # rubocop:disable Style/SafeNavigationChainLength
               item_type.gsub("UserRole", "").safe_constantize&.model_name&.human&.pluralize || item_type
+              # rubocop:enable Style/SafeNavigationChainLength
             end
 
             def search_field_predicate

data/app/controllers/concerns/decidim/decidim_awesome/needs_hashcash.rb

@@ -17,9 +17,9 @@ module Decidim
       private
 
       def awesome_hashcash_bits(zone)
-        return false unless awesome_config["hashcash_#{zone}".to_sym]
+        return false unless awesome_config[:"hashcash_#{zone}"]
 
-        awesome_config["hashcash_#{zone}_bits".to_sym]
+        awesome_config[:"hashcash_#{zone}_bits"]
       end
 
       def awesome_check_hashcash

data/app/controllers/decidim/decidim_awesome/admin/admin_accountability_controller.rb

@@ -43,7 +43,8 @@ module Decidim
         end
 
         def admin_role_actions
-          @admin_role_actions ||= PaperTrailVersion.in_organization(current_organization).admin_role_actions(PaperTrailVersion.safe_admin_role_type(params[:admin_role_type]))
+          @admin_role_actions ||= PaperTrailVersion.in_organization(current_organization)
+                                                   .admin_role_actions(PaperTrailVersion.safe_admin_role_type(params[:admin_role_type]))
         end
 
         def export_params

data/app/controllers/decidim/decidim_awesome/admin/custom_redirects_controller.rb

@@ -80,7 +80,7 @@ module Decidim
         end
 
         def current_config
-          @current_config ||= (AwesomeConfig.find_by(var: :custom_redirects, organization: current_organization)&.value || {})
+          @current_config ||= AwesomeConfig.find_by(var: :custom_redirects, organization: current_organization)&.value || {}
         end
       end
     end

data/app/controllers/decidim/decidim_awesome/required_authorizations_controller.rb

@@ -15,6 +15,10 @@ module Decidim
         redirect_to redirect_url if user_signed_in? && service.granted? && request.path != redirect_url
       end
 
+      def index
+        redirect_to decidim.user_session_path(redirect_url:) unless user_signed_in?
+      end
+
       def redirect_url
         @redirect_url ||= begin
           path = params[:redirect_url] || request.referer

data/app/forms/decidim/decidim_awesome/admin/config_form.rb

@@ -56,7 +56,7 @@ module Decidim
         # TODO: validate non general admins are here
 
         def self.from_params(params, additional_params = {})
-          instance = super(params, additional_params)
+          instance = super
           instance.valid_keys = params.keys.map(&:to_sym) || []
           instance.force_authorizations = build_force_authorizations(instance.force_authorizations)
           instance.sanitize_labels!

data/app/helpers/concerns/decidim/decidim_awesome/proposals/application_helper_override.rb

@@ -78,14 +78,14 @@ module Decidim
 
             body = if name == :private_body
                      if form_presenter.proposal.private_body.is_a?(Hash) && locale.present?
-                       form_presenter.private_body(extras: false, all_locales: locale.present?).with_indifferent_access[locale]
+                       form_presenter.private_body(all_locales: locale.present?).with_indifferent_access[locale]
                      else
-                       form_presenter.private_body(extras: false)
+                       form_presenter.private_body
                      end
                    elsif form_presenter.proposal.body.is_a?(Hash) && locale.present?
-                     form_presenter.body(extras: false, all_locales: locale.present?).with_indifferent_access[locale]
+                     form_presenter.body(all_locales: locale.present?).with_indifferent_access[locale]
                    else
-                     form_presenter.body(extras: false)
+                     form_presenter.body
                    end
 
             custom_fields.apply_xml(body) if body.present?

data/app/helpers/decidim/decidim_awesome/map_helper.rb

@@ -40,7 +40,7 @@ module Decidim
             "menu-merge-components" => global_settings.menu_merge_components,
             "menu-amendments" => global_settings.menu_amendments,
             "menu-meetings" => global_settings.menu_meetings,
-            "menu-categories" => global_settings.menu_categories,
+            "menu-taxonomies" => global_settings.menu_taxonomies,
             "menu-hashtags" => global_settings.menu_hashtags,
             "show-not-answered" => step_settings&.show_not_answered,
             "show-accepted" => step_settings&.show_accepted,
@@ -72,20 +72,23 @@ module Decidim
       end
 
       # rubocop:disable Rails/HelperInstanceVariable
-      def current_categories(categories)
-        return @current_categories if @current_categories
+      def current_taxonomies(taxonomies)
+        return @current_taxonomies if @current_taxonomies
 
         @golden_ratio_conjugate = 0.618033988749895
         # @h = rand # use random start value
         @h = 0.41
-        @current_categories = []
-        categories.first_class.each do |category|
-          append_category category
-          category.subcategories.each do |subcat|
-            append_category subcat
+        @current_taxonomies = []
+        taxonomies.each do |taxonomy|
+          append_taxonomy taxonomy
+          taxonomy&.children&.each do |subtax|
+            append_taxonomy subtax
+            subtax&.children&.each do |subsubtax|
+              append_taxonomy subsubtax
+            end
           end
         end
-        @current_categories
+        @current_taxonomies
       end
 
       private
@@ -103,15 +106,15 @@ module Decidim
         builder
       end
 
-      def append_category(category)
+      def append_taxonomy(taxonomy)
         @h += @golden_ratio_conjugate
         @h %= 1
         # r,g,b = hsv_to_rgb(@h, 0.5, 0.95)
         r, g, b = hsv_to_rgb(@h, 0.99, 0.95)
-        @current_categories.append(
-          id: category.id,
-          name: translated_attribute(category.name),
-          parent: category.parent&.id,
+        @current_taxonomies.append(
+          id: taxonomy.id,
+          name: translated_attribute(taxonomy.name),
+          parent: taxonomy.parent&.id,
           color: format("#%02x%02x%02x", r, g, b)
         )
       end

data/app/jobs/decidim/decidim_awesome/destroy_private_data_job.rb

@@ -9,7 +9,7 @@ module Decidim
       def perform(resource)
         extra_fields = Decidim::DecidimAwesome::ProposalExtraField.where(
           proposal: Decidim::Proposals::Proposal.where(component: resource)
-        ).where("private_body_updated_at < ?", DecidimAwesome.private_data_expiration_time.ago)
+        ).where(private_body_updated_at: ...DecidimAwesome.private_data_expiration_time.ago)
 
         extra_fields.find_each do |extra_field|
           extra_field.update(private_body: nil)

data/app/jobs/decidim/decidim_awesome/export_admin_actions_job.rb

@@ -3,14 +3,18 @@
 module Decidim
   module DecidimAwesome
     class ExportAdminActionsJob < ApplicationJob
+      include Decidim::PrivateDownloadHelper
+
       queue_as :default
 
       def perform(current_user, format, collection_ids)
         collection = serialized_collection(collection_ids)
 
-        export_data = Exporters.find_exporter(format).new(collection).export
+        export_data = Decidim::Exporters.find_exporter(format).new(collection).export
+
+        private_export = attach_archive(export_data, "admin_actions", current_user)
 
-        ExportMailer.export(current_user, "admin_actions", export_data).deliver_now
+        ExportMailer.export(current_user, private_export).deliver_now
       end
 
       private

data/app/models/decidim/decidim_awesome/paper_trail_version.rb

@@ -15,12 +15,14 @@ module Decidim
 
       scope :space_role_actions, lambda { |organization|
         role_changes = where(item_type: PaperTrailVersion.safe_user_roles, event: "create")
-        user_ids_from_object_changes = role_changes.pluck(:object_changes).map { |change| change.match(/decidim_user_id:\n- ?\n- (\d+)/)[1].to_i }
-        relevant_user_ids = Decidim::User.select(:id).where(id: user_ids_from_object_changes, organization:).pluck(:id)
+
+        user_ids_from_object_changes = role_changes.pluck(:object_changes).map { |change| change.fetch("decidim_user_id", []).last.to_i }
+        user_ids_from_object_changes.compact_blank!
+        relevant_user_ids = Decidim::User.where(id: user_ids_from_object_changes, organization:).pluck(:id)
         # add users that might have been completly destroyed in any organization
-        relevant_user_ids += user_ids_from_object_changes - Decidim::User.select("id").where(id: user_ids_from_object_changes).pluck(:id)
+        relevant_user_ids += user_ids_from_object_changes - Decidim::User.where(id: user_ids_from_object_changes).pluck(:id)
 
-        role_changes.where("object_changes ~ ANY (array[?])", relevant_user_ids.map { |id| "decidim_user_id:\n- ?\n- #{id}(?!\\d)" })
+        role_changes.where("object_changes @> ANY (array[?]::jsonb[])", relevant_user_ids.map { |id| { "decidim_user_id" => [nil, id] }.to_json })
       }
 
       scope :in_organization, lambda { |organization|
@@ -33,11 +35,15 @@ module Decidim
         base = where(item_type: "Decidim::UserBaseEntity", event: %w(create update))
         case filter
         when nil
-          base.where("object_changes LIKE '%\nroles:\n- []\n- - %' OR object_changes LIKE '%\nadmin:\n- false\n- true%'")
+          base.where(
+            "object_changes @> ?::jsonb OR object_changes @> ?::jsonb",
+            { "roles" => [[], []] }.to_json,
+            { "admin" => [false, true] }.to_json
+          )
         when "admin"
-          base.where("object_changes LIKE '%\nadmin:\n- false\n- true%'")
+          base.where("object_changes @> ?::jsonb", { "admin" => [false, true] }.to_json)
         else
-          base.where("object_changes LIKE ?", "%\nroles:\n- []\n- - #{filter}\n%")
+          base.where("object_changes @> ?::jsonb", { "roles" => [[], [filter]] }.to_json)
         end
       end
 
@@ -64,7 +70,6 @@ module Decidim
           Arel.sql("(#{queries.join(" UNION ")})")
         end
       end
-
       ransacker :participatory_space_type do
         Arel.sql(%{("item_type")::text})
       end
@@ -112,6 +117,14 @@ module Decidim
       ransacker :created_at, type: :date do
         Arel.sql("date(versions.created_at)")
       end
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w(created_at event id item_id item_type object object_changes participatory_space_type role_type user_email user_name whodunnit)
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        ["item"]
+      end
     end
   end
 end

data/app/overrides/decidim/devise/sessions/new/add_hashcash.html.erb.deface

@@ -1,3 +1,3 @@
-<!-- insert_top ".login__links" -->
+<!-- insert_before ".form__wrapper-block" -->
 
 <%= render partial: "decidim/decidim_awesome/hashcash/hidden_field", locals: { zone: :login } %>

data/app/overrides/decidim/proposals/proposals/_proposal_actions/limit_amendments_modal.html.erb.deface

@@ -0,0 +1,2 @@
+<!-- insert_before "erb[silent]:contains('@proposal.amendable? && allowed_to?(:edit, :proposal, proposal: @proposal)')" -->
+<%= render "decidim/decidim_awesome/amendments/modal" if @proposal.emendations.not_hidden.where(decidim_amendments: { state: Decidim::Amendment.states["evaluating"] }).exists? && @proposal.amendable? %>

data/app/overrides/decidim/proposals/proposals/_votes_count/replace_counter.html.erb.deface

@@ -7,4 +7,4 @@
     <%# Hidden placeholder for votes count to avoid update_button_adn_counter.js.erb cause a javascript console error %>
     <span style="display: none" id="proposal-<%= proposal.id %>-votes-count"><%= proposal.proposal_votes_count || 0 %></span>
   <% end %>
-<% elsif !current_settings.votes_hidden? && current_component.participatory_space.can_participate?(current_user) %>
+<% elsif !current_settings.votes_hidden? && (current_component.participatory_space.can_participate?(current_user) || current_user.admin?) %>

data/app/overrides/decidim/shared/_login_modal/add_hashcash.html.erb.deface

@@ -1,3 +1,3 @@
-<!-- insert_top ".login__modal-links" -->
+<!-- insert_top ".login__modal-remember" -->
 
 <%= render partial: "decidim/decidim_awesome/hashcash/hidden_field", locals: { zone: :login } %>

data/app/packs/src/decidim/decidim_awesome/amendments/show_modal_on_limits.js

@@ -1,10 +1,9 @@
 document.addEventListener("DOMContentLoaded", () => {
   const modalId = "LimitAmendmentsModal";
   const modalEl = document.getElementById(modalId);
-  const amendButton = document.getElementById("amend-button");
   const limitAmendments = modalEl && JSON.parse(modalEl.dataset.limitAmendments);
 
-  if (!amendButton || !limitAmendments || document.querySelector('a[href^="/users/sign_in"]')) {
+  if (!limitAmendments || document.querySelector('a[href^="/users/sign_in"]')) {
     return;
   }
 
@@ -14,15 +13,19 @@ document.addEventListener("DOMContentLoaded", () => {
     });
   });
 
-  /**
-   * Determines if the modal should be displayed based on its current state and data attributes.
-   */
-  amendButton.addEventListener("click", (event) => {
+  document.addEventListener("click", (event) => {
+    const target = event.target.closest("#amend-button");
+    if (!target) {
+      return;
+    }
+
     const modal = window.Decidim.currentDialogs[modalId];
-    if (modal) {
-      event.preventDefault();
-      event.stopPropagation();
-      modal.open();
+    if (!modal) {
+      return;
     }
+
+    event.preventDefault();
+    event.stopPropagation();
+    modal.open();
   });
 });

data/app/packs/src/decidim/decidim_awesome/awesome_map/api/fetcher.js

@@ -30,14 +30,15 @@ export default class Fetcher {
     api.fetchAll((result) => {
       if (result) {
         const collection = result.component[this.collection];
+        collection.edges = collection.edges.filter((edge) => edge.node !== null);
         // console.log("collection", collection)
-        
+
         collection.edges.forEach((element) => {
           let node = element.node;
           if (!node) {
             return;
           }
-      
+
           if (node.coordinates && node.coordinates.latitude && node.coordinates.longitude) {
             this.decorateNode(node);
             this.onNode(node)
@@ -70,7 +71,7 @@ export default class Fetcher {
   findTranslation(translations) {
     let lang = document.querySelector("html").getAttribute("lang"),
         text = "";
-    
+
     translations.forEach((txt) => {
       if (txt.text) {
         if (!text || txt.locale === lang) {
@@ -127,9 +128,9 @@ export default class Fetcher {
       : tag.html), "");
     if (string) {
       return `${txt}<p>${string}</p>`;
-    } 
+    }
     return txt;
-    
+
   }
 
   truncate(html) {

data/app/packs/src/decidim/decidim_awesome/awesome_map/api/meetings_fetcher.js

@@ -36,7 +36,7 @@ export default class MeetingsFetcher extends Fetcher {
                   longitude
                 }
                 typeOfMeeting
-                category {
+                taxonomies {
                   id
                 }
               }

data/app/packs/src/decidim/decidim_awesome/awesome_map/api/proposals_fetcher.js

@@ -45,7 +45,7 @@ export default class ProposalsFetcher extends Fetcher {
                       id
                     }
                   }
-                  category {
+                  taxonomies {
                     id
                   }
                 }

data/app/packs/src/decidim/decidim_awesome/awesome_map/awesome_map.js

@@ -15,7 +15,7 @@ import MeetingsController from "src/decidim/decidim_awesome/awesome_map/controll
 export default class AwesomeMap {
   constructor(map, config) {
     this.map = map;
-    this.categories = window.AwesomeMap && window.AwesomeMap.categories || []
+    this.taxonomies = window.AwesomeMap && window.AwesomeMap.taxonomies || []
     this.config = $.extend({
       length: 255,
       center: null,
@@ -23,7 +23,7 @@ export default class AwesomeMap {
       menu: {
         amendments: false,
         meetings: false,
-        categories: true,
+        taxonomies: true,
         hashtags: false,
         mergeComponents: false
       },
@@ -83,25 +83,25 @@ export default class AwesomeMap {
     }
   }
 
-  getCategory(category) {
-    let defaultCat = {
+  getTaxonomy(taxonomy) {
+    let defaultTax = {
       color: getComputedStyle(document.documentElement).getPropertyValue("--primary"),
       children: () => {},
       parent: null,
       name: null
     };
 
-    if (category) {
-      let id = category.id ? parseInt(category.id, 10) : parseInt(category, 10); // eslint-disable-line no-ternary, multiline-ternary
-      let cat = this.categories.find((ct) => ct.id === id);
-      if (cat) {
-        cat.children = () => {
-          return this.categories.filter((ct) => ct.parent === cat.id);
+    if (taxonomy) {
+      let id = taxonomy.id ? parseInt(taxonomy.id, 10) : parseInt(taxonomy, 10); // eslint-disable-line no-ternary, multiline-ternary
+      let tax = this.taxonomies.find((tx) => tx.id === id);
+      if (tax) {
+        tax.children = () => {
+          return this.taxonomies.filter((tx) => tx.parent === tax.id);
         }
-        return cat;
+        return tax;
       }
     }
-    return defaultCat;
+    return defaultTax;
   }
 
   _getController(component) {