Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
FIX preserve search, filters, and sort across admin table forms (#13805)
Damian Legawiec5880bd1bf2bf
diff --git a/spree/admin/app/helpers/spree/admin/table_helper.rb b/spree/admin/app/helpers/spree/admin/table_helper.rbindex 9a22673bbd..529692b71c 100644--- a/spree/admin/app/helpers/spree/admin/table_helper.rb+++ b/spree/admin/app/helpers/spree/admin/table_helper.rb@@ -394,8 +394,11 @@ module Spreeenddef sort_dropdown_item(label, sort_value, is_active, current_q)+ url_params = { q: current_q.merge(s: sort_value) }+ url_params[:query_state] = params[:query_state] if params[:query_state].present?+link_to(- url_for(q: current_q.merge(s: sort_value)),+ url_for(url_params),class: "dropdown-item flex items-center justify-between #{'active' if is_active}",data: { turbo_action: 'advance' }) dodiff --git a/spree/admin/app/views/spree/admin/tables/_query_builder.html.erb b/spree/admin/app/views/spree/admin/tables/_query_builder.html.erbindex fe9e54683d..04292ec31b 100644--- a/spree/admin/app/views/spree/admin/tables/_query_builder.html.erb+++ b/spree/admin/app/views/spree/admin/tables/_query_builder.html.erb@@ -24,6 +24,23 @@class="grow flex flex-col justify-between"><%= form_with url: url_for, method: :get, html: { class: 'grow flex flex-col justify-between' }, data: { turbo_frame: frame_name, turbo_action: 'advance', query_builder_target: 'form', action: 'submit->query-builder#submitForm' } do |f| %>+ <%# Preserve search and date range state when applying filters %>+ <% search_param = table.respond_to?(:search_param) ? table.search_param : :name_cont %>+ <% if params.dig(:q, search_param).present? %>+ <%= hidden_field_tag "q[#{search_param}]", params.dig(:q, search_param) %>+ <% end %>+ <% date_range_param = table.date_range_param %>+ <% if date_range_param.present? %>+ <% if params.dig(:q, :"#{date_range_param}_gt").present? %>+ <%= hidden_field_tag "q[#{date_range_param}_gt]", params.dig(:q, :"#{date_range_param}_gt") %>+ <% end %>+ <% if params.dig(:q, :"#{date_range_param}_lt").present? %>+ <%= hidden_field_tag "q[#{date_range_param}_lt]", params.dig(:q, :"#{date_range_param}_lt") %>+ <% end %>+ <% end %>+ <% if params.dig(:q, :s).present? %>+ <%= hidden_field_tag "q[s]", params.dig(:q, :s) %>+ <% end %><div class="drawer-body"><div class="mb-4 flex items-center gap-2 flex-wrap"><span class="text-sm text-gray-600">diff --git a/spree/admin/app/views/spree/admin/tables/_table.html.erb b/spree/admin/app/views/spree/admin/tables/_table.html.erbindex a70d9d12a1..b3bfbdd871 100644--- a/spree/admin/app/views/spree/admin/tables/_table.html.erb+++ b/spree/admin/app/views/spree/admin/tables/_table.html.erb@@ -27,6 +27,23 @@<%= icon 'x', class: 'w-4 h-4' %></button></div>+ <%# Preserve query builder filter state when submitting search %>+ <% if params[:query_state].present? %>+ <%= hidden_field_tag :query_state, params[:query_state] %>+ <% end %>+ <%# Preserve date range filter state when submitting search %>+ <% if date_range_param.present? %>+ <% if params.dig(:q, :"#{date_range_param}_gt").present? %>+ <%= hidden_field_tag "q[#{date_range_param}_gt]", params.dig(:q, :"#{date_range_param}_gt") %>+ <% end %>+ <% if params.dig(:q, :"#{date_range_param}_lt").present? %>+ <%= hidden_field_tag "q[#{date_range_param}_lt]", params.dig(:q, :"#{date_range_param}_lt") %>+ <% end %>+ <% end %>+ <%# Preserve sort order when submitting search %>+ <% if params.dig(:q, :s).present? %>+ <%= hidden_field_tag "q[s]", params.dig(:q, :s) %>+ <% end %><% end %></div>@@ -39,6 +56,16 @@date_from_value: params.dig(:q, :"#{date_range_param}_gt"),date_to_value: params.dig(:q, :"#{date_range_param}_lt"),css_classes: "btn-light btn-sm dropdown-toggle h-[2.125rem]" %>+ <%# Preserve search and filter state when submitting date range %>+ <% if params.dig(:q, search_param).present? %>+ <%= hidden_field_tag "q[#{search_param}]", params.dig(:q, search_param) %>+ <% end %>+ <% if params[:query_state].present? %>+ <%= hidden_field_tag :query_state, params[:query_state] %>+ <% end %>+ <% if params.dig(:q, :s).present? %>+ <%= hidden_field_tag "q[s]", params.dig(:q, :s) %>+ <% end %><% end %><% end %><%= render 'spree/admin/tables/query_builder', table: table, table_key: table_key, frame_name: frame_name %>diff --git a/spree/admin/spec/features/spree/admin/products/products_spec.rb b/spree/admin/spec/features/spree/admin/products/products_spec.rbindex 674bf0d308..54d2a384a3 100644--- a/spree/admin/spec/features/spree/admin/products/products_spec.rb+++ b/spree/admin/spec/features/spree/admin/products/products_spec.rb@@ -27,6 +27,47 @@ describe 'Products', type: :feature doendcontext 'listing products' do+ # Regression test for #13789+ context 'search preserves filters', js: true do+ let!(:active_cap) { create(:product, name: 'apache baseball cap', status: 'active') }+ let!(:active_shirt) { create(:product, name: 'zomg shirt', status: 'active') }+ let!(:draft_product) { create(:product, name: 'apache draft hat', status: 'draft') }++ it 'preserves query_state filters when searching' do+ query_state = { combinator: 'and', filters: [{ id: '1', field: 'status', operator: 'eq', value: 'active' }], groups: [] }.to_json+ visit spree.admin_products_path(query_state: query_state)++ # Only active products should be visible+ expect(page).to have_content('apache baseball cap')+ expect(page).to have_content('zomg shirt')+ expect(page).not_to have_content('apache draft hat')++ # Type in search box — filters should be preserved+ fill_in 'products-table-search-input', with: 'apache'+ wait_for_turbo++ # Should show only active products matching search+ expect(page).to have_content('apache baseball cap')+ expect(page).not_to have_content('zomg shirt')+ expect(page).not_to have_content('apache draft hat')++ # Verify query_state is still present in the page+ expect(page).to have_css('input[name="query_state"]', visible: :all)+ end++ it 'preserves search text when applying filters' do+ visit spree.admin_products_path(q: { search: 'apache' })++ # Only products matching search should be visible+ expect(page).to have_content('apache baseball cap')+ expect(page).to have_content('apache draft hat')+ expect(page).not_to have_content('zomg shirt')++ # Verify search text is still in the hidden field within the query builder form+ expect(page).to have_css('input[name="q[search]"][value="apache"]', visible: :all)+ end+ end+context 'sorting' dobefore docreate(:product, name: 'apache baseball cap', price: 10)