decidim-decidim_awesome 0.6.6 → 0.8.0

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      # Global configuration controller
+      class ProposalCustomFieldsController < DecidimAwesome::Admin::ConfigController
+        def create
+          CreateProposalCustomField.call(current_organization) do
+            on(:ok) do |key|
+              flash[:notice] = I18n.t("config.create_proposal_custom_field.success", key: key, scope: "decidim.decidim_awesome.admin")
+            end
+
+            on(:invalid) do |message|
+              flash[:alert] = I18n.t("config.create_proposal_custom_field.error", error: message, scope: "decidim.decidim_awesome.admin")
+            end
+          end
+
+          redirect_to decidim_admin_decidim_awesome.config_path(:proposal_custom_fields)
+        end
+
+        def destroy
+          DestroyProposalCustomField.call(params[:key], current_organization) do
+            on(:ok) do |key|
+              flash[:notice] = I18n.t("config.destroy_proposal_custom_field.success", key: key, scope: "decidim.decidim_awesome.admin")
+            end
+
+            on(:invalid) do |message|
+              flash[:alert] = I18n.t("config.destroy_proposal_custom_field.error", error: message, scope: "decidim.decidim_awesome.admin")
+            end
+          end
+
+          redirect_to decidim_admin_decidim_awesome.config_path(:proposal_custom_fields)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      # Global configuration controller
+      class ScopedAdminsController < DecidimAwesome::Admin::ConfigController
+        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")
+            end
+
+            on(:invalid) do |message|
+              flash[:alert] = I18n.t("config.create_scoped_admin.error", error: message, scope: "decidim.decidim_awesome.admin")
+            end
+          end
+
+          redirect_to decidim_admin_decidim_awesome.config_path(:admins)
+        end
+
+        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")
+            end
+
+            on(:invalid) do |message|
+              flash[:alert] = I18n.t("config.destroy_scoped_admin.error", error: message, scope: "decidim.decidim_awesome.admin")
+            end
+          end
+
+          redirect_to decidim_admin_decidim_awesome.config_path(:admins)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      # Global configuration controller
+      class ScopedStylesController < DecidimAwesome::Admin::ConfigController
+        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")
+            end
+
+            on(:invalid) do |message|
+              flash[:alert] = I18n.t("config.create_scoped_style.error", error: message, scope: "decidim.decidim_awesome.admin")
+            end
+          end
+
+          redirect_to decidim_admin_decidim_awesome.config_path(:styles)
+        end
+
+        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")
+            end
+
+            on(:invalid) do |message|
+              flash[:alert] = I18n.t("config.destroy_scoped_style.error", error: message, scope: "decidim.decidim_awesome.admin")
+            end
+          end
+
+          redirect_to decidim_admin_decidim_awesome.config_path(:styles)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    # Abstract component class for components without any admin controllers (only settings)
+    class BlankComponentController < Decidim::Components::BaseController
+      # just redirects to settings
+      def settings
+        redirect_to EngineRouter.admin_proxy(component.participatory_space).edit_component_path(id: component)
+      end
+
+      private
+
+      def component
+        Decidim::Component.find(params[:component_id])
+      end
+    end
+  end
+end

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

@@ -14,10 +14,9 @@ module Decidim
         enforce_permission_to :create, :editor_image, awesome_config: awesome_config
 
         @form = form(EditorImageForm).from_params(form_values)
-
         CreateEditorImage.call(@form) do
           on(:ok) do |image|
-            url = image.url
+            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") }
           end
@@ -40,7 +39,7 @@ module Decidim
 
       def form_values
         {
-          image: params[:image],
+          file: params[:image],
           author_id: current_user.id,
           path: request.referer
         }

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

@@ -3,7 +3,7 @@
 module Decidim
   module DecidimAwesome
     module IframeComponent
-      class IframeController < DecidimAwesome::IframeComponent::ApplicationController
+      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?
 

data/app/controllers/decidim/decidim_awesome/map_component/map_controller.rb

@@ -3,23 +3,16 @@
 module Decidim
   module DecidimAwesome
     module MapComponent
-      class MapController < DecidimAwesome::MapComponent::ApplicationController
+      class MapController < DecidimAwesome::BlankComponentController
         helper Decidim::DecidimAwesome::MapHelper
         helper_method :map_components
 
         def show
-          render :error unless maps_enabled?
+          render :error unless Decidim::Map.configured?
         end
 
         private
 
