decidim-decidim_awesome 0.6.0 → 0.6.5

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(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.map { |key| [I18n.t(".menu_hacks.form.visibility.#{key}", scope: "decidim.decidim_awesome.admin"), key] }.to_h
+        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/editor_images_controller.rb

@@ -42,7 +42,7 @@ module Decidim
         {
           image: params[:image],
           author_id: current_user.id,
-          path: request.original_fullpath
+          path: request.referer
         }
       end
     end

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
@@ -12,10 +10,21 @@ module Decidim
         attribute :use_markdown_editor, Boolean
         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
+
+        def self.from_params(params, additional_params = {})
+          instance = super(params, additional_params)
+          instance.valid_keys = params.keys.map(&:to_sym) || []
+          instance
+        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/forms/decidim/decidim_awesome/editor_image_form.rb

@@ -11,6 +11,8 @@ module Decidim
 
       validates :author_id, presence: true
       validates :image, presence: true
+
+      alias organization current_organization
     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

@@ -23,7 +23,12 @@ module Decidim
                                    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-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
@@ -45,6 +50,11 @@ 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,
           "data-markers-data" => [].to_json
         }
 

data/app/models/decidim/decidim_awesome/editor_image.rb

@@ -11,9 +11,10 @@ module Decidim
       validates :organization, presence: true
       validates :author, presence: true
 
-      validates :image,
-                file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                file_content_type: { allow: ["image/jpeg", "image/png"] }
+      validates :image, presence: true
+      # validates :image,
+      #           file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
+      #           file_content_type: { allow: ["image/jpeg", "image/png"] }
 
       mount_uploader :image, Decidim::DecidimAwesome::ImageUploader
 

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,10 +10,19 @@ 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
+
+      def content_type_whitelist
+        %w(image/jpeg image/png)
+      end
+
       def max_image_height_or_width
         8000
       end

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

@@ -0,0 +1,27 @@
+<div class="row column decidim_awesome-form">
+  <% if config_enabled? :scoped_styles %>
+    <p class="help-text"><%= t("help.scoped_styles", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+    <p class="help-text">
+      <%= t("help.scoped_styles_variables", scope: "decidim.decidim_awesome.admin.config.form") %><br>
+      <% [:primary, :secondary, :success, :warning, :alert, :highlight, :highlight_alternative].each do |color| %>
+        var(--<%= color %>),
+      <% end %>
+    </p>
+
+    <% form.object.scoped_styles&.each do |key, value| %>
+      <div class="scoped-style" data-key="<%= key %>">
+        <%= label_tag :scoped_styles do %>
+          <%= 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 %>
+        <%= 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>
+    <% end %>
+
+    <%= link_to t(".new"), decidim_admin_decidim_awesome.new_scoped_style_path, method: :post %>
+
+  <% end %>
+</div>
+
+<%= javascript_include_tag "decidim/decidim_awesome/admin/form_exit_warn" %>

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

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, method: :patch, url: decidim_admin_decidim_awesome.config_path(params[:var])) do |f| %>
+<%= decidim_form_for(@form, method: :patch, url: decidim_admin_decidim_awesome.config_path(params[:var]), html: { class: "awesome-edit-config" }, data: { "safe-path" => decidim_admin_decidim_awesome.config_path(params[:var]) }) do |f| %>
   <div class="card">
     <div class="card-divider">
       <h2 class="card-title"><%= t(".title", setting: params[:var]) %></h2>

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 %>

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

@@ -0,0 +1,44 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".title") %>
+      <%= link_to t(".new"), decidim_admin_decidim_awesome.new_menu_hack_path, class: "button tiny button--title" %>
+    </h2>
+  </div>
+  <div class="card-section">
+  <div class="row column decidim_awesome-form">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th><%= t("menu.raw_label", scope: "activemodel.attributes") %></th>
+          <th><%= t("menu.url", scope: "activemodel.attributes") %></th>
+          <th><%= t("menu.position", scope: "activemodel.attributes") %></th>
+          <th><%= t("menu.target", scope: "activemodel.attributes") %></th>
+          <th><%= t("menu.visibility", scope: "activemodel.attributes") %></th>
+          <th class="actions"></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% current_items.each do |item| %>
+          <tr<%= " class=menu_hack-addition" if item.try(:overrided?) == false %>>
+            <td><%= item.label %></td>
+            <td><%= item.url %></td>
+            <td><%= item.position %></td>
+            <td><%= target_options.invert[item.try(:target)||""] %></td>
+            <td><%= visibility_options.invert[item.try(:visibility)] %></td>
+            <td class="table-list__actions">
+              <%= icon_link_to "pencil", decidim_admin_decidim_awesome.edit_menu_hack_path(md5(item.url)), t(".edit"), class: "action-icon--edit" %>
+              <% if item.respond_to?(:overrided?) %>
+                <%= icon_link_to "circle-x", decidim_admin_decidim_awesome.menu_hack_path(md5(item.url)), t(".remove#{'_hack' if item.overrided?}"), method: :delete, class: "action-icon--remove", data: { confirm: t(".confirm_destroy") } %>
+              <% else %>
+                  <span class="action-icon">
+                    <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
+                  </span>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>

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

@@ -0,0 +1,13 @@
+<%= decidim_form_for(@form, url: menu_hacks_path) 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 %>