decidim-admin 0.27.4 → 0.28.0.rc5

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

@@ -5,7 +5,12 @@ module Decidim
     # Controller that allows managing all areas at the admin panel.
     #
     class AreasController < Decidim::Admin::ApplicationController
+      include Decidim::Admin::Concerns::HasTabbedMenu
+
       layout "decidim/admin/settings"
+
+      add_breadcrumb_item_from_menu :admin_settings_menu
+
       helper_method :area, :organization_areas
 
       def index
@@ -35,12 +40,12 @@ module Decidim
       end
 
       def edit
-        enforce_permission_to :update, :area, area: area
+        enforce_permission_to(:update, :area, area:)
         @form = form(AreaForm).from_model(area)
       end
 
       def update
-        enforce_permission_to :update, :area, area: area
+        enforce_permission_to(:update, :area, area:)
         @form = form(AreaForm).from_params(params)
 
         UpdateArea.call(area, @form) do
@@ -57,7 +62,7 @@ module Decidim
       end
 
       def destroy
-        enforce_permission_to :destroy, :area, area: area
+        enforce_permission_to(:destroy, :area, area:)
 
         DestroyArea.call(area, current_user) do
           on(:ok) do
@@ -73,6 +78,8 @@ module Decidim
 
       private
 
+      def tab_menu_name = :admin_areas_menu
+
       def organization_areas
         current_organization.areas
       end

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

@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     class BlockUserController < Decidim::Admin::ApplicationController
-      layout "decidim/admin/users"
+      layout "decidim/admin/global_moderations"
 
       helper_method :user
 
@@ -11,6 +11,7 @@ module Decidim
         enforce_permission_to :block, :admin_user
 
         @form = form(BlockUserForm).from_model(user)
+        @form.hide = params[:hide] || false
       end
 
       def create
@@ -21,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(blocked: true)
+            redirect_to moderated_users_path(blocked: true), notice:
           end
 
           on(:invalid) do
@@ -44,7 +45,7 @@ module Decidim
           end
         end
 
-        redirect_to moderated_users_path(blocked: false)
+        redirect_to moderated_users_path, notice:
       end
 
       private

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

@@ -8,18 +8,21 @@ module Decidim
       include ParticipatorySpaceAdminContext
       participatory_space_admin_layout
 
+      before_action :find_category, except: [:index, :new, :create]
+      before_action :set_categories_breadcrumb_items
+
       def index
         enforce_permission_to :read, :category
       end
 
       def new
         enforce_permission_to :create, :category
-        @form = form(CategoryForm).from_params({}, current_participatory_space: current_participatory_space)
+        @form = form(CategoryForm).from_params({}, current_participatory_space:)
       end
 
       def create
         enforce_permission_to :create, :category
-        @form = form(CategoryForm).from_params(params, current_participatory_space: current_participatory_space)
+        @form = form(CategoryForm).from_params(params, current_participatory_space:)
 
         CreateCategory.call(@form, current_participatory_space, current_user) do
           on(:ok) do
@@ -35,15 +38,13 @@ module Decidim
       end
 
       def edit
-        @category = collection.find(params[:id])
         enforce_permission_to :update, :category, category: @category
-        @form = form(CategoryForm).from_model(@category, current_participatory_space: current_participatory_space)
+        @form = form(CategoryForm).from_model(@category, current_participatory_space:)
       end
 
       def update
-        @category = collection.find(params[:id])
         enforce_permission_to :update, :category, category: @category
-        @form = form(CategoryForm).from_params(params, current_participatory_space: current_participatory_space)
+        @form = form(CategoryForm).from_params(params, current_participatory_space:)
 
         UpdateCategory.call(@category, @form, current_user) do
           on(:ok) do
@@ -58,13 +59,7 @@ module Decidim
         end
       end
 
-      def show
-        @category = collection.find(params[:id])
-        enforce_permission_to :read, :category, category: @category
-      end
-
       def destroy
-        @category = collection.find(params[:id])
         enforce_permission_to :destroy, :category, category: @category
 
         DestroyCategory.call(@category, current_user) do
