decidim-admin 0.28.5 → 0.29.0.rc1

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

@@ -9,7 +9,7 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
-        include Decidim::Paginable
+        include Decidim::Admin::Paginable
         include Decidim::TranslatableAttributes
 
         helper Decidim::Admin::FilterableHelper
@@ -20,12 +20,15 @@ module Decidim
                       :filters,
                       :filters_with_values,
                       :find_dynamic_translation,
+                      :filter_prefix_key,
                       :query,
                       :query_params,
                       :query_params_with,
                       :query_params_without,
+                      :blank_query_params,
                       :ransack_params,
-                      :search_field_predicate
+                      :search_field_predicate,
+                      :adjacent_items
 
         delegate :categories, to: :current_component
         delegate :scopes, to: :current_organization
@@ -36,10 +39,70 @@ module Decidim
 
         private
 
+        def check_admin_session_filters
+          if (current_filters = ransack_params).present?
+            admin_session_filters = session["admin_filters"] || {}
+            return if admin_session_filters[filter_prefix_key] == current_filters
+
+            current_filters = {} if current_filters[:reset_filters] == "true"
+
+            admin_session_filters[filter_prefix_key] = current_filters
+            session["admin_filters"] = admin_session_filters
+
+            redirect_to url_for(query_params.merge(q: {})) if current_filters.blank?
+          else
+            @session_filter_params = {} unless session_filter_params.is_a?(Hash)
+            redirect_to url_for(query_params_with(session_filter_params)) if session_filter_params.present?
+          end
+        end
+
         def filtered_collection
           paginate(query.result)
         end
 
