From 64c00aea30fd9e2231e0a48539bbdfe105fad551 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@37signals.com>
Date: Sat, 5 Apr 2025 16:20:31 +0200
Subject: [PATCH] Extract helper for bubble_assignee_checkbox

---
 app/helpers/bubbles/assignments_helper.rb  |  8 ++++++++
 app/views/bubbles/assignments/new.html.erb | 11 ++---------
 2 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 app/helpers/bubbles/assignments_helper.rb

diff --git a/app/helpers/bubbles/assignments_helper.rb b/app/helpers/bubbles/assignments_helper.rb
new file mode 100644
index 000000000..9bd6630fc
--- /dev/null
+++ b/app/helpers/bubbles/assignments_helper.rb
@@ -0,0 +1,8 @@
+module Bubbles::AssignmentsHelper
+  def bubble_assignee_checkbox(form, bubble, user)
+    form.check_box("assignee_id[]", {
+        checked: bubble.assigned_to?(user), data: { action: "change->form#submit" }, id: dom_id(user, :assign), include_hidden: false
+      }, user.id
+    ) + form.label("assignee_id[]", user.name, for: dom_id(user, :assign), class: "overflow-ellipsis")
+  end
+end
diff --git a/app/views/bubbles/assignments/new.html.erb b/app/views/bubbles/assignments/new.html.erb
index 992c0b3c4..cea4d9815 100644
--- a/app/views/bubbles/assignments/new.html.erb
+++ b/app/views/bubbles/assignments/new.html.erb
@@ -4,16 +4,9 @@
       <strong class="popup__title margin-block-start-half pad-inline-half txt-nowrap">Assign this to…</strong>
 
       <%= form_with url: bubble_assignments_path(@bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %>
-        <% @bubble.bucket.users.active.sort_by(&:name).each do |user| %>
+        <% @bubble.bucket.users.active.alphabetically.each do |user| %>
           <div class="btn popup__item">
-            <%= form.check_box "assignee_id[]", {
-              checked: @bubble.assigned_to?(user),
-              data: { action: "change->form#submit" },
-              id: dom_id(user, :assign),
-              include_hidden: false,
-            }, user.id %>
-
-            <%= form.label "assignee_id[]", user.name, for: dom_id(user, :assign), class: "overflow-ellipsis" %>
+            <%= bubble_assignee_checkbox(form, @bubble, user) %>
             <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
           </div>
         <% end %>