From 57ec0b849d305c21f14e234ed58adccbda7ccf8c Mon Sep 17 00:00:00 2001
From: Rainer Dema <rainer.dema@gmail.com>
Date: Tue, 14 Nov 2023 14:26:07 +0100
Subject: [PATCH 1/6] Extend `ui/forms/field` component for string form names

Updated `ui/forms/field` to support string form names and objects,
in addition to form objects.
Added `extract_form_details` method for handling argument extraction
and validation.
---
 .../orders/show/address/component.html.erb    |  4 +-
 .../orders/show/address/component.rb          |  3 +-
 .../ui/forms/address/component.html.erb       | 24 +++++-----
 .../ui/forms/address/component.rb             |  9 ++--
 .../solidus_admin/ui/forms/field/component.rb | 47 +++++++++++++------
 .../solidus_admin/addresses_controller.rb     | 11 ++++-
 .../orders/show/address/component_preview.rb  |  3 +-
 .../component_preview/overview.html.erb       |  2 +-
 .../ui/forms/address/component_preview.rb     | 13 +++--
 .../component_preview/overview.html.erb       |  4 +-
 10 files changed, 76 insertions(+), 44 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 f8a547ac963..1a341f0ca1c 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
@@ -5,9 +5,7 @@
       <div class="w-full flex flex-col mb-4">
         <h2 class="text-sm mb-4 font-semibold"><%= t(".subtitle.#{@type}") %></h2>
         <div class="w-full flex gap-4">
-          <%= form.fields_for :"#{@type}_address" do |address_form| %>
-            <%= render component('ui/forms/address').new(form: address_form, disabled: false) %>
-          <% end %>
+          <%= render component('ui/forms/address').new(address: @address, name: "order[#{@type}_address_attributes]") %>
         </div>
 
         <label class="flex gap-2 items-center">
diff --git a/admin/app/components/solidus_admin/orders/show/address/component.rb b/admin/app/components/solidus_admin/orders/show/address/component.rb
index 6bb5970074b..dd434dc2b64 100644
--- a/admin/app/components/solidus_admin/orders/show/address/component.rb
+++ b/admin/app/components/solidus_admin/orders/show/address/component.rb
@@ -5,9 +5,10 @@ class SolidusAdmin::Orders::Show::Address::Component < SolidusAdmin::BaseCompone
 
   VALID_TYPES = ['ship', 'bill'].freeze
 
-  def initialize(order:, type: 'ship')
+  def initialize(order:, address:, type: 'ship')
     @order = order
     @type = validate_address_type(type)
+    @address = address
   end
 
   def form_id
diff --git a/admin/app/components/solidus_admin/ui/forms/address/component.html.erb b/admin/app/components/solidus_admin/ui/forms/address/component.html.erb
index e4c66ad6057..3567418ffb1 100644
--- a/admin/app/components/solidus_admin/ui/forms/address/component.html.erb
+++ b/admin/app/components/solidus_admin/ui/forms/address/component.html.erb
@@ -3,32 +3,34 @@
   <%= :disabled if @disabled %>
 >
   <div class="<%= stimulus_id %>--address-form flex flex-wrap gap-4 pb-4">
-    <%= render component("ui/forms/field").text_field(@form, :name) %>
-    <%= render component("ui/forms/field").text_field(@form, :address1) %>
-    <%= render component("ui/forms/field").text_field(@form, :address2) %>
+    <%= render component("ui/forms/field").text_field(@name, :name, object: @address) %>
+    <%= render component("ui/forms/field").text_field(@name, :address1, object: @address) %>
+    <%= render component("ui/forms/field").text_field(@name, :address2, object: @address) %>
     <div class="flex gap-4 w-full">
