decidim-core 0.31.4 → 0.31.6

data/config/locales/sv.yml

@@ -422,8 +422,8 @@ sv:
         success: Ändringsförslaget har dragits tillbaka.
       wizard_step_form:
         steps:
-          '1': Skapa ändringsförslag
-          '2': Publicera ditt ändringsförslag
+          '1': Skapa din korrigering
+          '2': Publicera din korrigering
     anonymous_user: Anonym
     application:
       document:
@@ -556,7 +556,6 @@ sv:
           global:
             amendments_enabled: Aktivera ändringsförslag
             comments_enabled: Aktivera kommentarer
-            comments_max_length: Maximal längd på kommentarer
             define_taxonomy_filters: Ställ in filter innan du använder den här inställningen.
             dummy_global_attribute1: Dummy Attribut 1
             dummy_global_attribute2: Dummy Attribut 2
@@ -1215,7 +1214,6 @@ sv:
         create:
           error: Konversationen har inte startat. Försök igen senare.
         error_modal:
-          close: Stäng fönster
           correct_errors: Vänligen korrigera felen och försök igen.
           intro: 'Det fanns följande fel med ditt meddelande:'
           ok: Ok
@@ -1341,6 +1339,7 @@ sv:
         own_activity: Min egen verksamhet, som när någon kommenterar mitt förslag eller nämner mig
         push_notifications: Push-meddelanden
         push_notifications_reminder: För att få aviseringar från plattformen måste du först tillåta dem i webbläsarens inställningar.
+        push_notifications_unsupported_browser: Din webbläsare stöds inte.
         receive_notifications_about: Jag vill få notiser om
         update_notifications_settings: Spara ändringar
       update:
@@ -1526,13 +1525,6 @@ sv:
         log_in: logga in
         never_logged_in: har aldrig loggat in
         subject: Varning om inaktivt konto
-      removal_notification:
-        body: Ditt %{organization_name}-konto har tagits bort på grund av inaktivitet.
-        greetings_html: |
-          Vänliga hälsningar,<br>
-          %{organization_name}
-        hello: Hej %{username},
-        subject: Inaktivt konto raderat
     passwords:
       update:
         error: Det gick inte att uppdatera lösenordet.

data/config/locales/tr-TR.yml

@@ -202,10 +202,6 @@ tr:
       update_draft:
         error: Değişiklik taslağı güncellenirken bir hata oluştu.
         success: Değişiklik taslağı başarıyla güncellendi.
-      wizard_step_form:
-        steps:
-          '1': Değişikliğinizi oluşturun
-          '2': Değişikliğinizi yayınlayın
     anonymous_user: Anonim
     application:
       document:
@@ -305,7 +301,6 @@ tr:
           global:
             amendments_enabled: Değişiklikler etkinleştirildi
             comments_enabled: Yorumlar etkin
-            comments_max_length: Maksimum yorum uzunluğu
             dummy_global_attribute1: Sahet Özellik 1
             dummy_global_attribute2: Sahte Özellik 2
             dummy_global_translatable_text: Sahte Çevrilebilir Metin
@@ -633,7 +628,6 @@ tr:
           modal_title: Yeni görüşme
           no_results: Sonuç bulunamadı
         error_modal:
-          close: Pencereyi kapat
           correct_errors: Lütfen hataları düzeltip tekrar deneyin.
           intro: 'Mesajınızda aşağıdaki hatalar vardı:'
           ok: OK

data/config/locales/zh-CN.yml

@@ -176,9 +176,6 @@ zh-CN:
       update_draft:
         error: 更新修正草案时遇到问题。
         success: 修正草稿已成功更新。
-      wizard_step_form:
-        steps:
-          '1': 创建您的修改
     anonymous_user: 匿名的
     application:
       document:
@@ -266,7 +263,6 @@ zh-CN:
           global:
             amendments_enabled: 修改已启用
             comments_enabled: 评论已启用
-            comments_max_length: 评论最大长度
             dummy_global_attribute1: 虚拟属性 1
             dummy_global_attribute2: 虚拟属性 2
             dummy_global_translatable_text: 虚拟可翻译文本