+        def session_filtered_collection
+          @session_filtered_collection ||= begin
+            query = base_query.ransack(session_filter_params, search_context: :admin, auth_object: current_user).result
+            # The limit reorders as pagination does
+            query.limit(query.count)
+          end
+        end
+
+        # This method takes the query used by filter and selects the id of
+        # each item of the filtered collection (this extra select id avoids
+        # some errors where the SQL of the filtered collection query uses
+        # aliases and the id is not available in the result) and uses the lag
+        # and lead window functions which returns the previous and next ids in
+        # the query
+        def adjacent_items(item)
+          query =
+            <<-SQL.squish
+              WITH
+                collection AS (#{session_filtered_collection.select(:id).to_sql}),
+                successors AS (
+                  SELECT
+                    id,
+                    Lag(id, 1) OVER () prev_item,
+                    Lead(id, 1) OVER () next_item
+                  FROM
+                    collection
+                )
+              SELECT
+                prev_item,
+                next_item
+              FROM
+                successors
+              WHERE
+                successors.id = #{item.id}
+            SQL
+
+          (ActiveRecord::Base.connection.exec_query(query).first || {}).compact_blank.transform_values { |id| collection.find_by(id:) }
+        end
+
+        def filter_prefix_key
+          @filter_prefix_key ||= controller_name.to_sym
+        end
+
         def base_query
           raise NotImplementedError, "A base query is needed to filter admin resources"
         end
@@ -63,14 +126,26 @@ module Decidim
           query_params[:q] || {}
         end
 
+        def session_filter_params
+          @session_filter_params ||= (session["admin_filters"] || {}).with_indifferent_access.fetch(filter_prefix_key, {})
+        end
+
         # For injecting ransack params while keeping query params in links.
         def query_params_with(hash)
           query_params.merge(q: ransack_params.merge(hash))
         end
 
         # For rejecting ransack params while keeping query params in links.
-        def query_params_without(*filters)
-          query_params.merge(q: ransack_params.except(*filters))
+        def query_params_without(*)
+          q = ransack_params.except(*)
+
+          return blank_query_params if q.blank?
+
+          query_params.merge(q:)
+        end
+
+        def blank_query_params
+          query_params.merge(q: { reset_filters: true })
         end
 
         # Ransack predicate to use in the search_form_for.

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

@@ -10,7 +10,7 @@ module Decidim
       included do
         # Private: Overwrites the method from the parent controller so that the
         # permission system does not overwrite permissions.
-        def permission_resource
+        def authorization_scope
           :global_moderation
         end
 

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

@@ -45,7 +45,6 @@ module Decidim
         return true if participatory_process_user_role?
         return true if assembly_user_role?
         return true if conference_user_role?
-        return true if voting_monitoring_commitee_member?
 
         false
       end
@@ -67,12 +66,6 @@ module Decidim
 
         true if Decidim::ConferenceUserRole.exists?(user: current_user)
       end
-
-      def voting_monitoring_commitee_member?
-        return false unless Decidim.module_installed?(:elections)
-
-        true if Decidim::Votings::MonitoringCommitteeMember.exists?(user: current_user)
-      end
     end
   end
 end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Admin
+    module Paginable
+      # Common logic to paginate admin resources
+      extend ActiveSupport::Concern
+
+      included do
+        include Decidim::Paginable
+
+        def per_page
+          params[:per_page].present? ? params[:per_page].to_i : Decidim::Admin.per_page_range.first
+        end
+      end
+    end
+  end
+end

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

@@ -33,7 +33,7 @@ module Decidim
         end
 
         # Public: Returns a String or Object that will be passed to `redirect_to` after
-        # exporing a space. By default it redirects to the root_path.
+        # exploring a space. By default it redirects to the root_path.
         #
         # It can be redefined at controller level if you need to redirect elsewhere.
         def after_export_path

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

@@ -9,6 +9,7 @@ module Decidim
       include NeedsPasswordChange
       include NeedsSnippets
       include NeedsAdminTosAccepted
+      include NeedsRtlDirection
       include FormFactory
       include LocaleSwitcher
       include UseOrganizationTimeZone
@@ -17,7 +18,6 @@ module Decidim
       include Headers::ContentSecurityPolicy
       include DisableRedirectionToExternalHost
       include Decidim::Admin::Concerns::HasBreadcrumbItems
-      include ActiveStorage::SetCurrent
 
       helper Decidim::Admin::ApplicationHelper
       helper Decidim::Admin::AttributesDisplayHelper
@@ -26,6 +26,7 @@ module Decidim
       helper Decidim::Admin::IconWithTooltipHelper
       helper Decidim::Admin::MenuHelper
       helper Decidim::Admin::ScopesHelper
+      helper Decidim::Admin::Paginable::PerPageHelper
       helper Decidim::DecidimFormHelper
       helper Decidim::ReplaceButtonsHelper
       helper Decidim::ScopesHelper

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

@@ -2,7 +2,7 @@
 
 module Decidim
   module Admin
-    # Controller that allows managing areatypes to group areas
+    # Controller that allows managing area types to group areas
 
     class AreaTypesController < Decidim::Admin::ApplicationController
       include Decidim::Admin::Concerns::HasTabbedMenu
@@ -26,7 +26,7 @@ module Decidim
         enforce_permission_to :create, :area_type
         @form = form(AreaTypeForm).from_params(params)
 
-        CreateAreaType.call(@form, current_user) do
+        CreateAreaType.call(@form) do
           on(:ok) do
             flash[:notice] = I18n.t("area_types.create.success", scope: "decidim.admin")
             redirect_to area_types_path
@@ -48,7 +48,7 @@ module Decidim
         enforce_permission_to(:update, :area_type, area_type:)
         @form = form(AreaTypeForm).from_params(params)
 
-        UpdateAreaType.call(area_type, @form, current_user) do
+        UpdateAreaType.call(@form, area_type) do
           on(:ok) do
             flash[:notice] = I18n.t("area_types.update.success", scope: "decidim.admin")
             redirect_to area_types_path
@@ -64,13 +64,12 @@ module Decidim
       def destroy
         enforce_permission_to(:destroy, :area_type, area_type:)
 
-        Decidim.traceability.perform_action!("delete", area_type, current_user) do
-          area_type.destroy!
+        Decidim::Commands::DestroyResource.call(area_type, current_user) do
+          on(:ok) do
+            flash[:notice] = I18n.t("area_types.destroy.success", scope: "decidim.admin")
+            redirect_to area_types_path
+          end
         end
-
-        flash[:notice] = I18n.t("area_types.destroy.success", scope: "decidim.admin")
-
-        redirect_to area_types_path
       end
 
       private

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

@@ -48,7 +48,7 @@ module Decidim
         enforce_permission_to(:update, :area, area:)
         @form = form(AreaForm).from_params(params)
 
-        UpdateArea.call(area, @form) do
+        UpdateArea.call(@form, area) do
           on(:ok) do
             flash[:notice] = I18n.t("areas.update.success", scope: "decidim.admin")
             redirect_to areas_path

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

@@ -10,7 +10,7 @@ module Decidim
       def index
         enforce_permission_to :index, :authorization_workflow
 
-        @workflows = Decidim::Verifications.admin_workflows.select do |manifest|
+        @workflows = Decidim::Verifications.workflows.select do |manifest|
           current_organization.available_authorizations.include?(manifest.name.to_s)
         end
 

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

@@ -22,7 +22,7 @@ module Decidim
         BlockUser.call(@form) do
           on(:ok) do
             flash[:notice] = I18n.t("officializations.block.success", scope: "decidim.admin")
-            redirect_to moderated_users_path, notice:
+            redirect_to moderated_users_path(blocked: true), notice:
           end
 
           on(:invalid) do

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

@@ -24,7 +24,7 @@ module Decidim
         enforce_permission_to :create, :category
         @form = form(CategoryForm).from_params(params, current_participatory_space:)
 
-        CreateCategory.call(@form, current_participatory_space, current_user) do
+        CreateCategory.call(@form) do
           on(:ok) do
             flash[:notice] = I18n.t("categories.create.success", scope: "decidim.admin")
             redirect_to categories_path(current_participatory_space)
@@ -46,7 +46,7 @@ module Decidim
         enforce_permission_to :update, :category, category: @category
         @form = form(CategoryForm).from_params(params, current_participatory_space:)
 
-        UpdateCategory.call(@category, @form, current_user) do
+        UpdateCategory.call(@form, @category) do
           on(:ok) do
             flash[:notice] = I18n.t("categories.update.success", scope: "decidim.admin")
             redirect_to categories_path(current_participatory_space)

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

@@ -20,7 +20,7 @@ module Decidim
         enforce_permission_to(:update, :component, component:)
         @permissions_form = PermissionsForm.from_params(params)
 
-        UpdateComponentPermissions.call(@permissions_form, component, resource, current_user) do
+        UpdateComponentPermissions.call(@permissions_form, component, resource) do
           on(:ok) do
             flash[:notice] = t("component_permissions.update.success", scope: "decidim.admin")
             redirect_to return_path

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

@@ -35,7 +35,7 @@ module Decidim
 
         CreateComponent.call(@form) do
           on(:ok) do
-            if (landing_page_path = participatory_space_landing_page_path(@component)).present?
+            if (landing_page_path = participatory_space_landing_page_path(resource)).present?
               flash[:notice_html] = I18n.t("components.create.success_landing_page", landing_page_path:, scope: "decidim.admin").html_safe
             else
               flash[:notice] = I18n.t("components.create.success", scope: "decidim.admin")
@@ -63,7 +63,7 @@ module Decidim
         @form = form(@component.form_class).from_params(component_params)
         enforce_permission_to :update, :component, component: @component
 
-        UpdateComponent.call(@form, @component, current_user) do
+        UpdateComponent.call(@form, @component) do
           on(:ok) do |settings_changed, previous_settings, current_settings|
             handle_component_settings_change(previous_settings, current_settings) if settings_changed
 

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

@@ -31,7 +31,7 @@ module Decidim
             enforce_permission_to :create, :attachment_collection
             @form = form(AttachmentCollectionForm).from_params(params, collection_for:)
 
-            CreateAttachmentCollection.call(@form, collection_for, current_user) do
+            CreateAttachmentCollection.call(@form, collection_for) do
               on(:ok) do
                 flash[:notice] = I18n.t("attachment_collections.create.success", scope: "decidim.admin")
                 redirect_to action: :index
@@ -56,7 +56,7 @@ module Decidim
             enforce_permission_to :update, :attachment_collection, attachment_collection: @attachment_collection
             @form = form(AttachmentCollectionForm).from_params(params, collection_for:)
 
-            UpdateAttachmentCollection.call(@attachment_collection, @form, current_user) do
+            UpdateAttachmentCollection.call(@attachment_collection, @form) do
               on(:ok) do
                 flash[:notice] = I18n.t("attachment_collections.update.success", scope: "decidim.admin")
                 redirect_to action: :index

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

@@ -31,7 +31,7 @@ module Decidim
             enforce_permission_to(:create, :attachment, attached_to:)
             @form = form(::Decidim::Admin::AttachmentForm).from_params(params, attached_to:)
 
-            CreateAttachment.call(@form, attached_to, current_user) do
+            CreateAttachment.call(@form, attached_to) do
               on(:ok) do
                 flash[:notice] = I18n.t("attachments.create.success", scope: "decidim.admin")
                 redirect_to action: :index
@@ -56,7 +56,7 @@ module Decidim
             enforce_permission_to(:update, :attachment, attachment:)
             @form = form(::Decidim::Admin::AttachmentForm).from_params(attachment_params, attached_to:)
 
-            UpdateAttachment.call(@attachment, @form, current_user) do
+            UpdateAttachment.call(@attachment, @form) do
               on(:ok) do
                 flash[:notice] = I18n.t("attachments.update.success", scope: "decidim.admin")
                 redirect_to action: :index

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

@@ -33,7 +33,7 @@ module Decidim
             enforce_permission_to :create, :space_private_user
             @form = form(ParticipatorySpacePrivateUserForm).from_params(params, privatable_to:)
 
-            CreateParticipatorySpacePrivateUser.call(@form, current_user, current_participatory_space) do
+            CreateParticipatorySpacePrivateUser.call(@form, current_participatory_space) do
               on(:ok) do
                 flash[:notice] = I18n.t("participatory_space_private_users.create.success", scope: "decidim.admin")
                 redirect_to action: :index

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

@@ -26,7 +26,7 @@ module Decidim
             enforce_permission_to :csv_import, :space_private_user
             @form = form(ParticipatorySpacePrivateUserCsvImportForm).from_params(params, privatable_to:)
 
-            ProcessParticipatorySpacePrivateUserImportCsv.call(@form, current_user, current_participatory_space) do
+            ProcessParticipatorySpacePrivateUserImportCsv.call(@form, current_participatory_space) do
               on(:ok) do
                 flash[:notice] = I18n.t("participatory_space_private_users_csv_imports.create.success", scope: "decidim.admin")
                 redirect_to after_import_path

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

@@ -3,16 +3,18 @@
 module Decidim
   module Admin
     class ConflictsController < Decidim::Admin::ApplicationController
-      include Decidim::Admin::VerificationConflicts::Filterable
-
       layout "decidim/admin/users"
 
-      helper_method :context_breadcrumb_items, :conflicts
+      helper_method :context_breadcrumb_items
 
       add_breadcrumb_item_from_menu :impersonate_menu
 
       def index
         enforce_permission_to :index, :impersonatable_user
+
+        @conflicts = Decidim::Verifications::Conflict.joins(:current_user).where(
+          decidim_users: { decidim_organization_id: current_organization.id }
+        )
       end
 
       def edit
@@ -47,7 +49,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("error", scope: "decidim.admin.conflicts.transfer")
-            render action: "edit"
+            redirect_to decidim.root_path
           end
         end
       end
@@ -64,16 +66,6 @@ module Decidim
           url: decidim_admin.impersonatable_users_path
         }
       end
