decidim-decidim_awesome 0.10.3 → 0.11.1

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

@@ -21,6 +21,10 @@ module Decidim
           @form = form(MenuForm).instance
         end
 
+        def edit
+          @form = form(MenuForm).from_model(menu_item)
+        end
+
         def create
           @form = form(MenuForm).from_params(params)
           CreateMenuHack.call(@form, current_menu_name) do
@@ -36,10 +40,6 @@ module Decidim
           end
         end
 
-        def edit
-          @form = form(MenuForm).from_model(menu_item)
-        end
-
         def update
           @form = form(MenuForm).from_params(params)
           UpdateMenuHack.call(@form, current_menu_name) do
@@ -61,7 +61,7 @@ module Decidim
               flash[:notice] = I18n.t("menu_hacks.destroy.success", scope: "decidim.decidim_awesome.admin")
             end
             on(:invalid) do |error|
-              flash[:alert] = I18n.t("menu_hacks.destroy.error", scope: "decidim.decidim_awesome.admin", error: error)
+              flash[:alert] = I18n.t("menu_hacks.destroy.error", scope: "decidim.decidim_awesome.admin", error:)
             end
           end
           redirect_to decidim_admin_decidim_awesome.menu_hacks_path
@@ -69,7 +69,6 @@ module Decidim
 
         private
 
-        # rubocop:disable Style/OpenStructUse
         def menu_item
           item = current_items.find { |i| md5(i.url) == params[:id] }
           raise ActiveRecord::RecordNotFound unless item
@@ -83,7 +82,6 @@ module Decidim
             native?: !item.respond_to?(:overrided?)
           )
         end
-        # rubocop:enable Style/OpenStructUse
 
         def current_items
           @current_items ||= current_menu.items(include_invisible: true)
@@ -94,7 +92,7 @@ module Decidim
         end
 
         def current_menu_name
-          :menu
+          params[:menu_id].to_sym
         end
 
         def visibility_options

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

@@ -8,7 +8,7 @@ module Decidim
         def create
           CreateProposalCustomField.call(current_organization, config_var) do
             on(:ok) do |key|
-              flash[:notice] = I18n.t("config.create_proposal_custom_field.success", key: key, scope: "decidim.decidim_awesome.admin")
+              flash[:notice] = I18n.t("config.create_proposal_custom_field.success", key:, scope: "decidim.decidim_awesome.admin")
             end
 
             on(:invalid) do |message|
@@ -22,7 +22,7 @@ module Decidim
         def destroy
           DestroyProposalCustomField.call(params[:key], current_organization, config_var) do
             on(:ok) do |key|
-              flash[:notice] = I18n.t("config.destroy_proposal_custom_field.success", key: key, scope: "decidim.decidim_awesome.admin")
+              flash[:notice] = I18n.t("config.destroy_proposal_custom_field.success", key:, scope: "decidim.decidim_awesome.admin")
             end
 
             on(:invalid) do |message|

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

@@ -8,7 +8,7 @@ module Decidim
         def create
           CreateScopedAdmin.call(current_organization) do
             on(:ok) do |key|
-              flash[:notice] = I18n.t("config.create_scoped_admin.success", key: key, scope: "decidim.decidim_awesome.admin")
+              flash[:notice] = I18n.t("config.create_scoped_admin.success", key:, scope: "decidim.decidim_awesome.admin")
             end
 
             on(:invalid) do |message|
@@ -22,7 +22,7 @@ module Decidim
         def destroy
           DestroyScopedAdmin.call(params[:key], current_organization) do
             on(:ok) do |key|
-              flash[:notice] = I18n.t("config.destroy_scoped_admin.success", key: key, scope: "decidim.decidim_awesome.admin")
+              flash[:notice] = I18n.t("config.destroy_scoped_admin.success", key:, scope: "decidim.decidim_awesome.admin")
             end
 
             on(:invalid) do |message|

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

@@ -8,7 +8,7 @@ module Decidim
         def create
           CreateScopedStyle.call(current_organization) do
             on(:ok) do |key|
-              flash[:notice] = I18n.t("config.create_scoped_style.success", key: key, scope: "decidim.decidim_awesome.admin")
+              flash[:notice] = I18n.t("config.create_scoped_style.success", key:, scope: "decidim.decidim_awesome.admin")
             end
 
             on(:invalid) do |message|