-      <%= render component("ui/forms/field").text_field(@form, :city) %>
-      <%= render component("ui/forms/field").text_field(@form, :zipcode) %>
+      <%= render component("ui/forms/field").text_field(@name, :city, object: @address) %>
+      <%= render component("ui/forms/field").text_field(@name, :zipcode, object: @address) %>
     </div>
 
     <%= render component("ui/forms/field").select(
-      @form,
+      @name,
       :country_id,
       Spree::Country.all.map { |c| [c.name, c.id] },
-      value: @form.object.try(:country_id),
+      object: @address,
+      value: @address.try(:country_id),
       "data-#{stimulus_id}-target": "country",
       "data-action": "change->#{stimulus_id}#loadStates"
     ) %>
 
     <%= render component("ui/forms/field").select(
-      @form,
+      @name,
       :state_id,
       state_options,
-      value: @form.object.try(:state_id),
-      disabled: @form.object.country&.states&.empty?,
+      object: @address,
+      value: @address.try(:state_id),
+      disabled: @address.country&.states&.empty?,
       "data-#{stimulus_id}-target": "state"
     ) %>
 
-    <%= render component("ui/forms/field").text_field(@form, :phone) %>
+    <%= render component("ui/forms/field").text_field(@name, :phone,  object: @address) %>
   </div>
 </fieldset>
diff --git a/admin/app/components/solidus_admin/ui/forms/address/component.rb b/admin/app/components/solidus_admin/ui/forms/address/component.rb
index 5aa67048967..fffe19e6d3a 100644
--- a/admin/app/components/solidus_admin/ui/forms/address/component.rb
+++ b/admin/app/components/solidus_admin/ui/forms/address/component.rb
@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
 class SolidusAdmin::UI::Forms::Address::Component < SolidusAdmin::BaseComponent
-  def initialize(form:, disabled: false)
-    @form = form
+  def initialize(address:, name:, disabled: false)
+    @address = address
+    @name = name
     @disabled = disabled
   end
 
   def state_options
-    return [] unless @form.object.country
-    @form.object.country.states.map { |s| [s.name, s.id] }
+    return [] unless @address.country
+    @address.country.states.map { |s| [s.name, s.id] }
   end
 end
