decidim-decidim_awesome 0.11.4 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d76b564c88310b85cca5f32876773b3698805bde193ab100281f3729a5d17184
-  data.tar.gz: daef24e9c1ee24620267137e92fe8f25be2878aa9f26a0c1be65cfab96b90286
+  metadata.gz: e111d7d8a993a82615ebe5876f238141d046d140d17cc2ce8a47bd57a6e4028b
+  data.tar.gz: 21012c001100d7bb1fdc7555a6650b695ba990bca5b38e0014ac78082af6f15e
 SHA512:
-  metadata.gz: 854f55867d965a8301d262bd7700266f362015cab0f993285a619da1b9349753a9dedd56f472d287c2459bfb5991eb22241983b10fdf7b03c8094d9253f4e5bc
-  data.tar.gz: ca46f4d43cc00b2b2cf63dea0ae8625cf7bd58605935aa78ef0196d703548f25a5786a8fbea3b886e125448676cdd1dff6777636a127897383f8d65bcf7779a2
+  metadata.gz: 70df95271a2b16f3510ee8fa6549ec616f9c38963b5266291acfa8ec0bf572980af1781474be44b55ee0bd4cdff04efbfb6c135ca48bafe2676ab9d8a2ffc3c6
+  data.tar.gz: 6e75d54f61ffde030812ff30e6f4ec58b6db4d2e1ce8168f38c58921efa3bf8a648c4c5c58801a714e0740beeabb3d16df97319badab04bae70cd6171169114b

data/CHANGELOG.md

@@ -1,6 +1,47 @@
 CHANGELOG
 =========
 
+v0.12.2
+-------
+
+Compatibility:
+  - Decidim 0.29.x
+
+Features:
+  - Fix custom styles loading order
+  - Fix for awesome map no loading in a component
+  - Fix "other" options in checkbox/radio custom fields
+  - Added Mobile Menu Override
+
+v0.12.2
+-------
+
+Compatibility:
+  - Decidim 0.29.x
+
+Features:
+  - Added HashCash anti-bot mechanism
+  - Fixed multi-tenant crossover in admin accountability
+
+v0.12.1
+-------
+
+Compatibility:
+  - Decidim 0.29.x
+
+Feature:
+  - 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
+
+v0.12.0
+-------
+Compatibility:
+  - Decidim 0.29.x
+
+Features:
+  - Upgrade to Decidim v0.29
+
 v0.11.4
 -------
 Compatibility:
