metadata_presenter 3.3.8 → 3.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 328dab1045a2324860917bc91f334eb353622109395a58381846b86a4f48654d
-  data.tar.gz: 559913cd057f2e6fbe76bc5f5b42d7dca5e4c80288a567546425817fc511c896
+  metadata.gz: 72f903ea69aac642330788eb582ca3ca0f23b6be19bb46675dd57e9c65435a9e
+  data.tar.gz: b937d1215881c6634dab4ac6844cc9f4a9d5e34bda404c8d71fc26d5800ffeea
 SHA512:
-  metadata.gz: de3b47dab8a26bcc6b346a391d5152727a1b68c7417d378c8153b5a0861205591ec8aed96a2db5c91c3edc8e2194ffa8b60039dbf76a2150cbea0a9082f5e04a
-  data.tar.gz: aec951701f792b9a0d34e674bc83965ca3bf74504d5a891ed924b8a363cb5f8ac1f924dfc13e186b6520e464360a974f129ac84584c10eb080b44ea67ba95442
+  metadata.gz: c4cb42cfa3147e7b5ba49fa4d847fdfe3af0a568851a525da702f080d08c03bbe8c0f94b01eacf6b5191c04d793a3051a47ecf19338095a35563a5f9d033cecf
+  data.tar.gz: ef5eb881fc90c4bc68057740d6caa4370a14c5328480044384b6ac7c582f0d49dc1acf32e04f61b9cc5f32f275de694485de210ca230df534137e2e7a0fe2440

data/app/controllers/metadata_presenter/engine_controller.rb

@@ -8,38 +8,52 @@ module MetadataPresenter
     before_action :show_maintenance_page
 
     def reload_user_data
+      # :nocov:
       if defined? super
         super
+        # :nocov:
       else
         load_user_data
       end
     end
 
     def save_form_progress
+      # :nocov:
       if defined? super
         super
+        # :nocov:
       end
     end
 
     def get_saved_progress(uuid)
+      # :nocov:
       if defined? super
         super(uuid)
+        # :nocov:
       end
     end
 
     def increment_record_counter(uuid)
+      # :nocov:
       if defined? super
         super(uuid)
+        # :nocov:
       end
     end
 
     def invalidate_record(uuid)
+      # :nocov:
       if defined? super
         super(uuid)
+        # :nocov:
       end
     end
 
     def back_link
