metadata_presenter 0.27.3 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 027ea2efffbb85068abc14cb2ba4ff016aa92f7d32052a29689e1e5a0f38e315
-  data.tar.gz: 77b4685de4e43230b2c42b716f318d19e0352dea1b9ffa7e13f36f3a55501b54
+  metadata.gz: 710ee25690f8d4c33cd436f03553399076b6a43b9db5146a25ca865deec4a861
+  data.tar.gz: 9241c9c780ce678cbb8d83cdcf6c61bece75447709ab568e180ea0eeddc3fb70
 SHA512:
-  metadata.gz: d19d3e0d29083c44dc3efda1c631b0e949d78e865b112c97601acf71590e6e376b0f9324d92d35dd39dcf0866a9552fd0609025ce344570f344926c0aa4a4ea4
-  data.tar.gz: 18426551b21ebca783e364ad645bfef4b9dcf1a94a868e35d73c549535efbf30e77d571f8ac94919fae4c34804be16c84fe8642f6a6e5fa7514140979845070c
+  metadata.gz: c192cf21be0ef86dd737a7fda0d313b8861c6ee02cc12d649627d56ab3e09c3fc714a3da71009236a980d068eb6147e0559b324087298b050f225f15b1da1d3e
+  data.tar.gz: 5ce185225d8a00da09b1937aba2f8b398e2822f60182c4fb4624e3847f4d608a1a5ee2d1581c3c129c560b6cefed6e7782e82cab59449701c33bc63e458f0232

data/app/controllers/metadata_presenter/engine_controller.rb

@@ -8,7 +8,10 @@ module MetadataPresenter
     def back_link
       return if @page.blank?
 
-      previous_page = service.previous_page(current_page: @page)&.url
+      previous_page = service.previous_page(
+        current_page: @page,
+        referrer: request.referer
+      )&.url
 
       @back_link ||= File.join(request.script_name, previous_page) if previous_page
     end

data/app/helpers/metadata_presenter/application_helper.rb

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

data/app/models/metadata_presenter/meta.rb

@@ -0,0 +1,7 @@
+class MetadataPresenter::Meta < MetadataPresenter::Metadata
+  def items
+    metadata.items.map do |item|
+      MetadataPresenter::MetaItem.new(item)
+    end
+  end
+end

data/app/models/metadata_presenter/meta_item.rb

@@ -0,0 +1,2 @@
+class MetadataPresenter::MetaItem < MetadataPresenter::Metadata
+end

data/app/models/metadata_presenter/service.rb

@@ -5,6 +5,12 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
     end
   end
 
+  def standalone_pages
+    @standalone_pages ||= metadata.standalone_pages.map do |page|
+      MetadataPresenter::Page.new(page, editor: editor?)
+    end
+  end
+
   def start_page
     pages.first
   end
@@ -14,11 +20,11 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
   end
 
   def find_page_by_url(url)
-    pages.find { |page| strip_slash(page.url) == strip_slash(url) }
+    all_pages.find { |page| strip_slash(page.url) == strip_slash(url) }
   end
 
   def find_page_by_uuid(uuid)
-    pages.find { |page| page.uuid == uuid }
+    all_pages.find { |page| page.uuid == uuid }
   end
 
   def next_page(from:)
@@ -26,8 +32,10 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
     pages[pages.index(current_page) + 1] if current_page.present?
   end
 
-  def previous_page(current_page:)
-    pages[pages.index(current_page) - 1] unless current_page == start_page
+  def previous_page(current_page:, referrer:)
+    unless no_back_link?(current_page)
+      flow_page(current_page) || referrer_page(referrer)
+    end
   end
 
   def confirmation_page
@@ -36,8 +44,29 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
     end
   end
 
+  def meta
+    MetadataPresenter::Meta.new(configuration['meta'])
+  end
+
   private
 
+  def all_pages
+    @all_pages ||= pages + standalone_pages
+  end
+
+  def no_back_link?(current_page)
+    current_page == start_page || current_page == confirmation_page
+  end
+
+  def flow_page(current_page)
+    page_index = pages.index(current_page)
+    pages[page_index - 1] if page_index.present?
+  end
+
+  def referrer_page(referrer)
+    find_page_by_url(URI(referrer).path) if referrer
+  end
+
   def strip_slash(url)
     return url if url == '/'
 

data/app/validators/metadata_presenter/validate_schema.rb

