decidim-decidim_awesome 0.6.6 → 0.8.0

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class DestroyCustomRedirect < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # item - the redirections item to destroy
+        # organization
+        def initialize(item, organization)
+          @item = item
+          @organization = organization
+          @redirections = AwesomeConfig.find_by(var: :custom_redirects, 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?
+
+          redirections.value&.except!(item.origin)
+          redirections.save!
+
+          broadcast(:ok, @item)
+        rescue StandardError => e
+          broadcast(:invalid, e.message)
+        end
+
+        private
+
+        attr_reader :organization, :item, :redirections
+
+        def url_exists?
+          return false unless redirections
+          return false unless redirections.value.is_a? Hash
+
+          redirections.value[item.origin].present?
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class DestroyProposalCustomField < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # key - the key to destroy inise proposal_custom_fields
+        # 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
+          fields = AwesomeConfig.find_by(var: :proposal_custom_fields, organization: @organization)
+          return broadcast(:invalid, "Not a hash") unless fields&.value.is_a? Hash
+          return broadcast(:invalid, "#{key} key invalid") unless fields.value.has_key?(@key)
+
+          fields.value.except!(@key)
+          fields.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: "proposal_custom_field_#{@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/destroy_scoped_admin.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class DestroyScopedAdmin < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # key - the key to destroy inside scoped_admins
+        # 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
+          admins = AwesomeConfig.find_by(var: :scoped_admins, organization: @organization)
+          return broadcast(:invalid, "Not a hash") unless admins&.value.is_a? Hash
+          return broadcast(:invalid, "#{key} key invalid") unless admins.value.has_key?(@key)
+
+          admins.value.except!(@key)
+          admins.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_admin_#{@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/destroy_scoped_style.rb

@@ -6,7 +6,7 @@ module Decidim
       class DestroyScopedStyle < Rectify::Command
         # Public: Initializes the command.
         #
-        # key - the key to destroy inise scoped_styles
+        # key - the key to destroy inside scoped_styles
         # organization
         def initialize(key, organization)
           @key = key

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

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class RenameScopeLabel < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # params - A constraint params
+        def initialize(params, organization)
+          @text = params[:text]&.strip&.gsub(" ", "_")&.parameterize&.truncate(64)
+          @scope = params[:scope]
+          @key = params[:key]
+          @attribute = params[:attribute]
+          @organization = organization
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          raise StandardError, "empty value" if @text.blank?
+          raise StandardError, "key already exists" if config.value.keys.include? @text
+
+          transaction do
+            config.value[@text] = config.value.delete @key
+            config.save!
+            if config_scope
+              config_scope.var = scope
+              config_scope.save!
+            end
+          end
+
+          broadcast(:ok, { scope: scope, key: @text })
+        rescue StandardError => e
+          broadcast(:invalid, e.message)
+        end
+
+        private
+
+        def scope
+          @scope.gsub(/_#{@key}$/, "_#{@text}")
+        end
+
+        def config
+          @config ||= Decidim::DecidimAwesome::AwesomeConfig.find_by!(var: @attribute, organization: @organization)
+        end
+
+        def config_scope
+          @config_scope ||= Decidim::DecidimAwesome::AwesomeConfig.find_by(var: @scope, organization: @organization)
+        end
+      end
+    end
+  end
+end

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

@@ -18,7 +18,11 @@ 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?
+            message = form.errors[:scoped_admins].join("; ") if @form.errors[:scoped_admins].any?
+            return broadcast(:invalid, message, form.errors)
+          end
 
           begin
             form.attributes.each do |key, val|

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class UpdateCustomRedirect < Rectify::Command
+        # Public: Initializes the command.
+        #
+        def initialize(form, item)
+          @form = form
+          @item = item
+          @redirects = AwesomeConfig.find_by(var: :custom_redirects, 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("custom_redirects.origin_missing", scope: "decidim.decidim_awesome.admin")) unless url_exists?
+
+          redirects.value&.except!(item.origin)
+          redirects.value[to_params[0]] = to_params[1]
+          redirects.save!
+
+          broadcast(:ok, redirects)
+        rescue StandardError => e
+          broadcast(:invalid, e.message)
+        end
+
+        private
+
+        attr_reader :form, :redirects, :item
+
+        delegate :to_params, to: :form
+
+        def url_exists?
+          return unless redirects
+          return unless redirects.value.is_a? Hash
+
+          redirects.value[item.origin].present?
+        end
+      end
+    end
+  end
+end

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

@@ -19,15 +19,22 @@ module Decidim
       def call
         return broadcast(:invalid) if form.invalid?
 
-        image = EditorImage.new(
+        transaction do
+          create_editor_image!
+        end
+
+        broadcast(:ok, @editor_image)
+      end
+
+      private
+
+      def create_editor_image!
+        @editor_image = EditorImage.create!(
           path: form.path,
           decidim_author_id: form.current_user.id,
           organization: form.organization,
-          image: form.image
+          file: form.file
         )
-
-        image.save!
-        broadcast(:ok, image)
       end
 
       attr_reader :form

data/app/controllers/concerns/decidim/decidim_awesome/not_found_redirect.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module NotFoundRedirect
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :redirect_unallowed_scoped_admins, only: :not_found, if: -> { request.original_fullpath =~ %r{^(/+)admin} }
+        before_action :redirect_to_custom_paths, only: :not_found, if: -> { DecidimAwesome.enabled? :custom_redirects }
+        private
+
+        def redirect_unallowed_scoped_admins
+          return unless Decidim::User.respond_to? :awesome_admins_for_current_scope
+          return unless Decidim::User.respond_to? :awesome_potential_admins
+          return unless defined? current_user
+          return unless Decidim::User.awesome_potential_admins.include? current_user.id
+
+          # assiging a flash message here does not work after redirection due the order of middleware in Rails
+          # as a workaround, send a message through a get parameter
+          path = "/admin/?unauthorized"
+          referer = request.headers["Referer"]
+          if referer
+            uri = URI(referer)
+            params = Rack::Utils.parse_query uri.query
+            unless request.params.has_key? "unauthorized"
+              params["unauthorized"] = nil
+              path = "#{uri.path}?#{Rack::Utils.build_query(params)}"
+            end
+          end
+
+          redirect_to path
+        end
+
+        def redirect_to_custom_paths
+          destination = custom_redirects_destination(request.original_fullpath)
+          redirect_to destination if destination.present?
+        end
+
+        def custom_redirects_destination(fullpath)
+          redirects = (AwesomeConfig.find_by(var: :custom_redirects, organization: current_organization)&.value || {}).filter { |_, v| v["active"] }
+          return if redirects.blank?
+          return unless redirects.is_a? Hash
+
+          path, query = fullpath.split("?")
+          destination = redirects.dig(path.downcase, "destination")
+          pass_query = redirects.dig(path.downcase, "pass_query")
+          if pass_query.present?
+            union = destination.include?("?") ? "&" : "?"
+            destination = "#{destination}#{union}#{query}"
+          end
+
+          return destination.strip if destination.present?
+        end
+      end
+    end
+  end
+end

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)
-        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
+        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
@@ -28,43 +30,54 @@ module Decidim
               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
 
-        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")
+        def users
+          respond_to do |format|
+            format.json do
+              if (term = params[:term].to_s).present?
+                query = current_organization.users.order(name: :asc)
+                query = query.where("name ILIKE :term OR nickname ILIKE :term OR email ILIKE :term", term: "%#{term}%")
+
+                render json: query.all.collect { |u| { id: u.id, text: format_user_name(u) } }
+              else
+                render json: []
+              end
             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")
+        def rename_scope_label
+          RenameScopeLabel.call(params, current_organization) do
+            on(:ok) do |result|
+              render json: result.merge({
+                                          html: render_to_string(partial: "decidim/decidim_awesome/admin/config/constraints",
+                                                                 locals: {
+                                                                   key: result[:scope],
+                                                                   constraints: constraints_for(result[:scope])
+                                                                 })
+                                        })
             end
 
             on(:invalid) do |message|
-              flash[:alert] = I18n.t("config.destroy_scoped_style.error", error: message, scope: "decidim.decidim_awesome.admin")
+              render json: { error: message }, status: :unprocessable_entity
             end
           end
-
-          redirect_to decidim_admin_decidim_awesome.config_path(:styles)
         end
 
         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
@@ -74,6 +87,14 @@ module Decidim
 
           DecidimAwesome.config.keys
         end
+
+        def users_for(ids_list)
+          Decidim::User.where(id: ids_list).map { |user| OpenStruct.new(text: format_user_name(user), id: user.id) }
+        end
+
+        def format_user_name(user)
+          "<span class='#{"is-admin" if user.read_attribute("admin")}'>#{user.name} (@#{user.nickname} - #{user.email})</span>"
+        end
       end
     end
   end

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

@@ -127,6 +127,10 @@ module Decidim
           case key
           when /^scoped_style_/
             :scoped_styles
+          when /^scoped_admin_/
+            :scoped_admins
+          when /^proposal_custom_field_/
+            :proposal_custom_fields
           else
             key
           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
@@ -85,7 +86,7 @@ module Decidim
         end
 
         def current_items
-          @current_items ||= current_menu.items(true)
+          @current_items ||= current_menu.items(include_invisible: true)
         end
 
         def current_menu
@@ -96,18 +97,14 @@ module Decidim
           :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
+          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