@@ -546,7 +542,6 @@ zh-CN:
           modal_title: 新建对话
           no_results: 没有结果
         error_modal:
-          close: 关闭模式
           correct_errors: 请更正错误，然后重试。
           intro: '您的消息有以下错误：'
           ok: 好的

data/config/locales/zh-TW.yml

@@ -293,9 +293,6 @@ zh-TW:
         success: 修正案草稿成功更新。
       withdraw:
         success: 修正案已成功撤回.
-      wizard_step_form:
-        steps:
-          '1': 創建您的修正案
     anonymous_user: 匿名
     application:
       document:
@@ -409,7 +406,6 @@ zh-TW:
           global:
             amendments_enabled: 修改功能已啟用
             comments_enabled: 啟用評論功能
-            comments_max_length: 評論最大長度
             dummy_global_attribute1: 虛擬屬性 1
             dummy_global_attribute2: 虛擬屬性 2
             dummy_global_translatable_text: 虛擬可翻譯文字
@@ -819,7 +815,6 @@ zh-TW:
         create:
           error: 對話未開始。請稍後再試。
         error_modal:
-          close: 關閉視窗
           correct_errors: 請修正錯誤後再試一次。
           intro: '您的訊息有以下錯誤：'
           ok: 好的

data/config/routes.rb

@@ -54,6 +54,7 @@ Decidim::Core::Engine.routes.draw do
   end
 
   authenticate(:user) do
+    resources :private_downloads, only: :show
     devise_scope :user do
       get "change_password" => "devise/passwords"
       put "apply_password" => "devise/passwords"

data/lib/decidim/api/functions/user_entity_list.rb

@@ -11,6 +11,7 @@ module Decidim
     #
     class UserEntityList
       include NeedsApiFilterAndOrder
+      include NeedsApiDefaultOrder
 
       def initialize
         @model_class = Decidim::UserBaseEntity
@@ -24,6 +25,7 @@ module Decidim
                  .includes(avatar_attachment: :blob)
         add_filter_keys(args[:filter])
         add_order_keys(args[:order].to_h)
+        add_default_order
         @query
       end
     end

data/lib/decidim/attachment_attributes.rb

@@ -15,24 +15,39 @@ module Decidim
       #
       # name - The attribute's name
       #
-      #
       # Example:
       #
-      #   attachment_attribute :photos
+      #   attachments_attribute :photos
       #   # This will create two attributes of the following types:
       #   #   attribute :photos, Array[Integer]
       #   #   attribute :add_photos, Array
-      #   # In addition, it will generate the getter method for the attribute
-      #   # returning an array of the Decidim::Attachment records.
+      #   # In addition, it will generate:
+      #   #   - A setter that handles String (JSON/CSV), Integer, or Array inputs.
+      #   #   - A getter that falls back to add_photos when the attribute is blank.
+      #   #   - Private helpers for parsing and extracting IDs.
       #
       # Returns nothing.
-      def attachments_attribute(name)
+      def attachments_attribute(name) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         attribute name, Array[Integer]
         attribute :"add_#{name}", Array
 
-        # Define the getter method that fetches the attachment records based on
-        # their types. For Strings and Integers, assumes they are IDs and will
-        # fetch the attachment record matching that ID.
+        # Setter: coerces String (JSON or comma-separated IDs) and bare Integer
+        # values into the expected Array[Integer] format before delegating to super.
+        define_method :"#{name}=" do |value|
+          case value
+          when String
+            parsed = send(:"parse_string_#{name}", value)
+            parsed.any? ? super(parsed) : super(value)
+          when Integer
+            super([value])
+          else
+            super(value)
+          end
+        end
+
+        # Getter: resolves stored integer IDs to Decidim::Attachment records,
+        # caching the result on the instance. Falls back to extracting IDs from
+        # add_<name> when the attribute itself is blank, then resolves those too.
         variable_name = "@#{name}_records"
         define_method name do
           return instance_variable_get(variable_name) if instance_variable_defined?(variable_name)
@@ -40,9 +55,15 @@ module Decidim
           original = @attributes[name.to_s].value_before_type_cast
           return original if original && !original.is_a?(Array)
 
