decidim-assemblies 0.26.0 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 344e04cccf08bd1451e5346a57a8d383148ad661e9291b48f5c0193de77eef72
-  data.tar.gz: 981cf77c8e5ffc50ded811bdd8d18f3c29f470350be24252ac59938f0932fd74
+  metadata.gz: 2a5b5e8c31f5fe95f7daababb5bbc461d310b6856de642bc7fbfbc11ec28e2ad
+  data.tar.gz: 93a14db836c2565409018f0f7412e573a09e82d284d1f8541e02760840e9474b
 SHA512:
-  metadata.gz: 8e4a6ab3ac34de4431ddb4f490ed2bda8bda4548cb4c36a5da7ba48639695ceb21314f2b1a4f500b63989a9074a065dfdcf3dd27f5e3de14a39850d34e42222c
-  data.tar.gz: d17c60e0e01a7694f6d5aa931d205b3d82b502ad281b71fcf176683e41e329e87056c1910f42adf0a463d109027e370726fd746a873966a8c4382bec51c9f452
+  metadata.gz: 1d798e4bce33008a72d064a0018526315f7d19316892ea0768143da3ebe88b2dd2b41a49a933ec1a53179d86f14ee12725e125f84b7805668a3b7daf02064c41
+  data.tar.gz: 8acdd79b4afb870df01b723e8d2f2e821bbeafbfb132cacfdb6c32efbb6d4ba0daf48defffe6717b630f3bcbf7e0dd3af2f93ca8eea2f0959bcc9f8f507ffdb3

data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies/show.erb

@@ -1,4 +1,4 @@
-<section class="wrapper-home home-section" xmlns="http://www.w3.org/1999/xhtml">
+<section id="highlighted_assemblies" class="wrapper-home home-section" xmlns="http://www.w3.org/1999/xhtml">
   <div class="row" id="highlighted-assemblies">
     <h3 class="section-heading"><%= t("active_assemblies", scope: i18n_scope) %></h3>
     <div class="row collapse">

data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb

@@ -6,10 +6,6 @@ module Decidim
       class HighlightedAssembliesCell < Decidim::ViewModel
         delegate :current_user, to: :controller
 
-        cache :show, expires_in: 10.minutes, if: :perform_caching? do
-          cache_hash
-        end
-
         def show
           render if highlighted_assemblies.any?
         end
@@ -22,6 +18,7 @@ module Decidim
           @highlighted_assemblies ||= OrganizationPrioritizedAssemblies
                                       .new(current_organization, current_user)
                                       .query
+                                      .with_attached_hero_image
                                       .includes([:organization])
                                       .limit(max_results)
         end
@@ -41,6 +38,10 @@ module Decidim
           hash.push(I18n.locale)
           hash.join(Decidim.cache_key_separator)
         end
+
+        def cache_expiry_time
+          10.minutes
+        end
       end
     end
   end

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

@@ -5,14 +5,15 @@ module Decidim
     module Admin
       # A command with all the business logic when copying a new participatory
       # assembly in the system.
-      class CopyAssembly < Rectify::Command
+      class CopyAssembly < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
         # assembly - An assembly we want to duplicate
-        def initialize(form, assembly)
+        def initialize(form, assembly, user)
           @form = form
           @assembly = assembly
+          @user = user
         end
 
         # Executes the command. Broadcasts these events:
@@ -24,11 +25,13 @@ module Decidim
         def call
           return broadcast(:invalid) if form.invalid?
 
-          Assembly.transaction do
-            copy_assembly
-            copy_assembly_attachments
-            copy_assembly_categories if @form.copy_categories?
-            copy_assembly_components if @form.copy_components?
+          Decidim.traceability.perform_action!("duplicate", @assembly, @user) do
+            Assembly.transaction do
+              copy_assembly
+              copy_assembly_attachments
+              copy_assembly_categories if @form.copy_categories?
+              copy_assembly_components if @form.copy_components?
+            end
           end
 
           broadcast(:ok, @copied_assembly)

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new assembly
       # type in the system.
