decidim-assemblies 0.20.1 → 0.23.1

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

@@ -8,13 +8,12 @@ module Decidim
       #
       class AssemblyForm < Form
         include TranslatableAttributes
+        include Decidim::HasUploadValidations
 
-        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 +31,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 +40,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,22 +63,30 @@ 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
 
-        validates :banner_image,
-                  file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                  file_content_type: { allow: ["image/jpeg", "image/png"] }
-        validates :hero_image,
-                  file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                  file_content_type: { allow: ["image/jpeg", "image/png"] }
+        validates :banner_image, passthru: { to: Decidim::Assembly }
+        validates :hero_image, passthru: { to: Decidim::Assembly }
+
+        alias organization current_organization
+
+        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
@@ -94,12 +101,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 +120,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 +151,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

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

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # A form object used to import an assembly from the admin
+      # dashboard.
+      #
+      class AssemblyImportForm < Form
+        include TranslatableAttributes
+
+        JSON_MIME_TYPE = "application/json"
+        # Accepted mime types
+        # keys: are used for dynamic help text on admin form.
+        # values: are used to validate the file format of imported document.
+        #
+        # WARNING: consider adding/removing the relative translation key at
+        # decidim.assemblies.admin.new_import.accepted_types when modifying this hash
+        ACCEPTED_TYPES = {
+          json: JSON_MIME_TYPE
+        }.freeze
+
+        translatable_attribute :title, String
+
+        mimic :assembly
+
+        attribute :slug, String
+        attribute :import_steps, Boolean, default: false
+        attribute :import_categories, Boolean, default: true
+        attribute :import_attachments, Boolean, default: true
+        attribute :import_components, Boolean, default: true
+        attribute :document
+
+        validates :document, presence: true
+
+        validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
+        validates :title, translatable_presence: true
+        validate :slug_uniqueness
+
+        validate :document_type_must_be_valid, if: :document
+
+        def document_text
+          @document_text ||= document&.read
+        end
+
+        def document_type_must_be_valid
+          return if valid_mime_types.include?(document_type)
+
+          errors.add(:document, i18n_invalid_document_type_text)
+        end
+
+        # Return ACCEPTED_MIME_TYPES plus `text/plain` for better markdown support
+        def valid_mime_types
+          ACCEPTED_TYPES.values
+        end
+
+        def document_type
+          document.content_type
+        end
+
+        def i18n_invalid_document_type_text
+          I18n.t("invalid_document_type",
+                 scope: "activemodel.errors.models.assembly.attributes.document",
+                 valid_mime_types: i18n_valid_mime_types_text)
+        end
+
+        def i18n_valid_mime_types_text
+          ACCEPTED_TYPES.keys.map do |mime_type|
+            I18n.t(mime_type, scope: "decidim.assemblies.admin.new_import.accepted_types")
+          end.join(", ")
+        end
+
+        private
+
+        def slug_uniqueness
+          return unless OrganizationAssemblies.new(current_organization).query.where(slug: slug).where.not(id: id).any?
+
+          errors.add(:slug, :taken)
+        end
+      end
+    end
+  end
+end

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

@@ -12,10 +12,12 @@ module Decidim
         attribute :email, String
         attribute :role, String
 
-        validates :email, :role, presence: true
-        validates :name, presence: true
+        validates :name, :email, :role, presence: true
         validates :role, inclusion: { in: Decidim::AssemblyUserRole::ROLES }
 
+        validates :name, format: { with: UserBaseEntity::REGEXP_NAME }
+        validate :admin_uniqueness
+
         def roles
           Decidim::AssemblyUserRole::ROLES.map do |role|
             [
@@ -24,6 +26,10 @@ module Decidim
             ]
           end
         end
+
+        def admin_uniqueness
+          errors.add(:email, :taken) if context && context.current_organization && context.current_organization.admins.where(email: email).exists?
+        end
       end
     end
   end

data/app/helpers/decidim/assemblies/admin/assemblies_helper.rb

@@ -14,6 +14,12 @@ module Decidim
             @processes_selected ||= current_assembly.linked_participatory_space_resources(:participatory_processes, "included_participatory_processes").pluck(:id)
           end
         end
+
+        # Public: A collection of Assemblies that can be selected as parent
+        # assemblies for another assembly; to be used in forms.
+        def parent_assemblies_for_select
+          @parent_assemblies_for_select ||= ParentAssembliesForSelect.for(current_organization, current_assembly)
+        end
       end
     end
   end

data/app/helpers/decidim/assemblies/assemblies_helper.rb

@@ -45,9 +45,12 @@ module Decidim
           html += "<span class='definition-data__title'>#{t("assemblies.show.social_networks", scope: "decidim")}</span>".html_safe
           Decidim::Assembly::SOCIAL_HANDLERS.each do |handler|
             handler_name = "#{handler}_handler"
-            if assembly.send(handler_name).present?
-              html += link_to handler.capitalize, "https://#{handler}.com/#{assembly.send(handler_name)}", target: "_blank", class: "", title: handler.capitalize, rel: "noopener"
-            end
+            next if assembly.send(handler_name).blank?
+
+            html += link_to handler.capitalize, "https://#{handler}.com/#{assembly.send(handler_name)}",
+                            target: "_blank",
+                            class: "",
+                            title: t("assemblies.show.social_networks_title", scope: "decidim") << " " << handler.capitalize.to_s, rel: "noopener"
           end
           html += "</div>".html_safe
         end

data/app/helpers/decidim/assemblies/filter_assemblies_helper.rb

