Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Fix admin export to apply filters correctly (#13616)

Damian Legawiec0af96c490661
diff --git a/backend/engines/admin/app/views/spree/admin/tables/_table.html.erb b/backend/engines/admin/app/views/spree/admin/tables/_table.html.erb
index 5c3189f086..a70d9d12a1 100644
--- a/backend/engines/admin/app/views/spree/admin/tables/_table.html.erb
+++ b/backend/engines/admin/app/views/spree/admin/tables/_table.html.erb
@@ -6,11 +6,10 @@
<% search_placeholder = (table.respond_to?(:search_placeholder) && table.search_placeholder) || [Spree.t(:search), controller_name.humanize.downcase].join(' ') %>
<% date_range_param = table.date_range_param %>
-<% if export_type.present? %>
- <%= render 'spree/admin/shared/export_modal', export_type: export_type %>
-<% end %>
-
<%= turbo_frame_tag frame_name, data: { turbo_action: 'advance' } do %>
+ <% if export_type.present? %>
+ <%= render 'spree/admin/shared/export_modal', export_type: export_type %>
+ <% end %>
<div class="<%= local_assigns[:container_class] || 'card-lg' %>" data-controller="table" data-table-url-value="<%= request.path %>">
<div class="p-3 border-b border-gray-200">
<div class="flex flex-col lg:flex-row gap-3 items-start lg:items-center justify-between">
diff --git a/backend/engines/admin/spec/controllers/spree/admin/products_controller_spec.rb b/backend/engines/admin/spec/controllers/spree/admin/products_controller_spec.rb
index 42b2309a42..89e45a3519 100644
--- a/backend/engines/admin/spec/controllers/spree/admin/products_controller_spec.rb
+++ b/backend/engines/admin/spec/controllers/spree/admin/products_controller_spec.rb
@@ -75,6 +75,17 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller do
expect(response).to be_successful
end
+
+ it 'renders the export dialog inside the table turbo frame with search params' do
+ get :index, params: { q: { multi_search: 'test-filter' } }
+
+ doc = Nokogiri::HTML(response.body)
+ table_frame = doc.at_css('turbo-frame#products')
+ export_frame = table_frame&.at_css('turbo-frame#export_dialog')
+
+ expect(export_frame).to be_present
+ expect(CGI.unescape(export_frame['src'])).to include('test-filter')
+ end
end
describe 'sorting by price' do