+      if use_external_start_page? && first_page?
+        return external_start_page_url
+      end
+
       previous_page = PreviousPage.new(
         service:,
         user_data: load_user_data,

data/app/controllers/metadata_presenter/service_controller.rb

@@ -1,8 +1,30 @@
 module MetadataPresenter
   class ServiceController < EngineController
     def start
+      if use_external_start_page?
+        return redirect_to_next_page
+      end
+
       @page = service.start_page
       render template: @page.template
     end
+
+    private
+
+    def redirect_to_next_page
+      next_page = NextPage.new(
+        service:,
+        session:,
+        user_data: reload_user_data,
+        current_page_url: service.start_page.url,
+        previous_answers: []
+      ).find
+
+      if next_page.present?
+        redirect_to_page next_page.url
+      else
+        not_found
+      end
+    end
   end
 end

data/app/controllers/metadata_presenter/submissions_controller.rb

@@ -33,9 +33,11 @@ module MetadataPresenter
       # So in the Runner we defined the #create_save_and_return_submission in the parent
       # controller and in the Editor we don't.
       #
+      # :nocov:
       if defined?(super)
         super
       end
+      # :nocov:
     end
   end
 end

data/app/models/metadata_presenter/address_fieldset.rb

@@ -0,0 +1,37 @@
+module MetadataPresenter
+  class AddressFieldset
+    extend ActiveModel::Translation
+    include ActiveModel::Validations
+    include ActionView::Helpers
+
+    DEFAULT_COUNTRY = 'United Kingdom'.freeze
+    FIELDS = %w[
+      address_line_one
+      address_line_two
+      city
+      county
+      postcode
+      country
+    ].freeze
+
+    attr_reader(*FIELDS)
+
+    def initialize(address)
+      FIELDS.each do |field|
+        next unless address[field]
+
+        instance_variable_set(:"@#{field}", conform(address[field]))
+      end
+
+      @country ||= DEFAULT_COUNTRY
+    end
+
+    def to_a
+      instance_values.values_at(*FIELDS).compact_blank
+    end
+
+    def conform(address_field)
+      sanitize(address_field, tags: [], attributes: []).strip
+    end
+  end
+end

data/app/models/metadata_presenter/component.rb

@@ -88,12 +88,6 @@ class MetadataPresenter::Component < MetadataPresenter::Metadata
     end
   end
 
-  def find_conditional_content_by_uuid(uuid)
-    metadata['conditionals'].select do |conditional|
-      conditional['_uuid'] == uuid
-    end
-  end
-
   private
 
   def validation_bundle_key

data/app/models/metadata_presenter/evaluate_content_conditionals.rb

@@ -25,7 +25,7 @@ module MetadataPresenter
       if candidate_component.conditionals.count == 1
         # if there are only and rules or the particular case where there is only one condition
         evaluation_conditions << evaluate_condition(candidate_component.conditionals[0])
-        return candidate_component.uuid if evaluation_conditions.flatten.all?
+        candidate_component.uuid if evaluation_conditions.flatten.all?
       elsif candidate_component.conditionals.count > 1
         # if there are or rule
         if candidate_component.conditionals[0][:_type] == 'and'
@@ -40,7 +40,7 @@ module MetadataPresenter
           candidate_component.conditionals.map do |conditional|
             evaluation_conditions << evaluate_condition(conditional)
           end
-          return candidate_component.uuid if evaluation_conditions.flatten.any?
+          candidate_component.uuid if evaluation_conditions.flatten.any?
         end
       end
     end

data/app/models/metadata_presenter/page_answers.rb

@@ -34,11 +34,15 @@ module MetadataPresenter
         answer_object.to_h if answer_object.present?
       elsif component && component.type == 'checkboxes'
         answers[method_name.to_s].to_a
+      elsif component && component.type == 'address'
+        address_answer(method_name.to_s)
       else
         sanitize(answers[method_name.to_s])
       end
     end
 
+    private
+
     def upload_answer(component_id, _count)
       file_details = answers[component_id.to_s]
 
@@ -141,8 +145,6 @@ module MetadataPresenter
       end
     end
 
-    private
-
     def sanitize_filename(answer)
       sanitize(filename(update_filename(answer)))
     end
@@ -173,5 +175,16 @@ module MetadataPresenter
       file_extension = File.extname(answer)
       %w[.jfif .jpg].include?(file_extension)
     end
+
+    # NOTE: Address component is different to other components in the sense it can
+    # produce different validation errors in different fields, and we need to track
+    # those errors between page renders, thus needing memoisation.
+    def address_answer(component_id)
+      @address_answer ||= {}
+
+      @address_answer[component_id] ||= MetadataPresenter::AddressFieldset.new(
+        answers.fetch(component_id, {})
+      )
+    end
   end
 end

data/app/presenters/metadata_presenter/page_answers_presenter.rb

@@ -93,5 +93,11 @@ module MetadataPresenter
     def autocomplete(value)
       JSON.parse(value)['text']
     end
+
+    def address(value)
+      view.simple_format(
+        value.to_a.join("\r\n"), {}, wrapper_tag: 'span'
+      )
+    end
   end
 end

data/app/validators/metadata_presenter/address_validator.rb

@@ -0,0 +1,46 @@
+module MetadataPresenter
+  class AddressValidator < BaseValidator
+    REQUIRED_FIELDS = %i[
+      address_line_one
+      city
+      postcode
+      country
+    ].freeze
+
+    OPTIONAL_FIELDS = %i[
+      address_line_two
+      county
+    ].freeze
+
+    def valid?
+      return true if allow_blank?
+
+      validate_required_fields
+
+      user_answer.errors.empty?
+    end
+
+    private
+
+    def allow_blank?
+      component.validation.compact_blank.keys.exclude?('required')
+    end
+
+    def validate_required_fields
+      REQUIRED_FIELDS.each { |field| add_error_if_blank(field) }
+    end
+
+    def add_error_if_blank(field)
+      if user_answer.send(field).blank?
+        error_message = default_error_message(field: translated_field(field))
+
+        page_answers.errors.add([component.id, field].join('.'), error_message)
+        user_answer.errors.add(field, error_message)
+      end
+    end
+
+    def translated_field(field)
+      MetadataPresenter::AddressFieldset.human_attribute_name(field).downcase
+    end
+  end
+end

data/app/validators/metadata_presenter/base_validator.rb

@@ -73,14 +73,14 @@ module MetadataPresenter
     # @return [String] returns the default error message
     # @raise [MetadataPresenter::NoDefaultMessage] raises no default message if
     # is not present
-    def default_error_message
+    def default_error_message(params = {})
       default_error_message_key = "error.#{schema_key}"
       default_message = Rails.application
                              .config
                              .default_metadata[default_error_message_key]
 
       if default_message.present?
-        default_message['value'] % error_message_hash
+        default_message['value'] % error_message_hash.merge(params)
       else
         raise NoDefaultMessage, "No default message found for key '#{default_error_message_key}'."
       end
@@ -129,7 +129,7 @@ module MetadataPresenter
     # blank values. We should not allow blank when performing the required
     # validation.
     #
-    # @return [TrueClass]
+    # @return [Boolean]
     #
     def allow_blank?
       user_answer.blank? && !self.class.name.demodulize.include?('RequiredValidator')

data/app/validators/metadata_presenter/postcode_validator.rb

@@ -0,0 +1,53 @@
+module MetadataPresenter
+  class PostcodeValidator < BaseValidator
+    require 'uk_postcode'
+
+    VALIDATABLE_COUNTRIES = [
+      'UK',
+      'U.K.',
+      'England',
+      'United Kingdom',
+      'Scotland',
+      'Wales',
+      'Cymru',
+      'Channel Islands',
+      'Isle of Man',
+      'Northern Ireland'
+    ].freeze
+
+    def valid?
+      validate_postcode if postcode.present?
+
+      user_answer.errors.empty?
+    end
+
+    private
+
+    def country
+      user_answer.country
+    end
+
+    def postcode
+      user_answer.postcode
+    end
+
+    def parsed_postcode
+      @parsed_postcode ||= UKPostcode.parse(postcode)
+    end
+
+    def valid_postcode?
+      parsed_postcode.full_valid?
+    end
+
+    def validatable_country?
+      VALIDATABLE_COUNTRIES.grep(/\A#{country}\z/i).any?
+    end
+
+    def validate_postcode
+      return if !validatable_country? || valid_postcode?
+
+      page_answers.errors.add([component.id, :postcode].join('.'), default_error_message)
+      user_answer.errors.add(:postcode, default_error_message)
+    end
+  end
+end

data/app/views/metadata_presenter/attribute/_external_start_page_info.html.erb

@@ -0,0 +1,12 @@
+<div class="govuk-notification-banner" role="region" aria-labelledby="govuk-notification-banner-title" data-module="govuk-notification-banner">
+<div class="govuk-notification-banner__header">
+  <h2 class="govuk-notification-banner__title" id="govuk-notification-banner-title">
+    <%= I18n.t('presenter.external_start_page_info.important') %>
+  </h2>
+</div>
+<div class="govuk-notification-banner__content">
+  <p class="govuk-notification-banner__heading">
+    <%= I18n.t('presenter.external_start_page_info.content', href: govuk_link_to(I18n.t('presenter.external_start_page_info.link_text'), 'https://moj-forms.service.justice.gov.uk/building-and-editing/#start-page')).html_safe %>
+  </p>
+</div>
+</div>

data/app/views/metadata_presenter/component/_address.html.erb

@@ -0,0 +1,46 @@
+<% hint_id = f.field_id(component.id, [:hint]).tr('_', '-') if component.hint.present? %>
+
+<%= f.govuk_fieldset legend: { text: input_title }, described_by: hint_id do %>
+  <%= f.fields_for component.id, f.object.send(component.id) do |a| %>
+    <% if component.hint.present? %>
+      <div class="govuk-hint govuk-!-margin-bottom-6" id="<%= hint_id %>" data-fb-default-text="<%= default_text('hint') %>">
+        <%= component.hint %>
+      </div>
+    <% end %>
+
+    <%=
+      a.govuk_text_field :address_line_one,
+                         label: { text: MetadataPresenter::AddressFieldset.human_attribute_name('address_line_one') },
+                         autocorrect: 'off', autocomplete: 'address-line1'
+    %>
+    <%=
+      a.govuk_text_field :address_line_two,
+                         label: { text: MetadataPresenter::AddressFieldset.human_attribute_name('address_line_two') },
+                         autocorrect: 'off', autocomplete: 'address-line2'
+    %>
+    <%=
+      a.govuk_text_field :city,
+                         label: { text: MetadataPresenter::AddressFieldset.human_attribute_name('city') },
+                         width: 'two-thirds',
+                         autocorrect: 'off', autocomplete: 'address-level2'
+    %>
+    <%=
+      a.govuk_text_field :county,
+                         label: { text: MetadataPresenter::AddressFieldset.human_attribute_name('county') },
+                         width: 'two-thirds',
+                         autocorrect: 'off', autocomplete: 'address-level1'
+    %>
+    <%=
+      a.govuk_text_field :postcode,
+                         label: { text: MetadataPresenter::AddressFieldset.human_attribute_name('postcode') },
+                         width: 'one-quarter',
+                         autocorrect: 'off', autocomplete: 'postal-code'
+    %>
+    <%=
+      a.govuk_text_field :country,
+                         label: { text: MetadataPresenter::AddressFieldset.human_attribute_name('country') },
+                         width: 'one-quarter',
+                         autocorrect: 'off', autocomplete: 'country-name'
+    %>
+  <% end %>
+<% end %>

data/app/views/metadata_presenter/header/show.html.erb

@@ -28,10 +28,10 @@
     </div>
     <% if service.service_name.present? %>
       <div class="govuk-header__content">
-        <a href="<%= root_path %>" class="govuk-header__link govuk-header__service-name">
+        <a href="<%= start_page_url %>" class="govuk-header__link govuk-header__service-name">
           <%= service.service_name %>
         </a>
+      </div>
     <% end %>
-    </div>
   </div>
 </header>

data/app/views/metadata_presenter/page/content.html.erb

@@ -1,6 +1,9 @@
 <div class="fb-main-grid-wrapper" data-fb-pagetype="<%= @page.type %>">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
+      <% if editor_preview? && use_external_start_page? && first_page? %>
+        <%= render 'metadata_presenter/attribute/external_start_page_info' %>
+      <% end %>
 
       <%= render partial:'metadata_presenter/component/conditional_component_banner'%>
 

data/app/views/metadata_presenter/page/multiplequestions.html.erb

@@ -1,6 +1,9 @@
 <div class="fb-main-grid-wrapper" data-fb-pagetype="<%= @page.type %>">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
+      <% if editor_preview? && use_external_start_page? && first_page? %>
+        <%= render 'metadata_presenter/attribute/external_start_page_info' %>
+      <% end %>
 
       <%= render partial:'metadata_presenter/component/conditional_component_banner'%>
 

data/app/views/metadata_presenter/page/singlequestion.html.erb

@@ -2,6 +2,10 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
 
+    <% if editor_preview? && use_external_start_page? && first_page? %>
+      <%= render 'metadata_presenter/attribute/external_start_page_info' %>
+    <% end %>
+
       <%= render 'metadata_presenter/attribute/section_heading' %>
 
       <%= form_for @page_answers, as: :answers, url: @page.url, method: :post, authenticity_token: false do |f| %>

data/config/initializers/supported_components.rb

@@ -17,11 +17,11 @@ Rails.application.config.supported_components =
       content: %w(content)
     },
     multiplequestions: {
-      input: %w(text textarea email number date radios checkboxes),
+      input: %w(text textarea email number date address radios checkboxes),
       content: %w(content)
     },
     singlequestion: {
-      input: %w(text textarea number date radios checkboxes email upload multiupload autocomplete),
+      input: %w(text textarea number date address radios checkboxes email upload multiupload autocomplete),
       content: %w()
      }
   })

