From ab43c84ab1b0287a49150b9ab5011f61b76fc151 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 18 Mar 2024 17:13:32 -0300
Subject: [PATCH] fix: indicar el filtro activo #15652

---
 app/helpers/moderation_queue_helper.rb            | 10 +++++++++-
 app/views/components/_comments_show_submenu.haml  |  3 ++-
 app/views/components/_dropdown_item.haml          |  3 ++-
 app/views/components/_instances_show_submenu.haml |  3 ++-
 app/views/components/_profiles_show_submenu.haml  |  3 ++-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/helpers/moderation_queue_helper.rb b/app/helpers/moderation_queue_helper.rb
index 3681bec3..c69364ae 100644
--- a/app/helpers/moderation_queue_helper.rb
+++ b/app/helpers/moderation_queue_helper.rb
@@ -2,6 +2,14 @@
 
 module ModerationQueueHelper
   def filter_states(**args)
-    params.permit(:state, :actor_state, :activity_pub_state).merge(**args)
+    params.permit(:instance_state, :actor_state, :activity_pub_state).merge(**args)
+  end
+
+  def active?(states, state_name, state)
+    if params[state_name].present?
+      params[state_name] == state.to_s
+    else
+      states.first == state
+    end
   end
 end
diff --git a/app/views/components/_comments_show_submenu.haml b/app/views/components/_comments_show_submenu.haml
index 60c02501..9964a62a 100644
--- a/app/views/components/_comments_show_submenu.haml
+++ b/app/views/components/_comments_show_submenu.haml
@@ -1,4 +1,5 @@
 - ActivityPub.states.each do |state|
   = render 'components/dropdown_item',
     text: t(".submenu_#{state}", count: activity_pubs.unscope(where: :aasm_state).public_send(state).count),
-    path: filter_states(activity_pub_state: state)
+    path: filter_states(activity_pub_state: state),
+    class: ('active' if active?(ActivityPub.states, :activity_pub_state, state))
diff --git a/app/views/components/_dropdown_item.haml b/app/views/components/_dropdown_item.haml
index e5b16950..a4d363a8 100644
--- a/app/views/components/_dropdown_item.haml
+++ b/app/views/components/_dropdown_item.haml
@@ -1,4 +1,5 @@
 -#
   @param :text [String] Contenido del link
   @param :path [String,Hash] Link
-= link_to text, path, class: 'dropdown-item', data: { target: 'dropdown.item' }
+- local_assigns[:class] = "dropdown-item #{local_assigns[:class]}"
+= link_to text, path, class: local_assigns[:class], data: { target: 'dropdown.item' }
diff --git a/app/views/components/_instances_show_submenu.haml b/app/views/components/_instances_show_submenu.haml
index c56df547..6b9b747e 100644
--- a/app/views/components/_instances_show_submenu.haml
+++ b/app/views/components/_instances_show_submenu.haml
@@ -1,4 +1,5 @@
 - InstanceModeration.states.each do |state|
   = render 'components/dropdown_item',
     text: t(".submenu_#{state}", count: instance_moderations.unscope(where: :aasm_state).public_send(state).count),
-    path: filter_states(instance_state: state)
+    path: filter_states(instance_state: state),
+    class: ('active' if active?(InstanceModeration.states, :instance_state, state))
diff --git a/app/views/components/_profiles_show_submenu.haml b/app/views/components/_profiles_show_submenu.haml
index 99694698..bebfbe20 100644
--- a/app/views/components/_profiles_show_submenu.haml
+++ b/app/views/components/_profiles_show_submenu.haml
@@ -1,4 +1,5 @@
 - ActorModeration.states.each do |actor_state|
   = render 'components/dropdown_item',
     text: t(".submenu_#{actor_state}", count: actor_moderations.unscope(where: :aasm_state).public_send(actor_state).count),
-    path: filter_states(actor_state: actor_state)
+    path: filter_states(actor_state: actor_state),
+    class: ('active' if active?(ActorModeration.states, :actor_state, actor_state))