decidim-core 0.30.0.rc1 → 0.30.0.rc3

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

@@ -49,46 +49,7 @@ module Decidim
           private
 
           def language_code
-            primary = I18n.locale.to_s
-            secondary = primary.split("-")[0]
-            available_language_codes[primary] || available_language_codes[secondary] || ""
-          end
-
-          def available_language_codes
-            @available_language_codes ||= {
-              "ar" => "ara", # Arabic
-              "eu" => "baq", # Basque
-              "ca" => "cat", # Catalan
-              "zh" => "chi", # Chinese (simplified)
-              # "" => "cht", # Chinese (traditional)
-              "cs" => "cze", # Czech
-              "da" => "dan", # Danish
-              "nl" => "dut", # Dutch
-              "en" => "eng", # English
-              "fi" => "fin", # Finnish
-              "fr" => "fre", # French
-              "de" => "ger", # German
-              "ga" => "gle", # Gaelic
-              "el" => "gre", # Greek
-              "he" => "heb", # Hebrew
-              "hi" => "hin", # Hindi
-              "id" => "ind", # Indonesian
-              "it" => "ita", # Italian
-              "no" => "nor", # Norwegian
-              "fa" => "per", # Persian
-              "pl" => "pol", # Polish
-              "pt" => "por", # Portuguese
-              "ru" => "rus", # Russian
-              "si" => "sin", # Sinhalese
-              "es" => "spa", # Spanish
-              "sv" => "swe", # Swedish
-              "th" => "tha", # Thai
-              "tr" => "tur", # Turkish
-              "uk" => "ukr", # Ukrainian
-              "ur" => "urd", # Urdu
-              "vi" => "vie", # Vietnamese
-              "cy" => "wel" # Welsh
-            }
+            I18n.locale.to_s
           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

@@ -58,6 +58,8 @@ module Decidim
 
     # Public: Broadcasts a notification to the author of the resource that has been hidden
     def send_notification_to_author
+      return if affected_users.blank?
+
       data = {
         event: "decidim.events.reports.resource_hidden",
         event_class: Decidim::ResourceHiddenEvent,
@@ -65,13 +67,12 @@ module Decidim
         extra: {
           report_reasons:
         },
-        affected_users: @reportable.try(:authors) || [@reportable.try(:normalized_author)]
+        affected_users:
       }
 
       Decidim::EventsManager.publish(**data)
     end
 
-    # Public: hides the resource
     def hide_with_admin_log!
       Decidim.traceability.perform_action!(
         "hide",
@@ -91,10 +92,22 @@ module Decidim
         @reportable.moderation.update!(hidden_at: Time.current)
         @reportable.try(:touch)
       end
+
+      if @reportable.is_a?(Decidim::Comments::Commentable)
+        @reportable.comment_threads.each do |comment|
+          Decidim::HideChildResourcesJob.perform_later(comment, @current_user.id)
+        end
+      end
+
+      send_notification_to_author
     end
 
     private
 
+    def affected_users
+      @affected_users ||= (@reportable.try(:authors) || [@reportable.try(:normalized_author)]).select { |author| author.is_a?(Decidim::User) }
+    end
+
     def report_reasons
       @reportable.moderation.reports.pluck(:reason).uniq
     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/tasks/decidim_taxonomies.rake

@@ -82,6 +82,7 @@ namespace :decidim do
     task :import_all_plans, [] => :environment do |_task, _args|
       Rails.root.glob("tmp/taxonomies/*_plan.json").each do |file|
         log.info "Importing plan from #{file}"
+        Rake::Task["decidim:taxonomies:import_plan"].reenable
         Rake::Task["decidim:taxonomies:import_plan"].invoke(file)
       end
     end
@@ -93,7 +94,10 @@ namespace :decidim do
 
       data = JSON.parse(File.read(file))
       taxonomies = data["taxonomy_map"]
-      abort "No taxonomies found in the file" unless taxonomies && taxonomies&.any?
+      unless taxonomies && taxonomies&.any?
+        log.warn "No metric (categories) taxonomies found in the file"
+        next
+      end
 
       total = taxonomies.count
       taxonomies.each_with_index do |(id, object_id), index|
@@ -112,6 +116,7 @@ namespace :decidim do
     task :update_all_metrics, [] => :environment do |_task, _args|
       Rails.root.glob("tmp/taxonomies/*_result.json").each do |file|
         log.info "Processing metrics from #{file}"
+        Rake::Task["decidim:taxonomies:update_metrics"].reenable
         Rake::Task["decidim:taxonomies:update_metrics"].invoke(file)
       end
     end

data/lib/tasks/upgrade/clean_hidden_resources.rake

@@ -0,0 +1,33 @@
+# 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

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::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}")
+        user.nickname.downcase!
+
+        begin
+          if user.nickname_changed?
+            user.save!
+            has_changed << user.id
           end
