diff --git a/decidim-core/app/commands/decidim/create_omniauth_registration.rb b/decidim-core/app/commands/decidim/create_omniauth_registration.rb
index 67317657c44ec..38f4f870c0126 100644
--- a/decidim-core/app/commands/decidim/create_omniauth_registration.rb
+++ b/decidim-core/app/commands/decidim/create_omniauth_registration.rb
@@ -29,6 +29,7 @@ def call
return broadcast(:ok, @user)
end
return broadcast(:invalid) if form.invalid?
+ return broadcast(:add_tos_errors) if requires_tos_acceptance?
transaction do
create_or_find_user
@@ -37,8 +38,6 @@ def call
trigger_omniauth_event
broadcast(:ok, @user)
- rescue NeedTosAcceptance
- broadcast(:add_tos_errors, @user)
rescue ActiveRecord::RecordInvalid => e
broadcast(:error, e.record)
end
@@ -75,7 +74,6 @@ def create_or_find_user
attach_avatar(form.avatar_url) if form.avatar_url.present?
@user.tos_agreement = form.tos_agreement
@user.accepted_tos_version = Time.current
- raise NeedTosAcceptance if @user.tos_agreement.blank?
@user.skip_confirmation! if verified_email
@user.save!
@@ -83,6 +81,12 @@ def create_or_find_user
end
end
+ def requires_tos_acceptance?
+ return false if form.tos_agreement.present?
+
+ verified_email.blank? || User.find_by(email: verified_email, organization:).blank?
+ end
+
def attach_avatar(avatar_url)
url = URI.parse(avatar_url)
filename = File.basename(url.path)
@@ -148,9 +152,6 @@ def trigger_omniauth_event(event_name = "decidim.user.omniauth_registration")
end
end
- class NeedTosAcceptance < StandardError
- end
-
class InvalidOauthSignature < StandardError
end
end
diff --git a/decidim-core/app/commands/decidim/destroy_account.rb b/decidim-core/app/commands/decidim/destroy_account.rb
index 6199f2ffbf6cb..b682149ce2e9a 100644
--- a/decidim-core/app/commands/decidim/destroy_account.rb
+++ b/decidim-core/app/commands/decidim/destroy_account.rb
@@ -15,7 +15,7 @@ def initialize(form)
def call
return broadcast(:invalid) unless @form.valid?
- Decidim::User.transaction do
+ with_events(with_transaction: true) do
destroy_user_account!
destroy_user_identities
destroy_follows
@@ -110,5 +110,16 @@ def delegate_destroy_to_participatory_spaces
space_manifest.invoke_on_destroy_account(current_user)
end
end
+
+ # We use memoization in this particular email, as we want to have the data available before the actual anonymization
+ def event_arguments
+ @event_arguments ||= {
+ user_id: current_user.id,
+ user_email: current_user.email,
+ user_name: current_user.name,
+ locale: current_user.locale,
+ organization: current_user.organization
+ }
+ end
end
end
diff --git a/decidim-core/app/commands/decidim/gallery_methods.rb b/decidim-core/app/commands/decidim/gallery_methods.rb
deleted file mode 100644
index 413ce685dcc3c..0000000000000
--- a/decidim-core/app/commands/decidim/gallery_methods.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- # A module with all the gallery common methods
- # Allows to create several image attachments at once
- module GalleryMethods
- private
-
- def build_gallery(attached_to = nil)
- @gallery = []
- @form.add_photos.compact_blank.each do |photo|
- if photo.is_a?(Hash) && photo.has_key?(:id)
- update_attachment_title_for(photo)
- next
- end
-
- @gallery << Attachment.new(
- title: photos_title(photo),
- attached_to: attached_to || gallery_attached_to,
- file: photos_signed_id(photo), # Define attached_to before this
- content_type: photos_content_type(photo)
- )
- end
- end
-
- def update_attachment_title_for(photo)
- Decidim::Attachment.find(photo[:id]).update(title: photos_title(photo))
- end
-
- def image?(signed_id)
- blob(signed_id).content_type.start_with? "image"
- end
-
- def gallery_invalid?
- @gallery.each do |photo|
- if photo.invalid? && photo.errors.has_key?(:file)
- @form.errors.add(:add_photos, photo.errors[:file])
- return true
- end
- end
- false
- end
-
- def create_gallery(first_weight: 0)
- weight = first_weight
- # Add the weights first to the old photos
- @form.photos.each do |photo|
- photo.update!(weight:)
- weight += 1
- end
- @gallery.map! do |photo|
- photo.weight = weight
- photo.attached_to = gallery_attached_to
- photo.save!
- weight += 1
- @form.photos << photo
- end
- end
-
- def photo_cleanup!
- gallery_attached_to.photos.each do |photo|
- next unless @form.photos.map(&:id).exclude?(photo.id)
-
- photo.destroy! if (@form.respond_to?(:documents) && @form.documents.map(&:id).exclude?(photo.id)) || !@form.respond_to?(:documents)
- end
- # manually reset cached photos
- gallery_attached_to.reload
- gallery_attached_to.instance_variable_set(:@photos, nil)
- end
-
- # maybe a custom settings options would be nice
- def gallery_allowed?
- true
- end
-
- def process_gallery?
- gallery_allowed? && @form.add_photos.any?
- end
-
- def gallery_attached_to
- return @attached_to if @attached_to.present?
- return form.current_organization if form.respond_to?(:current_organization)
-
- form.current_component.organization if form.respond_to?(:current_component)
- end
-
- def photos_signed_id(photo)
- return photo[:file] if photo.is_a?(Hash)
-
- photo
- end
-
- def photos_title(photo)
- return { I18n.locale => photo[:title] } if photo.is_a?(Hash) && photo.has_key?(:title)
-
- { I18n.locale => "" }
- end
-
- def photos_content_type(photo)
- blob(photos_signed_id(photo)).content_type
- end
-
- def blob(signed_id)
- ActiveStorage::Blob.find_signed(signed_id)
- end
- end
-end
diff --git a/decidim-core/app/commands/decidim/multiple_attachments_methods.rb b/decidim-core/app/commands/decidim/multiple_attachments_methods.rb
index 248d604e0d7e3..b52b28afd1914 100644
--- a/decidim-core/app/commands/decidim/multiple_attachments_methods.rb
+++ b/decidim-core/app/commands/decidim/multiple_attachments_methods.rb
@@ -5,16 +5,16 @@ module MultipleAttachmentsMethods
private
def build_attachments
- @documents = []
- @form.add_documents.compact_blank.each do |attachment|
+ @attachments = []
+ @form.add_attachments.compact_blank.each do |attachment|
if attachment.is_a?(Hash) && attachment.has_key?(:id)
update_attachment_title_for(attachment)
next
end
- @documents << Attachment.new(
+ @attachments << Attachment.new(
title: title_for(attachment),
- attached_to: @attached_to || documents_attached_to,
+ attached_to: @attached_to || attachments_attached_to,
file: signed_id_for(attachment),
content_type: content_type_for(attachment)
)
@@ -26,11 +26,11 @@ def update_attachment_title_for(attachment)
end
def attachments_invalid?
- @documents.each do |document|
- next if document.valid? || !document.errors.has_key?(:file)
+ @attachments.each do |attachment|
+ next if attachment.valid? || !attachment.errors.has_key?(:file)
- document.errors[:file].each do |error|
- @form.errors.add(:add_documents, error)
+ attachment.errors[:file].each do |error|
+ @form.errors.add(:add_attachments, error)
end
return true
@@ -41,37 +41,38 @@ def attachments_invalid?
def create_attachments(first_weight: 0)
weight = first_weight
- # Add the weights first to the old documents
- document_ids = keep_ids
- Decidim::Attachment.where(id: document_ids).each do |document|
- document.update!(weight:)
+ # Add the weights first to the old attachments
+ attachment_ids = keep_ids
+ Decidim::Attachment.where(id: attachment_ids).each do |attachment|
+ attachment.update!(weight:)
weight += 1
end
- @documents.map! do |document|
- document.weight = weight
- document.attached_to = documents_attached_to
- document.save!
+ @attachments.map! do |attachment|
+ attachment.weight = weight
+ attachment.attached_to = attachments_attached_to
+ attachment.save!
weight += 1
- @form.documents << document
+ @form.attachments << attachment
end
end
- def document_cleanup!(include_all_attachments: false)
- documents = include_all_attachments ? documents_attached_to.attachments.with_attached_file : documents_attached_to.documents
+ def attachment_cleanup!(include_all_attachments: false)
+ attachments = include_all_attachments ? attachments_attached_to.attachments.with_attached_file : attachments_attached_to.attachments
- documents.each do |document|
- document.destroy! unless keep_ids.include?(document.id)
+ attachments.each do |attachment|
+ attachment.destroy! unless keep_ids.include?(attachment.id)
end
- documents_attached_to.reload
- documents_attached_to.instance_variable_set(:@documents, nil)
+ attachments_attached_to.reload
+ attachments_attached_to.instance_variable_set(:@attachments, nil)
+ attachments_attached_to.instance_variable_set(:@photos, nil)
end
def process_attachments?
- @form.add_documents.any?
+ @form.add_attachments.any?
end
- def documents_attached_to
+ def attachments_attached_to
return @attached_to if @attached_to.present?
return form.current_organization if form.respond_to?(:current_organization)
@@ -101,8 +102,8 @@ def blob(signed_id)
end
def keep_ids
- documents_array = Array(@form.documents)
- documents_array.map do |doc|
+ attachments_array = Array(@form.attachments)
+ attachments_array.map do |doc|
case doc
when Decidim::Attachment
doc.id
diff --git a/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb b/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb
index f0510877242b8..609b418d7f220 100644
--- a/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb
+++ b/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb
@@ -41,6 +41,10 @@ module DeviseControllers
layout "layouts/decidim/application"
+ # Ensure locale is set before Devise's own prepended callbacks and reset
+ # after the request finishes.
+ prepend_around_action :set_current_locale
+
# Saves the location before loading each page so we can return to the
# right page.
before_action :store_current_location
@@ -58,6 +62,12 @@ def store_current_location
store_location_for(:user, redirect_url)
end
+
+ def set_current_locale(&)
+ locale = detect_locale
+ locale = default_locale unless available_locales.include?(locale)
+ I18n.with_locale(locale, &)
+ end
end
end
end
diff --git a/decidim-core/app/controllers/decidim/devise/omniauth_registrations_controller.rb b/decidim-core/app/controllers/decidim/devise/omniauth_registrations_controller.rb
index 8edb523f35611..adfb2ae4cfc31 100644
--- a/decidim-core/app/controllers/decidim/devise/omniauth_registrations_controller.rb
+++ b/decidim-core/app/controllers/decidim/devise/omniauth_registrations_controller.rb
@@ -14,13 +14,15 @@ def new
end
def create
- form_params = user_params_from_oauth_hash || params[:user]
+ return handle_missing_oauth_data! if pending_oauth_data.blank?
- @form = form(OmniauthRegistrationForm).from_params(form_params)
- @form.email ||= verified_email
+ form_params = form_params_from_pending_oauth
+ @form = form(OmniauthRegistrationForm).from_params(form_params)
CreateOmniauthRegistration.call(@form, verified_email) do
on(:ok) do |user|
+ clear_pending_oauth_data!
+
if user.active_for_authentication?
sign_in_and_redirect user, event: :authentication
set_flash_message :notice, :success, kind: @form.provider.capitalize
@@ -39,7 +41,6 @@ def create
on(:add_tos_errors) do
set_flash_message :alert, :add_tos_errors if @form.valid_tos?
- session[:verified_email] = verified_email
render :new_tos_fields
end
@@ -61,28 +62,106 @@ def action_missing(action_name)
private
+ def form_params_from_pending_oauth
+ submitted_params = params.fetch(:user, {}).permit(:name, :nickname, :email, :tos_agreement, :newsletter).to_h.symbolize_keys
+ oauth_params = pending_oauth_form_params
+
+ oauth_params.merge(
+ submitted_params
+ )
+ end
+
def oauth_data
@oauth_data ||= oauth_hash.slice(:provider, :uid, :info)
end
- # Private: Create form params from omniauth hash
- # Since we are using trusted omniauth data we are generating a valid signature.
- def user_params_from_oauth_hash
- return nil if oauth_data.empty?
+ # Private: Create trusted form params from oauth data stored server-side.
+ # Since we are using trusted oauth data we are generating a valid signature.
+ # Note: raw_data is stored in Rails.cache (not session) to avoid cookie size issues.
+ # If cache is not shared across nodes, raw_data may not be available on retry —
+ # the registration flow will still succeed but raw_data will be empty.
+ def pending_oauth_form_params
+ return {} if pending_oauth_data.blank?
{
+ provider: pending_oauth_data[:provider],
+ uid: pending_oauth_data[:uid],
+ email: pending_oauth_data[:verified_email],
+ name: pending_oauth_data[:name],
+ nickname: pending_oauth_data[:nickname],
+ oauth_signature: OmniauthRegistrationForm.create_signature(pending_oauth_data[:provider], pending_oauth_data[:uid]),
+ avatar_url: pending_oauth_data[:avatar_url],
+ raw_data: restore_raw_data_from_cache,
+ pending_oauth_token:
+ }
+ end
+
+ def verified_email
+ @verified_email ||= pending_oauth_data&.dig(:verified_email)
+ end
+
+ def pending_oauth_data
+ @pending_oauth_data ||= if oauth_hash.present?
+ store_pending_oauth_data!
+ else
+ restore_pending_oauth_data
+ end
+ end
+
+ def pending_oauth_token
+ @pending_oauth_token ||= params.dig(:user, :pending_oauth_token).presence || session.dig(:omniauth_registration, :token)
+ end
+
+ def store_pending_oauth_data!
+ data = {
provider: oauth_data[:provider],
uid: oauth_data[:uid],
- name: oauth_data[:info][:name],
- nickname: oauth_data[:info][:nickname],
- oauth_signature: OmniauthRegistrationForm.create_signature(oauth_data[:provider], oauth_data[:uid]),
- avatar_url: oauth_data[:info][:image],
- raw_data: oauth_hash
+ name: oauth_data.dig(:info, :name),
+ nickname: oauth_data.dig(:info, :nickname),
+ avatar_url: oauth_data.dig(:info, :image),
+ verified_email: oauth_data.dig(:info, :email).presence
}
+
+ token = SecureRandom.hex(16)
+ session[:omniauth_registration] = { token:, data: }
+ Rails.cache.write(raw_data_cache_key(token), oauth_hash, expires_in: 30.minutes)
+
+ @pending_oauth_token = token
+ data
end
- def verified_email
- @verified_email ||= oauth_data.dig(:info, :email).presence || session[:verified_email]
+ def raw_data_cache_key(token)
+ "decidim/omniauth_registration/raw_data/#{token}"
+ end
+
+ def restore_raw_data_from_cache
+ return {} if pending_oauth_token.blank?
+
+ raw_data = Rails.cache.read(raw_data_cache_key(pending_oauth_token))
+ return raw_data if raw_data.present?
+
+ Rails.logger.warn("[Decidim::OmniauthRegistrationsController] Missing raw_data in cache for pending_oauth_token=#{pending_oauth_token}")
+ {}
+ end
+
+ def restore_pending_oauth_data
+ token = params.dig(:user, :pending_oauth_token)
+ return {} if token.blank?
+
+ state = session[:omniauth_registration]&.with_indifferent_access
+ return {} if state.blank?
+
+ stored_token = state[:token].to_s
+ return {} unless stored_token.bytesize == token.to_s.bytesize
+ return {} unless ActiveSupport::SecurityUtils.secure_compare(stored_token, token.to_s)
+
+ @pending_oauth_token = stored_token
+ state[:data] || {}
+ end
+
+ def clear_pending_oauth_data!
+ Rails.cache.delete(raw_data_cache_key(pending_oauth_token)) if pending_oauth_token.present?
+ session.delete(:omniauth_registration)
end
def oauth_hash
@@ -91,6 +170,11 @@ def oauth_hash
raw_hash.deep_symbolize_keys
end
+
+ def handle_missing_oauth_data!
+ flash[:alert] = t("devise.failure.timeout")
+ redirect_back_or_to(decidim.root_path)
+ end
end
end
end
diff --git a/decidim-core/app/events/decidim/amendable/amendment_base_event.rb b/decidim-core/app/events/decidim/amendable/amendment_base_event.rb
index d0fa9d860e59e..73a7c7b6d4edd 100644
--- a/decidim-core/app/events/decidim/amendable/amendment_base_event.rb
+++ b/decidim-core/app/events/decidim/amendable/amendment_base_event.rb
@@ -3,7 +3,7 @@
module Decidim::Amendable
class AmendmentBaseEvent < Decidim::Events::SimpleEvent
i18n_attributes :amendable_path, :amendable_type, :amendable_title,
- :emendation_path, :emendation_author_nickname, :emendation_author_path
+ :emendation_path, :emendation_author_nickname, :emendation_author_name, :emendation_author_path
def amendable_title
@amendable_title ||= translated_attribute(amendable_resource.title)
@@ -33,6 +33,12 @@ def emendation_author_nickname
@emendation_author_nickname ||= emendation_author.nickname
end
+ def emendation_author_name
+ return unless emendation_resource
+
+ @emendation_author_name ||= emendation_author.name
+ end
+
def emendation_author_path
return unless emendation_resource
diff --git a/decidim-core/app/forms/decidim/omniauth_registration_form.rb b/decidim-core/app/forms/decidim/omniauth_registration_form.rb
index 345177a76785c..0f344cc22d074 100644
--- a/decidim-core/app/forms/decidim/omniauth_registration_form.rb
+++ b/decidim-core/app/forms/decidim/omniauth_registration_form.rb
@@ -15,6 +15,7 @@ class OmniauthRegistrationForm < Form
attribute :oauth_signature, String
attribute :avatar_url, String
attribute :raw_data, Hash
+ attribute :pending_oauth_token, String
validates :email, presence: true
validates :name, presence: true
diff --git a/decidim-core/app/helpers/decidim/menu_helper.rb b/decidim-core/app/helpers/decidim/menu_helper.rb
index 7f01f96a7d1e8..6294b43e9acf1 100644
--- a/decidim-core/app/helpers/decidim/menu_helper.rb
+++ b/decidim-core/app/helpers/decidim/menu_helper.rb
@@ -55,10 +55,8 @@ def footer_menu
@footer_menu ||= ::Decidim::FooterMenuPresenter.new(
:menu,
self,
- element_class: "font-semibold underline",
active_class: "is-active",
role: false,
- container_options: { class: "space-y-4 break-inside-avoid" },
label: t("layouts.decidim.footer.decidim_title")
)
end
diff --git a/decidim-core/app/helpers/decidim/sanitize_helper.rb b/decidim-core/app/helpers/decidim/sanitize_helper.rb
index 4da95d82b675b..d19487fda38d5 100644
--- a/decidim-core/app/helpers/decidim/sanitize_helper.rb
+++ b/decidim-core/app/helpers/decidim/sanitize_helper.rb
@@ -139,5 +139,31 @@ def render_sanitized_content(resource, method, presenter_class: nil)
decidim_sanitize_editor(content)
end
+
+ # Transforms relative image URLs in HTML content to absolute URLs using the provided host.
+ # This is used in emails (newsletters and notifications) to ensure images display correctly
+ # in email clients.
+ #
+ # @param content [String] - HTML content with img tags
+ # @param host [String] - the Decidim::Organization host to use for the root URL
+ #
+ # @return [String] - the content with transformed image URLs
+ def decidim_transform_image_urls(content, host)
+ return content if host.blank? || content.blank?
+
+ root_url = Decidim::EngineRouter.new("decidim", {}).root_url(host:).chomp("/")
+
+ content.gsub(/src\s*=\s*(['"])([^'"]*)\1/) do
+ quote = Regexp.last_match(1)
+ src_value = Regexp.last_match(2)
+
+ if src_value.blank? || src_value.start_with?("http://", "https://", "data:", "//", "cid:")
+ %(src=#{quote}#{src_value}#{quote})
+ else
+ normalized_src = src_value.start_with?("/") ? src_value : "/#{src_value}"
+ %(src=#{quote}#{root_url}#{normalized_src}#{quote})
+ end
+ end
+ end
end
end
diff --git a/decidim-core/app/jobs/decidim/process_inactive_participant_job.rb b/decidim-core/app/jobs/decidim/process_inactive_participant_job.rb
index 34ac46744d8f0..2a2413291fe42 100644
--- a/decidim-core/app/jobs/decidim/process_inactive_participant_job.rb
+++ b/decidim-core/app/jobs/decidim/process_inactive_participant_job.rb
@@ -31,13 +31,6 @@ def process_send_warning(user, type, days)
end
def process_remove_user(user)
- email = user.email
- name = user.name
- locale = user.locale
- organization = user.organization
-
- ParticipantsAccountMailer.removal_notification(email, name, locale, organization).deliver_later
-
Decidim::DestroyAccount.call(
Decidim::DeleteAccountForm.from_params(
delete_reason: I18n.t("decidim.account.destroy.inactive_account_removal_reason", inactivity_period: Decidim.delete_inactive_users_after_days)
diff --git a/decidim-core/app/mailers/decidim/application_mailer.rb b/decidim-core/app/mailers/decidim/application_mailer.rb
index e7876ab663723..55e5b80dec4dc 100644
--- a/decidim-core/app/mailers/decidim/application_mailer.rb
+++ b/decidim-core/app/mailers/decidim/application_mailer.rb
@@ -9,7 +9,10 @@ class ApplicationMailer < ActionMailer::Base
include Decidim::SanitizeHelper
include Decidim::MailerHelper
include Decidim::OrganizationHelper
- helper_method :organization_name, :decidim_escape_translated, :decidim_sanitize_translated, :translated_attribute, :decidim_sanitize, :decidim_sanitize_newsletter
+
+ helper Decidim::SanitizeHelper
+ helper_method :organization_name, :current_locale, :decidim_escape_translated, :decidim_sanitize_translated, :translated_attribute, :decidim_sanitize,
+ :decidim_sanitize_newsletter
helper Decidim::SanitizeHelper
helper Decidim::MailerHelper
diff --git a/decidim-core/app/mailers/decidim/delete_user_mailer.rb b/decidim-core/app/mailers/decidim/delete_user_mailer.rb
new file mode 100644
index 0000000000000..e6b64f4684e26
--- /dev/null
+++ b/decidim-core/app/mailers/decidim/delete_user_mailer.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+ class DeleteUserMailer < ApplicationMailer
+ # This email is being sent when a user deletes his own account, or when the user was inactive for too long.
+ def delete(user_email:, user_name:, locale:, organization:)
+ I18n.with_locale(locale) do
+ @user_name = user_name
+ @organization = organization
+ mail(to: user_email, subject: I18n.t("decidim.delete_user_mailer.subject"))
+ end
+ end
+ end
+end
diff --git a/decidim-core/app/mailers/decidim/participants_account_mailer.rb b/decidim-core/app/mailers/decidim/participants_account_mailer.rb
index eef337bce4d7d..ffe865badf226 100644
--- a/decidim-core/app/mailers/decidim/participants_account_mailer.rb
+++ b/decidim-core/app/mailers/decidim/participants_account_mailer.rb
@@ -18,21 +18,5 @@ def inactivity_notification(user, days)
mail(to: user.email, subject:)
end
end
-
- # Notify user about account removal due to inactivity
- def removal_notification(email, name, locale, organization)
- @email = email
- @user_name = name
- @organization = organization
-
- I18n.with_locale(locale) do
- subject = I18n.t(
- "decidim.participants_account_mailer.removal_notification.subject",
- organization_name: organization_name(@organization)
- )
-
- mail(to: email, subject:)
- end
- end
end
end
diff --git a/decidim-core/app/models/decidim/moderation.rb b/decidim-core/app/models/decidim/moderation.rb
index 04f40dfc2c8aa..6991632d482b9 100644
--- a/decidim-core/app/models/decidim/moderation.rb
+++ b/decidim-core/app/models/decidim/moderation.rb
@@ -32,7 +32,7 @@ def self.log_presenter_class_for(_log)
end
def self.ransackable_attributes(_auth_object = nil)
- %w(reported_id_string reported_content created_at)
+ %w(reported_id_string reported_content created_at report_count)
end
def self.ransackable_associations(_auth_object = nil)
diff --git a/decidim-core/app/models/decidim/participatory_space_private_user.rb b/decidim-core/app/models/decidim/participatory_space_private_user.rb
index cd8676f037dd2..fc4f617ed9d02 100644
--- a/decidim-core/app/models/decidim/participatory_space_private_user.rb
+++ b/decidim-core/app/models/decidim/participatory_space_private_user.rb
@@ -39,7 +39,7 @@ def self.log_presenter_class_for(_log)
def self.ransackable_attributes(auth_object = nil)
return [] unless auth_object&.admin?
- %w(name nickname email invitation_accepted_at last_sign_in_at invitation_sent_at role)
+ %w(name nickname email invitation_accepted_at last_sign_in_at invitation_sent_at role published)
end
def self.ransackable_associations(_auth_object = nil)
diff --git a/decidim-core/app/models/decidim/user.rb b/decidim-core/app/models/decidim/user.rb
index d499702c79fd5..2bcdd5d28b771 100644
--- a/decidim-core/app/models/decidim/user.rb
+++ b/decidim-core/app/models/decidim/user.rb
@@ -21,8 +21,8 @@ def self.all
devise :invitable, :database_authenticatable, :registerable, :confirmable, :timeoutable,
:recoverable, :trackable, :lockable,
- :decidim_validatable, :decidim_newsletterable, :jwt_authenticatable,
- :omniauthable, omniauth_providers: Decidim::OmniauthProvider.available.keys, jwt_revocation_strategy: Decidim::Api::JwtDenylist,
+ :decidim_validatable, :decidim_newsletterable,
+ :omniauthable, omniauth_providers: Decidim::OmniauthProvider.available.keys,
request_keys: [:env], reset_password_keys: [:decidim_organization_id, :email],
confirmation_keys: [:decidim_organization_id, :email]
devise :rememberable if Decidim.enable_remember_me
diff --git a/decidim-core/app/models/decidim/user_base_entity.rb b/decidim-core/app/models/decidim/user_base_entity.rb
index 4532c4dfde91b..51895d16225ef 100644
--- a/decidim-core/app/models/decidim/user_base_entity.rb
+++ b/decidim-core/app/models/decidim/user_base_entity.rb
@@ -69,12 +69,27 @@ def followings_blocked?
Decidim::UserBaseEntity.joins(:follows).where(decidim_follows: { user: self }).blocked.exists?
end
+ ransacker :role do
+ Arel.sql(%{CASE WHEN "decidim_users"."admin" = true THEN 'admin' ELSE cast("decidim_users"."roles" as text) END})
+ end
+
+ ransacker :user_moderation_report_count do
+ query = <<~SQL.squish
+ (
+ SELECT COALESCE(MAX(decidim_user_moderations.report_count), 0)
+ FROM decidim_user_moderations
+ WHERE decidim_user_moderations.decidim_user_id = decidim_users.id
+ )
+ SQL
+ Arel.sql(query)
+ end
+
def self.ransackable_attributes(auth_object = nil)
- base = %w(name email nickname last_sign_in_at)
+ base = %w(name email nickname last_sign_in_at created_at)
return base unless auth_object&.admin?
- base + %w(invitation_sent_at invitation_accepted_at officialized_at)
+ base + %w(invitation_sent_at invitation_accepted_at officialized_at role user_moderation_report_count)
end
def self.ransackable_associations(_auth_object = nil)
diff --git a/decidim-core/app/models/decidim/user_moderation.rb b/decidim-core/app/models/decidim/user_moderation.rb
index 3245174f489de..4df36da104b14 100644
--- a/decidim-core/app/models/decidim/user_moderation.rb
+++ b/decidim-core/app/models/decidim/user_moderation.rb
@@ -19,7 +19,7 @@ def self.log_presenter_class_for(_log)
end
def self.ransackable_attributes(_auth_object = nil)
- []
+ %w(created_at report_count)
end
def self.ransackable_associations(_auth_object = nil)
diff --git a/decidim-core/app/packs/src/decidim/controllers/accordion/accordion.test.js b/decidim-core/app/packs/src/decidim/controllers/accordion/accordion.test.js
index 497b2ee7be538..cef930e853d1b 100644
--- a/decidim-core/app/packs/src/decidim/controllers/accordion/accordion.test.js
+++ b/decidim-core/app/packs/src/decidim/controllers/accordion/accordion.test.js
@@ -1,36 +1,44 @@
/* global jest */
import AccordionController from "src/decidim/controllers/accordion/controller";
+import { screens } from "tailwindcss/defaultTheme"
jest.mock("a11y-accordion-component", () => ({
render: jest.fn(),
destroy: jest.fn()
}));
+const createController = (controllerElement) => {
+ const instance = Object.create(AccordionController.prototype);
+ Reflect.defineProperty(instance, "element", {
+ get: () => controllerElement,
+ configurable: true
+ });
+ return instance;
+};
+
describe("AccordionController", () => {
let controller = null;
let accordionElement = null;
let panel1 = null;
let panel2 = null;
- const createController = (controllerElement) => {
- const ControllerClass = AccordionController;
- const instance = Object.create(ControllerClass.prototype);
- Reflect.defineProperty(instance, "element", {
- get: () => controllerElement,
- configurable: true
+ const mockMatchMedia = (matchesOrPredicate = false) => {
+ window.matchMedia = jest.fn().mockImplementation((query) => {
+ const matches = typeof matchesOrPredicate === "function"
+ ? matchesOrPredicate(query)
+ : matchesOrPredicate;
+ return {
+ matches,
+ media: query,
+ addEventListener: jest.fn(),
+ removeEventListener: jest.fn()
+ };
});
- return instance;
};
beforeEach(() => {
- window.matchMedia = jest.fn().mockImplementation((query) => ({
- matches: false,
- media: query,
- addListener: jest.fn(),
- removeListener: jest.fn()
- }));
-
+ mockMatchMedia(false);
document.body.innerHTML = `
- ${this.options.noDataFoundMessage}
`
- : null;
-
- this.tribute = new Tribute({
- trigger: "@",
- values: this.debounce((text, callback) => {
- this.performRemoteSearch(text, callback);
- }, this.options.debounceDelay),
- positionMenu: true,
- menuContainer: null,
- allowSpaces: true,
- menuItemLimit: this.options.menuItemLimit,
- fillAttr: "nickname",
- selectClass: "highlight",
- noMatchTemplate: noMatchTemplate,
- lookup: (item) => item.nickname + item.name,
- selectTemplate: (item) => {
- if (typeof item === "undefined") {
- return null;
- }
- return item.original.nickname;
- },
- menuItemTemplate: (item) => {
- return `
- 
- ${item.original.nickname}
- ${item.original.name}
- `;
- }
- });
+ createSuggestionContainer() {
+ this.suggestion = document.createElement("div");
+ this.suggestion.classList.add("editor-suggestions", "hidden", "hide");
+ document.body.append(this.suggestion);
+ this.suggestion.addEventListener("mousedown", (event) => event.preventDefault());
- this.tribute.attach(this.element);
+ this.performRemoteSearch = this.debounce(this.performRemoteSearch.bind(this), this.options.debounceDelay);
}
- /**
- * Set up event listeners for the element
- * @returns {void}
- * @private
- */
setupEventListeners() {
- // Handle focus events to set menu container
- this.element.addEventListener("focusin", this.handleFocusIn.bind(this));
- this.element.addEventListener("focusout", this.handleFocusOut.bind(this));
- this.element.addEventListener("input", this.handleInput.bind(this));
- }
-
- /**
- * Handle focus in event
- * @param {Event} event - The focus in event
- * @returns {void}
- * @private
- */
- handleFocusIn(event) {
- if (this.tribute) {
- this.tribute.menuContainer = event.target.parentNode;
- }
- }
-
- /**
- * Handle focus out event
- * @param {Event} event - The focus out event
- * @returns {void}
- * @private
- */
+ this.handleFocusIn = this.handleFocusIn.bind(this);
+ this.handleFocusOut = this.handleFocusOut.bind(this);
+ this.handleInput = this.handleInput.bind(this);
+ this.handleKeyDown = this.handleKeyDown.bind(this);
+ this.handleDocumentClick = this.handleDocumentClick.bind(this);
+
+ this.element.addEventListener("focusin", this.handleFocusIn);
+ this.element.addEventListener("focusout", this.handleFocusOut);
+ this.element.addEventListener("input", this.handleInput);
+ this.element.addEventListener("keydown", this.handleKeyDown);
+ document.addEventListener("click", this.handleDocumentClick);
+ }
+
+ handleFocusIn() {
+ if (this.element.parentNode) {
+ this.element.parentNode.classList.add("is-active");
+ }
+ }
+
handleFocusOut(event) {
+ if (this.suggestion && this.suggestion.contains(event.relatedTarget)) {
+ return;
+ }
+
+ this.hideSuggestions();
const parent = event.target.parentNode;
if (parent && parent.classList.contains("is-active")) {
@@ -118,63 +86,99 @@ export default class extends Controller {
}
}
- /**
- * Handle input event
- * @param {Event} event - The input event
- * @returns {void}
- * @private
- */
- handleInput(event) {
- const parent = event.target.parentNode;
+ handleInput() {
+ const trigger = this.mentionTriggerAtCursor();
+ if (!trigger) {
+ this.hideSuggestions();
+ return;
+ }
+
+ this.currentMentionStart = trigger.start;
+ this.performRemoteSearch(trigger.query);
+ }
- if (!parent) {
+ handleKeyDown(event) {
+ if (!this.isActive) {
return;
}
- if (this.tribute && this.tribute.isActive) {
- // Move the tribute container to the correct parent
- const tributeContainer = document.querySelector(".tribute-container");
- if (tributeContainer) {
- parent.appendChild(tributeContainer);
- }
+ if (event.key === "Escape") {
+ event.preventDefault();
+ this.hideSuggestions();
+ } else if (event.key === "ArrowDown") {
+ event.preventDefault();
+ this.updateSelectedIndex(1);
+ this.renderSuggestions();
+ } else if (event.key === "ArrowUp") {
+ event.preventDefault();
+ this.updateSelectedIndex(-1);
+ this.renderSuggestions();
+ } else if (event.key === "Enter") {
+ event.preventDefault();
+ this.selectSuggestion(this.selectedIndex);
+ }
+ }
- parent.classList.add("is-active");
- } else {
- parent.classList.remove("is-active");
+ handleDocumentClick(event) {
+ if (this.element === event.target || this.element.contains(event.target) || this.suggestion?.contains(event.target)) {
+ return;
+ }
+
+ this.hideSuggestions();
+ }
+
+ mentionTriggerAtCursor() {
+ const value = this.element.value || "";
+ const caretPosition = this.element.selectionStart;
+
+ if (typeof caretPosition !== "number") {
+ return null;
+ }
+
+ const textBeforeCursor = value.slice(0, caretPosition);
+ const mentionMatch = textBeforeCursor.match(/(?:^|\s)@([\w.-]{2,})$/);
+ if (!mentionMatch) {
+ return null;
}
+
+ return {
+ query: mentionMatch[1],
+ start: caretPosition - mentionMatch[1].length - 1
+ };
}
- /**
- * Perform remote search for users
- * @param {string} text - The search text
- * @param {Function} callback - The callback function to call with results
- * @returns {void}
- * @private
- */
- performRemoteSearch(text, callback) {
+ performRemoteSearch(text) {
+ const currentRequestId = this.requestId + 1;
+ this.requestId = currentRequestId;
+
const query = `{users(filter:{wildcard:"${text}"}){nickname,name,avatarUrl,__typename}}`;
const apiPath = window.Decidim.config.get("api_path");
this.makeRequest(apiPath, { query }).
then((response) => {
+ if (this.requestId !== currentRequestId) {
+ return;
+ }
+
const data = response.data.users || [];
- callback(data);
+ const sortedData = data.sort((first, second) => first.nickname.localeCompare(second.nickname));
+ this.suggestions = sortedData.slice(0, this.options.menuItemLimit);
+ this.selectedIndex = this.suggestions.length > 0
+ ? 0
+ : -1;
+ this.renderSuggestions({ showNoResults: true });
}).
catch(() => {
- callback([]);
- }).
- finally(() => {
- this.adjustTributeContainer();
+ if (this.requestId !== currentRequestId) {
+ return;
+ }
+
+ this.suggestions = [];
+ this.selectedIndex = -1;
+ this.renderSuggestions({ showNoResults: true });
});
}
- /**
- * Make an HTTP POST request
- * @param {string} url - The request URL
- * @param {Object} data - The request data
- * @returns {Promise} The request promise
- * @private
- */
makeRequest(url, data) {
return fetch(url, {
method: "POST",
@@ -191,35 +195,191 @@ export default class extends Controller {
});
}
- /**
- * Adjust the tribute container positioning and styling
- * @returns {void}
- * @private
- */
- adjustTributeContainer() {
- if (!this.tribute || !this.tribute.current || !this.tribute.current.element) {
+ renderSuggestions({ showNoResults = false } = {}) {
+ if (!this.suggestion) {
+ return;
+ }
+
+ this.suggestion.innerHTML = "";
+
+ if (this.suggestions.length < 1) {
+ this.isActive = false;
+
+ if (showNoResults && this.options.noDataFoundMessage) {
+ const noResultsItem = document.createElement("button");
+ noResultsItem.type = "button";
+ noResultsItem.disabled = true;
+ noResultsItem.classList.add("editor-suggestions-item", "editor-suggestions-item-disabled");
+ noResultsItem.textContent = this.options.noDataFoundMessage;
+ this.suggestion.append(noResultsItem);
+ this.positionSuggestionMenu();
+ this.suggestion.classList.remove("hidden", "hide");
+ } else {
+ this.suggestion.classList.add("hidden", "hide");
+ }
+
return;
}
- const parent = this.tribute.current.element.parentNode;
- if (parent) {
- parent.classList.add("is-active");
+ this.suggestions.forEach((item, index) => {
+ const suggestionItem = document.createElement("button");
+ suggestionItem.type = "button";
+ suggestionItem.classList.add("editor-suggestions-item");
+ suggestionItem.dataset.index = index;
+
+ if (item.avatarUrl) {
+ const avatar = document.createElement("img");
+ avatar.classList.add("editor-suggestions-item-avatar");
+ avatar.src = item.avatarUrl;
+ avatar.alt = item.name || item.nickname;
+ suggestionItem.append(avatar);
+ }
+
+ const label = document.createElement("span");
+ label.classList.add("editor-suggestions-item-label");
+ label.textContent = `${item.nickname} (${item.name})`;
+ suggestionItem.append(label);
- const tributeContainer = parent.querySelector(".tribute-container");
- if (tributeContainer) {
- // Remove inline styles for absolute positioning
- tributeContainer.removeAttribute("style");
+ if (index === this.selectedIndex) {
+ suggestionItem.dataset.selected = "true";
}
+
+ suggestionItem.addEventListener("click", (event) => {
+ event.preventDefault();
+ this.selectSuggestion(index);
+ });
+
+ this.suggestion.append(suggestionItem);
+ });
+
+ this.positionSuggestionMenu();
+ this.isActive = true;
+ this.suggestion.classList.remove("hidden", "hide");
+ }
+
+ positionSuggestionMenu() {
+ if (!this.suggestion || this.currentMentionStart === null) {
+ return;
}
+
+ const coordinates = this.coordinatesForTextIndex(this.currentMentionStart);
+ if (!coordinates) {
+ return;
+ }
+
+ Object.assign(this.suggestion.style, {
+ position: "absolute",
+ top: `${coordinates.top}px`,
+ left: `${coordinates.left}px`
+ });
+ }
+
+ coordinatesForTextIndex(index) {
+ const element = this.element;
+ const styles = window.getComputedStyle(element);
+ const elementRect = element.getBoundingClientRect();
+ const borderTopWidth = parseFloat(styles.borderTopWidth) || 0;
+ const borderLeftWidth = parseFloat(styles.borderLeftWidth) || 0;
+ const lineHeight = parseFloat(styles.lineHeight) || 16;
+
+ const mirror = document.createElement("div");
+ const mirrorStyles = [
+ "fontFamily",
+ "fontSize",
+ "fontWeight",
+ "fontStyle",
+ "letterSpacing",
+ "textTransform",
+ "wordSpacing",
+ "textIndent",
+ "boxSizing",
+ "width",
+ "paddingTop",
+ "paddingRight",
+ "paddingBottom",
+ "paddingLeft",
+ "borderTopWidth",
+ "borderRightWidth",
+ "borderBottomWidth",
+ "borderLeftWidth",
+ "borderStyle",
+ "lineHeight"
+ ];
+
+ mirrorStyles.forEach((property) => {
+ mirror.style[property] = styles[property];
+ });
+
+ mirror.style.position = "absolute";
+ mirror.style.visibility = "hidden";
+ mirror.style.whiteSpace = element.nodeName === "TEXTAREA"
+ ? "pre-wrap"
+ : "pre";
+ mirror.style.overflowWrap = "break-word";
+ mirror.style.top = "0";
+ mirror.style.left = "-9999px";
+
+ const before = document.createTextNode((element.value || "").slice(0, index));
+ const marker = document.createElement("span");
+ marker.textContent = "@";
+
+ mirror.append(before);
+ mirror.append(marker);
+ document.body.append(mirror);
+
+ const top = elementRect.top + window.scrollY + marker.offsetTop - element.scrollTop + borderTopWidth + lineHeight;
+ const left = elementRect.left + window.scrollX + marker.offsetLeft - element.scrollLeft + borderLeftWidth;
+
+ mirror.remove();
+
+ return { top, left };
+ }
+
+ updateSelectedIndex(direction) {
+ if (this.suggestions.length < 1) {
+ this.selectedIndex = -1;
+ return;
+ }
+
+ const maxIndex = this.suggestions.length - 1;
+ const nextIndex = this.selectedIndex + direction;
+
+ this.selectedIndex = Math.max(0, Math.min(nextIndex, maxIndex));
+ }
+
+ selectSuggestion(index) {
+ const selectedItem = this.suggestions[index];
+ if (!selectedItem || this.currentMentionStart === null) {
+ return;
+ }
+
+ const cursorPosition = this.element.selectionStart;
+ const value = this.element.value || "";
+ const mentionValue = `${selectedItem.nickname} `;
+ const newValue = `${value.slice(0, this.currentMentionStart)}${mentionValue}${value.slice(cursorPosition)}`;
+
+ this.element.value = newValue;
+
+ const newPosition = this.currentMentionStart + mentionValue.length;
+ this.element.setSelectionRange(newPosition, newPosition);
+
+ this.element.dispatchEvent(new Event("input", { bubbles: true }));
+ this.hideSuggestions();
+ }
+
+ hideSuggestions() {
+ if (!this.suggestion) {
+ return;
+ }
+
+ this.isActive = false;
+ this.currentMentionStart = null;
+ this.selectedIndex = -1;
+ this.suggestions = [];
+ this.suggestion.classList.add("hidden", "hide");
+ this.suggestion.innerHTML = "";
}
- /**
- * Create a debounced version of a function
- * @param {Function} callback - The function to debounce
- * @param {number} wait - The debounce delay in milliseconds
- * @returns {Function} The debounced function
- * @private
- */
debounce(callback, wait) {
let timeout = null;
return (...args) => {
@@ -233,10 +393,6 @@ export default class extends Controller {
};
}
- /**
- * Check if the component is initialized
- * @returns {boolean} True if initialized, false otherwise
- */
get initialized() {
return this.isInitialized;
}
diff --git a/decidim-core/app/packs/src/decidim/controllers/mention/input_mentions.test.js b/decidim-core/app/packs/src/decidim/controllers/mention/input_mentions.test.js
index b44fafc0aff0c..f3ef5c82477ad 100644
--- a/decidim-core/app/packs/src/decidim/controllers/mention/input_mentions.test.js
+++ b/decidim-core/app/packs/src/decidim/controllers/mention/input_mentions.test.js
@@ -1,82 +1,47 @@
-/* eslint max-lines: ["error", 650] */
/* global global, jest */
/**
* @jest-environment jsdom
*/
-// Mock the Tribute library first
-const mockTribute = {
- attach: jest.fn(),
- detach: jest.fn(),
- isActive: false,
- current: null,
- menu: null,
- range: {
- getDocument: () => document
- },
- menuContainer: null
-};
-
-// Create the constructor mock
-jest.mock("src/decidim/vendor/tribute", () => {
- return jest.fn().mockImplementation(() => mockTribute);
-});
-
import { Application } from "@hotwired/stimulus"
import MentionController from "src/decidim/controllers/mention/controller";
-import Tribute from "src/decidim/vendor/tribute";
-// Get access to mock methods (pure JavaScript approach)
-const TributeMock = Tribute;
-
-// Mock global fetch
global.fetch = jest.fn();
-// Mock window.Decidim
global.window.Decidim = {
config: {
get: jest.fn()
}
};
-describe("MentionsComponent", () => {
- let mockElement = null;
+describe("MentionController", () => {
let application = null;
+ let mockElement = null;
let controller = null;
beforeEach(() => {
- // Set up Stimulus application
application = Application.start();
application.register("mention", MentionController);
-
- // Reset all mocks
jest.clearAllMocks();
- mockTribute.attach.mockClear();
- mockTribute.detach.mockClear();
- TributeMock.mockClear();
- // Create DOM elements for testing
document.body.innerHTML = `
- No users found
");
- });
-
- it("configures null noMatchTemplate when no message provided", () => {
- const elementWithoutMessage = document.createElement("input");
- elementWithoutMessage.setAttribute("data-controller", "mention");
- document.body.appendChild(elementWithoutMessage);
-
- return new Promise((resolve) => {
- setTimeout(() => {
- controller = application.getControllerForElementAndIdentifier(elementWithoutMessage, "mention");
-
- // Check that the tribute was created and the second call (index [1]) has the expected config
- const tributeConfig = TributeMock.mock.calls[1][0];
- expect(tributeConfig.noMatchTemplate).toEqual(expect.any(Function));
-
- // Clean up
- controller.disconnect();
- elementWithoutMessage.remove();
- resolve();
- }, 0);
- });
- });
+ expect(controller.initialized).toBe(true);
+ expect(document.querySelector(".editor-suggestions")).toBeInstanceOf(HTMLDivElement);
});
- describe("event handling", () => {
- it("handles focusin event", () => {
- const event = new Event("focusin");
- Reflect.defineProperty(event, "target", {
- value: mockElement,
- enumerable: true
- });
-
- mockElement.dispatchEvent(event);
-
- expect(mockTribute.menuContainer).toBe(mockElement.parentNode);
- });
-
- it("handles focusout event when parent has is-active class", () => {
- mockElement.parentNode.classList.add("is-active");
-
- const event = new Event("focusout");
- Reflect.defineProperty(event, "target", {
- value: mockElement,
- enumerable: true
- });
-
- mockElement.dispatchEvent(event);
-
- expect(mockElement.parentNode.classList.contains("is-active")).toBe(false);
- });
-
- it("handles focusout event when parent does not exist", () => {
- const isolatedElement = document.createElement("input");
- isolatedElement.setAttribute("data-controller", "mention");
- document.body.appendChild(isolatedElement);
-
- return new Promise((resolve) => {
- setTimeout(() => {
- const isolatedController = application.getControllerForElementAndIdentifier(isolatedElement, "mention");
-
- const event = new Event("focusout");
- Reflect.defineProperty(event, "target", {
- value: isolatedElement,
- enumerable: true
- });
-
- // Test that dispatching the focusout event does not throw when parent is null
- expect(() => isolatedElement.dispatchEvent(event)).not.toThrow();
-
- // Clean up
- isolatedController.disconnect();
- isolatedElement.remove();
- resolve();
- }, 0);
- });
- });
-
- it("handles input event when tribute is active", () => {
- mockTribute.isActive = true;
-
- const event = new Event("input");
- Reflect.defineProperty(event, "target", {
- value: mockElement,
- enumerable: true
- });
-
- mockElement.dispatchEvent(event);
-
- expect(mockElement.parentNode.classList.contains("is-active")).toBe(true);
- });
-
- it("handles input event when tribute is not active", () => {
- mockTribute.isActive = false;
- mockElement.parentNode.classList.add("is-active");
-
- const event = new Event("input");
- Reflect.defineProperty(event, "target", {
- value: mockElement,
- enumerable: true
- });
+ it("does not initialize when inside editor", async () => {
+ const editorContainer = document.createElement("div");
+ editorContainer.classList.add("editor");
+ const editorElement = document.createElement("input");
+ editorElement.setAttribute("data-controller", "mention");
+ editorContainer.appendChild(editorElement);
+ document.body.appendChild(editorContainer);
- mockElement.dispatchEvent(event);
+ await new Promise((resolve) => setTimeout(resolve, 0));
- expect(mockElement.parentNode.classList.contains("is-active")).toBe(false);
- });
-
- it("handles input event when parent does not exist", () => {
- const isolatedElement = document.createElement("input");
- isolatedElement.setAttribute("data-controller", "mention");
- document.body.appendChild(isolatedElement);
-
- return new Promise((resolve) => {
- setTimeout(() => {
- const isolatedController = application.getControllerForElementAndIdentifier(isolatedElement, "mention");
-
- const event = new Event("input");
- Reflect.defineProperty(event, "target", {
- value: isolatedElement,
- enumerable: true
- });
-
- // Test that dispatching the input event does not throw when parent is null
- expect(() => isolatedElement.dispatchEvent(event)).not.toThrow();
-
- // Clean up
- isolatedController.disconnect();
- isolatedElement.remove();
- resolve();
- }, 0);
- });
- });
+ const editorController = application.getControllerForElementAndIdentifier(editorElement, "mention");
+ expect(editorController.initialized).toBe(false);
+ expect(editorController.suggestion).toBeNull();
});
- describe("remote search", () => {
- it("performs remote search successfully", async () => {
- const tributeConfig = TributeMock.mock.calls[0][0];
- const mockCallback = jest.fn();
-
- // Execute the values function (which is debounced)
- await new Promise((resolve) => {
- tributeConfig.values("test", mockCallback);
- // Wait for debounce
- setTimeout(resolve, 300);
- });
-
- expect(fetch).toHaveBeenCalledWith(
- "http://localhost:3000/api",
- expect.objectContaining({
- method: "POST",
- headers: expect.objectContaining({
- "Content-Type": "application/json"
- }),
- body: JSON.stringify({
- query: '{users(filter:{wildcard:"test"}){nickname,name,avatarUrl,__typename}}'
- })
- })
- );
-
- expect(mockCallback).toHaveBeenCalledWith([
- {
- nickname: "testuser",
- name: "Test User",
- avatarUrl: "http://example.com/avatar.jpg",
- __typename: "User"
- }
- ]);
- });
+ it("shows suggestions for valid mention query", async () => {
+ await connectController();
- it("handles remote search failure", async () => {
- fetch.mockRejectedValueOnce(new Error("Network error"));
+ mockElement.value = "Hello @do";
+ mockElement.setSelectionRange(mockElement.value.length, mockElement.value.length);
+ mockElement.dispatchEvent(new Event("input", { bubbles: true }));
- const tributeConfig = TributeMock.mock.calls[0][0];
- const mockCallback = jest.fn();
+ await waitForDebounce();
- await new Promise((resolve) => {
- tributeConfig.values("test", mockCallback);
- // Wait for debounce
- setTimeout(resolve, 300);
- });
+ const suggestions = document.querySelector(".editor-suggestions");
+ const items = suggestions.querySelectorAll(".editor-suggestions-item");
- expect(mockCallback).toHaveBeenCalledWith([]);
- });
-
- it("handles empty search results", async () => {
- fetch.mockResolvedValueOnce({
- ok: true,
- json: () => Promise.resolve({ data: {} })
- });
-
- const tributeConfig = TributeMock.mock.calls[0][0];
- const mockCallback = jest.fn();
-
- await new Promise((resolve) => {
- tributeConfig.values("test", mockCallback);
- // Wait for debounce
- setTimeout(resolve, 300);
- });
-
- expect(mockCallback).toHaveBeenCalledWith([]);
- });
+ expect(items.length).toBe(1);
+ expect(items[0].querySelector(".editor-suggestions-item-avatar")).toBeInstanceOf(HTMLImageElement);
+ expect(items[0].querySelector(".editor-suggestions-item-label").textContent).toBe("@doe_john (John Doe)");
+ expect(suggestions.classList.contains("hidden")).toBe(false);
+ });
- it("handles non-ok response", async () => {
- fetch.mockResolvedValueOnce({
- ok: false,
- status: 500
- });
+ it("does not show suggestions when fewer than two mention characters", async () => {
+ await connectController();
- const tributeConfig = TributeMock.mock.calls[0][0];
- const mockCallback = jest.fn();
+ mockElement.value = "Hello @d";
+ mockElement.setSelectionRange(mockElement.value.length, mockElement.value.length);
+ mockElement.dispatchEvent(new Event("input", { bubbles: true }));
- await new Promise((resolve) => {
- tributeConfig.values("test", mockCallback);
- // Wait for debounce
- setTimeout(resolve, 300);
- });
+ await waitForDebounce();
- expect(mockCallback).toHaveBeenCalledWith([]);
- });
+ const suggestions = document.querySelector(".editor-suggestions");
+ expect(suggestions.classList.contains("hidden")).toBe(true);
});
- describe("destroy", () => {
- it("cleans up resources properly", () => {
- controller.disconnect();
+ it("inserts selected mention on click", async () => {
+ await connectController();
- expect(mockTribute.detach).toHaveBeenCalledWith(mockElement);
- expect(controller.tribute).toBeNull();
- expect(controller.initialized).toBe(false);
- });
+ mockElement.value = "Hello @do";
+ mockElement.setSelectionRange(mockElement.value.length, mockElement.value.length);
+ mockElement.dispatchEvent(new Event("input", { bubbles: true }));
- it("handles missing tribute gracefully", () => {
- controller.tribute = null;
+ await waitForDebounce();
- expect(() => controller.disconnect()).not.toThrow();
- });
+ const suggestionItem = document.querySelector(".editor-suggestions-item");
+ suggestionItem.click();
- it("handles missing element gracefully", () => {
- expect(() => controller.disconnect()).not.toThrow();
- });
+ expect(mockElement.value).toBe("Hello @doe_john ");
+ expect(document.querySelector(".editor-suggestions").classList.contains("hidden")).toBe(true);
});
- describe("debounce functionality", () => {
- beforeEach(() => {
- jest.useFakeTimers();
- });
+ it("supports keyboard navigation and enter selection", async () => {
+ await connectController();
- afterEach(() => {
- jest.useRealTimers();
+ fetch.mockResolvedValueOnce({
+ ok: true,
+ json: () => Promise.resolve({
+ data: {
+ users: [
+ { nickname: "@alpha", name: "Alpha", avatarUrl: "", __typename: "User" },
+ { nickname: "@bravo", name: "Bravo", avatarUrl: "", __typename: "User" }
+ ]
+ }
+ })
});
- it("debounces function calls", () => {
- const mockCallback = jest.fn();
- const debouncedFunction = controller.debounce(mockCallback, 100);
-
- debouncedFunction("arg1");
- debouncedFunction("arg2");
- debouncedFunction("arg3");
+ mockElement.value = "Hello @ab";
+ mockElement.setSelectionRange(mockElement.value.length, mockElement.value.length);
+ mockElement.dispatchEvent(new Event("input", { bubbles: true }));
+ await waitForDebounce();
- expect(mockCallback).not.toHaveBeenCalled();
+ mockElement.dispatchEvent(new KeyboardEvent("keydown", { key: "ArrowDown", bubbles: true }));
+ mockElement.dispatchEvent(new KeyboardEvent("keydown", { key: "Enter", bubbles: true }));
- jest.advanceTimersByTime(100);
-
- expect(mockCallback).toHaveBeenCalledTimes(1);
- expect(mockCallback).toHaveBeenCalledWith("arg3");
- });
-
- it("cancels previous timeout on new call", () => {
- const mockCallback = jest.fn();
- const debouncedFunction = controller.debounce(mockCallback, 100);
+ expect(mockElement.value).toBe("Hello @bravo ");
+ });
- debouncedFunction("arg1");
- jest.advanceTimersByTime(50);
- debouncedFunction("arg2");
- jest.advanceTimersByTime(50);
+ it("positions suggestions near the mention trigger character", async () => {
+ await connectController();
- expect(mockCallback).not.toHaveBeenCalled();
+ mockElement.value = "A long text before @do";
+ mockElement.setSelectionRange(mockElement.value.length, mockElement.value.length);
+ mockElement.dispatchEvent(new Event("input", { bubbles: true }));
+ await waitForDebounce();
- jest.advanceTimersByTime(50);
+ const suggestions = document.querySelector(".editor-suggestions");
- expect(mockCallback).toHaveBeenCalledTimes(1);
- expect(mockCallback).toHaveBeenCalledWith("arg2");
- });
+ expect(suggestions.style.position).toBe("absolute");
+ expect(suggestions.style.top).toMatch(/\d+px/);
+ expect(suggestions.style.left).toMatch(/\d+px/);
});
- describe("tribute container adjustment", () => {
- it("adjusts tribute container when tribute is active", () => {
- const mockParent = document.createElement("div");
- const mockTributeContainer = document.createElement("div");
- mockTributeContainer.classList.add("tribute-container");
- mockTributeContainer.setAttribute("style", "position: absolute; top: 10px;");
- mockParent.appendChild(mockTributeContainer);
-
- mockTribute.current = { element: { parentNode: mockParent } };
+ it("shows no results message when API returns empty list", async () => {
+ await connectController();
- controller.adjustTributeContainer();
-
- expect(mockParent.classList.contains("is-active")).toBe(true);
- expect(mockTributeContainer.getAttribute("style")).toBeNull();
+ fetch.mockResolvedValueOnce({
+ ok: true,
+ json: () => Promise.resolve({ data: { users: [] } })
});
- it("handles missing tribute current element", () => {
- mockTribute.current = null;
+ mockElement.value = "Hello @zz";
+ mockElement.setSelectionRange(mockElement.value.length, mockElement.value.length);
+ mockElement.dispatchEvent(new Event("input", { bubbles: true }));
+ await waitForDebounce();
- expect(() => controller.adjustTributeContainer()).not.toThrow();
- });
+ const noResultsItem = document.querySelector(".editor-suggestions-item");
+ expect(noResultsItem).toBeInstanceOf(HTMLButtonElement);
+ expect(noResultsItem.textContent).toBe("No users found");
+ expect(noResultsItem.disabled).toBe(true);
+ });
- it("handles missing parent element", () => {
- mockTribute.current = { element: { parentNode: null } };
+ it("hides suggestions on escape", async () => {
+ await connectController();
- expect(() => controller.adjustTributeContainer()).not.toThrow();
- });
- });
+ mockElement.value = "Hello @do";
+ mockElement.setSelectionRange(mockElement.value.length, mockElement.value.length);
+ mockElement.dispatchEvent(new Event("input", { bubbles: true }));
+ await waitForDebounce();
- describe("CSRF token handling", () => {
- it("includes CSRF token in requests when available", async () => {
- const mockToken = "test-csrf-token";
- const metaElement = document.createElement("meta");
- metaElement.name = "csrf-token";
- metaElement.content = mockToken;
- document.head.appendChild(metaElement);
-
- const tributeConfig = TributeMock.mock.calls[0][0];
- const mockCallback = jest.fn();
-
- await new Promise((resolve) => {
- tributeConfig.values("test", mockCallback);
- setTimeout(resolve, 300);
- });
-
- expect(fetch).toHaveBeenCalledWith(
- expect.any(String),
- expect.objectContaining({
- headers: expect.objectContaining({
- "X-CSRF-Token": mockToken
- })
- })
- );
- });
+ mockElement.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape", bubbles: true }));
- it("handles missing CSRF token gracefully", async () => {
- const tributeConfig = TributeMock.mock.calls[0][0];
- const mockCallback = jest.fn();
-
- await new Promise((resolve) => {
- tributeConfig.values("test", mockCallback);
- setTimeout(resolve, 300);
- });
-
- expect(fetch).toHaveBeenCalledWith(
- expect.any(String),
- expect.objectContaining({
- body: '{"query":"{users(filter:{wildcard:\\"test\\"}){nickname,name,avatarUrl,__typename}}"}',
- method: "POST",
- headers: expect.objectContaining({
- "Content-Type": "application/json",
- "X-CSRF-Token": expect.any(String)
- })
- })
- );
- });
+ const suggestions = document.querySelector(".editor-suggestions");
+ expect(suggestions.classList.contains("hidden")).toBe(true);
});
- describe("external integration", () => {
- it("handles attach-mentions-element event with no element", () => {
- const attachEvent = new CustomEvent("attach-mentions-element", {
- detail: {}
- });
-
- expect(() => document.dispatchEvent(attachEvent)).not.toThrow();
- });
+ it("cleans up on disconnect", async () => {
+ await connectController();
- it("handles attach-mentions-element event with no detail", () => {
- const attachEvent = new CustomEvent("attach-mentions-element");
+ controller.disconnect();
- expect(() => document.dispatchEvent(attachEvent)).not.toThrow();
- });
+ expect(controller.suggestion).toBeNull();
+ expect(controller.initialized).toBe(false);
});
});
diff --git a/decidim-core/app/packs/src/decidim/controllers/multiple_mentions/controller.js b/decidim-core/app/packs/src/decidim/controllers/multiple_mentions/controller.js
index 6d7a35533feac..851ad85c552f7 100644
--- a/decidim-core/app/packs/src/decidim/controllers/multiple_mentions/controller.js
+++ b/decidim-core/app/packs/src/decidim/controllers/multiple_mentions/controller.js
@@ -1,5 +1,5 @@
import { Controller } from "@hotwired/stimulus"
-import AutoComplete from "src/decidim/refactor/moved/autocomplete";
+import TomSelect from "tom-select/dist/cjs/tom-select.popular";
import icon from "src/decidim/refactor/moved/icon";
export default class extends Controller {
@@ -16,20 +16,6 @@ export default class extends Controller {
this.initializeEmptyFocusElement();
this.initializeAutoComplete();
- this.setupSelectionListener();
- }
-
- /**
- * Setup the selection event listener
- * @returns {void}
- */
- setupSelectionListener() {
- this.selectionHandler = (event) => {
- const feedback = event.detail;
- const selection = feedback.selection;
- this.handleSelection(selection);
- };
- this.searchInput.addEventListener("selection", this.selectionHandler);
}
/*
@@ -37,8 +23,8 @@ export default class extends Controller {
* @returns {void}
*/
disconnect() {
- if (this.searchInput && this.selectionHandler) {
- this.searchInput.removeEventListener("selection", this.selectionHandler);
+ if (this.tomSelect) {
+ this.tomSelect.destroy();
}
}
@@ -80,11 +66,56 @@ export default class extends Controller {
* @returns {void}
*/
initializeAutoComplete() {
- this.autoComplete = new AutoComplete(this.searchInput, {
- dataMatchKeys: ["name", "nickname"],
- dataSource: this.getDataSource.bind(this),
- dataFilter: this.filterResults.bind(this),
- modifyResult: this.modifyResult.bind(this)
+ this.tomSelect = new TomSelect(this.searchInput, {
+ maxItems: 1,
+ valueField: "id",
+ labelField: "name",
+ searchField: ["name", "nickname"],
+ loadThrottle: 200,
+ loadingClass: "loading",
+ preload: false,
+ highlight: true,
+ load: (query, callback) => {
+ if (!query || query.length < 2) {
+ callback();
+ return;
+ }
+ this.getDataSource(query, (results) => {
+ const filtered = this.filterResults(results);
+ filtered.forEach((item) => {
+ if (item.directMessagesEnabled === "false") {
+ item.disabled = true;
+ }
+ });
+ callback(filtered);
+ });
+ },
+ render: {
+ option: (data, escape) => {
+ const isDisabled = data.directMessagesEnabled === "false";
+ const className = isDisabled
+ ? "disabled"
+ : "";
+ const disabledMsg = isDisabled
+ ? `${escape(this.searchInput.dataset.directMessagesDisabled)}`
+ : "";
+ return `
- ${selection.value.name}
-
+
+ })
+ ${this.htmlEscape(selection.value.name)}
+
`;
this.selectedItems.appendChild(listItem);
diff --git a/decidim-core/app/packs/src/decidim/controllers/multiple_mentions/input_multiple_mentions.test.js b/decidim-core/app/packs/src/decidim/controllers/multiple_mentions/input_multiple_mentions.test.js
index 2ee43ac67922f..257db953b6347 100644
--- a/decidim-core/app/packs/src/decidim/controllers/multiple_mentions/input_multiple_mentions.test.js
+++ b/decidim-core/app/packs/src/decidim/controllers/multiple_mentions/input_multiple_mentions.test.js
@@ -7,13 +7,14 @@
import { Application } from "@hotwired/stimulus"
import MultipleMentionsController from "src/decidim/controllers/multiple_mentions/controller"
-const AutoComplete = require("src/decidim/refactor/moved/autocomplete");
+const TomSelect = require("tom-select/dist/cjs/tom-select.popular");
const iconMock = require("src/decidim/refactor/moved/icon");
// Mock the dependencies
-jest.mock("src/decidim/refactor/moved/autocomplete", () => {
+jest.mock("tom-select/dist/cjs/tom-select.popular", () => {
return jest.fn().mockImplementation(() => ({
- setInput: jest.fn()
+ destroy: jest.fn(),
+ clearOptions: jest.fn()
}));
});
@@ -114,12 +115,22 @@ describe("MultipleMentionsManager", () => {
expect(controller.emptyFocusElement).toBe(existingElement);
});
- it("should initialize AutoComplete with correct configuration", () => {
- expect(AutoComplete).toHaveBeenCalledWith(searchInput, {
- dataMatchKeys: ["name", "nickname"],
- dataSource: expect.any(Function),
- dataFilter: expect.any(Function),
- modifyResult: expect.any(Function)
+ it("should initialize TomSelect with correct configuration", () => {
+ expect(TomSelect).toHaveBeenCalledWith(searchInput, {
+ maxItems: 1,
+ valueField: "id",
+ labelField: "name",
+ searchField: ["name", "nickname"],
+ loadThrottle: 200,
+ loadingClass: "loading",
+ preload: false,
+ highlight: true,
+ load: expect.any(Function),
+ render: {
+ option: expect.any(Function),
+ "no_results": expect.any(Function)
+ },
+ onChange: expect.any(Function)
});
});
});
@@ -226,24 +237,24 @@ describe("MultipleMentionsManager", () => {
controller.selected = ["1", "3"];
const list = [
- { value: { id: "1" } },
- { value: { id: "2" } },
- { value: { id: "3" } },
- { value: { id: "4" } }
+ { id: "1" },
+ { id: "2" },
+ { id: "3" },
+ { id: "4" }
];
const filtered = controller.filterResults(list);
expect(filtered).toEqual([
- { value: { id: "2" } },
- { value: { id: "4" } }
+ { id: "2" },
+ { id: "4" }
]);
});
it("should return all users when none are selected", () => {
const list = [
- { value: { id: "1" } },
- { value: { id: "2" } }
+ { id: "1" },
+ { id: "2" }
];
const filtered = controller.filterResults(list);
@@ -255,8 +266,8 @@ describe("MultipleMentionsManager", () => {
controller.selected = ["1", "2"];
const list = [
- { value: { id: "1" } },
- { value: { id: "2" } }
+ { id: "1" },
+ { id: "2" }
];
const filtered = controller.filterResults(list);
@@ -330,7 +341,6 @@ describe("MultipleMentionsManager", () => {
expect(controller.selected).toContain("1");
expect(selectedItems.children.length).toBe(1);
- expect(controller.autoComplete.setInput).toHaveBeenCalledWith("");
});
it("should not add user when max limit is reached", () => {
@@ -350,7 +360,6 @@ describe("MultipleMentionsManager", () => {
expect(controller.selected).not.toContain("10");
expect(selectedItems.children.length).toBe(0);
- expect(controller.autoComplete.setInput).not.toHaveBeenCalled();
});
it("should not add user when direct messages are disabled", () => {
@@ -368,7 +377,6 @@ describe("MultipleMentionsManager", () => {
expect(controller.selected).not.toContain("1");
expect(selectedItems.children.length).toBe(0);
- expect(controller.autoComplete.setInput).not.toHaveBeenCalled();
});
it("should handle multiple valid selections", () => {
@@ -383,7 +391,6 @@ describe("MultipleMentionsManager", () => {
expect(controller.selected).toEqual(["1", "2"]);
expect(selectedItems.children.length).toBe(2);
- expect(controller.autoComplete.setInput).toHaveBeenCalledTimes(2);
});
});
diff --git a/decidim-core/app/packs/src/decidim/controllers/password_toggler/controller.js b/decidim-core/app/packs/src/decidim/controllers/password_toggler/controller.js
index 9362ffb575fd9..6edfe67a9ea3e 100644
--- a/decidim-core/app/packs/src/decidim/controllers/password_toggler/controller.js
+++ b/decidim-core/app/packs/src/decidim/controllers/password_toggler/controller.js
@@ -55,6 +55,18 @@ export default class extends Controller {
hide: icon("eye-off-line")
}
+ const existingWrapper = this.input.closest(".input-group__password");
+ if (existingWrapper) {
+ const existingButton = existingWrapper.querySelector('button[type="button"]');
+ const existingStatusText = existingWrapper.querySelector('span.sr-only[aria-live="polite"]');
+ if (existingButton && existingStatusText) {
+ this.button = existingButton;
+ this.statusText = existingStatusText;
+ this.bindListeners();
+ return;
+ }
+ }
+
this.init();
}
@@ -81,8 +93,17 @@ export default class extends Controller {
*/
init() {
this.createControls();
+ this.bindListeners();
+ }
+
+ bindListeners() {
+ if (this.button && this.boundToggleVisibility) {
+ this.button.removeEventListener("click", this.boundToggleVisibility);
+ }
+ if (this.form && this.boundHidePassword) {
+ this.form.removeEventListener("submit", this.boundHidePassword);
+ }
- // Bind methods to maintain correct context
this.boundToggleVisibility = this.toggleVisibility.bind(this);
this.boundHidePassword = this.hidePassword.bind(this);
diff --git a/decidim-core/app/packs/src/decidim/controllers/password_toggler/password_toggler.test.js b/decidim-core/app/packs/src/decidim/controllers/password_toggler/password_toggler.test.js
index 24714f016a77d..61e7411532765 100644
--- a/decidim-core/app/packs/src/decidim/controllers/password_toggler/password_toggler.test.js
+++ b/decidim-core/app/packs/src/decidim/controllers/password_toggler/password_toggler.test.js
@@ -22,17 +22,7 @@ describe("PasswordToggler", () => {
container = document.createElement("div");
container.innerHTML = `
@@ -39,11 +47,9 @@ describe("AccordionController", () => {
`;
-
accordionElement = document.getElementById("test-accordion");
panel1 = document.getElementById("panel-1");
panel2 = document.getElementById("panel-2");
-
controller = createController(accordionElement);
});
@@ -56,10 +62,8 @@ describe("AccordionController", () => {
it("changes role from region to group when data-panel-role is group", () => {
panel1.setAttribute("role", "region");
panel2.setAttribute("role", "region");
-
accordionElement.dataset.panelRole = "group";
controller.fixPanelRole();
-
expect(panel1.getAttribute("role")).toBe("group");
expect(panel2.getAttribute("role")).toBe("group");
});
@@ -67,52 +71,202 @@ describe("AccordionController", () => {
it("removes role attribute when data-panel-role is none", () => {
panel1.setAttribute("role", "region");
panel2.setAttribute("role", "region");
-
accordionElement.dataset.panelRole = "none";
controller.fixPanelRole();
-
expect(panel1.getAttribute("role")).toBeNull();
expect(panel2.getAttribute("role")).toBeNull();
});
- it("does nothing when data-panel-role is not set", () => {
- panel1.setAttribute("role", "region");
- panel2.setAttribute("role", "region");
-
- Reflect.deleteProperty(accordionElement.dataset, "panelRole");
- controller.fixPanelRole();
-
- expect(panel1.getAttribute("role")).toBe("region");
- expect(panel2.getAttribute("role")).toBe("region");
- });
-
- it("does nothing when data-panel-role is empty", () => {
+ it("does nothing when data-panel-role is not set or empty", () => {
panel1.setAttribute("role", "region");
-
- accordionElement.dataset.panelRole = "";
controller.fixPanelRole();
-
expect(panel1.getAttribute("role")).toBe("region");
});
it("sets custom role value when data-panel-role is set", () => {
panel1.setAttribute("role", "region");
-
accordionElement.dataset.panelRole = "navigation";
controller.fixPanelRole();
-
expect(panel1.getAttribute("role")).toBe("navigation");
});
it("handles nonexistent panels gracefully", () => {
accordionElement.dataset.panelRole = "group";
+ const trigger = document.createElement("button");
+ trigger.dataset.controls = "nonexistent-panel";
+ accordionElement.appendChild(trigger);
+ expect(() => controller.fixPanelRole()).not.toThrow();
+ });
+ });
- const nonExistentTrigger = document.createElement("button");
- nonExistentTrigger.dataset.controls = "nonexistent-panel";
- accordionElement.appendChild(nonExistentTrigger);
+ describe("_applyBreakpointOpenAttributes", () => {
+ beforeEach(() => {
+ controller.initialize();
+ });
- expect(() => controller.fixPanelRole()).not.toThrow();
+ it("removes data-open when no breakpoint matches and no original exists", () => {
+ accordionElement.innerHTML = `
+
+ Panel 2 Content
Panel 1
+ `;
+ controller._applyBreakpointOpenAttributes();
+ expect(accordionElement.querySelector("[data-controls]").hasAttribute("data-open")).toBe(false);
+ });
+
+ it("sets data-open from breakpoint attribute when viewport matches", () => {
+ mockMatchMedia((query) => query === `(min-width: ${screens.lg})`);
+ accordionElement.innerHTML = `
+
+ Panel 1
+ `;
+ controller.initialize();
+ controller._applyBreakpointOpenAttributes();
+ expect(accordionElement.querySelector("[data-controls]").getAttribute("data-open")).toBe("true");
+ });
+
+ it("restores original data-open when breakpoint no longer matches", () => {
+ const lgQuery = `(min-width: ${screens.lg})`;
+ accordionElement.innerHTML = `
+
+ Panel 1
+ `;
+ const trigger = accordionElement.querySelector("[data-controls]");
+ controller.initialize();
+
+ mockMatchMedia((query) => query === lgQuery);
+ controller._applyBreakpointOpenAttributes();
+ expect(trigger.getAttribute("data-open")).toBe("true");
+
+ mockMatchMedia(() => false);
+ controller._applyBreakpointOpenAttributes();
+ expect(trigger.getAttribute("data-open")).toBe("false");
+ });
+
+ it("removes data-open when breakpoint stops matching and no original existed", () => {
+ const lgQuery = `(min-width: ${screens.lg})`;
+ accordionElement.innerHTML = `
+
+ Panel 1
+ `;
+ const trigger = accordionElement.querySelector("[data-controls]");
+ controller.initialize();
+
+ mockMatchMedia((query) => query === lgQuery);
+ controller._applyBreakpointOpenAttributes();
+ expect(trigger.getAttribute("data-open")).toBe("true");
+
+ mockMatchMedia(() => false);
+ controller._applyBreakpointOpenAttributes();
+ expect(trigger.hasAttribute("data-open")).toBe(false);
+ });
+
+ it("applies the last matching breakpoint when multiple match", () => {
+ mockMatchMedia((query) =>
+ query === `(min-width: ${screens.sm})` || query === `(min-width: ${screens.lg})`
+ );
+ accordionElement.innerHTML = `
+
+ Panel 1
+ `;
+ controller.initialize();
+ controller._applyBreakpointOpenAttributes();
+ expect(accordionElement.querySelector("[data-controls]").getAttribute("data-open")).toBe("true");
+ });
+
+ it("leaves triggers without breakpoint attributes unchanged", () => {
+ controller.initialize();
+ controller._applyBreakpointOpenAttributes();
+ expect(accordionElement.querySelector("#trigger-1").hasAttribute("data-open")).toBe(false);
+ expect(accordionElement.querySelector("#trigger-2").hasAttribute("data-open")).toBe(false);
});
});
-});
+ describe("_listenForBreakpointChanges", () => {
+ beforeEach(() => {
+ controller.initialize();
+ });
+
+ it("registers change listeners for breakpoints with matching triggers", () => {
+ accordionElement.innerHTML = `
+
+ Panel 1
+ `;
+ controller._listenForBreakpointChanges();
+ expect(window.matchMedia).toHaveBeenCalledWith(`(min-width: ${screens.lg})`);
+ expect(window.matchMedia.mock.results[0].value.addEventListener).toHaveBeenCalledWith("change", expect.any(Function));
+ });
+
+ it("skips breakpoints without matching triggers", () => {
+ accordionElement.innerHTML = `
+
+ Panel 1
+ `;
+ controller._listenForBreakpointChanges();
+ expect(window.matchMedia).toHaveBeenCalledTimes(1);
+ });
+
+ it("registers nothing when there are no breakpoint triggers", () => {
+ controller._listenForBreakpointChanges();
+ expect(controller._mediaQueries.length).toBe(0);
+ });
+
+ it("registers listeners for multiple breakpoints", () => {
+ accordionElement.innerHTML = `
+
+ Panel 1
+ `;
+ controller._listenForBreakpointChanges();
+ expect(window.matchMedia).toHaveBeenCalledWith(`(min-width: ${screens.sm})`);
+ expect(window.matchMedia).toHaveBeenCalledWith(`(min-width: ${screens.lg})`);
+ expect(controller._mediaQueries.length).toBe(2);
+ });
+ });
+
+ describe("_stopListeningForBreakpointChanges", () => {
+ beforeEach(() => {
+ controller.initialize();
+ });
+
+ it("removes all registered change listeners", () => {
+ accordionElement.innerHTML = `
+
+ Panel 1
+ `;
+ controller._listenForBreakpointChanges();
+ const mql = window.matchMedia.mock.results[0].value;
+ controller._stopListeningForBreakpointChanges();
+ expect(mql.removeEventListener).toHaveBeenCalledWith("change", expect.any(Function));
+ expect(controller._mediaQueries.length).toBe(0);
+ });
+
+ it("does nothing when no listeners exist", () => {
+ expect(() => controller._stopListeningForBreakpointChanges()).not.toThrow();
+ });
+ });
+
+ describe("connect/disconnect/reconnect with breakpoints", () => {
+ beforeEach(() => {
+ controller.initialize();
+ });
+
+ it("connect applies breakpoint attributes and sets up listeners", () => {
+ const applySpy = jest.spyOn(controller, "_applyBreakpointOpenAttributes");
+ const listenSpy = jest.spyOn(controller, "_listenForBreakpointChanges");
+ controller.connect();
+ expect(applySpy).toHaveBeenCalled();
+ expect(listenSpy).toHaveBeenCalled();
+ });
+
+ it("disconnect tears down breakpoint listeners", () => {
+ const spy = jest.spyOn(controller, "_stopListeningForBreakpointChanges");
+ controller.disconnect();
+ expect(spy).toHaveBeenCalled();
+ });
+
+ it("reconnect re-evaluates breakpoint attributes", () => {
+ const spy = jest.spyOn(controller, "_applyBreakpointOpenAttributes");
+ controller.reconnect({});
+ expect(spy).toHaveBeenCalled();
+ });
+ });
+});
diff --git a/decidim-core/app/packs/src/decidim/controllers/accordion/controller.js b/decidim-core/app/packs/src/decidim/controllers/accordion/controller.js
index efe711c1531af..7aab7a60d1837 100644
--- a/decidim-core/app/packs/src/decidim/controllers/accordion/controller.js
+++ b/decidim-core/app/packs/src/decidim/controllers/accordion/controller.js
@@ -2,6 +2,9 @@ import { Controller } from "@hotwired/stimulus"
import Accordions from "a11y-accordion-component";
import { screens } from "tailwindcss/defaultTheme"
export default class extends Controller {
+ initialize() {
+ this._originalOpenValues = new WeakMap();
+ }
/**
* Create accordion from a component
@@ -16,21 +19,8 @@ export default class extends Controller {
accordionOptions.isMultiSelectable = this.element.dataset.multiselectable !== "false";
accordionOptions.isCollapsible = this.element.dataset.collapsible !== "false";
- // This snippet allows to change the OPEN data-attribute based on the current viewport
- // Just include the breakpoint where the different value will be applied from.
- // Ex:
- // data-open="false" data-open-md="true"
- Object.keys(screens).forEach((key) => {
- if (!this.isScreenSize(key)) {
- return;
- }
-
- const elementsToOpen = this.element.querySelectorAll(`[data-controls][data-open-${key}]`);
-
- elementsToOpen.forEach((elem) => {
- (elem.dataset.open = elem.dataset[`open-${key}`.replace(/-([a-z])/g, (str) => str[1].toUpperCase())])
- })
- })
+ this._applyBreakpointOpenAttributes();
+ this._listenForBreakpointChanges();
if (!this.element.id) {
// when component has no id, we enforce to have it one
@@ -59,20 +49,106 @@ export default class extends Controller {
}
if (this.boundExpand) {
- this.toggleButton.addEventListener("click", this.boundExpand);
+ this.toggleButton.removeEventListener("click", this.boundExpand);
}
+
+ this._stopListeningForBreakpointChanges();
}
reconnect(event) {
this.disconnect();
- if (event.detail && event.detail.collapse) {
+ if (event && event.detail && event.detail.collapse) {
this.previouslyExpanded = false;
}
this.connect();
}
+ /**
+ * Applies viewport-conditional data-open attributes and resets
+ * previously applied values when the viewport no longer matches.
+ *
+ * @returns {void}
+ */
+ _applyBreakpointOpenAttributes() {
+ const controlledTriggers = new Set();
+
+ Object.keys(screens).forEach((key) => {
+ this.element.querySelectorAll(`[data-controls][data-open-${key}]`).forEach((elem) => {
+ controlledTriggers.add(elem);
+
+ if (!this._originalOpenValues.has(elem)) {
+ this._originalOpenValues.set(elem, elem.getAttribute("data-open"));
+ }
+ });
+ });
+
+ // Reset all controlled triggers to their original data-open state
+ controlledTriggers.forEach((elem) => {
+ const original = this._originalOpenValues.get(elem);
+ if (original === null) {
+ elem.removeAttribute("data-open");
+ } else {
+ elem.setAttribute("data-open", original);
+ }
+ });
+
+ // Apply breakpoint-specific values for the current viewport
+ Object.keys(screens).forEach((key) => {
+ if (!this.isScreenSize(key)) {
+ return;
+ }
+
+ this.element.querySelectorAll(`[data-controls][data-open-${key}]`).forEach((elem) => {
+ elem.dataset.open = elem.getAttribute(`data-open-${key}`);
+ });
+ });
+ }
+
+ /**
+ * Listens for viewport changes that cross breakpoints relevant
+ * to this accordion and reconnects to keep state in sync.
+ *
+ * @returns {void}
+ */
+ _listenForBreakpointChanges() {
+ this._mediaQueries = [];
+
+ Object.keys(screens).forEach((key) => {
+ const hasRelevantTriggers = this.element.querySelector(`[data-controls][data-open-${key}]`);
+ if (!hasRelevantTriggers) {
+ return;
+ }
+
+ const mql = window.matchMedia(`(min-width: ${screens[key]})`);
+ const handler = () => {
+ this.reconnect({ detail: { collapse: true } });
+ };
+
+ if (mql.addEventListener) {
+ mql.addEventListener("change", handler);
+ } else if (mql.addListener) {
+ mql.addListener(handler);
+ }
+
+ this._mediaQueries.push({ mql, handler });
+ });
+ }
+
+ _stopListeningForBreakpointChanges() {
+ if (this._mediaQueries) {
+ this._mediaQueries.forEach(({ mql, handler }) => {
+ if (mql.removeEventListener) {
+ mql.removeEventListener("change", handler);
+ } else if (mql.removeListener) {
+ mql.removeListener(handler);
+ }
+ });
+ this._mediaQueries = [];
+ }
+ }
+
expandIfNeeded()
{
if (!this.toggleButton) {
diff --git a/decidim-core/app/packs/src/decidim/controllers/dropdown/controller.js b/decidim-core/app/packs/src/decidim/controllers/dropdown/controller.js
index 34f755f37decb..a88bb5891b22a 100644
--- a/decidim-core/app/packs/src/decidim/controllers/dropdown/controller.js
+++ b/decidim-core/app/packs/src/decidim/controllers/dropdown/controller.js
@@ -47,6 +47,12 @@ export default class extends Controller {
this.element.id = `dropdown-${Math.random().toString(36).substring(7)}`
}
+ if (!this.element.hasAttribute("aria-expanded")) {
+ this.element.setAttribute("aria-expanded", dropdownOptions.isOpen
+ ? "true"
+ : "false");
+ }
+
const autofocus = this.element.dataset.autofocus;
if (autofocus) {
// set the focus to some inner element, use setTimeout hack due to waiting for element to display
diff --git a/decidim-core/app/packs/src/decidim/controllers/dropdown/dropdown.test.js b/decidim-core/app/packs/src/decidim/controllers/dropdown/dropdown.test.js
index 72aed33913de0..0afeccdea120f 100644
--- a/decidim-core/app/packs/src/decidim/controllers/dropdown/dropdown.test.js
+++ b/decidim-core/app/packs/src/decidim/controllers/dropdown/dropdown.test.js
@@ -142,6 +142,34 @@ describe("DropdownController", () => {
});
});
+ describe("aria-expanded initialization", () => {
+ it("sets aria-expanded to false when missing and isOpen is false", () => {
+ const testController = createController(element);
+
+ testController.connect();
+
+ expect(element.getAttribute("aria-expanded")).toBe("false");
+ });
+
+ it("sets aria-expanded to true when missing and data-open is true", () => {
+ element.setAttribute("data-open", "true");
+ const testController = createController(element);
+
+ testController.connect();
+
+ expect(element.getAttribute("aria-expanded")).toBe("true");
+ });
+
+ it("does not override existing aria-expanded attribute", () => {
+ element.setAttribute("aria-expanded", "true");
+ const testController = createController(element);
+
+ testController.connect();
+
+ expect(element.getAttribute("aria-expanded")).toBe("true");
+ });
+ });
+
describe("data-add-aria-roles option", () => {
it("keeps role menu when data-add-aria-roles is true", () => {
element.setAttribute("data-add-aria-roles", "true");
diff --git a/decidim-core/app/packs/src/decidim/controllers/form_validator/form_validator.js b/decidim-core/app/packs/src/decidim/controllers/form_validator/form_validator.js
index 98c1f1e623bb0..8543438a24cc0 100644
--- a/decidim-core/app/packs/src/decidim/controllers/form_validator/form_validator.js
+++ b/decidim-core/app/packs/src/decidim/controllers/form_validator/form_validator.js
@@ -419,13 +419,13 @@ class FormValidator {
return true;
}
- checkboxGroup.forEach((checkboxElement) => {
- if (isValid) {
- this.removeInputErrorClasses(checkboxElement);
- } else {
+ if (isValid) {
+ this.removeCheckboxGroupErrorClasses(groupName);
+ } else {
+ checkboxGroup.forEach((checkboxElement) => {
this.addInputErrorClasses(checkboxElement, ["required"]);
- }
- });
+ });
+ }
return isValid;
}
diff --git a/decidim-core/app/packs/src/decidim/controllers/form_validator/form_validator.test.js b/decidim-core/app/packs/src/decidim/controllers/form_validator/form_validator.test.js
index b200f7c283c54..95a20f8594393 100644
--- a/decidim-core/app/packs/src/decidim/controllers/form_validator/form_validator.test.js
+++ b/decidim-core/app/packs/src/decidim/controllers/form_validator/form_validator.test.js
@@ -1,4 +1,4 @@
-/* eslint max-lines: ["error", 690] */
+/* eslint max-lines: ["error", 712] */
/* global jest */
/**
* @jest-environment jsdom
@@ -253,6 +253,28 @@ describe("FormValidator", () => {
const isValidTwo = validatorInstance.validateCheckboxGroup("multiCheckboxes");
expect(isValidTwo).toBe(true);
});
+
+ it("should remove error classes once for the group, not per checkbox", () => {
+ formElement.innerHTML = `
+
+
+ `;
+ validatorInstance = new FormValidator(formElement);
+ formElement.querySelector("#cb-1").checked = true;
+
+ const removeGroupSpy = jest.spyOn(validatorInstance, "removeCheckboxGroupErrorClasses");
+ const removeInputSpy = jest.spyOn(validatorInstance, "removeInputErrorClasses");
+
+ const isValid = validatorInstance.validateCheckboxGroup("largeGroup");
+
+ expect(isValid).toBe(true);
+ expect(removeGroupSpy).toHaveBeenCalledTimes(1);
+ expect(removeInputSpy).not.toHaveBeenCalled();
+ });
});
describe("Custom Validators", () => {
diff --git a/decidim-core/app/packs/src/decidim/controllers/mention/controller.js b/decidim-core/app/packs/src/decidim/controllers/mention/controller.js
index 43c651a281c9c..566f9c6e65f9c 100644
--- a/decidim-core/app/packs/src/decidim/controllers/mention/controller.js
+++ b/decidim-core/app/packs/src/decidim/controllers/mention/controller.js
@@ -1,5 +1,6 @@
+/* eslint max-lines: ["error", 400] */
+
import { Controller } from "@hotwired/stimulus"
-import Tribute from "src/decidim/vendor/tribute";
export default class extends Controller {
connect() {
@@ -9,7 +10,12 @@ export default class extends Controller {
menuItemLimit: 5
};
- this.tribute = null;
+ this.suggestion = null;
+ this.suggestions = [];
+ this.selectedIndex = -1;
+ this.isActive = false;
+ this.currentMentionStart = null;
+ this.requestId = 0;
this.isInitialized = false;
// Prevent initialization inside editor components
@@ -17,100 +23,62 @@ export default class extends Controller {
return;
}
- if (this.element.hasAttribute("data-tribute")) {
- this.element.removeAttribute("data-tribute");
- }
-
- this.createTribute();
+ this.createSuggestionContainer();
this.setupEventListeners();
this.isInitialized = true;
}
disconnect() {
- if (this.tribute) {
- this.tribute.detach(this.element);
+ if (this.suggestion) {
+ this.suggestion.remove();
}
this.element.removeEventListener("focusin", this.handleFocusIn);
this.element.removeEventListener("focusout", this.handleFocusOut);
this.element.removeEventListener("input", this.handleInput);
+ this.element.removeEventListener("keydown", this.handleKeyDown);
+ document.removeEventListener("click", this.handleDocumentClick);
- this.tribute = null;
+ this.suggestion = null;
+ this.suggestions = [];
this.isInitialized = false;
}
- /**
- * Create and configure the Tribute instance
- * @returns {void}
- * @private
- */
- createTribute() {
- const noMatchTemplate = this.options.noDataFoundMessage
- ? () => `
-
`;
mockElement = document.querySelector("[data-controller='mention']");
- // Setup window.Decidim mock
window.Decidim.config.get.mockReturnValue("http://localhost:3000/api");
- // Setup fetch mock
fetch.mockResolvedValue({
ok: true,
json: () => Promise.resolve({
data: {
users: [
{
- nickname: "testuser",
- name: "Test User",
+ nickname: "@doe_john",
+ name: "John Doe",
avatarUrl: "http://example.com/avatar.jpg",
__typename: "User"
}
@@ -84,479 +49,177 @@ describe("MentionsComponent", () => {
}
})
});
- return new Promise((resolve) => {
- setTimeout(() => {
- controller = application.getControllerForElementAndIdentifier(mockElement, "mention");
- resolve();
- }, 0);
- });
});
afterEach(() => {
- controller.disconnect();
+ controller?.disconnect();
document.body.innerHTML = "";
+ application.stop();
jest.restoreAllMocks();
});
- describe("constructor", () => {
- it("creates instance with default options", () => {
- expect(controller.element).toBe(mockElement);
- expect(controller.options.noDataFoundMessage).toBe("No users found");
- expect(controller.options.debounceDelay).toBe(250);
- expect(controller.options.menuItemLimit).toBe(5);
- });
-
- it("initializes component when not inside editor", () => {
- expect(controller.initialized).toBe(true);
- expect(TributeMock).toHaveBeenCalled();
- expect(mockTribute.attach).toHaveBeenCalledWith(mockElement);
- });
-
- it("does not initialize when inside editor", () => {
- const editorContainer = document.createElement("div");
- editorContainer.classList.add("editor");
- const editorElement = document.createElement("input");
- editorElement.setAttribute("data-controller", "mention");
- editorContainer.appendChild(editorElement);
- document.body.appendChild(editorContainer);
-
- // Wait for the controller to be connected
- return new Promise((resolve) => {
- setTimeout(() => {
- controller = application.getControllerForElementAndIdentifier(editorElement, "mention");
-
- expect(controller.initialized).toBe(false);
- // Since TributeMock should not be called, we can check that tribute is null
- expect(controller.tribute).toBeNull();
-
- resolve();
- }, 0);
- });
- });
- });
-
- describe("Tribute configuration", () => {
- it("configures Tribute with correct options", () => {
- const tributeConfig = TributeMock.mock.calls[0][0];
-
- expect(tributeConfig.trigger).toBe("@");
- expect(tributeConfig.positionMenu).toBe(true);
- expect(tributeConfig.allowSpaces).toBe(true);
- expect(tributeConfig.menuItemLimit).toBe(5);
- expect(tributeConfig.fillAttr).toBe("nickname");
- expect(tributeConfig.selectClass).toBe("highlight");
- });
-
- it("configures lookup function correctly", () => {
- const tributeConfig = TributeMock.mock.calls[0][0];
- const mockItem = { nickname: "testuser", name: "Test User" };
-
- expect(tributeConfig.lookup(mockItem)).toBe("testuserTest User");
- });
-
- it("configures selectTemplate function correctly", () => {
- const tributeConfig = TributeMock.mock.calls[0][0];
- const mockItem = { original: { nickname: "testuser" } };
-
- expect(tributeConfig.selectTemplate(mockItem)).toBe("testuser");
- // eslint-disable-next-line no-undefined
- expect(tributeConfig.selectTemplate(undefined)).toBeNull();
+ const connectController = () => {
+ return new Promise((resolve) => {
+ setTimeout(() => {
+ controller = application.getControllerForElementAndIdentifier(mockElement, "mention");
+ resolve();
+ }, 0);
});
+ };
- it("configures menuItemTemplate function correctly", () => {
- const tributeConfig = TributeMock.mock.calls[0][0];
- const mockItem = {
- original: {
- nickname: "testuser",
- name: "Test User",
- avatarUrl: "http://example.com/avatar.jpg"
- }
- };
-
- const template = tributeConfig.menuItemTemplate(mockItem);
- expect(template).toContain('img src="http://example.com/avatar.jpg"');
- expect(template).toContain("testuser");
- expect(template).toContain("Test User");
- });
+ const waitForDebounce = () => {
+ return new Promise((resolve) => setTimeout(resolve, 300));
+ };
- it("configures noMatchTemplate when no data found message exists", () => {
- const tributeConfig = TributeMock.mock.calls[0][0];
+ it("initializes when not inside editor", async () => {
+ await connectController();
- expect(tributeConfig.noMatchTemplate()).toBe("
+ })
+ ${escape(data.nickname)}
+ ${escape(data.name)}
+ ${disabledMsg}
+
`;
+ },
+ "no_results": () => `${this.searchInput.dataset.noresults || ""}
`
+ },
+ onChange: (value) => {
+ if (value) {
+ const option = this.tomSelect.options[value];
+ this.handleSelection({ value: option });
+ this.tomSelect.clear();
+ this.tomSelect.clearOptions();
+ }
+ }
});
}
@@ -129,7 +160,7 @@ export default class extends Controller {
*/
filterResults(list) {
return list.filter(
- (item) => !this.selected.includes(item.value.id)
+ (item) => !this.selected.includes(item.id)
);
}
@@ -161,18 +192,23 @@ export default class extends Controller {
*/
handleSelection(selection) {
const id = selection.value.id;
- // Check if we have reached the maximum limit or if direct messages are disabled
if (this.isMaxLimitReached() || selection.value.directMessagesEnabled === "false") {
return;
}
this.addSelectedUser(selection, id);
- this.autoComplete.setInput("");
this.selected.push(id);
+ }
- if (this.autoComplete && this.autoComplete.autocomplete) {
- this.autoComplete.autocomplete.close();
- }
+ /**
+ * Escape HTML characters in a string
+ * @param {string} str - The string to escape
+ * @returns {string} The escaped HTML string
+ */
+ htmlEscape(str) {
+ const div = document.createElement("div");
+ div.appendChild(document.createTextNode(str));
+ return div.innerHTML;
}
/**
@@ -187,10 +223,10 @@ export default class extends Controller {
const listItem = document.createElement("li");
listItem.tabIndex = "-1";
listItem.innerHTML = `
-
-
-
-
-
+
-
-
-
-
<%= t(".program") %> <%= t(".program") %> (<%= translated_attribute current_participatory_space.title %>) diff --git a/decidim-conferences/app/views/decidim/conferences/conference_speakers/index.html.erb b/decidim-conferences/app/views/decidim/conferences/conference_speakers/index.html.erb index 77c855563a3ae..bfb883f5dcb37 100644 --- a/decidim-conferences/app/views/decidim/conferences/conference_speakers/index.html.erb +++ b/decidim-conferences/app/views/decidim/conferences/conference_speakers/index.html.erb @@ -14,7 +14,7 @@ edit_link( %> <%# NOTE: this page does not use a regular layout %> -
+
diff --git a/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb b/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb index 9fb927673017c..983b5a27dcacc 100644 --- a/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb +++ b/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb @@ -20,7 +20,7 @@ edit_link( include the hero inside the two-column layout. Therefore is mandatory to pass the "main_enabled: false" flag to the layout_two_col for disabling the original main. %> -
+
<%= content_for :aside do %>
diff --git a/decidim-conferences/app/views/decidim/conferences/media/index.html.erb b/decidim-conferences/app/views/decidim/conferences/media/index.html.erb
index 6baad67eb1192..2ea7fb5b7260f 100644
--- a/decidim-conferences/app/views/decidim/conferences/media/index.html.erb
+++ b/decidim-conferences/app/views/decidim/conferences/media/index.html.erb
@@ -13,7 +13,7 @@ edit_link(
%>
<%# NOTE: this page does not use a regular layout %>
-
+
<% end %>
-<% form.fields_for :images, form.object.images do |images_fields| %>
+<% form.fields_for :images, content_block.images_container do |images_fields| %>
<%= images_fields.upload :background_image, label: t(".background_image"), button_class: "button button__sm button__transparent-secondary" %>
diff --git a/decidim-core/app/cells/decidim/content_blocks/highlighted_participatory_spaces_cell.rb b/decidim-core/app/cells/decidim/content_blocks/highlighted_participatory_spaces_cell.rb
index 5c91715fdb0c2..979ebb2408763 100644
--- a/decidim-core/app/cells/decidim/content_blocks/highlighted_participatory_spaces_cell.rb
+++ b/decidim-core/app/cells/decidim/content_blocks/highlighted_participatory_spaces_cell.rb
@@ -28,7 +28,7 @@ def max_results; end
private
def cache_hash
- [I18n.locale, highlighted_spaces.map(&:cache_key_with_version)].join(Decidim.cache_key_separator)
+ [I18n.locale, model.cache_key_with_version, highlighted_spaces.map(&:cache_key_with_version)].join(Decidim.cache_key_separator)
end
def section_class
diff --git a/decidim-core/app/cells/decidim/content_blocks/participatory_space_hero_settings_form/show.erb b/decidim-core/app/cells/decidim/content_blocks/participatory_space_hero_settings_form/show.erb
index 4463b6f8a74e0..c5b691886ac25 100644
--- a/decidim-core/app/cells/decidim/content_blocks/participatory_space_hero_settings_form/show.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/participatory_space_hero_settings_form/show.erb
@@ -8,7 +8,7 @@
<%= t("media", scope: "layouts.decidim.conferences_nav") %> <%= t("media", scope: "layouts.decidim.conferences_nav") %> (<%= translated_attribute current_participatory_space.title %>) diff --git a/decidim-conferences/app/views/decidim/conferences/registration_types/index.html.erb b/decidim-conferences/app/views/decidim/conferences/registration_types/index.html.erb index f785a76fa3064..a66b12a1eb043 100644 --- a/decidim-conferences/app/views/decidim/conferences/registration_types/index.html.erb +++ b/decidim-conferences/app/views/decidim/conferences/registration_types/index.html.erb @@ -16,7 +16,7 @@ edit_link( <%= append_stylesheet_pack_tag "decidim_conferences" %> <%# NOTE: this page does not use a regular layout %> -
+
- <%= action_authorized_link_to :amend, new_amend_path, resource: model, data: { "redirect_url" => new_amend_path }, id: "amend-button", class: "dropdown__button" do %>
+
+ <%= action_authorized_link_to :amend, new_amend_path, resource: model, data: { "redirect_url" => new_amend_path }, id: "amend-button", class: "dropdown__button", role: "menuitem" do %>
<%= t("button", scope: "decidim.amendments.amendable", model_name: nil) %>
<%= icon "pencil-line" %>
<% end %>
diff --git a/decidim-core/app/cells/decidim/author_cell.rb b/decidim-core/app/cells/decidim/author_cell.rb
index 34e443143e24a..aaedb01ed691a 100644
--- a/decidim-core/app/cells/decidim/author_cell.rb
+++ b/decidim-core/app/cells/decidim/author_cell.rb
@@ -31,10 +31,6 @@ def flag_user
render unless current_user == model
end
- def perform_caching?
- true
- end
-
def raw_model
model.try(:__getobj__) || model
end
diff --git a/decidim-core/app/cells/decidim/card_metadata_cell.rb b/decidim-core/app/cells/decidim/card_metadata_cell.rb
index e8bf4102480f6..322b31b19a0b0 100644
--- a/decidim-core/app/cells/decidim/card_metadata_cell.rb
+++ b/decidim-core/app/cells/decidim/card_metadata_cell.rb
@@ -29,7 +29,7 @@ def space_item
return unless show_space?
{
- text: decidim_escape_translated(participatory_space.title),
+ text: translated_attribute(participatory_space.title),
icon: resource_type_icon_key(participatory_space.class),
url: Decidim::ResourceLocatorPresenter.new(participatory_space).path
}
diff --git a/decidim-core/app/cells/decidim/comments_button_cell.rb b/decidim-core/app/cells/decidim/comments_button_cell.rb
index c9196d38fcdab..f09bbb7f48b73 100644
--- a/decidim-core/app/cells/decidim/comments_button_cell.rb
+++ b/decidim-core/app/cells/decidim/comments_button_cell.rb
@@ -23,7 +23,9 @@ def comments_enabled?
end
def path
- "#add-comment-anchor"
+ return "#add-comment-anchor" if current_user
+
+ nil
end
def text
@@ -37,5 +39,11 @@ def icon_name
def button_classes
"button button__sm button__transparent-secondary add-comment-mobile"
end
+
+ def html_options
+ return {} if current_user
+
+ { data: { "dialog-open": "loginModal" } }
+ end
end
end
diff --git a/decidim-core/app/cells/decidim/content_blocks/cta_settings_form/show.erb b/decidim-core/app/cells/decidim/content_blocks/cta_settings_form/show.erb
index ee2e372caf992..2878acaffce11 100644
--- a/decidim-core/app/cells/decidim/content_blocks/cta_settings_form/show.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/cta_settings_form/show.erb
@@ -4,6 +4,6 @@
<%= settings_fields.translated :text_field, :description, label: t("decidim.content_blocks.cta_settings_form.description") %>
<% end %>
-<% form.fields_for :images, form.object.images do |images_fields| %>
+<% form.fields_for :images, content_block.images_container do |images_fields| %>
<%= images_fields.upload :background_image, label: t("decidim.content_blocks.cta_settings_form.background_image") %>
<% end %>
diff --git a/decidim-core/app/cells/decidim/content_blocks/hero_settings_form/show.erb b/decidim-core/app/cells/decidim/content_blocks/hero_settings_form/show.erb
index fd40f5b447a8a..5e94a7ecd61c1 100644
--- a/decidim-core/app/cells/decidim/content_blocks/hero_settings_form/show.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/hero_settings_form/show.erb
@@ -5,7 +5,7 @@
<%= settings_fields.translated :text_field, :cta_button_path, label: t(".cta_button_path") %>
-
@@ -14,7 +14,7 @@
<% end %>
-<% form.fields_for :images, form.object.images do |images_fields| %>
+<% form.fields_for :images, content_block.images_container do |images_fields| %>
<%= images_fields.upload :background_image, label: t(".background_image"), button_class: "button button__sm button__transparent-secondary" %>
diff --git a/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner_cell.rb b/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner_cell.rb
index 5c883bd8289d1..a09cf0af691cb 100644
--- a/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner_cell.rb
+++ b/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner_cell.rb
@@ -32,7 +32,7 @@ def background_image
private
def render?
- required_keys = [:title, :short_description, :action_button_title, :action_button_subtitle, :action_button_url]
+ required_keys = [:title, :action_button_title, :action_button_subtitle, :action_button_url]
required_keys.all? { |key| model.settings.public_send(key).present? }
end
end
diff --git a/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner_settings_form/show.erb b/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner_settings_form/show.erb
index 19c789a0f2f54..1d941e28d61a4 100644
--- a/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner_settings_form/show.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner_settings_form/show.erb
@@ -20,7 +20,7 @@
diff --git a/decidim-conferences/config/locales/eu.yml b/decidim-conferences/config/locales/eu.yml index 15d9278f78ef5..d9185c7dd4a63 100644 --- a/decidim-conferences/config/locales/eu.yml +++ b/decidim-conferences/config/locales/eu.yml @@ -233,7 +233,7 @@ eu: actions: Ekintzak affiliation: Afiliazioa full_name: Izen osoa - position: Ardura + position: Kokapena name: Hizlaria conference_user_role: fields: @@ -597,7 +597,7 @@ eu: notification_title: %{resource_title} jardunaldiak erregistroak gaitu ditu. role_assigned: email_intro: '%{role} rola esleitu zaizu jardunaldian.' - email_outro: Jakinarazpen hau jaso duzu %{role} rola esleitu dizutelako "%{resource_title}" hitzaldian. + email_outro: Jakinarazpen hau jaso duzu %{role} rola esleitu dizutelako "%{resource_title}" jardunaldian. email_subject: '%{role} rola esleitu zaizu batzarrean.' notification_title: '%{role} rola esleitu zaizu %{resource_title} batzarrean.' upcoming_conference: @@ -667,7 +667,7 @@ eu: promoted_conferences: Sustatutako jardunaldiak order_by_conferences: conferences: - one: "Jardunaldi %{count}" + one: "%{count} jardunaldi" other: "%{count} jardunaldi" conferences_nav: conference_partners_menu_item: Kideak diff --git a/decidim-conferences/config/locales/fr-CA.yml b/decidim-conferences/config/locales/fr-CA.yml index b91de1e2889ec..9c5ecd91f0a1b 100644 --- a/decidim-conferences/config/locales/fr-CA.yml +++ b/decidim-conferences/config/locales/fr-CA.yml @@ -121,8 +121,11 @@ fr-CA: success: Conférencier supprimé avec succès pour cette conférence. edit: update: Mettre à jour + index: + conference_speakers_title: Conférenciers new: create: Créer + title: Nouveau conférencier publish: invalid: Il y a eu un problème lors de la publication de cet intervenant. success: L'intervenant de la conférence a été publié avec succès. diff --git a/decidim-conferences/config/locales/sk.yml b/decidim-conferences/config/locales/sk.yml index 781e01a77a6b2..6860cb3b1e98d 100644 --- a/decidim-conferences/config/locales/sk.yml +++ b/decidim-conferences/config/locales/sk.yml @@ -501,7 +501,7 @@ sk: show: already_have_an_account?: Už máte účet? are_you_new?: Nový účastník? - login_as: Ste prihlásení ako %{name} %{email} + login_as: Ste prihlásení ako %{name} %{email} make_conference_registration: Zaregistrovať sa na konferenciu manage_registration: Spravovať registráciu register: Registrovať @@ -591,10 +591,10 @@ sk: conference_registration_validation_pending: notification_title: Vaša registrácia na konferencii %{resource_title} čaká na potvrdenie. conference_registrations_over_percentage: - email_intro: Konferencia "%{resource_title}" je obsadená na viac, než%{percentage} %. + email_intro: Konferencia "%{resource_title}" je obsadená na viac, než%{percentage} %. email_outro: Túto notifikáciu ste dostali, pretože ste administrátorom participatívneho priestoru konferencie. - email_subject: Konferencia "%{resource_title}" je obsadená na viac, než%{percentage} %. - notification_title: Konferencia %{resource_title} je obsadená na viac, než %{percentage} %. + email_subject: Konferencia "%{resource_title}" je obsadená na viac, než%{percentage} %. + notification_title: Konferencia %{resource_title} je obsadená na viac, než %{percentage} %. conference_updated: email_intro: 'Konferencia "%{resource_title}" bola aktualizovaná. Novú verziu si môžete pozrieť na jej stránke:' email_outro: Túto notifikáciu ste dostali, pretože sledujete konferenciu "%{resource_title}". Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz. diff --git a/decidim-conferences/lib/decidim/conferences/test/factories.rb b/decidim-conferences/lib/decidim/conferences/test/factories.rb index db7213137a588..3277d06e34fe6 100644 --- a/decidim-conferences/lib/decidim/conferences/test/factories.rb +++ b/decidim-conferences/lib/decidim/conferences/test/factories.rb @@ -44,6 +44,10 @@ published_at { Time.current } end + trait :trashed do + deleted_at { Time.current } + end + trait :diploma do main_logo { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") } signature { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") } diff --git a/decidim-conferences/lib/decidim/conferences/version.rb b/decidim-conferences/lib/decidim/conferences/version.rb index 0757dec2c9c0a..9069854c9a332 100644 --- a/decidim-conferences/lib/decidim/conferences/version.rb +++ b/decidim-conferences/lib/decidim/conferences/version.rb @@ -4,7 +4,7 @@ module Decidim # This holds the decidim-conferences version. module Conferences def self.version - "0.31.4" + "0.31.7" end end end diff --git a/decidim-conferences/spec/commands/create_conference_spec.rb b/decidim-conferences/spec/commands/create_conference_spec.rb index cc6e1979e2b12..fdb67137d1f98 100644 --- a/decidim-conferences/spec/commands/create_conference_spec.rb +++ b/decidim-conferences/spec/commands/create_conference_spec.rb @@ -31,11 +31,8 @@ module Decidim::Conferences let(:related_processes_ids) { [participatory_processes.map(&:id)] } let(:related_assemblies_ids) { [assemblies.map(&:id)] } - let(:form) do - instance_double( - Admin::ConferenceForm, - current_user:, - invalid?: invalid, + let(:attributes) do + { title: { en: "title" }, slogan: { en: "slogan" }, weight: 1, @@ -46,8 +43,6 @@ module Decidim::Conferences promoted: nil, description: { en: "description" }, short_description: { en: "short_description" }, - current_organization: organization, - organization:, taxonomizations:, errors:, show_statistics: false, @@ -59,6 +54,17 @@ module Decidim::Conferences registration_terms: { en: "registrations terms" }, participatory_processes_ids: related_processes_ids, assemblies_ids: related_assemblies_ids + } + end + + let(:form) do + instance_double( + Admin::ConferenceForm, + **attributes, + current_user:, + organization:, + current_organization: organization, + invalid?: invalid ) end let(:invalid) { false } @@ -71,6 +77,23 @@ module Decidim::Conferences end end + context "when there is a trashed space with the same slug" do + let!(:trashed_space) { create(:conference, :trashed, slug: "slug", organization:) } + + let(:form) do + Admin::ConferenceForm.from_params(attributes) + .with_context({ + current_user:, + current_organization: organization + }) + end + + it "broadcasts invalid" do + expect { subject.call }.to broadcast(:invalid) + expect(form.errors[:slug]).not_to be_empty + end + end + context "when the conference is not persisted" do let(:hero_image) do ActiveStorage::Blob.create_and_upload!( diff --git a/decidim-conferences/spec/commands/duplicate_conference_spec.rb b/decidim-conferences/spec/commands/duplicate_conference_spec.rb index 940c0c2afeb78..1c922a1b341e7 100644 --- a/decidim-conferences/spec/commands/duplicate_conference_spec.rb +++ b/decidim-conferences/spec/commands/duplicate_conference_spec.rb @@ -34,6 +34,27 @@ module Decidim::Conferences end end + context "when there is a trashed space with the same slug" do + let!(:trashed_space) { create(:conference, :trashed, slug: "duplicated-slug", organization:) } + + let(:form) do + Admin::ConferenceDuplicateForm.from_params({ + title: { en: "title" }, + slug: "duplicated-slug", + duplicate_components: duplicate_components + }) + .with_context({ + current_user:, + current_organization: organization + }) + end + + it "broadcasts invalid" do + expect { subject.call }.to broadcast(:invalid) + expect(form.errors[:slug]).not_to be_empty + end + end + context "when everything is ok" do it "duplicates a conference" do expect { subject.call }.to change(Decidim::Conference, :count).by(1) diff --git a/decidim-conferences/spec/commands/update_conference_spec.rb b/decidim-conferences/spec/commands/update_conference_spec.rb index 851749725adef..d98217bbb99b1 100644 --- a/decidim-conferences/spec/commands/update_conference_spec.rb +++ b/decidim-conferences/spec/commands/update_conference_spec.rb @@ -95,6 +95,19 @@ module Decidim::Conferences end end + context "when there is a trashed space with the same slug" do + let!(:trashed_space) { create(:conference, :trashed, slug: "slug", organization:) } + + let(:form) do + Admin::ConferenceForm.from_params(params.deep_merge(conference: { slug: "slug" })).with_context(context) + end + + it "broadcasts invalid" do + expect { command.call }.to broadcast(:invalid) + expect(form.errors[:slug]).not_to be_empty + end + end + describe "when the conference is not valid" do before do allow(form).to receive(:invalid?).and_return(false) diff --git a/decidim-conferences/spec/controllers/admin/imports_controller_spec.rb b/decidim-conferences/spec/controllers/admin/imports_controller_spec.rb index 2ec0c6a719fcd..f9aba84439f69 100644 --- a/decidim-conferences/spec/controllers/admin/imports_controller_spec.rb +++ b/decidim-conferences/spec/controllers/admin/imports_controller_spec.rb @@ -13,10 +13,7 @@ module Admin let(:extra_params) { { conference_slug: participatory_space.slug } } let(:file) do - Rack::Test::UploadedFile.new( - Decidim::Dev.test_file("import_proposals.csv", "text/csv"), - "text/csv" - ) + Decidim::Dev.test_file("import_proposals.csv", "text/csv") end end end diff --git a/decidim-conferences/spec/shared/manage_conference_components_examples.rb b/decidim-conferences/spec/shared/manage_conference_components_examples.rb index e8864e661c218..924faad96fd20 100644 --- a/decidim-conferences/spec/shared/manage_conference_components_examples.rb +++ b/decidim-conferences/spec/shared/manage_conference_components_examples.rb @@ -197,7 +197,7 @@ it "hides the component from the menu" do visit decidim_conferences.conference_path(conference, locale: I18n.locale) - expect(page).to have_content decidim_escape_translated(component.name) + expect(page).to have_content translated_attribute(component.name) visit decidim_admin_conferences.components_path(conference) @@ -212,7 +212,7 @@ end visit decidim_conferences.conference_path(conference, locale: I18n.locale) - expect(page).to have_no_content decidim_escape_translated(component.name) + expect(page).to have_no_content translated_attribute(component.name) end end diff --git a/decidim-conferences/spec/system/conference_program_spec.rb b/decidim-conferences/spec/system/conference_program_spec.rb index 091136f369ee4..4403a2dd09b25 100644 --- a/decidim-conferences/spec/system/conference_program_spec.rb +++ b/decidim-conferences/spec/system/conference_program_spec.rb @@ -52,8 +52,8 @@ visit decidim_conferences.conference_path(conference) within "aside .conference__nav-container" do - expect(page).to have_content(decidim_escape_translated(component.name)) - click_on decidim_escape_translated(component.name) + expect(page).to have_content(translated_attribute(component.name)) + click_on translated_attribute(component.name) end expect(page).to have_current_path decidim_conferences.conference_conference_program_path(conference, component) diff --git a/decidim-conferences/spec/system/conferences_spec.rb b/decidim-conferences/spec/system/conferences_spec.rb index 849d8fffc114e..d732e039f9aaa 100644 --- a/decidim-conferences/spec/system/conferences_spec.rb +++ b/decidim-conferences/spec/system/conferences_spec.rb @@ -230,11 +230,27 @@ context "when the conference has some components" do it "shows the components" do within ".conference__nav" do - expect(page).to have_content(decidim_escape_translated(proposals_component.name)) + expect(page).to have_content(translated(proposals_component.name)) + expect(page.html).to include(decidim_escape_translated(proposals_component.name).gsub(""", "\"")) expect(page).to have_no_content(decidim_escape_translated(meetings_component.name)) end end + describe "when there are special characters (', &) in the nav links" do + let(:participatory_space) { conference } + let(:component_name) { "People's Budget & Ideas" } + let!(:proposal_component) { create(:proposal_component, name: { en: component_name }, participatory_space:) } + + it "renders the component name correctly" do + visit current_path + within ".conference__nav-container" do + expect(page).to have_content(component_name) + expect(page).to have_no_content("'") + expect(page).to have_no_content("'") + end + end + end + it "renders the stats for those components that are visible" do within all("[data-statistic]")[0] do expect(page).to have_css(".statistic__title", text: "Proposals") diff --git a/decidim-core/app/cells/decidim/amendable/amend_button_card/show.erb b/decidim-core/app/cells/decidim/amendable/amend_button_card/show.erb index eb6623e304b56..7eb077db92fe1 100644 --- a/decidim-core/app/cells/decidim/amendable/amend_button_card/show.erb +++ b/decidim-core/app/cells/decidim/amendable/amend_button_card/show.erb @@ -1,5 +1,5 @@ -
<%= t(".cta_button_path_help", url: decidim_form_slug_url("", translated_attribute(form.object.settings.cta_button_path))) %>
+<%= t(".cta_button_path_help", url: decidim_form_slug_url("", translated_attribute(form.object.settings["cta_button_path"]))) %>
<%= category[:description] %>
<% if category[:items].present? %> -