decidim-core 0.24.3 → 0.25.0.rc1

data/app/helpers/decidim/layout_helper.rb

@@ -11,7 +11,7 @@ module Decidim
       return if current_organization.favicon.blank?
 
       safe_join(Decidim::OrganizationFaviconUploader::SIZES.map do |version, size|
-        favicon_link_tag(current_organization.favicon.send(version).url, sizes: "#{size}x#{size}")
+        favicon_link_tag(current_organization.attached_uploader(:favicon).variant_url(version, host: current_organization.host), sizes: "#{size}x#{size}")
       end)
     end
 
@@ -29,19 +29,35 @@ module Decidim
     #
     # Returns a String.
     def icon(name, options = {})
+      options = options.with_indifferent_access
       html_properties = {}
 
       html_properties["width"] = options[:width]
       html_properties["height"] = options[:height]
-      html_properties["aria-label"] = options[:aria_label] || options[:"aria-label"] || options["aria-label"]
+      html_properties["aria-label"] = options[:aria_label] || options[:"aria-label"]
       html_properties["role"] = options[:role] || "img"
-      html_properties["aria-hidden"] = options[:aria_hidden] || options[:"aria-hidden"] || options["aria-hidden"]
+      html_properties["aria-hidden"] = options[:aria_hidden] || options[:"aria-hidden"]
 
       html_properties["class"] = (["icon--#{name}"] + _icon_classes(options)).join(" ")
 
+      title = options["title"] || html_properties["aria-label"]
+      if title.blank? && html_properties["role"] == "img"
+        # This will make the accessibility audit tools happy as with the "img"
+        # role, the alternative text (aria-label) and title are required for the
+        # element. This will also force the SVG to be hidden because otherwise
+        # the screen reader would announce the icon name which can be in
+        # different language (English) than the page language which is not
+        # allowed.
+        title = name
+        html_properties["aria-label"] = title
+        html_properties["aria-hidden"] = true
+      end
+
+      href = Decidim.cors_enabled ? "" : asset_pack_path("media/images/icons.svg")
+
       content_tag :svg, html_properties do
-        inner = content_tag :title, options["title"] || html_properties["aria-label"]
-        inner += content_tag :use, nil, role: options[:role], "href" => "#{asset_path("decidim/icons.svg")}#icon-#{name}"
+        inner = content_tag :title, title
+        inner += content_tag :use, nil, "href" => "#{href}#icon-#{name}"
 
         inner
       end
@@ -59,13 +75,19 @@ module Decidim
 
       if path.split(".").last == "svg"
         attributes = { class: classes.join(" ") }.merge(options)
-        asset = Rails.application.assets_manifest.find_sources(path).first
+        asset = File.read(application_path(path))
         asset.gsub("<svg ", "<svg#{tag_builder.tag_options(attributes)} ").html_safe
       else
-        image_tag(path, class: classes.join(" "), style: "display: none")
+        image_pack_tag(path, class: classes.join(" "), style: "display: none")
       end
     end
 
+    def application_path(path)
+      img_path = asset_pack_path(path)
+      img_path = URI(img_path).path if Decidim.cors_enabled
+      Rails.root.join("public/#{img_path}")
+    end
+
     # Allows to create role attribute according to accessibility rules
     #
     # Returns role attribute string if role option is specified
@@ -85,7 +107,7 @@ module Decidim
       extra_items = items.slice((max_items + 1)..-1) || []
       active_item = items.find { |item| item[:active] }
 
-      render partial: "decidim/shared/extended_navigation_bar", locals: {
+      render partial: "decidim/shared/extended_navigation_bar.html", locals: {
         items: items,
         extra_items: extra_items,
         active_item: active_item,

data/app/helpers/decidim/map_helper.rb

@@ -93,18 +93,19 @@ module Decidim
       end
 
       map_html_options = { id: "map", class: "google-map" }.merge(html_options)
+      bottom_id = "#{map_html_options[:id]}_bottom"
 
       help = content_tag(:div, class: "map__help") do
         sr_content = content_tag(:p, t("screen_reader_explanation", scope: "decidim.map.dynamic"), class: "show-for-sr")
-        link = link_to(t("skip_button", scope: "decidim.map.dynamic"), "#map_bottom", class: "skip")
+        link = link_to(t("skip_button", scope: "decidim.map.dynamic"), "##{bottom_id}", class: "skip")
 
         sr_content + link
       end
       content_tag :div, class: "row column" do
         map = builder.map_element(map_html_options, &block)
-        link = link_to("", "#", id: "map_bottom")
+        bottom = content_tag(:div, "", id: bottom_id)
 
-        help + map + link
+        help + map + bottom
       end
     end
 

data/app/helpers/decidim/menu_helper.rb

@@ -9,7 +9,8 @@ module Decidim
         :menu,
         self,
         element_class: "main-nav__link",
-        active_class: "main-nav__link--active"
+        active_class: "main-nav__link--active",
+        label: t("layouts.decidim.header.main_menu")
       )
     end
 
@@ -19,7 +20,8 @@ module Decidim
         :user_menu,
         self,
         element_class: "tabs-title",
-        active_class: "is-active"
+        active_class: "is-active",
+        label: t("layouts.decidim.user_menu.title")
       )
     end
   end