-        def maps_enabled?
-          return Decidim::Map.configured? if defined?(Decidim::Map)
-
-          # TODO: remove when 0.22 support is diched
-          Decidim.geocoder.present?
-        end
-
         def map_components
           @map_components ||= current_participatory_space.components.published.filter do |component|
             case component.manifest.name

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

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
+require "sassc"
+
 module Decidim
   module DecidimAwesome
     module Admin
       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_proposals, Boolean
@@ -11,6 +15,8 @@ module Decidim
         attribute :allow_images_in_markdown_editor, Boolean
         attribute :auto_save_forms, Boolean
         attribute :scoped_styles, Hash
+        attribute :proposal_custom_fields, Hash
+        attribute :scoped_admins, Hash
         attribute :menu, Array[MenuForm]
         attribute :intergram_for_admins, Boolean
         attribute :intergram_for_admins_settings, IntergramForm
@@ -20,11 +26,57 @@ module Decidim
         # collect all keys anything not specified in the params (UpdateConfig command ignores it)
         attr_accessor :valid_keys
 
+        validate :css_syntax, if: ->(form) { form.scoped_styles.present? }
+        validate :json_syntax, if: ->(form) { form.proposal_custom_fields.present? }
+
+        # TODO: validate non general admins are here
+
         def self.from_params(params, additional_params = {})
           instance = super(params, additional_params)
           instance.valid_keys = params.keys.map(&:to_sym) || []
+          instance.sanitize_labels!
           instance
         end
+
+        def css_syntax
+          scoped_styles.each do |key, code|
+            next unless code
+
+            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(key.to_sym, e.message)
+          end
+        end
+
+        def json_syntax
+          proposal_custom_fields.each do |key, code|
+            next unless code
+
+            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"))
+            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
+
+            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
   end

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

@@ -10,7 +10,9 @@ module Decidim
         attribute :component_manifest, String
         attribute :component_id, Integer
 
-        validates :component_manifest, absence: true, if: ->(form) { form.component_id.present? || form.participatory_space_manifest == "system" }
+        validates :component_manifest, absence: true, if: lambda { |form|
+          form.component_id.present? || ConfigConstraintsHelpers::OTHER_MANIFESTS.include?(form.participatory_space_manifest&.to_sym)
+        }
         validates :component_id, absence: true, if: ->(form) { form.component_manifest.present? }
       end
     end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class CustomRedirectForm < Decidim::Form
+        include Decidim::TranslatableAttributes
+        attribute :origin, String
+        attribute :destination, String
+        attribute :active, Boolean
+        attribute :pass_query, Boolean
+
+        validates :origin, :destination, presence: true
+        validate :different_origin_destination
+
+        def to_params
+          [
+            sanitize_url(origin),
+            {
+              destination: sanitize_url(destination, strip_host: false),
+              active: active,
+              pass_query: pass_query
+            }
+          ]
+        end
+
+        def sanitize_url(url, strip_host: true)
+          url = url.strip.downcase
+          parsed = Addressable::URI.parse(url)
+          url = parsed.path if strip_host && parsed.host == current_organization.host
+          url = "/#{url}" unless url.match?(%r{^https?://|^/})
+          url
+        end
+
+        private
+
+        def different_origin_destination
+          return if sanitize_url(origin) != sanitize_url(destination)
+
+          errors.add(:destination, :invalid)
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/decidim_awesome/editor_image_form.rb

@@ -5,12 +5,13 @@ module Decidim
     class EditorImageForm < Decidim::Form
       mimic :editor_image
 
-      attribute :image
+      attribute :file
       attribute :author_id, Integer
       attribute :path, String
 
       validates :author_id, presence: true
-      validates :image, presence: true
+      validates :file, presence: true
+      validates :file, passthru: { to: Decidim::DecidimAwesome::EditorImage }
 
       alias organization current_organization
     end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+# Recreate validations to take into account custom fields and ignore the length limit in proposals
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      module ProposalWizardCreateStepFormOverride
+        extend ActiveSupport::Concern
+
+        included do
+          clear_validators!
+
+          validates :title, presence: true, etiquette: true
+          validates :title, length: { in: 15..150 }
+          validates :body, presence: true, etiquette: true, unless: ->(form) { form.override_validations? }
+          validates :body, proposal_length: {
+            minimum: 15,
+            maximum: ->(record) { record.override_validations? ? 0 : record.component.settings.proposal_length }
+          }
+
+          validate :body_is_not_bare_template, unless: ->(form) { form.override_validations? }
+
+          def override_validations?
+            return false if context.current_component.settings.participatory_texts_enabled
+
+            custom_fields.present?
+          end
+
+          def custom_fields
+            awesome_config = Decidim::DecidimAwesome::Config.new(context.current_organization)
+            awesome_config.context_from_component(context.current_component)
+            awesome_config.collect_sub_configs_values("proposal_custom_field")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,10 +4,26 @@ module Decidim
   module DecidimAwesome
     module Admin
       module ConfigConstraintsHelpers
+        OTHER_MANIFESTS = [:none, :system, :process_groups].freeze
+
         include Decidim::TranslatableAttributes
 
         def check(status)
-          content_tag(:span, icon("check", class: "icon", aria_label: status, role: "img"), class: "text-#{status == :ok ? "success" : "alert"}")
+          content_tag(:span, icon(status ? "check" : "x", class: "icon", aria_label: status, role: "img"), class: "text-#{status ? "success" : "alert"}")
+        end
+
+        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),
+            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])
+          }
         end
 
         # returns only non :disabled vars in config