diff --git a/admin/app/components/solidus_admin/ui/forms/field/component.rb b/admin/app/components/solidus_admin/ui/forms/field/component.rb
index b66c7cc1a97..a2bb0b300a1 100644
--- a/admin/app/components/solidus_admin/ui/forms/field/component.rb
+++ b/admin/app/components/solidus_admin/ui/forms/field/component.rb
@@ -12,61 +12,78 @@ def initialize(label:, hint: nil, tip: nil, error: nil, input_attributes: nil, *
     raise ArgumentError, "provide either a block or input_attributes" if content? && input_attributes
   end
 
-  def self.text_field(form, method, hint: nil, tip: nil, size: :m, **attributes)
-    errors = form.object.errors.messages_for(method).presence
+  def self.text_field(form, method, object: nil, hint: nil, tip: nil, size: :m, **attributes)
+    object_name, object, label, errors = extract_form_details(form, object, method)
 
     new(
-      label: form.object.class.human_attribute_name(method),
+      label: label,
       hint: hint,
       tip: tip,
       error: errors,
       input_attributes: {
-        name: "#{form.object_name}[#{method}]",
+        name: "#{object_name}[#{method}]",
         tag: :input,
         size: size,
-        value: form.object.public_send(method),
+        value: object.public_send(method),
         error: (errors.to_sentence.capitalize if errors),
         **attributes,
       }
     )
   end
 
-  def self.select(form, method, choices, hint: nil, tip: nil, size: :m, **attributes)
-    errors = form.object.errors.messages_for(method).presence
+  def self.select(form, method, choices, object: nil, hint: nil, tip: nil, size: :m, **attributes)
+    object_name, object, label, errors = extract_form_details(form, object, method)
 
     new(
-      label: form.object.class.human_attribute_name(method),
+      label: label,
       hint: hint,
       tip: tip,
       error: errors,
       input_attributes: {
-        name: "#{form.object_name}[#{method}]",
+        name: "#{object_name}[#{method}]",
         tag: :select,
         choices: choices,
         size: size,
-        value: form.object.public_send(method),
+        value: object.public_send(method),
         error: (errors.to_sentence.capitalize if errors),
         **attributes,
       }
     )
   end
 
-  def self.text_area(form, method, hint: nil, tip: nil, size: :m, **attributes)
-    errors = form.object.errors.messages_for(method).presence
+  def self.text_area(form, method, object: nil, hint: nil, tip: nil, size: :m, **attributes)
+    object_name, object, label, errors = extract_form_details(form, object, method)
 
     new(
-      label: form.object.class.human_attribute_name(method),
+      label: label,
       hint: hint,
       tip: tip,
       error: errors,
       input_attributes: {
-        name: "#{form.object_name}[#{method}]",
+        name: "#{object_name}[#{method}]",
         size: size,
         tag: :textarea,
-        value: form.object.public_send(method),
+        value: object.public_send(method),
         error: (errors.to_sentence.capitalize if errors),
         **attributes,
       }
     )
   end
+
+  def self.extract_form_details(form, object, method)
+    if form.is_a?(String)
+      object_name = form
+      raise ArgumentError, "Object must be provided when form name is a string" unless object
+    elsif form.respond_to?(:object)
+      object_name = form.object_name
+      object = form.object
+    else
+      raise ArgumentError, "Invalid arguments: expected a form object or form.object_name and form.object"
+    end
+
+    errors = object.errors.messages_for(method).presence if object.respond_to?(:errors)
+    label = object.class.human_attribute_name(method)
+
+    [object_name, object, label, errors]
+  end
 end
diff --git a/admin/app/controllers/solidus_admin/addresses_controller.rb b/admin/app/controllers/solidus_admin/addresses_controller.rb
index 8cbb7bfd3e2..5e86c734d9d 100644
--- a/admin/app/controllers/solidus_admin/addresses_controller.rb
+++ b/admin/app/controllers/solidus_admin/addresses_controller.rb
@@ -14,7 +14,7 @@ def new
       address.country_id ||= default_country_id if address.country.nil?
 
       respond_to do |format|
-        format.html { render component('orders/show/address').new(order: @order, type: address_type) }
+        format.html { render component('orders/show/address').new(order: @order, address: address, type: address_type) }
       end
     end
 
@@ -25,7 +25,14 @@ def update
         flash.now[:error] = @order.errors[:base].join(", ") if @order.errors[:base].any?
 
         respond_to do |format|
-          format.html { render component('orders/show/address').new(order: @order, type: address_type), status: :unprocessable_entity }
+          format.html do
+            render component('orders/show/address').new(
+              order: @order,
+              address: @order.send("#{address_type}_address"),
+              type: address_type,
+              status: :unprocessable_entity,
+            )
+          end
         end
       end
     end
diff --git a/admin/spec/components/previews/solidus_admin/orders/show/address/component_preview.rb b/admin/spec/components/previews/solidus_admin/orders/show/address/component_preview.rb
index 2120f317a95..4279afad087 100644
--- a/admin/spec/components/previews/solidus_admin/orders/show/address/component_preview.rb
+++ b/admin/spec/components/previews/solidus_admin/orders/show/address/component_preview.rb
@@ -11,6 +11,7 @@ def overview
     render_with_template(
       locals: {
         order: order,
+        address: order.send("#{type}_address"),
         type: type
       }
     )
@@ -19,7 +20,7 @@ def overview
   # @param type select :type_options
   def playground(type: "ship")
     order = fake_order(type)
-    render current_component.new(order: order, type: type)
+    render current_component.new(order: order, address: order.send("#{type}_address"), type: type)
   end
 
   private
diff --git a/admin/spec/components/previews/solidus_admin/orders/show/address/component_preview/overview.html.erb b/admin/spec/components/previews/solidus_admin/orders/show/address/component_preview/overview.html.erb
index 1f2f4e68235..a5b1b6ac203 100644
--- a/admin/spec/components/previews/solidus_admin/orders/show/address/component_preview/overview.html.erb
+++ b/admin/spec/components/previews/solidus_admin/orders/show/address/component_preview/overview.html.erb
@@ -1 +1 @@
-<%= render current_component.new(order: order, type: type) %>
+<%= render current_component.new(order: order, address: address, type: type) %>
diff --git a/admin/spec/components/previews/solidus_admin/ui/forms/address/component_preview.rb b/admin/spec/components/previews/solidus_admin/ui/forms/address/component_preview.rb
index e3bd6a00526..cba6252cd1b 100644
--- a/admin/spec/components/previews/solidus_admin/ui/forms/address/component_preview.rb
+++ b/admin/spec/components/previews/solidus_admin/ui/forms/address/component_preview.rb
@@ -5,15 +5,22 @@ class SolidusAdmin::UI::Forms::Address::ComponentPreview < ViewComponent::Previe
   include SolidusAdmin::Preview
 
   def overview
-    render_with_template
+    render_with_template(locals: { address: fake_address })
   end
 
   # @param disabled toggle
   def playground(disabled: false)
-    view = ActionView::Base.new(ActionView::LookupContext.new([]), {}, nil)
     render component("ui/forms/address").new(
-      form: ActionView::Helpers::FormBuilder.new(:address, Spree::Address.new, view, {}),
+      name: "",
+      address: fake_address,
       disabled: disabled
     )
   end
+
+  private
+
+  def fake_address
+    country = Spree::Country.find_or_initialize_by(iso: Spree::Config.default_country_iso)
+    Spree::Address.new(country: country)
+  end
 end
diff --git a/admin/spec/components/previews/solidus_admin/ui/forms/address/component_preview/overview.html.erb b/admin/spec/components/previews/solidus_admin/ui/forms/address/component_preview/overview.html.erb
index 8068d4ec9b7..057e6ed9a3f 100644
--- a/admin/spec/components/previews/solidus_admin/ui/forms/address/component_preview/overview.html.erb
+++ b/admin/spec/components/previews/solidus_admin/ui/forms/address/component_preview/overview.html.erb
@@ -1,3 +1 @@
-<%= form_for Spree::Address.new, url: '#' do |f| %>
-  <%= render current_component.new(form: f, disabled: false) %>
-<% end %>
+<%= render current_component.new(name: "", address: address) %>

From c6efd71b73b28ceee9281134b7b19ac5ee92ec12 Mon Sep 17 00:00:00 2001
From: Rainer Dema <rainer.dema@gmail.com>
Date: Tue, 14 Nov 2023 14:26:27 +0100
Subject: [PATCH 2/6] Refactor address controller by introducing a show action

Revisited the address handling in the controller by removing
the `new` action and consolidating its functionality into the
`show` action.
The show action now manages rendering of addresses by checking for:
  1. an existing `address_id` parameter
  2. using the order's address
  3. or building a new, non-persistent address.
---
 .../orders/show/component.html.erb            |  8 ++---
 .../solidus_admin/addresses_controller.rb     | 33 +++++++++++++++----
 admin/config/routes.rb                        |  4 +--
 3 files changed, 33 insertions(+), 12 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 a92fa6ea60c..cb585e8196d 100644
--- a/admin/app/components/solidus_admin/orders/show/component.html.erb
+++ b/admin/app/components/solidus_admin/orders/show/component.html.erb
@@ -16,8 +16,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) %>
-        <% panel.with_menu t(".edit_shipping"), solidus_admin.new_order_ship_address_path(@order) %>
-        <% panel.with_menu t(".edit_billing"), solidus_admin.new_order_bill_address_path(@order) %>
+        <% 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 %>
 
         <% panel.with_section(class: 'flex flex-col gap-6') do %>