data/config/locales/en.yml

@@ -17,6 +17,10 @@ en:
       rejected: rejected
       confirmation: You've %{action} analytics cookies.
       hide: Hide this message
+    external_start_page_info:
+      important: 'Important'
+      content: "Your form has a %{href}. Links to your form's 'home' page, such as your form's name in the header, will not work until the GOV.UK page has been published."
+      link_text: 'GOV.UK start page'
     maintenance:
       maintenance_page_heading: 'Sorry, this form is unavailable'
       maintenance_page_content: "If you were in the middle of completing the form, your data has not been saved.\r\n\r\nThe form will be available again from 9am on Monday 19 November 2018.\r\n\r\n\r\n\r\n### Other ways to apply\r\n\r\nContact us if your application is urgent \r\n\r\nEmail:  \r\nTelephone:  \r\nMonday to Friday, 9am to 5pm  \r\n[Find out about call charges](https://www.gov.uk/call-charges)"
@@ -171,3 +175,13 @@ en:
           - "[date when you performed your basic accessibility check]"
           - "[insert team or organisation here]"
         url: 'accessibility'
+
+  activemodel:
+    attributes:
+      metadata_presenter/address_fieldset:
+        address_line_one: Address line 1
+        address_line_two: Address line 2 (optional)
+        city: Town or city
+        county: County (optional)
+        postcode: Postcode
+        country: Country

