decidim-admin 0.31.3 → 0.32.0.rc1

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

data/app/controllers/decidim/admin/participatory_space/concerns/has_members.rb

@@ -0,0 +1,166 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      module Concerns
+        # Members can be related to any ParticipatorySpace, in order to
+        # manage the members for a given type, you should create a new
+        # controller and include this concern.
+        #
+        # It takes the current_participatory_space that is defined
+        # in the controller, so there is no need to define any method
+        module HasMembers
+          extend ActiveSupport::Concern
+
+          included do
+            include Decidim::Admin::ParticipatorySpace::Concerns::MembersFilterable
+
+            helper PaginateHelper
+            helper_method :members
+
+            # rubocop:disable Rails/LexicallyScopedActionFilter
+            before_action :set_member, only: [:edit, :update, :destroy, :resend_invitation]
+            # rubocop:enable Rails/LexicallyScopedActionFilter
+
+            def index
+              enforce_permission_to :read, :space_member
+
+              render template: "decidim/admin/members/index"
+            end
+
+            def new
+              enforce_permission_to :create, :space_member
+              @form = form(MemberForm).from_params({})
+              render template: "decidim/admin/members/new"
+            end
+
+            def edit
+              enforce_permission_to :update, :space_member, member: @member
+              @form = form(MemberForm).from_model(@member)
+              render template: "decidim/admin/members/edit"
+            end
+
+            def update
+              enforce_permission_to :update, :space_member, member: @member
+              @form = form(MemberForm).from_params(params)
+
+              UpdateMember.call(@form, @member) do
+                on(:ok) do
+                  flash[:notice] = I18n.t("members.update.success", scope: "decidim.admin")
+                  redirect_to action: :index
+                end
+
+                on(:invalid) do
+                  flash.now[:alert] = I18n.t("members.update.error", scope: "decidim.admin")
+                  render template: "decidim/admin/members/edit", status: :unprocessable_content
+                end
+              end
+            end
+
+            def create
+              enforce_permission_to :create, :space_member
+              @form = form(MemberForm).from_params(params)
+
+              CreateMember.call(@form, current_participatory_space) do
+                on(:ok) do
+                  flash[:notice] = I18n.t("members.create.success", scope: "decidim.admin")
+                  redirect_to action: :index
+                end
+
+                on(:invalid) do
+                  flash.now[:alert] = I18n.t("members.create.error", scope: "decidim.admin")
+                  render template: "decidim/admin/members/new", status: :unprocessable_content
+                end
+              end
+            end
+
+            def destroy
+              enforce_permission_to :destroy, :space_member, member: @member
+
+              DestroyMember.call(@member, current_user) do
+                on(:ok) do
+                  flash[:notice] = I18n.t("members.destroy.success", scope: "decidim.admin")
+                  redirect_to after_destroy_path
+                end
+
+                on(:invalid) do
+                  flash.now[:alert] = I18n.t("members.destroy.error", scope: "decidim.admin")
+                  render template: "decidim/admin/members/index", status: :unprocessable_content
+                end
+              end
+            end
+
+            def resend_invitation
+              enforce_permission_to :invite, :space_member, member: @member
+              InviteUserAgain.call(@member.user, "invite_member") do
+                on(:ok) do
+                  flash[:notice] = I18n.t("users.resend_invitation.success", scope: "decidim.admin")
+                end
+
+                on(:invalid) do
+                  flash[:alert] = I18n.t("users.resend_invitation.error", scope: "decidim.admin")
+                end
+              end
+
+              redirect_to after_destroy_path
+            end
+
+            def publish_all
+              PublishAllMembers.call(current_participatory_space, current_user) do
+                on(:ok) do
+                  flash[:notice] = I18n.t("members.publish_all.success", scope: "decidim.admin")
+                  redirect_to action: :index
+                end
+
+                on(:invalid) do
+                  flash[:alert] = I18n.t("members.publish_all.error", scope: "decidim.admin")
+                  redirect_to action: :index
+                end
+              end
+            end
+
+            def unpublish_all
+              UnpublishAllMembers.call(current_participatory_space, current_user) do
+                on(:ok) do
+                  flash[:notice] = I18n.t("members.unpublish_all.success", scope: "decidim.admin")
+                  redirect_to action: :index
+                end
+
+                on(:invalid) do
+                  flash[:alert] = I18n.t("members.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 member. By default it redirects to the participatory_space.
+            #
+            # It can be redefined at controller level if you need to redirect elsewhere.
+            def after_destroy_path
+              members_path(current_participatory_space)
+            end
+
+            def collection
+              # there is an unidentified corner case where Decidim::User
+              # may have been destroyed, but the related Member
+              # remains in the database. That is why filtering by not null users
+              @collection ||= current_participatory_space
+                              .members
+                              .includes(:user).where.not("decidim_users.id" => nil)
+            end
+
+            def members
+              filtered_collection
+            end
+
+            def set_member
+              @member = collection.find(params[:id])
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/admin/participatory_space/concerns/has_members_csv_import.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      module Concerns
+        # Members can be related to any ParticipatorySpace, in order to
+        # import members from csv for a given type, you should create a new
+        # controller and include this concern.
+        #
+        # The only requirement is to define a `participatory_space` method that
+        # returns an instance of the model to relate the member to.
+        module HasMembersCsvImport
+          extend ActiveSupport::Concern
+
+          included do
+            helper_method :participatory_space
+
+            def new
+              enforce_permission_to :csv_import, :space_member
+              @form = form(MemberCsvImportForm).from_params({}, participatory_space:)
+              @count = Decidim::ParticipatorySpace::Member.by_participatory_space(participatory_space).count
+              render template: "decidim/admin/members_csv_imports/new"
+            end
+
+            def create
+              enforce_permission_to :csv_import, :space_member
+              @form = form(MemberCsvImportForm).from_params(params, participatory_space:)
+
+              ImportMemberCsv.call(@form, current_participatory_space) do
+                on(:ok) do
+                  flash[:notice] = I18n.t("members_csv_imports.create.success", scope: "decidim.admin")
+                  redirect_to after_import_path
+                end
+
+                on(:invalid) do
+                  flash[:alert] = I18n.t("members_csv_imports.create.invalid", scope: "decidim.admin")
+                  render template: "decidim/admin/members_csv_imports/new", status: :unprocessable_content
+                end
+              end
+            end
+
+            def destroy_all
+              enforce_permission_to :csv_import, :space_member
+              Decidim::ParticipatorySpace::Member.by_participatory_space(participatory_space).delete_all
+              redirect_to new_members_csv_imports_path
+            end
+
+            # Public: Returns a String or Object that will be passed to `redirect_to` after
+            # importing members. By default it redirects to the participatory_space.
+            #
+            # It can be redefined at controller level if you need to redirect elsewhere.
+            def after_import_path
+              participatory_space
+            end
+
+            # Public: The only method to be implemented at the controller. You need to
+            # return the object where the attachment will be attached to.
+            def participatory_space
+              raise NotImplementedError
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/admin/participatory_space/concerns/members_filterable.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      module Concerns
+        module MembersFilterable
+          extend ActiveSupport::Concern
+
+          included do
+            include Decidim::Admin::Filterable
+
+            private
+
+            def base_query
+              collection
+            end
+
+            def filters
+              [
+                :user_invitation_sent_at_not_null,
+                :user_invitation_accepted_at_not_null
+              ]
+            end
+
+            def search_field_predicate
+              :user_name_or_user_email_cont
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/admin/participatory_space/user_role_controller.rb

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

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

@@ -27,7 +27,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = t("decidim.admin.reminders.create.error")
-            render :new, status: :unprocessable_entity
+            render :new, status: :unprocessable_content
           end
         end
       end

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

@@ -25,7 +25,7 @@ module Decidim
           end
 
           on(:invalid) do
-            render action: :edit, status: :unprocessable_entity
+            render action: :edit, status: :unprocessable_content
           end
         end
       end

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

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

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

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

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

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

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

@@ -17,7 +17,7 @@ module Decidim
             flash.now[:alert] = I18n.t("create.error", scope: i18n_scope)
           end
 
-          redirect_back(fallback_location:)
+          redirect_back_or_to(fallback_location)
         end
       end
 
@@ -33,7 +33,7 @@ module Decidim
             flash.now[:alert] = I18n.t("destroy.error", scope: i18n_scope)
           end
 
-          redirect_back(fallback_location:)
+          redirect_back_or_to(fallback_location)
         end
       end
 

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

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

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

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

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

@@ -39,7 +39,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("create.invalid", scope: "decidim.admin.taxonomies")
-            render action: "new", status: :unprocessable_entity
+            render action: "new", status: :unprocessable_content
           end
         end
       end
@@ -66,7 +66,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("update.invalid", scope: "decidim.admin.taxonomies")
-            render action: "edit", status: :unprocessable_entity
+            render action: "edit", status: :unprocessable_content
           end
         end
       end
@@ -83,7 +83,7 @@ module Decidim
             flash.now[:alert] = I18n.t("destroy.invalid", scope: "decidim.admin.taxonomies")
           end
         end
-        redirect_back(fallback_location: taxonomies_path)
+        redirect_back_or_to(taxonomies_path)
       end
 
       def reorder

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

@@ -41,7 +41,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("create.error", scope: "decidim.admin.taxonomy_filters")
-            render :new, status: :unprocessable_entity
+            render :new, status: :unprocessable_content
           end
         end
       end
@@ -63,7 +63,7 @@ module Decidim
           end
           on(:invalid) do
             flash.now[:alert] = I18n.t("update.error", scope: "decidim.admin.taxonomy_filters")
-            render :edit, status: :unprocessable_entity
+            render :edit, status: :unprocessable_content
           end
         end
       end
@@ -78,7 +78,7 @@ module Decidim
             flash[:alert] = I18n.t("destroy.error", scope: "decidim.admin.taxonomy_filters")
           end
         end
-        redirect_back(fallback_location: decidim_admin.taxonomy_filters_path(root_taxonomy))
+        redirect_back_or_to(decidim_admin.taxonomy_filters_path(root_taxonomy))
       end
 
       private