@@ -49,7 +49,7 @@
               <% if @order.ship_address %>
                 <%= format_address @order.ship_address %>
               <% else %>
-                <%= link_to t(".add_shipping"), solidus_admin.new_order_ship_address_path(@order), class: 'body-link' %>
+                <%= link_to t(".add_shipping"), solidus_admin.edit_order_ship_address_path(@order), class: 'body-link' %>
               <% end %>
             </div>
           </div>
@@ -58,7 +58,7 @@
             <span class="body-small-bold"><%= @order.class.human_attribute_name(:bill_address) %></span>
             <div class="body-small">
               <% if @order.bill_address.blank? %>
-                <%= link_to t(".add_billing"), solidus_admin.new_order_bill_address_path(@order), class: 'body-link' %>
+                <%= link_to t(".add_billing"), solidus_admin.edit_order_bill_address_path(@order), class: 'body-link' %>
               <% elsif @order.bill_address == @order.ship_address %>
                 <span class="text-gray-500"><%= t('.same_as_shipping') %></span>
               <% else %>
diff --git a/admin/app/controllers/solidus_admin/addresses_controller.rb b/admin/app/controllers/solidus_admin/addresses_controller.rb
index 5e86c734d9d..0eef22fad42 100644
--- a/admin/app/controllers/solidus_admin/addresses_controller.rb
+++ b/admin/app/controllers/solidus_admin/addresses_controller.rb
@@ -7,17 +7,24 @@ class AddressesController < BaseController
     before_action :load_order
     before_action :validate_address_type
 
