Merge pull request #10217 from alphagov/CM-115-stop-embedded-object-form-from-inheriting-its-parents-value

(CM-115) Move calculation of value to the FormComponent

Author: pezholio

lib/engines/content_block_manager/app/components/content_block_manager/content_block_edition/details/fields/base_component.rb

@@ -6,7 +6,7 @@ class ContentBlockManager::ContentBlockEdition::Details::Fields::BaseComponent <
   def initialize(content_block_edition:, field:, value: nil, object_id: nil)
     @content_block_edition = content_block_edition
     @field = field
-    @value = value || content_block_edition.details&.fetch(field.name, nil)
+    @value = value
     @object_id = object_id
   end
 

lib/engines/content_block_manager/app/components/content_block_manager/content_block_edition/details/form_component.rb

@@ -20,6 +20,7 @@ def component_args(field)
     {
       content_block_edition:,
       field:,
+      value: content_block_edition.details&.fetch(field.name, nil),
     }
   end
 end

lib/engines/content_block_manager/test/components/content_block/edition/details/fields/string_component_test.rb

@@ -21,19 +21,22 @@ class ContentBlockManager::ContentBlockEdition::Details::Fields::StringComponent
     assert_selector "input[type=\"text\"][name=\"#{expected_name}\"][id=\"#{expected_id}\"]"
   end
 
-  it "should show the value when present" do
-    content_block_edition.details = { "email_address": "[email protected]" }
-
+  it "should show the value when provided" do
     render_inline(
       ContentBlockManager::ContentBlockEdition::Details::Fields::StringComponent.new(
         content_block_edition:,
         field:,
+        value: "[email protected]",
       ),
     )
 
     assert_selector 'input[value="[email protected]"]'
   end
 
+  it "should show the value from an embedded object" do
+    content_block_edition.details = { "description": "[email protected]" }
+  end
+
   it "should show errors when present" do
     content_block_edition.errors.add(:details_email_address, "Some error goes here")
 

lib/engines/content_block_manager/test/components/content_block/edition/details/form_component_test.rb

@@ -30,15 +30,25 @@ class ContentBlockManager::ContentBlockEdition::Details::FormComponentTest < Vie
   let(:bar_field) { stub("field", name: "bar", component_name: "string", enum_values: nil) }
   let(:baz_field) { stub("field", name: "baz", component_name: "enum", enum_values: %w[some enum]) }
 
+  let(:foo_stub) { stub("string_component") }
+  let(:bar_stub) { stub("string_component") }
+  let(:baz_stub) { stub("enum_component") }
+
+  let(:component) do
+    ContentBlockManager::ContentBlockEdition::Details::FormComponent.new(
+      content_block_edition:,
+      schema:,
+    )
+  end
+
   before do
     schema.stubs(:fields).returns([foo_field, bar_field, baz_field])
+    component.expects(:render).with(foo_stub)
+    component.expects(:render).with(bar_stub)
+    component.expects(:render).with(baz_stub)
   end
 
   it "renders fields for each property" do
-    foo_stub = stub("string_component")
-    bar_stub = stub("string_component")
-    baz_stub = stub("enum_component")
-
     ContentBlockManager::ContentBlockEdition::Details::Fields::StringComponent.expects(:new).with(
       content_block_edition:,
       field: foo_field,
@@ -55,15 +65,35 @@ class ContentBlockManager::ContentBlockEdition::Details::FormComponentTest < Vie
       enum: %w[some enum],
     ).returns(baz_stub)
 
-    component = ContentBlockManager::ContentBlockEdition::Details::FormComponent.new(
+    assert render_inline(component)
+  end
+
+  it "sends values to the field components when the block has them" do
+    content_block_edition.details = {
+      "foo" => "foo value",
+      "bar" => "bar value",
+      "baz" => "baz value",
+    }
+
+    ContentBlockManager::ContentBlockEdition::Details::Fields::StringComponent.expects(:new).with(
       content_block_edition:,
-      schema:,
-    )
+      field: foo_field,
+      value: "foo value",
+    ).returns(foo_stub)
 
-    component.expects(:render).with(foo_stub)
-    component.expects(:render).with(bar_stub)
-    component.expects(:render).with(baz_stub)
+    ContentBlockManager::ContentBlockEdition::Details::Fields::StringComponent.expects(:new).with(
+      content_block_edition:,
+      field: bar_field,
+      value: "bar value",
+    ).returns(bar_stub)
+
+    ContentBlockManager::ContentBlockEdition::Details::Fields::EnumComponent.expects(:new).with(
+      content_block_edition:,
+      field: baz_field,
+      value: "baz value",
+      enum: %w[some enum],
+    ).returns(baz_stub)
 
-    render_inline(component)
+    assert render_inline(component)
   end
 end