decidim-core 0.26.5 → 0.27.0.rc1

data/app/forms/decidim/amendable/form.rb

@@ -66,8 +66,7 @@ module Decidim
           errors = amendable_form_errors.details[key] - @original_form.errors.details[key]
 
           errors.map do |hash|
-            error = hash.delete(:error)
-            @amendable_form.errors.add(key, error, **hash) unless @amendable_form.errors.details[key].include?(error: error)
+            @amendable_form.errors.add(key, hash[:error]) unless @amendable_form.errors.details[key].include? error: hash[:error]
           end
         end
       end

data/app/forms/decidim/form.rb

@@ -3,7 +3,7 @@
 module Decidim
   # A base form object to hold common logic, like automatically adding as
   # public method the params sent as context by the `FormFactory` concern.
-  class Form < Rectify::Form
+  class Form < Decidim::AttributeObject::Form
     delegate :current_organization,
              :current_user,
              :current_component,

data/app/forms/decidim/messaging/conversation_form.rb

@@ -7,7 +7,7 @@ module Decidim
       mimic :conversation
 
       attribute :body, Decidim::Attributes::CleanString
-      attribute :recipient_id, Integer
+      attribute :recipient_id, [Integer]
 
       validates :body, :recipient, presence: true, length: { maximum: Decidim.config.maximum_conversation_message_length }
       validate :check_recipient

data/app/forms/decidim/notifications_settings_form.rb

@@ -2,22 +2,24 @@
 
 module Decidim
   # The form object that handles the data behind updating a user's
-  # notifications settings in her profile page.
+  # notifications settings in their profile page.
   class NotificationsSettingsForm < Form
     mimic :user
 
-    attribute :email_on_notification, Boolean
     attribute :email_on_moderations, Boolean
     attribute :newsletter_notifications, Boolean
     attribute :notifications_from_followed, Boolean
     attribute :notifications_from_own_activity, Boolean
     attribute :allow_public_contact, Boolean
+    attribute :notification_settings, Hash
+    attribute :notifications_sending_frequency, String
 
     def map_model(user)
       self.newsletter_notifications = user.newsletter_notifications_at.present?
       self.notifications_from_followed = ["all", "followed-only"].include? user.notification_types
       self.notifications_from_own_activity = ["all", "own-only"].include? user.notification_types
       self.allow_public_contact = user.direct_message_types == "all"
+      self.notifications_sending_frequency = user.notifications_sending_frequency
     end
 
     def newsletter_notifications_at
@@ -49,5 +51,9 @@ module Decidim
       end
       false
     end
+
+    def meet_push_notifications_requirements?
+      Rails.application.secrets.vapid[:enabled]
+    end
   end
 end

data/app/forms/decidim/password_form.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  class PasswordForm < Form
+    attribute :password
+    attribute :password_confirmation
+
+    validates :password, confirmation: true
+  end
+end

data/app/forms/decidim/registration_form.rb

@@ -14,8 +14,8 @@ module Decidim
     attribute :tos_agreement, Boolean
     attribute :current_locale, String
 
-    validates :name, presence: true, format: { with: Decidim::User::REGEXP_NAME }
-    validates :nickname, presence: true, format: { with: Decidim::User::REGEXP_NICKNAME }, length: { maximum: Decidim::User.nickname_max_length }
+    validates :name, presence: true
+    validates :nickname, presence: true, format: Decidim::User::REGEXP_NICKNAME, length: { maximum: Decidim::User.nickname_max_length }
     validates :email, presence: true, "valid_email_2/email": { disposable: true }
     validates :password, confirmation: true
     validates :password, password: { name: :name, email: :email, username: :nickname }