@@ -22,7 +22,7 @@ module Decidim
         def destroy
           DestroyScopedStyle.call(params[:key], current_organization) do
             on(:ok) do |key|
-              flash[:notice] = I18n.t("config.destroy_scoped_style.success", key: key, scope: "decidim.decidim_awesome.admin")
+              flash[:notice] = I18n.t("config.destroy_scoped_style.success", key:, scope: "decidim.decidim_awesome.admin")
             end
 
             on(:invalid) do |message|

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

@@ -6,13 +6,18 @@ module Decidim
     class BlankComponentController < Decidim::Components::BaseController
       # just redirects to settings
       def settings
-        redirect_to EngineRouter.admin_proxy(component.participatory_space).edit_component_path(id: component)
+        redirect_to EngineRouter.admin_proxy(current_component.participatory_space).edit_component_path(id: current_component)
       end
 
       private
 
-      def component
-        Decidim::Component.find(params[:component_id])
+      def set_component_breadcrumb_item
+        context_breadcrumb_items << {
+          label: current_component.name,
+          url: EngineRouter.admin_proxy(current_component.participatory_space).edit_component_path(id: current_component),
+          active: false,
+          resource: current_component
+        }
       end
     end
   end

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

@@ -2,7 +2,7 @@
 
 module Decidim
   module DecidimAwesome
-    # This controller handles image uploads for the hacked Quill editor
+    # This controller handles image uploads for the Tiptap editor
     class EditorImagesController < DecidimAwesome::ApplicationController
       include FormFactory
       include NeedsAwesomeConfig
@@ -11,14 +11,14 @@ module Decidim
       rescue_from Decidim::ActionForbidden, with: :ajax_user_has_no_permission
 
       def create
-        enforce_permission_to :create, :editor_image, awesome_config: awesome_config
+        enforce_permission_to(:create, :editor_image, awesome_config:)
 
         @form = form(EditorImageForm).from_params(form_values)
         CreateEditorImage.call(@form) do
           on(:ok) do |image|
             url = image.attached_uploader(:file).path
             url = "#{request.base_url}#{url}" unless url&.start_with?("http")
-            render json: { url: url, message: I18n.t("decidim_awesome.editor_images.create.success", scope: "decidim") }
+            render json: { url:, message: I18n.t("decidim_awesome.editor_images.create.success", scope: "decidim") }
           end
 
           on(:invalid) do |_message|

data/app/controllers/decidim/decidim_awesome/iframe_component/iframe_controller.rb

@@ -5,7 +5,8 @@ module Decidim
     module IframeComponent
       class IframeController < DecidimAwesome::BlankComponentController
         ALLOWED_ATTRIBUTES = %w(src width height frameborder title allow allowpaymentrequest name referrerpolicy sandbox srcdoc allowfullscreen).freeze
-        helper_method :iframe, :remove_margins?, :viewport_width?
+        helper_method :iframe, :viewport_width?
+        before_action :add_additional_csp_directives, only: :show
 
         def show; end
 
@@ -27,13 +28,18 @@ module Decidim
           document.to_s
         end
 
-        def remove_margins?
-          current_component.settings.no_margins
-        end
-
         def viewport_width?
           current_component.settings.viewport_width
         end
+
+        def add_additional_csp_directives
+          iframe_urls = Nokogiri::HTML::DocumentFragment.parse(iframe).children.select { |x| x.name == "iframe" }.filter_map { |x| x.attribute("src")&.value }
+          return if iframe_urls.blank?
+
+          iframe_urls.each do |url|
+            content_security_policy.append_csp_directive("frame-src", url)
+          end
+        end
       end
     end
   end

data/app/forms/concerns/decidim/decidim_awesome/proposals/proposal_wizard_create_step_form_override.rb

@@ -28,7 +28,7 @@ module Decidim
           def override_validations?
             return false if context.current_component.settings.participatory_texts_enabled
 
-            custom_fields.present? || awesome_config.enabled_in_context?(:use_markdown_editor)
+            custom_fields.present?
           end
 
           def minimum_title_length

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

@@ -8,13 +8,9 @@ module Decidim
       class ConfigForm < Decidim::Form
         include ActionView::Helpers::SanitizeHelper
 
