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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
FIX validation error on admin address for not persisted address (#13526)
brozek1e03cabd6531
diff --git a/admin/app/controllers/spree/admin/addresses_controller.rb b/admin/app/controllers/spree/admin/addresses_controller.rbindex 05223be728..9ef82fa037 100644--- a/admin/app/controllers/spree/admin/addresses_controller.rb+++ b/admin/app/controllers/spree/admin/addresses_controller.rb@@ -15,14 +15,8 @@ module Spree@address = @object = result.value- if result.success?- set_current_store-- flash[:success] = flash_message_for(@address, :successfully_created)- redirect_to location_after_save, status: :see_other- else- render action: :edit, status: :unprocessable_entity- end+ set_current_store if result.success?+ flash.now[:success] = flash_message_for(@address, :successfully_created) if result.success?enddef update@@ -37,14 +31,8 @@ module Spree@address = @object = result.value- if result.success?- set_current_store-- flash[:success] = flash_message_for(@address, :successfully_updated)- redirect_to location_after_save, status: :see_other- else- render action: :edit, status: :unprocessable_entity- end+ set_current_store if result.success?+ flash.now[:success] = flash_message_for(@address, :successfully_updated) if result.success?endprivatediff --git a/admin/app/views/spree/admin/addresses/_edit_form.html.erb b/admin/app/views/spree/admin/addresses/_edit_form.html.erbnew file mode 100644index 0000000000..2e04bd3e0d--- /dev/null+++ b/admin/app/views/spree/admin/addresses/_edit_form.html.erb@@ -0,0 +1,13 @@+<%= turbo_frame_tag "edit_address_#{params[:type]}" do %>+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @address } %>++ <%= form_for [:admin, @address], as: :address, url: spree.admin_address_path(@address), method: :put do |f| %>+ <%= render 'spree/addresses/form',+ address_name: 'address',+ address_form: f,+ address_type: 'shipping',+ address: @address %>+ <%= hidden_field_tag :type, params[:type] %>+ <%= render 'spree/admin/shared/edit_resource_links', f: f %>+ <% end %>+<% end %>diff --git a/admin/app/views/spree/admin/addresses/_new_form.html.erb b/admin/app/views/spree/admin/addresses/_new_form.html.erbnew file mode 100644index 0000000000..4fc1e34d67--- /dev/null+++ b/admin/app/views/spree/admin/addresses/_new_form.html.erb@@ -0,0 +1,22 @@+<% frame_id = local_assigns.fetch(:frame_id, "new_address_#{params[:type]}") %>+<% user_id_value = local_assigns.fetch(:user_id, params[:user_id]) %>+<% default_shipping_value = local_assigns.fetch(:default_shipping, params[:default_shipping]) %>+<% default_billing_value = local_assigns.fetch(:default_billing, params[:default_billing]) %>++<%= turbo_frame_tag frame_id do %>+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @address } %>++ <%= form_for [:admin, @address], as: :address, url: spree.admin_addresses_path, method: :post do |f| %>+ <%= render 'spree/addresses/form',+ address_name: 'address',+ address_form: f,+ address_type: 'shipping',+ address: @address %>+ <%= hidden_field_tag :user_id, user_id_value %>+ <%= hidden_field_tag :default_shipping, default_shipping_value %>+ <%= hidden_field_tag :default_billing, default_billing_value %>+ <%= hidden_field_tag :type, params[:type] %>++ <%= render 'spree/admin/shared/new_resource_links', f: f %>+ <% end %>+<% end %>diff --git a/admin/app/views/spree/admin/addresses/create.turbo_stream.erb b/admin/app/views/spree/admin/addresses/create.turbo_stream.erbnew file mode 100644index 0000000000..bbbefe7f90--- /dev/null+++ b/admin/app/views/spree/admin/addresses/create.turbo_stream.erb@@ -0,0 +1,21 @@+<% @user = @address.user %>++<% if @address.valid? %>+ <%= turbo_render_alerts %>++ <% if params[:default_shipping].to_b %>+ <%= turbo_stream.replace 'user-ship-address' do %>+ <%= render 'spree/admin/users/shipping' %>+ <% end %>+ <% end %>++ <% if params[:default_billing].to_b %>+ <%= turbo_stream.replace 'user-bill-address' do %>+ <%= render 'spree/admin/users/billing' %>+ <% end %>+ <% end %>+<% else %>+ <%= turbo_stream.replace "new_address_#{params[:type]}" do %>+ <%= render 'spree/admin/addresses/new_form' %>+ <% end %>+<% end %>diff --git a/admin/app/views/spree/admin/addresses/edit.html.erb b/admin/app/views/spree/admin/addresses/edit.html.erbindex f0e670926d..6b2a3b55cf 100644--- a/admin/app/views/spree/admin/addresses/edit.html.erb+++ b/admin/app/views/spree/admin/addresses/edit.html.erb@@ -1,12 +1 @@-<%= turbo_frame_tag "edit_address_#{params[:type]}" do %>- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @address } %>-- <%= form_for [:admin, @address], as: :address, url: spree.admin_address_path(@address), method: :put, data: { turbo_frame: '_top' } do |f| %>- <%= render 'spree/addresses/form',- address_name: 'address',- address_form: f,- address_type: 'shipping',- address: @address %>- <%= render 'spree/admin/shared/edit_resource_links', f: f, turbo_frame: '_top' %>- <% end %>-<% end %>\ No newline at end of file+<%= render 'spree/admin/addresses/edit_form' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/addresses/new.html.erb b/admin/app/views/spree/admin/addresses/new.html.erbindex ffd9712450..8b3887cfb6 100644--- a/admin/app/views/spree/admin/addresses/new.html.erb+++ b/admin/app/views/spree/admin/addresses/new.html.erb@@ -1,16 +1 @@-<%= turbo_frame_tag "new_address_#{params[:type]}" do %>- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @address } %>-- <%= form_for [:admin, @address], as: :address, url: spree.admin_addresses_path, method: :post, data: { turbo_frame: '_top' } do |f| %>- <%= render 'spree/addresses/form',- address_name: 'address',- address_form: f,- address_type: 'shipping',- address: @address %>- <%= hidden_field_tag :user_id, params[:user_id] %>- <%= hidden_field_tag :default_shipping, params[:default_shipping] %>- <%= hidden_field_tag :default_billing, params[:default_billing] %>-- <%= render 'spree/admin/shared/new_resource_links', f: f %>- <% end %>-<% end %>\ No newline at end of file+<%= render 'spree/admin/addresses/new_form' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/addresses/update.turbo_stream.erb b/admin/app/views/spree/admin/addresses/update.turbo_stream.erbnew file mode 100644index 0000000000..0df704e63f--- /dev/null+++ b/admin/app/views/spree/admin/addresses/update.turbo_stream.erb@@ -0,0 +1,26 @@+<% @user = @address.user %>++<% if @address.valid? %>+ <%= turbo_render_alerts %>++ <%= turbo_stream.replace 'user-ship-address' do %>+ <%= render 'spree/admin/users/shipping' %>+ <% end %>++ <%= turbo_stream.replace 'user-bill-address' do %>+ <%= render 'spree/admin/users/billing' %>+ <% end %>+<% else %>+ <%# Update service may return a new address without ID when original isn't editable %>+ <%= turbo_stream.replace "edit_address_#{params[:type]}" do %>+ <% if @address.persisted? %>+ <%= render 'spree/admin/addresses/edit_form' %>+ <% else %>+ <%= render 'spree/admin/addresses/new_form',+ frame_id: "edit_address_#{params[:type]}",+ user_id: @user&.id,+ default_shipping: params[:type] == 'shipping',+ default_billing: params[:type] == 'billing' %>+ <% end %>+ <% end %>+<% end %>diff --git a/admin/spec/controllers/spree/admin/addresses_controller_spec.rb b/admin/spec/controllers/spree/admin/addresses_controller_spec.rbindex 3a196bc84e..a5a4537da9 100644--- a/admin/spec/controllers/spree/admin/addresses_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/addresses_controller_spec.rb@@ -5,18 +5,20 @@ RSpec.describe Spree::Admin::AddressesController, type: :controller dorender_viewslet(:user) { create(:user) }+ let(:country) { Spree::Country.by_iso('US') || create(:country, iso: 'US', name: 'United States') }+ let(:state) { create(:state, name: 'California', abbr: 'CA', country: country) }describe 'GET #new' doit 'renders the new address form' do- get :new+ get :new, params: { type: 'shipping' }expect(response).to render_template(:new)endenddescribe 'POST #create' do- subject { post :create, params: params }+ subject { post :create, params: params, format: :turbo_stream }- let(:params) { { address: address_params, user_id: user.id } }+ let(:params) { { address: address_params, user_id: user.id, type: 'shipping', default_shipping: true } }let(:address_params) do{@@ -30,17 +32,13 @@ RSpec.describe Spree::Admin::AddressesController, type: :controller do}end- let(:country) { Spree::Country.by_iso('US') || create(:country, iso: 'US', name: 'United States') }- let(:state) { create(:state, name: 'California', abbr: 'CA', country: country) }-- let(:user) { create(:user) }-let(:address) { Spree::Address.last }- it 'creates a new address' do+ it 'creates a new address and renders turbo_stream' doexpect { subject }.to change(Spree::Address, :count).by(1)- expect(response).to redirect_to(spree.admin_user_path(user))+ expect(response).to have_http_status(:ok)+ expect(response.media_type).to eq('text/vnd.turbo-stream.html')expect(address.user).to eq(user)expect(address.firstname).to eq('John')@@ -53,7 +51,7 @@ RSpec.describe Spree::Admin::AddressesController, type: :controller doendcontext 'with default shipping' do- let(:params) { { address: address_params, user_id: user.id, default_shipping: true } }+ let(:params) { { address: address_params, user_id: user.id, type: 'shipping', default_shipping: true } }it 'creates a new default shipping address' doexpect { subject }.to change(Spree::Address, :count).by(1)@@ -62,7 +60,7 @@ RSpec.describe Spree::Admin::AddressesController, type: :controller doendcontext 'with default billing' do- let(:params) { { address: address_params, user_id: user.id, default_billing: true } }+ let(:params) { { address: address_params, user_id: user.id, type: 'billing', default_billing: true } }it 'creates a new default billing address' doexpect { subject }.to change(Spree::Address, :count).by(1)@@ -70,12 +68,14 @@ RSpec.describe Spree::Admin::AddressesController, type: :controller doendend- context 'without user' do- let(:params) { { address: address_params } }+ context 'with invalid params' do+ let(:address_params) { { firstname: '' } }- it 'creates no address' do+ it 'renders turbo_stream with form errors' doexpect { subject }.not_to change(Spree::Address, :count)- expect(response).to redirect_to(spree.admin_users_path)++ expect(response).to have_http_status(:ok)+ expect(response.media_type).to eq('text/vnd.turbo-stream.html')endendend@@ -84,17 +84,17 @@ RSpec.describe Spree::Admin::AddressesController, type: :controller dolet(:address) { create(:address) }it 'renders the edit address form' do- get :edit, params: { id: address.id }+ get :edit, params: { id: address.id, type: 'shipping' }expect(response).to render_template(:edit)endenddescribe 'PUT #update' do- subject { put :update, params: params }-- let(:params) { { id: address.id, address: address_params, user_id: user.id } }+ subject { put :update, params: params, format: :turbo_stream }let(:address) { create(:address, user: user, firstname: 'John', lastname: 'Doe') }+ let(:params) { { id: address.id, address: address_params, type: 'shipping' } }+let(:address_params) do{firstname: 'Jane',@@ -102,12 +102,13 @@ RSpec.describe Spree::Admin::AddressesController, type: :controller do}end- it 'updates the address' do+ it 'updates the address and renders turbo_stream' doexpect { subject }.to change { address.reload.first_name }.to('Jane').and(change { address.reload.lastname }.to('Moe'))- expect(response).to redirect_to(spree.admin_user_path(user))+ expect(response).to have_http_status(:ok)+ expect(response.media_type).to eq('text/vnd.turbo-stream.html')endcontext 'for a user with an incomplete order' do@@ -115,7 +116,17 @@ RSpec.describe Spree::Admin::AddressesController, type: :controller doit 'pushes the order to the address state' doexpect { subject }.to change { order.reload.state }.to('address')- expect(response).to redirect_to(spree.admin_user_path(user))+ end+ end++ context 'with invalid params' do+ let(:address_params) { { firstname: '' } }++ it 'renders turbo_stream with form errors' do+ subject++ expect(response).to have_http_status(:ok)+ expect(response.media_type).to eq('text/vnd.turbo-stream.html')endendend