Skip to content

Commit 4ff6e68

Browse files
committed
Rename "fieldset_name" to "form_field_name"
As per this discussion #6191 (comment).
1 parent 59e9872 commit 4ff6e68

7 files changed

Lines changed: 18 additions & 18 deletions

File tree

admin/app/components/solidus_admin/orders/show/address/component.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<div class="w-full flex gap-4">
3030
<%= turbo_frame_tag address_frame_id do %>
31-
<%= render component('ui/forms/address').new(addressable: @address, fieldset_name: "order[#{@type}_address_attributes]") %>
31+
<%= render component('ui/forms/address').new(addressable: @address, form_field_name: "order[#{@type}_address_attributes]") %>
3232
<% end %>
3333
</div>
3434

admin/app/components/solidus_admin/ui/forms/address/component.html.erb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
<%= :disabled if @disabled %>
44
>
55
<div class="<%= stimulus_id %>--address-form flex flex-wrap gap-4 pb-4">
6-
<%= render component("ui/forms/field").text_field(@fieldset_name, :name, object: @addressable) if @include_name_field %>
7-
<%= render component("ui/forms/field").text_field(@fieldset_name, :address1, object: @addressable) %>
8-
<%= render component("ui/forms/field").text_field(@fieldset_name, :address2, object: @addressable) %>
6+
<%= render component("ui/forms/field").text_field(@form_field_name, :name, object: @addressable) if @include_name_field %>
7+
<%= render component("ui/forms/field").text_field(@form_field_name, :address1, object: @addressable) %>
8+
<%= render component("ui/forms/field").text_field(@form_field_name, :address2, object: @addressable) %>
99
<div class="flex gap-4 w-full">
10-
<%= render component("ui/forms/field").text_field(@fieldset_name, :city, object: @addressable) %>
11-
<%= render component("ui/forms/field").text_field(@fieldset_name, :zipcode, object: @addressable) %>
10+
<%= render component("ui/forms/field").text_field(@form_field_name, :city, object: @addressable) %>
11+
<%= render component("ui/forms/field").text_field(@form_field_name, :zipcode, object: @addressable) %>
1212
</div>
1313

1414
<%= render component("ui/forms/field").select(
15-
@fieldset_name,
15+
@form_field_name,
1616
:country_id,
1717
Spree::Country.all.map { |c| [c.name, c.id] },
1818
object: @addressable,
@@ -26,21 +26,21 @@
2626
class: (@addressable.country&.states&.empty? ? "flex flex-col gap-2 w-full" : "hidden flex flex-col gap-2 w-full")
2727
) do %>
2828
<%= render component("ui/forms/field").text_field(
29-
@fieldset_name,
29+
@form_field_name,
3030
:state_name,
3131
object: @addressable,
3232
value: @addressable.try(:state_name),
3333
"data-#{stimulus_id}-target": "stateName"
3434
) %>
3535
<% end %>
36-
<input autocomplete="off" type="hidden" name=<%= "#{@fieldset_name}[state_id]" %>>
36+
<input autocomplete="off" type="hidden" name=<%= "#{@form_field_name}[state_id]" %>>
3737

3838
<%= content_tag(:div,
3939
data: { "#{stimulus_id}-target": "stateWrapper" },
4040
class: (@addressable.country&.states&.empty? ? "hidden flex flex-col gap-2 w-full" : "flex flex-col gap-2 w-full")
4141
) do %>
4242
<%= render component("ui/forms/field").select(
43-
@fieldset_name,
43+
@form_field_name,
4444
:state_id,
4545
state_options,
4646
object: @addressable,
@@ -49,6 +49,6 @@
4949
) %>
5050
<% end %>
5151

52-
<%= render component("ui/forms/field").text_field(@fieldset_name, :phone, object: @addressable) %>
52+
<%= render component("ui/forms/field").text_field(@form_field_name, :phone, object: @addressable) %>
5353
</div>
5454
</fieldset>

admin/app/components/solidus_admin/ui/forms/address/component.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# frozen_string_literal: true
22

33
class SolidusAdmin::UI::Forms::Address::Component < SolidusAdmin::BaseComponent
4-
def initialize(addressable:, fieldset_name:, disabled: false, include_name_field: true)
4+
def initialize(addressable:, form_field_name:, disabled: false, include_name_field: true)
55
@addressable = addressable
6-
@fieldset_name = fieldset_name
6+
@form_field_name = form_field_name
77
@disabled = disabled
88
@include_name_field = include_name_field
99
end

admin/app/components/solidus_admin/users/addresses/component.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<%= render component('ui/panel').new(title: t(".billing_address")) do %>
2020
<%= form_for @user, url: solidus_admin.update_addresses_user_path(@user), method: :put, html: { id: "#{form_id}_billing", autocomplete: "off", class: "bill_address" } do |f| %>
2121

22-
<%= render component('ui/forms/address').new(addressable: @bill_address, fieldset_name: "user[bill_address_attributes]") %>
22+
<%= render component('ui/forms/address').new(addressable: @bill_address, form_field_name: "user[bill_address_attributes]") %>
2323
<div class="py-1.5 text-center">
2424
<%= render component("ui/button").new(tag: :button, text: t(".update"), form: "#{form_id}_billing") %>
2525
<%= render component("ui/button").new(tag: :a, text: t(".cancel"), href: solidus_admin.addresses_user_path(@user), scheme: :secondary) %>
@@ -30,7 +30,7 @@
3030
<%= render component('ui/panel').new(title: t(".shipping_address")) do %>
3131
<%= form_for @user, url: solidus_admin.update_addresses_user_path(@user), method: :put, html: { id: "#{form_id}_shipping", autocomplete: "off", class: "ship_address" } do |f| %>
3232

33-
<%= render component('ui/forms/address').new(addressable: @ship_address, fieldset_name: "user[ship_address_attributes]") %>
33+
<%= render component('ui/forms/address').new(addressable: @ship_address, form_field_name: "user[ship_address_attributes]") %>
3434
<div class="py-1.5 text-center">
3535
<%= render component("ui/button").new(tag: :button, text: t(".update"), form: "#{form_id}_shipping") %>
3636
<%= render component("ui/button").new(tag: :a, text: t(".cancel"), href: solidus_admin.addresses_user_path(@user), scheme: :secondary) %>

admin/spec/components/previews/solidus_admin/ui/forms/address/component_preview.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def overview
1111
# @param disabled toggle
1212
def playground(disabled: false)
1313
render component("ui/forms/address").new(
14-
fieldset_name: "",
14+
form_field_name: "",
1515
addressable: fake_address,
1616
disabled:
1717
)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<%= render current_component.new(fieldset_name: "", addressable:) %>
1+
<%= render current_component.new(form_field_name: "", addressable:) %>

admin/spec/components/solidus_admin/ui/forms/address/component_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
context "with include_name_field: false" do
1111
it "does not render name field" do
1212
component = described_class.new(
13-
fieldset_name: "",
13+
form_field_name: "",
1414
addressable: Spree::Address.new(country: Spree::Country.find_or_initialize_by(iso: "US")),
1515
include_name_field: false
1616
)

0 commit comments

Comments
 (0)