data/default_metadata/component/address.json

@@ -0,0 +1,13 @@
+{
+  "_id": "component.address",
+  "_type": "address",
+  "errors": {},
+  "legend": "Address question",
+  "hint": "",
+  "name": "component-name",
+  "validation": {
+    "required": true,
+    "address": true,
+    "postcode": true
+  }
+}

data/default_metadata/string/error.address.json

@@ -0,0 +1,6 @@
+{
+  "_id": "error.address",
+  "_type": "string.error",
+  "description": "Input (address) is blank",
+  "value": "Enter %{field} for \"%{control}\""
+}

data/default_metadata/string/error.postcode.json

@@ -0,0 +1,6 @@
+{
+  "_id": "error.postcode",
+  "_type": "string.error",
+  "description": "Postcode format is not valid",
+  "value": "Enter a valid UK postcode for \"%{control}\""
+}

data/fixtures/version.json

@@ -1,104 +1,110 @@
 {
   "_id": "service.base",
-  "_type": "service.base",
   "flow": {
-    "cf6dc32f-502c-4215-8c27-1151a45735bb": {
-      "_type": "flow.page",
+    "0c022e95-0748-4dda-8ba5-12fd1d2f596b": {
       "next": {
-        "default": "9e1ba77f-f1e5-42f4-b090-437aa9af7f73"
-      }
+        "default": "e8708909-922e-4eaf-87a5-096f7a713fcb"
+      },
+      "_type": "flow.page"
     },
-    "9e1ba77f-f1e5-42f4-b090-437aa9af7f73": {
-      "_type": "flow.page",
+    "2ef7d11e-0307-49e9-9fe2-345dc528dd66": {
       "next": {
-        "default": "adcb61c3-52b1-479b-be51-1bb610876d54"
-      }
+        "default": "2ef7d11e-0307-49e9-9fe2-345dc528dd67"
+      },
+      "_type": "flow.page"
     },
-    "adcb61c3-52b1-479b-be51-1bb610876d54": {
-      "_type": "flow.page",
+    "2ef7d11e-0307-49e9-9fe2-345dc528dd67": {
       "next": {
-        "default": "4b8c6bf3-878a-4446-9198-48351b3e2185"
-      }
+        "default": "c7755991-436b-4495-afa6-803db58cefbc"
+      },
+      "_type": "flow.page"
     },
     "4b8c6bf3-878a-4446-9198-48351b3e2185": {
-      "_type": "flow.page",
       "next": {
         "default": "54ccc6cd-60c0-4749-947b-a97af1bc0aa2"
-      }
+      },
+      "_type": "flow.page"
     },
     "54ccc6cd-60c0-4749-947b-a97af1bc0aa2": {
-      "_type": "flow.page",
       "next": {
         "default": "b8335af2-6642-4e2f-8192-0dd12279eec7"
-      }
-    },
-    "b8335af2-6642-4e2f-8192-0dd12279eec7": {
-      "_type": "flow.page",
-      "next": {
-        "default": "68fbb180-9a2a-48f6-9da6-545e28b8d35a"
-      }
+      },
+      "_type": "flow.page"
     },
     "68fbb180-9a2a-48f6-9da6-545e28b8d35a": {
-      "_type": "flow.page",
       "next": {
         "default": "7806cd64-0c05-450e-ba6f-2325c8b22d46"
-      }
+      },
+      "_type": "flow.page"
     },