@@ -9,9 +9,8 @@ class MetadataPresenter::ValidateSchema
       validate(controller.request.params, 'request.service')
 
       metadata = controller.request.params['metadata']
-      Array(metadata['pages']).each do |page|
-        validate(page, page['_type'])
-      end
+      validate_pages(metadata['pages'])
+      validate_pages(metadata['standalone_pages'])
     rescue JSON::Schema::ValidationError, JSON::Schema::SchemaError, SchemaNotFoundError => e
       controller.render(
         json: ErrorsSerializer.new(message: e.message).attributes,
@@ -39,5 +38,11 @@ class MetadataPresenter::ValidateSchema
     rescue Errno::ENOENT
       raise SchemaNotFoundError, "Schema not found => #{schema_name}"
     end
+
+    def validate_pages(pages)
+      Array(pages).each do |page|
+        validate(page, page['_type'])
+      end
+    end
   end
 end

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

@@ -0,0 +1,9 @@
+<h2 class="govuk-visually-hidden">Support links</h2>
+
+<ul class="govuk-footer__inline-list">
+<% meta_items.each do |item| %>
+  <li class="govuk-footer__inline-list-item">
+    <a class="govuk-footer__link" href=<%= item.href %>><%= item.text %></a>
+  </li>
+<% end %>
+</ul>

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

@@ -3,6 +3,10 @@
     <div class="govuk-footer__meta">
       <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
 
+        <%= render partial: 'metadata_presenter/footer/meta' %>
+
+        <hr class="govuk-footer__section-break govuk-!-margin-top-7">
+
         <svg aria-hidden="true" focusable="false" class="govuk-footer__licence-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 483.2 195.7" height="17" width="41">
           <path fill="currentColor" d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145" />
         </svg>

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

@@ -9,7 +9,7 @@
           data-fb-content-type="element">
         <%= @page.heading %>
       </h1>
- 
+
       <%= render 'metadata_presenter/attribute/lede' %>
       <%= render 'metadata_presenter/attribute/body' %>
 

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

@@ -0,0 +1,17 @@
+<div class="fb-main-grid-wrapper" data-fb-pagetype="<%= @page.type %>">
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+
+      <% if @page.heading %>
+        <h1 class="fb-editable govuk-heading-xl"
+            data-fb-content-id="page[heading]"
+            data-fb-content-type="element">
+          <%= @page.heading %>
+        </h1>
+      <% end %>
+
+      <%= render 'metadata_presenter/attribute/body' %>
+
+    </div>
+  </div>
+</div>

data/default_metadata/page/standalone.json

@@ -0,0 +1,8 @@
+{
+  "_id": "page.standalone",
+  "_type": "page.standalone",
+  "heading": "Title",
+  "body": "[Optional content]",
+  "components": [],
+  "url": ""
+}

data/default_metadata/service/base.json

@@ -4,5 +4,6 @@
   "service_name": "Service name",
   "configuration": {},
   "pages": [],
+  "standalone_pages": [],
   "locale": "en"
 }

data/fixtures/invalid_content_page.json

@@ -68,5 +68,6 @@
       "url": "how-many-lights"
     }
   ],
+  "standalone_pages": [],
   "locale": "en"
 }

data/fixtures/no_component_page.json

@@ -56,5 +56,6 @@
       "components": []
     }
   ],
+  "standalone_pages": [],
   "locale": "en"
 }

data/fixtures/non_finished_service.json

@@ -116,5 +116,6 @@
       "url": "/parent-name"
     }
   ],
+  "standalone_pages": [],
   "locale": "en"
 }

data/fixtures/service.json

@@ -46,5 +46,6 @@
       "url": "/"
     }
   ],
+  "standalone_pages": [],
   "locale": "en"
 }

data/fixtures/version.json

@@ -370,5 +370,34 @@
       ]
     }
   ],
