decidim-admin 0.26.10 → 0.27.0.rc1

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

@@ -21,7 +21,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), notice: notice
+            redirect_to officializations_path(q: { name_or_nickname_or_email_cont: user.name }), notice: notice
           end
 
           on(:invalid) do
@@ -44,13 +44,13 @@ module Decidim
           end
         end
 
-        redirect_to moderated_users_path(blocked: false), notice: notice
+        redirect_to officializations_path(q: { name_or_nickname_or_email_cont: user.name }), notice: notice
       end
 
       private
 
       def user
-        @user ||= Decidim::UserBaseEntity.find_by(
+        @user ||= Decidim::User.find_by(
           id: params[:user_id],
           organization: current_organization
         )

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

@@ -21,7 +21,7 @@ module Decidim
         enforce_permission_to :create, :category
         @form = form(CategoryForm).from_params(params, current_participatory_space: current_participatory_space)
 
-        CreateCategory.call(@form, current_participatory_space) do
+        CreateCategory.call(@form, current_participatory_space, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("categories.create.success", scope: "decidim.admin")
             redirect_to categories_path(current_participatory_space)
@@ -45,7 +45,7 @@ module Decidim
         enforce_permission_to :update, :category, category: @category
         @form = form(CategoryForm).from_params(params, current_participatory_space: current_participatory_space)
 
-        UpdateCategory.call(@category, @form) do
+        UpdateCategory.call(@category, @form, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("categories.update.success", scope: "decidim.admin")
             redirect_to categories_path(current_participatory_space)
@@ -67,7 +67,7 @@ module Decidim
         @category = collection.find(params[:id])
         enforce_permission_to :destroy, :category, category: @category
 
-        DestroyCategory.call(@category) do
+        DestroyCategory.call(@category, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("categories.destroy.success", scope: "decidim.admin")
           end

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

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

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

@@ -15,6 +15,7 @@ module Decidim
         helper Decidim::ResourceHelper
         helper Decidim::Admin::ExportsHelper
         helper Decidim::Admin::ImportsHelper
+        helper Decidim::Admin::RemindersHelper
         helper Decidim::Admin::BulkActionsHelper
         helper Decidim::Admin::ResourcePermissionsHelper
 

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

@@ -58,7 +58,7 @@ module Decidim
         @form = form(@component.form_class).from_params(component_params)
         enforce_permission_to :update, :component, component: @component
 
-        UpdateComponent.call(@form, @component) do
+        UpdateComponent.call(@form, @component, current_user) 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: collection_for)
 
-            CreateAttachmentCollection.call(@form, collection_for) do
+            CreateAttachmentCollection.call(@form, collection_for, current_user) 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: collection_for)
 
-            UpdateAttachmentCollection.call(@attachment_collection, @form) do
+            UpdateAttachmentCollection.call(@attachment_collection, @form, current_user) do
               on(:ok) do
                 flash[:notice] = I18n.t("attachment_collections.update.success", scope: "decidim.admin")
                 redirect_to action: :index
@@ -78,7 +78,10 @@ module Decidim
           def destroy
             @attachment_collection = collection.find(params[:id])
             enforce_permission_to :destroy, :attachment_collection, attachment_collection: @attachment_collection
-            @attachment_collection.destroy!
+
+            Decidim.traceability.perform_action!("delete", @attachment_collection, current_user) do
+              @attachment_collection.destroy!
+            end
 
             flash[:notice] = I18n.t("attachment_collections.destroy.success", scope: "decidim.admin")
 

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

@@ -31,7 +31,7 @@ module Decidim
             enforce_permission_to :create, :attachment, attached_to: attached_to
             @form = form(::Decidim::Admin::AttachmentForm).from_params(params, attached_to: attached_to)
 
-            CreateAttachment.call(@form, attached_to) do
+            CreateAttachment.call(@form, attached_to, current_user) 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: attachment
             @form = form(::Decidim::Admin::AttachmentForm).from_params(attachment_params, attached_to: attached_to)
 
-            UpdateAttachment.call(@attachment, @form) do
+            UpdateAttachment.call(@attachment, @form, current_user) do
               on(:ok) do
                 flash[:notice] = I18n.t("attachments.update.success", scope: "decidim.admin")
                 redirect_to action: :index
@@ -78,7 +78,10 @@ module Decidim
           def destroy
             @attachment = collection.find(params[:id])
             enforce_permission_to :destroy, :attachment, attachment: attachment
-            @attachment.destroy!
+
+            Decidim.traceability.perform_action!("delete", @attachment, current_user) do
+              @attachment.destroy!
+            end
 
             flash[:notice] = I18n.t("attachments.destroy.success", scope: "decidim.admin")
 

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

@@ -18,6 +18,7 @@ module Decidim
           def new
             enforce_permission_to :csv_import, :space_private_user
             @form = form(ParticipatorySpacePrivateUserCsvImportForm).from_params({}, privatable_to: privatable_to)
+            @count = Decidim::ParticipatorySpacePrivateUser.by_participatory_space(privatable_to).count
             render template: "decidim/admin/participatory_space_private_users_csv_imports/new"
           end
 
@@ -38,6 +39,12 @@ module Decidim
             end
           end
 
+          def destroy_all
+            enforce_permission_to :csv_import, :space_private_user
+            Decidim::ParticipatorySpacePrivateUser.by_participatory_space(privatable_to).delete_all
+            redirect_to new_participatory_space_private_users_csv_imports_path
+          end
+
           # Public: Returns a String or Object that will be passed to `redirect_to` after
           # importing private users. By default it redirects to the privatable_to.
           #

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

@@ -27,7 +27,8 @@ module Decidim
       def metrics_presenter
         @metrics_presenter ||= Decidim::Admin::DashboardMetricChartsPresenter.new(
           summary: true,
-          organization: current_organization
+          organization: current_organization,
+          view_context: view_context
         )
       end
 
@@ -37,10 +38,10 @@ module Decidim
         last_month = Time.zone.today.prev_month
 
         {
-          total_admins_last_24: users_count(last_day, true),
+          total_admins_last_day: users_count(last_day, true),
           total_admins_last_week: users_count(last_week, true),
           total_admins_last_month: users_count(last_month, true),
-          total_participants_last_24: users_count(last_day, false),
+          total_participants_last_day: users_count(last_day, false),
           total_participants_last_week: users_count(last_week, false),
           total_participants_last_month: users_count(last_month, false)
         }

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

@@ -9,7 +9,10 @@ module Decidim
       def create
         enforce_permission_to :export, :component_data, component: component
         name = params[:id]
-        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: name, format: params[:format] || default_format }) do
+          ExportJob.perform_later(current_user, component, name, params[:format] || default_format, params[:resource_id].presence)
+        end
 
         flash[:notice] = t("decidim.admin.exports.notice")
 

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

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

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