@@ -82,6 +77,19 @@ module Decidim
 
       private
 
+      def set_categories_breadcrumb_items
+        return if @category.blank?
+
+        controller_breadcrumb_items << {
+          label: translated_attribute(@category.name),
+          active: true
+        }
+      end
+
+      def find_category
+        @category ||= collection.find(params[:id])
+      end
+
       def collection
         @collection ||= current_participatory_space.categories.includes(:subcategories)
       end

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

@@ -8,7 +8,7 @@ module Decidim
       include Decidim::ComponentPathHelper
 
       def edit
-        enforce_permission_to :update, :component, component: component
+        enforce_permission_to(:update, :component, component:)
         @permissions_form = PermissionsForm.new(
           permissions: permission_forms
         )
@@ -17,7 +17,7 @@ module Decidim
       end
 
       def update
-        enforce_permission_to :update, :component, component: component
+        enforce_permission_to(:update, :component, component:)
         @permissions_form = PermissionsForm.from_params(params)
 
         UpdateComponentPermissions.call(@permissions_form, component, resource, current_user) do

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

@@ -31,9 +31,11 @@ module Decidim
           enforce_permission_to :read, :component, component: current_component
         end
 
+        before_action :set_component_breadcrumb_item
+
         def permissions_context
           super.merge(
-            current_participatory_space: current_participatory_space,
+            current_participatory_space:,
             participatory_space: current_participatory_space
           )
         end
@@ -65,6 +67,19 @@ module Decidim
         def skip_manage_component_permission
           false
         end
+
+        def set_component_breadcrumb_item
+          context_breadcrumb_items << {
+            label: t("components", scope: "decidim.admin.menu"),
+            url: parent_path,
+            active: false
+          }
+          context_breadcrumb_items << {
+            label: translated_attribute(current_component.name),
+            url: ::Decidim::EngineRouter.admin_proxy(current_component).root_path,
+            active: true
+          }
+        end
       end
     end
   end

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

@@ -35,7 +35,12 @@ module Decidim
 
         CreateComponent.call(@form) do
           on(:ok) do
-            flash[:notice] = I18n.t("components.create.success", scope: "decidim.admin")
+            if (landing_page_path = participatory_space_landing_page_path(@component)).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")
+            end
+
             redirect_to action: :index
           end
 
@@ -168,6 +173,13 @@ module Decidim
           current_settings["default_step"] || {}
         )
       end
+
+      def participatory_space_landing_page_path(component)
+        participatory_space = component.participatory_space
+        return if participatory_space.manifest.content_blocks_scope_name.blank?
+
+        Decidim::EngineRouter.admin_proxy(participatory_space).send("edit_#{participatory_space.manifest.route_name}_landing_page_path")
+      end
     end
   end
 end

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

@@ -23,13 +23,13 @@ module Decidim
 
           def new
             enforce_permission_to :create, :attachment_collection
-            @form = form(AttachmentCollectionForm).from_params({}, collection_for: collection_for)
+            @form = form(AttachmentCollectionForm).from_params({}, collection_for:)
             render template: "decidim/admin/attachment_collections/new"
           end
 
           def create
             enforce_permission_to :create, :attachment_collection
-            @form = form(AttachmentCollectionForm).from_params(params, collection_for: collection_for)
+            @form = form(AttachmentCollectionForm).from_params(params, collection_for:)
 
             CreateAttachmentCollection.call(@form, collection_for, current_user) do
               on(:ok) do
@@ -47,14 +47,14 @@ module Decidim
           def edit
             @attachment_collection = collection.find(params[:id])
             enforce_permission_to :update, :attachment_collection, attachment_collection: @attachment_collection
-            @form = form(AttachmentCollectionForm).from_model(@attachment_collection, collection_for: collection_for)
+            @form = form(AttachmentCollectionForm).from_model(@attachment_collection, collection_for:)
             render template: "decidim/admin/attachment_collections/edit"
           end
 
           def update
             @attachment_collection = collection.find(params[:id])
             enforce_permission_to :update, :attachment_collection, attachment_collection: @attachment_collection