-      class CreateAssembliesType < Rectify::Command
+      class CreateAssembliesType < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new participatory
       # assembly in the system.
-      class CreateAssembly < Rectify::Command
+      class CreateAssembly < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new assembly
       # member in the system.
-      class CreateAssemblyMember < Rectify::Command
+      class CreateAssemblyMember < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
@@ -53,16 +53,16 @@ module Decidim
 
         def assembly_member_attributes
           form.attributes.slice(
-            :full_name,
-            :gender,
-            :birthday,
-            :birthplace,
-            :ceased_date,
-            :designation_date,
-            :position,
-            :position_other,
-            :weight
-          ).merge(
+            "full_name",
+            "gender",
+            "birthday",
+            "birthplace",
+            "ceased_date",
+            "designation_date",
+            "position",
+            "position_other",
+            "weight"
+          ).symbolize_keys.merge(
             assembly: assembly,
             user: form.user
           ).merge(
@@ -99,7 +99,7 @@ module Decidim
             resource: assembly,
             followers: followers
           }
-          Decidim::EventsManager.publish(data)
+          Decidim::EventsManager.publish(**data)
         end
       end
     end

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when destroying an assembly
       # type in the system.
-      class DestroyAssembliesType < Rectify::Command
+      class DestroyAssembliesType < Decidim::Command
         # Public: Initializes the command.
         #
         # assemblies_type - the AssemblyMember to destroy

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when destroying an assembly
       # admin in the system.
-      class DestroyAssemblyAdmin < Rectify::Command
+      class DestroyAssemblyAdmin < Decidim::Command
         # Public: Initializes the command.
         #
         # role - the AssemblyUserRole to destroy

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when destroying an assembly
       # member in the system.
-      class DestroyAssemblyMember < Rectify::Command
+      class DestroyAssemblyMember < Decidim::Command
         # Public: Initializes the command.
         #
         # assembly_member - the AssemblyMember to destroy

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

@@ -5,13 +5,14 @@ module Decidim
     module Admin
       # A command with all the business logic to import a new assembly
       # in the system.
-      class ImportAssembly < Rectify::Command
+      class ImportAssembly < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
         # assembly - An assembly we want to duplicate
-        def initialize(form)
+        def initialize(form, user)
           @form = form
+          @user = user
         end
 
         # Executes the command. Broadcasts these events:
@@ -38,11 +39,14 @@ module Decidim
         def import_assembly
           importer = Decidim::Assemblies::AssemblyImporter.new(form.current_organization, form.current_user)
           assemblies.each do |original_assembly|
-            @imported_assembly = importer.import(original_assembly, form.current_user, title: form.title, slug: form.slug)
-            importer.import_assemblies_type(original_assembly["decidim_assemblies_type_id"])
-            importer.import_categories(original_assembly["assembly_categories"]) if form.import_categories?
-            importer.import_folders_and_attachments(original_assembly["attachments"]) if form.import_attachments?
-            importer.import_components(original_assembly["components"]) if form.import_components?
+            Decidim.traceability.perform_action!("import", Assembly, @user) do
+              @imported_assembly = importer.import(original_assembly, form.current_user, title: form.title, slug: form.slug)
+              importer.import_assemblies_type(original_assembly["decidim_assemblies_type_id"])
+              importer.import_categories(original_assembly["assembly_categories"]) if form.import_categories?
+              importer.import_folders_and_attachments(original_assembly["attachments"]) if form.import_attachments?
+              importer.import_components(original_assembly["components"]) if form.import_components?
+              @imported_assembly
+            end
           end
         end
 

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

@@ -4,7 +4,7 @@ module Decidim
   module Assemblies
     module Admin
       # A command to notify users when a role is assigned for an assembly
