decidim-core 0.30.0.rc2 → 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/content_parsers/user_parser.rb

@@ -49,7 +49,7 @@ module Decidim
 
       def existing_mentionables
         @existing_mentionables ||= mentionable_class.where(
-          "decidim_organization_id = ? AND LOWER(nickname) IN (?)",
+          "decidim_organization_id = ? AND nickname IN (?)",
           current_organization.id,
           content_nicknames
         )

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.rc2"
+      "0.30.0"
     end
   end
 end

data/lib/decidim/map/provider/static_map/here.rb

@@ -6,8 +6,42 @@ module Decidim
       module StaticMap
         # The static map utility class for the HERE maps service
         class Here < ::Decidim::Map::StaticMap
+          def url(latitude:, longitude:, options: {})
+            map_url = configuration.fetch(:url, nil)
+            return super unless map_url
+
+            return super unless map_url.include?("mia/v3")
+
+            w = options[:width] || Decidim::Map::StaticMap::DEFAULT_SIZE
+            h = options[:height] || Decidim::Map::StaticMap::DEFAULT_SIZE
+
+            params = {
+              apiKey: configuration[:api_key],
+              overlay: "point:#{latitude},#{longitude};icon=cp;size=large|#{latitude},#{longitude};style=circle;width=50m;color=%231B9D2C60"
+            }
+
+            URI.parse("#{map_url}:radius=90/#{w}x#{h}/png8").tap do |uri|
+              uri.query = URI.encode_www_form(params)
+            end.to_s
+          end
+
           # @See Decidim::Map::StaticMap#url_params
           def url_params(latitude:, longitude:, options: {})