+          ids = if super().blank? && send(:"add_#{name}").present?
+                  send(:"extract_ids_from_add_#{name}")
+                else
+                  super()
+                end
+
           instance_variable_set(
             variable_name,
-            super().map do |attachment|
+            ids.map do |attachment|
               if attachment.is_a?(Integer)
                 Decidim::Attachment.find_by(id: attachment)
               else
@@ -51,6 +72,34 @@ module Decidim
             end.compact
           )
         end
+
+        # Private helpers -------------------------------------------------------
+
+        define_method :"extract_ids_from_add_#{name}" do
+          send(:"add_#{name}")
+            .select { |item| item.is_a?(Hash) && (item[:id].present? || item["id"].present?) }
+            .map { |item| (item[:id] || item["id"]).to_i }
+        end
+
+        define_method :"parse_string_#{name}" do |value|
+          return [] if value.blank?
+
+          send(:"parse_#{name}_ids", value)
+        end
+
+        define_method :"parse_#{name}_ids" do |value|
+          ids = begin
+            Array(JSON.parse(value))
+          rescue JSON::ParserError
+            value.split(",").map(&:strip)
+          end
+
+          ids.map(&:to_i).reject(&:zero?)
+        end
+
+        private :"extract_ids_from_add_#{name}"
+        private :"parse_string_#{name}"
+        private :"parse_#{name}_ids"
       end
     end
   end

data/lib/decidim/command.rb

@@ -53,7 +53,7 @@ module Decidim
     protected
 
     def event_arguments
-      raise "#{self.class} must implement #event_arguments"
+      raise "#{self.class} must implement #event_arguments (passed to #{event_namespace})"
     end
 
     def event_namespace

data/lib/decidim/content_renderers/base_renderer.rb

@@ -12,6 +12,16 @@ module Decidim
     class BaseRenderer
       include Decidim::ContentProcessor::Common
 
+      ReplacementContext = Struct.new(:placement, :node_name, :attribute_name, :ancestor_names, keyword_init: true) do
+        def text?
+          placement == :text
+        end
+
+        def attribute?
+          placement == :attribute
+        end
+      end
+
       # @return [String] the content to be formatted
       attr_reader :content
 
@@ -34,6 +44,108 @@ module Decidim
       def render(_options = nil)
         content
       end
+
+      protected
+
+      def replace_pattern_by_context(text, pattern, skip_ancestor_tags: %w(code pre script style), on_missing: "")
+        return text unless text.respond_to?(:gsub)
+
+        skip_ancestor_tags = Array(skip_ancestor_tags).map(&:to_s)
+
+        has_match = pattern.is_a?(String) ? text.include?(pattern) : pattern.match?(text)
+        return text unless has_match
+
+        fragment = html_fragment(text)
+        attr_modified = replace_pattern_in_attributes(fragment, pattern, skip_ancestor_tags:, on_missing:) do |match, context|
+          yield(match, context)
+        end
+        text_modified = replace_pattern_in_text_nodes(fragment, pattern, skip_ancestor_tags:, on_missing:) do |match, context|
+          yield(match, context)
+        end
+
+        return text unless attr_modified || text_modified
+
+        fragment.to_s
+      end
+
+      private
+
+      def replace_pattern_in_attributes(fragment, pattern, skip_ancestor_tags:, on_missing:)
+        modified = false
+        fragment.xpath(".//*").each do |node|
+          next if skip_replacement_for_node?(node, skip_ancestor_tags)
+
+          node.attribute_nodes.each do |attribute|
+            replaced_value = attribute.value.gsub(pattern) do |match|
+              replace_match(match, replacement_context(node, placement: :attribute, attribute_name: attribute.name), on_missing:) do |resolved_match, context|
+                yield(resolved_match, context)
+              end
+            end
+            unless replaced_value == attribute.value
+              attribute.value = replaced_value
+              modified = true
+            end
+          end
+        end
+        modified
+      end
+
+      def replace_pattern_in_text_nodes(fragment, pattern, skip_ancestor_tags:, on_missing:)
+        modified = false
+        fragment.xpath(".//text()").each do |node|
+          parent = node.parent
+          next if skip_replacement_for_node?(parent, skip_ancestor_tags)
+
+          original_text = node.text
+          has_node_match = pattern.is_a?(String) ? original_text.include?(pattern) : pattern.match?(original_text)
+          next unless has_node_match
+
+          doc = node.document
+          context = replacement_context(parent, placement: :text)
+          last_pos = 0
+
+          original_text.scan(pattern) do
+            m = Regexp.last_match
+            node.add_previous_sibling(Nokogiri::XML::Text.new(original_text[last_pos...m.begin(0)], doc)) if m.begin(0) > last_pos
+
+            replacement = replace_match(m[0], context, on_missing:) do |resolved_match, ctx|
+              yield(resolved_match, ctx)
+            end
+
+            Loofah.fragment(replacement.to_s).children.to_a.each do |child|
+              node.add_previous_sibling(child)
+            end
+
+            last_pos = m.end(0)
+          end
+
+          node.add_previous_sibling(Nokogiri::XML::Text.new(original_text[last_pos..], doc)) if last_pos < original_text.length
+          node.remove
+          modified = true
+        end
+        modified
+      end
+
+      def replace_match(match, context, on_missing:)
+        yield(match, context)
+      rescue ActiveRecord::RecordNotFound
+        on_missing.respond_to?(:call) ? on_missing.call(match, context) : on_missing
+      end
+
+      def replacement_context(node, placement:, attribute_name: nil)
+        ReplacementContext.new(
+          placement:,
+          node_name: node&.name,
+          attribute_name:,
+          ancestor_names: node ? node.ancestors.map(&:name) : []
+        )
+      end
+
+      def skip_replacement_for_node?(node, skip_ancestor_tags)
+        return false unless node
+
+        ([node.name] + node.ancestors.map(&:name)).any? { |name| skip_ancestor_tags.include?(name) }
+      end
     end
   end
 end

