decidim-assemblies 0.27.10 → 0.28.0.rc4

data/app/commands/decidim/assemblies/admin/destroy_assemblies_type.rb

@@ -18,7 +18,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/assemblies/admin/destroy_assembly_member.rb

@@ -18,7 +18,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/assemblies/admin/import_assembly.rb

@@ -18,7 +18,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/assemblies/admin/update_assemblies_type.rb

@@ -18,7 +18,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/assemblies/admin/update_assembly.rb

@@ -21,7 +21,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/assemblies/admin/update_assembly_member.rb

@@ -20,7 +20,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/constraints/decidim/assemblies/current_assembly.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Assemblies
-    # This class infers the current assembly we're scoped to by
+    # This class infers the current assembly we are scoped to by
     # looking at the request parameters and the organization in the request
     # environment, and injects it into the environment.
     class CurrentAssembly

data/app/controllers/concerns/decidim/assemblies/admin/assembly_context.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Assemblies
     module Admin
-      # This module, when injected into a controller, ensures there's a
+      # This module, when injected into a controller, ensures there is a
       # Assembly available and deducts it from the context.
       module AssemblyContext
         def self.extended(base)

data/app/controllers/concerns/decidim/assemblies/admin/assembly_members/filterable.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Assemblies
+    module Admin
+      module AssemblyMembers
+        module Filterable
+          extend ActiveSupport::Concern
+
+          included do
+            include Decidim::Admin::Filterable
+
+            private
+
+            def filters
+              [:ceased_date_not_null]
+            end
+
+            def filters_with_values
+              {
+                ceased_date_not_null: %w(true false)
+              }
+            end
+
+            def base_query
+              collection
+            end
+
+            def search_field_predicate
+              :full_name_or_user_name_or_user_nickname_cont
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/assemblies/assembly_breadcrumb.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # Concern to provide a specific breadcrumb item to controllers using it
+    module AssemblyBreadcrumb
+      extend ActiveSupport::Concern
+
+      private
+
+      def current_participatory_space_breadcrumb_item
+        return {} if current_participatory_space.blank?
+
+        dropdown_cell = current_participatory_space_manifest.breadcrumb_cell
+
+        items = current_participatory_space.ancestors.map do |participatory_space|
+          {
+            label: participatory_space.title,
+            url: Decidim::ResourceLocatorPresenter.new(participatory_space).path,
+            active: false,
+            dropdown_cell:,
+            resource: participatory_space
+          }
+        end
+
+        items << {
+          label: current_participatory_space.title,
+          url: Decidim::ResourceLocatorPresenter.new(current_participatory_space).path,
+          active: true,
+          dropdown_cell:,
+          resource: current_participatory_space
+        }
+      end
+    end
+  end
+end

data/app/controllers/decidim/assemblies/admin/assemblies_controller.rb

@@ -7,6 +7,7 @@ module Decidim
       #
       class AssembliesController < Decidim::Assemblies::Admin::ApplicationController
         include Decidim::Assemblies::Admin::Filterable
+        include Decidim::Admin::ParticipatorySpaceAdminBreadcrumb
         helper_method :current_assembly, :parent_assembly, :current_participatory_space
         layout "decidim/admin/assemblies"
 

data/app/controllers/decidim/assemblies/admin/assemblies_types_controller.rb

@@ -17,7 +17,7 @@ module Decidim
       # This comment (and the i18n keys) may be removed in future versions
       class AssembliesTypesController < Decidim::Assemblies::Admin::ApplicationController
         helper_method :available_assemblies_types, :current_assembly_type
-        layout "decidim/admin/assemblies"
+        layout "decidim/admin/assemblies_types"
 
         # GET /admin/assemblies_types
         def index

data/app/controllers/decidim/assemblies/admin/assembly_attachment_collections_controller.rb

@@ -8,6 +8,7 @@ module Decidim
       class AssemblyAttachmentCollectionsController < Decidim::Assemblies::Admin::ApplicationController
         include Concerns::AssemblyAdmin
         include Decidim::Admin::Concerns::HasAttachmentCollections
