decidim-decidim_awesome 0.10.2 → 0.11.2

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      module ProposalFormOverride
+        extend ActiveSupport::Concern
+
+        included do
+          alias_method :decidim_original_map_model, :map_model
+          attribute :private_body, String
+
+          def map_model(model)
+            decidim_original_map_model(model)
+            self.private_body = model.private_body
+          end
+        end
+      end
+    end
+  end
+end

data/app/forms/{decidim → concerns/decidim}/decidim_awesome/proposals/proposal_wizard_create_step_form_override.rb

@@ -15,6 +15,7 @@ module Decidim
             minimum: ->(form) { form.minimum_title_length },
             maximum: 150
           }
+
           validates :body, presence: true, unless: ->(form) { form.override_validations? || form.minimum_body_length.zero? }
           validates :body, etiquette: true, unless: ->(form) { form.override_validations? }
           validates :body, proposal_length: {
@@ -27,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,16 +8,15 @@ 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 :scoped_styles, Hash
         attribute :proposal_custom_fields, Hash
+        attribute :proposal_private_custom_fields, Hash
         attribute :scoped_admins, Hash
-        attribute :menu, Array[MenuForm]
+        attribute :menu, [MenuForm]
         attribute :intergram_for_admins, Boolean
         attribute :intergram_for_admins_settings, IntergramForm
         attribute :intergram_for_public, Boolean
@@ -36,7 +35,8 @@ module Decidim
         attr_accessor :valid_keys
 
         validate :css_syntax, if: ->(form) { form.scoped_styles.present? }
-        validate :json_syntax, if: ->(form) { form.proposal_custom_fields.present? }
+        validate :json_syntax
+
         validates :validate_title_min_length, presence: true, numericality: { greater_than_or_equal_to: 1, less_than_or_equal_to: 100 }
         validates :validate_title_max_caps_percent, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 100 }
         validates :validate_title_max_marks_together, presence: true, numericality: { greater_than_or_equal_to: 1 }
@@ -65,26 +65,27 @@ 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
 
         def json_syntax
-          proposal_custom_fields.each do |key, code|
-            next unless code
+          fields = {}
+          fields.merge!(proposal_custom_fields: proposal_custom_fields.values) if proposal_custom_fields.present?
+          fields.merge!(proposal_private_custom_fields: proposal_private_custom_fields.values) if proposal_private_custom_fields.present?
+          fields.each do |key, values|
+            next if values.blank?
 
-            JSON.parse(code)
-          rescue JSON::ParserError => e
-            errors.add(:scoped_styles, I18n.t("config.form.errors.incorrect_json", key: key, scope: "decidim.decidim_awesome.admin"))
+            values.each { |code| JSON.parse(code) }
+          rescue JSON::JSONError => e
+            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
         def sanitize_labels!
-          return unless proposal_custom_fields
-
           proposal_custom_fields.transform_values! do |code|
             next unless code
 
@@ -97,6 +98,19 @@ module Decidim
           rescue JSON::ParserError
             code
           end
