From 66b0a4f2e7f60d6bcdb3736f1b2cb07f041ba395 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@hey.com>
Date: Thu, 18 Sep 2025 15:08:08 +0200
Subject: [PATCH] Adapt indexed_at too

---
 app/views/filters/settings/_controls.html.erb |  5 +--
 .../filters/settings/_indexed_by.html.erb     | 35 ++++++-------------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/app/views/filters/settings/_controls.html.erb b/app/views/filters/settings/_controls.html.erb
index 961b1a0d0..213c5c587 100644
--- a/app/views/filters/settings/_controls.html.erb
+++ b/app/views/filters/settings/_controls.html.erb
@@ -1,9 +1,10 @@
-<%= form_with url: cards_path, method: :get, data: { controller: "form" } do |form| %>
+<%= form_with url: cards_path, method: :get, class: "flex-inline center align-center gap-half",
+      data: { controller: "form" } do |form| %>
   <%= hidden_field_tag :expand_all, true, disabled: !user_filtering.expanded?, data: { toggle_enable_target: "element" } %>
 
 
   <%= render "filters/settings/sorted_by", user_filtering: user_filtering %>
-<%#= render "filters/settings/indexed_by", user_filtering: user_filtering %>
+  <%= render "filters/settings/indexed_by", user_filtering: user_filtering %>
 <%#= render "filters/settings/tags", user_filtering: user_filtering %>
 <%#= render "filters/settings/assignees", user_filtering: user_filtering %>
 <%#= render "filters/settings/creators", user_filtering: user_filtering %>
diff --git a/app/views/filters/settings/_indexed_by.html.erb b/app/views/filters/settings/_indexed_by.html.erb
index a2a37486b..16c042894 100644
--- a/app/views/filters/settings/_indexed_by.html.erb
+++ b/app/views/filters/settings/_indexed_by.html.erb
@@ -1,36 +1,23 @@
 <% filter = user_filtering.filter %>
 
-<%= tag.div class: class_names("quick-filter position-relative", "default-value": filter.indexed_by.all?),
-      data: { controller: "dialog", action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside", filter_show: user_filtering.show_indexed_by? } do %>
-    <button class="btn input input--select flex-inline txt-x-small" data-action="click->dialog#open:stop">
-      <span class="overflow-ellipsis">
-        <%= filter.indexed_by == "all" ? "Status" : filter.indexed_by.humanize %>
+<%= tag.div class: class_names("quick-filter position-relative"),
+      data: { controller: "dialog combobox", action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside", filter_show: user_filtering.show_indexed_by? } do %>
+    <button type="button" class="btn input input--select flex-inline txt-x-small" data-action="click->dialog#toggle:stop">
+      <span class="overflow-ellipsis" data-combobox-target="label">
       </span>
     </button>
 
     <%= filter_dialog "Filter by…" do %>
       <strong class="popup__title">Filter by…</strong>
 
-      <ul class="popup__list" data-filter-target="list">
+      <ul class="popup__list" data-filter-target="list" role="listbox">
         <% Filter::INDEXES.each do |index| %>
-          <li class="popup__item" data-navigable-list-target="item">
-            <%= form_with url: cards_path, method: :get, class: "full-width", data: { controller: "form" } do |form| %>
-              <% filter.as_params.except(:indexed_by).each do |key, value| %>
-                <%= filter_hidden_field_tag key, value %>
-              <% end %>
-
-              <%= hidden_field_tag :indexed_by, index %>
-
-              <%= hidden_field_tag :expand_all, true, disabled: !user_filtering.expanded?, data: { toggle_enable_target: "element" } %>
-
-              <%= form.button type: "submit", class: "popup__btn btn" do %>
-                <span class="overflow-ellipsis flex-item-grow"><%= index.humanize %></span>
-                <% if filter.indexed_by == index %>
-                  <%= icon_tag "check", class: "checked flex-item-justify-end" %>
-                <% end %>
-              <% end %>
-            <% end %>
-          </li>
+          <%= tag.li class: "popup__item", data: { navigable_list_target: "item", combobox_target: "item", combobox_value: index }, role: "checkbox", aria: { checked: filter.indexed_by == index } do %>
+            <button type="button" class="btn popup__btn" data-action="dialog#close combobox#change">
+              <span class="overflow-ellipsis flex-item-grow" data-combobox-label="<%= index == "all" ? "Status" : index.humanize %>"><%= index == "all" ? "Status" : index.humanize %></span>
+              <%= icon_tag "check", class: "checked flex-item-justify-end", "aria-hidden": true %>
+            </button>
+          <% end %>
         <% end %>
       </ul>
     <% end %>