Sort selected users first in filter dropdowns

app/models/user/filtering.rb

@@ -28,6 +28,21 @@ def users
     @users ||= account.users.active.alphabetically
   end
 
+  # Returns users sorted with selected assignees first
+  def users_for_assignee_filter
+    @users_for_assignee_filter ||= sort_users_by_selection(filter.assignees)
+  end
+
+  # Returns users sorted with selected creators first
+  def users_for_creator_filter
+    @users_for_creator_filter ||= sort_users_by_selection(filter.creators)
+  end
+
+  # Returns users sorted with selected closers first
+  def users_for_closer_filter
+    @users_for_closer_filter ||= sort_users_by_selection(filter.closers)
+  end
+
   def filters
     @filters ||= user.filters.all
   end
@@ -82,4 +97,14 @@ def cache_key
     def account
       user.account
     end
+
+    def sort_users_by_selection(selected_users)
+      all_users = users.to_a
+      selected_ids = selected_users.pluck(:id).to_set
+
+      selected = all_users.select { |u| selected_ids.include?(u.id) }
+      unselected = all_users.reject { |u| selected_ids.include?(u.id) }
+
+      selected + unselected
+    end
 end

app/views/filters/settings/_assignees.html.erb

@@ -33,7 +33,7 @@
           </button>
         <% end %>
 
-        <% user_filtering.users.each do |user| %>
+        <% user_filtering.users_for_assignee_filter.each do |user| %>
           <%= tag.li class: "popup__item", data: {
                 filter_target: "item", navigable_list_target: "item", multi_selection_combobox_target: "item", multi_selection_combobox_value: user.id, multi_selection_combobox_label: user.familiar_name },
                 role: "checkbox", aria: { checked: filter.assignees.include?(user) } do %>

app/views/filters/settings/_closers.html.erb

@@ -24,7 +24,7 @@
       <% end %>
 
       <ul class="popup__list" data-filter-target="list" role="listbox">
-        <% user_filtering.users.each do |user| %>
+        <% user_filtering.users_for_closer_filter.each do |user| %>
           <%= tag.li class: "popup__item", data: {
                 filter_target: "item", navigable_list_target: "item", multi_selection_combobox_target: "item", multi_selection_combobox_value: user.id, multi_selection_combobox_label: user.familiar_name },
                 role: "checkbox", aria: { checked: filter.closers.include?(user) } do %>

app/views/filters/settings/_creators.html.erb

@@ -24,7 +24,7 @@
       <% end %>
 
       <ul class="popup__list" data-filter-target="list" role="listbox">
-        <% user_filtering.users.each do |user| %>
+        <% user_filtering.users_for_creator_filter.each do |user| %>
           <%= tag.li class: "popup__item", data: {
                 filter_target: "item", navigable_list_target: "item", multi_selection_combobox_target: "item", multi_selection_combobox_value: user.id, multi_selection_combobox_label: user.familiar_name },
                 role: "checkbox", aria: { checked: filter.creators.include?(user) } do %>

test/models/user/filtering_test.rb

@@ -0,0 +1,65 @@
+require "test_helper"
+
+class User::FilteringTest < ActiveSupport::TestCase
+  setup do
+    @user = users(:david)
+    @filter = @user.filters.create!
+  end
+
+  test "users_for_assignee_filter sorts selected assignees first" do
+    # Create some test users
+    alice = @user.account.users.create!(name: "Alice", email_address: "alice@test.com")
+    bob = @user.account.users.create!(name: "Bob", email_address: "bob@test.com")
+    charlie = @user.account.users.create!(name: "Charlie", email_address: "charlie@test.com")
+
+    # Select Bob and Charlie as assignees
+    @filter.assignees = [charlie, bob]
+    @filter.save!
+
+    filtering = User::Filtering.new(@user, @filter)
+    result = filtering.users_for_assignee_filter
+
+    # Selected users (Bob, Charlie) should appear first, both alphabetically sorted
+    assert_equal "Bob", result[0].name
+    assert_equal "Charlie", result[1].name
+
+    # Alice (unselected) should appear after selected users
+    assert_equal "Alice", result.find { |u| u.name == "Alice" }.name
+    assert result.index { |u| u.name == "Alice" } > 1, "Unselected user should appear after selected users"
+  end
+
+  test "users_for_creator_filter sorts selected creators first" do
+    alice = @user.account.users.create!(name: "Alice", email_address: "alice@test.com")
+    bob = @user.account.users.create!(name: "Bob", email_address: "bob@test.com")
+
+    @filter.creators = [bob]
+    @filter.save!
+
+    filtering = User::Filtering.new(@user, @filter)
+    result = filtering.users_for_creator_filter
+
+    assert_equal "Bob", result.first.name
+  end
+
+  test "users_for_closer_filter sorts selected closers first" do
+    alice = @user.account.users.create!(name: "Alice", email_address: "alice@test.com")
+    bob = @user.account.users.create!(name: "Bob", email_address: "bob@test.com")
+
+    @filter.closers = [alice]
+    @filter.save!
+
+    filtering = User::Filtering.new(@user, @filter)
+    result = filtering.users_for_closer_filter
+
+    assert_equal "Alice", result.first.name
+  end
+
+  test "users method returns all users alphabetically without selection sorting" do
+    filtering = User::Filtering.new(@user, @filter)
+    result = filtering.users
+
+    # Should just be alphabetical, no selection sorting
+    names = result.map(&:name)
+    assert_equal names.sort, names, "Users should be alphabetically sorted"
+  end
+end