@@ -7,10 +7,10 @@ module Decidim
     # `filter` returns a Filter object from Decidim::FilterResource
     module FilterAssembliesHelper
       def available_filters
-        %w(all) + Assembly::ASSEMBLY_TYPES
+        @available_filters ||= [t("all", scope: "decidim.assemblies.filter")] + organization_assembly_types
       end
 
-      def filter_link(filter_name)
+      def filter_link(type_id)
         Decidim::Assemblies::Engine
           .routes
           .url_helpers
@@ -18,7 +18,7 @@ module Decidim
             filter: {
               scope_id: filter.scope_id,
               area_id: filter.area_id,
-              assembly_type: filter_name
+              type_id: type_id
             }
           )
       end
@@ -27,12 +27,15 @@ module Decidim
         t("help", scope: "decidim.assemblies.filter")
       end
 
-      def filter_name(filter_key)
-        t(filter_key, scope: "decidim.assemblies.filter")
+      def current_filter_name
+        type = AssembliesType.find_by(id: filter.type_id)
+        return translated_attribute type.title if type
+
+        t("all", scope: "decidim.assemblies.filter")
       end
 
-      def current_filter_name
-        filter_name(filter.assembly_type)
+      def organization_assembly_types
+        AssembliesType.where(organization: current_organization)&.map { |type| [translated_attribute(type.title), type.id] }
       end
     end
   end

data/app/models/decidim/assemblies_setting.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Assemblies setting.
+  class AssembliesSetting < ApplicationRecord
+    include Decidim::Traceable
+    include Decidim::Loggable
+
+    belongs_to :organization,
+               foreign_key: "decidim_organization_id",
+               class_name: "Decidim::Organization"
+
+    def self.log_presenter_class_for(_log)
+      Decidim::Assemblies::AdminLog::AssembliesSettingPresenter
+    end
+  end
+end

data/app/models/decidim/assemblies_type.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Assembly type.
+  class AssembliesType < ApplicationRecord
+    include Decidim::Traceable
+    include Decidim::Loggable
+    include Decidim::TranslatableResource
+
+    translatable_fields :title
+
+    belongs_to :organization,
+               foreign_key: "decidim_organization_id",
+               class_name: "Decidim::Organization"
+
+    has_many :assemblies,
+             foreign_key: "decidim_assemblies_type_id",
+             class_name: "Decidim::Assembly",
+             dependent: :nullify
+
+    validates :title, presence: true
+
+    def self.log_presenter_class_for(_log)
+      Decidim::Assemblies::AdminLog::AssembliesTypePresenter
+    end
+  end
+end

data/app/models/decidim/assembly.rb

@@ -24,7 +24,7 @@ module Decidim
     include Decidim::HasAttachmentCollections
     include Decidim::Participable
     include Decidim::Publicable
-    include Decidim::Scopable
+    include Decidim::ScopableParticipatorySpace
     include Decidim::Followable
     include Decidim::HasReference
     include Decidim::Traceable
@@ -32,11 +32,16 @@ module Decidim
     include Decidim::ParticipatorySpaceResourceable
     include Decidim::HasPrivateUsers
     include Decidim::Searchable
+    include Decidim::HasUploadValidations
+    include Decidim::TranslatableResource
 
     SOCIAL_HANDLERS = [:twitter, :facebook, :instagram, :youtube, :github].freeze
-    ASSEMBLY_TYPES = %w(government executive consultative_advisory participatory working_group commission others).freeze
     CREATED_BY = %w(city_council public others).freeze
 
+    translatable_fields :title, :subtitle, :short_description, :description, :developer_group, :meta_scope, :local_area,
+                        :target, :participatory_scope, :participatory_structure, :purpose_of_action, :composition, :created_by_other,
+                        :closing_date_reason, :internal_organisation, :special_features
+
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
                class_name: "Decidim::Organization"
@@ -44,6 +49,10 @@ module Decidim
                foreign_key: "decidim_area_id",
                class_name: "Decidim::Area",
                optional: true
+    belongs_to :assembly_type,
+               foreign_key: "decidim_assemblies_type_id",
+               class_name: "Decidim::AssembliesType",
+               optional: true
     has_many :categories,
              foreign_key: "decidim_participatory_space_id",
              foreign_type: "decidim_participatory_space_type",
@@ -60,7 +69,10 @@ module Decidim
     has_many :children, foreign_key: "parent_id", class_name: "Decidim::Assembly", inverse_of: :parent, dependent: :destroy
     belongs_to :parent, foreign_key: "parent_id", class_name: "Decidim::Assembly", inverse_of: :children, optional: true, counter_cache: :children_count
 
+    validates_upload :hero_image
     mount_uploader :hero_image, Decidim::HeroImageUploader
+
+    validates_upload :banner_image
     mount_uploader :banner_image, Decidim::BannerImageUploader
 
     validates :slug, uniqueness: { scope: :organization }
@@ -148,6 +160,17 @@ module Decidim
       closing_date < Date.current
     end
 
+    def user_roles(role_name = nil)
+      roles = Decidim::AssemblyUserRole.where(assembly: self)
+      return roles if role_name.blank?
+
+      roles.where(role: role_name)
+    end
+
+    def attachment_context
+      :admin
+    end
+
     private
 
     # When an assembly changes their parent, we need to update the parents_path attribute
@@ -201,7 +224,7 @@ module Decidim
 
     # Allow ransacker to search for a key in a hstore column (`title`.`en`)
     ransacker :title do |parent|
-      Arel::Nodes::InfixOperation.new("->", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
+      Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
     end
   end
 end