From 71f4f0b42c93479a102caee66d7e32b70632ba90 Mon Sep 17 00:00:00 2001
From: andrea longhi <andrea@spaghetticode.it>
Date: Tue, 5 Mar 2024 11:31:31 +0100
Subject: [PATCH 01/13] Manage order email dialog with turbo frame tag

---
 .../components/solidus_admin/orders/show/component.html.erb | 6 +++++-
 admin/app/components/solidus_admin/orders/show/component.rb | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/admin/app/components/solidus_admin/orders/show/component.html.erb b/admin/app/components/solidus_admin/orders/show/component.html.erb
index f2e8cbbee8b..274d35f6a02 100644
--- a/admin/app/components/solidus_admin/orders/show/component.html.erb
+++ b/admin/app/components/solidus_admin/orders/show/component.html.erb
@@ -16,7 +16,7 @@
 
     <%= page_with_sidebar_aside do %>
       <%= render component('ui/panel').new do |panel| %>
-        <% panel.with_menu t(".edit_email"), solidus_admin.order_customer_path(@order) %>
+        <% panel.with_menu t(".edit_email"), solidus_admin.order_customer_path(@order), data: { turbo_frame: :edit_order_email_modal } %>
         <% panel.with_menu t(".edit_shipping"), solidus_admin.edit_order_ship_address_path(@order) %>
         <% panel.with_menu t(".edit_billing"), solidus_admin.edit_order_bill_address_path(@order) %>
         <% panel.with_menu t(".remove_customer"), solidus_admin.order_customer_path(@order), method: :delete, class: "text-red-500" if @order.user %>
@@ -73,4 +73,8 @@
 
     <% end %>
   <% end %>
+
+  <% turbo_frames.each do |frame| %>
+    <%= turbo_frame_tag frame %>
+  <% end %>
 <% end %>
diff --git a/admin/app/components/solidus_admin/orders/show/component.rb b/admin/app/components/solidus_admin/orders/show/component.rb
index ba9cf656f0b..20b1df72c03 100644
--- a/admin/app/components/solidus_admin/orders/show/component.rb
+++ b/admin/app/components/solidus_admin/orders/show/component.rb
@@ -29,6 +29,10 @@ def format_address(address)
     ], " ")
   end
 