-            @form = form(AttachmentCollectionForm).from_params(params, collection_for: collection_for)
+            @form = form(AttachmentCollectionForm).from_params(params, collection_for:)
 
             UpdateAttachmentCollection.call(@attachment_collection, @form, current_user) do
               on(:ok) do
@@ -69,12 +69,6 @@ module Decidim
             end
           end
 
-          def show
-            @attachment_collection = collection.find(params[:id])
-            enforce_permission_to :read, :attachment_collection, attachment_collection: @attachment_collection
-            render template: "decidim/admin/attachment_collections/show"
-          end
-
           def destroy
             @attachment_collection = collection.find(params[:id])
             enforce_permission_to :destroy, :attachment_collection, attachment_collection: @attachment_collection

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

@@ -16,20 +16,20 @@ module Decidim
           helper_method :attached_to, :attachment
 
           def index
-            enforce_permission_to :read, :attachment, attached_to: attached_to
+            enforce_permission_to(:read, :attachment, attached_to:)
 
             render template: "decidim/admin/attachments/index"
           end
 
           def new
-            enforce_permission_to :create, :attachment, attached_to: attached_to
-            @form = form(::Decidim::Admin::AttachmentForm).from_params({}, attached_to: attached_to)
+            enforce_permission_to(:create, :attachment, attached_to:)
+            @form = form(::Decidim::Admin::AttachmentForm).from_params({}, attached_to:)
             render template: "decidim/admin/attachments/new"
           end
 
           def create
-            enforce_permission_to :create, :attachment, attached_to: attached_to
-            @form = form(::Decidim::Admin::AttachmentForm).from_params(params, attached_to: attached_to)
+            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
               on(:ok) do
@@ -46,15 +46,15 @@ module Decidim
 
           def edit
             @attachment = collection.find(params[:id])
-            enforce_permission_to :update, :attachment, attachment: attachment
-            @form = form(::Decidim::Admin::AttachmentForm).from_model(@attachment, attached_to: attached_to)
+            enforce_permission_to(:update, :attachment, attachment:)
+            @form = form(::Decidim::Admin::AttachmentForm).from_model(@attachment, attached_to:)
             render template: "decidim/admin/attachments/edit"
           end
 
           def update
             @attachment = collection.find(params[:id])
-            enforce_permission_to :update, :attachment, attachment: attachment
-            @form = form(::Decidim::Admin::AttachmentForm).from_params(attachment_params, attached_to: attached_to)
+            enforce_permission_to(:update, :attachment, attachment:)
+            @form = form(::Decidim::Admin::AttachmentForm).from_params(attachment_params, attached_to:)
 
             UpdateAttachment.call(@attachment, @form, current_user) do
               on(:ok) do
@@ -69,15 +69,9 @@ module Decidim
             end
           end
 
-          def show
-            @attachment = collection.find(params[:id])
-            enforce_permission_to :read, :attachment, attachment: attachment
-            render template: "decidim/admin/attachments/show"
-          end
-
           def destroy
             @attachment = collection.find(params[:id])
-            enforce_permission_to :destroy, :attachment, attachment: attachment
+            enforce_permission_to(:destroy, :attachment, attachment:)
 
             Decidim.traceability.perform_action!("delete", @attachment, current_user) do
               @attachment.destroy!

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module Concerns
+      module HasBreadcrumbItems
+        extend ActiveSupport::Concern
+
+        class_methods do
+          def add_breadcrumb_item_from_menu(target_menu, opts = {})
+            before_action -> { secondary_breadcrumb_menus << target_menu }, opts
+          end
+        end
+
+        included do
+          def secondary_breadcrumb_menus
+            @secondary_breadcrumb_menus ||= []
+          end
+
+          def controller_breadcrumb_items
+            @controller_breadcrumb_items ||= []
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module Concerns
+      module HasContentBlocks
+        extend ActiveSupport::Concern
+
+        included do
+          helper_method :content_blocks?
+
+          private
+
+          def content_blocks?
+            return unless Decidim.page_blocks.include?(scoped_resource.try(:slug))
+
+            @has_content_blocks ||= available_manifests.present?
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -25,13 +25,13 @@ module Decidim
 
           def new
             enforce_permission_to :create, :space_private_user
