decidim-decidim_awesome 0.6.3 → 0.7.0

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

@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      # Editing menu items
+      class MenuHacksController < DecidimAwesome::Admin::ApplicationController
+        include NeedsAwesomeConfig
+        helper ConfigConstraintsHelpers
+
+        layout "decidim/admin/decidim_awesome"
+
+        helper_method :current_items, :md5, :visibility_options, :target_options
+
+        before_action do
+          enforce_permission_to :edit_config, :menu
+        end
+
+        def index; end
+
+        def new
+          @form = form(MenuForm).instance
+        end
+
+        def create
+          @form = form(MenuForm).from_params(params)
+          CreateMenuHack.call(@form, current_menu_name) do
+            on(:ok) do
+              flash[:notice] = I18n.t("menu_hacks.create.success", scope: "decidim.decidim_awesome.admin")
+              redirect_to decidim_admin_decidim_awesome.menu_hacks_path
+            end
+
+            on(:invalid) do |message|
+              flash.now[:alert] = I18n.t("menu_hacks.create.error", error: message, scope: "decidim.decidim_awesome.admin")
+              render :new
+            end
+          end
+        end
+
+        def edit
+          @form = form(MenuForm).from_model(menu_item)
+        end
+
+        def update
+          @form = form(MenuForm).from_params(params)
+          UpdateMenuHack.call(@form, current_menu_name) do
+            on(:ok) do
+              flash[:notice] = I18n.t("menu_hacks.update.success", scope: "decidim.decidim_awesome.admin")
+              redirect_to decidim_admin_decidim_awesome.menu_hacks_path
+            end
+
+            on(:invalid) do |message|
+              flash.now[:alert] = I18n.t("menu_hacks.update.error", error: message, scope: "decidim.decidim_awesome.admin")
+              render :edit
+            end
+          end
+        end
+
+        def destroy
+          DestroyMenuHack.call(menu_item, current_menu_name, current_organization) do
+            on(:ok) do
+              flash[:notice] = I18n.t("menu_hacks.destroy.success", scope: "decidim.decidim_awesome.admin")
+            end
+            on(:invalid) do |error|
+              flash[:alert] = I18n.t("menu_hacks.destroy.error", scope: "decidim.decidim_awesome.admin", error: error)
+            end
+          end
+          redirect_to decidim_admin_decidim_awesome.menu_hacks_path
+        end
+
+        private
+
+        def menu_item
+          item = current_items.find { |i| md5(i.url) == params[:id] }
+          raise ActiveRecord::RecordNotFound unless item
+
+          OpenStruct.new(
+            raw_label: item.try(:raw_label) || { current_organization.default_locale => item.label },
+            url: item.url,
+            position: item.position,
+            target: item.try(:target),
+            visibility: item.try(:visibility),
+            native?: !item.respond_to?(:overrided?)
+          )
+        end
+
+        def current_items
+          @current_items ||= current_menu.items(include_invisible: true)
+        end
+
+        def current_menu
+          @current_menu ||= MenuHacker.new(current_menu_name, self)
+        end
+
+        def current_menu_name
+          :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"
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -14,10 +14,7 @@ module Decidim
         private
 
         def maps_enabled?
-          return Decidim::Map.configured? if defined?(Decidim::Map)
-
-          # TODO: remove when 0.22 support is diched
-          Decidim.geocoder.present?
+          Decidim::Map.configured?
         end
 
         def map_components

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

@@ -3,8 +3,6 @@
 module Decidim
   module DecidimAwesome
     module Admin
-      # A form object used to configure the endpoint.
-      #
       class ConfigForm < Decidim::Form
         attribute :allow_images_in_full_editor, Boolean
         attribute :allow_images_in_small_editor, Boolean
@@ -13,10 +11,31 @@ module Decidim
         attribute :allow_images_in_markdown_editor, Boolean
         attribute :auto_save_forms, Boolean
         attribute :scoped_styles, Hash
+        attribute :menu, Array[MenuForm]
         attribute :intergram_for_admins, Boolean
         attribute :intergram_for_admins_settings, IntergramForm
         attribute :intergram_for_public, Boolean
         attribute :intergram_for_public_settings, IntergramForm
+
+        # 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? }
+
+        def self.from_params(params, additional_params = {})
+          instance = super(params, additional_params)
+          instance.valid_keys = params.keys.map(&:to_sym) || []
+          instance
+        end
+
+        def css_syntax
+          scoped_styles.each do |key, 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
       end
     end
   end

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

@@ -3,8 +3,6 @@
 module Decidim
   module DecidimAwesome
     module Admin
-      # A form object used to configure the endpoint.
-      #
       class ConstraintForm < Decidim::Form
         attribute :id, Integer
         attribute :participatory_space_manifest, String

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

