decidim-core 0.28.6 → 0.29.0.rc1

data/app/presenters/decidim/admin_log/organization_presenter.rb

@@ -15,7 +15,7 @@ module Decidim
       private
 
       def diff_fields_mapping
-        return { external_domain_whitelist: :string } if action == "update_external_domain"
+        return { external_domain_allowlist: :string } if action == "update_external_domain"
 
         settings_attributes_mapping
           .merge(omnipresent_banner_attributes_mapping)

data/app/presenters/decidim/admin_log/static_page_presenter.rb

@@ -24,7 +24,7 @@ module Decidim
 
       # Private: Caches the object that will be responsible of presenting the static page.
       # Overwrites the method so that we can use a custom presenter to show the correct
-      # path for ther page.
+      # path for their page.
       #
       # Returns an object that responds to `present`.
       def resource_presenter

data/app/presenters/decidim/attachment_presenter.rb

@@ -6,7 +6,7 @@ module Decidim
   #
   class AttachmentPresenter < SimpleDelegator
     def attachment_file_url
-      attachment.attached_uploader(:file).url
+      attachment.attached_uploader(:file).url(host: attached_to.organization.host)
     end
 
     def attachment

data/app/presenters/decidim/authorization_transfer_presenter.rb

@@ -37,7 +37,7 @@ module Decidim
     # Returns an array of the translated record counts containing only the
     # texts to be displayed for the user.
     #
-    # @return [Array<String>] The translated records names with their coutns.
+    # @return [Array<String>] The translated records names with their counts.
     def translated_record_texts
       translated_record_counts.values
     end

data/app/presenters/decidim/component_attachment_collection_presenter.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Decidim
+  #
+  # Decorator attachments of a component acting as an attachment collection
+  #
+  class ComponentAttachmentCollectionPresenter < SimpleDelegator
+    include Decidim::TranslatableAttributes
+
+    def initialize(resource, opts = {})
+      super(resource)
+
+      @include_component_name = opts[:include_component_name]
+    end
+
+    def attachments
+      @attachments ||= if [resource_model_name, resource_table_name].all?(&:present?)
+                         base_query = Decidim::Attachment.joins(resource_join.join_sources)
+                                                         .where(resource_table_name => { decidim_component_id: __getobj__.id })
+                         if resource_model&.include?(Decidim::Publicable)
+                           base_query.where.not(resource_table_name => { published_at: nil })
+                         else
+                           base_query
+                         end
+                       else
+                         Decidim::Attachment.none
+                       end
+    end
+
+    def documents
+      @documents ||= attachments.with_attached_file.order(:weight).select(&:document?)
+    end
+
+    def documents_visible_for(user)
+      return documents unless resource_model.respond_to?(:visible_for)
+
+      attachments.merge(resource_model.visible_for(user)).with_attached_file.order(:weight).select(&:document?)
+    end
+
+    def unused?
+      documents.blank?
+    end
+
+    def id
+      "component-#{__getobj__.id}"
+    end
+
+    def name
+      base_name = I18n.t(manifest_name, scope: "decidim.application.documents.component_documents")
+
+      return base_name unless @include_component_name
+
+      "#{base_name} - #{translated_attribute(__getobj__.name)}"
+    end
+
+    def description; end
+
+    private
+
+    def resource_join
+      resource_table = Arel::Table.new(resource_table_name)
+      attachments_table = Decidim::Attachment.arel_table
+      attachments_table.join(resource_table).on(
+        resource_table[:id].eq(attachments_table[:attached_to_id]),
+        attachments_table[:attached_to_type].eq(resource_model_name)
+      )
+    end
+
+    def resource_model_name
+      @resource_model_name ||= Decidim.resource_registry.find(manifest_name)&.model_class_name
+    end
+
+    def resource_model
+      @resource_model ||= resource_model_name&.safe_constantize
+    end
+
+    def resource_table_name
+      @resource_table_name ||= resource_model&.table_name
+    end
+  end
+end

data/app/presenters/decidim/footer_menu_presenter.rb

@@ -4,7 +4,7 @@ module Decidim
   # A presenter to render footer menu
   class FooterMenuPresenter < MenuPresenter
     def render