@@ -17,18 +33,13 @@ module Decidim
           end
         end
 
+        # ensure boolean value
         def config_enabled?(var)
-          unless var.is_a?(Array)
-            return false unless DecidimAwesome.config.has_key?(var.to_sym)
-
-            return DecidimAwesome.config.send(var) != :disabled
-          end
-
-          var.detect { |v| DecidimAwesome.config.send(v) != :disabled }
+          DecidimAwesome.enabled?(var) ? true : false
         end
 
         def participatory_space_manifests
-          manifests = { system: I18n.t("decidim.decidim_awesome.admin.config.system") }
+          manifests = OTHER_MANIFESTS.index_with { |m| I18n.t("decidim.decidim_awesome.admin.config.#{m}") }
           Decidim.participatory_space_manifests.pluck(:name).each do |name|
             manifests[name.to_sym] = I18n.t("decidim.admin.menu.#{name}")
           end
@@ -36,7 +47,7 @@ module Decidim
         end
 
         def component_manifests(space = nil)
-          return {} if space == "system"
+          return {} if OTHER_MANIFESTS.include?(space)
 
           Decidim.component_manifests.pluck(:name).map do |name|
             [name.to_sym, I18n.t("decidim.components.#{name}.name")]
@@ -44,17 +55,17 @@ module Decidim
         end
 
         def participatory_spaces_list(manifest)
-          space = participatory_space_for_manifest(manifest)
+          space = model_for_manifest(manifest)
           return {} if space.blank?
 
           space.where(organization: current_organization).map do |item|
-            [item.slug, translated_attribute(item.title)]
+            [item.try(:slug) || item.id.to_s, translated_attribute(item.title)]
           end.to_h
         end
 
         def components_list(manifest, slug)
-          space = participatory_space_for_manifest(manifest)
-          return {} if space.blank?
+          space = model_for_manifest(manifest)
+          return {} unless space&.column_names&.include? "slug"
 
           components = Component.where(participatory_space: space.find_by(slug: slug))
           components.map do |item|
@@ -82,11 +93,17 @@ module Decidim
           end
         end
 
+        def md5(text)
+          Digest::MD5.hexdigest(text)
+        end
+
         private
 
-        def participatory_space_for_manifest(manifest)
+        def model_for_manifest(manifest)
           return nil if manifest.blank?
 
+          return Decidim::ParticipatoryProcessGroup if manifest == "process_groups"
+
           space = Decidim.find_participatory_space_manifest(manifest)
           return nil unless space
 

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      module SystemCheckerHelpers
+        def decidim_version
+          Decidim.version
+        end
+
+        def decidim_version_valid?
+          @decidim_version_valid ||= Gem::Dependency.new("", DecidimAwesome::COMPAT_DECIDIM_VERSION).match?("", decidim_version, true)
+        end
+
+        def overrides
+          SystemChecker.to_h
+        end
+
+        def valid?(spec, file)
+          SystemChecker.valid?(spec, file)
+        end
+
+        def images_migrated?
+          pending_image_migrations.zero?
+        end
+
+        def pending_image_migrations
+          @pending_image_migrations ||= begin
+            images = Decidim::DecidimAwesome::EditorImage.where(organization: current_organization)
+            images.count - images.joins(:file_attachment).count
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+# 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 = awesome_custom_fields(attribute, form)
+          return decidim_amendments_form_field_for(attribute, form, original_resource) if custom_fields.blank?
+
+          render_amendment_custom_fields_override(custom_fields, attribute, form, original_resource)
+        end
+
+        private
+
+        def render_amendment_custom_fields_override(fields, attribute, form, original_resource)
+          custom_fields = Decidim::DecidimAwesome::CustomFields.new(fields)
+          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 }
+        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)
+          awesome_config.collect_sub_configs_values("proposal_custom_field")
+        end
+      end
+    end
+  end
+end