Spike - simple child pages (shared content ID) [WHIT-3520]

app/models/configurable_content_blocks/default_textarea.rb

@@ -0,0 +1,9 @@
+module ConfigurableContentBlocks
+  class DefaultTextarea < BaseBlock
+  private
+
+    def template_name
+      "default_textarea"
+    end
+  end
+end

app/models/configurable_document_type.rb

@@ -3,6 +3,7 @@ class ConfigurableDocumentType
 
   CONTENT_BLOCKS = {
     "default_string" => ConfigurableContentBlocks::DefaultString,
+    "default_textarea" => ConfigurableContentBlocks::DefaultTextarea,
     "govspeak" => ConfigurableContentBlocks::Govspeak,
     "default_date" => ConfigurableContentBlocks::DefaultDate,
     "default_select" => ConfigurableContentBlocks::DefaultSelect,
@@ -86,6 +87,28 @@ def properties
     @schema["attributes"] || {}
   end
 
+  def parts
+    parts = []
+    @forms.each_value.flat_map do |form|
+      next unless form["fields"]
+
+      form["fields"].each do |_, field|
+        parts << field["part"] if field["part"]
+      end
+    end
+    parts.uniq
+  end
+
+  def fields_for_part(part_key)
+    @forms.each_value.flat_map do |form|
+      next unless form["fields"]
+
+      form["fields"].select { |_, field| field["part"] == part_key }.map do |key, field|
+        { "key" => key, "part_name" => field["part_name"], "part" => part_key }
+      end
+    end
+  end
+
   def form(key = nil)
     return nil if @forms.empty?
 

app/models/configurable_document_types/topical_event.json

@@ -30,6 +30,36 @@
         }
       }
     },