-    "7806cd64-0c05-450e-ba6f-2325c8b22d46": {
-      "_type": "flow.page",
+    "6984b0a4-d432-4628-89b7-410170b6f148": {
       "next": {
-        "default": "0c022e95-0748-4dda-8ba5-12fd1d2f596b"
-      }
+        "default": "e337070b-f636-49a3-a65c-f506675265f0"
+      },
+      "_type": "flow.page"
     },
-    "0c022e95-0748-4dda-8ba5-12fd1d2f596b": {
-      "_type": "flow.page",
+    "778e364b-9a7f-4829-8eb2-510e08f156a3": {
       "next": {
-        "default": "e8708909-922e-4eaf-87a5-096f7a713fcb"
-      }
+        "default": ""
+      },
+      "_type": "flow.page"
     },
-    "e8708909-922e-4eaf-87a5-096f7a713fcb": {
-      "_type": "flow.page",
+    "7806cd64-0c05-450e-ba6f-2325c8b22d46": {
       "next": {
-        "default": "80420693-d6f2-4fce-a860-777ca774a6f5"
-      }
+        "default": "0c022e95-0748-4dda-8ba5-12fd1d2f596b"
+      },
+      "_type": "flow.page"
     },
     "80420693-d6f2-4fce-a860-777ca774a6f5": {
-      "_type": "flow.page",
       "next": {
         "default": "2ef7d11e-0307-49e9-9fe2-345dc528dd66"
-      }
+      },
+      "_type": "flow.page"
     },
