decidim-decidim_awesome 0.6.3 → 0.7.0

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

@@ -0,0 +1,16 @@
+.awesome-edit-config{
+  .scoped-style{
+    .form-error {
+      margin: 0;
+    }
+    >.CodeMirror{
+      border-top: .5em solid #f6f6f6;
+      border-right: .5em solid #f6f6f6;
+      min-height: 6em;
+      height: auto;
+      max-height: 40em;
+      resize: vertical;
+      overflow: vertical !important;
+    }
+  }
+}

data/app/assets/stylesheets/decidim/decidim_awesome/awesome_map/leaflet.scss.erb

@@ -7,3 +7,12 @@
 .leaflet-default-icon-path {
   background-image: url(<%= asset_path "marker-icon.png" %>);
 }
+.leaflet-container {
+  font: inherit;
+
+  #bodyContent .description {
+    img, iframe {
+      max-height: 5em;
+    }
+  }
+}

data/app/assets/stylesheets/decidim/decidim_awesome/awesome_map/map.scss

@@ -63,4 +63,99 @@
     border: 2px solid #bbb;
     border-radius: 4px;
   }
+
+  .awesome_map-title-control{
+    display: block;
+    cursor: pointer;
+
+    &::after{
+      content: '';
+      width: 0;
+      height: 0;
+      border-left: 5px solid transparent;
+      border-right: 5px solid transparent;
+      border-top: 5px solid black;
+      border-bottom: 0;
+      display: inline-block;
+      margin: 0 0 2px 5px;
+    }
+  }
+
+  .active{
+    .awesome_map-title-control::after{
+      border-top: 0;
+      border-bottom: 5px solid black;
+    }
+  }
+
+  #awesome_map-{
+    &categories-control{
+      display: none;
+
+      label{
+        margin-left: .5rem;
+        display: none;
+
+        i{
+          display: inline-block;
+          width: .8rem;
+          height: .8rem;
+          border-radius: 50%;
+          background-color: var(-- primary);
+        }
+
+        &.subcategory{
+          padding-left: 1em;
+        }
+      }
+
+      .categories-container{
+        display: none;
+      }
+
+      &.active{
+        .categories-container{
+          display: block;
+        }
+      }
+    }
+
+    &hashtags-control{
+      display: none;
+
+      label{
+        display: inline-block;
+        line-height: 1;
+        background-color: #f0f0f0;
+        border-radius: 5px;
+        margin: .5rem;
+        padding: .5rem;
+
+        span{
+          margin: 0 .5rem 2px 0;
+        }
+
+        input{
+          vertical-align: top;
+        }
+      }
+
+      .awesome_map-toggle_all_tags{
+        margin: .5rem 1rem;
+        font-size: .875rem;
+      }
+
+      .hashtags-container,
+      .awesome_map-toggle_all_tags{
+        display: none;
+      }
+
+      &.active{
+        .hashtags-container,
+        .awesome_map-toggle_all_tags{
+          display: block;
+        }
+      }
+    }
+  }
 }

data/app/assets/stylesheets/decidim/decidim_awesome/editors/markdown_editor.scss

@@ -1,6 +1,6 @@
 // editor tweaks
 //
-.CodeMirror{
+.editor .CodeMirror{
   color: #333;
   font-weight: normal;
   line-height: 1.45;

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+Decidim::MenuPresenter.class_eval do
+  def evaluated_menu
+    @evaluated_menu ||= if awesome_override?
+                          Decidim::DecidimAwesome::MenuHacker.new(@name, @view)
+                        else
+                          begin
+                            menu = Decidim::Menu.new(@name)
+                            menu.build_for(@view)
+                            menu
+                          end
+                        end
+  end
+
+  private
+
+  def awesome_override?
+    return false unless Decidim::DecidimAwesome.config.has_key?(@name)
+
+    Decidim::DecidimAwesome.config.send(@name) != :disabled
+  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

@@ -25,15 +25,9 @@ Decidim::Proposals::ProposalPresenter.class_eval do
     # 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
-    else
-      # TODO: remove when 0.22 is diched
-      text = proposal.body
-      text = strip_tags(text) if strip_tags
-    end
+    # TODO: remove when 0.23 is ditched
+    text = translated_attribute(proposal.body)
+    text = strip_tags(sanitize_text(text)) if strip_tags
 
     renderer = Decidim::ContentRenderers::HashtagRenderer.new(text)
     text = renderer.render(links: links, extras: extras).html_safe

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

@@ -18,12 +18,15 @@ module Decidim
         #
         # Returns nothing.
         def call
-          return broadcast(:invalid) if form.invalid?
+          if form.invalid?
+            message = form.errors[:scoped_styles].join("; ") if @form.errors[:scoped_styles].any?
+            return broadcast(:invalid, message, form.errors)
+          end
 
           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/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/checks_controller.rb

@@ -37,7 +37,7 @@ module Decidim
         end
 
         def decidim_version_valid?
-          Gem::Dependency.new("", DecidimAwesome::COMPAT_DECIDIM_VERSION).match?("", decidim_version)
+          Gem::Dependency.new("", DecidimAwesome::COMPAT_DECIDIM_VERSION).match?("", decidim_version, true)
         end
 
         def head_addons(part)

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

@@ -12,22 +12,25 @@ 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")
               redirect_to decidim_admin_decidim_awesome.config_path
             end
 
-            on(:invalid) do |message|
+            on(:invalid) do |message, err|
               flash.now[:alert] = I18n.t("config.update.error", error: message, scope: "decidim.decidim_awesome.admin")
-              render :show
+              render :show, locals: { errors: err.presence }
             end
           end
         end
@@ -65,6 +68,12 @@ module Decidim
         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