+    "about": {
+      "dynamic": true,
+      "label": "About page",
+      "fields": {
+        "about_title": {
+          "title": "Title",
+          "block": "default_string",
+          "attribute_path": ["block_content", "about_title"],
+          "part": "/about",
+          "part_name": "title",
+          "translatable": true
+        },
+        "about_summary": {
+          "title": "Summary",
+          "block": "default_textarea",
+          "attribute_path": ["block_content", "about_summary"],
+          "part": "/about",
+          "part_name": "summary",
+          "translatable": true
+        },
+        "about_body": {
+          "title": "Body",
+          "block": "govspeak",
+          "attribute_path": ["block_content", "about_body"],
+          "part": "/about",
+          "part_name": "body",
+          "translatable": true
+        }
+      }
+    },
     "social_media_accounts": {
       "dynamic": true,
       "label": "Social media accounts",
@@ -128,6 +158,15 @@
       "body": {
         "type": "string"
       },
+      "about_title": {
+        "type": "string"
+      },
+      "about_summary": {
+        "type": "string"
+      },
+      "about_body": {
+        "type": "string"
+      },
       "social_media_links": {
         "type": "array",
         "attributes": {
@@ -175,7 +214,8 @@
     "publishing_api": {
       "details": {
         "body": "govspeak",
-        "social_media_links": "social_media_links"
+        "social_media_links": "social_media_links",
+        "parts": "parts"
       },
       "links": [
         "organisations"

app/models/edition.rb

@@ -422,6 +422,10 @@ def public_url(options = {})
     website_root + public_path(options)
   end
 
+  def additional_routes
+    []
+  end
+
   def force_scheduled?
     force_published? && state == "scheduled"
   end

app/models/standard_edition.rb

@@ -106,6 +106,10 @@ def base_path
     "#{type_instance.settings['base_path_prefix']}/#{slug}"
   end
 
+  def additional_routes
+    type_instance.parts
+  end
+
   def type_instance
     ConfigurableDocumentType.find(configurable_document_type)
   end

app/presenters/publishing_api/organisation_presenter.rb

@@ -74,7 +74,7 @@ def use_prefix_route?
     def additional_routes
       return [] if court_or_tribunal?
 
-      %w[atom]
+      %w[.atom]
     end
 
     def details

app/presenters/publishing_api/payload_builder/block_content.rb

@@ -55,6 +55,12 @@ def social_media_links(attribute)
           }
         end
       end
+
+      def parts(_attribute)
+        item.type_instance.parts.map do |part|
+          PayloadBuilder::MultipleParts.for(item, part)
+        end
+      end
     end
   end
 end

app/presenters/publishing_api/payload_builder/multiple_parts.rb

@@ -0,0 +1,32 @@
+module PublishingApi
+  module PayloadBuilder
+    class MultipleParts
+      attr_reader :item, :part
+
+      def self.for(item, part)
+        new(item, part).call
+      end
+
+      def initialize(item, part)
+        @item = item
+        @part = part
+      end
+
+      def call
+        parts
+      end
+
+    private
+
+      def parts
+        hash = {
+          slug: part.gsub("/", ""),
+        }
+        item.type_instance.fields_for_part(part).each_with_object(hash) do |field, obj|
+          obj[field["part_name"].to_sym] = item.block_content&.public_send(field["key"])
+        end
+        hash
+      end
+    end
+  end
+end

app/presenters/publishing_api/payload_builder/public_document_path.rb

@@ -12,7 +12,12 @@ def initialize(item)
       end
 
       def call
-        { base_path: }.merge(PayloadBuilder::Routes.for(base_path))
+        routes = if item.additional_routes.any?
+                   PayloadBuilder::Routes.for(base_path, additional_routes: item.additional_routes)
+                 else
+                   PayloadBuilder::Routes.for(base_path)
+                 end
+        { base_path: }.merge(routes)
       end
 
     private

app/presenters/publishing_api/payload_builder/routes.rb

@@ -17,7 +17,7 @@ def call
         routes = []
         routes << { path: base_path, type: }
         additional_routes.each do |additional_route|
-          routes << { path: "#{base_path}.#{additional_route}", type: "exact" }
+          routes << { path: "#{base_path}#{additional_route}", type: "exact" }
         end
         { routes: }
       end

app/presenters/publishing_api/topical_event_presenter.rb

@@ -26,7 +26,7 @@ def content
         rendering_app: Whitehall::RenderingApp::FRONTEND,
         schema_name: "topical_event",
       )
-      content.merge!(PayloadBuilder::PolymorphicPath.for(item, additional_routes: %w[atom]))
+      content.merge!(PayloadBuilder::PolymorphicPath.for(item, additional_routes: %w[.atom]))
     end
 
     def links

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

@@ -1,6 +1,9 @@
 <%= render "govuk_publishing_components/components/input", {
   id: block.path.form_control_id,
-  label: { text: block.title + (block.required ? " (required)" : "") },
+  label: {
+    text: block.title + (block.required ? " (required)" : ""),
+    heading_size: "m",
+  },
   name: block.path.form_control_name,
   value: block.value,
   hint: block.hint_text,

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

@@ -0,0 +1,19 @@
+<%= render "govuk_publishing_components/components/textarea", {
+  textarea_id: block.path.form_control_id,
+  label: {
+    text: block.title + (block.required ? " (required)" : ""),
+    heading_size: "m",
+  },
+  name: block.path.form_control_name,
+  value: block.value,
+  hint: block.hint_text,
+  right_to_left: block.edition.translation_locale.rtl?,
+  error_items: errors_for(block.edition.errors, block.path.validation_error_attribute.to_sym),
+} %>
+<% if block.primary_locale_value.present? %>
+  <%= render "govuk_publishing_components/components/details", {
+    title: "Primary locale content for #{block.title}",
+  } do %>
+    <%= block.primary_locale_value %>
+  <% end %>
+<% end %>

public/configurable-document-type.schema.json

@@ -67,6 +67,7 @@
             "default_date",
             "default_object",
             "default_string",
+            "default_textarea",
             "govspeak",
             "default_select",
             "select_with_search_tagging",
@@ -89,6 +90,14 @@
           "description": "When true, only renders the field if the configurable_document_types feature flag is enabled",
           "type": "boolean"
         },
+        "part": {
+          "description": "The slug (e.g. '/about') of the part this field belongs to, if any. Used to group fields into parts and subpages, and to determine the part_name value sent to the Publishing API.",
+          "type": "string"
+        },
+        "part_name": {
+          "description": "What we should call this individual part when sending the child page to Publishing API (otherwise we're forced to retain an unnecessary namespace prefix).",
+          "type": "string"
+        },
         "options": {
           "type": "array",
           "description": "List of options for select inputs.",
@@ -285,7 +294,8 @@
                     "rfc3339_date",
                     "image",
                     "raw",
-                    "social_media_links"
+                    "social_media_links",
+                    "parts"
                   ]
                 }
               },

test/unit/app/models/configurable_content_blocks/default_textarea_test.rb

@@ -0,0 +1,86 @@
+require "test_helper"
+
+class ConfigurableContentBlocks::DefaultTextareaRenderingTest < ActionView::TestCase
+  include ConfigurableContentBlockSharedTests
+
+  setup do
+    @field = {
+      "block" => "default_textarea",
+      "title" => "Test attribute",
+      "description" => "A test attribute",
+      "attribute_path" => %w[block_content test_attribute],
+      "translatable" => true,
+    }
+    @path = Path.new(%w[block_content test_attribute])
+    ConfigurableDocumentType.setup_test_types(build_configurable_document_type("test_type", {
+      "forms" => {
+        "documents" => {
+          "fields" => {
+            "test_attribute" => @field,
+          },
+        },
+      },
+      "schema" => {
+        "attributes" => {
+          "test_attribute" => {
+            "type" => "string",
+          },
+        },
+      },
+    }))
+    @edition = StandardEdition.new(
+      configurable_document_type: "test_type",
+      block_content: { "test_attribute" => "foo" },
+    )
+    @block = ConfigurableContentBlocks::DefaultTextarea.new(@edition, @field, @path)
+  end
+
+  test "the form label is equal to the attribute title" do
+    render @block
+    assert_dom "label", text: @field["title"]
+  end
+
+  test "it adds a required message to the label when the attribute is required" do
+    @field["required"] = true
+    render @block
+    assert_dom "label", text: "#{@field['title']} (required)"
+  end
+
+  test "it sets the textarea name correctly" do
+    render @block
+    assert_dom "textarea[name=?]", "edition[block_content][test_attribute]"
+  end
+
+  test "it sets the textarea value based on the content" do
+    render @block
+    assert_dom "textarea", text: @edition.block_content["test_attribute"]
+  end
+
+  test "it sets the hint text based on the description" do
+    render @block
+    assert_dom ".govuk-hint", text: @field["description"]
+  end
+
+  test "it sets the direction on the input to right to left when the current locale is Arabic" do
+    with_locale(:ar) do
+      render @block
+    end
+    assert_dom "textarea[dir=\"rtl\"]"
+  end
+
+  test "it renders the primary locale content under the textarea when the current locale is different from the primary locale" do
+    with_locale(:es) do
+      render @block
+    end
+
+    assert_dom ".govuk-details__text", text: @edition.block_content["test_attribute"]
+  end
+
+  test "it renders any validation errors when they are present" do
+    messages = %w[foo bar]
+    messages.each { |m| @edition.errors.add(:test_attribute, m) }
+
+    render @block
+    assert_dom ".govuk-error-message", "Error: #{messages.map { |m| "Test attribute #{m}" }.join}"
+  end
+end