@@ -3,8 +3,6 @@
 module Decidim
   module DecidimAwesome
     module Admin
-      # A form object used to configure the endpoint.
-      #
       class IntergramForm < Decidim::Form
         attribute :chat_id, String
         attribute :require_login, Boolean

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class MenuForm < Decidim::Form
+        include Decidim::TranslatableAttributes
+        VISIBILITY_STATES = %w(default hidden logged non_logged).freeze
+
+        translatable_attribute :raw_label, String
+        attribute :url, String
+        attribute :position, Integer
+        attribute :target, String
+        attribute :visibility, String
+
+        validates :raw_label, translatable_presence: true
+        validates :url, presence: true
+        validates :position, numericality: { greater_than: 0 }
+        validates :visibility, inclusion: { in: VISIBILITY_STATES }
+        validates :target, inclusion: { in: ["", "_blank"] }
+
+        # remove query string from native menu element (to avoid interactions with the locale in the generated url)
+        def map_model(model)
+          self.url = Addressable::URI.parse(model.url).path if model.native?
+        end
+
+        def to_params
+          {
+            label: raw_label,
+            position: position,
+            url: url,
+            target: target,
+            visibility: visibility
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -18,7 +18,11 @@ module Decidim
         end
 
         def config_enabled?(var)
-          return DecidimAwesome.config.send(var) != :disabled unless var.is_a? Array
+          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 }
         end

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

@@ -6,8 +6,6 @@ module Decidim
       include Decidim::MapHelper
 
       def awesome_map_for(components, &block)
-        return legacy_map_for(components, &block) unless defined?(Decidim::Map)
-
         map = dynamic_map_for({}, {}, &block)
         return unless map
 
@@ -24,57 +22,19 @@ module Decidim
                                  }
                                end.to_json,
           "data-collapsed" => current_component.settings.collapse,
-          "data-show-not-answered" => current_component.current_settings.show_not_answered,
-          "data-show-accepted" => current_component.current_settings.show_accepted,
-          "data-show-withdrawn" => current_component.current_settings.show_withdrawn,
-          "data-show-evaluating" => current_component.current_settings.show_evaluating
-          # "data-show-rejected" => current_component.current_settings.show_rejected
-        }
-        content_tag(:div, map, map_html_options)
-      end
-
-      # TODO: remove when 0.22 support is diched
-      def legacy_map_for(components)
-        return if Decidim.geocoder.blank?
-
-        map_html_options = {
-          class: "google-map",
-          id: "map",
-          "data-components" => components.map do |component|
-                                 {
-                                   id: component.id,
-                                   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
-                                 }
-                               end.to_json,
-          "data-collapsed" => current_component.settings.collapse,
+          "data-truncate" => current_component.settings.truncate,
+          "data-map-center" => current_component.settings.map_center,
+          "data-map-zoom" => current_component.settings.map_zoom,
+          "data-menu-amendments" => current_component.settings.menu_amendments,
+          "data-menu-meetings" => current_component.settings.menu_meetings,
+          "data-menu-hashtags" => current_component.settings.menu_hashtags,
           "data-show-not-answered" => current_component.current_settings.show_not_answered,
           "data-show-accepted" => current_component.current_settings.show_accepted,
           "data-show-withdrawn" => current_component.current_settings.show_withdrawn,
           "data-show-evaluating" => current_component.current_settings.show_evaluating,
-          # "data-show-rejected" => current_component.current_settings.show_rejected,
-          "data-markers-data" => [].to_json
+          "data-show-rejected" => current_component.current_settings.show_rejected
         }
-
-        if Decidim.geocoder[:here_api_key]
-          map_html_options["data-here-api-key"] = Decidim.geocoder[:here_api_key]
-        else
-          # Compatibility mode for old api_id/app_code configurations
-          map_html_options["data-here-app-id"] = Decidim.geocoder[:here_app_id]
-          map_html_options["data-here-app-code"] = Decidim.geocoder[:here_app_code]
-        end
-
-        content = capture { yield }.html_safe
-        help = content_tag(:div, class: "map__help") do
-          content_tag(:p, I18n.t("screen_reader_explanation", scope: "decidim.map.dynamic"), class: "show-for-sr")
-        end
-        content_tag :div, class: "awesome-map" do
-          map = content_tag(:div, "", map_html_options)
-
-          help + map + content
-        end
+        content_tag(:div, map, map_html_options)
       end
 
       # rubocop:disable Rails/HelperInstanceVariable
@@ -96,6 +56,7 @@ module Decidim
 
       private
 
+      # rubocop:disable Style/FormatStringToken
       def append_category(category)
         @h += @golden_ratio_conjugate
         @h %= 1
@@ -108,11 +69,12 @@ module Decidim
           color: format("#%02x%02x%02x", r, g, b)
         )
       end