data/app/forms/decidim/upload_validation_form.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A form object used to handle upload validations, this is used when user is
+  # adding files to dropzone in upload modal.
+  class UploadValidationForm < Decidim::Form
+    include Decidim::HasUploadValidations
+
+    attribute :resource_class, String
+    # Property is named as attribute in upload modal and passthru validator, but it
+    # cannot be named as attribute here.
+    attribute :property, String
+    attribute :blob, String
+    attribute :form_class, String
+
+    validates :resource_class, presence: true
+    validates :property, presence: true
+    validates :blob, presence: true
+    validate :file, if: ->(form) { form.resource_class.present? && form.property.present? && form.blob.present? }
+
+    def file
+      org = organization
+      PassthruValidator.new(
+        attributes: [property],
+        to: resource_class.constantize,
+        with: lambda { |record|
+          validate_with.tap do |hash|
+            hash.merge!(organization: record.try(:organization) || org) if !hash[:organization] && record.respond_to?(:organization=)
+          end
+        }
+      ).validate_each(self, property.to_sym, blob)
+    end
+
+    private
+
+    def validate_with
+      if form_object_class && form_object_class._validators[property.to_sym].is_a?(Array) && form_object_class._validators[property.to_sym].size.positive?
+        passthru = form_object_class._validators[property.to_sym].find { |v| v.is_a?(PassthruValidator) }
+        return passthru.options[:with] if passthru && passthru.options[:with].present?
+      end
+      {}
+    end
+
+    def form_object_class
+      @form_object_class ||= begin
+        form_class.constantize if form_class.present?
+      rescue NameError
+        nil
+      end
+    end
+
+    alias organization current_organization
+  end
+end

data/app/forms/decidim/user_group_form.rb

@@ -16,7 +16,7 @@ module Decidim
     attribute :phone
 
     validates :name, presence: true
-    validates :email, presence: true, 'valid_email_2/email': { disposable: true }
+    validates :email, presence: true, "valid_email_2/email": { disposable: true }
     validates :nickname, presence: true
 
     validates :nickname, length: { maximum: Decidim::User.nickname_max_length, allow_blank: true }

data/app/forms/decidim/user_interest_scope_form.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # The form object that handles the data behind updating a user's
-  # interests in her profile page.
+  # interests in their profile page.
   class UserInterestScopeForm < Form
     mimic :scope
 

data/app/forms/decidim/user_interests_form.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # The form object that handles the data behind updating a user's
-  # interests in her profile page.
+  # interests in their profile page.
   class UserInterestsForm < Form
     mimic :user
 

data/app/forms/translatable_presence_validator.rb

@@ -9,7 +9,7 @@
 # object (or the `default_locale` of the form's organization) for the given field.
 class TranslatablePresenceValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, _value)
-    translated_attr = "#{attribute}_#{default_locale_for(record)}"
+    translated_attr = "#{attribute}_#{default_locale_for(record)}".gsub("-", "__")
     record.errors.add(translated_attr, :blank) if record.send(translated_attr).blank?
   end
 
@@ -22,7 +22,7 @@ class TranslatablePresenceValidator < ActiveModel::EachValidator
       record.current_organization.default_locale
     else
       record.errors.add(:current_organization, :blank)
-      []
+      Decidim.default_locale
     end
   end
 end

data/app/forms/url_validator.rb

@@ -6,7 +6,7 @@
 #
 class UrlValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    record.errors[attribute] << (options[:message] || "must be a valid URL") unless url_valid?(value)
+    record.errors.add attribute, (options[:message] || "must be a valid URL") unless url_valid?(value)
   end
 
   # a URL may be technically well-formed but may

data/app/helpers/decidim/application_helper.rb

@@ -114,9 +114,9 @@ module Decidim
       base_url, params = decidim_participatory_processes.participatory_process_path(process).split("?")
 
       if params.present?
-        [base_url, "/", process.active_step.cta_path, "?", params].join("")
+        [base_url, "/", process.active_step.cta_path, "?", params].join
       else
-        [base_url, "/", process.active_step.cta_path].join("")
+        [base_url, "/", process.active_step.cta_path].join
       end
     end
 

data/app/helpers/decidim/attachments_helper.rb

@@ -10,7 +10,7 @@ module Decidim
     #
     # Returns nothing.
     def attachments_for(attached_to)
