Merge pull request opf#17136 from opf/fix/floating-form-and-error-msg

Render errors for the `short` field of Hierarchy Items
l3dlp-sandbox · Nov 7, 2024 · b022648 · b022648
2 parents d8a75e7 + e3265c2
commit b022648
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/app/components/admin/custom_fields/hierarchy/item_form_component.rb b/app/components/admin/custom_fields/hierarchy/item_form_component.rb
@@ -47,7 +47,7 @@ def http_verb
 
         def url
           if model.new_record?
-            new_child_custom_field_item_path(root.custom_field_id, model.parent)
+            new_child_custom_field_item_path(root.custom_field_id, model.parent, position: model.sort_order)
           else
             custom_field_item_path(root.custom_field_id, model)
           end

diff --git a/app/controllers/admin/custom_fields/hierarchy/items_controller.rb b/app/controllers/admin/custom_fields/hierarchy/items_controller.rb
@@ -73,7 +73,7 @@ def create
               end,
               lambda do |validation_result|
                 add_errors_to_form(validation_result)
-                render action: :new
+                render :new
               end
             )
         end
@@ -129,7 +129,7 @@ def item_input
         end
 
         def add_errors_to_form(validation_result)
-          @new_item = ::CustomField::Hierarchy::Item.new(parent: @active_item, **validation_result.to_h)
+          @new_item = ::CustomField::Hierarchy::Item.new(**item_input)
           validation_result.errors(full: true).to_h.each do |attribute, errors|
             @new_item.errors.add(attribute, errors.join(", "))
           end

diff --git a/app/forms/custom_fields/hierarchy/item_form.rb b/app/forms/custom_fields/hierarchy/item_form.rb
@@ -50,7 +50,8 @@ class ItemForm < ApplicationForm
             visually_hide_label: true,
             full_width: false,
             required: false,
-            placeholder: I18n.t("custom_fields.admin.items.placeholder.short")
+            placeholder: I18n.t("custom_fields.admin.items.placeholder.short"),
+            validation_message: validation_message_for(:short)
           )
         end