+        include Decidim::Admin::Concerns::HasTabbedMenu
 
         def after_destroy_path
           assembly_attachment_collections_path(current_assembly)
@@ -16,6 +17,10 @@ module Decidim
         def collection_for
           current_assembly
         end
+
+        private
+
+        def tab_menu_name = :assemblies_admin_attachments_menu
       end
     end
   end

data/app/controllers/decidim/assemblies/admin/assembly_attachments_controller.rb

@@ -9,6 +9,7 @@ module Decidim
       class AssemblyAttachmentsController < Decidim::Assemblies::Admin::ApplicationController
         include Concerns::AssemblyAdmin
         include Decidim::Admin::Concerns::HasAttachments
+        include Decidim::Admin::Concerns::HasTabbedMenu
 
         def after_destroy_path
           assembly_attachments_path(current_assembly)
@@ -17,6 +18,10 @@ module Decidim
         def attached_to
           current_assembly
         end
+
+        private
+
+        def tab_menu_name = :assemblies_admin_attachments_menu
       end
     end
   end

data/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb

@@ -4,6 +4,8 @@ module Decidim
   module Assemblies
     module Admin
       class AssemblyImportsController < Decidim::Assemblies::Admin::ApplicationController
+        layout "decidim/admin/assemblies_imports"
+
         def new
           enforce_permission_to :import, :assembly
           @form = form(AssemblyImportForm).instance

data/app/controllers/decidim/assemblies/admin/assembly_landing_page_content_blocks_controller.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # Controller that allows to manage the content from the assembly landing page content blocks
+      class AssemblyLandingPageContentBlocksController < Decidim::Assemblies::Admin::ApplicationController
+        include Decidim::Admin::ContentBlocks::LandingPageContentBlocks
+        include Concerns::AssemblyAdmin
+
+        layout "decidim/admin/assemblies"
+
+        private
+
+        def content_block_scope
+          current_participatory_space_manifest.content_blocks_scope_name
+        end
+
+        alias scoped_resource current_participatory_space
+
+        def enforce_permission_to_update_resource
+          enforce_permission_to :update, :assembly, assembly: scoped_resource
+        end
+
+        def edit_resource_landing_page_path
+          edit_assembly_landing_page_path(scoped_resource)
+        end
+
+        def resource_landing_page_content_block_path
+          assembly_landing_page_content_block_path(scoped_resource, params[:id])
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/assemblies/admin/assembly_landing_page_controller.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # Controller that allows managing the assembly landing page
+      class AssemblyLandingPageController < Decidim::Assemblies::Admin::ApplicationController
+        include Decidim::Admin::ContentBlocks::LandingPage
+        include Concerns::AssemblyAdmin
+
+        layout "decidim/admin/assembly"
+
+        def content_block_scope
+          current_participatory_space_manifest.content_blocks_scope_name
+        end
+
+        alias scoped_resource current_participatory_space
+
+        def enforce_permission_to_update_resource
+          enforce_permission_to :update, :assembly, assembly: scoped_resource
+        end
+
+        def resource_sort_url
+          assembly_landing_page_path(scoped_resource)
+        end
+
+        def resource_create_url(manifest_name)
+          assembly_landing_page_content_blocks_path(slug: params[:slug], manifest_name:)
+        end
+
+        def resource_content_block_cell
+          "decidim/assemblies/content_block"
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/assemblies/admin/assembly_members_controller.rb

@@ -7,15 +7,11 @@ module Decidim
       #
       class AssemblyMembersController < Decidim::Assemblies::Admin::ApplicationController
         include Concerns::AssemblyAdmin
-        layout "decidim/admin/assembly_members"
+        include Decidim::Assemblies::Admin::AssemblyMembers::Filterable
 
         def index
           enforce_permission_to :index, :assembly_member
-
-          @query = params[:q]
-          @status = params[:status]
-
-          @assembly_members = Decidim::Assemblies::Admin::AssemblyMembers.for(collection, @query, @status).page(params[:page]).per(15)
+          @assembly_members = filtered_collection
         end
 
         def new