-          has_changed.append(similar_user.id)
+        rescue ActiveRecord::RecordInvalid
+          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}")
         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",

data/lib/tasks/upgrade/migrations.rake

@@ -81,7 +81,10 @@ namespace :decidim do
 
       logger.warn("[Patch migration] Replacing content of #{File.basename(target_file)}")
 
-      File.binwrite(target_file, new_source)
+      additional_comment = "# This file has been modified by `decidim upgrade:migrations` task on #{Time.now.utc}\n"
+      source = new_source.gsub(inserted_comment, "#{inserted_comment}#{additional_comment}")
+
+      File.binwrite(target_file, source)
     end
 
     def logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.30.0.rc1
+  version: 0.30.0.rc3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-18 00:00:00.000000000 Z
+date: 2025-03-19 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.rc1
+        version: 0.30.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
 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
@@ -1416,10 +1413,12 @@ files:
 - app/jobs/decidim/export_participatory_space_job.rb
 - app/jobs/decidim/find_and_update_descendants_job.rb
 - app/jobs/decidim/hide_all_created_by_author_job.rb
+- app/jobs/decidim/hide_child_resources_job.rb
 - app/jobs/decidim/machine_translation_fields_job.rb
 - 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
@@ -1732,7 +1731,6 @@ files:
 - app/packs/src/decidim/utilities/dom.js
 - app/packs/src/decidim/utilities/text.js
 - app/packs/src/decidim/vendor/jquery-tmpl.js
-- app/packs/src/decidim/vendor/leaflet-tilelayer-here.js
 - app/packs/src/decidim/vendor/tribute.js
 - app/packs/src/decidim/vizzs/areachart.js
 - app/packs/src/decidim/vizzs/index.js
@@ -1759,6 +1757,7 @@ files:
 - app/packs/stylesheets/decidim/_fonts.scss
 - app/packs/stylesheets/decidim/_footer.scss
 - app/packs/stylesheets/decidim/_forms.scss
+- app/packs/stylesheets/decidim/_hashtags.scss
 - app/packs/stylesheets/decidim/_header.scss
 - app/packs/stylesheets/decidim/_hero.scss
 - app/packs/stylesheets/decidim/_home.scss
@@ -3080,6 +3079,7 @@ 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 %>

data/app/cells/decidim/flag_modal_cell.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  class FlagModalCell < Decidim::ViewModel
-    include ActionView::Helpers::FormOptionsHelper
-
-    def flag_user
-      render
-    end
-
-    def cache_hash
-      hash = []
-      hash.push(I18n.locale)
-      hash.push(current_user.try(:id))
-      hash.push(model.reported_by?(current_user) ? 1 : 0)
-      hash.push(model.class.name.gsub("::", ":"))
-      hash.push(model.id)
-      hash.join(Decidim.cache_key_separator)
-    end
-
-    private
-
-    def frontend_administrable?
-      author.respond_to?(:nickname) &&
-        model.can_be_administered_by?(current_user) &&
-        (model.respond_to?(:official?) && !model.official?)
-    end
-
-    def link_to_profile
-      author.presenter.profile_url
-    end
-
-    def author
-      model.try(:creator_identity) || model.try(:normalized_author)
-    end
-
-    def user_report_form
-      Decidim::ReportForm.from_params(reason: "spam")
-    end
-
-    def modal_id
-      options[:modal_id] || "flagModal"
-    end
-
-    def hide_checkbox_id
-      @hide_checkbox_id ||= Digest::MD5.hexdigest("report_form_hide_#{model.class.name}_#{model.id}")
-    end
-
-    def report_form
-      @report_form ||= begin
-        context = { can_hide: model.try(:can_be_administered_by?, current_user) }
-        Decidim::ReportForm.new(reason: "spam").with_context(context)
-      end
-    end
-  end
-end