-    "2ef7d11e-0307-49e9-9fe2-345dc528dd66": {
-      "_type": "flow.page",
+    "9e1ba77f-f1e5-42f4-b090-437aa9af7f73": {
       "next": {
-        "default": "2ef7d11e-0307-49e9-9fe2-345dc528dd67"
-      }
+        "default": "adcb61c3-52b1-479b-be51-1bb610876d54"
+      },
+      "_type": "flow.page"
     },
-    "2ef7d11e-0307-49e9-9fe2-345dc528dd67": {
-      "_type": "flow.page",
+    "adcb61c3-52b1-479b-be51-1bb610876d54": {
       "next": {
-        "default": "c7755991-436b-4495-afa6-803db58cefbc"
-      }
+        "default": "4b8c6bf3-878a-4446-9198-48351b3e2185"
+      },
+      "_type": "flow.page"
+    },
+    "b8335af2-6642-4e2f-8192-0dd12279eec7": {
+      "next": {
+        "default": "68fbb180-9a2a-48f6-9da6-545e28b8d35a"
+      },
+      "_type": "flow.page"
     },
     "c7755991-436b-4495-afa6-803db58cefbc": {
-      "_type": "flow.page",
       "next": {
-        "default": "e337070b-f636-49a3-a65c-f506675265f0"
-      }
+        "default": "6984b0a4-d432-4628-89b7-410170b6f148"
+      },
+      "_type": "flow.page"
+    },
+    "cf6dc32f-502c-4215-8c27-1151a45735bb": {
+      "next": {
+        "default": "9e1ba77f-f1e5-42f4-b090-437aa9af7f73"
+      },
+      "_type": "flow.page"
     },
     "e337070b-f636-49a3-a65c-f506675265f0": {
-      "_type": "flow.page",
       "next": {
         "default": "778e364b-9a7f-4829-8eb2-510e08f156a3"
-      }
+      },
+      "_type": "flow.page"
     },
