govuk_publishing_components 27.10.5 → 27.14.0

data/config/locales/fi.yml

@@ -166,9 +166,6 @@ fi:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/fr.yml

@@ -166,9 +166,6 @@ fr:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/gd.yml

@@ -166,9 +166,6 @@ gd:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/gu.yml

@@ -166,9 +166,6 @@ gu:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/he.yml

@@ -166,9 +166,6 @@ he:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/hi.yml

@@ -166,9 +166,6 @@ hi:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/hr.yml

@@ -166,9 +166,6 @@ hr:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/hu.yml

@@ -166,9 +166,6 @@ hu:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/hy.yml

@@ -166,9 +166,6 @@ hy:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/id.yml

@@ -166,9 +166,6 @@ id:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/is.yml

@@ -166,9 +166,6 @@ is:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/it.yml

@@ -166,9 +166,6 @@ it:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/ja.yml

@@ -166,9 +166,6 @@ ja:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/ka.yml

@@ -166,9 +166,6 @@ ka:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/kk.yml

@@ -166,9 +166,6 @@ kk:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/ko.yml

@@ -166,9 +166,6 @@ ko:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/lt.yml

@@ -166,9 +166,6 @@ lt:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/lv.yml

@@ -166,9 +166,6 @@ lv:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/ms.yml

@@ -166,9 +166,6 @@ ms:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/mt.yml

@@ -166,9 +166,6 @@ mt:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/nl.yml

@@ -166,9 +166,6 @@ nl:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/no.yml

@@ -166,9 +166,6 @@
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/pa-pk.yml

@@ -166,9 +166,6 @@ pa-pk:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/pa.yml

@@ -166,9 +166,6 @@ pa:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/pl.yml

@@ -166,9 +166,6 @@ pl:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/ps.yml

@@ -166,9 +166,6 @@ ps:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/pt.yml

@@ -166,9 +166,6 @@ pt:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/ro.yml

@@ -166,9 +166,6 @@ ro:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/ru.yml

@@ -166,9 +166,6 @@ ru:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/si.yml

@@ -166,9 +166,6 @@ si:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/sk.yml

@@ -166,9 +166,6 @@ sk:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/sl.yml

@@ -166,9 +166,6 @@ sl:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/so.yml

@@ -166,9 +166,6 @@ so:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/sq.yml

@@ -166,9 +166,6 @@ sq:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/sr.yml

@@ -166,9 +166,6 @@ sr:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/sv.yml

@@ -166,9 +166,6 @@ sv:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/sw.yml

@@ -166,9 +166,6 @@ sw:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/ta.yml

@@ -166,9 +166,6 @@ ta:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/th.yml

@@ -166,9 +166,6 @@ th:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/tk.yml

@@ -166,9 +166,6 @@ tk:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/tr.yml

@@ -166,9 +166,6 @@ tr:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/uk.yml

@@ -166,9 +166,6 @@ uk:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/ur.yml

@@ -166,9 +166,6 @@ ur:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/uz.yml

@@ -166,9 +166,6 @@ uz:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/vi.yml

@@ -166,9 +166,6 @@ vi:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/zh-hk.yml

@@ -166,9 +166,6 @@ zh-hk:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/zh-tw.yml

@@ -166,9 +166,6 @@ zh-tw:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/zh.yml

@@ -166,9 +166,6 @@ zh:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/lib/govuk_publishing_components/presenters/button_helper.rb

@@ -66,6 +66,7 @@ module GovukPublishingComponents
         options[:name] = name if name.present? && value.present?
         options[:value] = value if name.present? && value.present?
         options[:aria] = { label: aria_label } if aria_label
+        options[:draggable] = false if link?
         options
       end
 

data/lib/govuk_publishing_components/presenters/contextual_navigation.rb

@@ -111,10 +111,10 @@ module GovukPublishingComponents
       def show_brexit_related_links?
         # If tagged directly to /brexit or /world/brexit
         # Or if tagged to a taxon which has /brexit as a parent
-        # And is not the brexit checker start page
-        brexit_start_page_content_id = "58d093a1-787d-4f36-a568-86da23a7b884"
-        page_content_id = content_item["content_id"]
-        tagged_to_brexit? && (page_content_id != brexit_start_page_content_id)
+        # And is not the brexit hub pages
+        return false if brexit_hub_pages.include?(content_item["content_id"])
+
+        tagged_to_brexit?
       end
 
       def brexit_cta_document_exceptions
@@ -179,6 +179,17 @@ module GovukPublishingComponents
           4ca8698b-4a24-45ff-baea-7633cc24b679
           ed73581f-9bf8-48b5-bb66-935581a255e3
           15f1c594-af1d-4f16-97cc-ad4d12017509