data/lib/decidim/content_renderers/blob_renderer.rb

@@ -33,11 +33,10 @@ module Decidim
       protected
 
       def replace_pattern(text, pattern)
-        return text unless text.respond_to?(:gsub)
-
-        text.gsub(pattern) do
-          blob_gid = Regexp.last_match(1)
-          variation_key = Regexp.last_match(3)
+        replace_pattern_by_context(text, pattern) do |match, _context|
+          match_data = match.match(GLOBAL_ID_REGEX)
+          blob_gid = match_data[1]
+          variation_key = match_data[3]
 
           blob = GlobalID::Locator.locate(blob_gid)
           if variation_key
@@ -50,8 +49,6 @@ module Decidim
           else
             blob_url(blob)
           end
-        rescue ActiveRecord::RecordNotFound => _e
-          ""
         end
       end
 

data/lib/decidim/content_renderers/mention_resource_renderer.rb

@@ -27,17 +27,15 @@ module Decidim
       protected
 
       def replace_pattern(text, pattern, editor:)
-        return text unless text.respond_to?(:gsub)
-
-        text.gsub(pattern) do |resource_gid|
+        replace_pattern_by_context(text, pattern) do |resource_gid, context|
           resource = GlobalID::Locator.locate(resource_gid)
-          if editor
+          if context.attribute?
+            render_resource_url(resource, editor:)
+          elsif editor
             render_editor(resource_gid, resource)
           else
             render_resource_link(resource)
           end
-        rescue ActiveRecord::RecordNotFound => _e
-          ""
         end
       end
 
@@ -50,6 +48,12 @@ module Decidim
         link_to mention_title(resource), resource_path(resource)
       end
 
+      def render_resource_url(resource, editor:)
+        return resource_path(resource) if editor
+
+        Decidim::ResourceLocatorPresenter.new(resource).url
+      end
+
       def mention_title(resource)
         title = presenter_for(resource).title
 

data/lib/decidim/content_renderers/resource_renderer.rb

@@ -11,17 +11,26 @@ module Decidim
       #
       # @return [String] the content ready to display (contains HTML)
       def render(_options = nil)
-        return content unless content.respond_to?(:gsub)
-
-        content.gsub(regex) do |resource_gid|
+        replace_pattern_by_context(content, regex, on_missing: proc { |match, _| "~#{match.split("/").last}" }) do |resource_gid, context|
           resource = GlobalID::Locator.locate(resource_gid)
