decidim-decidim_awesome 0.6.0 → 0.6.5

data/app/assets/javascripts/decidim/decidim_awesome/editors/quill_editor.js.es6

@@ -12,7 +12,7 @@
   // Redefines Quill editor with images
   if(exports.DecidimAwesome.allow_images_in_full_editor  || exports.DecidimAwesome.allow_images_in_small_editor || exports.DecidimAwesome.use_markdown_editor) {
 
-    const quillFormats = ["bold", "italic", "link", "underline", "header", "list", "video", "image"];
+    const quillFormats = ["bold", "italic", "link", "underline", "header", "list", "video", "image", "alt"];
 
     const createQuillEditor = (container) => {
       const toolbar = $(container).data("toolbar");

data/app/assets/stylesheets/decidim/decidim_awesome/admin.scss

@@ -43,3 +43,7 @@
     padding-bottom: 0;
   }
 }
+
+tbody tr.menu_hack-addition {
+  background: rgb(255, 248, 222);
+}

data/app/awesome_overrides/presenters/decidim/menu_presenter_override.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+Decidim::MenuPresenter.class_eval do
+  def evaluated_menu
+    @evaluated_menu ||= if Decidim::DecidimAwesome.config.send(@name) == :disabled
+                          begin
+                            menu = Decidim::Menu.new(@name)
+                            menu.build_for(@view)
+                            menu
+                          end
+                        else
+                          Decidim::DecidimAwesome::MenuHacker.new(@name, @view)
+                        end
+  end
+end
+
+Decidim::MenuItemPresenter.class_eval do
+  def link_to(name = nil, options = nil, html_options = nil, &block)
+    html_options ||= {}
+    html_options[:target] = @menu_item.try(:target)
+
+    options ||= html_options
+    @view.link_to(name, options, html_options, &block)
+  end
+
+  def active
+    return @menu_item.active.call(url, @view) if @menu_item.try(:active).respond_to?(:call)
+
+    @menu_item&.active
+  end
+end

data/app/awesome_overrides/presenters/decidim/proposals/proposal_presenter_override.rb

@@ -2,8 +2,30 @@
 
 # Tune Proposal presenter to use markdown if configured
 Decidim::Proposals::ProposalPresenter.class_eval do
-  def body(links: false, extras: true, strip_tags: false)
-    if respond_to? :translated_attribute
+  # rubocop:disable Metrics/CyclomaticComplexity
+  # rubocop:disable Metrics/PerceivedComplexity
+  def body(links: false, extras: true, strip_tags: false, all_locales: false)
+    return unless proposal
+
+    if defined? handle_locales
+      return handle_locales(proposal.body, all_locales) do |content|
+        content = strip_tags(sanitize_text(content)) if strip_tags
+
+        renderer = Decidim::ContentRenderers::HashtagRenderer.new(content)
+        content = renderer.render(links: links, extras: extras).html_safe
+
+        if use_markdown?(proposal) && !all_locales # avoid rendering in editors
+          content = render_markdown(content)
+        elsif links
+          content = Decidim::ContentRenderers::LinkRenderer.new(content).render
+        end
+        content
+      end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
+
+    if defined? translated_attribute
       text = translated_attribute(proposal.body)
 
       text = strip_tags(sanitize_text(text)) if strip_tags
@@ -17,9 +39,7 @@ Decidim::Proposals::ProposalPresenter.class_eval do
     text = renderer.render(links: links, extras: extras).html_safe
 
     if use_markdown? proposal
-      text = Decidim::DecidimAwesome::ContentRenderers::MarkdownRenderer.new(text).render
-      # HACK: to avoid the replacement of lines to <br> that simple_format does
-      text = text.gsub(">\n", ">").gsub("\n<", "<")
+      text = render_markdown(text)
     elsif links
       text = Decidim::ContentRenderers::LinkRenderer.new(text).render
     end
@@ -35,4 +55,10 @@ Decidim::Proposals::ProposalPresenter.class_eval do
     config.context_from_component proposal
     config.enabled_for? :use_markdown_editor
   end