+        ] + brexit_hub_pages
+      end
+
+      # we don't want to show the standard Brexit sidebar nav on
+      # https://www.gov.uk/guidance/brexit-guidance-for-individuals-and-families or
+      # https://www.gov.uk/guidance/brexit-guidance-for-businesses
+      # as it might result in circular journeys
+      def brexit_hub_pages
+        %w[
+          91cd6143-69d5-4f27-99ff-a52fb0d51c78
+          6555e0bf-c270-4cf9-a0c5-d20b95fab7f1
         ]
       end
 

data/lib/govuk_publishing_components/presenters/single_page_notification_button_helper.rb

@@ -0,0 +1,40 @@
+module GovukPublishingComponents
+  module Presenters
+    class SinglePageNotificationButtonHelper
+      attr_reader :already_subscribed, :data_attributes, :base_path, :js_enhancement, :button_type, :button_location
+
+      def initialize(local_assigns)
+        @local_assigns = local_assigns
+        @data_attributes = @local_assigns[:data_attributes] || {}
+        @js_enhancement = @local_assigns[:js_enhancement] || false
+        @already_subscribed = @local_assigns[:already_subscribed] || false
+        @base_path = @local_assigns[:base_path] || nil
+        @button_location = button_location_is_valid? ? @local_assigns[:button_location] : nil
+        @button_type = @local_assigns[:already_subscribed] ? "Unsubscribe" : "Subscribe"
+      end
+
+      def data
+        module_names = %w[gem-track-click]
+        module_names << "single-page-notification-button" if js_enhancement
+
+        @data_attributes[:label] = base_path
+        # data-action for tracking should have the format of e.g. "Unsubscribe-button-top", or "Subscribe-button-bottom"
+        # when button_location is not present data-action will fall back to "Unsubscribe-button"/"Subscribe-button"
+        @data_attributes[:action] = [button_type, "button", button_location].compact.join("-")
+        @data_attributes[:module] = module_names.join(" ")
+        @data_attributes[:category] = "Single-page-notification-button"
+        # This attribute is passed through to the personalisation API to ensure when a new button is returned from the API, it has the same button_location
+        @data_attributes[:button_location] = button_location
+        @data_attributes
+      end
+
+      def button_location_is_valid?
+        %w[bottom top].include? @local_assigns[:button_location]
+      end
+
+      def button_text
+        @already_subscribed ? I18n.t("components.single_page_notification_button.unsubscribe_text") : I18n.t("components.single_page_notification_button.subscribe_text")
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "27.10.5".freeze
+  VERSION = "27.14.0".freeze
 end

data/lib/govuk_publishing_components.rb

@@ -8,7 +8,6 @@ require "govuk_publishing_components/presenters/shared_helper"
 require "govuk_publishing_components/presenters/attachment"
 require "govuk_publishing_components/presenters/breadcrumbs"
 require "govuk_publishing_components/presenters/breadcrumb_selector"
-require "govuk_publishing_components/presenters/brexit_cta_helper"
 require "govuk_publishing_components/presenters/button_helper"
 require "govuk_publishing_components/presenters/contextual_navigation"
 require "govuk_publishing_components/presenters/devolved_nations_helper"
@@ -34,6 +33,7 @@ require "govuk_publishing_components/presenters/intervention_helper"
 require "govuk_publishing_components/presenters/organisation_logo_helper"
 require "govuk_publishing_components/presenters/highlight_boxes_helper"
 require "govuk_publishing_components/presenters/taxonomy_list_helper"
+require "govuk_publishing_components/presenters/single_page_notification_button_helper"
 
 require "govuk_publishing_components/app_helpers/taxon_breadcrumbs"
 require "govuk_publishing_components/app_helpers/table_helper"

data/node_modules/govuk-frontend/govuk/components/accordion/macro-options.json

@@ -3,13 +3,13 @@
         "name": "id",
         "type": "string",
         "required": true,
-        "description": "Must be **unique** across the domain of your service (as the expanded state of individual instances of the component persists across page loads using [`sessionStorage`](https://developer.mozilla.org/en-US/docs/Web/API/Window/sessionStorage)). Used as an `id` in the HTML for the accordion as a whole, and also as a prefix for the `id`s of the section contents and the buttons that open them, so that those `id`s can be the target of `aria-labelledby` and `aria-control` attributes."
+        "description": "Must be unique across the domain of your service (as the expanded state of individual instances of the component persists across page loads using [`sessionStorage`](https://developer.mozilla.org/en-US/docs/Web/API/Window/sessionStorage)). Used as an `id` in the HTML for the accordion as a whole, and also as a prefix for the `id`s of the section contents and the buttons that open them, so that those `id`s can be the target of `aria-labelledby` and `aria-control` attributes."
     },
     {
         "name": "headingLevel",
         "type": "integer",
         "required": false,
-        "description": "Heading level, from 1 to 6. Default is `2`."
+        "description": "Heading level, from `1` to `6`. Default is `2`."
     },
     {
         "name": "classes",