+
+          proposal_private_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
         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

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module AmendmentsHelperOverride
+      extend ActiveSupport::Concern
+
+      included do
+        # original method
+        alias_method :decidim_amendments_form_field_for, :amendments_form_field_for
+
+        # override with custom fields if scope applies
+        def amendments_form_field_for(attribute, form, original_resource)
+          custom_fields, custom_private_fields = awesome_custom_fields(attribute, form)
+          content = if custom_fields.blank?
+                      decidim_amendments_form_field_for(attribute, form, original_resource)
+                    else
+                      render_amendment_custom_fields_override(custom_fields, attribute, form, original_resource)
+                    end
+          if custom_private_fields.present?
+            content = content_tag("div", content)
+            content += content_tag("div", render_amendment_custom_fields_override(custom_private_fields, :private_body, form, original_resource))
+          end
+          content
+        end
+
+        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
+
+          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
+        # context for awesome config constraints must be obtained from the resource
+        def awesome_custom_fields(attribute, _form)
+          return unless attribute == :body
+
+          component = amendable.try(:component)
+          return unless component
+          return if component.settings.participatory_texts_enabled?
+
+          awesome_config = Decidim::DecidimAwesome::Config.new(component.organization)
+          awesome_config.context_from_component(component)
+
+          pub = awesome_config.collect_sub_configs_values("proposal_custom_field")
+          priv = awesome_config.collect_sub_configs_values("proposal_private_custom_field")
+          [pub.presence && Decidim::DecidimAwesome::CustomFields.new(pub), priv.presence && Decidim::DecidimAwesome::CustomFields.new(priv)]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      module ApplicationHelperOverride
+        extend ActiveSupport::Concern
+
+        included do
+          alias_method :decidim_text_editor_for_proposal_body, :text_editor_for_proposal_body
+          alias_method :decidim_render_proposal_body, :render_proposal_body
+
+          # 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_editors]
+              content = present(proposal).body(links: true, strip_tags: false)
+              sanitized = decidim_sanitize_editor_admin(content, {})
+              Decidim::ContentProcessor.render_without_format(sanitized).html_safe
+            else
+              decidim_render_proposal_body(proposal)
+            end
+          end
+
+          # replace normal method to draw the editor
+          def text_editor_for_proposal_body(form)
+            custom_fields = awesome_proposal_custom_fields_for(:body)
+            custom_private_fields = awesome_proposal_custom_fields_for(:private_body)
+
+            content = if custom_fields.empty?
+                        decidim_text_editor_for_proposal_body(form)
+                      else
+                        render_proposal_custom_fields_override(custom_fields, form, :body)
+                      end
+
+            unless custom_private_fields.empty?
+              content = content_tag("div", content)
+              content += content_tag("div", render_proposal_custom_fields_override(custom_private_fields, form, :private_body))
+            end
+            content
+          end
+
+          # replace admin method to draw the editor (multi lang)
+          def admin_editor_for_proposal_body(form)
+            custom_fields = awesome_proposal_custom_fields_for(:body)
+
+            return if custom_fields.empty?
+
+            locales = form.send(:locales)
+            return render_proposal_custom_fields_override(custom_fields, form, "body_#{locales.first}", locales.first) if locales.length == 1
+
+            tabs_id = form.send(:sanitize_tabs_selector, form.options[:tabs_id] || "#{form.object_name}-body-tabs")
+
+            label_tabs = form.content_tag(:div, class: "label--tabs") do
+              language_selector = "".html_safe
+              language_selector = form.create_language_selector(locales, tabs_id, "body") if form.options[:label] != false
+
+              safe_join [content_tag("label"), language_selector]
+            end
+
+            tabs_content = form.content_tag(:div, class: "tabs-content", data: { tabs_content: tabs_id }) do
+              locales.each_with_index.inject("".html_safe) do |string, (locale, index)|
+                tab_content_id = "#{tabs_id}-body-panel-#{index}"
+                string + content_tag(:div, class: form.send(:tab_element_class_for, "panel", index), id: tab_content_id, "aria-hidden": index.zero? ? "false" : "true") do
+                  render_proposal_custom_fields_override(custom_fields, form, "body_#{locale}", locale)
+                end
+              end
+            end
+
+            safe_join [label_tabs, tabs_content]
+          end
+
+          def render_proposal_custom_fields_override(custom_fields, form, name, locale = nil)
+            # 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 = 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)
+            if name == :private_body
+              Decidim::DecidimAwesome::CustomFields.new(awesome_proposal_private_custom_fields)
+            else
+              Decidim::DecidimAwesome::CustomFields.new(awesome_proposal_custom_fields)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,40 +8,19 @@ module Decidim
 
         include Decidim::TranslatableAttributes
 
-        def check(status)
-          content_tag(:span, icon(status ? "check" : "x", class: "icon", aria_label: status, role: "img"), class: "text-#{status ? "success" : "alert"}")
-        end
+        delegate :menus, :config_enabled?, to: "Decidim::DecidimAwesome::Menu"
 
-        def menus
-          @menus ||= {
-            editors: config_enabled?([:allow_images_in_full_editor, :allow_images_in_small_editor, :use_markdown_editor, :allow_images_in_markdown_editor]),
-            proposals: config_enabled?([:allow_images_in_proposals,
-                                        :validate_title_min_length, :validate_title_max_caps_percent,
-                                        :validate_title_max_marks_together, :validate_title_start_with_caps,
-                                        :validate_body_min_length, :validate_body_max_caps_percent,
-                                        :validate_body_max_marks_together, :validate_body_start_with_caps]),
-            surveys: config_enabled?(:auto_save_forms),
-            styles: config_enabled?(:scoped_styles),
-            proposal_custom_fields: config_enabled?(:proposal_custom_fields),
-            admins: config_enabled?(:scoped_admins),
-            menu_hacks: config_enabled?(:menu),
-            custom_redirects: config_enabled?(:custom_redirects),
-            livechat: config_enabled?([:intergram_for_admins, :intergram_for_public])
-          }
+        def check(status)
+          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
         def enabled_configs(vars)
-          vars.filter do |var|
-            config_enabled? var
+          vars.filter do |conf|
+            config_enabled?(conf)
           end
         end
 
-        # ensure boolean value
-        def config_enabled?(var)
-          DecidimAwesome.enabled?(var)
-        end
-
         def participatory_space_manifests
           manifests = OTHER_MANIFESTS.index_with { |m| I18n.t("decidim.decidim_awesome.admin.config.#{m}") }
           Decidim.participatory_space_manifests.pluck(:name).each do |name|
@@ -71,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/destroy_private_data_job.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    class DestroyPrivateDataJob < ApplicationJob
+      queue_as :default
+
+      # Destroys private data associated with the resource
+      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)
+
+        extra_fields.find_each do |extra_field|
+          extra_field.update(private_body: nil)
+        end
+
+        Lock.new(resource.organization).release!(resource)
+      end
+    end
+  end
+end

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