-            @form = form(ParticipatorySpacePrivateUserForm).from_params({}, privatable_to: privatable_to)
+            @form = form(ParticipatorySpacePrivateUserForm).from_params({}, privatable_to:)
             render template: "decidim/admin/participatory_space_private_users/new"
           end
 
           def create
             enforce_permission_to :create, :space_private_user
-            @form = form(ParticipatorySpacePrivateUserForm).from_params(params, privatable_to: privatable_to)
+            @form = form(ParticipatorySpacePrivateUserForm).from_params(params, privatable_to:)
 
             CreateParticipatorySpacePrivateUser.call(@form, current_user, current_participatory_space) do
               on(:ok) do
@@ -94,9 +94,9 @@ module Decidim
           end
 
           def collection
-            # there's an unidentified corner case where Decidim::User
+            # there is an unidentified corner case where Decidim::User
             # may have been destroyed, but the related ParticipatorySpacePrivateUser
-            # remains in the database. That's why filtering by not null users
+            # remains in the database. That is why filtering by not null users
             @collection ||= privatable_to
                             .participatory_space_private_users
                             .includes(:user).where.not("decidim_users.id" => nil)

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

@@ -17,14 +17,14 @@ module Decidim
 
           def new
             enforce_permission_to :csv_import, :space_private_user
-            @form = form(ParticipatorySpacePrivateUserCsvImportForm).from_params({}, privatable_to: privatable_to)
+            @form = form(ParticipatorySpacePrivateUserCsvImportForm).from_params({}, privatable_to:)
             @count = Decidim::ParticipatorySpacePrivateUser.by_participatory_space(privatable_to).count
             render template: "decidim/admin/participatory_space_private_users_csv_imports/new"
           end
 
           def create
             enforce_permission_to :csv_import, :space_private_user
-            @form = form(ParticipatorySpacePrivateUserCsvImportForm).from_params(params, privatable_to: privatable_to)
+            @form = form(ParticipatorySpacePrivateUserCsvImportForm).from_params(params, privatable_to:)
 
             ProcessParticipatorySpacePrivateUserImportCsv.call(@form, current_user, current_participatory_space) do
               on(:ok) do

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module Concerns
+      module HasTabbedMenu
+        extend ActiveSupport::Concern
+
+        included do
+          helper_method :tab_menu_name, :has_tab_menu?
+
+          private
+
+          def has_tab_menu? = true
+
+          def tab_menu_name = raise NotImplementedError, "Need to define a `tab_menu_name` with the name from the `Decidim.menu` definition"
+        end
+      end
+    end
+  end
+end

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

@@ -17,7 +17,7 @@ module Decidim
         @form = form(TransferUserForm).from_params(
           user: conflict.current_user,
           managed_user: conflict.managed_user,
-          conflict: conflict
+          conflict:
         )
       end
 
@@ -25,8 +25,8 @@ module Decidim
         conflict = Decidim::Verifications::Conflict.find(params[:id])
 
         @form = form(TransferUserForm).from_params(
-          current_user: current_user,
-          conflict: conflict,
+          current_user:,
+          conflict:,
           reason: params[:transfer_user][:reason],
           email: params[:transfer_user][:email]
         )

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

@@ -8,6 +8,7 @@ module Decidim
       helper_method :latest_action_logs
       helper_method :users_counter
       helper_method :metrics_presenter
+      helper_method :count_pending_moderations
 
       def show
         enforce_permission_to :read, :admin_dashboard
@@ -15,6 +16,10 @@ module Decidim
 
       private
 
+      def count_pending_moderations
+        @count_pending_moderations ||= Decidim::Admin::ModerationStats.new(current_user).count_pending_moderations
+      end
+
       def latest_action_logs
         @latest_action_logs ||= Decidim::ActionLog
                                 .where(organization: current_organization)
@@ -28,7 +33,7 @@ module Decidim
         @metrics_presenter ||= Decidim::Admin::DashboardMetricChartsPresenter.new(
           summary: true,
           organization: current_organization,
-          view_context: view_context
+          view_context:
         )
       end
 