-      content_tag(:nav, role: "navigation", "aria-label" => @options[:label]) do
+      content_tag(:nav, :role => "navigation", "aria-label" => @options[:label]) do
         safe_join([content_tag(:h2, @options[:label], class: "h5 mb-4"), render_menu])
       end
     end

data/app/presenters/decidim/home_stats_presenter.rb

@@ -45,7 +45,7 @@ module Decidim
       stats = {}
       Decidim.component_manifests.flat_map do |component|
         component
-          .stats.except([:supports_count])
+          .stats.except([:votes_count])
           .filter(conditions)
           .with_context(published_components)
           .each do |name, data|

data/app/presenters/decidim/log/user_presenter.rb

@@ -46,7 +46,6 @@ module Decidim
       # Returns an HTML-safe String.
       def present_user
         return h.content_tag(:span, present_user_name, class: "logs__log__author") if user.blank?
-        return I18n.t("decidim.profile.deleted") if user.respond_to?(:deleted?) && user.deleted?
 
         h.link_to(
           present_user_name,

data/app/presenters/decidim/menu_item_presenter.rb

@@ -26,7 +26,7 @@ module Decidim
     delegate :content_tag, :safe_join, :link_to, :active_link_to_class, :is_active_link?, :icon, to: :@view
 
     def render
-      content_tag :li, role: :menuitem, class: link_wrapper_classes do
+      content_tag :li, class: link_wrapper_classes do
         output = if url == "#"
                    [content_tag(:span, composed_label, class: "sidebar-menu__item-disabled")]
                  else

data/app/presenters/decidim/organization_presenter.rb

@@ -4,7 +4,7 @@ module Decidim
   # A general presenter to render organization logic to build a manifest
   class OrganizationPresenter < SimpleDelegator
     def html_name
-      name.html_safe
+      translated_attribute(name).html_safe
     end
 
     def translated_description

data/app/queries/decidim/last_activity.rb

@@ -55,25 +55,14 @@ module Decidim
         klass = manifest.model_class_name.constantize
 
         condition = if klass.include?(Decidim::HasPrivateUsers)
-                      Arel.sql(
-                        <<~SQL.squish
-                          (
-                            decidim_action_logs.participatory_space_type = '#{manifest.model_class_name}' AND#{" "}
-                            decidim_action_logs.participatory_space_id IN (#{Arel.sql(klass.visible_for(current_user).select(:id).to_sql)})
-                          ) OR#{" "}
-                          (
-                            decidim_action_logs.resource_type = '#{manifest.model_class_name}' AND#{" "}
-                            decidim_action_logs.resource_id IN (#{Arel.sql(klass.visible_for(current_user).select(:id).to_sql)})
-                          )
-                        SQL
-                      ).to_s
-                    else
                       Arel.sql(
                         [
-                          "decidim_action_logs.resource_type = '#{manifest.model_class_name}'",
-                          "decidim_action_logs.participatory_space_type = '#{manifest.model_class_name}'"
-                        ].join(" OR ")
+                          "decidim_action_logs.participatory_space_type = '#{manifest.model_class_name}'",
+                          "decidim_action_logs.participatory_space_id IN (#{Arel.sql(klass.visible_for(current_user).select(:id).to_sql)})"
+                        ].join(" AND ")
                       ).to_s
+                    else
+                      Arel.sql("decidim_action_logs.participatory_space_type = '#{manifest.model_class_name}'").to_s
                     end
 
         conditions << "(#{condition})"

data/app/queries/decidim/metric_measure.rb

@@ -4,7 +4,7 @@ module Decidim
   # This class executes some measures related to Metrics, and return its results
   #
   #  - day: Date object
-  #  - resource: Object used to make measurements. Object class is dependant within each measure
+  #  - resource: Object used to make measurements. Object class is dependent within each measure
   class MetricMeasure
     def initialize(day, resource)
       @day = day.try(:to_date) || Time.zone.yesterday

data/app/queries/decidim/public_activities.rb

@@ -14,7 +14,7 @@ module Decidim
   #
   # :resource_name - an optional name for a resource for searching only that
   #    type of resources.
-  # :user - an optional `Decidim::User` that performed the activites
+  # :user - an optional `Decidim::User` that performed the activities
   # :current_user - an optional `Decidim::User` for defining whether to show the
   #   private log entries that relate to the current user.
   # :follows - a collection of `Decidim::Follow` resources. It will return any

data/app/queries/decidim/user_groups/admin_memberships.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module UserGroups
-    # Use this class to find the the admins of the given user group with the
+    # Use this class to find the admins of the given user group with the
     # "admin" role. It returns memberships.
     class AdminMemberships < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.

data/app/queries/decidim/user_groups/member_memberships.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module UserGroups
-    # Use this class to find the the members of the given user group with the
+    # Use this class to find the members of the given user group with the
     # "member" role. It returns memberships.
     class MemberMemberships < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.

data/app/services/decidim/action_logger.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # Use this class to log actions by any user. You probably should not
-  # use this class dfirectly, but rather use `Decidim.traceability` instead.
+  # use this class directly, but rather use `Decidim.traceability` instead.
   # Check the docs on `Decidim::Traceability` for more info.
   #
   # Usage:
@@ -14,7 +14,7 @@ module Decidim
     #
     # action - a String representing the name of the action
     # user - the Decidim::User that performed the action
-    # resource - the resource onn which the action was performed
+    # resource - the resource on which the action was performed
     # version_id - the ID of the `PaperTrail::Version` that was created on that action
     # resource_extra - a Hash with resource_extra info to be recorded
     #
@@ -27,7 +27,7 @@ module Decidim
     #
     # action - a String representing the name of the action
     # user - the Decidim::User that performed the action
-    # resource - the resource onn which the action was performed
+    # resource - the resource on which the action was performed
     # version_id - the ID of the `PaperTrail::Version` that was created on that action
     # resource_extra - a Hash with resource_extra info to be recorded
     def initialize(action, user, resource, version_id = nil, resource_extra = {})

data/app/services/decidim/base_diff_renderer.rb

@@ -41,9 +41,7 @@ module Decidim
     end
 
     def parse_i18n_changeset(attribute, values, type, diff)
-      return diff unless values.last.is_a?(Hash)
-
-      (values.last.keys - ["machine_translations"]).each do |locale, _value|
+      values.last.keys.each do |locale, _value|
         first_value = values.first.try(:[], locale)
         last_value = values.last.try(:[], locale)
         next if first_value == last_value
@@ -58,27 +56,6 @@ module Decidim
           }
         )
       end
