govuk_publishing_components 24.18.3 → 24.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c29fbe8ad46db11c8172e16fcd68bb08cc6e6799de22293cc29cd1829b6a938b
-  data.tar.gz: ac3904c23ae5a71ca5d556558da2411750454338bdcac2f1747f061322ee2daf
+  metadata.gz: 356af78d76ad3c161339e6c908f64e22aa8ce6da250fa1389ec2d5095d28c906
+  data.tar.gz: e820884ca39a8533a260ae07b824bee43d3d0616e4434f70e8d8a5212ec5f693
 SHA512:
-  metadata.gz: 7c1c5d8b01c9036993418b85125975b0bac85d59e8d7e9fdca6ae8d2444f9742c0c6b017adce4b0e1ba0482e2a410bf992f1e3556f8c971200a18d306ddba07a
-  data.tar.gz: e19439505f30c55bdfcb3fe1f2637f47311ae1c978e6bb5e0b50b09ada4ab0a60ddeb259167048d836ff97863c44213f06fbd369c774969a70452c3f88486724
+  metadata.gz: 115b6017568f069bece6086533f4e24e03af451682b59323924e96fe5996dc6c9e6f7597226571adba3fcba0df5798f85d8cfbd55f3ecaeaa49ac570946876af
+  data.tar.gz: 10f2ba6089990b0703e6cc4bc37aa3fc9e689560d8dfa9c193bf60aac1bc8536693e5f67a1501fdd836a408ad41d2ea3f191a640271425a27148bd8e1df54baf

data/app/assets/javascripts/govuk_publishing_components/analytics/custom-dimensions.js

@@ -63,7 +63,8 @@
       'taxon-ids': { dimension: 59, defaultValue: 'other' },
       'content-has-history': { dimension: 39, defaultValue: 'false' },
       'publishing-application': { dimension: 89 },
-      'brexit-audience': { dimension: 111 },
+      'brexit-audience': { dimension: 112 },
+      'brexit-superbreadcrumb': { dimension: 111 },
       stepnavs: { dimension: 96 },
       'relevant-result-shown': { dimension: 83 },
       'spelling-suggestion': { dimension: 81 }

data/app/views/govuk_publishing_components/components/_contextual_breadcrumbs.html.erb

@@ -12,9 +12,9 @@
                inverse: inverse,
                collapse_on_mobile: collapse_on_mobile %>
   <% end %>
-
-  <%= render(
-        'govuk_publishing_components/components/step_by_step_nav_header', breadcrumb_selector.priority_breadcrumbs
-      ) if breadcrumb_selector.priority_breadcrumbs
-  %>
+  <% if breadcrumb_selector.priority_breadcrumbs %>
+    <%= render 'govuk_publishing_components/components/step_by_step_nav_header', breadcrumb_selector.priority_breadcrumbs %>
+    <% meta_tag = GovukPublishingComponents::Presenters::MetaTags.new(content_item, local_assigns, request).brexit_priority_breadcrumb_tag %>
+    <meta name="<%= meta_tag.keys.first %>" content="<%= meta_tag.values.first %>">
+  <% end %>
 </div>

data/app/views/govuk_publishing_components/components/docs/checkboxes.yml

@@ -1,7 +1,7 @@
 name: Form checkboxes
 description: Let users select one or more options with checkboxes.
 body: |
-  If there is more than one checkbox they are rendered in a list. If there is only one, the markup is simplified to a single div and a heading attribute is not required.
+  If there is more than one checkbox they are rendered in a list. If there is only one, the markup is simplified to a single div and a heading attribute is not required. A `[]` needs to be appended to the name for Rails to treat the checkbox value as an array, otherwise only the last selected item is captured.
 govuk_frontend_components:
   - checkboxes
 accessibility_criteria: |
@@ -25,7 +25,7 @@ examples:
   with_multiple_checkboxes:
     description: When more than one checkbox is shown they are wrapped in a fieldset element, which requires a legend. This must be supplied to the component using the heading option.
     data:
-      name: "favourite_colour"
+      name: "favourite_colour[]"
       heading: "What is your favourite colour?"
       items:
         - label: "Red"
@@ -36,7 +36,7 @@ examples:
           value: "blue"
   with_small_checkboxes:
     data:
-      name: "favourite_small_synonym"
+      name: "favourite_small_synonym[]"
       heading: "What is your favourite synonym for small?"
       small: true
       items:
@@ -55,7 +55,7 @@ examples:
   with_custom_hint_text:
     description: Hint text defaults to 'Select all that apply' but can be overridden with this option. Note that a hint (and a heading) is only displayed if there is more than one checkbox.
     data:
