Skip to content

Add requireness to HasOne form #2812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add requireness to HasOne form #2812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8568fc1
Add requireness to HasOne form
goosys Mar 17, 2025
0d833b1
Add tests for nested resource field requireness in application helper
goosys Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/fields/has_one/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The form will be rendered as nested_from to parent relationship.
<% end %>

<% attributes.each do |attribute| %>
<div class="field-unit field-unit--<%= attribute.html_class %>">
<div class="field-unit field-unit--<%= attribute.html_class %> field-unit--<%= requireness(attribute) %>">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<div class="field-unit field-unit--<%= attribute.html_class %> field-unit--<%= requireness(attribute) %>">
<div class="field-unit field-unit--<%= attribute.html_class %> field-unit--<%= requiredness(attribute) %>">

I think we should probably make the change to "requiredness", as I do think that's more correct than "requireness".

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be changed in this PR?
Or would it be okay if I open a new PR?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh! Right, it's not actually introduced here. I hadn't realised. Let's leave it for now, we've already got the existing name and it's fine.

<%= render_field attribute, f: has_one_f %>
</div>
<% hint_key = "administrate.field_hints.#{field.name}.#{attribute.name}" %>
Expand Down
4 changes: 3 additions & 1 deletion spec/features/form_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@
Product.human_attribute_name(:name),
Product.human_attribute_name(:description),
Product.human_attribute_name(:price),
Product.human_attribute_name(:image_url)
Product.human_attribute_name(:image_url),
ProductMetaTag.human_attribute_name(:meta_title),
ProductMetaTag.human_attribute_name(:meta_description)
]

required_field_labels = find_all(".field-unit--required").map(&:text)
Expand Down
17 changes: 17 additions & 0 deletions spec/helpers/administrate/application_helper_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,23 @@
end
expect(requireness(release_year)).to eq("optional")
end

context "when the resource is nested" do
it "returns 'required' if nested field is required" do
field = page.attributes.values.flatten.detect { |i| i.attribute == :product_meta_tag }
nested_field = field.nested_form.attributes.values.flatten.detect { |i| i.attribute == :meta_title }
expect(requireness(nested_field)).to eq("required")
end

it "returns 'optional' if nested field is not required" do
field = page.attributes.values.flatten.detect { |i| i.attribute == :product_meta_tag }
nested_field = field.nested_form.attributes.values.flatten.detect { |i| i.attribute == :meta_title }

allow_any_instance_of(ActiveRecord::Validations::PresenceValidator).to receive(:options).and_return({on: :any})

expect(requireness(nested_field)).to eq("optional")
end
end
end

describe "#sort_order" do
Expand Down