-
-      return diff unless values.last.has_key?("machine_translations")
-
-      values.last.fetch("machine_translations").each_key do |locale, _value|
-        next unless I18n.available_locales.include?(locale.to_sym)
-
-        first_value = values.first.try(:[], "machine_translations").try(:[], locale)
-        last_value = values.last.try(:[], "machine_translations").try(:[], locale)
-
-        attribute_locale = :"#{attribute}_machine_translations_#{locale}"
-
-        diff.update(
-          attribute_locale => {
-            type:,
-            label: generate_i18n_label(attribute, locale, "decidim.machine_translations.automatic"),
-            old_value: first_value,
-            new_value: last_value
-          }
-        )
-      end
-
       diff
     end
 
@@ -131,8 +108,7 @@ module Decidim
     end
 
     # Returns a String.
-    # i18n-tasks-use t("decidim.machine_translations.automatic")
-    def generate_i18n_label(attribute, locale, postfix = "")
+    def generate_i18n_label(attribute, locale)
       label = I18n.t(attribute, scope: i18n_scope)
       locale_name = if I18n.available_locales.include?(locale.to_sym)
                       I18n.t("locale.name", locale:)
@@ -140,8 +116,6 @@ module Decidim
                       locale
                     end
 
-      locale_name = I18n.t(postfix, locale_name:, locale:) if postfix.present?
-
       "#{label} (#{locale_name})"
     end
 

data/app/services/decidim/download_your_data_exporter.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-require "decidim/seven_zip_wrapper"
+require "seven_zip_ruby"
+require "zip"
+require_relative "zip_stream/writer"
 
 module Decidim
   # Public: Generates a 7z(seven zip) file with data files ready to be persisted
