decidim-comments 0.31.0.rc1 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db61183a2914f1449e47ae59e79af732d2298593b617dccd1f729cdb84201957
-  data.tar.gz: b5822d26479e2a25527c45037210d4594fff730ed10f4ce0ef9e29a9e7c1377d
+  metadata.gz: f5e4186412267c1d490b61e28cb302d2ff11b7c162b2012306b36b74a87c6eb6
+  data.tar.gz: 6a3ae0d23d4917e2e8e6cd2fdef71d16b503f04bcc348e014194cf1381116139
 SHA512:
-  metadata.gz: c414291891ac6ad8f8904d6e97599e9bbab52f7c07b4e93dfb60dace6abb80f2042834d82edf080a9cf365fbfdce35613edc8f76b831ae95746c6b11beb833dd
-  data.tar.gz: 53112244ce496b3920f0da1cf74ad31608c19b790d9085053bfbba4e56df39d8a3634f30203905d11c0208649e4d4d1b9d8749d78d4942f2bbbccd5608b38c26
+  metadata.gz: 5aedd08f5540046b8494b47cfe19c96d58a42f01a0d9ce6cf4de8f0674bf08ea9d697ebbdea836bd93e4af6c6aea731cfa1c44527b465de76861500275d730ec
+  data.tar.gz: 6c0fea854c82c501f661b13b78cb586b73acc8e4ec5475afdda1cc3f4e32167e51a434828e54949f9a0c9f0351479b2b4d1804ec42940eef343a4339365448e9

data/app/cells/decidim/comments/comments/order_control.erb

@@ -2,21 +2,19 @@
   <%= form_with url: "#", data: { controller: :sort_comments } do %>
     <div class="md:hidden">
       <select id="order-mobile" aria-label="<%= t("decidim.components.comment.sort_by") %>" data-mobile-order-comment-select="true">
-        <option class="input-hidden" value="" <%= "disabled selected hidden" %>> <%= t("decidim.components.comment.sort_by") %> </option>
+        <option value="" disabled hidden <%= "selected" if params[:order].blank? %>>
+          <%= t("decidim.components.comment.sort_by") %>
+        </option>
         <% available_orders.each do |order_value| %>
           <option
             value="<%= order_value %>"
-            <%= "selected" if order_value == order %>
-            <% if order == nil && order_value == "older" || order_value == order %>
-              class="selected"
-            <% end %>
+            <%= "class = 'selected' selected" if params[:order] == order_value %>
             data-order-comment-url="<%= decidim_comments.comments_path(commentable_gid: model.to_signed_global_id.to_s, order: order_value || "older", reload: 1) %>">
             <%= t("decidim.components.comment_order_selector.order.#{order_value}") %>
           </option>
         <% end %>
       </select>
     </div>
-    <% order = "older" if order.nil? %>
     <div class="hidden md:block">
       <label for="order" class="comments-label-dropdown"><%= t("decidim.components.comment.sort_by") %></label>
       <select id="order" aria-label="<%= t("decidim.components.comment.sort_by") %>" data-desktop-order-comment-select="true">

data/app/cells/decidim/comments/comments_cell.rb

@@ -108,7 +108,7 @@ module Decidim
       end
 
       def order
-        options[:order]
+        options[:order] || "older"
       end
 
       def decidim

data/app/models/decidim/comments/comment.rb

@@ -144,8 +144,10 @@ module Decidim
 
         if root_commentable.respond_to?(:polymorphic_resource_url)
           root_commentable.polymorphic_resource_url(url_params)
-        else
+        elsif root_commentable.respond_to?(:reported_content_url)
           root_commentable.reported_content_url(url_params)
+        else
+          "/"
         end
       end
 

data/app/packs/src/decidim/comments/comments.component.js

@@ -426,7 +426,20 @@ export default class CommentsComponent {
       });
     });
 