data/app/controllers/decidim/assemblies/admin/assembly_publications_controller.rb

@@ -5,40 +5,20 @@ module Decidim
     module Admin
       # Controller that allows managing assembly publications.
       #
-      class AssemblyPublicationsController < Decidim::Assemblies::Admin::ApplicationController
+      # i18n-tasks-use t('decidim.admin.assembly_publications.create.error')
+      # i18n-tasks-use t('decidim.admin.assembly_publications.create.success')
+      # i18n-tasks-use t('decidim.admin.assembly_publications.destroy.error')
+      # i18n-tasks-use t('decidim.admin.assembly_publications.destroy.success')
+      class AssemblyPublicationsController < Decidim::Admin::SpacePublicationsController
         include Concerns::AssemblyAdmin
 
-        def create
-          enforce_permission_to :publish, :assembly, assembly: current_assembly
+        private
 
-          PublishAssembly.call(current_assembly, current_user) do
-            on(:ok) do
-              flash[:notice] = I18n.t("assembly_publications.create.success", scope: "decidim.admin")
-            end
+        def enforce_permission_to_publish = enforce_permission_to(:publish, :assembly, assembly: current_assembly)
 
-            on(:invalid) do
-              flash.now[:alert] = I18n.t("assembly_publications.create.error", scope: "decidim.admin")
-            end
+        def i18n_scope = "decidim.admin.assembly_publications"
 
-            redirect_back(fallback_location: assemblies_path)
-          end
-        end
-
-        def destroy
-          enforce_permission_to :publish, :assembly, assembly: current_assembly
-
-          UnpublishAssembly.call(current_assembly, current_user) do
-            on(:ok) do
-              flash[:notice] = I18n.t("assembly_publications.destroy.success", scope: "decidim.admin")
-            end
-
-            on(:invalid) do
-              flash.now[:alert] = I18n.t("assembly_publications.destroy.error", scope: "decidim.admin")
-            end
-
-            redirect_back(fallback_location: assemblies_path)
-          end
-        end
+        def fallback_location = assemblies_path
       end
     end
   end

data/app/controllers/decidim/assemblies/admin/assembly_user_roles_controller.rb

@@ -5,105 +5,22 @@ module Decidim
     module Admin
       # Controller that allows managing assembly user roles.
       #
-      class AssemblyUserRolesController < Decidim::Assemblies::Admin::ApplicationController
+      class AssemblyUserRolesController < Decidim::Admin::ParticipatorySpace::UserRoleController
         include Concerns::AssemblyAdmin
-        include Decidim::Admin::Officializations::Filterable
 
-        def index
-          enforce_permission_to :index, :assembly_user_role
-          @assembly_user_roles = filtered_collection
-        end
+        def authorization_scope = :assembly_user_role
 
-        def new
-          enforce_permission_to :create, :assembly_user_role
-          @form = form(AssemblyUserRoleForm).instance
-        end
+        def resource_form = form(AssemblyUserRoleForm)
 
-        def create
-          enforce_permission_to :create, :assembly_user_role
-          @form = form(AssemblyUserRoleForm).from_params(params)
+        def space_index_path = assembly_user_roles_path(current_participatory_space)
 
-          CreateAssemblyAdmin.call(@form, current_user, current_assembly) do
-            on(:ok) do
-              flash[:notice] = I18n.t("assembly_user_roles.create.success", scope: "decidim.admin")
-              redirect_to assembly_user_roles_path(current_assembly)
-            end
+        def i18n_scope = "decidim.admin.assembly_user_roles"
 
-            on(:invalid) do
-              flash[:alert] = I18n.t("assembly_user_roles.create.error", scope: "decidim.admin")
-              render :new
-            end
-          end
-        end
+        def role_class = Decidim::AssemblyUserRole
 
-        def edit
-          @user_role = collection.find(params[:id])
-          enforce_permission_to :update, :assembly_user_role, user_role: @user_role
-          @form = form(AssemblyUserRoleForm).from_model(@user_role.user)
-        end
+        def event = "decidim.events.assembly.role_assigned"
 
