decidim-assemblies 0.19.0 → 0.22.0

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

@@ -6,15 +6,13 @@ module Decidim
       # Controller that allows managing assemblies.
       #
       class AssembliesController < Decidim::Assemblies::Admin::ApplicationController
-        include Decidim::Paginable
-        helper_method :current_assembly, :parent_assembly, :parent_assemblies, :current_participatory_space, :query
+        include Decidim::Assemblies::Admin::Filterable
+        helper_method :current_assembly, :parent_assembly, :current_participatory_space
         layout "decidim/admin/assemblies"
 
-        before_action :set_all_assemblies, except: [:index]
-
         def index
           enforce_permission_to :read, :assembly_list
-          @assemblies = collection
+          @assemblies = filtered_collection
         end
 
         def new
@@ -30,7 +28,7 @@ module Decidim
           CreateAssembly.call(@form) do
             on(:ok) do |assembly|
               flash[:notice] = I18n.t("assemblies.create.success", scope: "decidim.admin")
-              redirect_to assemblies_path(parent_id: assembly.parent_id)
+              redirect_to assemblies_path(q: { parent_id_eq: assembly.parent_id })
             end
 
             on(:invalid) do
@@ -72,39 +70,20 @@ module Decidim
 
         private
 
-        def organization_assemblies
-          @organization_assemblies ||= OrganizationAssemblies.new(current_user.organization).query
-        end
-
-        def query
-          organization_assemblies
-            .where(parent_id: params[:parent_id])
-            .ransack(params[:q])
-        end
-
         def collection
-          @collection ||= paginate(query.result)
-        end
-
-        def set_all_assemblies
-          @all_assemblies = organization_assemblies
+          @collection ||= OrganizationAssemblies.new(current_user.organization).query
         end
 
         def current_assembly
