metadata_presenter 0.28.7 → 0.28.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b2b29de145c851f89d59513bd32a8eae87926ce47226616f99897ce6bf5269e
-  data.tar.gz: 5835b6dd1ab0c7f8585e5fb2aab6d35f8323e4a5bd40fa1d9344ab6481590876
+  metadata.gz: b14ecefbf796aa68584e1a79715522cd1c3c49b97b528eed86c685206ab65d35
+  data.tar.gz: a264dc36811814d20c328b13b93d0d19e08bd3e24dae1b9a07e7be8a6d91e0f7
 SHA512:
-  metadata.gz: 2e280b3a7d4dc243f4e8cd444594e4439a8319a856f37932ee0016c344f4a885d361c055e90bb0992e48c266a7eed1d5b165925e0f0ba7f34dc97f80a4405b84
-  data.tar.gz: 1dd935559a50b2ee92bd4291f7b0d40d3765eb81657a5abcfe335a0ae169a5993ffefffad00895e8581e1b5f9829caabc1b56e07433db7a6417ab0425d07bd78
+  metadata.gz: 1b902a201d3f224c50196ceb2809829c46eed5a093b3cc94715612a2da5b0deffab0749efbde851778fadaa1724b89be6facab64785fe8774ed2e3c0cd5b08c0
+  data.tar.gz: 446500e1d6a8a141d66ea70f761c874ffc0da245469ebc35985331d60e4cb75405f2bbdbc58d1fad3974ad8debf81ba7351968abc4698dbf19e267666656e6db

data/app/helpers/metadata_presenter/application_helper.rb

@@ -18,9 +18,5 @@ module MetadataPresenter
     def default_text(property)
       MetadataPresenter::DefaultText[property]
     end
-
-    def meta_items
-      service.meta.items
-    end
   end
 end

data/app/models/metadata_presenter/metadata.rb

@@ -13,6 +13,10 @@ class MetadataPresenter::Metadata
     to_h.to_json
   end
 
+  def uuid
+    metadata._uuid
+  end
+
   def id
     metadata._id
   end

data/app/models/metadata_presenter/page.rb

@@ -14,10 +14,6 @@ module MetadataPresenter
       add_extra_component
     ].freeze
 
-    def uuid
-      _uuid
-    end
-
     def ==(other)
       id == other.id if other.respond_to? :id
     end
@@ -26,6 +22,10 @@ module MetadataPresenter
       to_h.reject { |k, _| k.in?(NOT_EDITABLE) }
     end
 
+    def all_components
+      [components, extra_components].flatten.compact
+    end
+
     def components
       to_components(metadata.components, collection: :components)
     end
@@ -34,6 +34,14 @@ module MetadataPresenter
       to_components(metadata.extra_components, collection: :extra_components)
     end
 
+    def components_by_type(type)
+      supported_components = page_components(raw_type)[type]
+
+      all_components.select do |component|
+        supported_components.include?(component.type)
+      end
+    end
+
     def to_partial_path
       type.gsub('.', '/')
     end
@@ -43,11 +51,11 @@ module MetadataPresenter
     end
 
     def input_components
-      page_components(raw_type)[:input_components]
+      page_components(raw_type)[:input]
     end
 
     def content_components
-      page_components(raw_type)[:content_components]
+      page_components(raw_type)[:content]
     end
 
     private

data/app/presenters/metadata_presenter/page_answers_presenter.rb

@@ -1,11 +1,16 @@
 module MetadataPresenter
   class PageAnswersPresenter
     FIRST_ANSWER = 0