-        def update
-          @user_role = collection.find(params[:id])
-          enforce_permission_to :update, :assembly_user_role, user_role: @user_role
-          @form = form(AssemblyUserRoleForm).from_params(params)
-
-          UpdateAssemblyAdmin.call(@form, @user_role) do
-            on(:ok) do
-              flash[:notice] = I18n.t("assembly_user_roles.update.success", scope: "decidim.admin")
-              redirect_to assembly_user_roles_path(current_assembly)
-            end
-
-            on(:invalid) do
-              flash.now[:alert] = I18n.t("assembly_user_roles.update.error", scope: "decidim.admin")
-              render :edit
-            end
-          end
-        end
-
-        def destroy
-          @assembly_user_role = collection.find(params[:id])
-          enforce_permission_to :destroy, :assembly_user_role, user_role: @assembly_user_role
-
-          DestroyAssemblyAdmin.call(@assembly_user_role, current_user) do
-            on(:ok) do
-              flash[:notice] = I18n.t("assembly_user_roles.destroy.success", scope: "decidim.admin")
-              redirect_to assembly_user_roles_path(current_assembly)
-            end
-          end
-        end
-
-        def resend_invitation
-          @user_role = collection.find(params[:id])
-          enforce_permission_to :invite, :assembly_user_role, user_role: @user_role
-
-          InviteUserAgain.call(@user_role.user, "invite_admin") 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 assembly_user_roles_path(current_assembly)
-        end
-
-        private
-
-        def search_field_predicate
-          :name_or_nickname_or_email_cont
-        end
-
-        def filters
-          [:invitation_accepted_at_present, :last_sign_in_at_present]
-        end
-
-        def collection
-          @collection ||= Decidim::AssemblyUserRole
-                          .joins(:user)
-                          .where(assembly: current_assembly)
-        end
+        def event_class = Decidim::RoleAssignedToAssemblyEvent
       end
     end
   end

data/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb

@@ -36,7 +36,7 @@ module Decidim
             end
 
             def permissions_context
-              super.merge(current_participatory_space: current_participatory_space)
+              super.merge(current_participatory_space:)
             end
 
             def permission_class_chain

data/app/controllers/decidim/assemblies/assemblies_controller.rb

@@ -5,10 +5,15 @@ module Decidim
     # A controller that holds the logic to show Assemblies in a public layout.
     class AssembliesController < Decidim::Assemblies::ApplicationController
       include ParticipatorySpaceContext
+      include AssemblyBreadcrumb
+
       participatory_space_layout only: :show
+
       include FilterResource
+      include Paginable
+      include HasParticipatorySpaceContentBlocks
 
-      helper_method :parent_assemblies, :promoted_assemblies, :stats, :assembly_participatory_processes, :current_assemblies_settings
+      helper_method :collection, :parent_assemblies, :promoted_assemblies, :stats, :assembly_participatory_processes
 
       def index
         enforce_permission_to :list, :assembly
@@ -55,8 +60,8 @@ module Decidim
       def default_filter_params
         {
           with_any_scope: nil,
-          with_area: nil,
-          type_id_eq: nil
+          with_any_area: nil,
+          with_any_type: nil
         }
       end
 
@@ -80,6 +85,10 @@ module Decidim
         search.result.parent_assemblies.order(weight: :asc, promoted: :desc)
       end
 
+      def collection
+        @collection ||= paginate(Kaminari.paginate_array(parent_assemblies))
+      end
+
       def stats
         @stats ||= AssemblyStatsPresenter.new(assembly: current_participatory_space)
       end
@@ -87,10 +96,6 @@ module Decidim
       def assembly_participatory_processes
         @assembly_participatory_processes ||= @current_participatory_space.linked_participatory_space_resources(:participatory_processes, "included_participatory_processes")
       end
