decidim-admin 0.29.2 → 0.30.0.rc2

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

@@ -0,0 +1,170 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # Concern to handle warnings for deleted (trashed) resources
+    #
+    # # i18n-tasks-use t('decidim.admin.trash_management.restore.invalid')
+    # # i18n-tasks-use t('decidim.admin.trash_management.restore.success')
+    # # i18n-tasks-use t('decidim.admin.trash_management.soft_delete.invalid')
+    # # i18n-tasks-use t('decidim.admin.trash_management.soft_delete.success')
+    module HasTrashableResources
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :trashable_deleted_collection
+
+        before_action :trashable_set_deleted_warning, if: :trash_zone?
+
+        # i18n-tasks-use t('decidim.admin.trash_management.soft_delete.invalid')
+        # i18n-tasks-use t('decidim.admin.trash_management.soft_delete.success')
+        def soft_delete
+          enforce_permission_to(:soft_delete, trashable_deleted_resource_type, trashable_deleted_resource:)
+
+          Decidim::Commands::SoftDeleteResource.call(trashable_deleted_resource, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("soft_delete.success", scope: trashable_i18n_scope, resource_name: human_readable_resource_name.capitalize)
+              redirect_to_resource_index
+            end
+
+            on(:invalid) do
+              flash[:alert] = I18n.t("soft_delete.invalid", scope: trashable_i18n_scope, resource_name: human_readable_resource_name)
+              redirect_to_resource_index
+            end
+          end
+        end
+
+        # i18n-tasks-use t('decidim.admin.trash_management.restore.invalid')
+        # i18n-tasks-use t('decidim.admin.trash_management.restore.success')
+        def restore
+          enforce_permission_to(:restore, trashable_deleted_resource_type, trashable_deleted_resource:)
+
+          Decidim::Commands::RestoreResource.call(trashable_deleted_resource, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("restore.success", scope: trashable_i18n_scope, resource_name: human_readable_resource_name.capitalize)
+              redirect_to_resource_trash
+            end
+
+            on(:invalid) do
+              flash[:alert] = I18n.t("restore.invalid", scope: trashable_i18n_scope, resource_name: human_readable_resource_name)
+              redirect_to_resource_trash
+            end
+          end
+        end
+
+        def manage_trash
+          enforce_permission_to :manage_trash, trashable_deleted_resource_type
+        end
+      end
+
+      private
+
+      def trashable_deleted_resource_type
+        raise NotImplementedError, "Return the type of the deleted resource (symbol)"
+      end
+
+      def trashable_deleted_resource
+        raise NotImplementedError, "Return the deleted resource or nil"
+      end
+
+      def trashable_deleted_collection
+        raise NotImplementedError, "Return the collection of deleted resources"
+      end
+
+      # override to customize flash messages
+      def trashable_i18n_scope
+        "decidim.admin.trash_management"
+      end
+
+      def find_parent_resource
+        respond_to?(:parent_resource_finder, true) ? find_parent_resource : nil
+      end
+
+      # defaults to the resource name pluralized, but you can override on complex cases
+      def redirect_to_resource_index
+        redirect_to build_redirect_path
+      end
+
+      def redirect_to_resource_trash
+        redirect_to build_redirect_path(trash: true)
+      end
+
+      def trashable_set_deleted_warning
+        flash.now[:warning] = I18n.t("deleted_warning", scope: trashable_i18n_scope, default: t("decidim.admin.manage_trash.deleted_items_warning"))
+      end
+
+      def build_redirect_path(trash: false)
+        parent_resource = find_parent_resource
+
+        if parent_resource.present?
+          parent_resource_name = parent_resource.class.name.demodulize.underscore
+          action_prefix = trash ? "manage_trash_" : ""
+          route_name = "#{action_prefix}#{parent_resource_name}_#{trashable_deleted_resource_type.to_s.pluralize}_path"
+          if respond_to?(:current_component)
+            Decidim::EngineRouter.admin_proxy(current_component).send(route_name, parent_resource)
+          else
+            send(route_name, parent_resource)
+          end
+        else
+          action_prefix = trash ? "manage_trash_" : ""
+          route_name = "#{action_prefix}#{trashable_deleted_resource_type.to_s.pluralize}_path"
+          if respond_to?(:current_component)
+            Decidim::EngineRouter.admin_proxy(current_component).send(route_name)
+          else
+            send(route_name)
+          end
+        end
+      end
+
+      def trash_zone?
+        case action_name
+        when "manage_trash"
+          true
+        when "index", "show", "new", "edit"
+          resource_or_parents_trashed?
+        else
+          false
+        end
+      end
+
+      def parent_resource
+        trashable_deleted_resource&.try(:parent)
+      end
+
+      def component_trashed?
+        respond_to?(:current_component) && current_component&.deleted?
+      end
+
+      def participatory_space_trashed?
+        current_participatory_space.respond_to?(:deleted?) && current_participatory_space&.deleted?
+      end
+
+      def resource_trashed?
+        trashable_deleted_resource&.deleted?
+      end
+
+      def parent_trashed?
+        parent_resource&.deleted?
+      end
+
+      def parent_id_trashed?
+        parent_resource = find_parent_resource
+        parent_resource&.deleted? || false
+      end
+
+      def human_readable_resource_name
+        trashable_deleted_resource_type.to_s.humanize
+      end
+
+      def resource_or_parents_trashed?
+        return true if component_trashed?
+        return true if participatory_space_trashed?
+        return true if resource_trashed?
+        return true if parent_trashed?
+        return true if parent_id_trashed?
+
+        false
+      end
+    end
+  end
+end

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

@@ -5,6 +5,7 @@ module Decidim
     # Shared behaviour for signed_in admins that require the latest TOS accepted
     module NeedsAdminTosAccepted
       extend ActiveSupport::Concern
+      include UserRoleChecker
 
       included do
         before_action :tos_accepted_by_admin
@@ -15,7 +16,7 @@ module Decidim
       def tos_accepted_by_admin
         return unless request.format.html?
         return unless current_user
-        return unless user_has_any_role?
+        return unless user_has_any_role?(current_user, broad_check: true)
         return if current_user.admin_terms_accepted?
         return if permitted_paths?
 
@@ -38,34 +39,6 @@ module Decidim
       def admin_tos_path
         decidim_admin.admin_terms_show_path
       end
-
-      def user_has_any_role?
-        return true if current_user.admin
-        return true if current_user.roles.any?
-        return true if participatory_process_user_role?
-        return true if assembly_user_role?
-        return true if conference_user_role?
-
-        false
-      end
-
-      def participatory_process_user_role?
-        return false unless Decidim.module_installed?(:participatory_processes)
-
-        true if Decidim::ParticipatoryProcessUserRole.exists?(user: current_user)
-      end
-
-      def assembly_user_role?
-        return false unless Decidim.module_installed?(:assemblies)
-
-        true if Decidim::AssemblyUserRole.exists?(user: current_user)
-      end
-
-      def conference_user_role?
-        return false unless Decidim.module_installed?(:conferences)
-
-        true if Decidim::ConferenceUserRole.exists?(user: current_user)
-      end
     end
   end
 end

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

@@ -30,8 +30,6 @@ module Decidim
         helper_method :current_participatory_space
         helper_method :current_participatory_space_manifest
         helper_method :current_participatory_space_context
-
-        delegate :manifest, to: :current_participatory_space, prefix: true
       end
 
       private
@@ -44,6 +42,18 @@ module Decidim
         raise NotImplementedError
       end
 
+      def current_participatory_space_manifest
+        return current_participatory_space.manifest if current_participatory_space
+
+        manifest = Decidim.find_participatory_space_manifest(
+          self.class.name.demodulize.underscore.gsub("_controller", "")
+        )
+
+        raise NotImplementedError unless manifest
+
+        manifest
+      end
+
       def authorize_participatory_space
         enforce_permission_to :read, :participatory_space, current_participatory_space:
       end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Admin
+    module Taxonomies
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          private
+
+          def base_query
+            collection
+          end
+
+          def search_field_predicate
+            :name_or_children_name_cont
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -26,10 +26,9 @@ module Decidim
       helper Decidim::Admin::IconLinkHelper
       helper Decidim::Admin::IconWithTooltipHelper
       helper Decidim::Admin::MenuHelper
-      helper Decidim::Admin::ScopesHelper
       helper Decidim::DecidimFormHelper
       helper Decidim::ReplaceButtonsHelper
-      helper Decidim::ScopesHelper
+      helper Decidim::TaxonomiesHelper
       helper Decidim::TranslationsHelper
       helper Decidim::LanguageChooserHelper
       helper Decidim::ComponentPathHelper

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"
 

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

@@ -48,6 +48,41 @@ module Decidim
         redirect_to moderated_users_path, notice:
       end
 
+      def bulk_new
+        enforce_permission_to :block, :admin_user
+
+        @form = form(BlockUsersForm).from_params(params)
+      end
+
+      def bulk_create
+        @form = form(BlockUsersForm).from_params(params)
+
+        Admin::BulkBlockUsers.call(@form) do
+          on(:ok) do
+            flash[:notice] = I18n.t("officializations.bulk_action.block.success", scope: "decidim.admin")
+            redirect_to moderated_users_path
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("officializations.bulk_action.block.invalid", scope: "decidim.admin")
+            render :bulk_new
+          end
+        end
+      end
+
+      def bulk_destroy
+        Admin::BulkUnblockUsers.call(blocked_users, current_user) do
+          on(:ok) do
+            flash[:notice] = I18n.t("officializations.bulk_action.unblock.success", scope: "decidim.admin")
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("officializations.bulk_action.unblock.invalid", scope: "decidim.admin")
+          end
+        end
+        redirect_to moderated_users_path
+      end
+
       private
 
       def user
@@ -56,6 +91,13 @@ module Decidim
           organization: current_organization
         )
       end
+
+      def blocked_users
+        @blocked_users ||= Decidim::UserBaseEntity.where(
+          id: params[:user_ids],
+          organization: current_organization
+        )
+      end
     end
   end
 end

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

@@ -9,16 +9,14 @@ module Decidim
 
       def edit
         enforce_permission_to(:update, :component, component:)
-        @permissions_form = PermissionsForm.new(
-          permissions: permission_forms
-        )
+        @permissions_form = form(PermissionsForm).from_params(permissions: permission_forms)
 
         render template: "decidim/admin/resource_permissions/edit"
       end
 
       def update
         enforce_permission_to(:update, :component, component:)
-        @permissions_form = PermissionsForm.from_params(params)
+        @permissions_form = form(PermissionsForm).from_params(params)
 
         UpdateComponentPermissions.call(@permissions_form, component, resource) do
           on(:ok) do

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

@@ -6,7 +6,8 @@ module Decidim
     # admin panel.
     #
     class ComponentsController < Decidim::Admin::ApplicationController
-      helper_method :manifest, :current_participatory_space
+      include Decidim::Admin::HasTrashableResources
+      helper_method :manifest
 
       def index
         enforce_permission_to :read, :component
@@ -78,19 +79,21 @@ module Decidim
         end
       end
 
-      def destroy
-        @component = query_scope.find(params[:id])
-        enforce_permission_to :destroy, :component, component: @component
+      # i18n-tasks-use t('decidim.admin.trash_management.soft_delete.invalid')
+      # i18n-tasks-use t('decidim.admin.trash_management.soft_delete.success')
+      def soft_delete
+        enforce_permission_to(:soft_delete, trashable_deleted_resource_type, trashable_deleted_resource:)
 
-        DestroyComponent.call(@component, current_user) do
+        Decidim::Commands::SoftDeleteResource.call(trashable_deleted_resource, current_user) do
           on(:ok) do
-            flash[:notice] = I18n.t("components.destroy.success", scope: "decidim.admin")
-            redirect_to action: :index
+            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
 
           on(:invalid) do
-            flash[:alert] = I18n.t("components.destroy.error", scope: "decidim.admin")
-            redirect_to action: :index
+            flash[:alert] = I18n.t("soft_delete.invalid", scope: trashable_i18n_scope, resource_name: human_readable_resource_name)
+            redirect_to_resource_index
           end
         end
       end
@@ -119,6 +122,18 @@ module Decidim
         end
       end
 
+      def hide
+        @component = query_scope.find(params[:id])
+        enforce_permission_to :publish, :component, component: @component
+
+        HideMenuComponent.call(@component, current_user) do
+          on(:ok) do
+            flash[:notice] = I18n.t("components.hide.success", scope: "decidim.admin")
+            redirect_to action: :index
+          end
+        end
+      end
+
       def share
         @component = query_scope.find(params[:id])
         share_token = @component.share_tokens.create!(user: current_user, organization: current_organization)
@@ -126,8 +141,34 @@ module Decidim
         redirect_to share_token.url
       end
 
+      def reorder
+        enforce_permission_to :reorder, :component
+
+        ReorderComponents.call(current_participatory_space.components, params[:order_ids]) do
+          on(:ok) do
+            head :ok
+          end
+
+          on(:invalid) do
+            head :bad_request
+          end
+        end
+      end
+
       private
 
+      def trashable_deleted_resource_type
+        :component
+      end
+
+      def trashable_deleted_resource
+        @trashable_deleted_resource = query_scope.with_deleted.find_by(id: params[:id])
+      end
+
+      def trashable_deleted_collection
+        @trashable_deleted_collection ||= current_participatory_space.components.only_deleted.deleted_at_desc
+      end
+
       # Processes the component params so the form object defined in the manifest (component_form_class_name)
       # can assign and validate the attributes when using #from_params.
       def component_params

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

@@ -17,6 +17,10 @@ module Decidim
           helper PaginateHelper
           helper_method :privatable_to, :participatory_space_private_users
 
+          # rubocop:disable Rails/LexicallyScopedActionFilter
+          before_action :set_private_user, only: [:edit, :update, :destroy, :resend_invitation]
+          # rubocop:enable Rails/LexicallyScopedActionFilter
+
           def index
             enforce_permission_to :read, :space_private_user
 
@@ -29,6 +33,29 @@ module Decidim
             render template: "decidim/admin/participatory_space_private_users/new"
           end
 
+          def edit
+            enforce_permission_to :update, :space_private_user, private_user: @private_user
+            @form = form(ParticipatorySpacePrivateUserForm).from_model(@private_user)
+            render template: "decidim/admin/participatory_space_private_users/edit"
+          end
+
+          def update
+            enforce_permission_to :update, :space_private_user, private_user: @private_user
+            @form = form(ParticipatorySpacePrivateUserForm).from_params(params, privatable_to:)
+
+            UpdateParticipatorySpacePrivateUser.call(@form, @private_user) do
+              on(:ok) do
+                flash[:notice] = I18n.t("participatory_space_private_users.update.success", scope: "decidim.admin")
+                redirect_to action: :index
+              end
+
+              on(:invalid) do
+                flash.now[:alert] = I18n.t("participatory_space_private_users.update.error", scope: "decidim.admin")
+                render template: "decidim/admin/participatory_space_private_users/edit"
+              end
+            end
+          end
+
           def create
             enforce_permission_to :create, :space_private_user
             @form = form(ParticipatorySpacePrivateUserForm).from_params(params, privatable_to:)
@@ -47,7 +74,6 @@ module Decidim
           end
 
           def destroy
-            @private_user = collection.find(params[:id])
             enforce_permission_to :destroy, :space_private_user, private_user: @private_user
 
             DestroyParticipatorySpacePrivateUser.call(@private_user, current_user) do
@@ -64,7 +90,6 @@ module Decidim
           end
 
           def resend_invitation
-            @private_user = collection.find(params[:id])
             enforce_permission_to :invite, :space_private_user, private_user: @private_user
             InviteUserAgain.call(@private_user.user, "invite_private_user") do
               on(:ok) do
@@ -79,6 +104,34 @@ module Decidim
             redirect_to after_destroy_path
           end
 
+          def publish_all
+            PublishAllParticipatorySpacePrivateUsers.call(current_participatory_space, current_user) do
+              on(:ok) do
+                flash[:notice] = I18n.t("participatory_space_private_users.publish_all.success", scope: "decidim.admin")
+                redirect_to action: :index
+              end
+
+              on(:invalid) do
+                flash[:alert] = I18n.t("participatory_space_private_users.publish_all.error", scope: "decidim.admin")
+                redirect_to action: :index
+              end
+            end
+          end
+
+          def unpublish_all
+            UnpublishAllParticipatorySpacePrivateUsers.call(current_participatory_space, current_user) do
+              on(:ok) do
+                flash[:notice] = I18n.t("participatory_space_private_users.unpublish_all.success", scope: "decidim.admin")
+                redirect_to action: :index
+              end
+
+              on(:invalid) do
+                flash[:alert] = I18n.t("participatory_space_private_users.unpublish_all.error", scope: "decidim.admin")
+                redirect_to action: :index
+              end
+            end
+          end
+
           # Public: Returns a String or Object that will be passed to `redirect_to` after
           # destroying a private user. By default it redirects to the privatable_to.
           #
@@ -105,6 +158,10 @@ module Decidim
           def participatory_space_private_users
             filtered_collection
           end
+
+          def set_private_user
+            @private_user = collection.find(params[:id])
+          end
         end
       end
     end

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

@@ -27,6 +27,10 @@ module Decidim
       def reportable
         @reportable ||= moderations_for_user.find(params[:id]).reportable
       end
+
+      def selected_moderations
+        @selected_moderations ||= moderations_for_user.where(id: params[:moderation_ids])
+      end
     end
   end
 end

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

@@ -5,6 +5,8 @@ module Decidim
     class ModeratedUsersController < Decidim::Admin::ApplicationController
       include Decidim::ModeratedUsers::Admin::Filterable
 
+      helper_method :moderated_users
+
       layout "decidim/admin/global_moderations"
 
       before_action :set_moderation_breadcrumb_item
@@ -31,12 +33,36 @@ module Decidim
         end
       end
 
+      def bulk_unreport
+        Admin::BulkUnreportUsers.call(current_user, reportables) do
+          on(:ok) do
+            flash[:notice] = I18n.t("reportable.bulk_action.ignore.success", scope: "decidim.moderations.admin")
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("reportable.bulk_action.ignore.invalid", scope: "decidim.moderations.admin")
+          end
+        end
+        redirect_to moderated_users_path
+      end
+
       private
 
+      def moderated_users
+        @moderated_users ||= filtered_collection
+      end
+
       def reportable
         @reportable ||= base_query_finder.find(params[:id]).user
       end
 
+      def reportables
+        @reportables ||= Decidim::UserBaseEntity.where(
+          id: params[:user_ids],
+          organization: current_organization
+        )
+      end
+
       def base_query_finder
         Decidim::Admin::ModerationStats.new(current_user).user_reports
       end

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

@@ -67,6 +67,20 @@ module Decidim
         end
       end
 
+      def bulk_action
+        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?
+            flash[:alert] = I18n.t("reportable.bulk_action.#{params[:bulk_action]}.failed", scope: "decidim.moderations.admin", errored: ko.join(", ")) if ko.present? && ko.any?
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("reportable.bulk_action.#{params[:bulk_action]}.invalid", scope: "decidim.moderations.admin")
+          end
+        end
+        redirect_to moderations_path
+      end
+
       private
 
       def ransack_params
@@ -94,6 +108,10 @@ module Decidim
         @reportable ||= participatory_space_moderations.find(params[:id]).reportable
       end
 
+      def selected_moderations
+        @selected_moderations ||= participatory_space_moderations.where(id: params[:moderation_ids])
+      end
+
       def participatory_space_moderations
         @participatory_space_moderations ||= Decidim::Moderation.where(participatory_space: current_participatory_space)
       end