@@ -88,8 +129,8 @@ Compatibility:
 
 Features:
   - Migrate to [Deface](https://github.com/spree/deface) for overrides
-  - Introduce Weighted Voting with configurable manifests for different types of votings with grades
-  - Fix wrong behaviour showing proposals on map
+  - Introduce Weighted Voting with configurable manifests for different types of voting with grades
+  - Fix wrong behavior showing proposals on map
   - Introduced new sorting options for proposals. Added alphabetical sorting, reverse sorting, sorting by votes first and last.
 
 v0.9.3
@@ -111,7 +152,7 @@ Compatibility:
 
 Features:
   - Fixes for the menu hacker
- 
+
 v0.9.1
 ------
 
@@ -187,7 +228,7 @@ Features:
   - Now awesome components can be disabled using the `disabled_components` configuration var.
   - Feature: Custom redirections editor: Create shorter URL redirections to other places, inside or outside Decidim.
   - Update to webpacker compatiblity and Decidim 0.25
-  - Added tasks `bin/rails decidim_awesome:active_storage_migrations:check_migration_from_carrierwave` and `bin/rails decidim_awesome:active_storage_migrations:migrate_from_carrierwave` (also accessible as a backgroundjob from the awesome admin checks)
+  - Added tasks `bin/rails decidim_awesome:active_storage_migrations:check_migration_from_carrierwave` and `bin/rails decidim_awesome:active_storage_migrations:migrate_from_carrierwave` (also accessible as a background job from the awesome admin checks)
   - REMOVED: SCSS themes are not available anymore (the alternative is to use custom styles). This is mostly because of webpacker.
 
 v0.7.2
@@ -199,7 +240,7 @@ Compatibility:
 
 Features:
   - Added custom fields (with admin interface and scopable) to replace normal body in proposals.
-  - Change Markdown editor behaviour: now it is converted to HTML before storing in the database. This makes the editor compatible with all Rich Text editors.
+  - Change Markdown editor behavior: now it is converted to HTML before storing in the database. This makes the editor compatible with all Rich Text editors.
   - Added icons in the awesome config menu
   - Fixes scoped admins accessing process groups
 
@@ -215,7 +256,7 @@ Features:
   - Add Awesome Map content block for the homepage
   - Added processes groups constraint for different scoped tweaks
   - Added "Never" constraint to deactivated scoped tweaks temporarily
-  - Change Markdown editor behaviour: now it is converted to HTML before storing in the database. This makes the editor compatible with all Rich Text editors. This also takes this feature out the the "experimental" zone as the resulting edited text is fully compatible with standard Decidim.
+  - Change Markdown editor behavior: now it is converted to HTML before storing in the database. This makes the editor compatible with all Rich Text editors. This also takes this feature out the the "experimental" zone as the resulting edited text is fully compatible with standard Decidim.
   - Added scoped admins feature: Any user can be turned into a limited admin and scoped to one or more participatory spaces.
   - Fix allowing access to participatory space admins (only full admins can access the module).
   - Added `participatory_spaces_routes_context` config variable to specify additional routes correspondences to participatory spaces.

data/README.md

@@ -121,21 +121,8 @@ Technically, the content is stored in the database as an XML document compatible
 ![Custom fields screenshot](examples/custom-fields-2.png)
 ![Custom fields screenshot](examples/custom-fields-1.gif)
 
-Note that the custom fields are build using the jQuery library [formBuilder](https://formbuilder.online). This package is included in Decidim Awesome but the i18n translations are not. By default they are dynamically downloaded from the CDN https://cdn.jsdelivr.net/npm/formbuilder-languages@1.1.0/.
-If you wish to provide an alternative place for those files, you can configure the variable `form_builder_langs_location` in an initializer:
 
-```ruby
-# config/initializers/awesome_defaults.rb
-
-# A URL where to obtain the translations for the FormBuilder component
-# you can a custom place if you are worried about the CDN geolocation
-# Download them from https://github.com/kevinchappell/formBuilder-languages
-
-# For instance, copy them to your /public/fb_locales/ directory and set the path here:
-Decidim::DecidimAwesome.configure do |config|
-  config.form_builder_langs_location = "/fb_locales/"
-end
-```
+Translations for this feature are extracted from the [NPM formBuilder-languages](https://github.com/kevinchappell/formBuilder-languages).
 
 ##### 11.1. GraphQL types for custom fields
 
@@ -317,7 +304,7 @@ When building a new view for the vote button ([see the original](https://github.
 - If votes are blocked `if current_settings.votes_blocked?`
 - If the user has already voted `if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user)`
 - If maximum votes have already reached `if proposal.maximum_votes_reached?`
-- If the proposal can accumulate supports beyond maximum `if proposal.can_accumulate_supports_beyond_threshold`
+- If the proposal can accumulate supports beyond maximum `if proposal.can_accumulate_votes_beyond_threshold`
 - If the current component allows the user to participate `if current_component.participatory_space.can_participate?(current_user)`
 - Note that the [original view](https://github.com/decidim/decidim/blob/release/0.28-stable/decidim-proposals/app/views/decidim/proposals/proposals/_vote_button.html.erb) is overridden only inside the tag  `<div id="proposal-<%= proposal.id %>-vote-button" class="button--vote-button">`. You only need to substitute the part inside.
 
@@ -413,7 +400,7 @@ Decidim::DecidimAwesome.configure do |config|
 #### 21. Manual verifications
 
 The admin will be allowed to manually authorize users using the methods specified in the `/system` admin section.
-Currently, only form based handlers are supported (Direct methods). 
+Currently, only form based handlers are supported (Direct methods).
 Admins can manually override or verify users in the participants list but they still have to fulfill the requirements of the verifier (although they will be allowed to force the authorization even if some of them fails).
 
 Admin logs are also created in each action for accountability.
@@ -425,6 +412,19 @@ System configuration:
 ![Removing an authorization](examples/manual_verifications_2.png)
 ![Creating an authorization](examples/manual_verifications_3.png)
 
+#### 22. HashCash Anti-Bot login/registration
+
+This feature adds a HashCash-based anti-bot mechanism to the login and registration forms. HashCash is a proof-of-work system originally designed to limit email spam and denial-of-service attacks. When enabled, users must solve a computational puzzle (a "stamp") before submitting the form, making automated attacks significantly harder.
+
+The integration leverages the [ActiveHashcash](https://github.com/BaseSecrete/active_hashcash) gem to generate and verify HashCash stamps (although with some customizations). For more details on the HashCash protocol, see the [official documentation](http://www.hashcash.org/docs/hashcash.html).
+
+When this feature is active, each login or registration attempt requires a valid HashCash stamp, effectively reducing the risk of automated bot submissions.
+
+Note this feature is **disabled by default**, admins can enabled it under the "Surveys & Forms" menu in the Decidim Awesome admin dashboard.
+
+![Hashcash admin config](examples/haschcash_admin.png)
+![Hashcash public rendering](examples/hashcash_public.png)
+
 #### To be continued...
 
 We're not done! Please check the [issues](/decidim-ice/decidim-module-decidim_awesome/issues) (and participate) to see what's on our mind
@@ -464,29 +464,14 @@ Go to `yourdomain/admin/decidim_awesome` and start tweaking things!
 > bin/rails decidim_decidim_awesome:webpacker:install
 > ```
 
-
-If you are upgrading from a version prior to 0.8, make sure to visit the URL `/admin/decidim_awesome/checks` and run image migrations for the old images:
-
-![Check image migrations](examples/check_image_migrations.png)
-
-If you are a system admin, you can also perform this task by executing this rake task in the console:
-
-```
-RAILS_ENV=production bin/rails decidim_awesome:active_storage_migrations:migrate_from_carrierwave
-```
-
-Or check your migration status with:
-```
-RAILS_ENV=production bin/rails decidim_awesome:active_storage_migrations:check_migration_from_carrierwave
-```
-
 The correct version of Decidim Awesome should resolved automatically by the Bundler.
-However you can force some specific version using `gem "decidim-decidim_awesome", "~> 0.11.0"` in the Gemfile.
+However you can force some specific version using `gem "decidim-decidim_awesome", "~> 0.12.0"` in the Gemfile.
 
 Depending on your Decidim version, choose the corresponding Awesome version to ensure compatibility:
 
 | Awesome version | Compatible Decidim versions |
 |---|---|
+| 0.12.x | 0.29.x |
 | 0.11.x | 0.28.x |
 | 0.10.x | >= 0.26.7, >= 0.27.x |
 | 0.9.2 | >= 0.26.7, >= 0.27.3 |
@@ -582,6 +567,16 @@ can add the environment variables to the root directory of the project in a file
 named `.rbenv-vars`. If these are defined for the environment, you can omit
 defining these in the commands shown above.
 
+### Updating formBuilder languages
+
+There's a rake task to update the translations of the custom field's form builder interface:
+
+```
+bundle exec rake update_form_builder_i18n
+```
+
+This updates the `app/packs/src/vendor/form_builder_langs` folder.
+
 ### Code Styling
 
 Please follow the code styling defined by the different linters that ensure we
@@ -600,7 +595,6 @@ bundle exec rubocop
 To ease up following the style guide, you should install the plugin to your
 favorite editor, such as:
 
-- Atom - [linter-rubocop](https://atom.io/packages/linter-rubocop)
 - Sublime Text - [Sublime RuboCop](https://github.com/pderichs/sublime_rubocop)
 - Visual Studio Code - [Rubocop for Visual Studio Code](https://github.com/misogi/vscode-ruby-rubocop)
 
@@ -614,8 +608,8 @@ DATABASE_USERNAME=<username> DATABASE_PASSWORD=<password> bundle exec rake test_
 DATABASE_USERNAME=<username> DATABASE_PASSWORD=<password> bundle exec rspec
 ```
 
-> Note: the following is not currently applicable as version v0.11 is only compatible with version Decidim v0.28
-> Is left here for future reference
+> Note: the following is not currently applicable as from version v0.11 this plugin is compatible one version at the time.
+> This is left here for future reference.
 
 However, this project works with different versions of Decidim. In order to test them all, we maintain two different Gemfiles: `Gemfile` and `Gemfile.legacy`. The first one is used for development and testing the latest Decidim version supported, the second one is used for testing against the old Decidim version.
 
@@ -624,9 +618,9 @@ You can run run tests against the legacy Decidim versions by using:
 ```bash
 export DATABASE_USERNAME=<username>
 export DATABASE_PASSWORD=<password>
-RBENV_VERSION=3.1.1 BUNDLE_GEMFILE=Gemfile.legacy bundle
-RBENV_VERSION=3.1.1 BUNDLE_GEMFILE=Gemfile.legacy bundle exec rake test_app
-RBENV_VERSION=3.1.1 BUNDLE_GEMFILE=Gemfile.legacy bundle exec rspec
+RBENV_VERSION=3.2.2 BUNDLE_GEMFILE=Gemfile.legacy bundle
+RBENV_VERSION=3.2.2 BUNDLE_GEMFILE=Gemfile.legacy bundle exec rake test_app
+RBENV_VERSION=3.2.2 BUNDLE_GEMFILE=Gemfile.legacy bundle exec rspec
 ```
 
 For convenience, you can use the scripts `bin/test` and `bin/test-legacy` to run tests against one or the other version:

data/Rakefile

@@ -6,6 +6,7 @@ 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
@@ -55,3 +56,14 @@ task :development_app do
   override_webpacker_config_files("development_app")
   seed_db("development_app")
 end
+
+desc "Update languages for custom fields"
+task :update_form_builder_i18n do
+  puts "Updating languages for custom fields from formbuilder-languages NPM package..."
+  system("npm install formbuilder-languages")
+  puts "Copying files..."
+
+  Dir.glob("node_modules/formbuilder-languages/*.lang").each do |file_lang|
+    FileUtils.cp(file_lang, "app/packs/src/vendor/form_builder_langs", verbose: true)
+  end
+end

data/app/cells/concerns/decidim/decidim_awesome/global_menu_cell_override.rb

@@ -6,14 +6,26 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
+        private
+
         def cache_hash
-          [
+          @decidim_awesome_cache_hash ||= [
             "decidim/content_blocks/global_menu",
             current_organization.cache_key_with_version,
             I18n.locale,
-            awesome_config[:home_content_block_menu].to_s
+            *extra_cache_keys
           ].join(Decidim.cache_key_separator)
         end
+
+        def extra_cache_keys
+          [].tap do |array|
+            array << awesome_config[:home_content_block_menu].to_s
+            if defined?(current_user) && current_user
+              array << current_user.id
+              array << Decidim::Authorization.find_by(user: current_user)&.cache_key_with_version
+            end
+          end
+        end
       end
     end
   end

data/app/cells/concerns/decidim/decidim_awesome/proposal_l_cell_override.rb

@@ -15,10 +15,11 @@ module Decidim
         end
 
         def cache_hash
-          all_extra_fields = memoize("extra_fields")
-          extra_fields = all_extra_fields ? all_extra_fields[resource.id] : resource.extra_fields
-
-          @cache_hash ||= "#{decidim_original_cache_hash}#{Decidim.cache_key_separator}#{extra_fields&.vote_weight_totals}"
+          @decidim_awesome_cache_hash ||= begin
+            all_extra_fields = memoize("extra_fields")
+            extra_fields = all_extra_fields ? all_extra_fields[resource.id] : resource.extra_fields
+            "#{decidim_original_cache_hash}#{Decidim.cache_key_separator}#{extra_fields&.vote_weight_totals}"
+          end
         end
       end
     end

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

@@ -12,9 +12,9 @@
                                   voted_for?(0) ? t("decidim.decidim_awesome.voting.voting_cards.abstained") : proposal.manifest.label_for(0),
                                   proposal_vote_path(0),
                                   link_options(0).merge({
-                                    title: t("decidim.decidim_awesome.voting.voting_cards.voting_for", proposal: sanitized_title, type: proposal.manifest.label_for(0)),
-                                    class: "button button__sm button__transparent-secondary mb-4 vote-action abstain-button #{classes_for(0)}"
-                                    }) %>
+                                                          title: t("decidim.decidim_awesome.voting.voting_cards.voting_for", proposal: sanitized_title, type: proposal.manifest.label_for(0)),
+                                                          class: "button button__sm button__transparent-secondary mb-4 vote-action abstain-button #{classes_for(0)}"
+                                                        }) %>
   <% end %>
 
   <% if voted_for_any? && !current_settings.votes_blocked? %>
@@ -27,7 +27,7 @@
                                     id: "change-vote",
                                     class: "change-vote-button vote-action font-semibold" %>
     </p>
-  <% elsif proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
+  <% 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 %>
     <p class="text-center"><%= t("decidim.proposals.proposals.vote_button.no_votes_remaining") %></p>

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

@@ -9,7 +9,7 @@
       <span class="vote-label"><%= proposal.manifest.label_for(weight) %></span>
       <%= content_tag :svg, role: "img" do
         content_tag(:title, t("decidim.decidim_awesome.voting.voting_cards.voting_for", proposal: sanitized_title, type: proposal.manifest.label_for(weight))) +
-        content_tag(:use, "", "href" => svg_path(weight))
+          content_tag(:use, "", "href" => svg_path(weight))
       end %>
     <% end %>
   </div>

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

@@ -18,8 +18,8 @@ module Decidim
         end
 
         def vote_instructions
-          translated_attribute(current_component.settings.voting_cards_instructions).presence || t("decidim.decidim_awesome.voting.voting_cards.default_instructions_html",
-                                                                                                   organization: current_organization.name)
+          translated_attribute(current_component.settings.voting_cards_instructions).presence ||
+            t("decidim.decidim_awesome.voting.voting_cards.default_instructions_html", organization: translated_attribute(current_organization.name))
         end
 
         def proposal_votes(weight)
@@ -69,9 +69,7 @@ module Decidim
         def disabled?
           return true if voted_for_any? || current_settings.votes_blocked?
 
-          if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user)
-            return true
-          end
+          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
         end

data/app/commands/concerns/decidim/decidim_awesome/system/{register_organization_override.rb → create_organization_override.rb}

@@ -3,7 +3,7 @@
 module Decidim
   module DecidimAwesome
     module System
-      module RegisterOrganizationOverride
+      module CreateOrganizationOverride
         extend ActiveSupport::Concern
 
         included do

data/app/commands/concerns/decidim/decidim_awesome/update_account_override.rb

@@ -13,11 +13,11 @@ module Decidim
           decidim_update_personal_data
           return if @form.user_time_zone.blank?
 
-          @user.extended_data ||= {}
-          if @form.user_time_zone == @user.organization.time_zone
-            @user.extended_data.delete("time_zone")
+          current_user.extended_data ||= {}
+          if @form.user_time_zone == current_user.organization.time_zone
+            current_user.extended_data.delete("time_zone")
           else
-            @user.extended_data["time_zone"] = @form.user_time_zone
+            current_user.extended_data["time_zone"] = @form.user_time_zone
           end
         end
 

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

@@ -39,7 +39,7 @@ module Decidim
         attr_reader :form, :constraint
 
         def attributes
-          form.attributes.filter { |_i, v| v.present? }
+          form.attributes.compact_blank
         end
       end
     end

data/app/commands/decidim/decidim_awesome/create_editor_image.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module DecidimAwesome
-    class CreateEditorImage < Command
+    class CreateEditorImage < Decidim::Command
       # Creates a blueprint.
       #
       # form - The form with the data.
@@ -13,7 +13,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form wasn't valid, and we couldn't proceed.
       #
       # Returns nothing.
       def call

data/app/controllers/concerns/decidim/decidim_awesome/admin/maintenance_context.rb

@@ -8,34 +8,6 @@ module Decidim
 
         included do
           layout "decidim/decidim_awesome/admin/maintenance"
-          helper_method :current_view, :available_views, :present_private_data
-
-          private
-
-          def present_private_data(model)
-            PrivateDataPresenter.new(model)
-          end
-
-          def current_view
-            return params[:id] if available_views.include?(params[:id])
-
-            available_views.keys.first
-          end
-
-          def available_views
-            {
-              "private_data" => {
-                title: I18n.t("private_data", scope: "decidim.decidim_awesome.admin.menu.maintenance"),
-                icon: "spy-line",
-                path: decidim_admin_decidim_awesome.maintenance_path("private_data")
-              },
-              "checks" => {
-                title: I18n.t("checks", scope: "decidim.decidim_awesome.admin.menu.maintenance"),
-                icon: "pulse",
-                path: decidim_admin_decidim_awesome.checks_maintenance_index_path
-              }
-            }
-          end
         end
       end
     end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module NeedsHashcash
+      extend ActiveSupport::Concern
+
+      included do
+        include AwesomeHelpers
+        include ActiveHashcash
+
+        helper_method :awesome_hashcash_bits
+        before_action :set_hashcash_bits
+        before_action :awesome_check_hashcash, only: :create # rubocop:disable Rails/LexicallyScopedActionFilter
+      end
+
+      private
+
+      def awesome_hashcash_bits(zone)
+        return false unless awesome_config["hashcash_#{zone}".to_sym]
+
+        awesome_config["hashcash_#{zone}_bits".to_sym]
+      end
+
+      def awesome_check_hashcash
+        return unless set_hashcash_bits
+
+        check_hashcash
+      end
+
+      # Dynamically configures the gem https://github.com/BaseSecrete/active_hashcash
+      def set_hashcash_bits
+        if controller_name == "sessions"
+          ActiveHashcash.bits = awesome_hashcash_bits(:login)
+        elsif controller_name == "registrations"
+          ActiveHashcash.bits = awesome_hashcash_bits(:signup)
+        end
+      end
+    end
+  end
+end

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

@@ -14,9 +14,9 @@ module Decidim
           return unless Decidim::User.respond_to? :awesome_admins_for_current_scope
           return unless Decidim::User.respond_to? :awesome_potential_admins
           return unless defined? current_user
-          return unless Decidim::User.awesome_potential_admins.include? current_user.id
+          return unless Decidim::User.awesome_potential_admins.include? current_user&.id
 
-          # assiging a flash message here does not work after redirection due the order of middleware in Rails
+          # assigning a flash message here does not work after redirection due the order of middleware in Rails
           # as a workaround, send a message through a get parameter
           path = "/admin/?unauthorized"
           referer = request.headers["Referer"]

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

@@ -32,8 +32,8 @@ module Decidim
                 if force_verification.present?
                   create_forced_authorization
                 else
-                  message = render_to_string("callout", locals: { i18n_key: "user_not_authorized", klass: "alert" })
-                  message += render_to_string("edit", locals: { with_override: true })
+                  callout = render_to_string("callout", locals: { i18n_key: "user_not_authorized", klass: "alert" }, layout: false)
+                  message = render_to_string("edit", locals: { with_override: true, callout: })
                 end
               end
               on(:ok) do

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

@@ -15,12 +15,6 @@ module Decidim
 
         helper_method :head, :admin_head, :head_addons, :admin_addons
 
-        def migrate_images
-          Decidim::DecidimAwesome::MigrateLegacyImagesJob.perform_later(current_organization.id)
-          flash[:notice] = I18n.t("image_migrations_started", scope: "decidim.decidim_awesome.admin.checks.index")
-          redirect_to checks_maintenance_index_path
-        end
-
         private
 
         def head
@@ -58,10 +52,6 @@ module Decidim
         rescue ActionView::Template::Error => e
           flash.now[:alert] = "Partial [#{partial}] has thrown an error: #{e.message}"
         end
-
-        def current_view
-          "checks"
-        end
       end
     end
   end

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

@@ -16,8 +16,9 @@ module Decidim
 
         def show
           @form = form(ConfigForm).from_params(organization_awesome_config)
+          path = main_path_for(config_var)
 
-          redirect_to decidim_admin_decidim_awesome.checks_maintenance_index_path unless config_var
+          redirect_to decidim_admin_decidim_awesome.send(path[0], *path[1]) unless path[0] == :config_path
         end
 
         def update

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

@@ -3,13 +3,12 @@
 module Decidim
   module DecidimAwesome
     module Admin
-      # Editing menu items
       class CustomRedirectsController < DecidimAwesome::Admin::ApplicationController
         include NeedsAwesomeConfig
         include ConfigConstraintsHelpers
 
         before_action do
-          enforce_permission_to :edit_config, :menu
+          enforce_permission_to :edit_config, :custom_redirects
         end
 
         helper ConfigConstraintsHelpers

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "decidim/decidim_awesome/version"
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      # System compatibility analyzer
+      class HashcashController < DecidimAwesome::Admin::ApplicationController
+        include NeedsAwesomeConfig
+        include MaintenanceContext
+        helper ConfigConstraintsHelpers
+
+        helper_method :stamps, :stamp, :addresses
+        before_action do
+          enforce_permission_to :edit_config, [:hashcash_login, :hashcash_signup]
+        end
+
+        def ip_addresses
+          render "ip_addresses"
+        end
+
+        private
+
+        def stamps
+          @stamps ||= ActiveHashcash::Stamp.filter_by(params).order(created_at: :desc).limit(1000)
+        end
+
+        def stamp
+          @stamp ||= ActiveHashcash::Stamp.find_by(id: params[:id])
+        end
+
+        def addresses
+          @addresses ||= ActiveHashcash::Stamp.filter_by(params).group(:ip_address).order(count_all: :desc).limit(1000).count
+        end
+      end
+    end
+  end
+end

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

@@ -12,7 +12,7 @@ module Decidim
         helper_method :current_items, :visibility_options, :target_options
 
         before_action do
-          enforce_permission_to :edit_config, :menu
+          enforce_permission_to :edit_config, current_menu_name
         end
 
         def index; end