-        attribute :allow_images_in_full_editor, Boolean
-        attribute :allow_images_in_small_editor, Boolean
+        attribute :allow_images_in_editors, Boolean
         attribute :allow_videos_in_editors, Boolean
         attribute :allow_images_in_proposals, Boolean
-        attribute :use_markdown_editor, Boolean
-        attribute :allow_images_in_markdown_editor, Boolean
-        attribute :auto_save_forms, Boolean
         attribute :auto_save_forms, Boolean
         attribute :scoped_styles, Hash
         attribute :proposal_custom_fields, Hash
@@ -69,7 +65,7 @@ module Decidim
 
             SassC::Engine.new(code).render
           rescue SassC::SyntaxError => e
-            errors.add(:scoped_styles, I18n.t("config.form.errors.incorrect_css", key: key, scope: "decidim.decidim_awesome.admin"))
+            errors.add(:scoped_styles, I18n.t("config.form.errors.incorrect_css", key:, scope: "decidim.decidim_awesome.admin"))
             errors.add(key.to_sym, e.message)
           end
         end
@@ -83,32 +79,26 @@ module Decidim
 
             values.each { |code| JSON.parse(code) }
           rescue JSON::JSONError => e
-            errors.add(key, I18n.t("config.form.errors.incorrect_json", key: key, scope: "decidim.decidim_awesome.admin"))
+            errors.add(key, I18n.t("config.form.errors.incorrect_json", key:, scope: "decidim.decidim_awesome.admin"))
             errors.add(key.to_sym, e.message)
           end
         end
 
         # formBuilder has a bug and do not sanitize text if users copy/paste text with format in the label input
-        # rubocop:disable Metrics/CyclomaticComplexity
-        # rubocop:disable Metrics/PerceivedComplexity
         def sanitize_labels!
-          if proposal_custom_fields
-            proposal_custom_fields.transform_values! do |code|
-              next unless code
-
-              json = JSON.parse(code)
-              json.map! do |item|
-                item["label"] = strip_tags(item["label"])
-                item
-              end
-              JSON.generate(json)
-            rescue JSON::ParserError
-              code
+          proposal_custom_fields.transform_values! do |code|
+            next unless code
+
+            json = JSON.parse(code)
+            json.map! do |item|
+              item["label"] = strip_tags(item["label"])
+              item
             end
+            JSON.generate(json)
+          rescue JSON::ParserError
+            code
           end
 
-          return unless proposal_private_custom_fields
-
           proposal_private_custom_fields.transform_values! do |code|
             next unless code
 
@@ -122,8 +112,6 @@ module Decidim
             code
           end
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
-        # rubocop:enable Metrics/PerceivedComplexity
       end
     end
   end

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

@@ -18,8 +18,8 @@ module Decidim
             sanitize_url(origin),
             {
               destination: sanitize_url(destination, strip_host: false),
-              active: active,
-              pass_query: pass_query
+              active:,
+              pass_query:
             }
           ]
         end

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

@@ -13,6 +13,10 @@ module Decidim
         attribute :intro_message, String
         attribute :auto_response, String
         attribute :auto_no_response, String
+
+        def color
+          super || current_organization.colors["secondary"] || "#E91E63"
+        end
       end
     end
   end

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

@@ -27,10 +27,10 @@ module Decidim
         def to_params
           {
             label: raw_label,
-            position: position,
-            url: url,
-            target: target,
-            visibility: visibility
+            position:,
+            url:,
+            target:,
+            visibility:
           }
         end
       end

data/app/helpers/concerns/decidim/decidim_awesome/amendments_helper_override.rb

@@ -27,13 +27,20 @@ module Decidim
         private
 
         def render_amendment_custom_fields_override(custom_fields, attribute, form, original_resource)
+          # ensure decidim_editor is available as it is only required if the original FormBuilder is called
+          append_stylesheet_pack_tag "decidim_editor"
+          append_javascript_pack_tag "decidim_editor", defer: false
+
           custom_fields.translate!
           body = amendments_form_fields_value(original_resource, attribute)
           custom_fields.apply_xml(body) if body.present?
           # TODO: find a way to add errors as form is not the parent form
           # form.object.errors.add(attribute, custom_fields.errors) if custom_fields.errors
 