+    mobileOrderSelect.addEventListener("focus", function () {
+      const olderOption = mobileOrderSelect.querySelector('option[value="older"]');
+      if (!mobileOrderSelect.value) {
+        olderOption.style.fontWeight = "bold"
+      }
+    });
+
     mobileOrderSelect.addEventListener("change", function(event) {
+      const olderOption = mobileOrderSelect.querySelector('option[value="older"]');
+
+      if (!olderOption.selected) {
+        olderOption.style.fontWeight = "normal"
+      }
+
       const selectedOption = mobileOrderSelect.querySelector(`[value=${event.target.value}]`);
       const orderUrl = selectedOption.dataset.orderCommentUrl;
 

data/app/packs/stylesheets/comments.scss

@@ -175,7 +175,7 @@
     }
 
     &-author-name {
-      @apply text-secondary font-semibold;
+      @apply text-gray-2 font-semibold;
     }
 
     &-author-selected {

data/app/views/decidim/comments/comments/reload.js.erb

@@ -10,6 +10,7 @@
   $comments.html(commentsHtml);
 
   // Re-mount the component
+  component.order = "<%= order %>"
   component.mountComponent();
 
   // Update the comments count

data/config/locales/de.yml

@@ -67,7 +67,7 @@ de:
       comment:
         alignment:
           against: Gegen
-          in_favor: Zugunsten
+          in_favor: Dafür
         answers:
           one: "%{count} Antwort"
           other: "%{count} Antworten"

data/config/locales/eu.yml

@@ -122,7 +122,7 @@ eu:
         title:
           one: "Iruzkin bat"
           other: "%{count} iruzkin"
-        top_comment_label: Bozkatuenak
+        top_comment_label: Babes gehien galdu dituztenak
       down_vote_button:
         label:
           one: Ez dut atsegin botoia. %{count} ez-atsegin

data/db/data/20251117070404_update_user_groups_references.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+class UpdateUserGroupsReferences < ActiveRecord::Migration[7.2]
+  def up
+    Rails.logger.info "Starting comment body updates..."
+
+    updated_count = 0
+    skipped_count = 0
+    error_count = 0
+
+    Decidim::Comments::Comment.find_each do |comment|
+      next if comment.body.blank?
+
+      updated_body = process_comment_body(comment.body)
+      body_changed = updated_body != comment.body
+
+      if body_changed
+        comment.update_column(:body, updated_body) # rubocop:disable Rails/SkipsModelValidations
+        updated_count += 1
+        Rails.logger.info "✓ Updated comment ##{comment.id}"
+      else
+        skipped_count += 1
+      end
+    rescue StandardError => e
+      error_count += 1
+      Rails.logger.error "✗ Error updating comment ##{comment.id}: #{e.message}"
+    end
+
+    log_summary(updated_count, skipped_count, error_count)
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+
+  private
+
+  def process_comment_body(body)
+    updated_body = {}
+
+    body.each do |locale, text|
+      updated_body[locale] = if locale == "machine_translations" && text.is_a?(Hash)
+                               process_machine_translations(text)
+                             else
+                               replace_user_group_references(text)
+                             end
+    end
+
+    updated_body
+  end
+
+  def process_machine_translations(translations)
+    updated_translations = {}
+
+    translations.each do |translation_locale, translation_text|
+      next if translation_text.blank?
+
+      updated_translations[translation_locale] = replace_user_group_references(translation_text)
+    end
+
+    updated_translations
+  end
+
+  def replace_user_group_references(text)
+    return text if text.blank?
+
+    text.gsub(
+      %r{gid://([^/]+)/Decidim::UserGroup/(\d+)},
+      'gid://\1/Decidim::User/\2'
+    )
+  end
+
+  def log_summary(updated_count, skipped_count, error_count)
+    Rails.logger.info "=" * 50
+    Rails.logger.info "Comment body update completed!"
+    Rails.logger.info "=" * 50
+    Rails.logger.info "Updated: #{updated_count}"
+    Rails.logger.info "Skipped: #{skipped_count}"
+    Rails.logger.info "Errors: #{error_count}"
+    Rails.logger.info "=" * 50
+  end
+end

data/lib/decidim/comments/engine.rb

@@ -59,6 +59,12 @@ module Decidim
         Decidim.icons.register(name: "edit-line", icon: "edit-line", description: "Edit comment button", **common_parameters)
       end
 
+      initializer "decidim_comments.data_migrate", after: "decidim_core.data_migrate" do
+        DataMigrate.configure do |config|
+          config.data_migrations_path << root.join("db/data").to_s
+        end
+      end
+
       initializer "decidim_comments.register_resources" do
         Decidim.register_resource(:comment) do |resource|
           resource.model_class_name = "Decidim::Comments::Comment"

data/lib/decidim/comments/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-comments version.
   module Comments
     def self.version
-      "0.31.0.rc1"
+      "0.31.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.31.0.rc1
+  version: 0.31.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-25 00:00:00.000000000 Z
+date: 2025-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -52,28 +52,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -253,6 +253,7 @@ files:
 - config/locales/vi.yml
 - config/locales/zh-CN.yml
 - config/locales/zh-TW.yml
+- db/data/20251117070404_update_user_groups_references.rb
 - db/migrate/20161130143508_create_comments.rb
 - db/migrate/20161214082645_add_depth_to_comments.rb
 - db/migrate/20161216102820_add_alignment_to_comments.rb