From c0df006ebce51ea0a3fdadf855d4d2fedd06277b Mon Sep 17 00:00:00 2001
From: Jose Farias <jose@37signals.com>
Date: Thu, 17 Oct 2024 21:37:48 -0600
Subject: [PATCH] Consolidate bucket_view_helper and filters_helper

---
 app/helpers/bucket_views_helper.rb  | 27 ---------------------------
 app/helpers/filters_helper.rb       | 26 ++++++++++++++++++++++++++
 app/views/bubbles/_filters.html.erb |  2 +-
 app/views/bubbles/index.html.erb    |  2 +-
 4 files changed, 28 insertions(+), 29 deletions(-)
 delete mode 100644 app/helpers/bucket_views_helper.rb

diff --git a/app/helpers/bucket_views_helper.rb b/app/helpers/bucket_views_helper.rb
deleted file mode 100644
index b1bcba92e..000000000
--- a/app/helpers/bucket_views_helper.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-module BucketViewsHelper
-  def default_bucket_view?
-    bubble_filter_params.values.all?(&:blank?) || bubble_filter_params.to_h == Bucket::View.default_filters
-  end
-
-  def bubble_filter_form_tag(path, method:, id:)
-    form_tag path, method: method, id: id do
-      yield if block_given?
-
-      if params[:order_by].present?
-        concat hidden_field_tag(:order_by, params[:order_by])
-      end
-
-      if params[:status].present?
-        concat hidden_field_tag(:status, params[:status])
-      end
-
-      Array(params[:assignee_ids]).each do |assignee_id|
-        concat hidden_field_tag("assignee_ids[]", assignee_id, id: nil)
-      end
-
-      Array(params[:tag_ids]).each do |tag_id|
-        concat hidden_field_tag("tag_ids[]", tag_id, id: nil)
-      end
-    end
-  end
-end
diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb
index 81deb67f7..cf64ff592 100644
--- a/app/helpers/filters_helper.rb
+++ b/app/helpers/filters_helper.rb
@@ -32,4 +32,30 @@ module FiltersHelper
   def unassigned_filter_activated?
     params[:status] == "unassigned"
   end
+
+  def default_filters?
+    bubble_filter_params.values.all?(&:blank?) || bubble_filter_params.to_h == Bucket::View.default_filters
+  end
+
+  def bubble_filter_form_tag(path, method:, id: nil)
+    form_tag path, method: method, id: id do
+      yield if block_given?
+
+      if params[:order_by].present?
+        concat hidden_field_tag(:order_by, params[:order_by])
+      end
+
+      if params[:status].present?
+        concat hidden_field_tag(:status, params[:status])
+      end
+
+      Array(params[:assignee_ids]).each do |assignee_id|
+        concat hidden_field_tag("assignee_ids[]", assignee_id, id: nil)
+      end
+
+      Array(params[:tag_ids]).each do |tag_id|
+        concat hidden_field_tag("tag_ids[]", tag_id, id: nil)
+      end
+    end
+  end
 end
diff --git a/app/views/bubbles/_filters.html.erb b/app/views/bubbles/_filters.html.erb
index cce0cfc41..e3112120d 100644
--- a/app/views/bubbles/_filters.html.erb
+++ b/app/views/bubbles/_filters.html.erb
@@ -13,6 +13,6 @@
   <% end %>
 </h2>
 
-<% unless default_bucket_view? %>
+<% unless default_filters? %>
   <%= render "bubbles/filters/bucket_view_form", bucket: bucket, view: view %>
 <% end %>
diff --git a/app/views/bubbles/index.html.erb b/app/views/bubbles/index.html.erb
index 5b8628588..8280291ce 100644
--- a/app/views/bubbles/index.html.erb
+++ b/app/views/bubbles/index.html.erb
@@ -28,7 +28,7 @@
 
 <section class="bubbles-list unpad-inline center margin-block-start">
   <header class="flex-inline align-center gap txt-small margin-block-end-half center">
-    <%= bubble_filter_form_tag bucket_bubbles_path(@bucket), method: :get, id: dom_id(@bucket, :search) do %>
+    <%= bubble_filter_form_tag bucket_bubbles_path(@bucket), method: :get do %>
       <%= search_field_tag :term, params[:term], class: "input center flex-inline", placeholder: "Type to filter…" %>
     <% end %>
   </header>