decidim-admin 0.31.8 → 0.32.0.rc1

data/app/controllers/decidim/admin/area_types_controller.rb

@@ -34,7 +34,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("area_types.create.error", scope: "decidim.admin")
-            render :new, status: :unprocessable_entity
+            render :new, status: :unprocessable_content
           end
         end
       end
@@ -56,7 +56,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("area_types.update.error", scope: "decidim.admin")
-            render :edit, status: :unprocessable_entity
+            render :edit, status: :unprocessable_content
           end
         end
       end

data/app/controllers/decidim/admin/areas_controller.rb

@@ -6,6 +6,7 @@ module Decidim
     #
     class AreasController < Decidim::Admin::ApplicationController
       include Decidim::Admin::Concerns::HasTabbedMenu
+
       helper Decidim::Admin::AreasHelper
 
       layout "decidim/admin/settings"
@@ -35,7 +36,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("areas.create.error", scope: "decidim.admin")
-            render :new, status: :unprocessable_entity
+            render :new, status: :unprocessable_content
           end
         end
       end
@@ -57,7 +58,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("areas.update.error", scope: "decidim.admin")
-            render :edit, status: :unprocessable_entity
+            render :edit, status: :unprocessable_content
           end
         end
       end

data/app/controllers/decidim/admin/block_user_controller.rb

@@ -10,8 +10,6 @@ module Decidim
       def new
         enforce_permission_to :block, :admin_user
 
-        return redirect_to(officializations_path, alert: I18n.t("officializations.block.no_user", scope: "decidim.admin")) unless user
-
         @form = form(BlockUserForm).from_model(user)
         @form.hide = params[:hide] || false
       end
@@ -29,7 +27,7 @@ module Decidim
 
           on(:invalid) do
             flash[:alert] = I18n.t("officializations.block.error", scope: "decidim.admin")
-            render :new, status: :unprocessable_entity
+            render :new, status: :unprocessable_content
           end
         end
       end
@@ -57,7 +55,6 @@ module Decidim
       end
 
       def bulk_create
-        enforce_permission_to :block, :admin_user
         @form = form(BlockUsersForm).from_params(params)
 
         Admin::BulkBlockUsers.call(@form) do
@@ -68,13 +65,12 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("officializations.bulk_action.block.invalid", scope: "decidim.admin")
-            render :bulk_new, status: :unprocessable_entity
+            render :bulk_new, status: :unprocessable_content
           end
         end
       end
 
       def bulk_destroy