@@ -14,7 +14,8 @@ module Decidim
       def metrics_presenter
         @metrics_presenter ||= Decidim::Admin::DashboardMetricChartsPresenter.new(
           summary: false,
-          organization: current_organization
+          organization: current_organization,
+          view_context: view_context
         )
       end
     end

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

@@ -67,16 +67,18 @@ module Decidim
 
       private
 
+      def ransack_params
+        query_params[:q] || { s: "created_at desc" }
+      end
+
       # Private: This method is used by the `Filterable` concern as the base query
       #          without applying filtering and/or sorting options.
       def collection
-        @collection ||= begin
-          if params[:hidden]
-            participatory_space_moderations.hidden
-          else
-            participatory_space_moderations.not_hidden
-          end
-        end
+        @collection ||= if params[:hidden]
+                          participatory_space_moderations.hidden
+                        else
+                          participatory_space_moderations.not_hidden
+                        end
       end
 
       # Private: Returns a collection of `Moderation` filtered and/or sorted by

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)
         Premailer::Rails::Hook.perform(email)
         render html: email.html_part.body.decoded.html_safe
       end

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

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

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

@@ -15,7 +15,6 @@ module Decidim
       def update
         enforce_permission_to :update, :organization, organization: current_organization
         @form = form(OrganizationForm).from_params(params)
-        @form.id = current_organization.id
 
         UpdateOrganization.call(current_organization, @form) do
           on(:ok) do
@@ -31,11 +30,11 @@ module Decidim
       end
 
       def users
-        search(current_organization.users.available)
+        search(current_organization.users)
       end
 
       def user_entities
-        search(current_organization.user_entities.available)
+        search(current_organization.user_entities)
       end
 
       private
@@ -52,7 +51,7 @@ module Decidim
                           query.where("email ILIKE ?", "%#{term}%")
                         )
                       end
-              render json: query.all.collect { |u| { value: u.id, label: "#{u.name} (@#{u.nickname})" } }
+              render json: query.all.collect { |u| { value: u.id, label: "#{u.name} (@#{u.nickname}) #{u.email}" } }
             else
               render json: []
             end

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

@@ -16,7 +16,7 @@ module Decidim
         enforce_permission_to :update, :organization, organization: current_organization
         @form = form(OrganizationExternalDomainWhitelistForm).from_params(params)
 