+  def turbo_frames
+    %w[edit_order_email_modal]
+  end
+
   def customer_name(user)
     (
       user.default_user_bill_address ||

From 8b0bfbe00c885d235a1abddfaa1caff5fe585253 Mon Sep 17 00:00:00 2001
From: andrea longhi <andrea@spaghetticode.it>
Date: Tue, 5 Mar 2024 11:34:54 +0100
Subject: [PATCH 02/13] Close email edit modal on current page

We can remove all this custom behavior since we want the modal to
be rendered async on top of the current page.
---
 .../solidus_admin/orders/show/email/component.html.erb    | 8 +++++---
 .../solidus_admin/orders/show/email/component.rb          | 4 ----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/admin/app/components/solidus_admin/orders/show/email/component.html.erb b/admin/app/components/solidus_admin/orders/show/email/component.html.erb
index ca6023404e2..74861ee6d61 100644
--- a/admin/app/components/solidus_admin/orders/show/email/component.html.erb
+++ b/admin/app/components/solidus_admin/orders/show/email/component.html.erb
@@ -1,7 +1,7 @@
 <div class="<%= stimulus_id %>">
   <%= render component("orders/show").new(order: @order) %>
-  <%= render component("ui/modal").new(title: t(".title"), close_path: close_path) do |modal| %>
-    <%= form_for @order, url: close_path, html: { id: form_id} do |f| %>
+  <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
+    <%= form_for @order, url: solidus_admin.order_path(@order), html: { id: form_id } do |f| %>
       <%= render component("ui/forms/field").text_field(f, :email) %>
       <label class="font-normal text-sm mt-4 block">
         <%= t('.guest_checkout') %>:
@@ -11,7 +11,9 @@
     <% end %>
 
     <% modal.with_actions do %>
-      <%= render component("ui/button").new(tag: :a, scheme: :secondary, href: close_path, type: :submit, text: t('.cancel')) %>
+      <form method="dialog">
+        <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
+      </form>
       <%= render component("ui/button").new(form: form_id, type: :submit, text: t('.submit')) %>
     <% end %>
   <% end %>
diff --git a/admin/app/components/solidus_admin/orders/show/email/component.rb b/admin/app/components/solidus_admin/orders/show/email/component.rb
index 02dc30f313c..556a332fcfc 100644
--- a/admin/app/components/solidus_admin/orders/show/email/component.rb
+++ b/admin/app/components/solidus_admin/orders/show/email/component.rb
@@ -8,8 +8,4 @@ def initialize(order:)
   def form_id
     dom_id(@order, "#{stimulus_id}_email_form")
   end
-
-  def close_path
-    @close_path ||= solidus_admin.order_path(@order)
-  end
 end

From 195a57325bd1d5c01b66646e85ef0d0935e2699b Mon Sep 17 00:00:00 2001
From: andrea longhi <andrea@spaghetticode.it>
Date: Tue, 5 Mar 2024 11:56:47 +0100
Subject: [PATCH 03/13] Wrap order email modal with turbo frame tag

This way, the modal can be loaded async into the current page.

Please note that the order page rendering, which is discarded on
turbo-frame calls, needs to be moved to the bottom, as it includes
an empty turbo frame tag with same ID that would interfere with the
modal rendering.
---
 .../orders/show/email/component.html.erb      | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/admin/app/components/solidus_admin/orders/show/email/component.html.erb b/admin/app/components/solidus_admin/orders/show/email/component.html.erb
index 74861ee6d61..3e6c0e52e76 100644
--- a/admin/app/components/solidus_admin/orders/show/email/component.html.erb
+++ b/admin/app/components/solidus_admin/orders/show/email/component.html.erb
@@ -1,20 +1,23 @@
 <div class="<%= stimulus_id %>">
-  <%= render component("orders/show").new(order: @order) %>
-  <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @order, url: solidus_admin.order_path(@order), html: { id: form_id } do |f| %>
-      <%= render component("ui/forms/field").text_field(f, :email) %>
-      <label class="font-normal text-sm mt-4 block">
-        <%= t('.guest_checkout') %>:
-        <output class="font-semibold text-sm"><%= @order.user ? t('.no') : t('.yes') %></output>
-        <%= render component('ui/toggletip').new(text: t('.guest_checkout_tip'), class: "align-middle") %>
-      </label>
-    <% end %>
+  <%= turbo_frame_tag "edit_order_email_modal" do %>
+    <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
+      <%= form_for @order, url: solidus_admin.order_path(@order), html: { id: form_id } do |f| %>
+        <%= render component("ui/forms/field").text_field(f, :email) %>
+        <label class="font-normal text-sm mt-4 block">
+          <%= t('.guest_checkout') %>:
+          <output class="font-semibold text-sm"><%= @order.user ? t('.no') : t('.yes') %></output>
+          <%= render component('ui/toggletip').new(text: t('.guest_checkout_tip'), class: "align-middle") %>
+        </label>
+      <% end %>
 
-    <% modal.with_actions do %>
-      <form method="dialog">
-        <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
-      </form>
-      <%= render component("ui/button").new(form: form_id, type: :submit, text: t('.submit')) %>
+      <% modal.with_actions do %>
+        <form method="dialog">
+          <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
+        </form>
+        <%= render component("ui/button").new(form: form_id, type: :submit, text: t('.submit')) %>
+      <% end %>
     <% end %>
   <% end %>
+
+  <%= render component("orders/show").new(order: @order) %>
 </div>

From 29861b6efc2e2b4c041509ea8aad858cd9976a32 Mon Sep 17 00:00:00 2001
From: andrea longhi <andrea@spaghetticode.it>
Date: Tue, 5 Mar 2024 11:39:43 +0100
Subject: [PATCH 04/13] Use Turbo features in order modal controllers

The `respond_to` block is required to make Turbo frames and streams
work.

With this change, the order edit modal can be rendered async on top
of the calling page (order edit). Form submission, when successful,
triggers a turbo stream page refresh, updating contents (namely the
order email) while preserving the scroll position.
---
 admin/app/controllers/solidus_admin/customers_controller.rb | 6 +++++-
 admin/app/controllers/solidus_admin/orders_controller.rb    | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/admin/app/controllers/solidus_admin/customers_controller.rb b/admin/app/controllers/solidus_admin/customers_controller.rb
index 07e34cd95b1..af79d4d483a 100644
--- a/admin/app/controllers/solidus_admin/customers_controller.rb
+++ b/admin/app/controllers/solidus_admin/customers_controller.rb
@@ -4,7 +4,11 @@ class SolidusAdmin::CustomersController < SolidusAdmin::BaseController
   before_action :load_order, only: [:show, :destroy]
 
   def show
-    render component('orders/show/email').new(order: @order)
+    respond_to do |format|
+      format.html do
+        render component('orders/show/email').new(order: @order)
+      end
+    end
   end
 
   def destroy
diff --git a/admin/app/controllers/solidus_admin/orders_controller.rb b/admin/app/controllers/solidus_admin/orders_controller.rb
index 4fd9313bac9..0b2df6cb324 100644
--- a/admin/app/controllers/solidus_admin/orders_controller.rb
+++ b/admin/app/controllers/solidus_admin/orders_controller.rb
@@ -54,7 +54,11 @@ def update
         flash[:error] = t('.error')
       end
 
-      redirect_to spree.edit_admin_order_path(@order)
+      respond_to do |format|
+        format.html { redirect_to spree.edit_admin_order_path(@order) }
+
+        format.turbo_stream { render turbo_stream: '<turbo-stream action="refresh" />' }
+      end
     end
 
     def edit

From 855cf7fee273c68915511e1f45c4bf4924985fd5 Mon Sep 17 00:00:00 2001
From: andrea longhi <andrea@spaghetticode.it>
Date: Tue, 5 Mar 2024 12:27:46 +0100
Subject: [PATCH 05/13] Enable turbo frames for address modals

URLs for editing addresses are handled via turbo frames, enclosing
the modals inside their appropriate turbo frame tag addded on the
page.
---
 .../components/solidus_admin/orders/show/component.html.erb | 4 ++--
 admin/app/components/solidus_admin/orders/show/component.rb | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/admin/app/components/solidus_admin/orders/show/component.html.erb b/admin/app/components/solidus_admin/orders/show/component.html.erb
index 274d35f6a02..e2cdc78df48 100644
--- a/admin/app/components/solidus_admin/orders/show/component.html.erb
+++ b/admin/app/components/solidus_admin/orders/show/component.html.erb
@@ -17,8 +17,8 @@
     <%= page_with_sidebar_aside do %>
       <%= render component('ui/panel').new do |panel| %>
         <% panel.with_menu t(".edit_email"), solidus_admin.order_customer_path(@order), data: { turbo_frame: :edit_order_email_modal } %>
-        <% panel.with_menu t(".edit_shipping"), solidus_admin.edit_order_ship_address_path(@order) %>
-        <% panel.with_menu t(".edit_billing"), solidus_admin.edit_order_bill_address_path(@order) %>
+        <% panel.with_menu t(".edit_shipping"), solidus_admin.edit_order_ship_address_path(@order), data: { turbo_frame: :edit_order_ship_address_modal } %>
+        <% panel.with_menu t(".edit_billing"), solidus_admin.edit_order_bill_address_path(@order), data: { turbo_frame: :edit_order_bill_address_modal } %>
         <% panel.with_menu t(".remove_customer"), solidus_admin.order_customer_path(@order), method: :delete, class: "text-red-500" if @order.user %>
 
         <% panel.with_section(class: 'flex flex-col gap-6') do %>
diff --git a/admin/app/components/solidus_admin/orders/show/component.rb b/admin/app/components/solidus_admin/orders/show/component.rb
index 20b1df72c03..7279d93cc70 100644
--- a/admin/app/components/solidus_admin/orders/show/component.rb
+++ b/admin/app/components/solidus_admin/orders/show/component.rb
@@ -30,7 +30,11 @@ def format_address(address)
   end
 
   def turbo_frames
-    %w[edit_order_email_modal]
+    %w[
+      edit_order_email_modal
+      edit_order_bill_address_modal
+      edit_order_ship_address_modal
+    ]
   end
 
   def customer_name(user)

From 478e633a55979b420080d8809d6c6f54dd7183c0 Mon Sep 17 00:00:00 2001
From: andrea longhi <andrea@spaghetticode.it>
Date: Tue, 5 Mar 2024 12:28:13 +0100
Subject: [PATCH 06/13] Revisit address modal to work with turbo frames

Just like we did a few comments before with the order email modal.
---
 .../orders/show/address/component.html.erb    | 110 +++++++++---------
 1 file changed, 56 insertions(+), 54 deletions(-)

diff --git a/admin/app/components/solidus_admin/orders/show/address/component.html.erb b/admin/app/components/solidus_admin/orders/show/address/component.html.erb
index 13059d4e6c0..b47c32a6548 100644
--- a/admin/app/components/solidus_admin/orders/show/address/component.html.erb
+++ b/admin/app/components/solidus_admin/orders/show/address/component.html.erb
@@ -1,67 +1,69 @@
 <div class="<%= stimulus_id %>" data-controller="<%= stimulus_id %>">
-  <%= render component("orders/show").new(order: @order) %>
-
-  <%= render component("ui/modal").new(title: t(".title.#{@type}"), close_path: solidus_admin.order_path(@order)) do |modal| %>
-    <%= form_for @order, url: solidus_admin.send("order_#{@type}_address_path", @order), html: { id: form_id } do |form| %>
-      <div class="w-full flex flex-col mb-4">
-        <div class="flex justify-between items-center mb-4 relative">
-          <h2 class="text-sm font-semibold">
-            <%= t(".subtitle.#{@type}") %>
-          </h2>
+  <%= turbo_frame_tag "edit_order_#{params[:type]}_address_modal" do %>
+    <%= render component("ui/modal").new(title: t(".title.#{@type}")) do |modal| %>
+      <%= form_for @order, url: solidus_admin.send("order_#{@type}_address_path", @order), html: { id: form_id } do |form| %>
+        <div class="w-full flex flex-col mb-4">
+          <div class="flex justify-between items-center mb-4 relative">
+            <h2 class="text-sm font-semibold">
+              <%= t(".subtitle.#{@type}") %>
+            </h2>
 
-          <% if @addresses.present? %>
-            <%= render component('ui/dropdown').new(
-              text: t(".select_address"),
-              "data-#{stimulus_id}-target": "addresses",
-              class: "max-h-[26rem] overflow-y-auto"
-            ) do %>
-              <% @addresses.each do |address| %>
-                <%= tag.a(
-                  format_address(address),
-                  href: solidus_admin.send("order_#{@type}_address_path", @order, address_id: address.id),
-                  'data-turbo-frame': address_frame_id,
-                  'data-action': "#{component('ui/dropdown').stimulus_id}#close",
-                ) %>
+            <% if @addresses.present? %>
+              <%= render component('ui/dropdown').new(
+                text: t(".select_address"),
+                "data-#{stimulus_id}-target": "addresses",
+                class: "max-h-[26rem] overflow-y-auto"
+              ) do %>
+                <% @addresses.each do |address| %>
+                  <%= tag.a(
+                    format_address(address),
+                    href: solidus_admin.send("order_#{@type}_address_path", @order, address_id: address.id),
+                    'data-turbo-frame': address_frame_id,
+                    'data-action': "#{component('ui/dropdown').stimulus_id}#close",
+                  ) %>
+                <% end %>
               <% end %>
             <% end %>
-          <% end %>
-        </div>
+          </div>
 
-        <div class="w-full flex gap-4">
-          <%= turbo_frame_tag address_frame_id do %>
-            <%= render component('ui/forms/address').new(address: @address, name: "order[#{@type}_address_attributes]") %>
-          <% end %>
-        </div>
+          <div class="w-full flex gap-4">
+            <%= turbo_frame_tag address_frame_id do %>
+              <%= render component('ui/forms/address').new(address: @address, name: "order[#{@type}_address_attributes]") %>
+            <% end %>
+          </div>
 
-        <label class="flex gap-2 items-center">
-          <%= form.hidden_field use_attribute, value: '0', id: false %>
+          <label class="flex gap-2 items-center">
+            <%= form.hidden_field use_attribute, value: '0', id: false %>
 
-          <%= render component("ui/forms/checkbox").new(
-            name: "#{form.object_name}[#{use_attribute}]",
-            checked: @address == (@type == 'ship' ? @order.bill_address : @order.ship_address),
-            value: '1'
-          ) %>
+            <%= render component("ui/forms/checkbox").new(
+              name: "#{form.object_name}[#{use_attribute}]",
+              checked: @address == (@type == 'ship' ? @order.bill_address : @order.ship_address),
+              value: '1'
+            ) %>
 
-          <span class="font-normal text-xs">
-            <%= t(".use_this_address.#{@type}") %>
-          </span>
-        </label>
-      </div>
-    <% end %>
+            <span class="font-normal text-xs">
+              <%= t(".use_this_address.#{@type}") %>
+            </span>
+          </label>
+        </div>
+      <% end %>
 
-    <% modal.with_actions do %>
-      <%= render component("ui/button").new(
-        tag: :a,
-        scheme: :secondary,
-        text: t(".cancel"),
-        href: solidus_admin.order_path(@order)
-      ) %>
+      <% modal.with_actions do %>
+        <form method="dialog">
+          <%= render component("ui/button").new(
+            scheme: :secondary,
+            text: t(".cancel"),
+          ) %>
+        </form>
 
-      <%= render component("ui/button").new(
-        tag: :button,
-        text: t(".save"),
-        form: form_id
-      ) %>
+        <%= render component("ui/button").new(
+          tag: :button,
+          text: t(".save"),
+          form: form_id
+        ) %>
+      <% end %>
     <% end %>
   <% end %>
+
+  <%= render component("orders/show").new(order: @order) %>
 </div>

From 2e9888147a130ac7abe94f5c223c3db13a656211 Mon Sep 17 00:00:00 2001
From: andrea longhi <andrea@spaghetticode.it>
Date: Tue, 5 Mar 2024 12:29:30 +0100
Subject: [PATCH 07/13] Turbo refresh on successful address edit

---
 .../app/controllers/solidus_admin/addresses_controller.rb  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/admin/app/controllers/solidus_admin/addresses_controller.rb b/admin/app/controllers/solidus_admin/addresses_controller.rb
index 817d2c1f7be..88749621ae9 100644
--- a/admin/app/controllers/solidus_admin/addresses_controller.rb
+++ b/admin/app/controllers/solidus_admin/addresses_controller.rb
@@ -26,7 +26,12 @@ def edit
 
     def update
       if @order.contents.update_cart(order_params)
-        redirect_to order_path(@order), status: :see_other, notice: t('.success')
+        respond_to do |format|
+          flash[:notice] = t('.success')
+
+          format.html { redirect_to order_path(@order), status: :see_other }
+          format.turbo_stream { render turbo_stream: '<turbo-stream action="refresh" />' }
+        end
       else
         flash.now[:error] = @order.errors[:base].join(", ") if @order.errors[:base].any?
 

From 8e4c4e3632b1438cbeed1fec9d9b57bdb69c3e20 Mon Sep 17 00:00:00 2001
From: andrea longhi <andrea@spaghetticode.it>
Date: Tue, 5 Mar 2024 15:19:43 +0100
Subject: [PATCH 08/13] Enable turbo frame links in URL params

`Turbo.visit` already supports turbo frames, so we just need a way
to pass the information from the table HTML to the `visit` call.

This implementation, although arbitrary and possibly questionable,
has the merit of being simple, meaning that enabling turbo frames
in a table row requires just to update the URL to include the
`_turbo_frame` param. This param is removed from the URL, so it
won't have any possible further side effect in the application.
---
 .../app/components/solidus_admin/ui/table/component.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/admin/app/components/solidus_admin/ui/table/component.js b/admin/app/components/solidus_admin/ui/table/component.js
index 47065712993..faba92015de 100644
--- a/admin/app/components/solidus_admin/ui/table/component.js
+++ b/admin/app/components/solidus_admin/ui/table/component.js
@@ -104,7 +104,15 @@ export default class extends Controller {
     if (this.modeValue === "batch") {
       this.toggleCheckbox(event.currentTarget)
     } else {
-      window.Turbo.visit(event.params.url)
+      const url = new URL(event.params.url, "http://dummy.com")
+      const params = new URLSearchParams(url.search)
+      const frameId = params.get('_turbo_frame')
+      const frame = frameId ? { frame: frameId } : {}
+      // remove the custom _turbo_frame param from url search:
+      params.delete('_turbo_frame')
+      url.search = params.toString()
+
+      window.Turbo.visit(url.pathname + url.search, frame)
     }
   }
 

From 8f9f3336e020a391773cdf788796af5f14192782 Mon Sep 17 00:00:00 2001
From: andrea longhi <andrea@spaghetticode.it>
Date: Tue, 5 Mar 2024 15:38:57 +0100
Subject: [PATCH 09/13] Add turbo frame to stock item table rows

TR elements can have only TH and TD descendants, so we made table
rows linkable via Stimulus. Since A tags cannot be used for making
the row linkable, we can't leverage the default Turbo frame
functionality provided via the `data-turbo-frame` attribute.

For this reason, a workaround has been implemented with the previous
commit.
---
 .../components/solidus_admin/stock_items/index/component.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/admin/app/components/solidus_admin/stock_items/index/component.rb b/admin/app/components/solidus_admin/stock_items/index/component.rb
index 2ad4e782dd7..23b24fc56a1 100644
--- a/admin/app/components/solidus_admin/stock_items/index/component.rb
+++ b/admin/app/components/solidus_admin/stock_items/index/component.rb
@@ -14,7 +14,7 @@ def search_url
   end
 
   def row_url(stock_item)
-    solidus_admin.edit_stock_item_path(stock_item, page: params[:page], q: permitted_query_params)
+    solidus_admin.edit_stock_item_path(stock_item, _turbo_frame: :edit_stock_item_modal)
   end
 
   def scopes
@@ -171,4 +171,8 @@ def permitted_query_params
     return params[:q].permit! if params[:q].respond_to?(:permit)
     {}
   end
+
+  def turbo_frames
+    %w[edit_stock_item_modal]
+  end
 end

From 2257d9bcf872e2c7c932910ff19a55e39ed297b6 Mon Sep 17 00:00:00 2001
From: andrea longhi <andrea@spaghetticode.it>
Date: Tue, 5 Mar 2024 15:43:59 +0100
Subject: [PATCH 10/13] Rework stock item form modal

Since the modal open and closes on the current page, close links are
not needed anymore. Same goes for the explicit q and page params.

The `Cancel` button is simplified to use dialog standards.
---
 .../stock_items/edit/component.html.erb       | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/admin/app/components/solidus_admin/stock_items/edit/component.html.erb b/admin/app/components/solidus_admin/stock_items/edit/component.html.erb
index 6e6d9f55703..8c45b141768 100644
--- a/admin/app/components/solidus_admin/stock_items/edit/component.html.erb
+++ b/admin/app/components/solidus_admin/stock_items/edit/component.html.erb
@@ -3,7 +3,7 @@
   data-<%= stimulus_id %>-initial-count-on-hand-value="<%= @stock_item.count_on_hand_was || @stock_item.count_on_hand %>"
   data-action="input-><%= stimulus_id %>#updateCountOnHand"
 >
-  <%= render component("ui/modal").new(title: t(".title"), close_path: solidus_admin.stock_items_path(page: params[:page], q: permitted_query_params)) do |modal| %>
+  <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
     <%= form_for @stock_item, url: solidus_admin.stock_item_path(@stock_item), html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
         <div class="flex gap-4">
@@ -58,24 +58,16 @@
           checked: f.object.backorderable?,
           include_hidden: true,
         ) %>