+
+  def render_markdown(content)
+    content = Decidim::DecidimAwesome::ContentRenderers::MarkdownRenderer.new(content).render
+    # HACK: to avoid the replacement of lines to <br> that simple_format does
+    content.gsub(">\n", ">").gsub("\n<", "<")
+  end
 end

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class CreateMenuHack < Rectify::Command
+        # Public: Initializes the command.
+        #
+        def initialize(form, menu_name)
+          @form = form
+          @menu = AwesomeConfig.find_or_initialize_by(var: menu_name, organization: form.current_organization)
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+          return broadcast(:invalid, I18n.t("menu_hacks.url_exists", scope: "decidim.decidim_awesome.admin")) if url_exists?
+
+          menu.value = [] unless menu.value.is_a? Array
+          menu.value << to_params
+          menu.save!
+          broadcast(:ok, menu)
+        rescue StandardError => e
+          broadcast(:invalid, e.message)
+        end
+
+        private
+
+        attr_reader :form, :menu
+
+        def url_exists?
+          return false unless menu
+
+          menu.value&.detect { |i| i["url"] == form.url.gsub(/\?.*/, "") }
+        end
+
+        def to_params
+          params = form.to_params
+          url = Addressable::URI.parse(params[:url])
+          params[:url] = url.path if url.host == form.current_organization.host
+          params
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class CreateScopedStyle < Rectify::Command
+        # Public: Initializes the command.
+        #
+        def initialize(organization)
+          @organization = organization
+          @ident = rand(36**8).to_s(36)
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          styles = AwesomeConfig.find_or_initialize_by(var: :scoped_styles, organization: @organization)
+          styles.value = {} unless styles.value.is_a? Hash
+          # TODO: prevent (unlikely) colisions with exisiting values
+          styles.value[@ident] = ""
+          styles.save!
+
+          broadcast(:ok, @ident)
+        rescue StandardError => e
+          broadcast(:invalid, e.message)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class DestroyMenuHack < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # item - the menu item to destroy
+        # organization
+        def initialize(item, menu_name, organization)
+          @item = item
+          @organization = organization
+          @menu = AwesomeConfig.find_by(var: menu_name, organization: organization)
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) unless url_exists?
+
+          menu.value&.reject! { |i| i["url"] == item.url }
+          menu.save!
+
+          broadcast(:ok, @item)
+        rescue StandardError => e
+          broadcast(:invalid, e.message)
+        end
+
+        private
+
+        attr_reader :organization, :item, :menu
+
+        def url_exists?
+          return false unless menu
+          return false unless menu.value.is_a? Array
+
+          menu.value&.detect { |i| i["url"] == item.url }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class DestroyScopedStyle < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # key - the key to destroy inise scoped_styles
+        # organization
+        def initialize(key, organization)
+          @key = key
+          @organization = organization
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          styles = AwesomeConfig.find_by(var: :scoped_styles, organization: @organization)
+          return broadcast(:invalid, "Not a hash") unless styles&.value.is_a? Hash
+          return broadcast(:invalid, "#{key} key invalid") unless styles.value.has_key?(@key)
+
+          styles.value.except!(@key)
+          styles.save!
+          # remove constrains associated (a new config var is generated automatically, by removing it, it will trigger destroy on dependents)
+          constraint = AwesomeConfig.find_by(var: "scoped_style_#{@key}", organization: @organization)
+          constraint.destroy! if constraint.present?
+
+          broadcast(:ok, @key)
+        rescue StandardError => e
+          broadcast(:invalid, e.message)
+        end
+      end
+    end
+  end
+end

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

@@ -23,7 +23,7 @@ module Decidim
           begin
             form.attributes.each do |key, val|
               # ignore nil attributes (must specifically be set to false if necessary)
-              next if val.nil?
+              next unless form.valid_keys.include?(key)
 
               setting = AwesomeConfig.find_or_initialize_by(var: key, organization: form.current_organization)
 

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class UpdateMenuHack < Rectify::Command
+        # Public: Initializes the command.
+        #
+        def initialize(form, menu_name)
+          @form = form
+          @menu = AwesomeConfig.find_or_initialize_by(var: menu_name, organization: form.current_organization)
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          menu.value = [] unless menu.value.is_a? Array
+          menu.value = menu.value.filter { |i| i.is_a? Hash }
+          found = false
+          menu.value.map! do |item|
+            if item["url"] == form.url
+              found = true
+              form.to_params
+            else
+              item
+            end
+          end
+          menu.value << form.to_params unless found
+          menu.save!
+          broadcast(:ok, menu)
+        rescue StandardError => e
+          broadcast(:invalid, e.message)
+        end
+
+        private
+
+        attr_reader :form, :menu
+      end
+    end
+  end
+end

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

@@ -19,12 +19,14 @@ module Decidim
       def call
         return broadcast(:invalid) if form.invalid?
 
-        image = EditorImage.create!(
-          image: form.image,
+        image = EditorImage.new(
           path: form.path,
           decidim_author_id: form.current_user.id,
-          organization: form.current_organization
+          organization: form.organization,
+          image: form.image
         )
+
+        image.save!
         broadcast(:ok, image)
       end
 

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

@@ -9,9 +9,10 @@ module Decidim
       # Note that it inherits from `Decidim::Admin::Components::BaseController`, which
       # override its layout and provide all kinds of useful methods.
       class ApplicationController < Decidim::Admin::ApplicationController
-        # def permission_class_chain
-        #   [::Decidim::DecidimAwesome::Admin::Permissions] + super
-        # end
+        def permission_class_chain
+          [::Decidim::DecidimAwesome::Admin::Permissions] + super
+        end
+
         before_action do
           enforce_permission_to :update, :organization, organization: current_organization
         end

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

@@ -12,14 +12,16 @@ module Decidim
         layout "decidim/admin/decidim_awesome"
 
         helper_method :constraints_for
+        before_action do
+          enforce_permission_to :edit_config, configs
+        end
 
         def show
           @form = form(ConfigForm).from_params(organization_awesome_config)
         end
 
         def update
-          @form = form(ConfigForm).from_params(params)
-
+          @form = form(ConfigForm).from_params(params[:config])
           UpdateConfig.call(@form) do
             on(:ok) do
               flash[:notice] = I18n.t("config.update.success", scope: "decidim.decidim_awesome.admin")
@@ -33,11 +35,45 @@ module Decidim
           end
         end
 
+        def new_scoped_style
+          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_scoped_style
+          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
+
         private
 
         def constraints_for(key)
           awesome_config_instance.setting_for(key)&.constraints
         end
+
+        def configs
+          return params[:config].keys if params.has_key?(:config)
+
+          DecidimAwesome.config.keys
+        end
       end
     end
   end

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

@@ -9,6 +9,9 @@ module Decidim
         helper ConfigConstraintsHelpers
 
         layout false
+        before_action do
+          enforce_permission_to :edit_config, constraint_key
+        end
 
         def new
           @form = form(ConstraintForm).from_params(filtered_params, setting: current_setting)
@@ -118,6 +121,16 @@ module Decidim
         def current_setting
           awesome_config_instance.setting_for params[:key]
         end
+
+        def constraint_key
+          key = params[:key] || constraint.awesome_config.var
+          case key
+          when /^scoped_style_/
+            :scoped_styles
+          else
+            key
+          end
+        end
       end
     end
   end