@@ -8,6 +10,8 @@ module Decidim
   #
   # In fact, the 7z file wraps a ZIP file which finally contains the data files.
   class DownloadYourDataExporter
+    include ::Decidim::ZipStream::Writer
+
     DEFAULT_EXPORT_FORMAT = "CSV"
     ZIP_FILE_NAME = "download-your-data.zip"
 
@@ -25,25 +29,36 @@ module Decidim
     end
 
     def export
-      tmpdir = Dir.mktmpdir("temporary-download-your-data-dir")
-      user_data, user_attachments = data_and_attachments_for_user
-      save_user_data(tmpdir, user_data)
-      save_user_attachments(tmpdir, user_attachments)
-
-      SevenZipWrapper.compress_and_encrypt(filename: @path, password: @password, input_directory: tmpdir)
+      dirname = File.dirname(@path)
+      FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+      File.open(@path, "wb") do |file|
+        SevenZipRuby::Writer.open(file, password: @password) do |szw|
+          szw.header_encryption = true
+          szw.add_data(data, ZIP_FILE_NAME)
+        end
+      end
     end
 
     private
 
-    attr_reader :user, :export_format
+    def data
+      buffer = Zip::OutputStream.write_buffer do |out|
+        user_data, attachments = data_for(@user, @export_format)
 
-    def data_and_attachments_for_user
+        add_user_data_to_zip_stream(out, user_data)
+        add_attachments_to_zip_stream(out, attachments)
+      end
+
+      buffer.string
+    end
+
+    def data_for(user, format)
       export_data = []
       export_attachments = []
 
       download_your_data_entities.each do |object|
         klass = Object.const_get(object)
-        export_data << [klass.model_name.name.parameterize.pluralize, Exporters.find_exporter(export_format).new(klass.user_collection(user), klass.export_serializer).export]
+        export_data << [klass.model_name.name.parameterize.pluralize, Exporters.find_exporter(format).new(klass.user_collection(user), klass.export_serializer).export]
         attachments = klass.download_your_data_images(user)
         export_attachments << [klass.model_name.name.parameterize.pluralize, attachments.flatten] unless attachments.nil?
       end
@@ -54,31 +69,5 @@ module Decidim
     def download_your_data_entities
       @download_your_data_entities ||= DownloadYourDataSerializers.data_entities
     end
-
-    def save_user_data(tmpdir, user_data)
-      user_data.each do |entity, exporter_data|
-        next if exporter_data.read == "\n"
-
-        file_name = File.join(tmpdir, "#{entity}-#{exporter_data.filename}")
-        File.write(file_name, exporter_data.read)
-      end
-    end
-
-    def save_user_attachments(tmpdir, user_attachments)
-      user_attachments.each do |entity, attachment_block|
-        attachment_block.each do |attachment|
-          next unless attachment.attached?
-
-          blobs = attachment.is_a?(ActiveStorage::Attached::One) ? [attachment.blob] : attachment.blobs
-          blobs.each do |blob|
-            Dir.mkdir(File.join(tmpdir, entity.parameterize))
-            file_name = File.join(tmpdir, entity.parameterize, blob.filename.to_s)
-            blob.open do |blob_file|
-              File.write(file_name, blob_file.read.force_encoding("UTF-8"))
-            end
-          end
-        end
-      end
-    end
   end
 end

data/app/services/decidim/email_notification_generator.rb

@@ -36,29 +36,20 @@ module Decidim
       return unless resource
       return unless event_class.types.include?(:email)
 
-      send_to_followers
-      send_to_affected_users
-    end
+      followers.each do |recipient|
+        next unless ["all", "followed-only"].include?(recipient.notification_types)
 
-    private
+        send_email_to(recipient, user_role: :follower)
+      end
 
-    def send_to_affected_users
       affected_users.each do |recipient|
         next unless ["all", "own-only"].include?(recipient.notification_types)
-        next if recipient.deleted? || recipient.blocked?
 
         send_email_to(recipient, user_role: :affected_user)
       end
     end
 
