Show an error message when submitting a child form without child

opf · Jan 31, 2025 · 614869a · 614869a
1 parent 7f152ea
commit 614869a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/app/components/work_package_relations_tab/add_work_package_child_form_component.html.erb b/app/components/work_package_relations_tab/add_work_package_child_form_component.html.erb
@@ -1,7 +1,7 @@
 <%= component_wrapper do %>
   <%= primer_form_with(
     id: FORM_ID,
-    model: WorkPackage.new,
+    model: @child,
     **submit_url_options,
     data: {
       turbo: true,

diff --git a/app/components/work_package_relations_tab/add_work_package_child_form_component.rb b/app/components/work_package_relations_tab/add_work_package_child_form_component.rb
@@ -38,10 +38,11 @@ class WorkPackageRelationsTab::AddWorkPackageChildFormComponent < ApplicationCom
   ID_FIELD_TEST_SELECTOR = "work-package-child-form-id"
   I18N_NAMESPACE = "work_package_relations_tab"
 
-  def initialize(work_package:, base_errors: nil)
+  def initialize(work_package:, child: nil, base_errors: nil)
     super()
 
     @work_package = work_package
+    @child = child.presence || WorkPackage.new
     @base_errors = base_errors
   end
 

diff --git a/app/controllers/work_package_children_relations_controller.rb b/app/controllers/work_package_children_relations_controller.rb
@@ -43,8 +43,23 @@ def new
   end
 
   def create
-    child = WorkPackage.find(params[:work_package][:id])
-    service_result = set_relation(child:, parent: @work_package)
+    if params[:work_package][:id].present?
+      child = WorkPackage.find(params[:work_package][:id])
+      service_result = set_relation(child:, parent: @work_package)
+    else
+      child = WorkPackage.new
+      child.errors.add(:id, :blank)
+      service_result = ServiceResult.failure(result: child)
+    end
+
+    if service_result.failure?
+      update_via_turbo_stream(
+        component: WorkPackageRelationsTab::AddWorkPackageChildFormComponent.new(work_package: @work_package,
+                                                                                 child: service_result.result,
+                                                                                 base_errors: service_result.errors[:base]),
+        status: :bad_request
+      )
+    end
 
     respond_with_relations_tab_update(service_result, relation_to_scroll_to: service_result.result)
   end