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.

Feature: Turbo Confirm Dialog

Damian Legawieccaa1f7053e4f
diff --git a/admin/app/javascript/spree/admin/application.js b/admin/app/javascript/spree/admin/application.js
index d8ac4896a5..4353cc840b 100644
--- a/admin/app/javascript/spree/admin/application.js
+++ b/admin/app/javascript/spree/admin/application.js
@@ -16,6 +16,7 @@ import "mapkick/bundle"
// Helpers
import 'spree/admin/helpers/tinymce'
import 'spree/admin/helpers/trix/video_embed'
+import 'spree/admin/helpers/turbo_confirm'
// Stimulus controllers
import { Application } from "@hotwired/stimulus"
diff --git a/admin/app/javascript/spree/admin/helpers/turbo_confirm.js b/admin/app/javascript/spree/admin/helpers/turbo_confirm.js
new file mode 100644
index 0000000000..43751b1e94
--- /dev/null
+++ b/admin/app/javascript/spree/admin/helpers/turbo_confirm.js
@@ -0,0 +1,38 @@
+// Custom Turbo confirm dialog
+// Replaces browser native confirm() with a styled dialog
+
+export function initTurboConfirm() {
+ const dialog = document.getElementById("turbo-confirm-dialog")
+ const messageElement = document.getElementById("turbo-confirm-message")
+ const confirmButton = document.getElementById("turbo-confirm-button")
+
+ if (!dialog || !messageElement || !confirmButton) return
+
+ Turbo.config.forms.confirm = (message, element, submitter) => {
+ messageElement.textContent = message
+
+ // Allow custom button text via data-turbo-confirm-button attribute
+ const buttonText = submitter?.dataset.turboConfirmButton || element?.dataset.turboConfirmButton || "Confirm"
+ confirmButton.textContent = buttonText
+
+ // Allow custom button class via data-turbo-confirm-button-class attribute
+ const buttonClass = submitter?.dataset.turboConfirmButtonClass || element?.dataset.turboConfirmButtonClass
+ if (buttonClass) {
+ confirmButton.className = `btn ${buttonClass}`
+ } else {
+ confirmButton.className = "btn btn-primary"
+ }
+
+ dialog.showModal()
+
+ return new Promise((resolve) => {
+ dialog.addEventListener("close", () => {
+ resolve(dialog.returnValue === "confirm")
+ }, { once: true })
+ })
+ }
+}
+
+// Initialize on DOMContentLoaded and turbo:load
+document.addEventListener("DOMContentLoaded", initTurboConfirm)
+document.addEventListener("turbo:load", initTurboConfirm)
diff --git a/admin/app/views/layouts/spree/admin.html.erb b/admin/app/views/layouts/spree/admin.html.erb
index b8d928ba80..a31f3d0f90 100644
--- a/admin/app/views/layouts/spree/admin.html.erb
+++ b/admin/app/views/layouts/spree/admin.html.erb
@@ -25,6 +25,7 @@
<%= render "spree/admin/shared/dialog" %>
</main>
<%= render "spree/admin/shared/alerts" %>
+ <%= render "spree/admin/shared/turbo_confirm_dialog" %>
<%= render_admin_partials(:body_end_partials) %>
</body>
diff --git a/admin/app/views/layouts/spree/admin_settings.html.erb b/admin/app/views/layouts/spree/admin_settings.html.erb
index 1b25907d45..78704db78c 100644
--- a/admin/app/views/layouts/spree/admin_settings.html.erb
+++ b/admin/app/views/layouts/spree/admin_settings.html.erb
@@ -28,6 +28,7 @@
</main>
<%= render "spree/admin/shared/dialog" %>
<%= render "spree/admin/shared/alerts" %>
+ <%= render "spree/admin/shared/turbo_confirm_dialog" %>
<%= render_admin_partials(:body_end_partials) %>
</body>
diff --git a/admin/app/views/layouts/spree/admin_wizard.html.erb b/admin/app/views/layouts/spree/admin_wizard.html.erb
index 12133c68f4..0a44bc0456 100644
--- a/admin/app/views/layouts/spree/admin_wizard.html.erb
+++ b/admin/app/views/layouts/spree/admin_wizard.html.erb
@@ -27,6 +27,7 @@
<%= render 'spree/admin/shared/drawer' %>
<%= render "spree/admin/shared/dialog" %>
<%= render "spree/admin/shared/alerts" %>
+ <%= render "spree/admin/shared/turbo_confirm_dialog" %>
<%= render_admin_partials(:body_end_partials) %>
</body>
diff --git a/admin/app/views/layouts/spree/minimal.html.erb b/admin/app/views/layouts/spree/minimal.html.erb
index 3a6af11635..af95ec3c83 100644
--- a/admin/app/views/layouts/spree/minimal.html.erb
+++ b/admin/app/views/layouts/spree/minimal.html.erb
@@ -18,5 +18,6 @@
</div>
<%= render "spree/admin/shared/dialog" %>
<%= render "spree/admin/shared/alerts" %>
+ <%= render "spree/admin/shared/turbo_confirm_dialog" %>
</body>
</html>
diff --git a/admin/app/views/spree/admin/price_lists/index.html.erb b/admin/app/views/spree/admin/price_lists/index.html.erb
index cbd2229712..905a5b801d 100644
--- a/admin/app/views/spree/admin/price_lists/index.html.erb
+++ b/admin/app/views/spree/admin/price_lists/index.html.erb
@@ -9,4 +9,4 @@
<%= render_admin_partials(:price_lists_header_partials) %>
-<%= render_table @collection, :price_lists %>
+<%= render_table @collection, :price_lists, sortable: true %>
diff --git a/admin/app/views/spree/admin/price_lists/show.html.erb b/admin/app/views/spree/admin/price_lists/show.html.erb
index 94f6317afb..5e8d83c99e 100644
--- a/admin/app/views/spree/admin/price_lists/show.html.erb
+++ b/admin/app/views/spree/admin/price_lists/show.html.erb
@@ -6,23 +6,23 @@
<% content_for :page_actions do %>
<% if (@price_list.draft? || @price_list.inactive?) && can?(:activate, @price_list) %>
<% if @price_list.starts_at.present? %>
- <%= link_to spree.activate_admin_price_list_path(@price_list), class: 'btn btn-primary', data: { turbo_method: :put, turbo_confirm: Spree.t('admin.price_lists.confirm_schedule') } do %>
+ <%= link_to spree.activate_admin_price_list_path(@price_list), class: 'btn btn-primary', data: { turbo_method: :put, turbo_confirm: Spree.t('admin.price_lists.confirm_schedule'), turbo_confirm_button: Spree.t('admin.price_lists.schedule') } do %>
<%= icon('calendar-event', class: 'mr-1') %>
<%= Spree.t('admin.price_lists.schedule') %>
<% end %>
<% else %>
- <%= link_to spree.activate_admin_price_list_path(@price_list), class: 'btn btn-primary', data: { turbo_method: :put, turbo_confirm: Spree.t('admin.price_lists.confirm_activate') } do %>
+ <%= link_to spree.activate_admin_price_list_path(@price_list), class: 'btn btn-primary', data: { turbo_method: :put, turbo_confirm: Spree.t('admin.price_lists.confirm_activate'), turbo_confirm_button: Spree.t('admin.price_lists.activate') } do %>
<%= icon('player-play', class: 'mr-1') %>
<%= Spree.t('admin.price_lists.activate') %>
<% end %>
<% end %>
<% elsif @price_list.active? && can?(:deactivate, @price_list) %>
- <%= link_to spree.deactivate_admin_price_list_path(@price_list), class: 'btn btn-light', data: { turbo_method: :put, turbo_confirm: Spree.t('admin.price_lists.confirm_deactivate') } do %>
+ <%= link_to spree.deactivate_admin_price_list_path(@price_list), class: 'btn btn-light', data: { turbo_method: :put, turbo_confirm: Spree.t('admin.price_lists.confirm_deactivate'), turbo_confirm_button: Spree.t('admin.price_lists.deactivate') } do %>
<%= icon('player-pause', class: 'mr-1') %>
<%= Spree.t('admin.price_lists.deactivate') %>
<% end %>
<% elsif @price_list.scheduled? && can?(:deactivate, @price_list) %>
- <%= link_to spree.deactivate_admin_price_list_path(@price_list), class: 'btn btn-light', data: { turbo_method: :put, turbo_confirm: Spree.t('admin.price_lists.confirm_unschedule') } do %>
+ <%= link_to spree.deactivate_admin_price_list_path(@price_list), class: 'btn btn-light', data: { turbo_method: :put, turbo_confirm: Spree.t('admin.price_lists.confirm_unschedule'), turbo_confirm_button: Spree.t('admin.price_lists.unschedule') } do %>
<%= icon('calendar-off', class: 'mr-1') %>
<%= Spree.t('admin.price_lists.unschedule') %>
<% end %>
diff --git a/admin/app/views/spree/admin/shared/_turbo_confirm_dialog.html.erb b/admin/app/views/spree/admin/shared/_turbo_confirm_dialog.html.erb
new file mode 100644
index 0000000000..25d156d369
--- /dev/null
+++ b/admin/app/views/spree/admin/shared/_turbo_confirm_dialog.html.erb
@@ -0,0 +1,23 @@
+<dialog id="turbo-confirm-dialog" class="dialog" data-dialog-target="dialog" data-controller="dialog">
+ <div class="dialog-header">
+ <h5 class="dialog-title"><%= Spree.t(:are_you_sure) %></h5>
+ <form method="dialog">
+ <button type="submit" value="cancel" class="btn-close" aria-label="<%= Spree.t(:close) %>"></button>
+ </form>
+ </div>
+ <div class="dialog-body">
+ <p id="turbo-confirm-message" class="text-base text-gray-700 m-0"></p>
+ </div>
+ <div class="dialog-footer">
+ <form method="dialog">
+ <button type="submit" value="cancel" class="btn btn-light">
+ <%= Spree.t(:cancel) %>
+ </button>
+ </form>
+ <form method="dialog">
+ <button type="submit" value="confirm" id="turbo-confirm-button" class="btn btn-primary">
+ <%= Spree.t(:confirm) %>
+ </button>
+ </form>
+ </div>
+</dialog>
diff --git a/admin/lib/spree/admin/testing_support/capybara_utils.rb b/admin/lib/spree/admin/testing_support/capybara_utils.rb
index 5404c02b30..8eab0d10b0 100644
--- a/admin/lib/spree/admin/testing_support/capybara_utils.rb
+++ b/admin/lib/spree/admin/testing_support/capybara_utils.rb
@@ -54,6 +54,47 @@ module Spree
# The old headless mode is better but still needs a brief render pause
sleep 0.3
end
+
+ # Handles the custom turbo confirm dialog
+ # Replaces accept_confirm for elements using data-turbo-confirm
+ #
+ # @example
+ # accept_turbo_confirm { click_on 'Delete' }
+ #
+ # @param timeout [Integer] seconds to wait for the dialog
+ # @yield the block containing the action that triggers the confirm dialog
+ def accept_turbo_confirm(timeout: 5, &block)
+ yield
+
+ # Wait for the confirm dialog to open
+ dialog_selector = '#turbo-confirm-dialog'
+ has_css?("#{dialog_selector}[open]", visible: :all, wait: timeout)
+
+ # Click the confirm button
+ within(dialog_selector) do
+ click_button 'turbo-confirm-button'
+ end
+ end
+
+ # Dismisses the custom turbo confirm dialog by clicking cancel
+ #
+ # @example
+ # dismiss_turbo_confirm { click_on 'Delete' }
+ #
+ # @param timeout [Integer] seconds to wait for the dialog
+ # @yield the block containing the action that triggers the confirm dialog
+ def dismiss_turbo_confirm(timeout: 5, &block)
+ yield
+
+ # Wait for the confirm dialog to open
+ dialog_selector = '#turbo-confirm-dialog'
+ has_css?("#{dialog_selector}[open]", visible: :all, wait: timeout)
+
+ # Click the cancel button
+ within(dialog_selector) do
+ click_button class: 'btn-light'
+ end
+ end
end
end
end
diff --git a/admin/spec/features/spree/admin/orders/destroy_order_spec.rb b/admin/spec/features/spree/admin/orders/destroy_order_spec.rb
index 9826996b64..7978ae887b 100644
--- a/admin/spec/features/spree/admin/orders/destroy_order_spec.rb
+++ b/admin/spec/features/spree/admin/orders/destroy_order_spec.rb
@@ -11,9 +11,9 @@ describe 'Destroy Order Spec', type: :feature, js: true do
visit spree.edit_admin_order_path(order)
within('#page_actions_dropdown') do
click_on 'more-actions-link'
- accept_confirm do
- click_on 'Delete'
- end
+ end
+ accept_turbo_confirm do
+ click_on 'Delete'
end
expect(page).to have_content('Order has been successfully removed!')
diff --git a/admin/spec/features/spree/admin/settings/shipping_categories_spec.rb b/admin/spec/features/spree/admin/settings/shipping_categories_spec.rb
index 2644b4e989..74501b0e7d 100644
--- a/admin/spec/features/spree/admin/settings/shipping_categories_spec.rb
+++ b/admin/spec/features/spree/admin/settings/shipping_categories_spec.rb
@@ -45,7 +45,7 @@ RSpec.feature 'Shipping categories' do
click_on 'Edit'
wait_for_turbo
- accept_confirm do
+ accept_turbo_confirm do
click_on 'Delete'
end
diff --git a/admin/spec/features/spree/admin/settings/shipping_methods_spec.rb b/admin/spec/features/spree/admin/settings/shipping_methods_spec.rb
index 158ddf7d29..8aab07a2f2 100644
--- a/admin/spec/features/spree/admin/settings/shipping_methods_spec.rb
+++ b/admin/spec/features/spree/admin/settings/shipping_methods_spec.rb
@@ -79,7 +79,7 @@ RSpec.feature 'Shipping methods', js: true do
visit spree.edit_admin_shipping_method_path(shipping_method)
- accept_confirm do
+ accept_turbo_confirm do
click_on 'Delete'
end
diff --git a/admin/spec/features/spree/admin/settings/stock_locations_spec.rb b/admin/spec/features/spree/admin/settings/stock_locations_spec.rb
index 7011235125..239d1c32a1 100644
--- a/admin/spec/features/spree/admin/settings/stock_locations_spec.rb
+++ b/admin/spec/features/spree/admin/settings/stock_locations_spec.rb
@@ -43,7 +43,7 @@ RSpec.feature 'Stock Locations', js: true do
it 'allows to delete a stock location' do
visit spree.edit_admin_stock_location_path(stock_location)
- accept_confirm do
+ accept_turbo_confirm do
click_on 'Delete'
end
expect(page).to have_content("Location \"#{stock_location.name}\" has been successfully removed!")
diff --git a/admin/spec/features/spree/admin/settings/tax_categories_spec.rb b/admin/spec/features/spree/admin/settings/tax_categories_spec.rb
index 05ee99d53b..5582f45cf5 100644
--- a/admin/spec/features/spree/admin/settings/tax_categories_spec.rb
+++ b/admin/spec/features/spree/admin/settings/tax_categories_spec.rb
@@ -64,7 +64,7 @@ RSpec.feature 'Tax categories' do
click_on 'Edit'
wait_for_turbo
- accept_confirm do
+ accept_turbo_confirm do
click_on 'Delete'
end
diff --git a/admin/spec/features/spree/admin/settings/tax_rates_spec.rb b/admin/spec/features/spree/admin/settings/tax_rates_spec.rb
index cafa79a268..4bf1a09207 100644
--- a/admin/spec/features/spree/admin/settings/tax_rates_spec.rb
+++ b/admin/spec/features/spree/admin/settings/tax_rates_spec.rb
@@ -84,7 +84,7 @@ RSpec.feature 'Tax Rates', js: true do
click_on 'Edit'
wait_for_turbo
- accept_confirm do
+ accept_turbo_confirm do
click_on 'Delete'
end
diff --git a/packages/page_builder/app/views/layouts/spree/page_builder.html.erb b/packages/page_builder/app/views/layouts/spree/page_builder.html.erb
index 5517217cc5..34b95f4f7d 100644
--- a/packages/page_builder/app/views/layouts/spree/page_builder.html.erb
+++ b/packages/page_builder/app/views/layouts/spree/page_builder.html.erb
@@ -41,5 +41,6 @@
<%= render 'spree/admin/shared/dialog' %>
<%= render 'spree/admin/shared/alerts' %>
+ <%= render "spree/admin/shared/turbo_confirm_dialog" %>
</body>
</html>