-          scope = organization_assemblies
-          @current_assembly ||= scope.where(slug: params[:slug]).or(
-            scope.where(id: params[:slug])
+          @current_assembly ||= collection.where(slug: params[:slug]).or(
+            collection.where(id: params[:slug])
           ).first
         end
 
         alias current_participatory_space current_assembly
 
         def parent_assembly
-          @parent_assembly ||= organization_assemblies.find_by(id: params[:parent_id])
-        end
-
-        def parent_assemblies
-          @parent_assemblies ||= organization_assemblies.where(parent_id: nil)
+          @parent_assembly ||= collection.find_by(id: ransack_params[:parent_id_eq])
         end
 
         def assembly_params

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # Controller used to manage the assemblies settings for the current
+      # organization.
+      class AssembliesSettingsController < Decidim::Assemblies::Admin::ApplicationController
+        layout "decidim/admin/assemblies"
+
+        # GET /admin/assemblies_settings/edit
+        def edit
+          enforce_permission_to :edit, :assemblies_setting, assemblies_settings: current_assemblies_settings
+          @form = assemblies_settings_form.from_model(current_assemblies_settings)
+        end
+
+        # PUT /admin/assemblies_settings/:id
+        def update
+          enforce_permission_to :update, :assemblies_setting, assemblies_settings: current_assemblies_settings
+
+          @form = assemblies_settings_form
+                  .from_params(params, assemblies_settings: current_assemblies_settings)
+
+          UpdateAssembliesSetting.call(current_assemblies_settings, @form) do
+            on(:ok) do
+              flash[:notice] = I18n.t("assemblies_settings.update.success", scope: "decidim.admin")
+              redirect_to edit_assemblies_settings_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("assemblies_settings.update.error", scope: "decidim.admin")
+              render :edit
+            end
+          end
+        end
+
+        private
+
+        def current_assemblies_settings
+          @current_assemblies_settings ||= Decidim::AssembliesSetting.find_or_create_by!(decidim_organization_id: current_organization.id)
+        end
+
+        def assemblies_settings_form
+          form(Decidim::Assemblies::Admin::AssembliesSettingForm)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # Controller used to manage the available assemblies types for the current
+      # organization.
+      # As this substitues former i18n simple hash we need to keep these i18n keys for migrations
+      # and rollbakcs. So let i18n-tasks know about:
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.government')
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.commission')
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.consultative_advisory')
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.executive')
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.others')
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.participatory')
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.working_group')
+      # 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"
+
+        # GET /admin/assemblies_types
+        def index
+          enforce_permission_to :index, :assembly_type
+        end
+
+        # GET /admin/assemblies_types/new
+        def new
+          enforce_permission_to :create, :assembly_type
+          @form = assembly_type_form.instance
+        end
+
+        # POST /admin/assemblies_types
+        def create
+          enforce_permission_to :create, :assembly_type
+          @form = assembly_type_form.from_params(params)
+
+          CreateAssembliesType.call(@form) do
+            on(:ok) do |_assembly_type|
+              flash[:notice] = I18n.t("assemblies_types.create.success", scope: "decidim.admin")
+              redirect_to assemblies_types_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("assemblies_types.create.error", scope: "decidim.admin")
+              render :new
+            end
+          end
+        end
+
+        # GET /admin/assemblies_types/:id/edit
+        def edit
+          enforce_permission_to :edit, :assembly_type, assembly_type: current_assembly_type
+          @form = assembly_type_form
+                  .from_model(current_assembly_type,
+                              assembly_type: current_assembly_type)
+        end
+
+        # PUT /admin/assemblies_types/:id
+        def update
+          enforce_permission_to :update, :assembly_type, assembly_type: current_assembly_type
+
+          @form = assembly_type_form
+                  .from_params(params, assembly_type: current_assembly_type)
+
+          UpdateAssembliesType.call(current_assembly_type, @form) do
+            on(:ok) do
+              flash[:notice] = I18n.t("assemblies_types.update.success", scope: "decidim.admin")
+              redirect_to assemblies_types_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("assemblies_types.update.error", scope: "decidim.admin")
+              render :edit
+            end
+          end
+        end
+
+        # DELETE /admin/assemblies_types/:id
+        def destroy
+          enforce_permission_to :destroy, :assembly_type, assembly_type: current_assembly_type
+
+          DestroyAssembliesType.call(current_assembly_type, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("assemblies_types.destroy.success", scope: "decidim.admin")
+              redirect_to assemblies_types_path
+            end
+          end
+        end
+
+        private
+
+        def available_assemblies_types
+          @available_assemblies_types ||= AssembliesType.where(organization: current_organization)
+        end
+
+        def current_assembly_type
+          @current_assembly_type ||= AssembliesType.find(params[:id])
+        end
+
+        def assembly_type_form
+          form(Decidim::Assemblies::Admin::AssembliesTypeForm)
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Decidim
       participatory_space_layout only: :show
       include FilterResource
 
-      helper_method :parent_assemblies, :promoted_assemblies, :stats, :assembly_participatory_processes
+      helper_method :parent_assemblies, :promoted_assemblies, :stats, :assembly_participatory_processes, :current_assemblies_settings
 
       def index
         enforce_permission_to :list, :assembly
@@ -56,7 +56,7 @@ module Decidim
         {
           scope_id: nil,
           area_id: nil,
-          assembly_type: "all"
+          type_id: nil
         }
       end
 
@@ -87,6 +87,10 @@ 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/events/decidim/assemblies/create_assembly_member_event.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    class CreateAssemblyMemberEvent < Decidim::Events::SimpleEvent
+      i18n_attributes :resource_name
+
+      def resource_name
+        @resource_name ||= translated_attribute(assembly.title)
+      end
+
+      def assembly
+        @assembly ||= resource
+      end
+    end
+  end
+end

data/app/events/decidim/role_assigned_to_assembly_event.rb

@@ -0,0 +1,28 @@
+# 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"], "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,
+        scope: event_name,
+        participatory_space_title: participatory_space_title,
+        participatory_space_url: participatory_space_url,
+        role: i18n_role
+      }
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # A form object used to create assembly setting from the admin dashboard.
+      class AssembliesSettingForm < Form
+        mimic :assemblies_setting
+
+        attribute :enable_organization_chart, Boolean
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # A form object used to create assembly type from the admin dashboard.
+      class AssembliesTypeForm < Form
+        include TranslatableAttributes
+
+        mimic :assemblies_type
+
+        translatable_attribute :title, String
+        validates :title, translatable_presence: true
+      end
+    end
+  end
+end

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

@@ -9,12 +9,10 @@ module Decidim
       class AssemblyForm < Form
         include TranslatableAttributes
 
-        ASSEMBLY_TYPES = %w(government executive consultative_advisory participatory working_group commission others).freeze
         CREATED_BY = %w(city_council public others).freeze
 
         mimic :assembly
 
-        translatable_attribute :assembly_type_other, String
         translatable_attribute :composition, String
         translatable_attribute :closing_date_reason, String
         translatable_attribute :created_by_other, String
@@ -32,7 +30,6 @@ module Decidim
         translatable_attribute :target, String
         translatable_attribute :title, String
 
-        attribute :assembly_type, String
         attribute :created_by, String
         attribute :facebook_handler, String
         attribute :github_handler, String
@@ -42,6 +39,7 @@ module Decidim
         attribute :twitter_handler, String
         attribute :youtube_handler, String
 
+        attribute :decidim_assemblies_type_id, Integer
         attribute :area_id, Integer
         attribute :parent_id, Integer
         attribute :participatory_processes_ids, Array[Integer]
@@ -64,13 +62,16 @@ module Decidim
         attribute :remove_hero_image
 
         validates :area, presence: true, if: proc { |object| object.area_id.present? }
-        validates :parent, presence: true, if: ->(form) { form.parent_id.present? }
+
+        validates :parent, presence: true, if: ->(form) { form.parent.present? }
+        validate :ensure_parent_cannot_be_child, if: ->(form) { form.parent.present? }
+
         validates :scope, presence: true, if: proc { |object| object.scope_id.present? }
         validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
 
         validate :slug_uniqueness
+        validate :same_type_organization, if: ->(form) { form.decidim_assemblies_type_id }
 
-        validates :assembly_type_other, translatable_presence: true, if: ->(form) { form.assembly_type == "others" }
         validates :created_by_other, translatable_presence: true, if: ->(form) { form.created_by == "others" }
         validates :title, :subtitle, :description, :short_description, translatable_presence: true
 
@@ -81,6 +82,13 @@ module Decidim
                   file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
                   file_content_type: { allow: ["image/jpeg", "image/png"] }
 
+        def ensure_parent_cannot_be_child
+          return if id.blank?
+
+          available_assemblies = Decidim::Assemblies::ParentAssembliesForSelect.for(current_organization, Assembly.find(id))
+          errors.add(:parent, :invalid) unless available_assemblies.include? parent
+        end
+
         def map_model(model)
           self.scope_id = model.decidim_scope_id
         end
@@ -94,12 +102,8 @@ module Decidim
         end
 
         def assembly_types_for_select
-          ASSEMBLY_TYPES.map do |type|
-            [
-              I18n.t("assembly_types.#{type}", scope: "decidim.assemblies"),
-              type
-            ]
-          end
+          @assembly_types_for_select ||= organization_assembly_types
+                                             &.map { |type| [translated_attribute(type.title), type.id] }
         end
 
         def created_by_for_select
@@ -117,12 +121,20 @@ module Decidim
 
         def processes_for_select
           @processes_for_select ||= organization_participatory_processes
-                                    &.map { |pp| [translated_attribute(pp.title), pp.id] }
-                                    &.sort_by { |arr| arr[0] }
+                                        &.map { |pp| [translated_attribute(pp.title), pp.id] }
+                                        &.sort_by { |arr| arr[0] }
+        end
+
+        def assembly_type
+          AssembliesType.find_by(id: decidim_assemblies_type_id)
         end
 
         private
 
+        def organization_assembly_types
+          AssembliesType.where(organization: current_organization)
+        end
+
         def organization_participatory_processes
           Decidim.find_participatory_space_manifest(:participatory_processes)
                  .participatory_spaces.call(current_organization)
@@ -140,6 +152,13 @@ module Decidim
 
           errors.add(:slug, :taken)
         end
+
+        def same_type_organization
+          return unless assembly_type
+          return if assembly_type.organization == current_organization
+
+          errors.add(:assembly_type, :invalid)
+        end
       end
     end
   end