-    def send_to_followers
-      followers.each do |recipient|
-        next unless ["all", "followed-only"].include?(recipient.notification_types)
-        next if recipient.deleted? || recipient.blocked?
-
-        send_email_to(recipient, user_role: :follower)
-      end
-    end
+    private
 
     attr_reader :event, :event_class, :resource, :followers, :affected_users, :extra
 

data/app/services/decidim/log/diff_changeset_calculator.rb

@@ -20,7 +20,7 @@ module Decidim
     class DiffChangesetCalculator
       # original_changeset - a `changeset` from a PaperTrail::Version instance
       # fields_mapping - a Hash mapping attribute names and a type to render them
-      # i18n_labels_scope - a String representing the I18n scope where the attribtue
+      # i18n_labels_scope - a String representing the I18n scope where the attribute
       #   labels can be found
       def initialize(original_changeset, fields_mapping, i18n_labels_scope)
         @original_changeset = original_changeset
@@ -119,7 +119,7 @@ module Decidim
       # Generates the label for the given attribute. If the `locale` is set,
       # it appends the locale at the end: `AttributeName (LocaleName)`.
       #
-      # attribute - A Symbol representing the attribute name. It will retrive
+      # attribute - A Symbol representing the attribute name. It will retrieve
       #   this key from the I18n scope set at `i18n_labels_scope`.
       # locale - a String representing the name of the locale.
       #

data/app/services/decidim/notifications_digest_sending_decider.rb

@@ -3,7 +3,7 @@
 module Decidim
   class NotificationsDigestSendingDecider
     class << self
-      def must_notify?(user, time: Time.now.utc)
+      def must_notify?(user, time = Time.now.utc)
         return true if user.digest_sent_at.blank?
 
         # Note that we are checking whether the notifications were sent at any

data/app/services/decidim/open_data_exporter.rb

@@ -51,14 +51,13 @@ module Decidim
             headers.push(*exporter.headers)
             exported = exporter.export
 
-            tmpdir = Dir::Tmpname.create(export_manifest.name.to_s) do
-              # just get an empty file name
-            end
-            filename = File.join(tmpdir, "#{component.id}.csv")
-            Dir.mkdir(tmpdir)
-            File.write(filename, exported.read)
-
-            collection.push(filename)
+            tmpfile = Tempfile.new("#{export_manifest.name}-#{component.id}-")
+            tmpfile.write(exported.read)
+            # Do not delete the file when the reference is deleted
+            ObjectSpace.undefine_finalizer(tmpfile)
+            tmpfile.close
+
+            collection.push(tmpfile.path)
           end
         end
       end

data/app/services/decidim/static_map_generator.rb

@@ -15,7 +15,7 @@ module Decidim
     def data
       return if @resource.blank? || map_utility.nil?
 