-          render partial: "decidim/decidim_awesome/custom_fields/form_render", locals: { spec: custom_fields.to_json, form: form, name: attribute }
+          editor_image = Decidim::EditorImage.new
+          editor_options = form.send(:editor_options, editor_image, { context: "participant", lines: 10 })
+          editor_upload = form.send(:editor_upload, editor_image, editor_options[:upload])
+          render partial: "decidim/decidim_awesome/custom_fields/form_render", locals: { spec: custom_fields.to_json, editor_options:, editor_upload:, form:, name: attribute }
         end
 
         # Amendments don't use a URL specifying participatory space and component

data/app/helpers/concerns/decidim/decidim_awesome/breadcrumb_helper_override.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module BreadcrumbHelperOverride
+      extend ActiveSupport::Concern
+
+      included do
+        def active_breadcrumb_item(target_menu)
+          active_item = ::Decidim::MenuPresenter.new(target_menu, self).active_item_for_breadcrumb
+
+          return if active_item.blank?
+
+          {
+            label: active_item.label,
+            url: active_item.url,
+            active: active_item.active?
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -12,7 +12,7 @@ module Decidim
 
           # If the content is safe, HTML tags are sanitized, otherwise, they are stripped.
           def render_proposal_body(proposal)
-            if awesome_proposal_custom_fields.present? || awesome_config[:allow_images_in_full_editor] || awesome_config[:allow_images_in_small_editor]
+            if awesome_proposal_custom_fields.present? || awesome_config[:allow_images_in_editors]
               content = present(proposal).body(links: true, strip_tags: false)
               sanitized = decidim_sanitize_editor_admin(content, {})
               Decidim::ContentProcessor.render_without_format(sanitized).html_safe
@@ -70,12 +70,30 @@ module Decidim
           end
 
           def render_proposal_custom_fields_override(custom_fields, form, name, locale = nil)
-            custom_fields.translate!
+            # ensure decidim_editor is available as it is only required if the original FormBuilder is called
+            append_stylesheet_pack_tag "decidim_editor"
+            append_javascript_pack_tag "decidim_editor", defer: false
 
-            body = extract_body_content(name, locale)
-            apply_custom_fields(custom_fields, body, form, name)
+            custom_fields.translate!
 
-            render partial: "decidim/decidim_awesome/custom_fields/form_render", locals: { spec: custom_fields.to_json, form: form, name: name }
+            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]
+                     else
+                       form_presenter.private_body(extras: false)
+                     end
+                   elsif form_presenter.proposal.body.is_a?(Hash) && locale.present?
+                     form_presenter.body(extras: false, all_locales: locale.present?).with_indifferent_access[locale]
+                   else
+                     form_presenter.body(extras: false)
+                   end
+
+            custom_fields.apply_xml(body) if body.present?
+            form.object.errors.add(name, custom_fields.errors) if custom_fields.errors
+            editor_image = Decidim::EditorImage.new
+            editor_options = form.send(:editor_options, editor_image, { context: "participant", lines: 10 })
+            editor_upload = form.send(:editor_upload, editor_image, editor_options[:upload])
+            render partial: "decidim/decidim_awesome/custom_fields/form_render", locals: { spec: custom_fields.to_json, editor_options:, editor_upload:, form:, name: }
           end
 
           def awesome_proposal_custom_fields_for(name)
@@ -85,40 +103,6 @@ module Decidim
               Decidim::DecidimAwesome::CustomFields.new(awesome_proposal_custom_fields)
             end
           end
-
-          private
-
-          def extract_body_content(name, locale)
-            case name
-            when :private_body
-              extract_private_body(locale)
-            else
-              extract_body(locale)
-            end
-          end
-
-          def extract_private_body(locale)
-            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]
-            else
-              form_presenter.private_body(extras: false)
-            end
-          end
-
-          def extract_body(locale)
-            if form_presenter.proposal.body.is_a?(Hash) && locale.present?
-              form_presenter.body(extras: false, all_locales: locale.present?).with_indifferent_access[locale]
-            else
-              form_presenter.body(extras: false)
-            end
-          end
-
-          def apply_custom_fields(custom_fields, body, form, name)
-            if body.present?
-              custom_fields.apply_xml(body)
-              form.object.errors.add(name, custom_fields.errors) if custom_fields.errors
-            end
-          end
         end
       end
     end