-    def new
-      address = @order.send("#{address_type}_address")
-      @order.send("build_#{address_type}_address", country_id: default_country_id) if address.nil?
-      address ||= @order.send("#{address_type}_address")
-      address.country_id ||= default_country_id if address.country.nil?
+    def show
+      address = find_address || build_new_address
 
       respond_to do |format|
-        format.html { render component('orders/show/address').new(order: @order, address: address, type: address_type) }
+        format.html do
+          render component('orders/show/address').new(
+            order: @order,
+            address: address,
+            type: address_type,
+          )
+        end
       end
     end
 
+    def edit
+      redirect_to action: :show
+    end
+
     def update
       if @order.contents.update_cart(order_params)
         redirect_to order_path(@order), status: :see_other, notice: t('.success')
@@ -39,6 +46,20 @@ def update
 
     private
 
+    def find_address
+      if params[:address_id].present? && @order.user
+        @order.user.addresses.find(params[:address_id])
+      else
+        @order.send("#{address_type}_address")
+      end
+    end
+
+    def build_new_address
+      @order.send("build_#{address_type}_address", country_id: default_country_id).tap do |address|
+        address.country_id ||= default_country_id if address.country.nil?
+      end
+    end
+
     def address_type
       params[:type].presence_in(%w[bill ship])
     end
diff --git a/admin/config/routes.rb b/admin/config/routes.rb
index d0c3a997fa9..6b45f676195 100644
--- a/admin/config/routes.rb
+++ b/admin/config/routes.rb
@@ -21,8 +21,8 @@
   resources :orders, only: [:index, :show, :edit, :update] do
     resources :line_items, only: [:destroy, :create, :update]
     resource :customer
-    resource :ship_address, only: [:new, :update], controller: "addresses", type: "ship"
-    resource :bill_address, only: [:new, :update], controller: "addresses", type: "bill"
+    resource :ship_address, only: [:show, :edit, :update], controller: "addresses", type: "ship"
+    resource :bill_address, only: [:show, :edit, :update], controller: "addresses", type: "bill"
 
     member do
       get :variants_for

From d24e4d1627f4ab73a9b91447933e8977d4df8039 Mon Sep 17 00:00:00 2001
From: Rainer Dema <rainer.dema@gmail.com>
Date: Tue, 14 Nov 2023 14:42:48 +0100
Subject: [PATCH 3/6] Add "Select address" feature

Implemented the functionality for the 'Select Address' feature.
This addition includes dynamic handling of address selection, enabling users
to pick from a list of existing associated addresses.
---
 .../orders/show/address/component.html.erb    | 33 +++++++++++++++++--
 .../orders/show/address/component.rb          | 22 +++++++++++--
 .../orders/show/address/component.yml         |  1 +
 .../solidus_admin/addresses_controller.rb     |  2 ++
 4 files changed, 54 insertions(+), 4 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 1a341f0ca1c..d0499a49586 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,9 +1,38 @@
-<div class="<%= stimulus_id %>">
+<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">
-        <h2 class="text-sm mb-4 font-semibold"><%= t(".subtitle.#{@type}") %></h2>
+        <div class="flex justify-between items-center mb-4">
+          <h2 class="text-sm font-semibold">
+            <%= t(".subtitle.#{@type}") %>
+          </h2>
+
+          <% if @user&.addresses&.any? %>
+            <details class="text-black text-sm" data-controller="details-click-outside">
+              <summary
+                class="text-left flex cursor-pointer select-none"
+                data-action="keydown.esc-><%= stimulus_id %>#close"
+              >
+                <%= t(".select_address") %>
+                <%= render component("ui/icon").new(name: 'arrow-down-s-fill', class: 'w-5 h-5') %>
+              </summary>
+
+              <div class="absolute mr-4 right-0 bg-white border border-gray-100 rounded-lg py-2 mt-1 shadow-lg z-10 min-w-[16rem] max-h-[26rem] overflow-y-auto">
+                <% @user.addresses.each do |address| %>
+                  <%= tag.a(
+                        href: solidus_admin.send("order_#{@type}_address_path", @order, address_id: address.id),
+                        class: 'block text-black text-sm hover:bg-gray-50 p-2 mx-2 w-auto rounded-lg',
+                      ) do %>
+                    <%= format_address(address) %>
+                  <% end %>
+                <% end %>
+              </div>
+            </details>
+          <% end %>
+        </div>
+
         <div class="w-full flex gap-4">
           <%= render component('ui/forms/address').new(address: @address, name: "order[#{@type}_address_attributes]") %>
         </div>