-
-      def current_assemblies_settings
-        @current_assemblies_settings ||= Decidim::AssembliesSetting.find_or_create_by(decidim_organization_id: current_organization.id)
-      end
     end
   end
 end

data/app/controllers/decidim/assemblies/assembly_members_controller.rb

@@ -4,6 +4,8 @@ module Decidim
   module Assemblies
     class AssemblyMembersController < Decidim::Assemblies::ApplicationController
       include ParticipatorySpaceContext
+      include AssemblyBreadcrumb
+
       participatory_space_layout only: :index
 
       helper_method :collection

data/app/events/decidim/assemblies/create_assembly_member_event.rb

@@ -6,7 +6,7 @@ module Decidim
       i18n_attributes :resource_name
 
       def resource_name
-        @resource_name ||= decidim_sanitize_translated(assembly.title)
+        @resource_name ||= translated_attribute(assembly.title)
       end
 
       def assembly

data/app/events/decidim/role_assigned_to_assembly_event.rb

@@ -1,21 +1,26 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   class RoleAssignedToAssemblyEvent < Decidim::Events::SimpleEvent
+    include Decidim::Events::NotificationEvent
     include Decidim::Events::AuthorEvent
 
+    def notification_title
+      I18n.t("notification_title", **i18n_options).html_safe
+    end
+
     def i18n_role
       I18n.t(extra["role"], scope: "decidim.admin.models.assembly_user_role.roles", default: extra["role"])
     end
 
     def i18n_options
       {
-        resource_path: resource_path,
-        resource_title: resource_title,
-        resource_url: resource_url,
+        resource_path:,
+        resource_title:,
+        resource_url:,
         scope: event_name,
-        participatory_space_title: participatory_space_title,
-        participatory_space_url: participatory_space_url,
+        participatory_space_title:,
+        participatory_space_url:,
         role: i18n_role
       }
     end

data/app/forms/decidim/assemblies/admin/assembly_copy_form.rb

@@ -24,7 +24,7 @@ module Decidim
         private
 
         def slug_uniqueness
-          return unless OrganizationAssemblies.new(current_organization).query.where(slug: slug).where.not(id: id).any?
+          return unless OrganizationAssemblies.new(current_organization).query.where(slug:).where.not(id:).any?
 
           errors.add(:slug, :taken)
         end

data/app/forms/decidim/assemblies/admin/assembly_form.rb

@@ -149,7 +149,7 @@ module Decidim
 
         def slug_uniqueness
           return unless organization_assemblies
-                        .where(slug: slug)
+                        .where(slug:)
                         .where.not(id: context[:assembly_id])
                         .any?
 

data/app/forms/decidim/assemblies/admin/assembly_import_form.rb

@@ -73,7 +73,7 @@ module Decidim
         private
 
         def slug_uniqueness
-          return unless OrganizationAssemblies.new(current_organization).query.where(slug: slug).where.not(id: id).any?
+          return unless OrganizationAssemblies.new(current_organization).query.where(slug:).where.not(id:).any?
 
           errors.add(:slug, :taken)
         end

data/app/forms/decidim/assemblies/admin/assembly_user_role_form.rb

@@ -5,26 +5,10 @@ module Decidim
     module Admin
       # A form object used to create assembly user roles from the admin dashboard.
       #
-      class AssemblyUserRoleForm < Form
+      class AssemblyUserRoleForm < Decidim::Admin::ParticipatorySpaceAdminUserForm
         mimic :assembly_user_role
 
-        attribute :name, String
-        attribute :email, String
-        attribute :role, String
-
-        validates :name, :email, :role, presence: true
-        validates :role, inclusion: { in: Decidim::AssemblyUserRole::ROLES }
-
-        validates :name, format: { with: UserBaseEntity::REGEXP_NAME }
-
-        def roles
-          Decidim::AssemblyUserRole::ROLES.map do |role|
-            [
-              I18n.t(role, scope: "decidim.admin.models.assembly_user_role.roles"),
-              role
-            ]
-          end
-        end
+        def scope = "decidim.admin.models.assembly_user_role.roles"
       end
     end
   end