-        UpdateExternalDomainWhitelist.call(@form, current_organization) do
+        UpdateExternalDomainWhitelist.call(@form, current_organization, current_user) do
           on(:ok) do
             flash[:notice] = t("domain_whitelist.update.success", scope: "decidim.admin")
             redirect_to edit_organization_external_domain_whitelist_path

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class RemindersController < Admin::ApplicationController
+      include Decidim::ComponentPathHelper
+
+      helper_method :reminder_manifest
+
+      def new
+        enforce_permission_to :create, :reminder
+
+        @form = reminder_form_from_params(name: reminder_manifest.name)
+        render :new
+      end
+
+      def create
+        enforce_permission_to :create, :reminder
+
+        @form = reminder_form_from_params(params)
+
+        command_class.call(@form) do
+          on(:ok) do |reminders_queued|
+            flash[:notice] = t("decidim.admin.reminders.create.success", count: reminders_queued)
+            redirect_to manage_component_path(current_component)
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = t("decidim.admin.reminders.create.error")
+            render :new
+          end
+        end
+      end
+
+      private
+
+      def reminder_form_from_params(params)
+        form(reminder_manifest.form_class).from_params(
+          params,
+          current_component: current_component
+        )
+      end
+
+      def reminder_manifest
+        @reminder_manifest ||= Decidim.reminders_registry.for(reminder_name)
+      end
+
+      def reminder_name
+        params[:name]
+      end
+
+      def command_class
+        reminder_manifest.command_class
+      end
+
+      def current_component
+        @current_component ||= current_participatory_space.components.find(params[:component_id])
+      end
+    end
+  end
+end

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

@@ -47,8 +47,8 @@ module Decidim
       def permission_forms
         actions.inject({}) do |result, action|
           form = PermissionForm.new(
-            authorization_handlers: authorizations_for(action),
-            authorizations_handlers_options: options_for(action)
+            authorization_handlers: authorizations_for(action).keys,
+            authorization_handlers_options: options_for(action)
           )
 
           result.update(action => form)
@@ -83,7 +83,7 @@ module Decidim
       end
 
       def manifest_name
-        @manifest_name ||= resource.resource_manifest.name
+        @manifest_name ||= resource.manifest.name
       end
 
       def permissions

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

@@ -21,7 +21,7 @@ module Decidim
         enforce_permission_to :create, :scope_type
         @form = form(ScopeTypeForm).from_params(params)
 