-      render partial: "decidim/application/attachments.html", locals: { attached_to: attached_to }
+      render partial: "decidim/application/attachments", locals: { attached_to: attached_to }
     end
 
     # Renders the attachment's title.

data/app/helpers/decidim/cells_paginate_helper.rb

@@ -8,7 +8,7 @@ module Decidim
     include Cell::ViewModel::Partial
     include Decidim::PaginateHelper
 
-    def paginate(scope, options = {}, &block)
+    def paginate(scope, **options, &block)
       options = options.reverse_merge(views_prefix: "../views/")
       super
     end

data/app/helpers/decidim/datalist_select_helper.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Helper that provides a single method to create datalist select.
+  module DatalistSelectHelper
+    # Public: Creates HTML for datalist select so that you can use seperate ids and labels.
+    #
+    # items - Items in datalist, item should have id and name.
+    # options - a Hash with options
+    #           :id - id of wrapper
+    #           :class - wrapper css classes
+    #           :data - wrapper data attributes
+    #           :label - label for input
+    #           :name - name of input
+    #           :autocomplete - enable or disable autocomplete provided by browser.
+    #           :list - id of datalist
+    # yield - additional html (e.g. hidden input)
+    #
+    # Returns a HTML String div containing following children: label, input and datalist elements.
+    def datalist_select(items, options = {})
+      default_options = {
+        list: "datalist-list",
+        autocomplete: "off"
+      }
+      options = default_options.merge(options)
+      tag.div(id: options[:id], class: options[:class], data: options[:data]) do
+        html = ""
+        html += yield if block_given?
+        html += tag.label(options[:label], for: options[:name])
+        html += tag.input(type: "text", name: options[:name], list: options[:list], autocomplete: options[:autocomplete], placeholder: options[:placeholder])
+        html += tag.datalist(id: options[:list]) do
+          items.map do |item|
+            tag.option(translated_attribute(item.name), data: { value: item.id })
+          end.join.html_safe
+        end
+        html.html_safe
+      end
+    end
+  end
+end

data/app/helpers/decidim/decidim_form_helper.rb

@@ -190,7 +190,7 @@ module Decidim
           request.protocol,
           request.host_with_port,
           prepend_slug_path
-        ].join("").html_safe +
+        ].join.html_safe +
           content_tag(:span, value, class: "slug-url-value")
       end
     end

data/app/helpers/decidim/filters_helper.rb

@@ -24,11 +24,7 @@ module Decidim
           remote: true,
           html: { id: nil }.merge(html_options)
         ) do |form|
-          # Cannot use `concat()` here because it's not available in cells
-          inner = []
-          inner << hidden_field_tag("per_page", params[:per_page], id: nil) if params[:per_page]
-          inner << capture { yield form }
-          inner.join.html_safe
+          yield form
         end
       end
     end

data/app/helpers/decidim/followable_helper.rb

@@ -5,7 +5,7 @@ module Decidim
   module FollowableHelper
     # Invokes the decidim/shared/follow_button partial.
     def follow_button_for(model, large = nil)
-      render partial: "decidim/shared/follow_button.html", locals: { followable: model, large: large }
+      controller.view_context.render partial: "decidim/shared/follow_button", locals: { followable: model, large: large }
     end
   end
 end

data/app/helpers/decidim/icon_helper.rb

@@ -24,7 +24,7 @@ module Decidim
     #
     # Returns an HTML tag with the icon.
     def manifest_icon(manifest, options = {})
-      if manifest.respond_to?(:icon) && manifest.icon.present?
+      if manifest.icon
         external_icon manifest.icon, options
       else
         icon "question-mark", options
@@ -40,11 +40,11 @@ module Decidim
     #
     # Returns an HTML tag with the icon.
     def resource_icon(resource, options = {})
-      if resource.class.name == "Decidim::Comments::Comment"
+      if resource.instance_of?(Decidim::Comments::Comment)
         icon "comment-square", options
-      elsif resource.respond_to?(:component) && resource.component.present?
+      elsif resource.respond_to?(:component)
         component_icon(resource.component, options)