-    NO_USER_INPUT = %w[page.checkanswers page.confirmation page.content].freeze
+    NO_USER_INPUT = %w[
+      page.checkanswers
+      page.confirmation
+      page.content
+      page.start
+    ].freeze
 
     def self.map(view:, pages:, answers:)
       user_input_pages(pages).map { |page|
-        Array(page.components).map do |component|
+        Array(page.components_by_type(:input)).map do |component|
           new(
             view: view,
             component: component,
@@ -47,11 +52,19 @@ module MetadataPresenter
     end
 
     def display_heading?(index)
-      page.type == 'page.multiplequestions' && index == FIRST_ANSWER
+      multiplequestions_page? && index == FIRST_ANSWER
+    end
+
+    def last_multiple_question?(index, presenters_count_for_page)
+      multiplequestions_page? && index == presenters_count_for_page - 1
     end
 
     private
 
+    def multiplequestions_page?
+      page.type == 'page.multiplequestions'
+    end
+
     def date(value)
       I18n.l(
         Date.civil(value.year.to_i, value.month.to_i, value.day.to_i),

data/app/views/metadata_presenter/footer/_meta.html.erb

@@ -1,6 +1,6 @@
 <h2 class="govuk-visually-hidden">Support links</h2>
 <ul class="govuk-footer__inline-list">
-<% meta_items.each do |item| %>
+<% service.meta.items.each do |item| %>
   <li class="govuk-footer__inline-list-item">
     <a class="govuk-footer__link" href=<%= File.join(request.script_name, item.href) %>><%= item.text %></a>
   </li>

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

@@ -2,8 +2,6 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
 
-      <%= render partial: 'metadata_presenter/attribute/section_heading' %>
-
       <h1 class="fb-editable govuk-heading-xl"
           data-fb-content-type="element"
           data-fb-content-id="page[heading]">
@@ -51,6 +49,11 @@
                   <% end %>
                 </dd>
               </div>
+
+              <% if page_answers_presenter.last_multiple_question?(index, page_answers_presenters.size) %>
+        </dl>
+        <dl class="fb-block fb-block-answers govuk-summary-list">
+              <% end %>
             <% end %>
           <% end %>
         </dl>

data/config/initializers/page_components.rb

@@ -1,19 +1,23 @@
 Rails.application.config.page_components =
   ActiveSupport::HashWithIndifferentAccess.new({
     checkanswers: {
-      input_components: %w(),
-      content_components: %w(content)
+      input: %w(),
+      content: %w(content)
     },
     confirmation: {
-      input_components: %w(),
-      content_components: %w(content)
+      input: %w(),
+      content: %w(content)
     },
     content: {
-      input_components: %w(),
-      content_components: %w(content)
+      input: %w(),
+      content: %w(content)
     },
     multiplequestions: {
-      input_components: %w(text textarea number date radios checkboxes),
-      content_components: %w(content)
-    }
+      input: %w(text textarea number date radios checkboxes),
+      content: %w(content)
+    },
+    singlequestion: {
+      input: %w(text textarea number date radios checkboxes),
+      content: %w()
+     }
   })

data/default_metadata/page/start.json

@@ -2,7 +2,7 @@
   "_id": "page.start",
   "_type": "page.start",
   "heading": "Service name goes here",
-  "lede": "This is your start page first paragraph. You can only have one paragraph here.",
+  "lede": "",
   "body": "Use this service to:\r\n\r\n* do something\r\n* update your name, address or other details\r\n* do something else\r\n\r\nRegistering takes around 5 minutes.",
   "before_you_start": "###Before you start\r\nYou can also register by post.\r\n\r\nThe online service is also available in Welsh (Cymraeg).\r\n\r\nYou cannot register for this service if you’re in the UK illegally.",
   "steps": [],

data/fixtures/version.json

@@ -280,6 +280,11 @@
             "required": true
           }
         },
