diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb
index 568c324e0..ff5a62e37 100644
--- a/app/helpers/filters_helper.rb
+++ b/app/helpers/filters_helper.rb
@@ -3,6 +3,10 @@ module FiltersHelper
"#{name}_filter--#{value}"
end
+ def filter_chip_frame_id(kind)
+ "#{kind}_chips"
+ end
+
def filter_chips(filter, **)
safe_join [
chips_for_filter_kind(filter, :indexed_by, **),
@@ -71,17 +75,13 @@ module FiltersHelper
when :terms
[ %Q("#{object}"), object, "terms[]" ]
end.then do |display, value, name|
- { display: display, value: value, name: name, frame: filter_chip_frame(kind) }
+ { display: display, value: value, name: name, frame: filter_chip_frame_id(kind) }
end
end
- def filter_chip_frame(kind)
- "#{kind}_chips"
- end
-
def frame_for_filter_kind(filter, kind, **)
chips_for_filter_kind(filter, kind, **).then do |chips|
- turbo_frame_tag filter_chip_frame(kind) do
+ turbo_frame_tag filter_chip_frame_id(kind) do
safe_join chips
end
end
diff --git a/app/models/filter/params.rb b/app/models/filter/params.rb
index 9baefc1f1..1b256af53 100644
--- a/app/models/filter/params.rb
+++ b/app/models/filter/params.rb
@@ -17,12 +17,12 @@ module Filter::Params
def to_h
@to_h ||= {}.tap do |h|
+ h["tags"] = tags
+ h["terms"] = terms
+ h["buckets"] = buckets
+ h["assignees"] = assignees
h["indexed_by"] = indexed_by
h["assignments"] = assignments
- h["assignees"] = assignees
- h["tags"] = tags
- h["buckets"] = buckets
- h["terms"] = terms
end.reject do |k, v|
default_fields[k] == v
end.compact_blank.with_indifferent_access
diff --git a/app/views/bubbles/_filters.html.erb b/app/views/bubbles/_filters.html.erb
index 44593b37e..e74608e23 100644
--- a/app/views/bubbles/_filters.html.erb
+++ b/app/views/bubbles/_filters.html.erb
@@ -44,6 +44,7 @@
<%= form_with url: filter_chips_path, method: :post, class: "flex gap flex-item-grow align-center justify-center full-width center margin-block" do %>
<%= hidden_field_tag :name, "terms[]" %>
+ <%= hidden_field_tag :frame, filter_chip_frame_id(:terms) %>