data/app/helpers/decidim/user_group_helper.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module UserGroupHelper
+    # Renders a user_group select field in a form.
+    # form - FormBuilder object
+    # name - attribute user_group_id
+    # options - A hash used to modify the behavior of the select field.
+    #
+    # Returns nothing.
+    def user_group_select_field(form, name, options = {})
+      user_groups = Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
+      form.select(
+        name,
+        user_groups.map { |g| [g.name, g.id] },
+        selected: @form.user_group_id.presence,
+        include_blank: current_user.name,
+        label: options.has_key?(:label) ? options[:label] : true
+      )
+    end
+  end
+end

data/app/jobs/decidim/application_job.rb

@@ -2,5 +2,10 @@
 
 module Decidim
   class ApplicationJob < ActiveJob::Base
+    # Automatically retry jobs that encountered a deadlock
+    retry_on ActiveRecord::Deadlocked
+
+    # Most jobs are safe to ignore if the underlying records are no longer available
+    discard_on ActiveJob::DeserializationError
   end
 end

data/app/jobs/decidim/data_portability_export_job.rb

@@ -21,9 +21,8 @@ module Decidim
       DataPortabilityExporter.new(user, path, password, export_format).export
     end
 
-    # Saves to file system or uploads to storage service depending on the configuration.
     def save_or_upload_file(user, path)
-      DataPortabilityUploader.new(user).store!(File.open(path, "rb"))
+      user.data_portability_file.attach(io: File.open(path, "rb"), filename: File.basename(path))
     end
   end
 end

data/app/jobs/decidim/export_job.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   class ExportJob < ApplicationJob
-    queue_as :default
+    queue_as :exports
 
     def perform(user, component, name, format, resource_id = nil)
       export_manifest = component.manifest.export_manifests.find do |manifest|

data/app/jobs/decidim/export_participatory_space_job.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   class ExportParticipatorySpaceJob < ApplicationJob
-    queue_as :default
+    queue_as :exports
 
     def perform(user, participatory_space, name, format)
       export_manifest = participatory_space.manifest.export_manifests.find do |manifest|

data/app/jobs/decidim/machine_translation_fields_job.rb

@@ -4,7 +4,7 @@ module Decidim
   # This job is part of the machine translation flow. This one specifically
   # delegates the arguments to the translation service, if any.
   class MachineTranslationFieldsJob < ApplicationJob
-    queue_as :default
+    queue_as :translations
 
     # Performs the job. It won't perform anything if the
     # `Decidim.machine_translation_service` config is not set.

data/app/jobs/decidim/machine_translation_resource_job.rb

@@ -6,7 +6,7 @@ module Decidim
   # attributes defines as translatable is modified, then for each of those
   # attributes this job will schedule a `Decidim::MachineTranslationFieldsJob`.
   class MachineTranslationResourceJob < ApplicationJob
-    queue_as :default
+    queue_as :translations
 
     # rubocop: disable Metrics/CyclomaticComplexity
 
@@ -35,12 +35,13 @@ module Decidim
         @locales_to_be_translated += pending_locales(translated_locales) if @locales_to_be_translated.blank?
 
         @locales_to_be_translated.each do |target_locale|