-
-        <% if params[:q] %>
-          <%= f.hidden_field :q, value: params[:q].to_json, id: false %>
-        <% end %>
-
-        <% if params[:page] %>
-          <%= f.hidden_field :page, value: params[:page], id: false %>
-        <% end %>
       </div>
     <% end %>
 
     <% modal.with_actions do %>
-      <%= render component("ui/button").new(
-        tag: :a,
-        scheme: :secondary,
-        text: t(".cancel"),
-        href: solidus_admin.stock_items_path(page: params[:page], q: params[:q]),
-      ) %>
+      <form method="dialog">
+        <%= render component("ui/button").new(
+          scheme: :secondary,
+          text: t(".cancel"),
+        ) %>
+      </form>
 
       <%= render component("ui/button").new(
         tag: :button,

From b837c1ca2b129c2981bc2b9e4f6b58eed67429a8 Mon Sep 17 00:00:00 2001
From: andrea longhi <andrea@spaghetticode.it>
Date: Tue, 5 Mar 2024 15:49:01 +0100
Subject: [PATCH 11/13] Wrap stock edit dialog with turbo frame tag

Separated from the previous commit for easing reviews.
---
 .../stock_items/edit/component.html.erb       | 128 +++++++++---------
 1 file changed, 65 insertions(+), 63 deletions(-)

diff --git a/admin/app/components/solidus_admin/stock_items/edit/component.html.erb b/admin/app/components/solidus_admin/stock_items/edit/component.html.erb
index 8c45b141768..64a8d7cc594 100644
--- a/admin/app/components/solidus_admin/stock_items/edit/component.html.erb
+++ b/admin/app/components/solidus_admin/stock_items/edit/component.html.erb
@@ -3,77 +3,79 @@
   data-<%= stimulus_id %>-initial-count-on-hand-value="<%= @stock_item.count_on_hand_was || @stock_item.count_on_hand %>"
   data-action="input-><%= stimulus_id %>#updateCountOnHand"
 >
-  <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @stock_item, url: solidus_admin.stock_item_path(@stock_item), html: { id: form_id } do |f| %>
-      <div class="flex flex-col gap-6 pb-4">
-        <div class="flex gap-4">
-          <%= link_to spree.edit_admin_product_variant_path(
-            @stock_item.variant.product,
-            @stock_item.variant,
-          ), class: 'hover:bg-gray-25 rounded p-1 w-1/2 border border-gray-100' do %>
-            <%= render component("ui/resource_item").new(
-              thumbnail:
-                (
-                  @stock_item.variant.images.first ||
-                    @stock_item.variant.product.gallery.images.first
-                )&.url(:small),
-              title: @stock_item.variant.name,
-              subtitle:
-                "#{@stock_item.variant.sku}#{@stock_item.variant.options_text.presence&.prepend(" - ")}",
-            ) %>
-          <% end %>
-          <%= link_to spree.edit_admin_stock_location_path(@stock_item.stock_location), class: 'hover:bg-gray-25 rounded p-1 w-1/2 border border-gray-100' do %>
-            <%= render component("ui/resource_item").new(
-              title: @stock_item.stock_location.name,
-              subtitle: "#{Spree::StockLocation.model_name.human} #{@stock_item.stock_location.code}",
+  <%= turbo_frame_tag :edit_stock_item_modal do %>
+    <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
+      <%= form_for @stock_item, url: solidus_admin.stock_item_path(@stock_item), html: { id: form_id } do |f| %>
+        <div class="flex flex-col gap-6 pb-4">
+          <div class="flex gap-4">
+            <%= link_to spree.edit_admin_product_variant_path(
+              @stock_item.variant.product,
+              @stock_item.variant,
+            ), class: 'hover:bg-gray-25 rounded p-1 w-1/2 border border-gray-100' do %>
+              <%= render component("ui/resource_item").new(
+                thumbnail:
+                  (
+                    @stock_item.variant.images.first ||
+                      @stock_item.variant.product.gallery.images.first
+                  )&.url(:small),
+                title: @stock_item.variant.name,
+                subtitle:
+                  "#{@stock_item.variant.sku}#{@stock_item.variant.options_text.presence&.prepend(" - ")}",
+              ) %>
+            <% end %>
+            <%= link_to spree.edit_admin_stock_location_path(@stock_item.stock_location), class: 'hover:bg-gray-25 rounded p-1 w-1/2 border border-gray-100' do %>
+              <%= render component("ui/resource_item").new(
+                title: @stock_item.stock_location.name,
+                subtitle: "#{Spree::StockLocation.model_name.human} #{@stock_item.stock_location.code}",
+              ) %>
+            <% end %>
+          </div>
+
+          <%= render component("ui/forms/field").text_field(
+            f,
+            :count_on_hand,
+            disabled: true,
+            value: @stock_item.count_on_hand_was || @stock_item.count_on_hand,
+            "data-#{stimulus_id}-target": 'countOnHand',
+          ) %>
+          <%= render component("ui/forms/field").new(
+            label: t(".quantity_adjustment"),
+            hint: t(".quantity_adjustment_hint_html"),
+          ) do %>
+            <%= render component("ui/forms/input").new(
+              value: params[:quantity_adjustment] || 0,
+              name: :quantity_adjustment,
+              type: :number,
+              step: 1,
+              "data-#{stimulus_id}-target": 'quantityAdjustment',
             ) %>
           <% end %>
-        </div>
 
-        <%= render component("ui/forms/field").text_field(
-          f,
-          :count_on_hand,
-          disabled: true,
-          value: @stock_item.count_on_hand_was || @stock_item.count_on_hand,
-          "data-#{stimulus_id}-target": 'countOnHand',
-        ) %>
-        <%= render component("ui/forms/field").new(
-          label: t(".quantity_adjustment"),
-          hint: t(".quantity_adjustment_hint_html"),
-        ) do %>
-          <%= render component("ui/forms/input").new(
-            value: params[:quantity_adjustment] || 0,
-            name: :quantity_adjustment,
-            type: :number,
-            step: 1,
-            "data-#{stimulus_id}-target": 'quantityAdjustment',
+          <%= render component("ui/forms/switch_field").new(
+            name: "#{f.object_name}[backorderable]",
+            label: Spree::StockItem.human_attribute_name(:backorderable),
+            error: f.object.errors[:backorderable],
+            hint: t(".backorderable_hint_html"),
+            checked: f.object.backorderable?,
+            include_hidden: true,
           ) %>
-        <% end %>
+        </div>
+      <% end %>
 
-        <%= render component("ui/forms/switch_field").new(
-          name: "#{f.object_name}[backorderable]",
-          label: Spree::StockItem.human_attribute_name(:backorderable),
-          error: f.object.errors[:backorderable],
-          hint: t(".backorderable_hint_html"),
-          checked: f.object.backorderable?,
-          include_hidden: true,
-        ) %>
-      </div>
-    <% end %>
+      <% modal.with_actions do %>
+        <form method="dialog">
+          <%= render component("ui/button").new(
+            scheme: :secondary,
+            text: t(".cancel"),
+          ) %>
+        </form>
 
-    <% modal.with_actions do %>
-      <form method="dialog">
         <%= render component("ui/button").new(
-          scheme: :secondary,
-          text: t(".cancel"),
+          tag: :button,
+          text: t(".submit"),
+          form: form_id,
         ) %>
-      </form>
-
-      <%= render component("ui/button").new(
-        tag: :button,
-        text: t(".submit"),
-        form: form_id,
-      ) %>
+      <% end %>
     <% end %>
   <% end %>
 

From 71569de4d6699ffc1c008a28085e0d40d1457b32 Mon Sep 17 00:00:00 2001
From: andrea longhi <andrea@spaghetticode.it>
Date: Tue, 5 Mar 2024 15:50:14 +0100
Subject: [PATCH 12/13] Remove explicit handling of q and page params

With the modal managed via turbo frame and turbo stream refresh,
all this custom explicit params management is not needed anymore.
---
 .../solidus_admin/stock_items/edit/component.rb          | 5 -----
 .../solidus_admin/stock_items/index/component.rb         | 5 -----
 .../controllers/solidus_admin/stock_items_controller.rb  | 9 +++------
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/admin/app/components/solidus_admin/stock_items/edit/component.rb b/admin/app/components/solidus_admin/stock_items/edit/component.rb
index 95a63cf2628..3573444d413 100644
--- a/admin/app/components/solidus_admin/stock_items/edit/component.rb
+++ b/admin/app/components/solidus_admin/stock_items/edit/component.rb
@@ -15,9 +15,4 @@ def title
   def form_id
     "#{stimulus_id}-#{dom_id(@stock_item)}"
   end
-
-  def permitted_query_params
-    return params[:q].permit! if params[:q].respond_to?(:permit)
-    {}
-  end
 end
diff --git a/admin/app/components/solidus_admin/stock_items/index/component.rb b/admin/app/components/solidus_admin/stock_items/index/component.rb
index 23b24fc56a1..b9c306f82dc 100644
--- a/admin/app/components/solidus_admin/stock_items/index/component.rb
+++ b/admin/app/components/solidus_admin/stock_items/index/component.rb
@@ -167,11 +167,6 @@ def count_on_hand_column
     }
   end
 
-  def permitted_query_params
-    return params[:q].permit! if params[:q].respond_to?(:permit)
-    {}
-  end
-
   def turbo_frames
     %w[edit_stock_item_modal]
   end
diff --git a/admin/app/controllers/solidus_admin/stock_items_controller.rb b/admin/app/controllers/solidus_admin/stock_items_controller.rb
index 5dbb46b0534..9defdea4265 100644
--- a/admin/app/controllers/solidus_admin/stock_items_controller.rb
+++ b/admin/app/controllers/solidus_admin/stock_items_controller.rb
@@ -26,14 +26,11 @@ def edit
 
     def update
       quantity_adjustment = params[:quantity_adjustment].to_i
-      @stock_item.assign_attributes(stock_item_params.except(:page, :q))
+      @stock_item.assign_attributes(stock_item_params)
       @stock_item.stock_movements.build(quantity: quantity_adjustment, originator: current_solidus_admin_user)
 
       if @stock_item.save
-        redirect_to solidus_admin.stock_items_path(
-          page: stock_item_params[:page].to_i.presence,
-          q: stock_item_params[:q].presence&.then { |q| JSON.parse(q) }
-        ), status: :see_other
+        redirect_to solidus_admin.stock_items_path, status: :see_other
       else
         respond_to do |format|
           format.html { render component('stock_items/edit').new(stock_item: @stock_item, page: @page), status: :unprocessable_entity }
@@ -61,7 +58,7 @@ def load_stock_item
     end
 
     def stock_item_params
-      params.require(:stock_item).permit(:backorderable, :page, :q)
+      params.require(:stock_item).permit(:backorderable)
     end
   end
 end

From 8de68cbd817e5094cc992d3fbf24729f38e261b0 Mon Sep 17 00:00:00 2001
From: andrea longhi <andrea@spaghetticode.it>
Date: Thu, 7 Mar 2024 09:54:00 +0100
Subject: [PATCH 13/13] Refesh page on successful stock item update

---
 .../app/controllers/solidus_admin/stock_items_controller.rb  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin/app/controllers/solidus_admin/stock_items_controller.rb b/admin/app/controllers/solidus_admin/stock_items_controller.rb
index 9defdea4265..1333dbe672c 100644
--- a/admin/app/controllers/solidus_admin/stock_items_controller.rb
+++ b/admin/app/controllers/solidus_admin/stock_items_controller.rb
@@ -30,7 +30,10 @@ def update
       @stock_item.stock_movements.build(quantity: quantity_adjustment, originator: current_solidus_admin_user)
 
       if @stock_item.save
-        redirect_to solidus_admin.stock_items_path, status: :see_other
+        respond_to do |format|
+          format.html { redirect_to solidus_admin.stock_items_path, status: :see_other }
+          format.turbo_stream { render turbo_stream: '<turbo-stream action="refresh" />' }
+        end
       else
         respond_to do |format|
           format.html { render component('stock_items/edit').new(stock_item: @stock_item, page: @page), status: :unprocessable_entity }