decidim-decidim_awesome 0.7.2 → 0.8.0

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

@@ -9,10 +9,17 @@ module Decidim
       class ChecksController < DecidimAwesome::Admin::ApplicationController
         include NeedsAwesomeConfig
         helper ConfigConstraintsHelpers
+        helper SystemCheckerHelpers
 
         layout "decidim/admin/decidim_awesome"
 
-        helper_method :overrides, :valid?, :decidim_version, :decidim_version_valid?, :head, :admin_head, :head_addons, :admin_addons
+        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_path
+        end
 
         private
 
@@ -24,39 +31,25 @@ module Decidim
           @admin_head = Nokogiri::HTML(render_to_string(partial: "layouts/decidim/admin/header"))
         end
 
-        def overrides
-          SystemChecker.to_h
-        end
-
-        def valid?(spec, file)
-          SystemChecker.valid?(spec, file)
-        end
-
-        def decidim_version
-          Decidim.version
-        end
-
-        def decidim_version_valid?
-          Gem::Dependency.new("", DecidimAwesome::COMPAT_DECIDIM_VERSION).match?("", decidim_version, true)
-        end
-
         def head_addons(part)
           case part
           when :CSS
-            ['<%= stylesheet_link_tag "decidim/decidim_awesome/application", media: "all" %>',
-             '<%= stylesheet_link_tag(tenant_stylesheets, media: "all") if tenant_stylesheets %>'].join("\n")
+            ['<%= stylesheet_pack_tag "decidim_decidim_awesome", media: "all" %>',
+             '<%= render(partial: "layouts/decidim/decidim_awesome/custom_styles") if awesome_custom_styles %>'].join("\n")
           when :JavaScript
             ['<%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>',
-             '<%= javascript_include_tag "decidim/decidim_awesome/application" %>'].join("\n")
+             '<%= javascript_pack_tag "decidim_decidim_awesome" %>',
+             '<%= javascript_pack_tag "decidim_decidim_awesome_custom_fields" if awesome_proposal_custom_fields %>'].join("\n")
           end
         end
 
         def admin_addons(part)
           case part
           when :CSS
-            '<%= stylesheet_link_tag "decidim/decidim_awesome/admin", media: "all" %>'
+            '<%= stylesheet_pack_tag "decidim_admin_decidim_awesome", media: "all" %>'
           when :JavaScript
-            '<%= javascript_include_tag "decidim/decidim_awesome/admin" %>'
+            ['<%= javascript_pack_tag "decidim_admin_decidim_awesome", defer: false %>',
+             '<%= javascript_pack_tag "decidim_decidim_awesome_custom_fields" if awesome_proposal_custom_fields %>'].join("\n")
           end
         end
       end

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

@@ -11,13 +11,15 @@ module Decidim
 
         layout "decidim/admin/decidim_awesome"
 
-        helper_method :constraints_for, :users_for
+        helper_method :constraints_for, :users_for, :config_var
         before_action do
           enforce_permission_to :edit_config, configs
         end
 
         def show
           @form = form(ConfigForm).from_params(organization_awesome_config)
+
+          redirect_to decidim_admin_decidim_awesome.checks_path unless config_var
         end
 
         def update
@@ -70,6 +72,12 @@ module Decidim
 
         private
 