-    "778e364b-9a7f-4829-8eb2-510e08f156a3": {
-      "_type": "flow.page",
+    "e8708909-922e-4eaf-87a5-096f7a713fcb": {
       "next": {
-        "default": ""
-      }
+        "default": "80420693-d6f2-4fce-a860-777ca774a6f5"
+      },
+      "_type": "flow.page"
     }
   },
+  "_type": "service.base",
   "pages": [
     {
       "_id": "page.start",
@@ -675,6 +681,33 @@
       ],
       "section_heading": ""
     },
+    {
+      "_id": "page.postal-address",
+      "url": "postal-address",
+      "body": "Body section",
+      "lede": "",
+      "_type": "page.singlequestion",
+      "_uuid": "6984b0a4-d432-4628-89b7-410170b6f148",
+      "heading": "",
+      "components": [
+        {
+          "_id": "postal-address_address_1",
+          "hint": "",
+          "name": "postal-address_address_1",
+          "_type": "address",
+          "_uuid": "f72db038-d1cd-4c0d-baea-570b3e4863f5",
+          "errors": {},
+          "legend": "Confirm your postal address",
+          "collection": "components",
+          "validation": {
+            "address": true,
+            "required": true,
+            "postcode": true
+          }
+        }
+      ],
+      "section_heading": ""
+    },
     {
       "_id": "page.check-answers",
       "url": "check-answers",

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '3.3.8'.freeze
+  VERSION = '3.3.10'.freeze
 end

data/schemas/component/address.json

@@ -0,0 +1,31 @@
+{
+  "$id": "http://gov.uk/schema/v1.0.0/address",
+  "_name": "component.address",
+  "title": "Address",
+  "description": "Let users enter their address",
+  "type": "object",
+  "properties": {
+    "_type": {
+      "const": "address"
+    }
+  },
+  "allOf": [
+    {
+      "$ref": "definition.fieldset"
+    },
+    {
+      "$ref": "definition.width_class.input"
+    },
+    {
+      "$ref": "validations#/definitions/errors_address"
+    }
+  ],
+  "composite": [
+    "address_line_one",
+    "address_line_two",
+    "city",
+    "county",
+    "postcode",
+    "country"
+  ]
+}

data/schemas/errors/errors.json

@@ -20,6 +20,14 @@
         }
       ]
     },
+    "address": {
+      "title": "Error strings for required address fields",
+      "allOf": [
+        {
+          "$ref": "#/definitions/error_strings"
+        }
+      ]
+    },
     "min_length": {
       "title": "Error strings for minimum length",
       "allOf": [
@@ -95,6 +103,17 @@
         }
       }
     },
+    "address_errors": {
+      "properties": {
+        "errors": {
+          "properties": {
+            "address": {
+              "$ref": "#/definitions/address"
+            }
+          }
+        }
+      }
+    },
     "string_errors": {
       "properties": {
         "errors": {

data/schemas/validations/validations.json

@@ -34,6 +34,24 @@
         }
       ]
     },
