decidim-core 0.27.4 → 0.28.0.rc4

data/app/services/decidim/base_diff_renderer.rb

@@ -49,7 +49,7 @@ module Decidim
         attribute_locale = "#{attribute}_#{locale}".to_sym
         diff.update(
           attribute_locale => {
-            type: type,
+            type:,
             label: generate_i18n_label(attribute, locale),
             old_value: first_value,
             new_value: last_value
@@ -67,7 +67,7 @@ module Decidim
 
       diff.update(
         attribute => {
-          type: type,
+          type:,
           label: I18n.t(attribute, scope: i18n_scope),
           old_value: old_user_group ? translated_attribute(old_user_group.name) : "",
           new_value: new_user_group ? translated_attribute(new_user_group.name) : ""
@@ -83,7 +83,7 @@ module Decidim
 
       diff.update(
         attribute => {
-          type: type,
+          type:,
           label: I18n.t(attribute, scope: i18n_scope),
           old_value: old_scope ? translated_attribute(old_scope.name) : "",
           new_value: new_scope ? translated_attribute(new_scope.name) : ""
@@ -99,7 +99,7 @@ module Decidim
 
       diff.update(
         attribute => {
-          type: type,
+          type:,
           label: I18n.t(attribute, scope: i18n_scope),
           old_value: values[0],
           new_value: values[1]
@@ -111,7 +111,7 @@ module Decidim
     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: locale)
+                      I18n.t("locale.name", locale:)
                     else
                       locale
                     end

data/app/services/decidim/content_blocks_creator.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Service to generate content blocks on spaces o resources which have content
+  # blocks registered for them on their engines.
+  #
+  # This class is initialized passing an space which can be an organization, a
+  # participatory space with content blocks like processes or assemblies or a
+  # participatory process group.
+  class ContentBlocksCreator
+    attr_reader :space, :scope_name, :scoped_resource_id, :is_organization, :organization, :default_content_blocks, :component_content_blocks
+
+    def initialize(space)
+      @space = space
+      @is_organization = space.is_a? Decidim::Organization
+      @organization = is_organization ? space : space.organization
+      @scoped_resource_id = is_organization ? nil : space.id
+      manifest = manifest_for(space)
+      @scope_name = is_organization ? :homepage : manifest.content_blocks_scope_name
+      raise ArgumentError, "[ERROR] The #{manifest.name} spaces do not define a content blocks scope" if scope_name.blank?
+
+      @default_content_blocks = Decidim.content_blocks.for(scope_name).select(&:default)
+      @component_content_blocks = Decidim.content_blocks.for(scope_name).select(&:component_manifest_name)
+    end
+
+    # Creates all content blocks registered as default for the space or
+    # resource unless one created with the same manifest already exists in
+    # the same space.
+    def create_default!
+      default_content_blocks.each_with_index do |manifest, index|
+        next if Decidim::ContentBlock.exists?(decidim_organization_id: organization.id, scope_name:, manifest_name: manifest.name, scoped_resource_id:)
+
+        weight = (index + 1) * 10
+
+        Decidim::ContentBlock.create(
+          decidim_organization_id: organization.id,
+          weight:,
+          scope_name:,
+          scoped_resource_id:,
+          manifest_name: manifest.name,
+          published_at: Time.current
+        )
+      end
+    end
+
+    # This method only works in participatory spaces. For all the components
+    # published in the space creates an associated content block if registered
+    # for the sope and component and is not created configured for the
+    # component or globally to cover all components of the same type.
+    def create_components_blocks!
+      return unless space.is_a? Decidim::Participable
+
+      space.components.published.each_with_index do |component, index|
+        block_manifest = component_content_blocks.find { |manifest| manifest.component_manifest_name == component.manifest_name }
+
+        next unless block_manifest
+
+        content_blocks = Decidim::ContentBlock.where(decidim_organization_id: organization.id, scope_name:, manifest_name: block_manifest.name, scoped_resource_id:)
+
+        # Ignore creation if there is already a content block for the same
+        # component or a general content block for all the components of the
+        # same type in the space
+        next if content_blocks.any? do |block|
+          component_id = block.settings.component_id
+          component_id.blank? || component_id.to_i == component.id
+        end
+
+        weight = ((index + 1) * 10) + 1000
+
+        Decidim::ContentBlock.create(
+          decidim_organization_id: organization.id,
+          weight:,
+          scope_name:,
+          scoped_resource_id:,
+          manifest_name: block_manifest.name,
+          settings: { component_id: component.id.to_s },
+          published_at: Time.current
+        )
+      end
+    end
+
+    private
+
+    def manifest_for(resource)
+      return resource.manifest if resource.is_a? Decidim::Participable
+      return resource.resource_manifest if resource.is_a? Decidim::Resourceable
+    end
+  end
+end

data/app/services/decidim/email_notification_generator.rb

@@ -4,7 +4,7 @@ module Decidim
   # This class handles system events affecting resources and generates a
   # notification for each recipient by scheduling a new
   # `Decidim::NotificationMailer` job for each of them. This way we can
-  # easily control which jobs fail and retry them, so that we don't have
+  # easily control which jobs fail and retry them, so that we do not have
   # duplicated notifications.
   class EmailNotificationGenerator
     # Initializes the class.
@@ -13,9 +13,9 @@ module Decidim
     # event_class - A class that wraps the event.
     # resource - an instance of a class implementing the `Decidim::Resource` concern.
     # followers - a collection of Users that receive the notification because
-    #   they're following it
+    #   they are following it
     # affected_users - a collection of Users that receive the notification because
-    #   they're affected by it
+    #   they are affected by it
     # extra - a Hash with extra information to be included in the notification.
     # rubocop:disable Metrics/ParameterLists
     def initialize(event, event_class, resource, followers, affected_users, extra)

data/app/services/decidim/engine_resolver.rb

@@ -44,8 +44,8 @@ module Decidim
     def find_mounted_route(target_engine)
       target_engine.routes.set.each do |route|
         # If the route is a dispatcher
-        # (ActionDispatch::Routing::RouteSet::Dispatcher), it won't have an
-        # engine app mapped to it in which case the app won't respond to the
+        # (ActionDispatch::Routing::RouteSet::Dispatcher), it will not have an
+        # engine app mapped to it in which case the app will not respond to the
         # `routes` method.
         next if route.dispatcher?
         next unless route.app.app.is_a?(Class)

data/app/services/decidim/events_manager.rb

@@ -17,7 +17,7 @@ module Decidim
     # affected_users - a collection of `Decidim::Users` that are affected by the
     #   event and will receive a notification about it.
     # followers - a collection of `Decidim::Users` that should be notified about
-    #   the event, even though it doesn't affect them directly
+    #   the event, even though it does not affect them directly
     # force_send - boolean indicating if EventPublisherJob should skip the
     #   `notifiable?` check it performs before notifying. Defaults to __false__.
     # extra - a Hash with extra information to be included in the notification.
@@ -27,12 +27,12 @@ module Decidim
     def self.publish(event:, resource:, event_class: Decidim::Events::BaseEvent, affected_users: [], followers: [], extra: {}, force_send: false)
       ActiveSupport::Notifications.publish(
         event,
-        resource: resource,
+        resource:,
         event_class: event_class.name,
         affected_users: affected_users.uniq.compact,
         followers: followers.uniq.compact,
-        force_send: force_send,
-        extra: extra
+        force_send:,
+        extra:
       )
     end
     # rubocop:enable Metrics/ParameterLists
@@ -43,8 +43,8 @@ module Decidim
     # event - a String or a RegExp to match against event names.
     #
     # Returns nothing.
-    def self.subscribe(event, &block)
-      ActiveSupport::Notifications.subscribe(event, &block)
+    def self.subscribe(event, &)
+      ActiveSupport::Notifications.subscribe(event, &)
     end
   end
 end

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

@@ -111,7 +111,7 @@ module Decidim
             label: label || generate_label(attribute),
             new_value: values[1],
             previous_value: values[0],
-            type: type
+            type:
           }
         ]
       end
@@ -132,7 +132,7 @@ module Decidim
                 end
         return label unless locale
 
-        locale_name = I18n.t("locale.name", locale: locale) if I18n.available_locales.include?(locale.to_sym)
+        locale_name = I18n.t("locale.name", locale:) if I18n.available_locales.include?(locale.to_sym)
         locale_name ||= locale
 
         "#{label} (#{locale_name})"

data/app/services/decidim/log_reference_generator.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  class LogReferenceGenerator
+    def initialize(request)
+      @request = request
+    end
+
+    def generate_reference
+      tags_array = generate_tags(Rails.configuration.log_tags)
+      tags_array.collect { |tag| "[#{tag}] " }.join if tags_array
+    end
+
+    private
+
+    attr_reader :request
+
+    def generate_tags(tags)
+      tags&.collect do |tag|
+        case tag
+        when Proc
+          tag.call(request)
+        when Symbol
+          request.send(tag)
+        else
+          tag
+        end
+      end
+    end
+  end
+end

data/app/services/decidim/notification_generator.rb

@@ -4,7 +4,7 @@ module Decidim
   # This class handles system events affecting resources and generates a
   # notification for each recipient by scheduling a new
   # `Decidim::NotificationGeneratorForRecipientJob` job for each of them. This way
-  # we can easily control which jobs fail and retry them, so that we don't have
+  # we can easily control which jobs fail and retry them, so that we do not have
   # duplicated notifications.
   class NotificationGenerator
     # Initializes the class.
@@ -13,9 +13,9 @@ module Decidim
     # event_class - A class that wraps the event.
     # resource - an instance of a class implementing the `Decidim::Resource` concern.
     # followers - a collection of Users that receive the notification because
-    #   they're following it
+    #   they are following it
     # affected_users - a collection of Users that receive the notification because
-    #   they're affected by it
+    #   they are affected by it
     # extra - a Hash with extra information for the event.
     # rubocop:disable Metrics/ParameterLists
     def initialize(event, event_class, resource, followers, affected_users, extra)

data/app/services/decidim/notification_generator_for_recipient.rb

@@ -39,8 +39,8 @@ module Decidim
     def notification
       @notification ||= Notification.new(
         user: recipient,
-        event_class: event_class,
-        resource: resource,
+        event_class:,
+        resource:,
         event_name: event,
         extra: extra.merge(received_as: user_role)
       )

data/app/services/decidim/open_data_exporter.rb

@@ -64,10 +64,10 @@ module Decidim
 
       headers.uniq!
 
-      data = CSV.generate_line(headers, col_sep: col_sep)
+      data = CSV.generate_line(headers, col_sep:)
       collection.each do |content|
-        CSV.foreach(content, headers: true, col_sep: col_sep) do |row|
-          data << CSV.generate_line(row.values_at(*headers), col_sep: col_sep)
+        CSV.foreach(content, headers: true, col_sep:) do |row|
+          data << CSV.generate_line(row.values_at(*headers), col_sep:)
         end
         File.unlink(content)
       end

data/app/services/decidim/send_push_notification.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "webpush"
+require "web-push"
 
 module Decidim
   # This class generates a notification based on the given event, for the given
@@ -11,8 +11,8 @@ module Decidim
   class SendPushNotification
     include ActionView::Helpers::UrlHelper
 
-    # Send the push notification. Returns `nil` if the user didn't allowed push notifications
-    # or if the subscription to push notifications doesn't exist
+    # Send the push notification. Returns `nil` if the user did not allowed push notifications
+    # or if the subscription to push notifications does not exist
     #
     # Returns the result of the dispatch or nil if user or subscription are empty
     def perform(notification)
@@ -25,8 +25,8 @@ module Decidim
           # Capture webpush exceptions in order to avoid this call to be repeated by the background job runner
           # Webpush::Error class is the parent class of all defined errors
           begin
-            Webpush.payload_send(**payload)
-          rescue Webpush::Error => e
+            WebPush.payload_send(**payload)
+          rescue WebPush::Error => e
             Rails.logger.warn("[ERROR] Push notification delivery failed due to #{e.message}")
             nil
           end

data/app/services/decidim/static_map_generator.rb

@@ -7,9 +7,9 @@ module Decidim
       @resource = resource
       @options = options
 
-      @options[:zoom] ||= 15
-      @options[:width] ||= 120
-      @options[:height] ||= 120
+      @options[:zoom] ||= Decidim::Map::StaticMap::DEFAULT_ZOOM
+      @options[:width] ||= Decidim::Map::StaticMap::DEFAULT_SIZE
+      @options[:height] ||= Decidim::Map::StaticMap::DEFAULT_SIZE
     end
 
     def data
@@ -31,7 +31,7 @@ module Decidim
     end
 
     def map_utility
-      @map_utility ||= Decidim::Map.static(organization: organization)
+      @map_utility ||= Decidim::Map.static(organization:)
     end
   end
 end

data/app/uploaders/decidim/application_uploader.rb

@@ -67,7 +67,7 @@ module Decidim
       uri = URI.parse(url)
       filename = File.basename(uri.path)
       file = URI.parse(url).open
-      model.send(mounted_as).attach(io: file, filename: filename)
+      model.send(mounted_as).attach(io: file, filename:)
     rescue URI::InvalidURIError
       model.errors.add(mounted_as, :invalid)
     end

data/app/uploaders/decidim/avatar_uploader.rb

@@ -12,11 +12,11 @@ module Decidim
     end
 
     def default_url(*)
-      AssetRouter::Pipeline.new("media/images/default-avatar.svg", model: model).url
+      AssetRouter::Pipeline.new("media/images/default-avatar.svg", model:).url
     end
 
     def default_multiuser_url(*)
-      AssetRouter::Pipeline.new("media/images/avatar-multiuser.png", model: model).url
+      AssetRouter::Pipeline.new("media/images/avatar-multiuser.png", model:).url
     end
   end
 end

data/app/uploaders/decidim/cw/application_uploader.rb

@@ -43,7 +43,7 @@ module Decidim::Cw
     protected
 
     # Checks if the file is an image based on the content type. We need this so
-    # we only create different versions of the file when it's an image.
+    # we only create different versions of the file when it is an image.
     #
     # new_file - The uploaded file.
     #

data/app/uploaders/decidim/image_uploader.rb

@@ -8,7 +8,7 @@ module Decidim
     end
 
     def content_type_allowlist
-      extension_allowlist.map { |ext| "image/#{ext}" }
+      extension_allowlist.map { |ext| MiniMime.lookup_by_extension(ext).content_type }.uniq
     end
 
     # Fetches info about different variants, their processors and dimensions

data/app/uploaders/decidim/organization_favicon_uploader.rb

@@ -12,8 +12,21 @@ module Decidim
 
     set_variants do
       SIZES.transform_values do |value|
-        { resize_and_pad: [value, value] }
-      end
+        {
+          resize_and_pad: [value, value],
+          format: :png
+        }
+      end.merge(
+        favicon: {
+          resize_and_pad: [256, 256],
+          define: "icon:auto-resize=16,24,32,48,64,72,96,128,256",
+          format: :ico
+        }
+      )
+    end
+
+    def extension_allowlist
+      %w(png jpg jpeg ico)
     end
   end
 end

data/app/validators/etiquette_validator.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # This validator takes care of ensuring the validated content is
-# respectful, doesn't use caps, and overall is meaningful.
+# respectful, does not use caps, and overall is meaningful.
 class EtiquetteValidator < ActiveModel::EachValidator
   include ActionView::Helpers::SanitizeHelper
 

data/app/validators/geocoding_validator.rb

@@ -22,6 +22,6 @@ class GeocodingValidator < ActiveModel::EachValidator
   private
 
   def geocoder_for(organization)
-    Decidim::Map.geocoding(organization: organization)
+    Decidim::Map.geocoding(organization:)
   end
 end

data/app/validators/password_validator.rb

@@ -5,7 +5,7 @@ class PasswordValidator < ActiveModel::EachValidator
   MINIMUM_LENGTH = 10
   MAX_LENGTH = 256
   MIN_UNIQUE_CHARACTERS = 5
-  IGNORE_SIMILARITY_SHORTER_THAN = 4
+  IGNORE_SIMILARITY_SHORTER_THAN = Decidim.config.password_similarity_length
   ADMIN_MINIMUM_LENGTH = Decidim.config.admin_password_min_length
   ADMIN_REPETITION_TIMES = Decidim.config.admin_password_repetition_times
   VALIDATION_METHODS = [
@@ -17,7 +17,7 @@ class PasswordValidator < ActiveModel::EachValidator
     :email_included_in_password?,
     :domain_included_in_password?,
     :password_too_common?,
-    :blacklisted?,
+    :denied?,
     :password_repeated?
   ].freeze
 
@@ -106,28 +106,32 @@ class PasswordValidator < ActiveModel::EachValidator
     value.include?(record.nickname)
   end
 
+  def check_domain_length(domain)
+    domain.split(".").each do |part|
+      next if part.length < IGNORE_SIMILARITY_SHORTER_THAN
+
+      return true if value.downcase.include?(part.downcase)
+    end
+
+    false
+  end
+
   def email_included_in_password?
     return false if !record.respond_to?(:email) || record.email.blank?
 
     name, domain, _whatever = record.email.split("@")
-    value.include?(name) || (domain && value.include?(domain.split(".").first))
+    value.include?(name) || (domain && check_domain_length(domain))
   end
 
   def domain_included_in_password?
     return false unless organization && organization.host
-    return true if value.include?(organization.host)
-
-    organization.host.split(".").each do |part|
-      next if part.length < IGNORE_SIMILARITY_SHORTER_THAN
-
-      return true if value.include?(part)
-    end
+    return true if value.include?(organization.host) || check_domain_length(organization.host)
 
     false
   end
 
-  def blacklisted?
-    Array(Decidim.password_blacklist).each do |expression|
+  def denied?
+    Array(Decidim.denied_passwords).each do |expression|
       return true if expression.is_a?(Regexp) && value.match?(expression)
       return true if expression.to_s == value
     end

data/app/validators/uploader_image_dimensions_validator.rb

@@ -29,7 +29,7 @@ class UploaderImageDimensionsValidator < ActiveModel::Validations::FileContentTy
     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 }
-  rescue MiniMagick::Error, MiniMagick::Invalid
+  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
     # `identify` command fails to identify the image.
@@ -47,9 +47,9 @@ class UploaderImageDimensionsValidator < ActiveModel::Validations::FileContentTy
     return unless file.try(:content_type).to_s.start_with?("image")
 
     if uploaded_file?(file)
-      MiniMagick::Image.new(file.path)
+      MiniMagick::Image.new(file.path, File.extname(file.original_filename))
     elsif file.is_a?(ActiveStorage::Attached) && file.blob.persisted?
-      MiniMagick::Image.read(file.blob.download)
+      MiniMagick::Image.read(file.blob.download, File.extname(file.blob.filename.to_s))
     end
   rescue ActiveStorage::FileNotFoundError, MiniMagick::Invalid
     # Although the blob is persisted, the file is not available to download and analyze

data/app/views/decidim/account/_account_notification.js.erb

@@ -1,20 +1,6 @@
-var existingNotification = document.querySelector("main > .flash.callout");
-if (existingNotification) {
-  existingNotification.classList.add("hide");
-}
-
-var accountNotification = document.querySelector(".account-notification");
-document.querySelector("main").prepend(accountNotification);
+var accountNotification = document.querySelector("[data-alert-box]");
 
-if (accountNotification.querySelector(".account-message")) {
-  accountNotification.querySelector(".account-message").remove();
+if (accountNotification) {
+  accountNotification.childNodes[1].textContent = <%== @text.to_json %>;
+  accountNotification.classList.add("<%= @alert_class %>");
 }
-var messageDiv = document.createElement("div");
-messageDiv.classList.add("account-message");
-
-accountNotification.appendChild(messageDiv);
-messageDiv.innerHTML = <%== @text.to_json %>;
-
-accountNotification.classList.add("<%= @alert_class %>");
-accountNotification.classList.remove("hide");
-accountNotification.removeAttribute("style");

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

@@ -0,0 +1,17 @@
+<%= decidim_modal id: "delete-account", class:"verification-modal" do %>
+  <%= decidim_form_for(@form, url: account_path, method: :delete, namespace: "delete_user_confirm", html: { class: "delete-account-modal" }) do |f| %>
+    <%= f.hidden_field :delete_reason %>
+    <div data-dialog-container>
+      <%= icon "close-circle-line" %>
+      <h3 class="h3" id="dialog-title-delete-account" data-dialog-title>
+        <%= t("question", scope:"decidim.account.delete.confirm") %>
+      </h3>
+    </div>
+    <div data-dialog-actions>
+      <button type="button" class="button button__sm md:button__lg button__transparent-secondary" data-dialog-close="delete-account">
+        <%= t("close", scope: "decidim.account.delete.confirm") %>
+      </button>
+      <input type="submit" class="button button__sm md:button__lg button__secondary" value="<%= t("ok", scope:"decidim.account.delete.confirm") %>">
+    </div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,15 @@
+<div class="old-user-password"
+  data-show-password="<%= t "show_password", scope: "decidim.devise.shared.password_fields" %>"
+  data-hide-password="<%= t "hide_password", scope: "decidim.devise.shared.password_fields" %>"
+  data-hidden-password="<%= t "hidden_password", scope: "decidim.devise.shared.password_fields" %>"
+  data-shown-password="<%= t "shown_password", scope: "decidim.devise.shared.password_fields" %>">
+  <div class="!ml-0 old-password__wrapper">
+    <%= form.send(:custom_label, :old_password, t("activemodel.attributes.user.old_password"), { required: true }) %>
+
+    <% if local_assigns.has_key?(:show_help_text) %>
+      <%= form.password_field :old_password, old_password_options %>
+    <% else %>
+      <%= form.password_field :old_password, autocomplete: "current-password", required: true, label: false %>
+    <% end %>
+  </div>
+</div>

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

@@ -1,2 +1,13 @@
-<%= form.password_field :password, password_field_options_for(current_user) %>
-<%= form.password_field :password_confirmation, password_field_options_for(current_user).except(:help_text) %>
+<div class="user-password"
+  data-show-password="<%= t "show_password", scope: "decidim.devise.shared.password_fields" %>"
+  data-hide-password="<%= t "hide_password", scope: "decidim.devise.shared.password_fields" %>"
+  data-hidden-password="<%= t "hidden_password", scope: "decidim.devise.shared.password_fields" %>"
+  data-shown-password="<%= t "shown_password", scope: "decidim.devise.shared.password_fields" %>">
+  <%= form.send(:custom_label, :password, t("activemodel.attributes.user.password"), { required: true }) %>
+
+  <% if local_assigns.has_key?(:show_help_text) || local_assigns.has_key?(:user) %>
+    <%= form.password_field :password, password_field_options_for(user) %>
+  <% else %>
+    <%= form.password_field :password, autocomplete: "current-password", required: true, label: false %>
+  <% end %>
+</div>

data/app/views/decidim/account/cancel_email_change.js.erb

@@ -1,6 +1,6 @@
 <%= render partial: "account_notification" %>
 
 if ("<%= @alert_class %>" === "success") {
-  document.querySelector("#email-change-pending").classList.add("hide");
+  document.querySelector("#email-change-pending").style.display = "none";
   document.querySelector("#user_email").disabled = false;
 }