+        def config_var
+          return params[:var] if menus.has_key?(params[:var].try(:to_sym))
+
+          menus.key(true)
+        end
+
         def constraints_for(key)
           awesome_config_instance.setting_for(key)&.constraints
         end

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

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      # Editing menu items
+      class CustomRedirectsController < DecidimAwesome::Admin::ApplicationController
+        include NeedsAwesomeConfig
+        include ConfigConstraintsHelpers
+
+        layout "decidim/admin/decidim_awesome"
+
+        before_action do
+          enforce_permission_to :edit_config, :menu
+        end
+
+        helper ConfigConstraintsHelpers
+        helper_method :current_config
+
+        def index; end
+
+        def new
+          @form = form(CustomRedirectForm).instance
+        end
+
+        def create
+          @form = form(CustomRedirectForm).from_params(params)
+          CreateCustomRedirect.call(@form) do
+            on(:ok) do
+              flash[:notice] = I18n.t("custom_redirects.create.success", scope: "decidim.decidim_awesome.admin")
+              redirect_to decidim_admin_decidim_awesome.custom_redirects_path
+            end
+
+            on(:invalid) do |message|
+              flash.now[:alert] = I18n.t("custom_redirects.create.error", error: message, scope: "decidim.decidim_awesome.admin")
+              render :new
+            end
+          end
+        end
+
+        def edit
+          @form = form(CustomRedirectForm).from_model(redirect_item)
+        end
+
+        def update
+          @form = form(CustomRedirectForm).from_params(params)
+          UpdateCustomRedirect.call(@form, redirect_item) do
+            on(:ok) do
+              flash[:notice] = I18n.t("custom_redirects.update.success", scope: "decidim.decidim_awesome.admin")
+              redirect_to decidim_admin_decidim_awesome.custom_redirects_path
+            end
+
+            on(:invalid) do |message|
+              flash.now[:alert] = I18n.t("custom_redirects.update.error", error: message, scope: "decidim.decidim_awesome.admin")
+              render :new
+            end
+          end
+        end
+
+        def destroy
+          DestroyCustomRedirect.call(redirect_item, current_organization) do
+            on(:ok) do
+              flash[:notice] = I18n.t("custom_redirects.destroy.success", scope: "decidim.decidim_awesome.admin")
+            end
+            on(:invalid) do |error|
+              flash[:alert] = I18n.t("custom_redirects.destroy.error", scope: "decidim.decidim_awesome.admin", error: error)
+            end
+          end
+          redirect_to decidim_admin_decidim_awesome.custom_redirects_path
+        end
+
+        private
+
+        def redirect_item
+          origin, item = current_config.find { |origin, _| md5(origin) == params[:id] }
+          raise ActiveRecord::RecordNotFound unless item
+
+          OpenStruct.new(
+            origin: origin,
+            destination: item["destination"],
+            active: item["active"]
+          )
+        end
+
+        def current_config
+          @current_config ||= (AwesomeConfig.find_by(var: :custom_redirects, organization: current_organization)&.value || {})
+        end
+      end
+    end
+  end
+end

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

@@ -6,11 +6,12 @@ module Decidim
       # Editing menu items
       class MenuHacksController < DecidimAwesome::Admin::ApplicationController
         include NeedsAwesomeConfig
-        helper ConfigConstraintsHelpers
+        include ConfigConstraintsHelpers
 
         layout "decidim/admin/decidim_awesome"
 
-        helper_method :current_items, :md5, :visibility_options, :target_options
+        helper ConfigConstraintsHelpers
+        helper_method :current_items, :visibility_options, :target_options
 
         before_action do
           enforce_permission_to :edit_config, :menu
@@ -96,18 +97,14 @@ module Decidim
           :menu
         end
 
-        def md5(text)
-          Digest::MD5.hexdigest(text)
-        end
-
         def visibility_options
           MenuForm::VISIBILITY_STATES.index_by { |key| I18n.t(".menu_hacks.form.visibility.#{key}", scope: "decidim.decidim_awesome.admin") }
         end
 
         def target_options
           {
-            I18n.t(".menu_hacks.form.target.self", scope: "decidim.decidim_awesome.admin") => "",
-            I18n.t(".menu_hacks.form.target.blank", scope: "decidim.decidim_awesome.admin") => "_blank"
+            I18n.t("menu_hacks.form.target.self", scope: "decidim.decidim_awesome.admin") => "",
+            I18n.t("menu_hacks.form.target.blank", scope: "decidim.decidim_awesome.admin") => "_blank"
           }
         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,20 +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?
-          Decidim::Map.configured?
-        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,5 +1,7 @@
 # frozen_string_literal: true
 
+require "sassc"
+
 module Decidim
   module DecidimAwesome
     module Admin

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

@@ -9,7 +9,21 @@ module Decidim
         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