-      name: "favourite_skittle"
+      name: "favourite_skittle[]"
       heading: "What is your favourite skittle?"
       hint_text: "Taste the rainbow"
       items:
@@ -71,7 +71,7 @@ examples:
       The description text can only render text and not govspeak specific syntax.
       This is a pattern that is used across GOV.UK where a question is followed by a description.
     data:
-      name: "favourite_skittle"
+      name: "favourite_skittle[]"
       heading: "Choose your favourite skittles"
       description: |
         Skittles consist of hard sugar shells imprinted with the letter "S".
@@ -91,7 +91,7 @@ examples:
       The description text can only render text and not govspeak specific syntax.
       This is a pattern that is used across GOV.UK where a question is followed by a description.
     data:
-      name: "favourite_skittle"
+      name: "favourite_skittle[]"
       heading: "Choose your favourite skittles"
       is_page_heading: true
       description: |
@@ -112,7 +112,7 @@ examples:
       A caption can only be used with a page heading. If a heading is not provided the caption will not render.
       The pattern is used across GOV.UK to show a high-level section that this page question falls into.
     data:
-      name: "favourite_skittle"
+      name: "favourite_skittle[]"
       heading: "Choose your favourite skittles"
       heading_caption: "Question 3 of 9"
       is_page_heading: true
@@ -126,7 +126,7 @@ examples:
   without_hint_text:
     description: Hint text can be removed entirely with this option. Note that this option can be combined with the visually_hide_heading option.
     data:
-      name: "favourite_skittle"
+      name: "favourite_skittle[]"
       heading: "What is your favourite skittle?"
       no_hint_text: true
       items:
@@ -137,7 +137,7 @@ examples:
   with_a_hidden_heading:
     description: If the heading/legend on the checkboxes is not required, it can be visually hidden using this option. It will still be visible to screen readers.
     data:
-      name: "favourite_colour"
+      name: "favourite_colour[]"
       heading: "What is your favourite colour?"
       visually_hide_heading: true
       items:
@@ -150,7 +150,7 @@ examples:
   with_a_custom_id_attribute:
     description: Note that if an id is not given one is generated automatically. In either case, the id is applied to the parent element of the checkboxes, and each checkbox is given the same id with an incremented number at the end, e.g. the checkboxes below have ids of potatoes-0 and potatoes-1.
     data:
-      name: "potatoes"
+      name: "potatoes[]"
       id: "potatoes"
       heading: "What kind of potatoes do you like?"
       items:
@@ -161,7 +161,7 @@ examples:
   with_custom_ids_on_individal_checkboxes:
     description: Individual checkboxes can be given specific ids if required. Note that the general id option can still be used, but the individual ids will override the general one if it is given.
     data:
-      name: "carrots"
+      name: "carrots[]"
       id: "carrots"
       heading: "What kind of carrots do you like?"
       items:
@@ -173,7 +173,7 @@ examples:
   with_legend_as_page_heading:
     description: Since the legend/heading is required, if the checkboxes are alone on a page it makes sense to use this element as the H1 on the page rather than duplicate text.
     data:
-      name: "favourite_colour"
+      name: "favourite_colour[]"
       heading: "What is your favourite colour?"
       is_page_heading: true
       items:
@@ -185,11 +185,11 @@ examples:
           value: "blue"
   with_custom_heading_size:
     description: |
-      This allows the size of the legend to be changed. Valid options are s, m, l, xl, defaulting to m if no option is passed. 
+      This allows the size of the legend to be changed. Valid options are s, m, l, xl, defaulting to m if no option is passed.
 
       If the is_page_heading option is true and heading_size is not set, the text size will be xl.
     data:
-      name: "favourite_colour"
+      name: "favourite_colour[]"
       heading: "What is your favourite colour?"
       heading_size: "s"
       items:
@@ -235,7 +235,7 @@ examples:
   with_aria_controls_attributes:
     description: Aria controls attributes are applied to the checkboxes only if Javascript is enabled.
     data:
-      name: "aria_controls"
+      name: "aria_controls[]"
       heading: "What areas are you interested in?"
       items:
         - label: "Farming and the environment"
@@ -246,7 +246,7 @@ examples:
           controls: "js-live-results"
   checkboxes_with_individual_hints:
     data:
-      name: "nationality"
+      name: "nationality[]"
       heading: "What is your nationality?"
       hint_text: "If you have dual nationality, select all options that are relevant to you."
       items:
@@ -260,7 +260,7 @@ examples:
           hint: "anything other than the above"
   checkbox_items_with_error:
     data:
-      name: "nationality"
+      name: "nationality[]"
       heading: "What is your nationality?"
       error: "Select if you are British, Irish or a citizen of a different country"
       hint_text: "If you have dual nationality, select all options that are relevant to you."
