decidim-core 0.30.0.rc3 → 0.30.0

data/lib/decidim/content_parsers/blob_parser.rb

@@ -20,19 +20,19 @@ module Decidim
       # https://github.com/rails/rails/blob/a7e379896552ce43b822385c03c37f2bd47739d3/activestorage/config/routes.rb#L5-L14
       BLOB_REGEX = %r{
         # Group 1: Host part
-        (
+        (?<host_part>
           # Group 2: Domain and subpath part
-          https?://((?!/rails).)+
+          #{URI::DEFAULT_PARSER.make_regexp(%w(https http))}
         )?
         /rails/active_storage
         # Group 3: Blob path, representation path or disk service path
-        /(blobs/redirect|blobs/proxy|blobs|representations/redirect|representations/proxy|representations|disk)
+        /(?<type_part>blobs/redirect|blobs/proxy|blobs|representations/redirect|representations/proxy|representations|disk)
         # Group 4: Signed ID for blobs or encoded key for disk service
-        /([^/]+)
+        /(?<key_part>[^/]+)
         # Group 5: Variation part (only for representations)
         (
           # Group 6: Variation key for representations
-          /([\w.=-]+)
+          /(?<variation_part>[\w.=-]+)
         )?
         # Group 7: Filename
         /([\w.=-]+)
@@ -46,8 +46,10 @@ module Decidim
 
       def replace_blobs(text)
         text.gsub(BLOB_REGEX) do |match|
-          type_part = Regexp.last_match(3)
-          key_part = Regexp.last_match(4)
+          named_captures = Regexp.last_match.named_captures
+
+          type_part = named_captures["type_part"]
+          key_part = named_captures["key_part"]
 
           variation_key = nil
           blob =
@@ -59,7 +61,7 @@ module Decidim
               # Representation or blob
               if type_part.start_with?("representations")
                 # Representation
-                variation_part = Regexp.last_match(6)
+                variation_part = named_captures["variation_part"]
                 variation_key = generate_variation_key(variation_part)
               end
 

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

@@ -33,13 +33,6 @@ shared_examples "higher user role hides" do
     before do
       login_as user, scope: :user
     end
-    around do |example|
-      previous = Capybara.raise_server_errors
-
-      Capybara.raise_server_errors = false
-      example.run
-      Capybara.raise_server_errors = previous
-    end
 
     it "reports the resource" do
       visit reportable_path
@@ -54,6 +47,10 @@ shared_examples "higher user role hides" do
         click_on "Hide"
       end
 
+      sleep(1)
+
+      expect(page).to have_current_path(reportable_index_path, ignore_query: true)
+
       expect(reportable.reload).to be_hidden
     end
   end
@@ -67,14 +64,6 @@ shared_examples "higher user role hides resource with comments" do
       login_as user, scope: :user
       Decidim::Ai::SpamDetection.create_reporting_user!
     end
-    around do |example|
-      previous = Capybara.raise_server_errors
-
-      # Disabling server errors to that we can test page not found error.
-      Capybara.raise_server_errors = false
-      example.run
-      Capybara.raise_server_errors = previous
-    end
 
     it "hides the resource" do
       visit decidim.search_path
@@ -96,6 +85,10 @@ shared_examples "higher user role hides resource with comments" do
         click_on "Hide"
       end
 
+      sleep(1)
+
+      expect(page).to have_current_path(reportable_index_path, ignore_query: true)
+
       perform_enqueued_jobs
 
       expect(reportable.reload).to be_hidden

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

@@ -8,6 +8,7 @@ shared_examples "an uncommentable component" do
            manifest:,
            participatory_space:)
   end
+  let!(:comment) { create(:comment, commentable: resources.first) }
 
   it "does not displays comments count" do
     component.update!(settings: { comments_enabled: false })
@@ -18,4 +19,29 @@ shared_examples "an uncommentable component" do
       expect(page).to have_no_link(resource_locator(resource).path)
     end
   end
+
+  describe "when search a comment in the global search" do
+    it "does displays the comments" do
+      visit decidim.root_path
+
+      within ".main-bar__search" do
+        fill_in "term", with: comment.body["en"]
+        find("input#input-search").native.send_keys :enter
+      end
+
+      expect(page).to have_content("1 Results for the search")
+    end
+
+    it "does not displays the comment when comments are disable" do
+      component.update!(settings: { comments_enabled: false })
+      visit decidim.root_path
+
+      within ".main-bar__search" do
+        fill_in "term", with: comment.body["en"]
+        find("input#input-search").native.send_keys :enter
+      end
+
+      expect(page).to have_content("0 Results for the search")
+    end
+  end
 end

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

@@ -2,6 +2,32 @@
 
 require "spec_helper"
 
+shared_examples "a version of a hidden object" do
+  before do
+    visit resource_path
+    click_on "see other versions"
+    click_on("Version 1 of #{hidden_object.reload.versions.size}")
+  end
+
+  around do |example|
+    previous = Capybara.raise_server_errors
+
+    Capybara.raise_server_errors = false
+    example.run
+    Capybara.raise_server_errors = previous
+  end
+
+  it "shows an error page" do
+    expect(page).to have_content("Changes at")
+
+    create(:moderation, reportable: hidden_object, hidden_at: 1.day.ago)
+
+    visit current_path
+
+    expect(page).to have_content(ActiveRecord::RecordNotFound)
+  end
+end
+
 shared_examples "versions controller" do
   let(:base_params) do
     if resource.is_a?(Decidim::Participable)

data/lib/decidim/core/version.rb

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

data/lib/decidim/moderation_tools.rb

@@ -60,15 +60,21 @@ module Decidim
     def send_notification_to_author
       return if affected_users.blank?
 
-      data = {
-        event: "decidim.events.reports.resource_hidden",
-        event_class: Decidim::ResourceHiddenEvent,
+      data = if @reportable.moderation.reports.last&.reason == "parent_hidden"
+               { event: "decidim.events.reports.parent_hidden", event_class: Decidim::ParentHiddenEvent }
+             else
+               { event: "decidim.events.reports.resource_hidden", event_class: Decidim::ResourceHiddenEvent }
+             end
+
+      data.merge!(
         resource: @reportable,
         extra: {
-          report_reasons:
+          report_reasons:,
+          force_email: true
         },
-        affected_users:
-      }
+        affected_users:,
+        force_send: true
+      )
 
       Decidim::EventsManager.publish(**data)
     end
@@ -95,7 +101,7 @@ module Decidim
 
       if @reportable.is_a?(Decidim::Comments::Commentable)
         @reportable.comment_threads.each do |comment|
-          Decidim::HideChildResourcesJob.perform_later(comment, @current_user.id)
+          Decidim::HideChildResourcesJob.perform_later(comment, current_user.id)
         end
       end
 
@@ -109,7 +115,7 @@ module Decidim
     end
 
     def report_reasons
-      @reportable.moderation.reports.pluck(:reason).uniq
+      [@reportable.moderation.reports.last&.reason]
     end
   end
 end

data/lib/decidim/participatory_space_user.rb

@@ -37,9 +37,7 @@ module Decidim
         raise "Not implemented"
       end
 
-      def self.ransackable_attributes(auth_object = nil)
-        return [] unless auth_object&.admin?
-
+      def self.ransackable_attributes(_auth_object = nil)
         %w(name nickname email invitation_accepted_at last_sign_in_at role)
       end
 

data/lib/decidim/reportable.rb

@@ -53,8 +53,12 @@ module Decidim
       # Public: The reported content url
       #
       # Returns String
-      def reported_content_url
-        raise NotImplementedError
+      def reported_content_url(options = {})
+        if hidden?
+          ResourceLocatorPresenter.new(self).index(options)
+        else
+          ResourceLocatorPresenter.new(self).url(options)
+        end
       end
 
       # Public: The collection of attribute names that are considered

data/lib/decidim/translatable_attributes.rb

@@ -62,7 +62,7 @@ module Decidim
             final = super(value)
             return unless final # Do not set the `nil` values for the parent hash
 
-            final = value_type.serialize(final) if value_type
+            final = value_type.serialize(final) if value_type && !attachment?(final)
 
             public_send("#{name}=", field.merge(locale => final))
           end
@@ -127,5 +127,9 @@ module Decidim
       locale.to_s == try(:default_locale).to_s ||
         locale.to_s == try(:current_organization).try(:default_locale).to_s
     end
+
+    def attachment?(value)
+      value.is_a?(String) && value.include?(ActiveStorage.routes_prefix)
+    end
   end
 end

data/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake

@@ -7,7 +7,7 @@ namespace :decidim do
       logger.info("Fixing user nicknames case...")
 
       has_changed = []
-      Decidim::User.not_deleted.find_each do |user|
+      Decidim::UserBaseEntity.not_deleted.find_each do |user|
         user.nickname.downcase!
 
         begin
@@ -15,11 +15,11 @@ namespace :decidim do
             user.save!
             has_changed << user.id
           end
-        rescue ActiveRecord::RecordInvalid
+        rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
           update_user_nickname(user, Decidim::UserBaseEntity.nicknamize(user.nickname, organization: user.organization))
           has_changed << user.id
         rescue ActiveRecord::RecordInvalid # rubocop:disable Lint/DuplicateRescueException
-          logger.warn("User ID (#{similar_user.id}) : #{e}")
+          logger.warn("User ID (#{user.id}) : #{e}")
         end
       end
       logger.info("Process terminated, #{has_changed.count} users nickname have been updated.")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.30.0.rc3
+  version: 0.30.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-19 00:00:00.000000000 Z
+date: 2025-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -780,28 +780,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc3
+        version: 0.30.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc3
+        version: 0.30.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc3
+        version: 0.30.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc3
+        version: 0.30.0
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -2199,6 +2199,7 @@ files:
 - config/locales/bg.yml
 - config/locales/bn-BD.yml
 - config/locales/bs-BA.yml
+- config/locales/ca-IT.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
@@ -3079,7 +3080,6 @@ files:
 - lib/tasks/decidim_taxonomies.rake
 - lib/tasks/decidim_webpacker_tasks.rake
 - lib/tasks/upgrade/clean.rake
-- lib/tasks/upgrade/clean_hidden_resources.rake
 - lib/tasks/upgrade/decidim_active_storage_migration_tasks.rake
 - lib/tasks/upgrade/decidim_attachments.rake
 - lib/tasks/upgrade/decidim_content_blocks_tasks.rake

data/lib/tasks/upgrade/clean_hidden_resources.rake

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-namespace :decidim do
-  namespace :upgrade do
-    namespace :clean do
-      desc "Removes all related resources from hidden resource"
-      task hidden_resources: :environment do
-        logger.info("Removing child resources for hidden parents...")
-        Decidim::Moderation.hidden.find_each do |moderation_for_hidden_resource|
-          reportable = moderation_for_hidden_resource.reportable
-
-          current_user = if Decidim.module_installed?(:ai)
-                           reportable.organization.users.find_by!(email: Decidim::Ai::SpamDetection.reporting_user_email)
-                         else
-                           reportable.organization.admins.first
-                         end
-
-          tool = Decidim::ModerationTools.new(reportable, current_user)
-          tool.hide!
-        rescue NameError => e
-          log_error "Could not hide child resources for reportable id #{moderation_for_hidden_resource.id} because: #{e.message}"
-        end
-      end
-
-      private
-
-      def log_error(msg)
-        puts msg
-        Rails.logger.error(msg)
-      end
-    end
-  end
-end