@@ -19,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 = OTHER_MANIFESTS.map { |m| [m, I18n.t("decidim.decidim_awesome.admin.config.#{m}")] }.to_h
+          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
@@ -84,6 +93,10 @@ module Decidim
           end
         end
 
+        def md5(text)
+          Digest::MD5.hexdigest(text)
+        end
+
         private
 
         def model_for_manifest(manifest)

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/map_helper.rb

@@ -5,12 +5,16 @@ module Decidim
     module MapHelper
       include Decidim::MapHelper
 
+      def api_ready?
+        Decidim::Api::Schema.max_complexity >= 1300
+      end
+
       # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/PerceivedComplexity:
       def awesome_map_for(components, &block)
         return unless map_utility_dynamic
 
-        map = awesome_builder.map_element({ class: "google-map" }, &block)
+        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")
 
@@ -34,8 +38,10 @@ module Decidim
           "data-truncate" => global_settings.truncate || 255,
           "data-map-center" => global_settings.map_center,
           "data-map-zoom" => global_settings.map_zoom || 8,
+          "data-menu-merge-components" => global_settings.menu_merge_components,
           "data-menu-amendments" => global_settings.menu_amendments,
           "data-menu-meetings" => global_settings.menu_meetings,
+          "data-menu-categories" => global_settings.menu_categories,
           "data-menu-hashtags" => global_settings.menu_hashtags,
           "data-show-not-answered" => step_settings&.show_not_answered,
           "data-show-accepted" => step_settings&.show_accepted,
@@ -66,14 +72,14 @@ module Decidim
       end
 
       # rubocop:disable Rails/HelperInstanceVariable
-      def current_categories
+      def current_categories(categories)
         return @current_categories if @current_categories
 
         @golden_ratio_conjugate = 0.618033988749895
         # @h = rand # use random start value
-        @h = 0.4
+        @h = 0.41
         @current_categories = []
-        current_participatory_space.categories.first_class.each do |category|
+        categories.first_class.each do |category|
           append_category category
           category.subcategories.each do |subcat|
             append_category subcat
@@ -91,19 +97,19 @@ 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)
+          snippets.add(:awesome_map, javascript_pack_tag("decidim_decidim_awesome_map", defer: false))
+          snippets.add(:awesome_map, stylesheet_pack_tag("decidim_decidim_awesome_map"))
+          snippets.add(:head, snippets.for(:awesome_map))
+        end
+
         unless snippets.any?(:map)
           snippets.add(:map, builder.stylesheet_snippets)
           snippets.add(:map, builder.javascript_snippets)
           snippets.add(:head, snippets.for(:map))
         end
 
-        unless snippets.any?(:awesome_map)
-          snippets.add(:awesome_map, stylesheet_link_tag("decidim/decidim_awesome/awesome_map/map"))
-          snippets.add(:awesome_map, javascript_include_tag("decidim/decidim_awesome/awesome_map/map"))
-          snippets.add(:awesome_map, javascript_include_tag("decidim/decidim_awesome/awesome_map/load_map"))
-          snippets.add(:head, snippets.for(:awesome_map))
-        end
-
         builder
       end
 
@@ -112,7 +118,7 @@ module Decidim
         @h += @golden_ratio_conjugate
         @h %= 1
         # r,g,b = hsv_to_rgb(@h, 0.5, 0.95)
-        r, g, b = hsv_to_rgb(@h, 0.99, 0.96)
+        r, g, b = hsv_to_rgb(@h, 0.99, 0.95)
         @current_categories.append(
           id: category.id,
           name: translated_attribute(category.name),

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

@@ -61,8 +61,8 @@ module Decidim
             custom_fields = Decidim::DecidimAwesome::CustomFields.new(fields)
             custom_fields.translate!
 
-            body = if form_presenter.proposal.body.is_a?(Hash) && locale
-                     form_presenter.body(extras: false, all_locales: true)[locale]
+            body = if form_presenter.proposal.body.is_a?(Hash) && locale.present?
+                     form_presenter.body(extras: false, all_locales: true).with_indifferent_access[locale]
                    else
                      form_presenter.body(extras: false)
                    end