+            ActiveSupport::Deprecation.warn(
+              <<~DEPRECATION.strip
+                Please use a V3 version HERE maps.
+                For further information, see:
+                https://www.here.com/docs/bundle/map-image-migration-guide-v3/page/README.html
+                Also make sure your Decidim.maps configurations are using the
+                up to date format.
+                You need to change:
+                  static_url = "https://image.maps.ls.hereapi.com/mia/1.6/mapview" if static_provider == "here" && static_url.blank?
+                to:
+                  static_url = "https://image.maps.hereapi.com/mia/v3/base/mc/overlay" if static_provider == "here"
+                in your config/initializers/decidim.rb file.
+              DEPRECATION
+            )
+
             params = {
               c: "#{latitude}, #{longitude}",
               z: options[:zoom] || Decidim::Map::StaticMap::DEFAULT_ZOOM,

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/nicknamizable.rb

@@ -52,7 +52,7 @@ module Decidim
         candidate = name
 
         2.step do |n|
-          return candidate if Decidim::UserBaseEntity.where("nickname ILIKE ?", candidate.downcase).where(scope).empty?
+          return candidate if Decidim::UserBaseEntity.where(nickname: candidate.downcase).where(scope).empty?
 
           candidate = numbered_variation_of(name, n)
         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

@@ -2,37 +2,40 @@
 
 namespace :decidim do
   namespace :upgrade do
-    desc "Modifies nicknames with random numbers when exists similar ones case-insensitively"
-    task fix_nickname_uniqueness: :environment do
-      logger = Logger.new($stdout)
-      logger.info("Updating conflicting user nicknames...")
+    desc "Modifies nickname of the user to lower case"
+    task :fix_nickname_casing => :environment do
+      logger.info("Fixing user nicknames case...")
 
-      # list of users already changed in the process
       has_changed = []
+      Decidim::UserBaseEntity.not_deleted.find_each do |user|
+        user.nickname.downcase!
 
-      Decidim::User.not_deleted.find_each do |user|
-        next if has_changed.include? user.id
-
-        Decidim::User.where(organization: user.organization)
-                     .where("nickname ILIKE ?", user.nickname.downcase)
-                     .where.not(id: has_changed + [user.id])
-                     .not_deleted
-                     .order(:created_at)
-                     .each do |similar_user|
-          # change her nickname to the lowercased one with numbers if needed
-          begin
-            update_user_nickname(similar_user, Decidim::UserBaseEntity.nicknamize(similar_user.nickname, organization: similar_user.organization))
-          rescue ActiveRecord::RecordInvalid => e
-            logger.warn("User ID (#{similar_user.id}) : #{e}")
+        begin
+          if user.nickname_changed?
+            user.save!
+            has_changed << user.id
           end
-          has_changed.append(similar_user.id)
+        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 (#{user.id}) : #{e}")
         end
       end
       logger.info("Process terminated, #{has_changed.count} users nickname have been updated.")
     end
 
+    desc "Modifies nicknames with random numbers when exists similar ones case-insensitively"
+    task :fix_nickname_uniqueness => :environment do
+      Rake::Task["decidim:upgrade:fix_nickname_casing"].execute
+    end
+
     private
 
+    def logger
+      @logger ||= Logger.new($stdout)
+    end
+
     def send_notification_to(user)
       Decidim::EventsManager.publish(
         event: "decidim.events.nickname_event",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.30.0.rc2
+  version: 0.30.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-03 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.rc2
+        version: 0.30.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc2
+        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.rc2
+        version: 0.30.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc2
+        version: 0.30.0
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -843,8 +843,6 @@ files:
 - app/cells/decidim/author/contact.erb
 - app/cells/decidim/author/date.erb
 - app/cells/decidim/author/endorsements.erb
-- app/cells/decidim/author/flag.erb
-- app/cells/decidim/author/flag_user.erb
 - app/cells/decidim/author/name.erb
 - app/cells/decidim/author/profile_minicard.erb
 - app/cells/decidim/author/show.erb
@@ -996,9 +994,6 @@ files:
 - app/cells/decidim/endorsers_list/full.erb
 - app/cells/decidim/endorsers_list/show.erb
 - app/cells/decidim/endorsers_list_cell.rb
-- app/cells/decidim/flag_modal/flag_user.erb
-- app/cells/decidim/flag_modal/show.erb
-- app/cells/decidim/flag_modal_cell.rb
 - app/cells/decidim/follow_button/content.erb
 - app/cells/decidim/follow_button/show.erb
 - app/cells/decidim/follow_button_cell.rb
@@ -1074,8 +1069,6 @@ files:
 - app/cells/decidim/profile_actions/show.erb
 - app/cells/decidim/profile_actions_cell.rb
 - app/cells/decidim/profile_cell.rb
-- app/cells/decidim/profile_sidebar/show.erb
-- app/cells/decidim/profile_sidebar_cell.rb
 - app/cells/decidim/progress_bar/show.erb
 - app/cells/decidim/progress_bar_cell.rb
 - app/cells/decidim/public_participation/show.erb
@@ -1084,6 +1077,10 @@ files:
 - app/cells/decidim/report_button/flag_modal.erb
 - app/cells/decidim/report_button/show.erb
 - app/cells/decidim/report_button_cell.rb
+- app/cells/decidim/report_user_button/already_reported_modal.erb
+- app/cells/decidim/report_user_button/flag_modal.erb
+- app/cells/decidim/report_user_button/show.erb
+- app/cells/decidim/report_user_button_cell.rb
 - app/cells/decidim/reported_content/show.erb
 - app/cells/decidim/reported_content_cell.rb
 - app/cells/decidim/represent_user_group/show.erb
@@ -1421,6 +1418,7 @@ files:
 - app/jobs/decidim/machine_translation_resource_job.rb
 - app/jobs/decidim/machine_translation_save_job.rb
 - app/jobs/decidim/metric_job.rb
+- app/jobs/decidim/migrate/paper_trail_job.rb
 - app/jobs/decidim/newsletters_opt_in_job.rb
 - app/jobs/decidim/notification_generator_for_recipient_job.rb
 - app/jobs/decidim/notification_generator_job.rb
@@ -2201,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
@@ -3081,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/app/cells/decidim/author/flag.erb

@@ -1,6 +0,0 @@
-<button type="button" data-open="<%= current_user.present? ? "flagModal" : "loginModal" %>" title="<%= t("report", scope: "decidim.shared.flag_modal" ) %>" aria-controls="<%= current_user.present? ? "flagModal" : "loginModal" %>" aria-haspopup="true" tabindex="0">
-  <%= icon "flag", aria_hidden: true, class: "icon--small", role: "img", "aria-hidden": true %>
-  <span>
-    <%= t("report", scope: "decidim.shared.flag_modal" ) %>
-  </span>
-</button>

data/app/cells/decidim/author/flag_user.erb

@@ -1,14 +0,0 @@
-<% if user_flaggable? && model.try(:id) != current_user.try(:id) %>
-  <%= cell(
-        "decidim/button",
-        { icon: "flag-line", text: t("decidim.shared.flag_modal.report") },
-        button_classes: "button button__sm button__text-secondary only:m-auto",
-        html_options: {
-          "data-open" => current_user.present? ? "flagUserModal" : "loginModal",
-          "aria-controls" => current_user.present? ? "flagUserModal" : "loginModal",
-          "aria-haspopup" => "dialog"
-        }
-      ) %>
-
-  <%= cell("decidim/flag_modal", model).flag_user %>
-<% end %>

data/app/cells/decidim/flag_modal/flag_user.erb

@@ -1,34 +0,0 @@
-<div class="flag-modal hidden" id="flagUserModal" data-reveal role="dialog" aria-modal="true" aria-labelledby="flagUserModal-label">
-  <div>
-    <h3 id="flagUserModal-label"><%= t("decidim.shared.flag_user_modal.title") %></h3>
-    <button class="close-button" data-close aria-label="<%= t("decidim.shared.flag_user_modal.close") %>" type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <% if model.reported_by? current_user %>
-    <p><%= t("decidim.shared.flag_user_modal.already_reported") %></p>
-  <% else %>
-    <p><%= t("decidim.shared.flag_user_modal.description") %></p>
-    <%= decidim_form_for report_form, url: decidim.report_user_path(sgid: model.to_sgid.to_s), method: :post do |f| %>
-      <%= f.collection_radio_buttons :reason, [
-          [:spam, t("decidim.shared.flag_user_modal.spam")],
-          [:offensive, t("decidim.shared.flag_user_modal.offensive")],
-          [:does_not_belong, t("decidim.shared.flag_user_modal.does_not_belong", organization_name: current_organization.name)]
-      ], :first, :last do |builder| %>
-        <%= builder.label { builder.radio_button + builder.text } %>
-      <% end %>
-      <%= f.text_area :details, rows: 4 %>
-      <% if current_user&.admin? %>
-        <%= f.check_box :block, label: t("decidim.shared.flag_user_modal.block"),
-                                include_hidden: false,
-                                data: {
-                                  label_action: t("decidim.shared.flag_user_modal.block"),
-                                  label_report: t("decidim.shared.flag_user_modal.report"),
-                                  block: "true"
-                                } %>
-        <%= f.check_box :hide, label: t("decidim.shared.flag_user_modal.hide"), label_options: { id: "block_and_hide" } %>
-      <% end %>
-      <%= f.submit t("decidim.shared.flag_user_modal.report") %>
-    <% end %>
-  <% end %>
-</div>

data/app/cells/decidim/flag_modal/show.erb

@@ -1,52 +0,0 @@
-<%= decidim_modal id: modal_id do %>
-  <%= decidim_form_for report_form, url: decidim.report_path(sgid: model.to_sgid.to_s), method: :post, html: { id: nil, class: "modal__report form-defaults" } do |f| %>
-    <div data-dialog-container>
-      <%= icon "flag-line", class: "inline-block align-middle" %>
-      <h3 data-dialog-title id="dialog-title-<%= modal_id %>">
-        <%= t("decidim.shared.flag_modal.title") %>
-      </h3>
-
-      <% if model.reported_by? current_user %>
-        <div>
-          <p class="modal__report-text">
-            <%= t("decidim.shared.flag_modal.already_reported") %>
-          </p>
-        </div>
-      <% else %>
-        <div>
-          <p class="modal__report-text">
-            <%= t("decidim.shared.flag_modal.description") %>
-          </p>
-          <fieldset>
-            <legend><%= t("decidim.shared.flag_modal.reason") %></legend>
-            <%= f.collection_radio_buttons :reason, [
-              [:spam, t("decidim.shared.flag_modal.spam")],
-              [:offensive, t("decidim.shared.flag_modal.offensive")],
-              [:does_not_belong, t("decidim.shared.flag_modal.does_not_belong", organization_name: current_organization.name)]
-            ], :first, :last do |builder| %>
-              <div class="modal__report-container__radio">
-                <%= builder.radio_button(id: builder.value) %>
-                <label for="<%= builder.value %>">
-                  <%= builder.text %>
-                </label>
-              </div>
-            <% end %>
-          </fieldset>
-          <% unless model.reported_by? current_user %>
-            <%= f.text_area :details, class: "w-full rounded border min-h-[160px] border-text-gray-2 mt-2", id: "#{modal_id}_details", label_options: { for: "#{modal_id}_details", class: "text-gray-2" } %>
-          <% end %>
-        </div>
-      <% end %>
-    </div>
-    <div data-dialog-actions>
-      <% unless model.reported_by? current_user %>
-        <button type="submit" class="button button__lg button__secondary">
-          <span>
-            <%= t("decidim.shared.flag_modal.report") %>
-          </span>
-          <%= icon "arrow-right-line" %>
-        </button>
-      <% end %>
-    </div>
-  <% end %>
-<% end %>