fixed

Author: ChrisBAshton

app/models/concerns/standard_edition/has_block_content.rb

@@ -7,7 +7,12 @@ module StandardEdition::HasBlockContent
   def block_content=(value)
     value_to_merge = (value || {}).to_h.deep_stringify_keys
     merged_value = (self[:block_content] || {}).deep_merge(value_to_merge)
-    super(merged_value)
+
+    normalised = StandardEdition::BlockContent.new(type_instance.schema)
+    normalised.assign_attributes(merged_value)
+
+    @block_content = normalised # keep the memoized object in sync (optional but nice)
+    super(normalised.to_h)
   end
 
   def block_content

app/models/configurable_content_blocks/factory.rb

@@ -9,7 +9,7 @@ def build_block(block)
         "default_string" => ->(_page) { ConfigurableContentBlocks::DefaultString.new },
         "govspeak" => ->(page) { ConfigurableContentBlocks::Govspeak.new(page.images, page.attachments) },
         "default_date" => ->(_page) { ConfigurableContentBlocks::DefaultDate.new },
-        "social_media_service_select" => ->(page) { ConfigurableContentBlocks::SocialMediaServiceSelect.new },
+        "social_media_service_select" => ->(_page) { ConfigurableContentBlocks::SocialMediaServiceSelect.new },
         "image_select" => ->(page) { ConfigurableContentBlocks::ImageSelect.new(page.valid_images) },
         "lead_image_select" => ->(page) { ConfigurableContentBlocks::LeadImageSelect.new(page.valid_lead_images, default_lead_image: page.default_lead_image, placeholder_image_url: page.placeholder_image_url) },
         "default_object" => ->(_page) { ConfigurableContentBlocks::DefaultObject.new(self) },

app/models/standard_edition/block_content.rb

@@ -32,7 +32,8 @@ def attributes=(values)
         # { "0" => { "foo" => "bar" }, "1" => { "delete_me" => "something", "_destroy" => "1" } }
         # to
         # [ { "foo" => "bar" } ]
-        public_send(setter, values[key].values.reject { |h| h["_destroy"] == "1" })
+        vals = values[key].is_a?(Hash) ? values[key].values : values[key]
+        public_send(setter, vals.reject { |h| h["_destroy"] == "1" })
       else
         public_send(setter, values[key])
       end

app/presenters/publishing_api/payload_builder/block_content.rb

@@ -90,7 +90,7 @@ def social_media_links(attribute)
           service = SocialMediaService.find(item["social_media_service_id"].to_i)
           {
             title: service.name,
-            service_type: service.name.parameterize.underscore, # "Google Plus" => "google_plus"
+            service_type: service.name.parameterize, # "Google Plus" => "google-plus"
             href: item["url"],
           }
         end

app/views/admin/configurable_content_blocks/_default_array.html.erb

@@ -6,49 +6,52 @@
    required_attributes ||= []
    element_properties = schema.fetch("fields") %>
 
+<%
+  render_fields = ->(social_media_link, index) do
+    element_fields = capture do
+      element_properties.each do |property_key, property_schema|
+        block = default_array.block_factory.build_block(property_schema["block"])
+%>
+  <%= render block, {
+    schema: property_schema,
+    content: social_media_link[property_key],
+    # TODO: support translations
+    # translated_content: social_media_link[property_key],
+    path: ConfigurableContentBlocks::Path.new(["social_media_links", index, property_key]),
+    required: required_attributes.include?(property_key),
+    required_attributes: property_schema["block"] == "default_array" ? required_attributes : [],
+    right_to_left: right_to_left,
+    errors: errors,
+  } %>
+<%
+      end # element_properties.each loop
+    end # element_fields = capture
+  end # render_fields definition
+%>
+
 <%= render "govuk_publishing_components/components/fieldset",
             { legend_text: "#{schema['title']}#{required ? ' (required)' : ''}",
               heading_size: "l",
               id: path.form_control_id } do %>
   <%
     # TODO: make the array key (`social_media_links`) dynamic
-    items = content["social_media_links"].map do |social_media_link|
-  %>
-    <% element_fields = capture do %>
-      <% element_properties.each do |property_key, property_schema| %>
-        <% #raise [property_key, content.to_h, schema.inspect].inspect %>
-        <% block = default_array.block_factory.build_block(property_schema["block"]) %>
-        <%= render block, {
-          schema: property_schema,
-          content: social_media_link[property_key],
-          # translated_content: social_media_link[property_key],
-          path: ConfigurableContentBlocks::Path.new([property_key]),
-          required: required_attributes.include?(property_key),
-          required_attributes: property_schema["block"] == "default_array" ? required_attributes : [],
-          right_to_left: right_to_left,
-          errors: errors,
-        } %>
-      <% end %>
-    <% end %>
-
-    <%
+    items = content["social_media_links"].map.with_index do |social_media_link, index|
+      # raise path.form_control_name.inspect # "edition[block_content][social_media_links]"
       {
-        fields: element_fields,
-        # TODO: the noJS experience:
-        # destroy_checkbox: render("govuk_publishing_components/components/checkboxes", {
-        #   name: "#{item_path.form_control_name}[_destroy]",
-        #   items: [{ label: "Remove", value: "1" }],
-        # }),
+        fields: render_fields.call(social_media_link, index),
+        destroy_checkbox: render("govuk_publishing_components/components/checkboxes", {
+          name: "#{path.form_control_name}[#{index}][_destroy]",
+          items: [{ label: "Remove", value: "1" }],
+        }),
       }
-    %>
-  <% end %>
+    end
+  %>
 
   <%= render "govuk_publishing_components/components/add_another", {
     fieldset_legend: schema["title"],
     add_button_text: "Add another",
     empty_fields: true,
     items: items,
-    # TODO: the noJS experience:
-    empty: "TBC", # render_fields.call({}, path.push(items.length.to_s), []),
+    empty: render_fields.call({}, items.length)
   } %>
 <% end %>