-
-      def collection
-        @collection ||= Decidim::Verifications::Conflict.joins(:current_user).where(
-          decidim_users: { decidim_organization_id: current_organization.id }
-        )
-      end
-
-      def conflicts
-        @conflicts ||= filtered_collection.order(created_at: :desc)
-      end
     end
   end
 end

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

@@ -27,7 +27,7 @@ module Decidim
           params[:help_sections]
         )
 
-        UpdateHelpSections.call(@form, current_organization, current_user) do
+        UpdateHelpSections.call(@form, current_organization) do
           on(:ok) do
             flash[:notice] = t("help_sections.success", scope: "decidim.admin")
             redirect_to action: :show

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

@@ -29,7 +29,6 @@ module Decidim
 
         @form = form(ImpersonateUserForm).from_params(
           user:,
-          name: params[:impersonate_user][:name],
           handler_name:,
           reason: params[:impersonate_user][:reason],
           authorization: Decidim::AuthorizationHandler.handler_for(

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

@@ -17,7 +17,7 @@ module Decidim
           enforce_permission_to(:promote, :managed_user, user:)
           @form = form(ManagedUserPromotionForm).from_params(params)
 
-          PromoteManagedUser.call(@form, user, current_user) do
+          PromoteManagedUser.call(@form, user) do
             on(:ok) do
               flash[:notice] = I18n.t("managed_users.promotion.success", scope: "decidim.admin")
               redirect_to impersonatable_users_path

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

@@ -5,14 +5,14 @@ module Decidim
     module Moderations
       # This controller allows admins to manage reports in a moderation.
       class ReportsController < Decidim::Admin::ApplicationController
-        helper_method :moderation, :reports, :permission_resource
+        helper_method :moderation, :reports, :authorization_scope
 
         def index
-          enforce_permission_to :read, permission_resource
+          enforce_permission_to :read, authorization_scope
         end
 
         def show
-          enforce_permission_to :read, permission_resource
+          enforce_permission_to :read, authorization_scope
           @report = reports.find(params[:id])
         end
 
@@ -30,7 +30,7 @@ module Decidim
           @participatory_space_moderations ||= Decidim::Moderation.where(participatory_space: current_participatory_space)
         end
 
-        def permission_resource
+        def authorization_scope
           :moderation
         end
       end

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

@@ -6,21 +6,21 @@ module Decidim
     class ModerationsController < Decidim::Admin::ApplicationController
       include Decidim::Moderations::Admin::Filterable
 
-      helper_method :moderations, :allowed_to?, :query, :permission_resource
+      helper_method :moderations, :allowed_to?, :query, :authorization_scope
 
       before_action :set_moderation_breadcrumb_item
 
       def index
-        enforce_permission_to :read, permission_resource
+        enforce_permission_to :read, authorization_scope
       end
 
       def show
-        enforce_permission_to :read, permission_resource
+        enforce_permission_to :read, authorization_scope
         @moderation = collection.find(params[:id])
       end
 
       def unreport
-        enforce_permission_to :unreport, permission_resource
+        enforce_permission_to :unreport, authorization_scope
 
         Admin::UnreportResource.call(reportable, current_user) do
           on(:ok) do
@@ -36,7 +36,7 @@ module Decidim
       end
 
       def hide
-        enforce_permission_to :hide, permission_resource
+        enforce_permission_to :hide, authorization_scope
 
         Admin::HideResource.call(reportable, current_user) do
           on(:ok) do
@@ -52,7 +52,7 @@ module Decidim
       end
 
       def unhide
-        enforce_permission_to :unhide, permission_resource
+        enforce_permission_to :unhide, authorization_scope
 
         Admin::UnhideResource.call(reportable, current_user) do
           on(:ok) do
@@ -102,7 +102,7 @@ module Decidim
       # added so that the `GlobalModerationController` can overwrite this method
       # and define the custom permission resource, so that the permission system
       # is not overridden.
-      def permission_resource
+      def authorization_scope
         :moderation
       end
 

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

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

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

@@ -37,7 +37,7 @@ module Decidim
       def preview
         enforce_permission_to(:read, :newsletter, newsletter:)
 
-        email = NewsletterMailer.newsletter(current_user, newsletter, preview: true)
+        email = NewsletterMailer.newsletter(current_user, newsletter, true)
         Premailer::Rails::Hook.perform(email)
         render html: email.html_part.body.decoded.html_safe
       end
@@ -47,7 +47,7 @@ module Decidim
         @form = form(NewsletterForm).from_params(params)
         @form.images = images_block_context unless has_images_block_context?
 
-        CreateNewsletter.call(@form, content_block, current_user) do
+        CreateNewsletter.call(@form, content_block) do
           on(:ok) do |newsletter|
             flash.now[:notice] = I18n.t("newsletters.create.success", scope: "decidim.admin")
             redirect_to action: :show, id: newsletter.id
@@ -71,7 +71,7 @@ module Decidim
         @form = form(NewsletterForm).from_params(params)
         @form.images = images_block_context unless has_images_block_context?
 
-        UpdateNewsletter.call(newsletter, @form, current_user) do
+        UpdateNewsletter.call(newsletter, @form) do
           on(:ok) do |newsletter|
             flash[:notice] = I18n.t("newsletters.update.success", scope: "decidim.admin")
             redirect_to action: :show, id: newsletter.id
@@ -89,7 +89,7 @@ module Decidim
         enforce_permission_to(:destroy, :newsletter, newsletter:)
 
         DestroyNewsletter.call(newsletter, current_user) do
-          on(:already_sent) do
+          on(:invalid) do
             flash.now[:error] = I18n.t("newsletters.destroy.error_already_sent", scope: "decidim.admin")
             redirect_to :back
           end
@@ -108,8 +108,7 @@ module Decidim
       end
 
       def recipients_count
-        data = params.permit(newsletter: {}).to_h[:newsletter]
-
+        data = params.permit(data: {}).to_h[:data]
         @form = form(SelectiveNewsletterForm).from_params(data)
         render plain: recipients_count_query
       end
@@ -118,7 +117,7 @@ module Decidim
         enforce_permission_to(:update, :newsletter, newsletter:)
         @form = form(SelectiveNewsletterForm).from_params(params)
 
-        DeliverNewsletter.call(newsletter, @form, current_user) do
+        DeliverNewsletter.call(newsletter, @form) do
           on(:ok) do
             flash[:notice] = I18n.t("newsletters.deliver.success", scope: "decidim.admin")
             redirect_to action: :index

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

@@ -19,7 +19,7 @@ module Decidim
         enforce_permission_to :update, :organization, organization: current_organization
         @form = form(OrganizationAppearanceForm).from_params(params)
 
-        UpdateOrganizationAppearance.call(current_organization, @form) do
+        UpdateOrganizationAppearance.call(@form, current_organization) do
           on(:ok) do
             flash[:notice] = I18n.t("organization.update.success", scope: "decidim.admin")
             redirect_to edit_organization_appearance_path

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

@@ -19,7 +19,7 @@ module Decidim
         @form = form(OrganizationForm).from_params(params)
         @form.id = current_organization.id
 
-        UpdateOrganization.call(current_organization, @form) do
+        UpdateOrganization.call(@form, current_organization) do
           on(:ok) do
             flash[:notice] = I18n.t("organization.update.success", scope: "decidim.admin")
             redirect_to edit_organization_path