decidim-assemblies 0.21.0 → 0.23.2

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

@@ -25,12 +25,13 @@ module Decidim
           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
 
             on(:invalid) do
               flash[:alert] = I18n.t("assembly_user_roles.create.error", scope: "decidim.admin")
+              render :new
             end
-            redirect_to assembly_user_roles_path(current_assembly)
           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
@@ -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/controllers/decidim/assemblies/{assembly_widgets_controller.rb → widgets_controller.rb}

@@ -2,7 +2,7 @@
 
 module Decidim
   module Assemblies
-    class AssemblyWidgetsController < Decidim::WidgetsController
+    class WidgetsController < Decidim::WidgetsController
       helper Decidim::SanitizeHelper
 
       private
@@ -16,7 +16,7 @@ module Decidim
       end
 
       def iframe_url
-        @iframe_url ||= assembly_assembly_widget_url(model)
+        @iframe_url ||= assembly_widget_url(model)
       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/assembly_form.rb

@@ -8,6 +8,7 @@ module Decidim
       #
       class AssemblyForm < Form
         include TranslatableAttributes
+        include Decidim::HasUploadValidations
 
         CREATED_BY = %w(city_council public others).freeze
 
@@ -62,7 +63,10 @@ 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 }
 
@@ -72,12 +76,17 @@ module Decidim
         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
@@ -93,7 +102,7 @@ module Decidim
 
         def assembly_types_for_select
           @assembly_types_for_select ||= organization_assembly_types
-                                          &.map { |type| [translated_attribute(type.title), type.id] }
+                                             &.map { |type| [translated_attribute(type.title), type.id] }
         end
 
         def created_by_for_select
@@ -111,8 +120,8 @@ 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

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,11 @@ 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 }
+
         def roles
           Decidim::AssemblyUserRole::ROLES.map do |role|
             [

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/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

@@ -5,6 +5,9 @@ module Decidim
   class AssembliesType < ApplicationRecord
     include Decidim::Traceable
     include Decidim::Loggable
+    include Decidim::TranslatableResource
+
+    translatable_fields :title
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",

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,10 +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
     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"
@@ -63,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 }
@@ -158,6 +167,10 @@ module Decidim
       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

data/app/permissions/decidim/assemblies/permissions.rb

@@ -30,8 +30,10 @@ module Decidim
         return permission_action unless permission_action.scope == :admin
 
         user_can_read_assembly_list?
+        user_can_list_assembly_list?
         user_can_read_current_assembly?
         user_can_create_assembly?
+        user_can_read_assemblies_setting?
 
         # org admins and space admins can do everything in the admin section
         org_admin_action?
@@ -165,6 +167,13 @@ module Decidim
         toggle_allow(user.admin?)
       end
 
+      def user_can_read_assemblies_setting?
+        return unless permission_action.action == :read &&
+                      permission_action.subject == :assemblies_setting
+
+        toggle_allow(user.admin?)
+      end
+
       # Everyone can read the assembly list
       def user_can_read_assembly_list?
         return unless read_assembly_list_permission_action?
@@ -172,6 +181,25 @@ module Decidim
         toggle_allow(user.admin? || has_manageable_assemblies?)
       end
 
+      # Checks whether the user can list the current given assembly or not.
+      #
+      # In case of user being admin of child assembly even parent assembly
+      # should be listed to be able to navigate to child assembly
+      def user_can_list_assembly_list?
+        return unless permission_action.action == :list &&
+                      permission_action.subject == :assembly
+
+        toggle_allow(user.admin? || allowed_list_of_assemblies?)
+      end
+
+      def allowed_list_of_assemblies?
+        assemblies = AssembliesWithUserRole.for(user)
+        parent_assemblies = assemblies.flat_map { |assembly| [assembly.id] + assembly.ancestors.pluck(:id) }
+
+        allowed_list_of_assemblies = Decidim::Assembly.where(id: assemblies + parent_assemblies)
+        allowed_list_of_assemblies.uniq.member?(assembly)
+      end
+
       def user_can_read_current_assembly?
         return unless read_assembly_list_permission_action?
         return if permission_action.subject == :assembly_list
@@ -221,7 +249,9 @@ module Decidim
           :assembly,
           :assembly_user_role,
           :assembly_member,
-          :space_private_user
+          :space_private_user,
+          :export_space,
+          :import
         ].include?(permission_action.subject)
         allow! if is_allowed
       end
@@ -239,7 +269,10 @@ module Decidim
           :assembly,
           :assembly_user_role,
           :assembly_member,
-          :space_private_user
+          :space_private_user,
+          :export_space,
+          :import,
+          :assemblies_setting
         ].include?(permission_action.subject)
         allow! if is_allowed
       end