data/app/helpers/decidim/decidim_awesome/admin/config_constraints_helpers.rb

@@ -11,7 +11,7 @@ module Decidim
         delegate :menus, :config_enabled?, to: "Decidim::DecidimAwesome::Menu"
 
         def check(status)
-          content_tag(:span, icon(status ? "check" : "close", class: "inline-block", aria_label: status, role: "img"), class: "text-#{status ? "success" : "alert"}")
+          content_tag(:span, icon(status ? "check-line" : "close-line", class: "inline-block", aria_label: status, role: "img"), class: "fill-#{status ? "success" : "alert"}")
         end
 
         # returns only non :disabled vars in config
@@ -50,7 +50,7 @@ module Decidim
           space = model_for_manifest(manifest)
           return {} unless space&.column_names&.include? "slug"
 
-          components = Component.where(participatory_space: space.find_by(slug: slug))
+          components = Component.where(participatory_space: space.find_by(slug:))
           components.to_h do |item|
             [item.id, "#{item.id}: #{translated_attribute(item.name)}"]
           end

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

@@ -11,14 +11,12 @@ module Decidim
 
       # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/PerceivedComplexity:
-      def awesome_map_for(components, &block)
+      def awesome_map_for(components, &)
         return unless map_utility_dynamic
 
-        map = awesome_builder.map_element({ class: "google-map", id: "awesome-map-container" }, &block)
-        help = content_tag(:div, class: "map__help") do
-          sr_content = content_tag(:p, t("screen_reader_explanation", scope: "decidim.map.dynamic"), class: "show-for-sr")
-
-          sr_content
+        map = awesome_builder.map_element({ class: "dynamic-map", id: "awesome-map-container" }, &)
+        help = content_tag(:div, class: "map__skip-container") do
+          content_tag(:p, t("screen_reader_explanation", scope: "decidim.map.dynamic"), class: "sr-only")
         end
 
         html_options = {
@@ -30,7 +28,7 @@ module Decidim
                                    type: component.manifest.name,
                                    name: translated_attribute(component.name),
                                    url: Decidim::EngineRouter.main_proxy(component).root_path,
-                                   amendments: component.manifest.name == :proposals ? Decidim::Proposals::Proposal.where(component: component).only_emendations.count : 0
+                                   amendments: component.manifest.name == :proposals ? Decidim::Proposals::Proposal.where(component:).only_emendations.count : 0
                                  }
                                end.to_json,
           "data-hide-controls" => settings_source.try(:hide_controls),
@@ -51,7 +49,7 @@ module Decidim
         }
 
         content_tag(:div, html_options) do
-          content_tag :div, class: "row column" do
+          content_tag :div, class: "w-full" do
             help + map
           end
         end
@@ -71,7 +69,6 @@ module Decidim
         try(:current_component) || self
       end
 
-      # rubocop:disable Rails/HelperInstanceVariable
       def current_categories(categories)
         return @current_categories if @current_categories
 
@@ -97,26 +94,12 @@ module Decidim
         }
         builder = map_utility_dynamic.create_builder(self, options)
 
-        # We need awesome map listeners before initialize the official map
-        unless snippets.any?(:awesome_map_styles) || snippets.any?(:awesome_map_scripts)
-          snippets.add(:awesome_map_styles, stylesheet_pack_tag("decidim_decidim_awesome_map"))
-          snippets.add(:awesome_map_scripts, javascript_pack_tag("decidim_decidim_awesome_map", defer: false))
-          snippets.add(:head, snippets.for(:awesome_map_styles))
-          snippets.add(DecidimAwesome.legacy_version? ? :head : :foot, snippets.for(:awesome_map_scripts))
-        end
-
-        unless snippets.any?(:map_styles) || snippets.any?(:map_scripts)
-          snippets.add(:map_styles, builder.stylesheet_snippets)
-          snippets.add(:map_scripts, builder.javascript_snippets)
-
-          snippets.add(:head, snippets.for(:map_styles))
-          snippets.add(DecidimAwesome.legacy_version? ? :head : :foot, snippets.for(:map_scripts))
-        end
+        append_stylesheet_pack_tag("decidim_decidim_awesome_map")
+        append_javascript_pack_tag("decidim_decidim_awesome_map")
 
         builder
       end
 