@@ -281,7 +281,7 @@ examples:
 
       This behaviour should be doubled by similar checks on the backend.
     data:
-      name: "nationality-exclusive"
+      name: "nationality-exclusive[]"
       heading: "What kind of expertise can you offer?"
       hint_text: "Select the types of support you can offer."
       items:
@@ -301,7 +301,7 @@ examples:
 
       Note that if you do insert HTML, this may cause accessibility violations if the additional elements have different name attributes to the checkboxes. No styling will be applied to the inserted content by the component.
     data:
-      name: "contactingme"
+      name: "contactingme[]"
       id: "contactingme"
       heading: "How would you like to be contacted?"
       hint_text: "Please select all options that are relevant to you."
@@ -317,7 +317,7 @@ examples:
           conditional: <div class="govuk-form-group"><label class="govuk-label" for="contact-by-text">Mobile phone number</label><input class="govuk-input govuk-!-width-one-third" id="contact-by-text" name="contactingme" type="tel"></div>
   checkbox_items_with_conditional_reveal_checked:
     data:
-      name: "contacting-checked"
+      name: "contacting-checked[]"
       id: "contacting-checked"
       heading: "How would you like to be contacted?"
       hint_text: "Please select all options that are relevant to you."
@@ -334,7 +334,7 @@ examples:
           conditional: <div class="govuk-form-group"><label class="govuk-label" for="contact-by-text">Mobile phone number</label><input class="govuk-input govuk-!-width-one-third" id="contact-by-text" name="contactingme" type="tel"></div>
   checkbox_items_with_checked_items:
     data:
-      name: "nationality"
+      name: "nationality[]"
       heading: "What is your nationality?"
       hint_text: "If you have dual nationality, select all options that are relevant to you."
       items:
@@ -347,7 +347,7 @@ examples:
           value: "other"
   checkbox_items_with_nested_checkboxes:
     data:
-      name: "favourite_colour"
+      name: "favourite_colour[]"
       heading: "What is your favourite colour?"
       items:
         - label: "Red"

data/config/locales/cy.yml

@@ -114,14 +114,14 @@ cy:
       related_guides:
       statistical_data_sets:
       topical_events:
-      topics:
+      topics: Archwilio’r pwnc
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path: "/brexit.cy"
-        link_text: Gwiriwch beth sydd angen i chi ei wneud
+        link_text: Cael rhestr bersonol o gamau gweithredu
         title: Brexit
+        hub_page_link_path:
+        hub_page_link_text:
+        hub_page_title: Gwiriwr Brexit
       world_locations:
     search_box:
       input_title:
@@ -154,4 +154,4 @@ cy:
       delete:
       edit:
     tabs:
-      contents:
+      contents: Cynnwys

data/lib/govuk_publishing_components/presenters/meta_tags.rb

@@ -21,7 +21,11 @@ module GovukPublishingComponents
         meta_tags = add_political_tags(meta_tags)
         meta_tags = add_taxonomy_tags(meta_tags)
         meta_tags = add_step_by_step_tags(meta_tags)
-        add_brexit_tags(meta_tags)
+        add_brexit_tags("govuk:brexit-audience", meta_tags)
+      end
+
+      def brexit_priority_breadcrumb_tag
+        add_brexit_tags("govuk:brexit-superbreadcrumb")
       end
 
     private
@@ -112,15 +116,14 @@ module GovukPublishingComponents
         meta_tags
       end
 
-      def add_brexit_tags(meta_tags)
+      def add_brexit_tags(tag_key, meta_tags = {})
         links = content_item[:links]
         taxons = links[:taxons] unless links.nil?
 
         return meta_tags if taxons.blank?
         return meta_tags unless tagged_to_priority_taxon?
 
-        audience = priority_taxon_helper.brexit_audience
-        meta_tags["govuk:brexit-audience"] = audience if audience.present?
+        meta_tags[tag_key] = brexit_audience if brexit_audience.present?
 
         meta_tags
       end
@@ -133,6 +136,10 @@ module GovukPublishingComponents
         @priority_taxon_helper ||= ContentBreadcrumbsBasedOnPriority.new(content_item.deep_stringify_keys, request.query_parameters)
       end
 
+      def brexit_audience
+        priority_taxon_helper.brexit_audience
+      end
+
       def has_content_history?
         (content_item[:public_updated_at] && details[:first_public_at] && content_item[:public_updated_at] != details[:first_public_at]) ||
           (details[:change_history] && details[:change_history].size > 1)

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "24.18.3".freeze
+  VERSION = "24.18.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 24.18.3
+  version: 24.18.4
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config