-          resource.presenter.display_mention
-        rescue ActiveRecord::RecordNotFound
-          resource_id = resource_gid.split("/").last
-          "~#{resource_id}"
+
+          if context.attribute?
+            resource_attribute_value(resource)
+          else
+            resource.presenter.display_mention
+          end
         end
       end
 
+      protected
+
+      def resource_attribute_value(resource)
+        presenter = resource.presenter
+        return presenter.profile_path if presenter.respond_to?(:profile_path)
+
+        Decidim::ResourceLocatorPresenter.new(resource).path
+      end
+
       def regex
         raise "Not implemented"
       end

data/lib/decidim/content_renderers/user_renderer.rb

@@ -24,17 +24,15 @@ module Decidim
       protected
 
       def replace_pattern(text, pattern, editor:)
-        return text unless text.respond_to?(:gsub)
-
-        text.gsub(pattern) do |mentionable_gid|
-          mentionable = GlobalID::Locator.locate(mentionable_gid)
-          if editor
-            render_editor(mentionable)
+        replace_pattern_by_context(text, pattern) do |user_gid, context|
+          user = GlobalID::Locator.locate(user_gid)
+          if context.attribute?
+            render_profile_path(user)
+          elsif editor
+            render_editor(user)
           else
-            render_text(mentionable)
+            render_text(user)
           end
-        rescue ActiveRecord::RecordNotFound => _e
-          ""
         end
       end
 
@@ -55,6 +53,10 @@ module Decidim
           presenter_for(user).display_mention
         end
       end
+
+      def render_profile_path(user)
+        presenter_for(user).profile_path
+      end
     end
   end
 end

data/lib/decidim/core/content_blocks/registry_manager.rb

@@ -51,11 +51,11 @@ module Decidim
             ]
 
             content_block.settings do |settings|
-              settings.attribute :title, type: :text, translated: true
+              settings.attribute :title, type: :text, translated: true, required: true
               settings.attribute :short_description, type: :text, translated: true
-              settings.attribute :action_button_title, type: :text, translated: true
-              settings.attribute :action_button_subtitle, type: :text, translated: true
-              settings.attribute :action_button_url, type: :text
+              settings.attribute :action_button_title, type: :text, translated: true, required: true
+              settings.attribute :action_button_subtitle, type: :text, translated: true, required: true
+              settings.attribute :action_button_url, type: :text, required: true
             end
 
             content_block.default!

data/lib/decidim/core/engine.rb

@@ -495,6 +495,14 @@ module Decidim
         end
       end
 
+      initializer "decidim_core.delete_account" do
+        config.to_prepare do
+          ActiveSupport::Notifications.subscribe("decidim.destroy_account:after") do |_event_name, data|
+            Decidim::DeleteUserMailer.delete(user_email: data[:user_email], user_name: data[:user_name], locale: data[:locale], organization: data[:organization]).deliver_later
+          end
+        end
+      end
+
       initializer "decidim_core.add_cells_view_paths" do
         Cell::ViewModel.view_paths << Rails.root.join("app/views") # for partials
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Core::Engine.root}/app/cells")

data/lib/decidim/core/test/factories.rb

@@ -85,6 +85,8 @@ FactoryBot.define do
     "#{Faker::Lorem.sentence(word_count: 1, supplemental: true, random_words_to_add: 3)} #{n}"
   end
 
+  sequence(:component_position)
+
   factory :category, class: "Decidim::Category" do
     transient do
       skip_injection { false }
@@ -463,6 +465,7 @@ FactoryBot.define do
     manifest_name { "dummy" }
     published_at { Time.current }
     deleted_at { nil }