+    "address": {
+      "title": "Address",
+      "description": "Address required fields",
+      "oneOf": [
+        {
+          "$ref": "definition.conditional.boolean"
+        }
+      ],
+      "default": true
+    },
+    "errors_address": {
+      "title": "Error messages for 'Address'",
+      "allOf": [
+        {
+          "$ref": "#/definitions/error_strings"
+        }
+      ]
+    },
     "errors_required": {
       "title": "Error messages for ‘Required’",
       "allOf": [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 3.3.8
+  version: 3.3.10
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-15 00:00:00.000000000 Z
+date: 2024-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: uk_postcode
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: better_errors
   requirement: !ruby/object:Gem::Requirement
@@ -328,6 +342,7 @@ files:
 - app/helpers/metadata_presenter/default_metadata.rb
 - app/helpers/metadata_presenter/default_text.rb
 - app/jobs/metadata_presenter/application_job.rb
+- app/models/metadata_presenter/address_fieldset.rb
 - app/models/metadata_presenter/autocomplete_item.rb
 - app/models/metadata_presenter/branch_destinations.rb
 - app/models/metadata_presenter/column_number.rb
@@ -371,6 +386,7 @@ files:
 - app/presenters/metadata_presenter/page_answers_presenter.rb
 - app/validators/email_confirmation_validator.rb
 - app/validators/metadata_presenter/accept_validator.rb
+- app/validators/metadata_presenter/address_validator.rb
 - app/validators/metadata_presenter/autocomplete_validator.rb
 - app/validators/metadata_presenter/base_upload_validator.rb
 - app/validators/metadata_presenter/base_validator.rb
@@ -389,6 +405,7 @@ files:
 - app/validators/metadata_presenter/minimum_validator.rb
 - app/validators/metadata_presenter/multiupload_validator.rb
 - app/validators/metadata_presenter/number_validator.rb
+- app/validators/metadata_presenter/postcode_validator.rb
 - app/validators/metadata_presenter/required_validator.rb
 - app/validators/metadata_presenter/validate_answers.rb
 - app/validators/metadata_presenter/validate_schema.rb
@@ -409,9 +426,11 @@ files:
 - app/views/metadata_presenter/analytics/_ua.html.erb
 - app/views/metadata_presenter/analytics/analytics.html.erb
 - app/views/metadata_presenter/attribute/_body.html.erb
+- app/views/metadata_presenter/attribute/_external_start_page_info.html.erb
 - app/views/metadata_presenter/attribute/_heading.html.erb
 - app/views/metadata_presenter/attribute/_lede.html.erb
 - app/views/metadata_presenter/attribute/_section_heading.html.erb
+- app/views/metadata_presenter/component/_address.html.erb
 - app/views/metadata_presenter/component/_autocomplete.html.erb
 - app/views/metadata_presenter/component/_checkboxes.html.erb
 - app/views/metadata_presenter/component/_components.html.erb
@@ -460,6 +479,7 @@ files:
 - config/initializers/supported_components.rb
 - config/locales/en.yml
 - config/routes.rb
+- default_metadata/component/address.json
 - default_metadata/component/autocomplete.json
 - default_metadata/component/checkboxes.json
 - default_metadata/component/content.json
@@ -489,6 +509,7 @@ files:
 - default_metadata/page/start.json
 - default_metadata/service/base.json
 - default_metadata/string/error.accept.json
+- default_metadata/string/error.address.json
 - default_metadata/string/error.autocomplete.json
 - default_metadata/string/error.catch_all.json
 - default_metadata/string/error.date.json
@@ -505,6 +526,7 @@ files:
 - default_metadata/string/error.minimum.json
 - default_metadata/string/error.multiupload.json
 - default_metadata/string/error.number.json
+- default_metadata/string/error.postcode.json
 - default_metadata/string/error.required.json
 - default_metadata/string/error.virus_scan.json
 - default_metadata/validations/date_after.json
@@ -554,6 +576,7 @@ files:
 - lib/metadata_presenter/engine.rb
 - lib/metadata_presenter/test_helpers.rb
 - lib/metadata_presenter/version.rb
+- schemas/component/address.json
 - schemas/component/autocomplete.json
 - schemas/component/checkboxes.json
 - schemas/component/content.json