+        {
+          "_id": "star-wars-knowledge_content_1",
+          "_type": "content",
+          "content": "Stay on target"
+        },
         {
           "_id": "star-wars-knowledge_radios_1",
           "_type": "radios",
@@ -340,12 +345,12 @@
       "_id": "page._check-answers",
       "_type": "page.checkanswers",
       "heading": "Review your answer",
-      "section_heading": "This section is optional",
       "send_body": "By submitting this answer you confirm all your answers",
       "send_heading": "Send your answer",
       "url": "/check-answers",
       "components": [
         {
+          "_uuid": "256291c2-8ffa-4bda-8282-88e0724ccd10",
           "_id": "check-answers_content_1",
           "_type": "content",
           "content": "Check yourself before you wreck yourself."
@@ -353,6 +358,7 @@
       ],
       "extra_components": [
         {
+          "_uuid": "09961c6a-29f8-4d4f-a6d2-af00cff15536",
           "_id": "check-answers_content_1",
           "_type": "content",
           "content": "Take the cannoli."
@@ -391,7 +397,7 @@
       "_id": "page.accessibility",
       "_type": "page.standalone",
       "heading": "Accessibility Statement",
-      "body": "This accessibility statement applies to [describe your form here - for example, the general enquiries form for the CICA]. There is a separate [accessibility statement for the main GOV.UK website](https://www.gov.uk/help/accessibility-statement).\r\n\r\n###Using this online form\r\n\r\nThis form was built using a tool developed by the Ministry of Justice and uses components from the [GOV.UK Design System](https://design-system.service.gov.uk/).\r\n\r\n[insert your organisation here] is responsible for the content of this online form. The Ministry of Justice is responsible for its technical aspects.\r\n\r\nWe want as many people as possible to be able to use this online form. For example, that means you should be able to:\r\n\r\n- change colours, contrast levels and fonts\r\n- zoom in up to 300% without the text spilling off the screen\r\n- navigate the form using just a keyboard\r\n- navigate the form using speech recognition software\r\n- listen to the form using a screen reader (including recent versions of JAWS, NVDA and VoiceOver)\r\n\r\nWe’ve also made the text as simple as possible to understand.\r\n\r\n[AbilityNet](https://mcmw.abilitynet.org.uk/) has advice on making your device easier to use if you have a disability.\r\n\r\n###What to do if you can’t access part of this form\r\n\r\nIf you need information on this website in a different format:\r\n\r\n[insert your contact details for user requests here - add other channels, such as text phones or Relay UK, as required]\r\n\r\nEmail: [your email address]\r\nTelephone: [your telephone number]\r\n[Hours - e.g. Monday to Friday, 9am to 5pm]\r\n[Find out about call charges](https://www.gov.uk/call-charges)\r\n\r\nWe'll consider your request and get back to you in [add your SLA - e.g. a week or 5 working days].\r\n\r\n###Reporting accessibility problems\r\n\r\nWe’re always looking to improve the accessibility of this online form.\r\n\r\nIf you find any problems that aren’t listed on this page or think we’re not meeting accessibility requirements:\r\n\r\n[insert your contact details for user feedback here - add other channels, such as text phones or Relay UK, as required]\r\n\r\nEmail: [your email address]\nTelephone: [your telephone number]\n[Hours - e.g. Monday to Friday, 9am to 5pm]\n[Find out about call charges](https://www.gov.uk/call-charges)\r\n\r\n###Enforcement procedure\r\n\r\nThe Equality and Human Rights Commission (EHRC) is responsible for enforcing the accessibility regulations. If you’re not happy with how we respond to your complaint, contact the [Equality Advisory and Support Service (EASS)](https://www.equalityadvisoryservice.com/).\r\n\r\n###Technical information about this online form’s accessibility\r\n\r\nWe are committed to making our online forms and services accessible, in accordance with the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018.\r\n\r\nThis online form is fully compliant with the [Web Content Accessibility Guidelines version 2.1 AA standard](https://www.w3.org/TR/WCAG21/).\r\n\r\n###How we tested this online form\r\n\r\nThis online form was last tested in February 2021. The test was carried out by the Ministry of Justice. It was tested using the [WAVE Web Accessibility Evaluation Tool](https://wave.webaim.org/) following guidance from the Government Digital Service (GDS). We tested all the form’s pages.\r\n\r\n###What we’re doing to improve accessibility\r\n\r\nWe will monitor the accessibility of this website on an ongoing basis and fix any accessibility issues reported to us.\r\n\r\nThis statement was prepared on [insert current date].",
+      "body": "This accessibility statement applies to [describe your form here - for example, the general enquiries form for the CICA]. There is a separate [accessibility statement for the main GOV.UK website](https://www.gov.uk/help/accessibility-statement).\r\n\r\n###Using this online form\r\n\r\nThis form was built using MoJ Forms, a tool developed by the Ministry of Justice, and uses components from the [GOV.UK Design System](https://design-system.service.gov.uk/).\r\n\r\n[insert your organisation here] is responsible for the content of this online form. The Ministry of Justice is responsible for its technical aspects.\r\n\r\nWe want as many people as possible to be able to use this online form. For example, that means you should be able to:\r\n\r\n- change colours, contrast levels and fonts\r\n- zoom in up to 300% without the text spilling off the screen\r\n- navigate the form using just a keyboard\r\n- navigate the form using speech recognition software\r\n- listen to the form using a screen reader (including recent versions of JAWS, NVDA and VoiceOver)\r\n\r\nWe’ve also made the text as simple as possible to understand.\r\n\r\n[AbilityNet](https://mcmw.abilitynet.org.uk/) has advice on making your device easier to use if you have a disability.\r\n\r\n###How accessible this form is\r\n\r\nWe know some parts of this form are not fully accessible:\r\n\r\n- pages have no skip links\r\n- the language attribute of the page has not been set in the HTML\r\n- some pages may contain empty headings\r\n- some content may be cut off or appear truncated when zooming in\r\n\r\n###Feedback and contact information\r\n\r\nIf you need information on this website in a different format:\r\n\r\n[insert your contact details for user requests here - add other channels, such as text phones or Relay UK, as required]\r\n\r\n- email: [your email address]\r\n- call: [your telephone number]\r\n- [Hours - e.g. Monday to Friday, 9am to 5pm]\r\n\r\n###Enforcement procedure\r\n\r\nThe Equality and Human Rights Commission (EHRC) is responsible for enforcing the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018 (the ‘accessibility regulations’). If you’re not happy with how we respond to your complaint, contact the [Equality Advisory and Support Service (EASS)](https://www.equalityadvisoryservice.com/).\r\n\r\n###Technical information about this online form’s accessibility\r\n\r\nWe are committed to making our online forms and services accessible, in accordance with the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018.\r\n\r\n####Compliance status\r\n\r\nThis online form is partially compliant with the [Web Content Accessibility Guidelines version 2.1 AA standard](https://www.w3.org/TR/WCAG21/), due to the non-compliances listed below.\r\n\r\n###Non-accessible content\r\n\r\nThe content listed below is non-accessible for the following reasons.\r\n\r\n####Non compliance with the accessibility regulations\r\n\r\n1. Pages have no skip links. This issue may affect screen reader and keyboard users who use skip links to bypass repeated content such as headers and navigation menus to skip directly to the main page content.\r\n2. The language attribute of the page has not been set in the HTML. This may cause confusion to screen reader users who may not be able to identify the primary language of the page in their journey.\r\n3. Some pages may contain empty headings, including on the check answers page. As a result, screen reader users may have difficulty navigating these pages.\n4. Some content may be cut off or appear truncated when zooming in. This issue may affect low-vision users navigating the form who use reflow settings to view web pages.\r\n\r\nWe plan to fix these issues by July 2021.\r\n\r\n###Preparation of this accessibility statement\r\n\r\nThis statement was prepared on [date when it was first published]. It was last reviewed on [date when it was last reviewed].\r\n\r\nThis form was last tested on [date when you performed your basic accessibility check].\r\n\r\nIn order to test the compliance of all forms built using the MoJ Forms tool, the Ministry of Justice commissioned The Digital Accessibility Centre (DAC) to carry out a WCAG 2.1 AA level audit of a sample form. This included extensive testing by users with a wide range of disabilities. The audit was performed on 8 April 2021.\r\n\r\nIn addition, this form was tested by [insert team or organisation here]. It was tested using the [WAVE Web Accessibility Evaluation Tool](https://wave.webaim.org/) following guidance from the Ministry of Justice and Government Digital Service (GDS).\r\n\r\n###What we’re doing to improve accessibility\r\n\r\nWe will monitor the accessibility of this website on an ongoing basis and fix any accessibility issues reported to us.",
       "components": [],
       "url": "accessibility"
     },

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '0.28.7'.freeze
+  VERSION = '0.28.12'.freeze
 end

data/schemas/page/checkanswers.json

@@ -8,11 +8,6 @@
     "_type": {
       "const": "page.checkanswers"
     },
-    "section_heading": {
-      "title": "Section heading",
-      "type": "string",
-      "description": "Section to display before the heading"
-    },
     "heading": {
       "type": "string",
       "default": "Check your answers"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 0.28.7
+  version: 0.28.12
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-16 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder