decidim-decidim_awesome 0.12.5 → 0.13.1

data/config/locales/ro-RO.yml

@@ -1,4 +1,3 @@
----
 ro:
   activemodel:
     attributes:
@@ -146,8 +145,3 @@ ro:
         voting_cards:
           modal:
             cancel: Anulare
-  layouts:
-    decidim:
-      decidim_awesome:
-        awesome_config:
-          categories: Categorii

data/config/locales/sv.yml

@@ -1,4 +1,3 @@
----
 sv:
   active_hashcash:
     submit_filter: Filtrera
@@ -227,7 +226,6 @@ sv:
       decidim_awesome:
         awesome_config:
           amendments: Ändringsförslag
-          categories: Kategorier
           hashtags: Hashtaggar
           items: föremål
           meetings: Möten

data/lib/decidim/decidim_awesome/checksums.yml

@@ -3,13 +3,13 @@ decidim-admin:
     decidim-0.29.1: b2ae319d5bcf43954bbe0edb9a4e3ffb
 decidim-assemblies:
   /app/views/decidim/assemblies/admin/assemblies/_form.html.erb:
-    decidim-0.29.4: 020a06e40fd3b8dae4ec63b2afcac9cb
+    decidim-0.29.4: cf28844ddb8416aedb934d526462fbc0
 decidim-participatory_processes:
   /app/views/decidim/participatory_processes/admin/participatory_processes/_form.html.erb:
-    decidim-0.29.4: 41d304c7583bdd51cbd5b6e98b27fded
+    decidim-0.29.4: 3eca01ab87a77deec7443bbecee93a15
 decidim-conferences:
   /app/views/decidim/conferences/admin/conferences/_form.html.erb:
-    decidim-0.29.4: 40c04d3e64936598f2c3acedf8e99372
+    decidim-0.29.4: 068ebba1590111b40f50923b33f57313
 decidim-core:
   /app/packs/entrypoints/decidim_editor.js:
     decidim-0.29.1: beddd77e3893fd0b7cd2679a7ee6e536
@@ -17,6 +17,7 @@ decidim-core:
     decidim-0.29.1: 90dfac3acae97202dec083955e2249e4
   /app/validators/etiquette_validator.rb:
     decidim-0.29.1: e9ad91d824ad48ac2075a088a0d21349
+    decidim-0.30.0: 7a1d9f32067ca169610d4c03b97d7b0d
   /app/views/layouts/decidim/_head.html.erb:
     decidim-0.29.1: 8ac1af4e223d9a7a98136760b6194a75
     decidim-0.29.2: 59abccd8b1c5315d5c0b772be0c26d45
@@ -28,64 +29,89 @@ decidim-core:
     decidim-0.29.1: f04f0f5112499a86079119d5f9ae8487
   /app/helpers/decidim/amendments_helper.rb:
     decidim-0.29.1: 36072334cba7a58841a6b2fb007d24a6
+    decidim-0.30.0: 30791e6637dedd413cdc037206726c2f
   /app/presenters/decidim/admin_log/component_presenter.rb:
     decidim-0.29.1: 77e80d527727acdf117a0c4517a69a7c
+    decidim-0.30.0: 0bfbd6771f52884a224f8e947ab15839
   /app/forms/decidim/account_form.rb:
     decidim-0.29.1: 11a022ae6ae18ad89da168bec4207935
     decidim-0.29.3: 5872f17965919c0754a453ac4eb614df
   /app/commands/decidim/update_account.rb:
     decidim-0.29.1: d24090fdd9358c38e6e15c4607a78e18
+    decidim-0.30.0: f6c1fbdfd2e2c38bd9b6a43b335df975
   /app/views/decidim/account/show.html.erb:
     decidim-0.29.1: f13218e2358a2d611996c2a197c0de25
   /app/cells/decidim/content_blocks/global_menu_cell.rb:
     decidim-0.28.0: d224370c364a9cf4b2e244063274e5ef
   /app/views/decidim/devise/registrations/new.html.erb:
     decidim-0.29.1: b30423406afd43bb9af2c98d59d43632
+    decidim-0.30.0: 56884184f7f1582828a77fbeff2bb546
   /app/views/decidim/devise/sessions/new.html.erb:
     decidim-0.29.1: a8fe60cd10c1636822c252d5488a979d
+    decidim-0.30.0: da0d18178c8dcead2774956e989527c5
   /app/views/decidim/shared/_login_modal.html.erb:
     decidim-0.29.1: 0d615603bb45f7b209032578dda9fc72
+    decidim-0.30.0: 98bd2832be207d7abcd48d2a0ba40bd0
 decidim-proposals:
   /lib/decidim/proposals/proposal_serializer.rb:
     decidim-0.29.1: 58915ff3a7528463587d3762a93ff51b
     decidim-0.29.2: f52f5770d8596134624ecb79457a21de
+    decidim-0.30.0: 7e42fe689432706c6abbd832b9e3d3c3
   /lib/decidim/api/proposal_type.rb:
     decidim-0.29.1: 25d61a67a4b969ac8c472237d3f64b66
     decidim-0.29.2: cd24561962f6fb6038678795f60bdec3
+    decidim-0.30.0: 3b9dd9c3afc8ee0c9a7bb1e46c865a60
   /app/forms/decidim/proposals/proposal_form.rb:
     decidim-0.29.1: 0b19bfeb4f7bd15cd378a69c3935de6b
     decidim-0.29.2: ad4ff4bde6ee2e802d394382ef7859a4
+    decidim-0.30.0: 8db839481fec2a53acecabbf22377aa6
   /app/forms/decidim/proposals/admin/proposal_form.rb:
     decidim-0.29.1: 422632395194b19beed4c7c65f127ff5
     decidim-0.29.2: ad4ff4bde6ee2e802d394382ef7859a4
+    decidim-0.30.0: 34e42ec6c9911b60c28d2bb49f066a8c
   /app/helpers/decidim/proposals/application_helper.rb:
     decidim-0.29.1: 940488938f644b63a2ef6177f3757ca2
     decidim-0.29.3: e6039a99268845c5038f913309fde432
+    decidim-0.30.0: e539b6feb12c515ec24ed6d3efd6e29e
   /app/controllers/decidim/proposals/proposal_votes_controller.rb:
     decidim-0.29.1: f983e72c1ee8d31222d537533c762cd2
   /app/views/decidim/proposals/admin/proposals/_form.html.erb:
     decidim-0.29.1: 667c2ef6ffbf3369f59bd1e8eb0ba421
     decidim-0.29.3: 59a7ed11d05a633cd4bf23881254b7f1
+    decidim-0.30.0: bbf9f55b307e6ba22a70289712bc019b
+    decidim-0.30.1: 7619190e4de00729893f62bce180a8e5
   /app/views/decidim/proposals/proposals/_vote_button.html.erb:
     decidim-0.29.1: 06dd4c9bf7fc4953fc330b7ba081b2f6
+    decidim-0.30.0: 644e8d24ad9571939e150190443b054a
+    decidim-0.30.1: 3cd74a9396d20e19ed3821f08cbe2b06
   /app/views/decidim/proposals/proposals/_votes_count.html.erb:
     decidim-0.29.1: 6e663e5c82c27291b63f29f346df8737
+    decidim-0.30.0: 6af6cdeeff0fc0daad028b88ee1c21cb
   /app/cells/decidim/proposals/proposal_l_cell.rb:
     decidim-0.29.1: e38d1cd0ea6c7f14c8f8b56d3ceb0db5
     decidim-0.29.2: 5043d8560a26fce2e296b3a0f6ba6cf6
+    decidim-0.30.0: 682349209dad2f878f4d996a6c2b0bab
   /app/cells/decidim/proposals/proposal_metadata_cell.rb:
     decidim-0.29.1: 6859b77805227c4cf71ae0a1351a4551
+    decidim-0.30.0: 04239cfbbd8defc21f85bbd533e2d1a6
   /app/commands/decidim/proposals/create_proposal.rb:
     decidim-0.29.1: 02a6f54a032457e68be580e6a539c47b
+    decidim-0.30.0: e754afeca5167e04e40b856999667706
   /app/commands/decidim/proposals/create_collaborative_draft.rb:
     decidim-0.29.1: ab3f937f15c6ed945e776fef34b18abf
+    decidim-0.30.0: 64fb896383da98334648ce607dde0a27
   /app/commands/decidim/proposals/admin/create_proposal.rb:
     decidim-0.29.1: 837d86d2eb1f2d7579a0cef82d68caf7
+    decidim-0.30.0: 6d3daa0339abd4cc07859292dda319bb
   /app/commands/decidim/proposals/update_proposal.rb:
     decidim-0.29.1: e81268a1f9b3770387944d44d7704291
+    decidim-0.30.0: 2dcc14554207bbe287897543728a4d4d
   /app/commands/decidim/proposals/update_collaborative_draft.rb:
     decidim-0.29.1: 7df5266382bd57db72832da391fe7e11
+    decidim-0.30.0: 21b0546e5ea23b251cab3f9403732af6
   /app/commands/decidim/proposals/admin/update_proposal.rb:
     decidim-0.29.1: 67b691b6d1ce61cb198592ac25f76f74
+    decidim-0.30.0: d41045482929b4a561186d31a71666c4
   /app/presenters/decidim/proposals/proposal_presenter.rb:
     decidim-0.29.1: bbc7cee02125c1f8cf909219e48af337
+    decidim-0.30.0: b12cfb5e55aff4756d757e71e580c547

data/lib/decidim/decidim_awesome/engine.rb

@@ -38,12 +38,14 @@ module Decidim
         Decidim::ViewModel.include(Decidim::DecidimAwesome::AwesomeHelpers)
 
         # Override EtiquetteValidator
-        EtiquetteValidator.include(Decidim::DecidimAwesome::EtiquetteValidatorOverride) if DecidimAwesome.enabled?(:validate_title_max_caps_percent,
-                                                                                                                   :validate_title_max_marks_together,
-                                                                                                                   :validate_title_start_with_caps,
-                                                                                                                   :validate_body_max_caps_percent,
-                                                                                                                   :validate_body_max_marks_together,
-                                                                                                                   :validate_body_start_with_caps)
+        if DecidimAwesome.enabled?(:validate_title_max_caps_percent,
+                                   :validate_title_max_marks_together,
+                                   :validate_title_start_with_caps,
+                                   :validate_body_max_caps_percent,
+                                   :validate_body_max_marks_together,
+                                   :validate_body_start_with_caps)
+          EtiquetteValidator.include(Decidim::DecidimAwesome::EtiquetteValidatorOverride)
+        end
 
         # Custom fields need to deal with several places
         if DecidimAwesome.enabled?(:proposal_custom_fields,
@@ -227,7 +229,9 @@ module Decidim
             voting.proposal_metadata_cell = "decidim/decidim_awesome/voting/proposal_metadata"
             voting.weight_validator do |weight, context|
               allowed = [1, 2, 3]
+              # rubocop:disable Style/SafeNavigationChainLength
               allowed << 0 if context[:proposal]&.component&.settings&.voting_cards_show_abstain
+              # rubocop:enable Style/SafeNavigationChainLength
               weight.in? allowed
             end
           end

data/lib/decidim/decidim_awesome/map_component/component.rb

@@ -22,9 +22,10 @@ Decidim::DecidimAwesome.register_component(:awesome_map) do |component|
     settings.attribute :collapse, type: :boolean, default: false
     settings.attribute :menu_amendments, type: :boolean, default: true
     settings.attribute :menu_meetings, type: :boolean, default: true
-    settings.attribute :menu_categories, type: :boolean, default: true
+    settings.attribute :menu_taxonomies, type: :boolean, default: true
     settings.attribute :menu_hashtags, type: :boolean, default: true
     settings.attribute :menu_merge_components, type: :boolean, default: false
+    settings.attribute :taxonomy_filters, type: :taxonomy_filters
   end
 
   component.settings(:step) do |settings|

data/lib/decidim/decidim_awesome/map_component/engine.rb

@@ -35,7 +35,7 @@ module Decidim
               settings.attribute :menu_amendments, type: :boolean, default: true
               settings.attribute :menu_meetings, type: :boolean, default: true
               settings.attribute :menu_hashtags, type: :boolean, default: true
-              settings.attribute :menu_categories, type: :boolean, default: true
+              settings.attribute :menu_taxonomies, type: :boolean, default: true
               settings.attribute :menu_merge_components, type: :boolean, default: true
 
               settings.attribute :show_not_answered, type: :boolean, default: true
@@ -43,6 +43,7 @@ module Decidim
               settings.attribute :show_withdrawn, type: :boolean, default: false
               settings.attribute :show_evaluating, type: :boolean, default: true
               settings.attribute :show_rejected, type: :boolean, default: false
+              settings.attribute :taxonomy_ids, type: :array, default: []
             end
           end
           # === TODO: processes groups map block ===

data/lib/decidim/decidim_awesome/test/shared_examples/admin_accountability_contexts.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+shared_context "with admin accountability helpers" do
+  def search_by_date(start_date, end_date)
+    within(".filters__section") do
+      fill_in_datepicker :q_created_at_gteq_date, with: start_date.strftime("%d/%m/%Y") if start_date.present?
+      fill_in_datepicker :q_created_at_lteq_date, with: end_date.strftime("%d/%m/%Y") if end_date.present?
+      find("*[type=submit]").click
+    end
+  end
+end

data/lib/decidim/decidim_awesome/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   # This holds the decidim-decidim_awesome version.
   module DecidimAwesome
-    VERSION = "0.12.5"
-    COMPAT_DECIDIM_VERSION = [">= 0.29.1", "< 0.30"].freeze
+    VERSION = "0.13.1"
+    COMPAT_DECIDIM_VERSION = [">= 0.30.0", "< 0.31"].freeze
   end
 end

data/lib/tasks/decidim_awesome_migrate_menu_categories.rake

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+namespace :decidim_decidim_awesome do
+  namespace :upgrade do
+    desc "Migrate menu_categories to menu_taxonomies in awesome_map components"
+    task migrate_awesome_map_menu_categories_to_menu_taxonomies: :environment do
+      components_to_migrate = Decidim::Component.where(manifest_name: "awesome_map")
+                                                .where("settings->'global' ? 'menu_categories'")
+
+      next if components_to_migrate.empty?
+
+      puts "Starting migration of menu_categories to menu_taxonomies in awesome_map components..."
+      puts "Found #{components_to_migrate.count} components to migrate."
+
+      updated_count = 0
+
+      components_to_migrate.find_each do |component|
+        raw_settings = component.read_attribute(:settings)
+
+        if raw_settings&.dig("global")&.has_key?("menu_categories")
+          menu_categories_value = raw_settings["global"]["menu_categories"]
+
+          raw_settings["global"].delete("menu_categories")
+          raw_settings["global"]["menu_taxonomies"] = menu_categories_value
+
+          component.update_column(:settings, raw_settings) # rubocop:disable Rails/SkipsModelValidations
+
+          updated_count += 1
+
+          puts "Updated component ID: #{component.id}"
+          puts "  Changed menu_categories: #{menu_categories_value} -> menu_taxonomies: #{menu_categories_value}"
+        end
+      end
+
+      puts "Migration completed. Updated #{updated_count} components."
+    end
+  end
+end

data/lib/tasks/decidim_awesome_upgrade_tasks.rake

@@ -10,3 +10,7 @@ Rake::Task["decidim:choose_target_plugins"].enhance do
     ENV["FROM"] = "#{ENV.fetch("FROM", nil)},active_hashcash" if Decidim::DecidimAwesome.enabled?(:hashcash_signup, :hashcash_login)
   end
 end
+
+Rake::Task["decidim_decidim_awesome:install:migrations"].enhance do
+  Rake::Task["decidim_decidim_awesome:upgrade:migrate_awesome_map_menu_categories_to_menu_taxonomies"].invoke
+end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "decidim-module-decidim_awesome",
-  "version": "0.12.0",
+  "version": "0.13.1",
   "description": "Mods and tweaks for Decidim",
   "main": "index.js",
   "directories": {
@@ -34,11 +34,11 @@
   },
   "prettier": "@decidim/prettier-config",
   "devDependencies": {
-    "@decidim/dev": "0.29.4",
-    "@decidim/eslint-config": "0.29.4",
-    "@decidim/prettier-config": "0.29.4",
-    "@decidim/stylelint-config": "0.29.4",
-    "postcss-scss": "^4.0.9"
+    "@decidim/dev": "0.30.0",
+    "@decidim/eslint-config": "0.30.0",
+    "@decidim/prettier-config": "0.30.0",
+    "@decidim/stylelint-config": "0.30.0",
+    "@decidim/webpacker": "0.30.0"
   },
   "dependencies": {
     "codemirror": "^5.65.16",
@@ -47,7 +47,6 @@
     "formbuilder-languages": "^1.2.0",
     "inline-attacher": "^0.0.7",
     "jsrender": "^1.0.9",
-    "leaflet.featuregroup.subgroup": "^1.0.2",
-    "tom-select": "2.2.2"
+    "leaflet.featuregroup.subgroup": "^1.0.2"
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-decidim_awesome
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.13.1
 platform: ruby
 authors:
 - Ivan Vergés
@@ -30,40 +30,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.30.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.31'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.30.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.31'
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.30.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.31'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.30.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.31'
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -224,7 +224,7 @@ files:
 - app/overrides/decidim/proposals/admin/proposals/_form/replace_editor.html.erb.deface
 - app/overrides/decidim/proposals/admin/proposals/show/add_private_body.html.erb.deface
 - app/overrides/decidim/proposals/admin/proposals/show/replace_body.html.erb.deface
-- app/overrides/decidim/proposals/proposals/_proposal_aside/limit_amendments_modal.html.erb.deface
+- app/overrides/decidim/proposals/proposals/_proposal_actions/limit_amendments_modal.html.erb.deface
 - app/overrides/decidim/proposals/proposals/_vote_button/replace_vote_button.html.erb.deface
 - app/overrides/decidim/proposals/proposals/_votes_count/replace_counter.html.erb.deface
 - app/overrides/decidim/shared/_login_modal/add_hashcash.html.erb.deface
@@ -492,6 +492,7 @@ files:
 - lib/decidim/decidim_awesome/test/layouts/decidim/_head.html.erb
 - lib/decidim/decidim_awesome/test/layouts/decidim/admin/_header.html.erb
 - lib/decidim/decidim_awesome/test/shared_examples/action_log_presenter_examples.rb
+- lib/decidim/decidim_awesome/test/shared_examples/admin_accountability_contexts.rb
 - lib/decidim/decidim_awesome/test/shared_examples/box_label_editor_examples.rb
 - lib/decidim/decidim_awesome/test/shared_examples/config_examples.rb
 - lib/decidim/decidim_awesome/test/shared_examples/controller_examples.rb
@@ -506,6 +507,7 @@ files:
 - lib/decidim/decidim_awesome/test/shared_examples/summary_examples.rb
 - lib/decidim/decidim_awesome/version.rb
 - lib/decidim/decidim_awesome/voting_manifest.rb
+- lib/tasks/decidim_awesome_migrate_menu_categories.rake
 - lib/tasks/decidim_awesome_upgrade_tasks.rake
 - lib/tasks/decidim_awesome_webpacker_tasks.rake
 - package.json
@@ -522,14 +524,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A decidim decidim_awesome module

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

@@ -1,5 +0,0 @@
-<!-- replace "erb[loud]:contains('amend_button_for @proposal')" -->
-
-<%= amend_button_for @proposal %>
-
-<%= render "decidim/decidim_awesome/amendments/modal" if @proposal.emendations.not_hidden.where(decidim_amendments: { state: Decidim::Amendment.states["evaluating"] }).count.positive? && @proposal.amendable? %>