-        enforce_permission_to :block, :admin_user
         Admin::BulkUnblockUsers.call(blocked_users, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("officializations.bulk_action.unblock.success", scope: "decidim.admin")

data/app/controllers/decidim/admin/component_permissions_controller.rb

@@ -26,7 +26,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = t("component_permissions.update.error", scope: "decidim.admin")
-            render action: :edit, status: :unprocessable_entity
+            render action: :edit, status: :unprocessable_content
           end
         end
       end

data/app/controllers/decidim/admin/components/base_controller.rb

@@ -10,6 +10,7 @@ module Decidim
 
         include Decidim::Admin::ParticipatorySpaceAdminContext
         include Decidim::NeedsPermission
+
         participatory_space_admin_layout
 
         helper Decidim::ResourceHelper
@@ -25,7 +26,7 @@ module Decidim
 
         before_action :enforce_component_permissions
 
-        before_action :set_component_breadcrumb_item
+        before_action :set_breadcrumb_items
 
         def permissions_context
           super.merge(
@@ -71,9 +72,7 @@ module Decidim
           end
         end
 
-        protected
-
-        def set_component_breadcrumb_item
+        def set_breadcrumb_items
           context_breadcrumb_items << {
             label: t("components", scope: "decidim.admin.menu"),
             url: parent_path,

data/app/controllers/decidim/admin/components_controller.rb

@@ -7,6 +7,7 @@ module Decidim
     #
     class ComponentsController < Decidim::Admin::ApplicationController
       include Decidim::Admin::HasTrashableResources
+
       helper_method :manifest
 
       def index
@@ -47,7 +48,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("components.create.error", scope: "decidim.admin")
-            render action: "new", status: :unprocessable_entity
+            render action: "new", status: :unprocessable_content
           end
         end
       end
@@ -74,7 +75,7 @@ module Decidim
 
           on(:invalid) do
             flash[:alert] = I18n.t("components.update.error", scope: "decidim.admin")
-            render action: :edit, status: :unprocessable_entity
+            render action: :edit, status: :unprocessable_content
           end
         end
       end
@@ -86,7 +87,7 @@ module Decidim
 
         Decidim::Commands::SoftDeleteResource.call(trashable_deleted_resource, current_user) do
           on(:ok) do
-            Decidim::Reminder.where(component: resource).destroy_all # rubocop:disable Decidim/OrganizationScopedFinder -- resource is the soft-deleted component, already scoped to current_participatory_space via query_scope
+            Decidim::Reminder.where(component: resource).destroy_all
             flash[:notice] = I18n.t("soft_delete.success", scope: trashable_i18n_scope, resource_name: human_readable_resource_name.capitalize)
             redirect_to_resource_index
           end
@@ -135,9 +136,9 @@ module Decidim
       end
 
       def share
-        enforce_permission_to :share, :component
         @component = query_scope.find(params[:id])
         share_token = @component.share_tokens.create!(user: current_user, organization: current_organization)
+
         redirect_to share_token.url
       end
 

data/app/controllers/decidim/admin/concerns/has_attachment_collections.rb

@@ -39,7 +39,7 @@ module Decidim
 
               on(:invalid) do
                 flash.now[:alert] = I18n.t("attachment_collections.create.error", scope: "decidim.admin")
-                render template: "decidim/admin/attachment_collections/new", status: :unprocessable_entity
+                render template: "decidim/admin/attachment_collections/new", status: :unprocessable_content
               end
             end
           end
@@ -64,7 +64,7 @@ module Decidim
 
               on(:invalid) do
                 flash.now[:alert] = I18n.t("attachment_collections.update.error", scope: "decidim.admin")
-                render template: "decidim/admin/attachment_collections/edit", status: :unprocessable_entity
+                render template: "decidim/admin/attachment_collections/edit", status: :unprocessable_content
               end
             end
           end
@@ -82,8 +82,6 @@ module Decidim
             redirect_to after_destroy_path
           end
 
-          protected
-
           # Public: Returns a String or Object that will be passed to `redirect_to` after
           # destroying an attachment collection. By default it redirects to the object
           # that holds the attachment collection.

data/app/controllers/decidim/admin/concerns/has_attachments.rb

@@ -39,7 +39,7 @@ module Decidim
 
               on(:invalid) do
                 flash.now[:alert] = I18n.t("attachments.create.error", scope: "decidim.admin")
-                render template: "decidim/admin/attachments/new", status: :unprocessable_entity
+                render template: "decidim/admin/attachments/new", status: :unprocessable_content
               end
             end
           end
@@ -64,7 +64,7 @@ module Decidim
 
               on(:invalid) do
                 flash.now[:alert] = I18n.t("attachments.update.error", scope: "decidim.admin")
-                render template: "decidim/admin/attachments/edit", status: :unprocessable_entity
+                render template: "decidim/admin/attachments/edit", status: :unprocessable_content
               end
             end
           end
@@ -82,8 +82,6 @@ module Decidim
             redirect_to after_destroy_path
           end
 
-          protected
-
           # Public: Returns a String or Object that will be passed to `redirect_to` after
           # destroying an attachment. By default it redirects to the attached_to.
           #

data/app/controllers/decidim/admin/concerns/has_breadcrumb_items.rb

@@ -7,16 +7,12 @@ module Decidim
         extend ActiveSupport::Concern
 
         class_methods do
-          protected
-
           def add_breadcrumb_item_from_menu(target_menu, opts = {})
             before_action -> { secondary_breadcrumb_menus << target_menu }, opts
           end
         end
 
         included do
-          protected
-
           def secondary_breadcrumb_menus
             @secondary_breadcrumb_menus ||= []
           end

data/app/controllers/decidim/admin/conflicts_controller.rb

@@ -18,6 +18,8 @@ module Decidim
       def edit
         enforce_permission_to :index, :impersonatable_user
 
+        conflict = Decidim::Verifications::Conflict.find(params[:id])
+
         @form = form(TransferUserForm).from_params(
           user: conflict.current_user,
           managed_user: conflict.managed_user,
@@ -28,6 +30,8 @@ module Decidim
       def update
         enforce_permission_to :index, :impersonatable_user
 
+        conflict = Decidim::Verifications::Conflict.find(params[:id])
+
         @form = form(TransferUserForm).from_params(
           current_user:,
           conflict:,
@@ -43,17 +47,13 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("error", scope: "decidim.admin.conflicts.transfer")
-            render action: "edit", status: :unprocessable_entity
+            render action: "edit", status: :unprocessable_content
           end
         end
       end
 
       private
 
-      def conflict
-        @conflict ||= collection.find(params.require(:id))
-      end
-
       def context_breadcrumb_items
         @context_breadcrumb_items ||= [impersonations_breadcrumb_item]
       end
@@ -67,7 +67,7 @@ module Decidim
 
       def collection
         @collection ||= Decidim::Verifications::Conflict.joins(:current_user).where(
-          decidim_users: { organization: current_organization }
+          decidim_users: { decidim_organization_id: current_organization.id }
         )
       end
 

data/app/controllers/decidim/admin/exports_controller.rb

@@ -15,7 +15,7 @@ module Decidim
 
         flash[:notice] = t("decidim.admin.exports.notice")
 
-        redirect_back(fallback_location: manage_component_path(component))
+        redirect_back_or_to(manage_component_path(component))
       end
 
       private

data/app/controllers/decidim/admin/global_moderations/reports_controller.rb

@@ -9,8 +9,6 @@ module Decidim
 
         include Decidim::Admin::GlobalModerationContext
 
-        protected
-
         def moderation
           @moderation ||= moderations_for_user.find(params[:moderation_id])
         end

data/app/controllers/decidim/admin/global_moderations_controller.rb

@@ -9,8 +9,6 @@ module Decidim
 
       include Decidim::Admin::GlobalModerationContext
 
-      protected
-
       # Private: This method is used by the `Filterable` concern as the base query
       # without applying filtering and/or sorting options.
       def collection

data/app/controllers/decidim/admin/help_sections_controller.rb

@@ -12,17 +12,17 @@ module Decidim
 
       helper_method :sections
 
-      def show
+      before_action do
         enforce_permission_to :update, :help_sections
+      end
 
+      def show
         @form = form(HelpSectionsForm).from_model(
           OpenStruct.new(sections:)
         )
       end
 
       def update
-        enforce_permission_to :update, :help_sections
-
         @form = form(HelpSectionsForm).from_params(
           params[:help_sections]
         )

data/app/controllers/decidim/admin/impersonations_controller.rb

@@ -46,13 +46,12 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("impersonations.create.error", scope: "decidim.admin")
-            render :new, status: :unprocessable_entity
+            render :new, status: :unprocessable_content
           end
         end
       end
 
       def close_session
-        enforce_permission_to :close_session, :managed_user
         CloseSessionManagedUser.call(user, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("impersonations.close_session.success", scope: "decidim.admin")
@@ -83,7 +82,7 @@ module Decidim
         )
         return nil unless handler.unique_id
 
-        existing_authorization = Authorization.find_by( # rubocop:disable Decidim/OrganizationScopedFinder -- user: subquery scopes to current_organization
+        existing_authorization = Authorization.find_by(
           user: User.where(organization: current_organization),
           name: handler_name,
           unique_id: handler.unique_id

data/app/controllers/decidim/admin/imports_controller.rb

@@ -5,6 +5,7 @@ module Decidim
     # This controller allows admins to import resources from a file.
     class ImportsController < Decidim::Admin::ApplicationController
       include Decidim::ComponentPathHelper
+
       before_action :set_import_breadcrumb_item
 
       helper_method :import_manifest
@@ -39,7 +40,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = t("decidim.admin.imports.error")
-            render :new, status: :unprocessable_entity
+            render :new, status: :unprocessable_content
           end
         end
       end

data/app/controllers/decidim/admin/managed_users/impersonation_logs_controller.rb

@@ -11,7 +11,7 @@ module Decidim
         def index
           enforce_permission_to :index, :impersonatable_user
 
-          @impersonation_logs = user.impersonation_logs.order(started_at: :desc).page(params[:page]).per(15)
+          @impersonation_logs = Decidim::ImpersonationLog.where(user:).order(started_at: :desc).page(params[:page]).per(15)
         end
 
         private

data/app/controllers/decidim/admin/managed_users/promotions_controller.rb

@@ -25,7 +25,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("managed_users.promotion.error", scope: "decidim.admin")
-              render :new, status: :unprocessable_entity
+              render :new, status: :unprocessable_content
             end
           end
         end

data/app/controllers/decidim/admin/moderated_users_controller.rb

@@ -34,7 +34,6 @@ module Decidim
       end
 
       def bulk_unreport
-        enforce_permission_to :unreport, :moderate_users
         Admin::BulkUnreportUsers.call(current_user, reportables) do
           on(:ok) do
             flash[:notice] = I18n.t("reportable.bulk_action.ignore.success", scope: "decidim.moderations.admin")
@@ -68,8 +67,6 @@ module Decidim
         Decidim::Admin::ModerationStats.new(current_user).user_reports
       end
 
-      protected
-
       def collection
         @collection ||= if params[:blocked]
                           base_query_finder.blocked

data/app/controllers/decidim/admin/moderations_controller.rb

@@ -73,8 +73,6 @@ module Decidim
       end
 
       def bulk_action
-        enforce_permission_to :bulk_action, authorization_scope
-
         Admin::BulkAction.call(current_user, params[:bulk_action], selected_moderations) do
           on(:ok) do |ok, ko|
             flash[:notice] = I18n.t("reportable.bulk_action.#{params[:bulk_action]}.success", scope: "decidim.moderations.admin", count_ok: ok.count) if ok.count.positive?
@@ -94,8 +92,6 @@ module Decidim
         query_params[:q] || { s: "created_at desc" }
       end
 
-      protected
-
       # Private: This method is used by the `Filterable` concern as the base query
       #          without applying filtering and/or sorting options.
       def collection

data/app/controllers/decidim/admin/newsletter_templates_controller.rb

@@ -12,12 +12,9 @@ module Decidim
         enforce_permission_to :index, :newsletter
       end
 
-      def show
-        enforce_permission_to :index, :newsletter
-      end
+      def show; end
 
       def preview
-        enforce_permission_to :index, :newsletter
         email = NewsletterMailer.newsletter(current_user, fake_newsletter, true)
         Premailer::Rails::Hook.perform(email)
         render html: email.html_part.body.decoded.html_safe

data/app/controllers/decidim/admin/newsletters_controller.rb

@@ -7,6 +7,7 @@ module Decidim
       include Decidim::NewslettersHelper
       include Decidim::Admin::NewslettersHelper
       include Paginable
+
       helper_method :newsletter, :recipients_count_query, :content_block, :selected_options, :newsletter_params
 
       def index
@@ -31,7 +32,7 @@ module Decidim
         NewsletterMailer.newsletter(current_user, newsletter).deliver_later
         flash[:notice] = I18n.t("newsletters.send_to_user.sent_successfully", scope: "decidim.admin", email: current_user.email)
 
-        redirect_back fallback_location: newsletters_path
+        redirect_back_or_to(newsletters_path)
       end
 
       def preview
@@ -44,7 +45,7 @@ module Decidim
 
       def create
         enforce_permission_to :create, :newsletter
-        @form = form(NewsletterForm).from_params(params)
+        @form = form(NewsletterForm).from_params(params, content_block:)
         @form.images = images_block_context unless has_images_block_context?
 
         CreateNewsletter.call(@form, content_block) do
@@ -55,9 +56,8 @@ module Decidim
 
           on(:invalid) do |newsletter|
             @newsletter = newsletter
-            @form.images = content_block.images_container
             flash.now[:error] = I18n.t("newsletters.create.error", scope: "decidim.admin")
-            render action: :new, status: :unprocessable_entity
+            render action: :new, status: :unprocessable_content
           end
         end
       end
@@ -69,7 +69,7 @@ module Decidim
 
       def update
         enforce_permission_to(:update, :newsletter, newsletter:)
-        @form = form(NewsletterForm).from_params(params)
+        @form = form(NewsletterForm).from_params(params, content_block:)
         @form.images = images_block_context unless has_images_block_context?
 
         UpdateNewsletter.call(newsletter, @form) do
@@ -81,7 +81,7 @@ module Decidim
           on(:invalid) do |newsletter|
             @newsletter = newsletter
             flash.now[:error] = I18n.t("newsletters.update.error", scope: "decidim.admin")
-            render action: :edit, status: :unprocessable_entity
+            render action: :edit, status: :unprocessable_content
           end
         end
       end
@@ -113,7 +113,6 @@ module Decidim
       end
 
       def recipients_count
-        enforce_permission_to :read, :newsletter, newsletter:
         @form = form(SelectiveNewsletterForm).from_params(newsletter_params)
         render plain: recipients_count_query
       end
@@ -130,12 +129,12 @@ module Decidim
 
           on(:invalid) do
             flash.now[:error] = I18n.t("newsletters.deliver.error", scope: "decidim.admin")
-            render action: :select_recipients_to_deliver, status: :unprocessable_entity
+            render action: :select_recipients_to_deliver, status: :unprocessable_content
           end
 
           on(:no_recipients) do
             flash.now[:error] = I18n.t("newsletters.send.no_recipients", scope: "decidim.admin")
-            render action: :select_recipients_to_deliver, status: :unprocessable_entity
+            render action: :select_recipients_to_deliver, status: :unprocessable_content
           end
         end
       end
@@ -157,7 +156,7 @@ module Decidim
           :send_to_verified_users,
           :send_to_followers,
           :send_to_participants,
-          :send_to_private_members,
+          :send_to_members,
           verification_types: [],
           participatory_space_types: {
             assemblies: [:manifest_name, { ids: [] }],
@@ -183,8 +182,6 @@ module Decidim
         end
       end
 
-      protected
-
       def collection
         @collection ||= Newsletter.where(organization: current_organization)
       end

data/app/controllers/decidim/admin/officializations_controller.rb

@@ -22,8 +22,6 @@ module Decidim
       def new
         enforce_permission_to :create, :officialization
 
-        return redirect_to(officializations_path, alert: I18n.t("officializations.create.no_user_found", scope: "decidim.admin")) unless user
-
         @form = form(OfficializationForm).from_model(user)
       end
 

data/app/controllers/decidim/admin/organization_appearance_controller.rb

@@ -25,7 +25,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("organization.update.error", scope: "decidim.admin")
-            render :edit, status: :unprocessable_entity
+            render :edit, status: :unprocessable_content
           end
         end
       end

data/app/controllers/decidim/admin/organization_controller.rb

@@ -29,7 +29,36 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("organization.update.error", scope: "decidim.admin")
-            render :edit, status: :unprocessable_entity
+            render :edit, status: :unprocessable_content
+          end
+        end
+      end
+
+      def users
+        search(current_organization.users.available)
+      end
+
+      private
+
+      def search(relation)
+        respond_to do |format|
+          format.json do
+            if (term = params[:term].to_s).present?
+              query = if term.start_with?("@")
+                        nickname = term.delete("@")
+                        relation.where("nickname LIKE ?", "#{nickname}%")
+                                .order(Arel.sql(ActiveRecord::Base.sanitize_sql_array("similarity(nickname, '#{nickname}') DESC")))
+                      else
+                        relation.where("name ILIKE ?", "%#{term}%").or(
+                          relation.where("email ILIKE ?", "%#{term}%")
+                        )
+                                .order(Arel.sql(ActiveRecord::Base.sanitize_sql_array("GREATEST(similarity(name, '#{term}'), similarity(email, '#{term}')) DESC")))
+                                .order(Arel.sql(ActiveRecord::Base.sanitize_sql_array("(similarity(name, '#{term}') + similarity(email, '#{term}')) / 2 DESC")))
+                      end
+              render json: query.all.collect { |u| { value: u.id, label: "#{u.name} (@#{u.nickname})" } }
+            else
+              render json: []
+            end
           end
         end
       end

data/app/controllers/decidim/admin/organization_external_domain_allowlist_controller.rb

@@ -25,7 +25,7 @@ module Decidim
           end
           on(:invalid) do
             flash[:notice] = t("domain_allowlist.update.error", scope: "decidim.admin")
-            render action: "edit", status: :unprocessable_entity
+            render action: "edit", status: :unprocessable_content
           end
         end
       end

data/app/controllers/decidim/admin/organization_homepage_controller.rb

@@ -10,18 +10,14 @@ module Decidim
 
       add_breadcrumb_item_from_menu :admin_settings_menu
 
-      helper_method :scoped_resource
+      def content_block_scope
+        :homepage
+      end
 
       def scoped_resource
         nil
       end
 
-      protected
-
-      def content_block_scope
-        :homepage
-      end
-
       def enforce_permission_to_update_resource
         enforce_permission_to :update, :organization, organization: current_organization
       end