decidim-core 0.32.0.rc2 → 0.32.0

data/lib/decidim/command.rb

@@ -54,7 +54,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) 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

@@ -45,11 +45,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

@@ -463,6 +463,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 }
@@ -469,6 +471,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/amendable/amendment_event_examples.rb

@@ -8,7 +8,7 @@ shared_examples "amendment event" do
   it_behaves_like "a simple event email"
   it_behaves_like "a simple event notification"
 
-  let(:emendation_author_nickname) { "@#{emendation.creator_author.nickname}" }
+  let(:emendation_author_name) { emendation.creator_author.name }
   let(:emendation_path) { Decidim::ResourceLocatorPresenter.new(emendation).path }
   let(:emendation_author_path) { Decidim::UserPresenter.new(emendation.creator_author).profile_path }
   let(:amendable_path) { Decidim::ResourceLocatorPresenter.new(amendable).path }
@@ -16,5 +16,5 @@ shared_examples "amendment event" do
   let(:email_intro) { "An amendment has been #{amendment_type} for #{amendable_title}. You can see it from this page:" }
   let(:email_outro) { "You have received this notification because you are following #{amendable_title}. You can stop receiving notifications following the previous link." }
 
-  let(:notification_title) { "The <a href=\"#{emendation_path}\">amendment</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a> has been #{amendment_type} for <a href=\"#{amendable_path}\">#{amendable_title}</a>." } # rubocop:disable Layout/LineLength
+  let(:notification_title) { "The <a href=\"#{emendation_path}\">amendment</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_name}</a> has been #{amendment_type} for <a href=\"#{amendable_path}\">#{amendable_title}</a>." } # rubocop:disable Layout/LineLength
 end

data/lib/decidim/core/test/shared_examples/amendable/amendment_promoted_event_examples.rb

@@ -10,15 +10,15 @@ shared_examples "amendment promoted event" do
   it_behaves_like "a simple event email"
   it_behaves_like "a simple event notification"
 
-  let(:emendation_author_nickname) { "@#{emendation.creator_author.nickname}" }
+  let(:emendation_author_name) { emendation.creator_author.name }
   let(:emendation_path) { Decidim::ResourceLocatorPresenter.new(emendation).path }
   let(:emendation_author_path) { Decidim::UserPresenter.new(emendation.creator_author).profile_path }
   let(:amendable_path) { Decidim::ResourceLocatorPresenter.new(amendable).path }
 
-  let(:email_subject) { "An amendment from #{emendation_author_nickname} has been published as a new proposal" }
+  let(:email_subject) { "An amendment from #{emendation_author_name} has been published as a new proposal" }
   let(:email_intro) { "A rejected amendment for #{amendable_title} has been published as a new #{amendable_type}. You can see it from this page:" }
   let(:email_outro) { "You have received this notification because you are following #{amendable_title}. You can stop receiving notifications following the previous link." }
   # rubocop:disable Layout/LineLength
-  let(:notification_title) { "A <a href=\"#{emendation_path}\">rejected amendment</a> for <a href=\"#{amendable_path}\">#{amendable_title}</a> has been published as a new #{amendable_type} by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a>." }
+  let(:notification_title) { "A <a href=\"#{emendation_path}\">rejected amendment</a> for <a href=\"#{amendable_path}\">#{amendable_title}</a> has been published as a new #{amendable_type} by <a href=\"#{emendation_author_path}\">#{emendation_author_name}</a>." }
   # rubocop:enable Layout/LineLength
 end

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

@@ -990,16 +990,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
@@ -1008,8 +1008,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

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

@@ -8,7 +8,8 @@ shared_examples_for "has space in m-cell" do
     let(:show_space) { true }
 
     it "renders the space where the model belongs to" do
-      expect(cell_html).to have_content(decidim_escape_translated(model.component.participatory_space.title))
+      expect(cell_html).to have_content(translated_attribute(model.component.participatory_space.title))
+      expect(cell_html.to_s).to include(decidim_escape_translated(model.component.participatory_space.title).gsub(""", "\""))
     end
   end
 end

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

@@ -30,7 +30,7 @@ shared_examples_for "resource liked event" do
 
   describe "email_subject" do
     it "is generated correctly" do
-      expect(subject.email_subject).to eq("#{author_presenter.nickname} has performed a new like")
+      expect(subject.email_subject).to eq("#{author_presenter.name} has performed a new like")
     end
   end
 
@@ -38,7 +38,7 @@ shared_examples_for "resource liked event" do
     let(:resource_title) { decidim_sanitize_translated(resource.title) }
     it "is generated correctly" do
       expect(subject.email_intro)
-        .to eq("#{author.name} #{author_presenter.nickname}, who you are following, " \
+        .to eq("#{author.name}, who you are following, " \
                "has just liked \"#{resource_title}\" and we think it may be interesting to you. Check it out and contribute:")
     end
   end
@@ -51,7 +51,7 @@ shared_examples_for "resource liked event" do
         .to include("The <a href=\"#{resource_path}\">#{resource_title}</a> #{resource_type} has been liked by ")
 
       expect(subject.notification_title)
-        .to include("<a href=\"/en/profiles/#{author.nickname}\">#{author.name} #{author_presenter.nickname}</a>.")
+        .to include("<a href=\"/en/profiles/#{author.nickname}\">#{author.name}</a>.")
     end
   end
 

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.32.0.rc2"
+      "0.32.0"
     end
   end
 end

data/lib/decidim/map/autocomplete.rb

@@ -37,19 +37,20 @@ module Decidim
           template.snippets.add(:decidim_geocoding_scripts, template.append_javascript_pack_tag("decidim_geocoding"))
           template.snippets.add(:decidim_geocoding_styles, template.append_stylesheet_pack_tag("decidim_geocoding"))
 
-          template.content_tag(:div, class: "geocoding-container") do
+          template.content_tag(:div, class: "geocoding") do
             template.text_field(
               object_name,
               method,
               options.merge("data-decidim-geocoding" => view_options.to_json)
             ) +
-              template.content_tag(:div, class: "input-group-button user-device-location") do
-                template.content_tag(:button, class: "button button__sm md:button__sm button__text-secondary", type: "button", data: {
+              template.content_tag(:div, class: "input-group-button geocoding__locate") do
+                template.content_tag(:button, class: "button button__sm md:button__sm button__text-secondary geocoding__button", type: "button", data: {
                                        input: "#{object_name}_#{method}",
                                        latitude: "#{object_name}_latitude",
                                        longitude: "#{object_name}_longitude",
                                        error_no_location: I18n.t("errors.no_device_location", scope: "decidim.proposals.forms"),
                                        error_unsupported: I18n.t("errors.device_not_supported", scope: "decidim.proposals.forms"),
+                                       locating_text: I18n.t("locating", scope: "decidim.proposals.forms"),
                                        url: Decidim::Core::Engine.routes.url_helpers.locate_path
                                      }) do
                   icon("map-pin-line", role: "img", "aria-hidden": true) + " #{I18n.t("use_my_location", scope: "decidim.proposals.forms")}"

data/lib/decidim/searchable.rb

@@ -117,6 +117,11 @@ module Decidim
             searchables_in_org.find_each do |sr|
               next if sr.blank?
 
+              unless sr.locale.in?(org.available_locales)
+                sr.destroy
+                next
+              end
+
               sr.update(contents_to_searchable_resource_attributes(fields, sr.locale))
             end
           end

data/lib/decidim/view_model.rb

@@ -83,7 +83,7 @@ module Decidim
     end
 
     def perform_caching?
-      cache_hash.present?
+      super && cache_hash.present?
     end
 
     def cache_hash

data/lib/tasks/decidim_mailers_tasks.rake

@@ -4,20 +4,42 @@ namespace :decidim do
   namespace :mailers do
     desc "Sends the notification digest email with the daily report"
     task notifications_digest_daily: :environment do
-      notifications_digest(:daily)
+      time = Time.now.utc
+      target_users = Decidim::User.where(notifications_sending_frequency: :daily)
+
+      target_users.find_in_batches do |batch|
+        notification_users =
+          Decidim::Notification
+          .daily(time)
+          .where(decidim_user_id: batch.pluck(:id))
+          .select(:decidim_user_id)
+          .distinct
+          .pluck(:decidim_user_id)
+
+        notification_users.each do |user_id|
+          Decidim::EmailNotificationsDigestGeneratorJob.perform_later(user_id, :daily, time:)
+        end
+      end
     end
 
     desc "Sends the notification digest email with the weekly report"
     task notifications_digest_weekly: :environment do
-      notifications_digest(:weekly)
-    end
-  end
+      time = Time.now.utc
+      target_users = Decidim::User.where(notifications_sending_frequency: :weekly)
+
+      target_users.find_in_batches do |batch|
+        notification_users =
+          Decidim::Notification
+          .weekly(time)
+          .where(decidim_user_id: batch.pluck(:id))
+          .select(:decidim_user_id)
+          .distinct
+          .pluck(:decidim_user_id)
 
-  def notifications_digest(frequency)
-    target_users = Decidim::User.where(notifications_sending_frequency: frequency)
-    time = Time.now.utc
-    target_users.find_each do |user|
-      Decidim::EmailNotificationsDigestGeneratorJob.perform_later(user.id, frequency, time:)
+        notification_users.each do |user_id|
+          Decidim::EmailNotificationsDigestGeneratorJob.perform_later(user_id, :weekly, time:)
+        end
+      end
     end
   end
 end