bterkuile/fizzy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: When expanding filters, submitting filters should keep the filters expanded

Browse Source
This commit is contained in:
Jorge Manrubia
2025-09-12 18:01:25 +02:00
parent 774ff99f29
commit b7b705ba19
9 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/javascript/controllers/toggle_enable_controller.js
+11
View File
@@ -0,0 +1,11 @@
import { Controller } from "@hotwired/stimulus"
export default class extends Controller {
static targets = [ "element" ]
toggle() {
this.elementTargets.forEach((element) => {
element.toggleAttribute("disabled")
})
}
}
app/views/filters/_settings.html.erb
+1 -1
View File
@@ -2,7 +2,7 @@
<%= tag.aside id: "filter-settings",
class: class_names("filters flex align-center gap-half justify-center center margin-block-end", { "filters--expanded": user_filtering.expanded? }),
data: { controller: "toggle-class", toggle_class_toggle_class: "filters--expanded" } do %>
<div class="flex-inline center align-center gap-half">
<div class="flex-inline center align-center gap-half" data-controller="toggle-enable">
<%= render "filters/settings/terms", user_filtering: user_filtering %>
<%= render "filters/settings/controls", user_filtering: user_filtering %>
app/views/filters/settings/_assignees.html.erb
+2 -6
View File
@@ -32,9 +32,7 @@
<%= hidden_field_tag :assignment_status, "unassigned" %>
<% end %>
<% if user_filtering.expanded? %>
<%= hidden_field_tag :expand_all, user_filtering.expanded? %>
<% end %>
<%= hidden_field_tag :expand_all, true, disabled: !user_filtering.expanded?, data: { toggle_enable_target: "element" } %>
<%= form.button type: "submit", class: "popup__item btn" do %>
<span class="overflow-ellipsis flex-item-grow">No one</span>
@@ -61,9 +59,7 @@
<%= hidden_field_tag "assignee_ids[]", user.id %>
<% end %>
<% if user_filtering.expanded? %>
<%= hidden_field_tag :expand_all, user_filtering.expanded? %>
<% end %>
<%= hidden_field_tag :expand_all, true, disabled: !user_filtering.expanded?, data: { toggle_enable_target: "element" } %>
<%= form.button type: "submit", class: "popup__item btn" do %>
<span class="overflow-ellipsis flex-item-grow"><%= user.name %></span>
app/views/filters/settings/_closers.html.erb
+1 -3
View File
@@ -38,9 +38,7 @@
<%= hidden_field_tag "closer_ids[]", user.id %>
<% end %>
<% if user_filtering.expanded? %>
<%= hidden_field_tag :expand_all, user_filtering.expanded? %>
<% end %>
<%= hidden_field_tag :expand_all, true, disabled: !user_filtering.expanded?, data: { toggle_enable_target: "element" } %>
<%= form.button type: "submit", class: "popup__item btn" do %>
<span class="overflow-ellipsis flex-item-grow"><%= user.name %></span>
app/views/filters/settings/_creators.html.erb
+1 -3
View File
@@ -38,9 +38,7 @@
<%= hidden_field_tag "creator_ids[]", user.id %>
<% end %>
<% if user_filtering.expanded? %>
<%= hidden_field_tag :expand_all, user_filtering.expanded? %>
<% end %>
<%= hidden_field_tag :expand_all, true, disabled: !user_filtering.expanded?, data: { toggle_enable_target: "element" } %>
<%= form.button type: "submit", class: "popup__item btn" do %>
<span class="overflow-ellipsis flex-item-grow"><%= user.name %></span>
app/views/filters/settings/_indexed_by.html.erb
+1 -3
View File
@@ -21,9 +21,7 @@
<%= hidden_field_tag :indexed_by, index %>
<% if user_filtering.expanded? %>
<%= hidden_field_tag :expand_all, user_filtering.expanded? %>
<% end %>
<%= hidden_field_tag :expand_all, true, disabled: !user_filtering.expanded?, data: { toggle_enable_target: "element" } %>
<%= form.button type: "submit", class: "popup__item btn" do %>
<span class="overflow-ellipsis flex-item-grow"><%= index.humanize %></span>
app/views/filters/settings/_sorted_by.html.erb
+1 -3
View File
@@ -21,9 +21,7 @@
<%= hidden_field_tag :sorted_by, sort %>
<% if user_filtering.expanded? %>
<%= hidden_field_tag :expand_all, user_filtering.expanded? %>
<% end %>
<%= hidden_field_tag :expand_all, true, disabled: !user_filtering.expanded?, data: { toggle_enable_target: "element" } %>
<%= form.button type: "submit", class: "popup__item btn" do %>
<span class="overflow-ellipsis flex-item-grow"><%= sorted_by_label(sort) %></span>
app/views/filters/settings/_tags.html.erb
+1 -3
View File
@@ -38,9 +38,7 @@
<%= hidden_field_tag "tag_ids[]", tag.id %>
<% end %>
<% if user_filtering.expanded? %>
<%= hidden_field_tag :expand_all, user_filtering.expanded? %>
<% end %>
<%= hidden_field_tag :expand_all, true, disabled: !user_filtering.expanded?, data: { toggle_enable_target: "element" } %>
<%= form.button type: "submit", class: "popup__item btn" do %>
<span class="overflow-ellipsis flex-item-grow"><%= tag.hashtag %></span>
app/views/filters/settings/_toggle.html.erb
+2 -2
View File
@@ -1,11 +1,11 @@
<% filter = user_filtering.filter %>
<% if user_filtering.expanded? %>
<button type="button" class="btn txt-x-small btn--reversed" aria-selected="true" aria-label="Close filter options" data-action="toggle-class#toggle">
<button type="button" class="btn txt-x-small btn--reversed" aria-selected="true" aria-label="Close filter options" data-action="toggle-class#toggle toggle-enable#toggle">
<%= icon_tag "filter" %>
</button>
<% else %>
<button type="button" class="btn txt-x-small" aria-label="Expand filter options" data-action="toggle-class#toggle">
<button type="button" class="btn txt-x-small" aria-label="Expand filter options" data-action="toggle-class#toggle toggle-enable#toggle">
<%= icon_tag "filter" %>
</button>
<% end %>