+  "standalone_pages": [
+    {
+      "_uuid": "8239d280-4cb2-4cf8-b5d7-713f148a82f7",
+      "_id": "page.cookies",
+      "_type": "page.standalone",
+      "heading": "Cookies",
+      "body": "This online form puts small files (known as ‘cookies’) onto your computer to collect information about how you browse the site.\r\n\r\nCookies are used to:\r\n\r\n- remember your progress\r\n- measure how you use the website so it can be updated and improved based on your needs\r\n\r\nThis online form's cookies aren't used to identify you personally.\r\n\r\nYou'll normally see a message on the site before we store a cookie on your computer.\r\n\r\nFind out more about [how to manage cookies](https://www.aboutcookies.org/).\r\n\r\n##How cookies are used on this online form\r\n\r\nWe will store a cookie to remember your progress on this computer and to expire your session after 60 minutes of inactivity or when you close your browser.\r\n\r\n| Name | Purpose | Expires |\r\n|---|---|---|\r\n| _fb_runner_session | Saves your current progress in this computer and tracks inactivity periods | After 20 minutes of inactivity or when you close your browser |",
+      "components": [],
+      "url": "cookies"
+    },
+    {
+      "_uuid": "67c91f95-805e-4731-969e-648c7d3d172f",
+      "_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].",
+      "components": [],
+      "url": "accessibility"
+    },
+    {
+      "_uuid": "d658f790-0ceb-4507-b8ac-ae30ece6bc8d",
+      "_id": "page.privacy",
+      "_type": "page.standalone",
+      "heading": "Privacy notice",
+      "body": "This privacy notice explains what [insert your organisation name] means when we talk about personal data, why we ask for this information about you and what we do with it when you use this form.\r\n\r\nIt also explains how we store your data, how you can get a copy of the information we’ve collected about you and how you can complain if you think we’ve done something wrong.\r\n\r\n###Who manages this service\r\n\r\nThis form is managed by [your organisation].\r\n\r\nThe information you submit will be processed by [insert who will be processing the information and, if it’s a separate organisation, what their relationship is to you].\r\n\r\n[Insert name of organisation that acts as data controller for your form] is the data controller for the personal data collected by this form.\r\n\r\n###When we ask for personal data\r\n\r\nWhenever we ask for information about you, we promise to:\r\n\r\n- always let you know why we need it\r\n- ask for relevant personal information only\r\n- make sure we do not keep it longer than needed\r\n- keep your information safe and make sure nobody can access it unless authorised to do so\r\n- only share your data with other organisations for legitimate purposes\r\n- consider any request you make to correct or delete your personal data\r\n\r\nWe also promise to make it easy for you to:\r\n\r\n- tell us at any time if you want us to stop storing your personal data\r\n- make a complaint to the supervisory authority\r\n\r\n###The personal data we collect\r\n\r\nWe only collect personal data that you directly provide with your application.\r\n\r\nWe only collect the information we need to deliver this service to you. The personal data collected includes:\r\n\r\n[list the types of personal information requested by your form]\r\n\r\nWe [use cookies](http://www.aboutcookies.org.uk/managing-cookies) to collect data that tells us about how the servicermation we ask for, we may not be able to process your [insert the purpose of your form, such as claim, application or request].\r\n\r\nPlease note that transmitting information over the internet is generally not completely secure, and [your organisation] can’t guarantee the security of your data. Any data you transmit is at your own risk. [your organisation, and any other organisations involved in processing the data] have procedures and security features in place to keep your data secure once we receive it.\r\n\r\n###Sharing your personal data\r\n\r\nThe information you provide will be shared with… [name any organisations that you might share the data with and provide an explanation of why the information may be shared and what it will be used for]\r\n\r\nWe may also use your contact information to ask for feedback on using the service, but only when you have given your consent for us to do so. [delete this paragraph if not applicable]\r\n\r\nWe’ll never share your information with other organisations for marketing, market researcer organisation will receive the information for processing] take data security very seriously and take every step to ensure that your data remains private and secure. All data collected by this service is stored in a secure database kept entirely within the European Economic Area (EEA). [change this statement if date leaves the EEA]\r\n\r\nYour application will only be accessible to [your organisation, and any other organisations involved in processing the data] staff who require access to process applications.\r\n\r\n###Your rights\r\n\r\nYou can ask:\r\n\r\n- to see the personal data that we hold on you\r\n- to have the personal data corrected\r\n- to have the personal data removed or deleted (this will depend on the circumstances, for example if you decide not to continue your [insert the purpose of your form, such as claim, application or request])\r\n\r\nIf you want to see the personal data that we hold on you, you can make a [subject access request](https://www.gov.uk/government/organisations/ministry-of-justice/about/personal-information).\r\n\r\nWrite to us at:\r\n\r\n[insert your postal and email addresses]\r\n\r\n###Getting more information\r\n\r\nYou can get more details on:\r\n\r\n- agreements we have with other organisations for sharing information\r\n- when we can pass on personal information without telling you, for example, to help with the prevention or - detection of crime or to produce anonymised statistics\r\n- instructions we give to staff on how to collect, use or delete your personal information\r\n- how we check that the information we have is accurate and up-to-date\r\n- how to make a complaint\r\n\r\nFor more information, please contact the [your organisation] data protection officer at:\r\n\r\n[insert the postal and email addresses of your data protection officer - for the MoJ, this is:\r\n\r\n102 Petty France\r\nLondon\r\nSW1H 9AJ\r\ndata.compliance@justice.gov.uk]\r\n\r\n###Making a complaint\r\n\r\nWhen we ask you for information, we will keep to the law. If you think that your information has not been handled correctly, you can contact the [Information Commissioner](https://ico.org.uk/) for independent advice about data protection on the address below:\r\n\r\nInformation Commissioner's Office\r\nWycliffe House\r\nWater Lane\r\nWilmslow\r\nCheshire\r\nSK9 5AF\r\n\r\nTelephone: 0303 123 1113",
+      "components": [],
+      "url": "privacy"
+    }
+  ],
   "locale": "en"
 }

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '0.27.3'.freeze
+  VERSION = '0.28.0'.freeze
 end