-          MachineTranslationFieldsJob.perform_later(
-            resource,
+          Decidim::MachineTranslationFieldsJob.perform_later(
+            @resource,
             field,
             resource_field_value(
               previous_changes,
-              field
+              field,
+              source_locale
             ),
             target_locale,
             source_locale
@@ -72,10 +73,13 @@ module Decidim
       @locales_to_be_translated.present?
     end
 
-    def resource_field_value(previous_changes, field)
+    def resource_field_value(previous_changes, field, source_locale)
       values = previous_changes[field]
       new_value = values.last
-      return new_value[default_locale(@resource)] if new_value.is_a?(Hash)
+      if new_value.is_a?(Hash)
+        locale = source_locale || default_locale(@resource)
+        return new_value[locale]
+      end
 
       new_value
     end

data/app/jobs/decidim/machine_translation_save_job.rb

@@ -6,7 +6,7 @@ module Decidim
   # save it and also enables storing translations asynchronously when the
   # translation service returns the translated text in a webhook.
   class MachineTranslationSaveJob < ApplicationJob
-    queue_as :default
+    queue_as :translations
 
     # Performs the job. It won't perform anything if the
     # `Decidim.machine_translation_service` config is not set.

data/app/jobs/decidim/open_data_job.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   class OpenDataJob < ApplicationJob
-    queue_as :default
+    queue_as :exports
 
     def perform(organization)
       path = Rails.root.join("tmp/#{organization.open_data_file_path}")
@@ -10,7 +10,7 @@ module Decidim
       exporter = OpenDataExporter.new(organization, path)
       raise "Couldn't generate Open Data export" unless exporter.export.positive?
 
-      OpenDataUploader.new(organization).store!(File.open(path, "rb"))
+      organization.open_data_file.attach(io: File.open(path, "rb"), filename: organization.open_data_file_path)
     end
   end
 end

data/app/mailers/decidim/application_mailer.rb

@@ -17,7 +17,7 @@ module Decidim
       return if @organization.nil? || @organization.smtp_settings.blank?
 
       mail.from = @organization.smtp_settings["from"].presence || mail.from
-      mail.reply_to = mail.from || Decidim.config.mailer_reply
+      mail.reply_to = mail.reply_to || Decidim.config.mailer_reply
       mail.delivery_method.settings.merge!(
         address: @organization.smtp_settings["address"],
         port: @organization.smtp_settings["port"],

data/app/mailers/decidim/reported_mailer.rb

@@ -53,7 +53,7 @@ module Decidim
     end
 
     def author_profile_url
-      @author_profile_url ||= @author.is_a?(Decidim::UserBaseEntity) ? decidim.profile_url(@author.nickname, host: @organization.host) : nil
+      @author_profile_url ||= @author.is_a?(Decidim::UserBaseEntity) && !@author.deleted? ? decidim.profile_url(@author.nickname, host: @organization.host) : nil
     end
 
     def original_language(reportable)

data/app/models/decidim/attachment.rb

@@ -6,15 +6,17 @@ module Decidim
   class Attachment < ApplicationRecord
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
+    before_save :set_content_type_and_size, if: :attached?
 
     translatable_fields :title, :description
     belongs_to :attachment_collection, class_name: "Decidim::AttachmentCollection", optional: true
     belongs_to :attached_to, polymorphic: true
 
-    mount_uploader :file, Decidim::AttachmentUploader
+    has_one_attached :file
+    validates_upload :file, uploader: Decidim::AttachmentUploader
+    validates :content_type, presence: true
 
-    validates_upload :file
-    validates :file, :content_type, presence: true
+    delegate :attached?, to: :file
 
     default_scope { order(arel_table[:weight].asc, arel_table[:id].asc) }
 
@@ -46,8 +48,9 @@ module Decidim
     #
     # Returns Boolean.
     def photo?
-      @photo ||= content_type.start_with? "image"
+      @photo ||= file.attached? && file.image?
     end
+    alias image? photo?
 
     # Whether this attachment is a document or not.
     #
@@ -60,13 +63,12 @@ module Decidim
     #
     # Returns String.
     def file_type
-      file.url&.split(".")&.last&.downcase
+      url&.split(".")&.last&.downcase
     end
 
-    # The URL to download the file.
-    #
-    # Returns String.
-    delegate :url, to: :file
+    def url
+      attached_uploader(:file).path
+    end
 
     # The URL to download the thumbnail of the file. Only works with images.
     #
@@ -74,7 +76,7 @@ module Decidim
     def thumbnail_url
       return unless photo?
 
-      file.thumbnail.url
+      attached_uploader(:file).path(variant: :thumbnail)
     end
 
     # The URL to download the a big version of the file. Only works with images.
@@ -83,7 +85,12 @@ module Decidim
     def big_url
       return unless photo?
 
-      file.big.url
+      attached_uploader(:file).path(variant: :big)
+    end
+
+    def set_content_type_and_size
+      self.content_type = file.content_type
+      self.file_size = file.byte_size
     end
   end
 end

data/app/models/decidim/authorization.rb

@@ -18,8 +18,8 @@ module Decidim
     encrypt_attribute :metadata, type: :hash
     encrypt_attribute :verification_metadata, type: :hash
 
-    validates_upload :verification_attachment
-    mount_uploader :verification_attachment, Decidim::Verifications::AttachmentUploader
+    has_one_attached :verification_attachment
+    validates_upload :verification_attachment, uploader: Decidim::Verifications::AttachmentUploader
 
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
     has_one :organization, through: :user, class_name: "Decidim::Organization"
@@ -45,9 +45,7 @@ module Decidim
     end
 
     def grant!
-      remove_verification_attachment!
-
-      update!(granted_at: Time.current, verification_metadata: {})
+      update!(granted_at: Time.current, verification_metadata: {}, verification_attachment: nil)
     end
 
     def granted?

data/app/models/decidim/content_block.rb

@@ -9,13 +9,14 @@ module Decidim
     attr_accessor :in_preview
 
     belongs_to :organization, foreign_key: :decidim_organization_id, class_name: "Decidim::Organization"
+    has_many :attachments, foreign_key: "decidim_content_block_id", class_name: "Decidim::ContentBlockAttachment", inverse_of: :content_block, dependent: :destroy
 
     delegate :public_name_key, :has_settings?, :settings_form_cell, :cell, to: :manifest
 
     before_save :save_images
     after_save :reload_images
 
-    validate :images_container_valid
+    validates_associated :images_container
 
     # Public: finds the published content blocks for the given scope and
     # organization. Returns them ordered by ascending weight (lowest first).
@@ -39,6 +40,7 @@ module Decidim
     end
 
     def reload(*)
+      @manifest_attachments = nil
       @images_container = nil
       super
     end
@@ -57,10 +59,9 @@ module Decidim
     #     content_block.save!
     #
     #     # This is how you can access the image data, just like with any other
-    #     # uploader field. You can use the uploader versions too.
-    #     content_block.images_container.my_image.url
-    #     content_block.images_container.my_image.big.url
-    #     content_block.save!
+    #     # uploader field. You can use the uploader variants too.
+    #     content_block.images_container.attached_uploader(:my_image).path
+    #     content_block.images_container.attached_uploader(:my_image).path(variant: :big)
     #
     #     # This will delete the attached image
     #     content_block.images_container.my_image = nil
@@ -71,75 +72,60 @@ module Decidim
     def images_container
       return @images_container if @images_container
 
-      manifest = self.manifest
+      attachments = manifest_attachments
 
       @images_container = Class.new do
-        extend ::CarrierWave::Mount
         include ActiveModel::Validations
+        include Decidim::HasUploadValidations
 
-        cattr_accessor :manifest, :manifest_scope
+        cattr_accessor :manifest_attachments
         attr_reader :content_block
 
-        # Needed to calculate uploads URLs
-        delegate :id, :organization, to: :content_block
-
-        # Needed to customize the upload URL
         def self.name
           to_s.camelize
         end
 
-        # Needed to customize the upload URL
-        def self.to_s
-          "decidim/#{manifest.name.to_s.underscore}_#{manifest_scope.to_s.underscore}_content_block"
-        end
+        delegate :id, :organization, to: :content_block
 
         def initialize(content_block)
           @content_block = content_block
         end
 
-        def manifest
-          self.class.manifest
-        end
+        attachments.each do |name, attachment|
+          validates_upload name, uploader: attachment.uploader
 
-        manifest.images.each do |image_config|
-          mount_uploader image_config[:name], image_config[:uploader].constantize
-        end
+          define_method(name) do
+            attachment.file
+          end
 
-        # This is used to access the upload file name from the container, given
-        # an image name.
-        def read_uploader(column)
-          content_block.images[column.to_s]
+          define_method("#{name}=") do |file|
+            attachment.file = file
+          end
         end
 
-        # This is used to set the upload file name from the container, given
-        # an image name.
-        def write_uploader(column, value)
-          content_block.images[column.to_s] = value
+        def attached_uploader(name)
+          return if manifest_attachments[name].blank?
+
+          manifest_attachments[name].attached_uploader(:file)
         end
 
-        # When we save the content block, we force the container to save itself
-        # too, so images can be processed, uploaded and stored in the DB.
         def save
-          manifest.images.each do |image_config|
-            send(:"write_#{image_config[:name]}_identifier")
-            send(:"store_#{image_config[:name]}!")
-          end
+          return unless content_block.persisted?
+
+          manifest_attachments.values.map(&:save).all?
         end
       end
 
-      @images_container.manifest = manifest
-      @images_container.manifest_scope = scope_name
+      @images_container.manifest_attachments = manifest_attachments
       @images_container = @images_container.new(self)
     end
 
     private
 
-    def images_container_valid
-      # Note that we cannot call .valid? because it's not an ActiveRecord
-      # object. It's ActiveModel and in that case, CarrierWave will not work
-      # "normally" with the validators. It adds the errors directly after the
-      # uploader was tried to set.
-      errors.add(:images_container, :invalid) if images_container.errors.any?
+    def manifest_attachments
+      @manifest_attachments ||= manifest.images.each_with_object({}) do |attachment_config, list|
+        list[attachment_config[:name]] = attachments.find_or_initialize_by(name: attachment_config[:name])
+      end
     end
 
     # Internal: Since we're using the `images_container` hack to hold the