diff --git a/admin/app/components/solidus_admin/orders/show/address/component.rb b/admin/app/components/solidus_admin/orders/show/address/component.rb
index dd434dc2b64..e0e347337de 100644
--- a/admin/app/components/solidus_admin/orders/show/address/component.rb
+++ b/admin/app/components/solidus_admin/orders/show/address/component.rb
@@ -5,10 +5,11 @@ class SolidusAdmin::Orders::Show::Address::Component < SolidusAdmin::BaseCompone
 
   VALID_TYPES = ['ship', 'bill'].freeze
 
-  def initialize(order:, address:, type: 'ship')
+  def initialize(order:, address:, user: nil, type: 'ship')
     @order = order
-    @type = validate_address_type(type)
+    @user = user
     @address = address
+    @type = validate_address_type(type)
   end
 
   def form_id
@@ -24,6 +25,23 @@ def use_attribute
     end
   end
 
+  def format_address(address)
+    safe_join([
+      address.name,
+      tag.br,
+      address.address1,
+      tag.br,
+      address.address2,
+      address.city,
+      address.zipcode,
+      address.state&.name,
+      tag.br,
+      address.country.name,
+      tag.br,
+      address.phone,
+    ], " ")
+  end
+
   def validate_address_type(type)
     VALID_TYPES.include?(type) ? type : raise(ArgumentError, "Invalid address type: #{type}")
   end
diff --git a/admin/app/components/solidus_admin/orders/show/address/component.yml b/admin/app/components/solidus_admin/orders/show/address/component.yml
index e406088f45f..d7c82068537 100644
--- a/admin/app/components/solidus_admin/orders/show/address/component.yml
+++ b/admin/app/components/solidus_admin/orders/show/address/component.yml
@@ -4,6 +4,7 @@ en:
   save: Save
   cancel: Cancel
   back: Back
+  select_address: Select address
   title:
     ship: Edit Shipping Address
     bill: Edit Billing Address
diff --git a/admin/app/controllers/solidus_admin/addresses_controller.rb b/admin/app/controllers/solidus_admin/addresses_controller.rb
index 0eef22fad42..9a7b8e20c2d 100644
--- a/admin/app/controllers/solidus_admin/addresses_controller.rb
+++ b/admin/app/controllers/solidus_admin/addresses_controller.rb
@@ -14,6 +14,7 @@ def show
         format.html do
           render component('orders/show/address').new(
             order: @order,
+            user: @order.user,
             address: address,
             type: address_type,
           )
