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.

Author: rainerdema

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 %>

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

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