decidim-admin 0.31.8 → 0.32.0.rc1

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

@@ -10,16 +10,12 @@ module Decidim
       helper_method :authorizations, :other_authorizations_for, :resource_params, :resource
 
       def edit
-        enforce_permission_to :update, :resource_permission, resource:
-
         @permissions_form = PermissionsForm.new(
           permissions: permission_forms
         )
       end
 
       def update
-        enforce_permission_to :update, :resource_permission, resource:
-
         @permissions_form = PermissionsForm.from_params(params).with_context(current_organization:)
 
         UpdateResourcePermissions.call(@permissions_form, resource) do
@@ -29,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

@@ -11,10 +11,34 @@ module Decidim
 
       before_action :tos_version_formatted, only: [:index, :edit]
 
-      helper_method :topics, :scoped_resource
+      helper_method :topics
 
       alias update_content_blocks update
 
+      def content_block_scope
+        :static_page
+      end
+
+      def scoped_resource
+        @scoped_resource ||= collection.find_by(slug: params[:id])
+      end
+
+      def enforce_permission_to_update_resource
+        enforce_permission_to :update, :static_page, static_page: scoped_resource
+      end
+
+      def resource_sort_url
+        update_content_blocks_static_page_path(scoped_resource)
+      end
+
+      def resource_create_url(manifest_name)
+        static_page_content_blocks_path(scoped_resource, manifest_name:)
+      end
+
+      def resource_content_block_cell
+        "decidim/admin/static_page_content_block"
+      end
+
       def index
         enforce_permission_to :read, :static_page
         @topics = Decidim::StaticPageTopic.where(organization: current_organization)
@@ -38,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
@@ -61,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
@@ -77,32 +101,8 @@ module Decidim
         end
       end
 
-      def scoped_resource
-        @scoped_resource ||= collection.find_by(slug: params[:id])
-      end
-
       private
 
-      def content_block_scope
-        :static_page
-      end
-
-      def enforce_permission_to_update_resource
-        enforce_permission_to :update, :static_page, static_page: scoped_resource
-      end
-
-      def resource_sort_url
-        update_content_blocks_static_page_path(scoped_resource)
-      end
-
-      def resource_create_url(manifest_name)
-        static_page_content_blocks_path(scoped_resource, manifest_name:)
-      end
-
-      def resource_content_block_cell
-        "decidim/admin/static_page_content_block"
-      end
-
       def tab_menu_name = :admin_static_pages_menu
 
       def form_params
@@ -121,8 +121,6 @@ module Decidim
         @page ||= scoped_resource
       end
 
-      protected
-
       def collection
         current_organization.static_pages
       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
@@ -88,11 +88,11 @@ module Decidim
       end
 
       def root_taxonomy
-        @root_taxonomy ||= Taxonomy.for(current_organization).roots.find(params.require(:taxonomy_id)) # rubocop:disable Decidim/OrganizationScopedFinder -- .for(current_organization) scopes to current org
+        @root_taxonomy ||= Taxonomy.roots.find(params[:taxonomy_id])
       end
 
       def taxonomy_filter
-        @taxonomy_filter ||= collection.find_by(id: params[:id])
+        @taxonomy_filter ||= TaxonomyFilter.find_by(id: params[:id])
       end
 
       def set_taxonomies_breadcrumb_item

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

@@ -66,7 +66,7 @@ module Decidim
       end
 
       def component
-        @component ||= Component.find_by(id: params[:component_id]) # rubocop:disable Decidim/OrganizationScopedFinder -- validated by before_action: component.organization == current_organization
+        @component ||= Component.find_by(id: params[:component_id])
       end
 
       def root_taxonomy

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

@@ -9,7 +9,7 @@ module Decidim
       before_action do
         if taxonomy_item && taxonomy_item.parent_ids.exclude?(taxonomy.id)
           flash[:alert] = I18n.t("update.invalid", scope: "decidim.admin.taxonomies")
-          render plain: I18n.t("update.invalid", scope: "decidim.admin.taxonomies"), status: :unprocessable_entity
+          render plain: I18n.t("update.invalid", scope: "decidim.admin.taxonomies"), status: :unprocessable_content
         end
       end
 
@@ -29,7 +29,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
@@ -50,7 +50,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

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

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

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

@@ -12,12 +12,39 @@ module Decidim
       attribute :settings, Object
       attribute :images, Hash
 
+      validate :validate_settings
+
       def map_model(model)
         self.images = model.images_container
       end
 
       def settings?
-        settings.manifest.settings.any?
+        return false unless settings.respond_to?(:manifest)
+
+        settings.manifest.attributes.any?
+      end
+
+      private
+
+      def validate_settings
+        coerce_settings if settings.respond_to?(:to_h) && !settings.respond_to?(:valid?)
+
+        return unless settings.respond_to?(:valid?)
+        return if settings.valid?
+
+        settings.errors.each do |error|
+          errors.add(:settings, error.message)
+        end
+      end
+
+      def coerce_settings
+        content_block = context[:content_block]
+        return unless content_block
+
+        self.settings = content_block.manifest.settings.schema.new(
+          settings.to_h,
+          content_block.organization.default_locale
+        )
       end
     end
   end