-      Rails.cache.fetch(@resource.cache_key_with_version) do
+      Rails.cache.fetch(@resource.cache_key) do
         map_utility.image_data(
           latitude: @resource.latitude,
           longitude: @resource.longitude,

data/app/services/decidim/zip_stream/writer.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ZipStream
+    module Writer
+      def add_user_data_to_zip_stream(out, user_data)
+        user_data.each do |element|
+          filename_file = element.last.filename(element.first.parameterize)
+
+          out.put_next_entry(filename_file)
+          if element.last.read.presence
+            out.write element.last.read
+          else
+            out.write "No data"
+          end
+        end
+      end
+
+      def add_attachments_to_zip_stream(out, export_attachments)
+        export_attachments.each do |attachment_block|
+          next if attachment_block.last.nil?
+
+          folder_name = attachment_block.first.parameterize
+          attachment_block.last.each do |attachment|
+            next unless attachment.attached?
+
+            blobs = attachment.is_a?(ActiveStorage::Attached::One) ? [attachment.blob] : attachment.blobs
+            blobs.each do |blob|
+              out.put_next_entry("#{folder_name}/#{blob.filename}")
+              blob.open do |f|
+                out << f.read
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/uploaders/decidim/organization_favicon_uploader.rb

@@ -26,7 +26,7 @@ module Decidim
     end
 
     def extension_allowlist
-      %w(png jpg jpeg ico)
+      %w(png jpg jpeg webp ico)
     end
   end
 end

data/app/uploaders/decidim/record_image_uploader.rb

@@ -5,11 +5,11 @@ module Decidim
   # limited content types than the defaults.
   class RecordImageUploader < ImageUploader
     def content_type_allowlist
-      %w(image/jpeg image/png)
+      %w(image/jpeg image/png image/webp)
     end
 
     def extension_allowlist
-      %w(jpeg jpg png)
+      %w(jpeg jpg png webp)
     end
   end
 end

data/app/validators/organization_present_validator.rb

@@ -8,7 +8,7 @@ class OrganizationPresentValidator < ActiveModel::Validations::FileContentTypeVa
     return if record.is_a?(Decidim::Organization)
     return if record.respond_to?(:organization) && record.organization.is_a?(Decidim::Organization)
 
-    record.errors.add attribute, I18n.t("carrierwave.errors.not_inside_organization")
+    record.errors.add attribute, I18n.t("decidim.errors.files.not_inside_organization")
   end
 
   def check_validity!; end

data/app/validators/passthru_validator.rb

@@ -69,7 +69,7 @@ class PassthruValidator < ActiveModel::EachValidator
   def validation_record_context(dummy, record)
     if dummy.is_a?(Decidim::Form)
       dummy.with_context(
-        current_organization: record.try(:current_organization) || record.try(:ganization),
+        current_organization: record.try(:current_organization) || record.try(:organization),
         current_participatory_space: record.try(:current_participatory_space) || record.try(:participatory_space),
         current_component: record.try(:current_component) || record.try(:component)
       )

data/app/validators/uploader_image_dimensions_validator.rb

@@ -28,7 +28,7 @@ class UploaderImageDimensionsValidator < ActiveModel::Validations::FileContentTy
     return unless uploader.validable_dimensions
     return if (image = extract_image(file)).blank?
 
-    record.errors.add attribute, I18n.t("carrierwave.errors.file_resolution_too_large") if image.dimensions.any? { |dimension| dimension > uploader.max_image_height_or_width }
+    record.errors.add attribute, I18n.t("decidim.errors.files.file_resolution_too_large") if image.dimensions.any? { |dimension| dimension > uploader.max_image_height_or_width }
   rescue MiniMagick::Error
     # The error may happen because of many reasons but most commonly the image
     # exceeds the default maximum dimensions set for ImageMagick when the
@@ -40,7 +40,7 @@ class UploaderImageDimensionsValidator < ActiveModel::Validations::FileContentTy
     # Note that the error can also happen because of other reasons than only
     # the image dimensions being too large. But as we do not really know the
     # reason every time, we default to that error.
-    record.errors.add attribute, I18n.t("carrierwave.errors.file_cannot_be_processed")
+    record.errors.add attribute, I18n.t("decidim.errors.files.file_cannot_be_processed")
   end
 
   def extract_image(file)

data/app/views/decidim/account/show.html.erb

@@ -4,7 +4,7 @@
 <%= render layout: "layouts/decidim/shared/layout_user_profile" do %>
   <% if current_user.unconfirmed_email.present? %>
     <%# NOTE: announcement cell clean_body method will purge the button %>
-    <div id="email-change-pending" class="flash secondary" data-announcement>
+    <div id="email-change-pending" class="flash warning" data-announcement>
       <div class="flash__message flex-none block leading-relaxed">
         <p>
           <strong><%= t("decidim.account.email_change.title") %></strong>

data/app/views/decidim/amendments/_wizard_header.html.erb

@@ -1,14 +1,13 @@
 <div class="flex justify-center">
   <h1 class="title-decorator my-12">
     <%= wizard_header_title %>
-    <%= "(#{similar_resources_count})" if local_assigns[:similar_resources_count] %>
   </h1>
 </div>
 
 <ol id="wizard-steps" class="wizard-steps">
   <% (1..total_steps).each do |wizard_step| %>
     <% attributes = @current_step == wizard_step ? { "aria-current": "step" } : {} %>
-    <%= content_tag :li, t(wizard_step, scope: "decidim.amendments.wizard_step_form.steps"), attributes %>
+    <%= content_tag :li, t(wizard_step, scope: "decidim.amendments.wizard_step_form.steps"), attributes.merge(class: "w-1/2") %>
   <% end %>
 </ol>