-      # rubocop:disable Style/FormatStringToken
       def append_category(category)
         @h += @golden_ratio_conjugate
         @h %= 1
@@ -129,8 +112,6 @@ module Decidim
           color: format("#%02x%02x%02x", r, g, b)
         )
       end
-      # rubocop:enable Style/FormatStringToken
-      # rubocop:enable Rails/HelperInstanceVariable
 
       # HSV values in [0..1[
       # returns [r, g, b] values from 0 to 255

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

@@ -25,7 +25,7 @@ module Decidim
           cw_uploader: Decidim::Cw::DecidimAwesome::ImageUploader,
           as_attribute: "file",
           logger: @logger,
-          routes_mappings: routes_mappings
+          routes_mappings:
         )
       end
 
@@ -34,11 +34,11 @@ module Decidim
           klass, id = mapping[:instance].split("#")
           next unless klass == "Decidim::DecidimAwesome::EditorImage"
 
-          instance = Decidim::DecidimAwesome::EditorImage.find_by(id: id)
+          instance = Decidim::DecidimAwesome::EditorImage.find_by(id:)
 
           next if instance.blank?
 
-          mapping.merge!(instance: instance)
+          mapping.merge!(instance:)
         end.compact
 
         editor_images_available_attributes.each do |model, attributes|
@@ -75,7 +75,8 @@ module Decidim
           "Decidim::Assembly" => %w(short_description description purpose_of_action composition internal_organisation announcement closing_date_reason special_features),
           "Decidim::Forms::Questionnaire" => %w(description tos),
           "Decidim::Forms::Question" => %w(description),
-          "Decidim::Organization" => %w(welcome_notification_body admin_terms_of_use_body description highlighted_content_banner_short_description id_documents_explanation_text),
+          "Decidim::Organization" => %w(welcome_notification_body admin_terms_of_service_body description highlighted_content_banner_short_description
+                                        id_documents_explanation_text),
           "Decidim::StaticPage" => %w(content),
           "Decidim::ContextualHelpSection" => %w(content),
           "Decidim::Category" => %w(description),

data/app/middleware/decidim/decidim_awesome/current_config.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop:disable Style/OpenStructUse
 module Decidim
   module DecidimAwesome
     # A middleware that stores the current awesome context by parsing the request
@@ -101,7 +100,7 @@ module Decidim
       end
 
       def safe_get_route?
-        return unless @request.get?
+        return false unless @request.get?
 
         case @request.path
         when "/"
@@ -116,7 +115,7 @@ module Decidim
       end
 
       def safe_post_route?
-        return unless @request.post? || @request.put? || @request.patch?
+        return false unless @request.post? || @request.put? || @request.patch?
 
         case @request.path
         when %r{^/admin/admin_terms}
@@ -171,7 +170,7 @@ module Decidim
           next unless model
 
           settings["participatory_space_slug"] = model.find_by(slug: settings["participatory_space_slug"])&.id
-          OpenStruct.new(settings: settings) if settings["participatory_space_slug"]
+          OpenStruct.new(settings:) if settings["participatory_space_slug"]
         end
       end
       # rubocop:enable Metrics/CyclomaticComplexity
@@ -183,4 +182,3 @@ module Decidim
     end
   end
 end
-# rubocop:enable Style/OpenStructUse

data/app/models/concerns/decidim/decidim_awesome/has_proposal_extra_fields.rb

@@ -70,7 +70,7 @@ module Decidim
         def self.all_vote_weights_for(component)
           Decidim::DecidimAwesome::VoteWeight.where(
             proposal_vote_id: Decidim::Proposals::ProposalVote.where(
-              proposal: Decidim::Proposals::Proposal.where(component: component)
+              proposal: Decidim::Proposals::Proposal.where(component:)
             )
           ).pluck(:weight)
         end

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

@@ -25,7 +25,7 @@ module Decidim
       end
 
       def self.for_organization(organization)
-        where(organization: organization)
+        where(organization:)
       end
 
       # use this instead of "constraints" to evaluate dynamically added constants