@@ -35,6 +36,7 @@ def update
           format.html do
             render component('orders/show/address').new(
               order: @order,
+              user: @order.user,
               address: @order.send("#{address_type}_address"),
               type: address_type,
               status: :unprocessable_entity,

From cc878bd695ac1874009917fedc9f982145a31e23 Mon Sep 17 00:00:00 2001
From: Rainer Dema <rainer.dema@gmail.com>
Date: Tue, 14 Nov 2023 14:44:34 +0100
Subject: [PATCH 4/6] Implement close after click and ESC event for address
 menu

---
 .../solidus_admin/orders/show/address/component.html.erb | 3 ++-
 .../solidus_admin/orders/show/address/component.js       | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 admin/app/components/solidus_admin/orders/show/address/component.js

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 d0499a49586..c6a1811fbea 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
@@ -10,7 +10,7 @@
           </h2>
 
           <% if @user&.addresses&.any? %>
-            <details class="text-black text-sm" data-controller="details-click-outside">
+            <details class="text-black text-sm" data-controller="details-click-outside" data-<%= stimulus_id %>-target="addresses">
               <summary
                 class="text-left flex cursor-pointer select-none"
                 data-action="keydown.esc-><%= stimulus_id %>#close"
@@ -24,6 +24,7 @@
                   <%= tag.a(
                         href: solidus_admin.send("order_#{@type}_address_path", @order, address_id: address.id),
                         class: 'block text-black text-sm hover:bg-gray-50 p-2 mx-2 w-auto rounded-lg',
+                        'data-action': "#{stimulus_id}#close",
                       ) do %>
                     <%= format_address(address) %>
                   <% end %>
diff --git a/admin/app/components/solidus_admin/orders/show/address/component.js b/admin/app/components/solidus_admin/orders/show/address/component.js
new file mode 100644
index 00000000000..ebb6df4ab34
--- /dev/null
+++ b/admin/app/components/solidus_admin/orders/show/address/component.js
@@ -0,0 +1,9 @@
+import { Controller } from '@hotwired/stimulus'
+
+export default class extends Controller {
+  static targets = ["addresses"]
+
+  close() {
+    this.addressesTarget.removeAttribute('open')
+  }
+}

From 4e053bf2408b299aee2276aa820dc504716ff46a Mon Sep 17 00:00:00 2001
From: Rainer Dema <rainer.dema@gmail.com>
Date: Tue, 14 Nov 2023 15:09:10 +0100
Subject: [PATCH 5/6] Integrate turbo frame for address form

---
 .../solidus_admin/orders/show/address/component.html.erb     | 5 ++++-
 .../solidus_admin/orders/show/address/component.rb           | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

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 c6a1811fbea..f3e1600f2ab 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
@@ -25,6 +25,7 @@
                         href: solidus_admin.send("order_#{@type}_address_path", @order, address_id: address.id),
                         class: 'block text-black text-sm hover:bg-gray-50 p-2 mx-2 w-auto rounded-lg',
                         'data-action': "#{stimulus_id}#close",
+                        'data-turbo-frame': address_frame_id
                       ) do %>
                     <%= format_address(address) %>
                   <% end %>
@@ -35,7 +36,9 @@
         </div>
 
         <div class="w-full flex gap-4">
-          <%= render component('ui/forms/address').new(address: @address, name: "order[#{@type}_address_attributes]") %>
+          <%= 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">
diff --git a/admin/app/components/solidus_admin/orders/show/address/component.rb b/admin/app/components/solidus_admin/orders/show/address/component.rb
index e0e347337de..4ab9208ebf5 100644
--- a/admin/app/components/solidus_admin/orders/show/address/component.rb
+++ b/admin/app/components/solidus_admin/orders/show/address/component.rb
@@ -16,6 +16,10 @@ def form_id
     @form_id ||= "#{stimulus_id}--form-#{@type}-#{@order.id}"
   end
 
+  def address_frame_id
+    @table_frame_id ||= "#{stimulus_id}--#{@type}-address-frame-#{@order.id}"
+  end
+
   def use_attribute
     case @type
     when 'ship'

From c0b9942fdbcfb3248e623d67b6b9b7404b61c160 Mon Sep 17 00:00:00 2001
From: Rainer Dema <rainer.dema@gmail.com>
Date: Wed, 15 Nov 2023 17:50:43 +0100
Subject: [PATCH 6/6] Fix "undefined method `new_record?`" for user addresses

Fixed an issue where `new_record?` was called on a non-existent address
associated with an order object, leading to an "undefined method" error.
The problem was identified as the loss of a newly built address after a
page refresh, caused by the address selection process retrieving the
address without assigning it to the order.
---
 admin/app/controllers/solidus_admin/addresses_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin/app/controllers/solidus_admin/addresses_controller.rb b/admin/app/controllers/solidus_admin/addresses_controller.rb
index 9a7b8e20c2d..83a8da3a91e 100644
--- a/admin/app/controllers/solidus_admin/addresses_controller.rb
+++ b/admin/app/controllers/solidus_admin/addresses_controller.rb
@@ -50,7 +50,8 @@ def update
 
     def find_address
       if params[:address_id].present? && @order.user
-        @order.user.addresses.find(params[:address_id])
+        address = @order.user.addresses.find_by(id: params[:address_id])
+        @order.send("#{address_type}_address=", address) if address
       else
         @order.send("#{address_type}_address")
       end