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.

Improve admin bulk operation dialog loading

Damian Legawiecd96cb0fce078
diff --git a/admin/app/controllers/spree/admin/bulk_operations_controller.rb b/admin/app/controllers/spree/admin/bulk_operations_controller.rb
index 015747cce4..e99c56591d 100644
--- a/admin/app/controllers/spree/admin/bulk_operations_controller.rb
+++ b/admin/app/controllers/spree/admin/bulk_operations_controller.rb
@@ -18,8 +18,6 @@ module Spree
@form_partial_locals = @bulk_action.form_partial_locals || {}
@button_text = @bulk_action.resolve_button_text
@button_class = @bulk_action.button_class
-
- render partial: 'spree/admin/shared/bulk_modal_content'
end
private
diff --git a/admin/app/views/spree/admin/shared/_bulk_modal_content.html.erb b/admin/app/views/spree/admin/bulk_operations/new.html.erb
similarity index 73%
rename from admin/app/views/spree/admin/shared/_bulk_modal_content.html.erb
rename to admin/app/views/spree/admin/bulk_operations/new.html.erb
index 2d1c087fd6..802fab60be 100644
--- a/admin/app/views/spree/admin/shared/_bulk_modal_content.html.erb
+++ b/admin/app/views/spree/admin/bulk_operations/new.html.erb
@@ -1,4 +1,3 @@
-<%# @form_partial is sourced from registered BulkAction configuration, not user input %>
<%= turbo_frame_tag :bulk_dialog do %>
<%= dialog_header(@title, 'bulk-dialog') %>
<div class="dialog-body overflow-visible">
@@ -7,7 +6,6 @@
<% end %>
<% if @form_partial.present? %>
- <%# brakeman:disable:Render - @form_partial comes from BulkAction registry, not params %>
<%= render partial: @form_partial, locals: @form_partial_locals || {} %>
<% end %>
</div>
diff --git a/admin/app/views/spree/admin/shared/_bulk_modal.html.erb b/admin/app/views/spree/admin/shared/_bulk_modal.html.erb
index c8078a8778..0bdb60216d 100644
--- a/admin/app/views/spree/admin/shared/_bulk_modal.html.erb
+++ b/admin/app/views/spree/admin/shared/_bulk_modal.html.erb
@@ -1,12 +1,13 @@
-<dialog class="dialog overflow-visible" data-bulk-dialog-target="dialog" id="bulk-dialog">
+<dialog class="dialog" data-bulk-dialog-target="dialog" id="bulk-dialog">
<%= turbo_frame_tag :bulk_dialog do %>
<%= dialog_header(Spree.t(:loading), 'bulk-dialog') %>
- <div class="dialog-body text-center overflow-visible">
- <%= render 'spree/admin/shared/spinner' %>
- </div>
- <div class="dialog-footer">
- <%= dialog_discard_button('bulk-dialog') %>
- <%= turbo_save_button_tag %>
+ <div class="dialog-body text-center">
+ <div class="flex flex-col w-full h-full items-center justify-center">
+ <div class="inline-block w-8 h-8 border-4 border-current border-r-transparent rounded-full animate-spin text-gray-300 align-middle opacity-50 mb-3" role="status">
+ <span class="sr-only"><%= Spree.t(:loading) %>...</span>
+ </div>
+ <span class="text-gray-300"><%= Spree.t(:loading) %>...</span>
+ </div>
</div>
<% end %>
</dialog>
diff --git a/admin/app/views/spree/admin/shared/_spinner.html.erb b/admin/app/views/spree/admin/shared/_spinner.html.erb
index f5588ff619..d85dfc9334 100644
--- a/admin/app/views/spree/admin/shared/_spinner.html.erb
+++ b/admin/app/views/spree/admin/shared/_spinner.html.erb
@@ -1,6 +1,6 @@
<% spinner_id = defined?(id) ? id : 'turbo-spinner' %>
-<div class="flex flex-col w-full h-full min-h-[300px] items-center justify-center" id="<%= spinner_id %>">
+<div class="flex flex-col w-full h-full min-h-[200px] items-center justify-center" id="<%= spinner_id %>">
<div class="inline-block w-8 h-8 border-4 border-current border-r-transparent rounded-full animate-spin text-gray-300 align-middle opacity-50 mb-3" role="status">
<span class="sr-only"><%= Spree.t(:loading) %>...</span>
</div>
diff --git a/admin/config/brakeman.ignore b/admin/config/brakeman.ignore
deleted file mode 100644
index 9cb1b73df3..0000000000
--- a/admin/config/brakeman.ignore
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "ignored_warnings": [
- {
- "fingerprint": "a79f90265cecf812d03f170da32bf27c2b68fcb14fe1317ad22b17a01bfc252d",
- "note": "form_partial comes from BulkAction registry configuration, not directly from user input. The params[:kind] and params[:table_key] are used to look up a pre-registered BulkAction object from the tables registry, and only the form_partial attribute from that registered configuration is rendered."
- }
- ],
- "updated": "2026-01-09",
- "brakeman_version": "7.1.2"
-}
diff --git a/admin/spec/controllers/spree/admin/bulk_operations_controller_spec.rb b/admin/spec/controllers/spree/admin/bulk_operations_controller_spec.rb
index 503a42d418..ef3e082bcf 100644
--- a/admin/spec/controllers/spree/admin/bulk_operations_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/bulk_operations_controller_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe Spree::Admin::BulkOperationsController, type: :controller do
end
it 'renders the bulk modal content partial' do
- expect(subject).to render_template(partial: 'spree/admin/shared/_bulk_modal_content')
+ expect(subject).to render_template 'spree/admin/bulk_operations/new'
end
it 'assigns bulk action attributes' do