+      # rubocop:enable Style/FormatStringToken
       # rubocop:enable Rails/HelperInstanceVariable
 
-      # rubocop:disable Naming/UncommunicativeMethodParamName
       # HSV values in [0..1[
       # returns [r, g, b] values from 0 to 255
+      # rubocop:disable Naming/MethodParameterName
       def hsv_to_rgb(h, s, v)
         h_i = (h * 6).to_i
         f = h * 6 - h_i
@@ -151,7 +113,7 @@ module Decidim
         end
         [(r * 256).to_i, (g * 256).to_i, (b * 256).to_i]
       end
-      # rubocop:enable Naming/UncommunicativeMethodParamName
     end
+    # rubocop:enable Naming/MethodParameterName
   end
 end

data/app/permissions/decidim/decidim_awesome/admin/permissions.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class Permissions < Decidim::DefaultPermissions
+        include ConfigConstraintsHelpers
+
+        def permissions
+          return permission_action if permission_action.scope != :admin
+
+          toggle_allow(config_enabled?(permission_action.subject)) if permission_action.action == :edit_config
+
+          permission_action
+        end
+      end
+    end
+  end
+end

data/app/permissions/decidim/decidim_awesome/permissions.rb

@@ -6,6 +6,8 @@ module Decidim
       def permissions
         return permission_action unless user
 
+        return Decidim::DecidimAwesome::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
+
         editor_image_action?
 
         permission_action

data/app/uploaders/decidim/decidim_awesome/image_uploader.rb

@@ -10,11 +10,6 @@ module Decidim
         process resize_to_fit: [nil, 237]
       end
 
-      # TODO: remove when diching 0.22 support
-      def extension_white_list
-        %w(jpg jpeg png)
-      end
-
       def extension_whitelist
         %w(jpg jpeg png)
       end

data/app/views/decidim/decidim_awesome/admin/checks/index.html.erb

@@ -57,7 +57,7 @@
         <ul class="vertical menu">
         <% {
           CSS: "//link[@rel='stylesheet'][contains(@href,'decidim_awesome/admin')]",
-          JavaScript: "//script[contains(@src,'decidim_awesome/admin')]"
+          JavaScript: "//script[contains(@src,'decidim_awesome')]"
           }.each do |part, xpath| %>
           <li>
             <%= part %>

data/app/views/decidim/decidim_awesome/admin/config/_form_styles.html.erb

@@ -14,6 +14,7 @@
           <%= t("config.scoped_styles", scope: "activemodel.attributes", id: key) %>
           <%= link_to t(".remove"), decidim_admin_decidim_awesome.destroy_scoped_style_path(key: key), method: :post, class: "float-right", data: { confirm: t(".sure_to_remove") } %>
         <% end %>
+        <p class="form-error is-visible" id="custom-style-error-<%= $key %>"><%= errors[key.to_sym].join("<br>") if errors %></p>
         <%= text_area_tag key, value, name: "config[scoped_styles][#{key}]", rows: 5 %>
         <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: "scoped_style_#{key}", constraints: constraints_for("scoped_style_#{key}") }) %>
       </div>
@@ -24,5 +25,4 @@
   <% end %>
 </div>
 
-
 <%= javascript_include_tag "decidim/decidim_awesome/admin/form_exit_warn" %>

data/app/views/decidim/decidim_awesome/admin/config/show.html.erb

@@ -4,12 +4,11 @@
       <h2 class="card-title"><%= t(".title", setting: params[:var]) %></h2>
     </div>
     <div class="card-section">
-      <%= render partial: "form_#{params[:var]}", locals: { form: f } %>
+      <%= render partial: "form_#{params[:var]}", locals: { form: f, errors: defined?(errors) ? errors : nil } %>
     </div>
   </div>
   <div class="button--double form-general-submit">
     <%= f.submit t(".update") %>
   </div>
 <% end %>
-
 <%= render partial: "modal" %>

data/app/views/decidim/decidim_awesome/admin/menu_hacks/_form.html.erb

@@ -0,0 +1,7 @@
+<div>
+    <%= form.translated :text_field, :raw_label, help_text: t(".label_help") %>
+    <%= form.text_field :url , readonly: form.object.url.present? %>
+    <%= form.text_field :position %>
+    <%= form.select :target, target_options %>
+    <%= form.select :visibility, visibility_options %>
+</div>

data/app/views/decidim/decidim_awesome/admin/menu_hacks/edit.html.erb

@@ -0,0 +1,13 @@
+<%= decidim_form_for(@form, url: menu_hack_path, method: :patch) do |f| %>
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title"><%= t ".title" %></h2>
+    </div>
+    <div class="card-section">
+      <%= render partial: "form", object: f %>
+    </div>
+  </div>
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".save") %>
+  </div>
+<% end %>