-      elsif resource.respond_to?(:manifest) && resource.manifest.present?
+      elsif resource.respond_to?(:manifest)
         manifest_icon(resource.manifest, options)
       elsif resource.is_a?(Decidim::User)
         icon "person", options

data/app/helpers/decidim/layout_helper.rb

@@ -15,6 +15,20 @@ module Decidim
       end)
     end
 
+    def apple_favicon
+      icon_image = current_organization.attached_uploader(:favicon).variant_url(:medium, host: current_organization.host)
+      return unless icon_image
+
+      favicon_link_tag(icon_image, rel: "apple-touch-icon", type: "image/png")
+    end
+
+    def legacy_favicon
+      icon_image = current_organization.attached_uploader(:favicon).variant_url(:small, host: current_organization.host)
+      return unless icon_image
+
+      favicon_link_tag(icon_image.gsub(".png", ".ico"), rel: "icon", sizes: "any", type: nil)
+    end
+
     # Outputs an SVG-based icon.
     #
     # name    - The String with the icon name.
@@ -107,7 +121,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.html", locals: {
+      controller.view_context.render partial: "decidim/shared/extended_navigation_bar", locals: {
         items: items,
         extra_items: extra_items,
         active_item: active_item,

data/app/helpers/decidim/map_helper.rb

@@ -45,12 +45,14 @@ module Decidim
         link: map_url
       }.merge(options))
 
-      unless snippets.any?(:map)
-        snippets.add(:map, builder.stylesheet_snippets)
-        snippets.add(:map, builder.javascript_snippets)
+      unless snippets.any?(:map_styles) || snippets.any?(:map_scripts)
+        snippets.add(:map_styles, builder.stylesheet_snippets)
+        snippets.add(:map_scripts, builder.javascript_snippets)
 
         # This will display the snippets in the <head> part of the page.