data/schemas/page/standalone.json

@@ -0,0 +1,23 @@
+{
+  "$id": "http://gov.uk/schema/v1.0.0/page/standalone",
+  "_name": "page.standalone",
+  "title": "Standalone",
+  "description": "Pages which are not part of any flow",
+  "type": "object",
+  "properties": {
+    "_type": {
+      "const": "page.standalone"
+    }
+  },
+  "allOf": [
+    {
+      "$ref": "definition.page.content"
+    }
+  ],
+  "uiCategory": {
+    "main": [
+      "lede",
+      "body"
+    ]
+  }
+}

data/schemas/service/base.json

@@ -56,6 +56,16 @@
           }
         ]
       }
+    },
+    "standalone_pages": {
+      "type": "array",
+      "items": {
+        "anyOf": [
+          {
+            "$ref": "page.standalone"
+          }
+        ]
+      }
     }
   },
   "required": [
@@ -65,7 +75,8 @@
     "created_by",
     "locale",
     "configuration",
-    "pages"
+    "pages",
+    "standalone_pages"
   ],
   "additionalProperties": false
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 0.27.3
+  version: 0.28.0
 platform: ruby
 authors:
 - MoJ Online
@@ -264,6 +264,8 @@ files:
 - app/models/metadata_presenter/component.rb
 - app/models/metadata_presenter/date_field.rb
 - app/models/metadata_presenter/item.rb
+- app/models/metadata_presenter/meta.rb
+- app/models/metadata_presenter/meta_item.rb
 - app/models/metadata_presenter/metadata.rb
 - app/models/metadata_presenter/next_page.rb
 - app/models/metadata_presenter/page.rb
@@ -292,6 +294,7 @@ files:
 - app/views/metadata_presenter/component/_radios.html.erb
 - app/views/metadata_presenter/component/_text.html.erb
 - app/views/metadata_presenter/component/_textarea.html.erb
+- app/views/metadata_presenter/footer/_meta.html.erb
 - app/views/metadata_presenter/footer/footer.html.erb
 - app/views/metadata_presenter/header/show.html.erb
 - app/views/metadata_presenter/page/checkanswers.html.erb
@@ -300,6 +303,7 @@ files:
 - app/views/metadata_presenter/page/form.html.erb
 - app/views/metadata_presenter/page/multiplequestions.html.erb
 - app/views/metadata_presenter/page/singlequestion.html.erb
+- app/views/metadata_presenter/page/standalone.html.erb
 - app/views/metadata_presenter/page/start.html.erb
 - config/initializers/default_metadata.rb
 - config/initializers/default_text.rb
@@ -322,6 +326,7 @@ files:
 - default_metadata/page/content.json
 - default_metadata/page/multiplequestions.json
 - default_metadata/page/singlequestion.json
+- default_metadata/page/standalone.json
 - default_metadata/page/start.json
 - default_metadata/service/base.json
 - default_metadata/string/error.date.json
@@ -392,6 +397,7 @@ files:
 - schemas/page/content.json
 - schemas/page/multiplequestions.json
 - schemas/page/singlequestion.json
+- schemas/page/standalone.json
 - schemas/page/start.json
 - schemas/request/service.json
 - schemas/service/base.json