@@ -50,8 +55,8 @@ module Decidim
       def users_count(date, admin)
         @users_count = Decidim::Admin::ActiveUsersCounter.new(
           organization: current_organization,
-          date: date,
-          admin: admin
+          date:,
+          admin:
         ).query.count
       end
     end

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

@@ -7,11 +7,10 @@ module Decidim
       include Decidim::ComponentPathHelper
 
       def create
-        enforce_permission_to :export, :component_data, component: component
+        enforce_permission_to(:export, :component_data, component:)
         name = params[:id]
-
-        Decidim.traceability.perform_action!("export_component", component, current_user, { name: name, format: params[:format] || default_format }) do
-          ExportJob.perform_later(current_user, component, name, params[:format] || default_format, params[:resource_id].presence)
+        Decidim.traceability.perform_action!("export_component", component, current_user, { name:, format: params[:format] || default_format }) do
+          ExportJob.perform_later(current_user, component, name, params[:format] || default_format, params[:resource_id].presence, export_filters)
         end
 
         flash[:notice] = t("decidim.admin.exports.notice")
@@ -25,9 +24,27 @@ module Decidim
         "json"
       end
 
+      def export_filters
+        @export_filters ||= begin
+          filters = params.fetch(:filters, nil)
+          if !filters.is_a?(ActionController::Parameters)
+            { id_in: [] }
+          elsif commentable_filter?
+            # in this case, we need to search through the decidim_commentable
+            { decidim_commentable_id_in: Array(filters.fetch(:id_in, [])).compact }
+          else
+            { id_in: Array(filters.fetch(:id_in, [])).compact }
+          end
+        end.compact
+      end
+
       def component
         @component ||= current_participatory_space.components.find(params[:component_id])
       end
+
+      def commentable_filter?
+        params[:id].match?("comments$")
+      end
     end
   end
 end

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

@@ -8,6 +8,8 @@ module Decidim
       layout "decidim/admin/settings"
       include TranslationsHelper
 
+      add_breadcrumb_item_from_menu :admin_settings_menu
+
       helper_method :sections
 
       before_action do
@@ -16,7 +18,7 @@ module Decidim
 
       def show
         @form = form(HelpSectionsForm).from_model(
-          OpenStruct.new(sections: sections)
+          OpenStruct.new(sections:)
         )
       end
 

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

@@ -6,6 +6,8 @@ module Decidim
     # them
     #
     class ImpersonatableUsersController < Decidim::Admin::ApplicationController
+      include Decidim::Admin::Officializations::Filterable
+
       layout "decidim/admin/users"
 
       helper_method :new_managed_user
@@ -24,7 +26,7 @@ module Decidim
       private
 
       def collection
-        @collection ||= current_organization.users.where(admin: false, roles: [])
+        @collection ||= current_organization.users.where(admin: false, roles: []).order(created_at: :desc)
       end
 
       def new_managed_user

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

@@ -12,28 +12,28 @@ module Decidim
                     :creating_managed_user?
 
       def new
-        enforce_permission_to :impersonate, :impersonatable_user, user: user
+        enforce_permission_to(:impersonate, :impersonatable_user, user:)
 
         @form = form(ImpersonateUserForm).from_params(
-          user: user,
-          handler_name: handler_name,
+          user:,
+          handler_name:,
           authorization: Decidim::AuthorizationHandler.handler_for(
             handler_name,
-            user: user
+            user:
           )
         )
       end
 
       def create
-        enforce_permission_to :impersonate, :impersonatable_user, user: user
+        enforce_permission_to(:impersonate, :impersonatable_user, user:)
 
         @form = form(ImpersonateUserForm).from_params(
-          user: user,
-          handler_name: handler_name,
+          user:,
+          handler_name:,
           reason: params[:impersonate_user][:reason],
           authorization: Decidim::AuthorizationHandler.handler_for(
             handler_name,
-            params[:impersonate_user][:authorization].merge(user: user)
+            params[:impersonate_user][:authorization].merge(user:)
           )
         )