-        snippets.add(:head, snippets.for(:map))
+        snippets.add(:head, snippets.for(:map_styles))
+        # This will display the snippets in the bottom part of the page.
+        snippets.add(:foot, snippets.for(:map_scripts))
       end
 
       builder.map_element(
@@ -84,12 +86,14 @@ module Decidim
       # Ideally we would use Rails' native content_for here (which is exactly
       # for this purpose) but unfortunately it does not work in the cells which
       # also need to display maps.
-      unless snippets.any?(:map)
-        snippets.add(:map, builder.stylesheet_snippets)
-        snippets.add(:map, builder.javascript_snippets)
+      unless snippets.any?(:map_styles) || snippets.any?(:map_scripts)
+        snippets.add(:map_styles, builder.stylesheet_snippets)
+        snippets.add(:map_scripts, builder.javascript_snippets)
 
         # This will display the snippets in the <head> part of the page.
-        snippets.add(:head, snippets.for(:map))
+        snippets.add(:head, snippets.for(:map_styles))
+        # This will display the snippets in the bottom part of the page.
+        snippets.add(:foot, snippets.for(:map_scripts))
       end
 
       map_html_options = { id: "map", class: "google-map" }.merge(html_options)

data/app/helpers/decidim/meta_tags_helper.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop:disable Naming/MemoizedInstanceVariableName
 module Decidim
   # Helper that provides convenient methods to deal with the page meta tags.
   module MetaTagsHelper
@@ -128,4 +127,3 @@ module Decidim
     end
   end
 end
-# rubocop:enable Naming/MemoizedInstanceVariableName

data/app/helpers/decidim/newsletters_helper.rb

@@ -31,7 +31,6 @@ module Decidim
     # this method is used to generate the root link on mail with the utm_codes
     # If the newsletter_id is nil, it returns the root_url
     def custom_url_for_mail_root(organization, newsletter_id = nil)
-      decidim = EngineRouter.new("decidim", {})
       if newsletter_id.present?
         decidim.root_url(host: organization.host) + utm_codes(organization.host, newsletter_id.to_s)
       else

data/app/helpers/decidim/notifications_settings_helper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Helper that provides methods to render the notifications settings form
+  module NotificationsSettingsHelper
+    def frequencies_collection
+      {
+        none: t("decidim.notifications_settings.show.notifications_sending_frequencies.none"),
+        real_time: t("decidim.notifications_settings.show.notifications_sending_frequencies.real_time"),
+        daily: t("decidim.notifications_settings.show.notifications_sending_frequencies.daily"),
+        weekly: t("decidim.notifications_settings.show.notifications_sending_frequencies.weekly")
+      }
+    end
+  end
+end

data/app/helpers/decidim/passwords_helper.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Decidim
+  module PasswordsHelper
+    def password_field_options_for(user)
+      user =
+        case user
+        when :user
+          Decidim::User.new
+        when :admin
+          Decidim::User.new(admin: true)
+        when String
+          Decidim::User.with_reset_password_token(user)
+        else
+          user
+        end
+      min_length = ::PasswordValidator.minimum_length_for(user)
+      help_text =
+        if needs_admin_password?(user)
+          t("devise.passwords.edit.password_help_admin", minimun_characters: min_length)
+        else
+          t("devise.passwords.edit.password_help", minimun_characters: min_length)
+        end
+
+      {
+        autocomplete: "new-password",
+        required: true,
+        help_text: help_text,
+        minlength: min_length,
+        maxlength: ::PasswordValidator::MAX_LENGTH
+      }
+    end
+
+    def needs_admin_password?(user)
+      return false unless user&.admin?
+      return false unless Decidim.config.admin_password_strong
+
+      true
+    end
+  end
+end

data/app/helpers/decidim/sanitize_helper.rb

@@ -32,6 +32,7 @@ module Decidim
     end
 
     def decidim_sanitize_editor(html, options = {})
+      html = Decidim::IframeDisabler.new(html, options).perform
       content_tag(:div, decidim_sanitize(html, options), class: %w(ql-editor ql-reset-decidim))
     end
 

data/app/helpers/decidim/searches_helper.rb

@@ -27,12 +27,12 @@ module Decidim
       new_params = {
         utf8: params[:utf8],
         filter: {
-          decidim_scope_id: params.dig(:filter, :decidim_scope_id),
+          with_scope: params.dig(:filter, :with_scope),
           term: params[:term] || params.dig(:filter, :term)
         }
       }
-      new_params[:filter][:resource_type] = resource_type if resource_type.present?
-      new_params[:filter][:space_state] = space_state if space_state.present?
+      new_params[:filter][:with_resource_type] = resource_type if resource_type.present?
+      new_params[:filter][:with_space_state] = space_state if space_state.present?
       decidim.search_path(new_params)
     end
 
@@ -44,14 +44,14 @@ module Decidim
 
     # Generates the path to filter by resource type, considering the other filters.
     def search_path_by_resource_type(resource_type)
-      search_path_by(space_state: params.dig(:filter, :space_state), resource_type: resource_type)
+      search_path_by(space_state: params.dig(:filter, :with_space_state), resource_type: resource_type)
     end
 
     # Generates the path and link to filter by space state, taking into account
     # the other filters applied.
     def search_path_by_state_link(state)
-      path = search_path_by(resource_type: params.dig(:filter, :resource_type), space_state: state)
-      is_active = params.dig(:filter, :space_state).to_s == state.to_s
+      path = search_path_by(resource_type: params.dig(:filter, :with_resource_type), space_state: state)
+      is_active = params.dig(:filter, :with_space_state).to_s == state.to_s
 
       link_to path, class: "order-by__tab#{" is-active" if is_active}" do
         content_tag(:strong, t(state || :all, scope: "decidim.searches.filters.state"))

data/app/helpers/decidim/short_link_helper.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This helper includes some methods to help with generating short links within
+  # the Decidim engine views.
+  module ShortLinkHelper
+    # A helper method to get a short URL in the current context where this
+    # method is called from. This helper automatically fetches the "target" for
+    # the short link, such as the component or the participatory process. This
+    # also resolves the current mounted route name to make it possible to refer
+    # to the same context when redirecting the short URL to correct full URL.
+    #
+    # @option kwargs [Boolean] :route_name the route name to which the short
+    #   link should link to
+    # @option kwargs [Float] :params the URL query parameters that should be
+    #   included in the URL where the short link redirects to
+    # @return [String] The short URL
+    def short_url(**kwargs)
+      target = respond_to?(:current_component) && current_component
+      target ||= respond_to?(:current_participatory_space) && current_participatory_space
+      target ||= respond_to?(:current_organization) && current_organization
+      target ||= Rails.application
+
+      mounted_engine = EngineResolver.new(_routes).mounted_name
+      ShortLink.to(target, mounted_engine, **kwargs).short_url
+    end
+  end
+end

data/app/helpers/decidim/translations_helper.rb

@@ -14,10 +14,10 @@ module Decidim
     # options - Any other option to delegate to the individual I18n.t calls
     #
     # Returns a Hash with the locales as keys and the translations as values.
-    def multi_translation(key, locales = Decidim.available_locales, *options)
+    def multi_translation(key, locales = Decidim.available_locales, **options)
       locales.each_with_object({}) do |locale, result|
         I18n.with_locale(locale) do
-          result[locale.to_sym] = I18n.t(key, *options)
+          result[locale.to_sym] = I18n.t(key, **options)
         end
       end
     end

data/app/jobs/decidim/{data_portability_export_job.rb → download_your_data_export_job.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module Decidim
-  class DataPortabilityExportJob < ApplicationJob
+  class DownloadYourDataExportJob < ApplicationJob
     queue_as :default
 
-    def perform(user, export_format = ::Decidim::DataPortabilityExporter::DEFAULT_EXPORT_FORMAT)
+    def perform(user, export_format = ::Decidim::DownloadYourDataExporter::DEFAULT_EXPORT_FORMAT)
       filename = "#{SecureRandom.urlsafe_base64}.zip"
       path = Rails.root.join("tmp/#{filename}")
       password = SecureRandom.urlsafe_base64
@@ -12,17 +12,17 @@ module Decidim
       generate_zip_file(user, path, password, export_format)
       save_or_upload_file(user, path)
 
-      ExportMailer.data_portability_export(user, filename, password).deliver_later
+      ExportMailer.download_your_data_export(user, filename, password).deliver_later
     end
 
     private
 
     def generate_zip_file(user, path, password, export_format)
-      DataPortabilityExporter.new(user, path, password, export_format).export
+      DownloadYourDataExporter.new(user, path, password, export_format).export
     end
 
     def save_or_upload_file(user, path)
-      user.data_portability_file.attach(io: File.open(path, "rb"), filename: File.basename(path))
+      user.download_your_data_file.attach(io: File.open(path, "rb"), filename: File.basename(path))
     end
   end
 end

data/app/jobs/decidim/email_notifications_digest_generator_job.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  class EmailNotificationsDigestGeneratorJob < ApplicationJob
+    queue_as :mailers
+
+    def perform(user_id, frequency, time: Time.now.utc, force: false)
+      user = Decidim::User.find_by(id: user_id)
+      return if user.blank?
+
+      should_notify = force || NotificationsDigestSendingDecider.must_notify?(user, time: time)
+      return unless should_notify
+
+      notification_ids = user.notifications.try(frequency, time: time).pluck(:id)
+      return if notification_ids.blank?
+
+      NotificationsDigestMailer.digest_mail(user, notification_ids).deliver_later
+      user.update(digest_sent_at: time)
+    end
+  end
+end

data/app/jobs/decidim/notification_generator_for_recipient_job.rb

@@ -6,9 +6,11 @@ module Decidim
 
     def perform(event, event_class_name, resource, recipient, user_role, extra) # rubocop:disable Metrics/ParameterLists
       event_class = event_class_name.constantize
-      NotificationGeneratorForRecipient
-        .new(event, event_class, resource, recipient, user_role, extra)
-        .generate
+      notification = NotificationGeneratorForRecipient
+                     .new(event, event_class, resource, recipient, user_role, extra)
+                     .generate
+
+      SendPushNotification.new.perform(notification) if notification
     end
   end
 end