-        CreateScopeType.call(@form) do
+        CreateScopeType.call(@form, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("scope_types.create.success", scope: "decidim.admin")
             redirect_to scope_types_path
@@ -43,7 +43,7 @@ module Decidim
         enforce_permission_to :update, :scope_type, scope_type: scope_type
         @form = form(ScopeTypeForm).from_params(params)
 
-        UpdateScopeType.call(scope_type, @form) do
+        UpdateScopeType.call(scope_type, @form, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("scope_types.update.success", scope: "decidim.admin")
             redirect_to scope_types_path
@@ -58,7 +58,10 @@ module Decidim
 
       def destroy
         enforce_permission_to :destroy, :scope_type, scope_type: scope_type
-        scope_type.destroy!
+
+        Decidim.traceability.perform_action!("delete", scope_type, current_user) do
+          scope_type.destroy!
+        end
 
         flash[:notice] = I18n.t("scope_types.destroy.success", scope: "decidim.admin")
 

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

@@ -64,7 +64,9 @@ module Decidim
       private
 
       def topic
-        @topic ||= current_organization.static_page_topics.find(params[:id])
+        @topic ||= StaticPageTopic.where(
+          organization: current_organization
+        ).find(params[:id])
       end
     end
   end

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

@@ -82,13 +82,7 @@ module Decidim
         form_params = params.to_unsafe_hash
         form_params["static_page"] ||= {}
         form_params["static_page"]["organization"] = current_organization
-        form_params["static_page"]["allow_public_access"] ||= begin
-          if page
-            page.allow_public_access
-          else
-            false
-          end
-        end
+        form_params["static_page"]["allow_public_access"] ||= page ? page.allow_public_access : false
 
         return form_params unless page
 

data/app/forms/decidim/admin/block_user_form.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Admin
-    # A form object used to block users or user groups on the admin dashboard.
+    # A form object used to officialize users from the admin dashboard.
     class BlockUserForm < Form
       attribute :user_id, Integer
       attribute :justification, String
@@ -15,7 +15,7 @@ module Decidim
       end
 
       def user
-        @user ||= Decidim::UserBaseEntity.find_by(
+        @user ||= Decidim::User.find_by(
           id: user_id,
           organization: current_organization
         )

data/app/forms/decidim/admin/category_form.rb

@@ -9,12 +9,11 @@ module Decidim
 
       translatable_attribute :name, String
       attribute :weight, Integer, default: 0
-      translatable_attribute :description, String
       attribute :parent_id, Integer
 
       mimic :category
 
-      validates :name, :description, translatable_presence: true
+      validates :name, translatable_presence: true
       validates :parent_id, inclusion: { in: :parent_categories_ids }, allow_blank: true
 
       delegate :current_participatory_space, to: :context, prefix: false

data/app/forms/decidim/admin/component_form.rb

@@ -21,10 +21,12 @@ module Decidim
 
       attribute :settings, Object
       attribute :default_step_settings, Object
-      attribute :step_settings, Hash[String => Object]
+      attribute(:step_settings, { String => Object })
 
       attribute :share_tokens, Array[ShareToken]
 
+      validate :validate_settings, :validate_step_settings
+
       def settings?
         settings.manifest.attributes.any?
       end
@@ -39,13 +41,20 @@ module Decidim
 
       private
 
-      # Overwrites Rectify::Form#form_attributes_valid? to validate nested `step_settings` attributes.
-      def form_attributes_valid?
-        return false unless errors.empty? && settings_errors_empty? # Preserves errors from custom validation methods
+      def validate_settings
+        return unless errors.empty? && settings_errors_empty? # Preserves errors from custom validation methods
+
+        attributes.each do |key, value|
+          next unless value.respond_to?(:valid?)
+
+          errors.add(key, :invalid) unless value.valid?
+        end
+      end
+
+      def validate_step_settings
+        return unless step_settings.respond_to?(:attributes)
 
-        attributes_that_respond_to(:valid?).concat(
-          step_settings.each_value.select { |attribute| attribute.respond_to?(:valid?) }
-        ).all?(&:valid?)
+        errors.add(:step_settings, :invalid) unless step_settings.attributes.values.all? { |v| !v.respond_to?(:valid?) || v.valid? }
       end
 
       def settings_errors_empty?

data/app/forms/decidim/admin/import_example_form.rb

@@ -35,11 +35,7 @@ module Decidim
       end
 
       def reader
-        @reader ||= begin
-          return unless reader_klass
-
-          reader_klass.new("/dev/null")
-        end
+        @reader ||= reader_klass ? reader_klass.new("/dev/null") : nil
       end
 
       def reader_klass

data/app/forms/decidim/admin/import_form.rb

@@ -5,9 +5,10 @@ module Decidim
     class ImportForm < Form
       ACCEPTED_MIME_TYPES = Decidim::Admin::Import::Readers::ACCEPTED_MIME_TYPES
       include Decidim::HasUploadValidations
+      include Decidim::ProcessesFileLocally
 
       attribute :name, String
-      attribute :file
+      attribute :file, Decidim::Attributes::Blob
 
       validates :file, presence: true
       validates :name, presence: true
@@ -16,7 +17,7 @@ module Decidim
       validate :verify_import, if: -> { file.present? && accepted_mime_type? && !importer.invalid_file? }
 
       def importer
-        @importer ||= importer_for(file_path, mime_type)
+        @importer ||= importer_for(file, mime_type)
       end
 
       private
@@ -44,15 +45,11 @@ module Decidim
       def verify_import
         return if importer.verify
 
-        importer.errors.each do |_col, message|
-          errors.add(:file, message)
+        importer.errors.each do |error|
+          errors.add(:file, error.message)
         end
       end
 
-      def file_path
-        file&.path
-      end
-
       def mime_type
         file&.content_type
       end
@@ -61,9 +58,9 @@ module Decidim
         manifest.creator
       end
 
-      def importer_for(filepath, mime_type)
+      def importer_for(path, mime_type)
         Import::ImporterFactory.build(
-          filepath,
+          path,
           mime_type,
           context: importer_context,
           creator: creator_class

data/app/forms/decidim/admin/managed_user_promotion_form.rb

@@ -7,7 +7,7 @@ module Decidim
     class ManagedUserPromotionForm < Form
       attribute :email, String
 
-      validates :email, presence: true, 'valid_email_2/email': { disposable: true }
+      validates :email, presence: true, "valid_email_2/email": { disposable: true }
       validate :unique_email
 
       private

data/app/forms/decidim/admin/participatory_space_private_user_csv_import_form.rb

@@ -8,19 +8,22 @@ module Decidim
     #
     class ParticipatorySpacePrivateUserCsvImportForm < Form
       include Decidim::HasUploadValidations
+      include Decidim::ProcessesFileLocally
 
-      attribute :file
+      attribute :file, Decidim::Attributes::Blob
       attribute :user_name, String
       attribute :email, String
 
-      validates :file, presence: true
+      validates :file, presence: true, file_content_type: { allow: ["text/csv"] }
       validate :validate_csv
 
       def validate_csv
         return if file.blank?
 
-        CSV.foreach(file.path) do |_email, user_name|
-          errors.add(:user_name, :invalid) unless user_name.match?(UserBaseEntity::REGEXP_NAME)
+        process_file_locally(file) do |file_path|
+          CSV.foreach(file_path) do |_email, user_name|
+            errors.add(:user_name, :invalid) unless user_name.match?(UserBaseEntity::REGEXP_NAME)
+          end
         end
       end
     end