+    weight { generate(:component_position) }
     settings do
       {
         dummy_global_translatable_text: generate_localized_title(:dummy_global_translatable_text, skip_injection:),

data/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb

@@ -87,7 +87,7 @@ end
 
 shared_examples "admin creates resource gallery" do
   context "when uploading images" do
-    let(:uploaded_photos) do
+    let(:uploaded_attachments) do
       [
         {
           title: "Picture of the city",
@@ -99,10 +99,10 @@ shared_examples "admin creates resource gallery" do
         }
       ]
     end
-    let(:photos) { [] }
+    let(:current_attachments) { [] }
 
     it "creates a gallery for the resource" do
-      expect { command.call }.to change(Decidim::Attachment, :count).by(uploaded_photos.count)
+      expect { command.call }.to change(Decidim::Attachment, :count).by(uploaded_attachments.count)
 
       resource = resource_class.last
       expect(resource.photos.count).to eq(2)
@@ -111,7 +111,7 @@ shared_examples "admin creates resource gallery" do
     end
 
     context "when gallery is left blank" do
-      let(:uploaded_photos) { [] }
+      let(:uploaded_attachments) { [] }
 
       it "broadcasts ok" do
         expect { command.call }.to broadcast(:ok)
@@ -122,7 +122,7 @@ end
 
 shared_examples "admin manages resource gallery" do
   context "when managing images" do
-    let(:uploaded_photos) do
+    let(:uploaded_attachments) do
       [
         {
           title: "Picture of the city",
@@ -134,10 +134,10 @@ shared_examples "admin manages resource gallery" do
         }
       ]
     end
-    let(:photos) { [] }
+    let(:current_attachments) { [] }
 
     it "creates a gallery for the resource" do
-      expect { command.call }.to change(Decidim::Attachment, :count).by(uploaded_photos.count)
+      expect { command.call }.to change(Decidim::Attachment, :count).by(uploaded_attachments.count)
       resource = resource_class.last
       expect(resource.photos.count).to eq(2)
       last_attachment = Decidim::Attachment.last
@@ -145,7 +145,7 @@ shared_examples "admin manages resource gallery" do
     end
 
     context "when gallery is left blank" do
-      let(:uploaded_photos) { [] }
+      let(:uploaded_attachments) { [] }
 
       it "broadcasts ok" do
         expect { command.call }.to broadcast(:ok)
@@ -155,8 +155,8 @@ shared_examples "admin manages resource gallery" do
     context "when images are removed" do
       let!(:image1) { create(:attachment, :with_image, attached_to: resource) }
       let!(:image2) { create(:attachment, :with_image, attached_to: resource) }
-      let(:uploaded_photos) { [] }
-      let(:current_photos) { [image1] }
+      let(:uploaded_attachments) { [] }
+      let(:current_attachments) { [image1.id] }
 
       it "to decrease the number of photos in the gallery" do
         expect(resource.attachments.count).to eq(2)

data/lib/decidim/core/test/shared_examples/comments_examples.rb

@@ -1000,16 +1000,16 @@ shared_examples "comments" do
         let(:content) { "A valid user mention: @#{mentioned_user.nickname}" }
 
         context "when text finish with a mention" do
-          it "shows the tribute container" do
-            expect(page).to have_css(".tribute-container", text: mentioned_user.name, wait: 10)
+          it "shows the suggestions menu" do
+            expect(page).to have_css(".editor-suggestions-item", text: "@#{mentioned_user.nickname} (#{mentioned_user.name})", wait: 10)
           end
         end
 
         context "when text contains a mention" do
           let(:content) { "A valid user mention: @#{mentioned_user.nickname}." }
 
-          it "shows the tribute container" do
-            expect(page).to have_no_css(".tribute-container", text: mentioned_user.name)
+          it "hides the suggestions menu" do
+            expect(page).to have_no_css(".editor-suggestions-item", text: "@#{mentioned_user.nickname} (#{mentioned_user.name})")
           end
         end
       end
@@ -1018,8 +1018,8 @@ shared_examples "comments" do
         let!(:mentioned_user) { create(:user, organization:) }
         let(:content) { "A unconfirmed user mention: @#{mentioned_user.nickname}" }
 
-        it "do not show the tribute container" do
-          expect(page).to have_no_css(".tribute-container", text: mentioned_user.name)
+        it "does not show the suggestions menu" do
+          expect(page).to have_no_css(".editor-suggestions-item", text: "@#{mentioned_user.nickname} (#{mentioned_user.name})")
         end
       end
     end