-      class NotifyRoleAssignedToAssembly < Rectify::Command
+      class NotifyRoleAssignedToAssembly < Decidim::Command
         def send_notification(user)
           Decidim::EventsManager.publish(
             event: "decidim.events.assembly.role_assigned",

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

@@ -4,7 +4,7 @@ module Decidim
   module Assemblies
     module Admin
       # A command that sets an assembly as published.
-      class PublishAssembly < Rectify::Command
+      class PublishAssembly < Decidim::Command
         # Public: Initializes the command.
         #
         # assembly - A Assembly that will be published

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

@@ -4,7 +4,7 @@ module Decidim
   module Assemblies
     module Admin
       # A command that sets an assembly as unpublished.
-      class UnpublishAssembly < Rectify::Command
+      class UnpublishAssembly < Decidim::Command
         # Public: Initializes the command.
         #
         # assembly - A Assembly that will be published

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when updating assemblies
       # settings in admin area.
-      class UpdateAssembliesSetting < Rectify::Command
+      class UpdateAssembliesSetting < Decidim::Command
         # Public: Initializes the command.
         #
         # assemblies_setting - A assemblies_setting object to update.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when updating a new assembly
       # type in the system.
-      class UpdateAssembliesType < Rectify::Command
+      class UpdateAssembliesType < Decidim::Command
         # Public: Initializes the command.
         #
         # assemblies_type - A assemblies_type object to update.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new participatory
       # assembly in the system.
-      class UpdateAssembly < Rectify::Command
+      class UpdateAssembly < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when updating an assembly
       # member in the system.
-      class UpdateAssemblyMember < Rectify::Command
+      class UpdateAssemblyMember < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
@@ -51,16 +51,16 @@ module Decidim
 
         def attributes
           form.attributes.slice(
-            :full_name,
-            :gender,
-            :birthday,
-            :birthplace,
-            :ceased_date,
-            :designation_date,
-            :position,
-            :position_other,
-            :weight
-          ).merge(
+            "full_name",
+            "gender",
+            "birthday",
+            "birthplace",
+            "ceased_date",
+            "designation_date",
+            "position",
+            "position_other",
+            "weight"
+          ).symbolize_keys.merge(
             user: form.user
           ).merge(
             attachment_attributes(:non_user_avatar)

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

@@ -17,7 +17,7 @@ module Decidim
           enforce_permission_to :create, :assembly
           @form = form(AssemblyCopyForm).from_params(params)
 
-          CopyAssembly.call(@form, current_assembly) do
+          CopyAssembly.call(@form, current_assembly, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("assemblies_copies.create.success", scope: "decidim.admin")
               redirect_to assemblies_path(parent_id: current_assembly.parent_id)

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

@@ -13,7 +13,7 @@ module Decidim
           enforce_permission_to :import, :assembly
           @form = form(AssemblyImportForm).from_params(params)
 
-          ImportAssembly.call(@form) do
+          ImportAssembly.call(@form, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("assembly_imports.create.success", scope: "decidim.admin")
               redirect_to assemblies_path

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # This controller allows to send reminders.
+      # It is targeted for customizations for reminder things that lives under
+      # an assembly.
+      class RemindersController < Decidim::Admin::RemindersController
+        include Concerns::AssemblyAdmin
+      end
+    end
+  end
+end

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

@@ -48,15 +48,15 @@ module Decidim
 
       private
 
-      def search_klass
-        AssemblySearch
+      def search_collection
+        Assembly.where(organization: current_organization).published.visible_for(current_user)
       end
 
       def default_filter_params
         {
-          scope_id: nil,
-          area_id: nil,
-          type_id: nil
+          with_scope: nil,
+          with_area: nil,
+          type_id_eq: nil
         }
       end
 
@@ -77,7 +77,7 @@ module Decidim
       end
 
       def parent_assemblies
-        search.results.parent_assemblies.order(weight: :asc, promoted: :desc)
+        search.result.parent_assemblies.order(weight: :asc, promoted: :desc)
       end
 
       def stats

data/app/events/decidim/role_assigned_to_assembly_event.rb

@@ -6,7 +6,7 @@ module Decidim
     include Decidim::Events::AuthorEvent
 
     def notification_title
-      I18n.t("notification_title", i18n_options).html_safe
+      I18n.t("notification_title", **i18n_options).html_safe
     end
 
     def i18n_role

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

@@ -30,10 +30,9 @@ module Decidim
         attribute :import_categories, Boolean, default: true
         attribute :import_attachments, Boolean, default: true
         attribute :import_components, Boolean, default: true
-        attribute :document
-
-        validates :document, presence: true
+        attribute :document, Decidim::Attributes::Blob
 
+        validates :document, file_content_type: { allow: ACCEPTED_TYPES.values }
         validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
         validates :title, translatable_presence: true
         validate :slug_uniqueness
@@ -41,7 +40,7 @@ module Decidim
         validate :document_type_must_be_valid, if: :document
 
         def document_text
-          @document_text ||= document&.read
+          @document_text ||= document&.download
         end
 
         def document_type_must_be_valid
@@ -60,9 +59,9 @@ module Decidim
         end
 
         def i18n_invalid_document_type_text
-          I18n.t("invalid_document_type",
+          I18n.t("allowed_file_content_types",
                  scope: "activemodel.errors.models.assembly.attributes.document",
-                 valid_mime_types: i18n_valid_mime_types_text)
+                 types: i18n_valid_mime_types_text)
         end
 
         def i18n_valid_mime_types_text

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

@@ -7,7 +7,9 @@ module Decidim
     # `filter` returns a Filter object from Decidim::FilterResource
     module FilterAssembliesHelper
       def available_filters
-        @available_filters ||= [t("all", scope: "decidim.assemblies.filter")] + organization_assembly_types
+        return if organization_assembly_types.blank?
+
+        [t("all", scope: "decidim.assemblies.filter")] + organization_assembly_types
       end
 
       def filter_link(type_id)
@@ -16,9 +18,9 @@ module Decidim
           .url_helpers
           .assemblies_path(
             filter: {
-              scope_id: filter.scope_id,
-              area_id: filter.area_id,
-              type_id: type_id
+              with_scope: filter.with_scope,
+              with_area: filter.with_area,
+              type_id_eq: type_id
             }
           )
       end
@@ -28,14 +30,16 @@ module Decidim
       end
 
       def current_filter_name
-        type = AssembliesType.find_by(id: filter.type_id)
+        type = AssembliesType.find_by(id: filter_params[:type_id_eq])
         return translated_attribute type.title if type
 
         t("all", scope: "decidim.assemblies.filter")
       end
 
       def organization_assembly_types
-        AssembliesType.where(organization: current_organization)&.map { |type| [translated_attribute(type.title), type.id] }
+        @organization_assembly_types ||= AssembliesType.where(organization: current_organization).joins(:assemblies).where(
+          decidim_assemblies: { id: search.result.unscope(where: :decidim_assemblies_type_id).parent_assemblies }
+        ).distinct&.map { |type| [translated_attribute(type.title), type.id] }
       end
     end
   end

data/app/models/decidim/assembly.rb

@@ -34,6 +34,8 @@ module Decidim
     include Decidim::Searchable
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
+    include Decidim::HasArea
+    include Decidim::FilterableResource
 
     SOCIAL_HANDLERS = [:twitter, :facebook, :instagram, :youtube, :github].freeze
     CREATED_BY = %w(city_council public others).freeze
@@ -146,7 +148,7 @@ module Decidim
     end
 
     def user_roles(role_name = nil)
-      roles = Decidim::AssemblyUserRole.where(assembly: self)
+      roles = Decidim::AssemblyUserRole.where(assembly: self_and_ancestors)
       return roles if role_name.blank?
 
       roles.where(role: role_name)
@@ -156,6 +158,10 @@ module Decidim
       :admin
     end
 
+    def self.ransackable_scopes(_auth_object = nil)
+      [:with_area, :with_scope]
+    end
+
     private
 
     # When an assembly changes their parent, we need to update the parents_path attribute
@@ -208,8 +214,8 @@ module Decidim
     # rubocop:enable Rails/SkipsModelValidations
 
     # 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))
-    end
+    ransacker_i18n :title
+
+    ransack_alias :type_id, :decidim_assemblies_type_id
   end
 end