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 duplicate HTML ids in variant template price and stock inputs (#13883)
Kenta Ishizaki5b6b0c4ae9ca
diff --git a/spree/admin/app/views/spree/admin/products/form/variants/_variant_template.html.erb b/spree/admin/app/views/spree/admin/products/form/variants/_variant_template.html.erbindex cf45518675..7a342b6511 100644--- a/spree/admin/app/views/spree/admin/products/form/variants/_variant_template.html.erb+++ b/spree/admin/app/views/spree/admin/products/form/variants/_variant_template.html.erb@@ -21,18 +21,18 @@<div class="variants-table__body__cell column-price mr-2"><% supported_currencies.each_with_index do |currency, i| %><div class="input-group price-input-container <%= current_currency != currency ? 'hidden' : 'flex' %>" <%= !can_manage_prices ? 'readonly' : '' %>>- <%= text_field_tag "product[variants_attributes][prices_attributes][#{i}][amount]", '', class: 'border-0 focus:ring-0 focus:outline-none', data: { slot: "[prices_attributes][#{currency}][amount]_input", action: 'variants-form#updatePrice blur->variants-form#formatPrice', currency: currency.to_s }, readonly: !can_manage_prices %>+ <%= text_field_tag "product[variants_attributes][prices_attributes][#{i}][amount]", '', id: nil, class: 'border-0 focus:ring-0 focus:outline-none', data: { slot: "[prices_attributes][#{currency}][amount]_input", action: 'variants-form#updatePrice blur->variants-form#formatPrice', currency: currency.to_s }, readonly: !can_manage_prices %><span class="px-3"><%= currency_symbol(currency) %></span></div>- <%= hidden_field_tag "product[variants_attributes][prices_attributes][#{i}][currency]", currency, data: {slot: "[prices_attributes][#{currency}][currency]_input"} %>- <%= hidden_field_tag "product[variants_attributes][prices_attributes][#{i}][id]", "", data: {slot: "[prices_attributes][#{currency}][id]_input"} %>+ <%= hidden_field_tag "product[variants_attributes][prices_attributes][#{i}][currency]", currency, id: nil, data: {slot: "[prices_attributes][#{currency}][currency]_input"} %>+ <%= hidden_field_tag "product[variants_attributes][prices_attributes][#{i}][id]", "", id: nil, data: {slot: "[prices_attributes][#{currency}][id]_input"} %><% end %></div><div class="variants-table__body__cell column-quantity"><% available_stock_locations_for_product(@product).ids.each_with_index do |id, i| %>- <%= number_field_tag "product[variants_attributes][stock_items_attributes][#{i}][count_on_hand]", 0, class: class_names('form-input', default_stock_location.id == id ? 'block' : 'hidden'), data: {slot: "[stock_items_attributes][#{id}][count_on_hand]_input", stock_location_id: id, action: "variants-form#updateCountOnHand blur->variants-form#replaceBlankWithZero" }, readonly: !can_manage_stock %>- <%= hidden_field_tag "product[variants_attributes][stock_items_attributes][#{i}][stock_location_id]", id, data: { slot: "[stock_items_attributes][#{id}][stock_location_id]_input" } %>- <%= hidden_field_tag "product[variants_attributes][stock_items_attributes][#{i}][id]", "", data: { slot: "[stock_items_attributes][#{id}][id]_input" } %>+ <%= number_field_tag "product[variants_attributes][stock_items_attributes][#{i}][count_on_hand]", 0, id: nil, class: class_names('form-input', default_stock_location.id == id ? 'block' : 'hidden'), data: {slot: "[stock_items_attributes][#{id}][count_on_hand]_input", stock_location_id: id, action: "variants-form#updateCountOnHand blur->variants-form#replaceBlankWithZero" }, readonly: !can_manage_stock %>+ <%= hidden_field_tag "product[variants_attributes][stock_items_attributes][#{i}][stock_location_id]", id, id: nil, data: { slot: "[stock_items_attributes][#{id}][stock_location_id]_input" } %>+ <%= hidden_field_tag "product[variants_attributes][stock_items_attributes][#{i}][id]", "", id: nil, data: { slot: "[stock_items_attributes][#{id}][id]_input" } %><% end %></div><% if can?(:manage, @product.default_variant) %>diff --git a/spree/admin/spec/controllers/spree/admin/products_controller_spec.rb b/spree/admin/spec/controllers/spree/admin/products_controller_spec.rbindex 7d8f746934..919254f0e7 100644--- a/spree/admin/spec/controllers/spree/admin/products_controller_spec.rb+++ b/spree/admin/spec/controllers/spree/admin/products_controller_spec.rb@@ -488,6 +488,26 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller doget :edit, params: { id: product.to_param }expect(response).to render_template(:edit)end++ it 'does not generate id attributes on variant template price and stock inputs' do+ get :edit, params: { id: product.to_param }++ doc = Nokogiri::HTML(response.body)+ template = doc.at_css('template[data-variants-form-target="variantTemplate"]')++ expect(template).to be_present++ price_inputs = template.css('input[data-slot*="prices_attributes"]')+ stock_inputs = template.css('input[data-slot*="stock_items_attributes"]')+ all_inputs = price_inputs + stock_inputs++ expect(all_inputs).not_to be_empty++ inputs_with_ids = all_inputs.select { |el| el.attribute('id').present? }+ expect(inputs_with_ids).to be_empty,+ "Expected no id attributes on variant template inputs to avoid duplicates when cloned, " \+ "but found: #{inputs_with_ids.map { |el| el['id'] }.join(', ')}"+ endendend