govuk_publishing_components 27.11.0 → 27.14.1

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.11.0".freeze
+  VERSION = "27.14.1".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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 27.11.0
+  version: 27.14.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2021-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -501,6 +501,7 @@ files:
 - app/assets/javascripts/govuk_publishing_components/components/radio.js
 - app/assets/javascripts/govuk_publishing_components/components/reorderable-list.js
 - app/assets/javascripts/govuk_publishing_components/components/show-password.js
+- app/assets/javascripts/govuk_publishing_components/components/single-page-notification-button.js
 - app/assets/javascripts/govuk_publishing_components/components/step-by-step-nav.js
 - app/assets/javascripts/govuk_publishing_components/components/tabs.js
 - app/assets/javascripts/govuk_publishing_components/dependencies.js
@@ -624,7 +625,6 @@ files:
 - app/assets/stylesheets/govuk_publishing_components/components/govspeak/_place.scss
 - app/assets/stylesheets/govuk_publishing_components/components/govspeak/_stat-headline.scss
 - app/assets/stylesheets/govuk_publishing_components/components/govspeak/_steps.scss
-- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_summary.scss
 - app/assets/stylesheets/govuk_publishing_components/components/govspeak/_tables.scss
 - app/assets/stylesheets/govuk_publishing_components/components/govspeak/_typography.scss
 - app/assets/stylesheets/govuk_publishing_components/components/govspeak/_warning-callout.scss
@@ -637,6 +637,7 @@ files:
 - app/assets/stylesheets/govuk_publishing_components/components/mixins/_govuk-template-link-focus-override.scss
 - app/assets/stylesheets/govuk_publishing_components/components/mixins/_margins.scss
 - app/assets/stylesheets/govuk_publishing_components/components/mixins/_media-down.scss
+- app/assets/stylesheets/govuk_publishing_components/components/mixins/_prefixed-transform.scss
 - app/assets/stylesheets/govuk_publishing_components/components/print/_accordion.scss
 - app/assets/stylesheets/govuk_publishing_components/components/print/_button.scss
 - app/assets/stylesheets/govuk_publishing_components/components/print/_contents-list.scss
@@ -931,7 +932,6 @@ files:
 - lib/govuk_publishing_components/presenters/attachment.rb
 - lib/govuk_publishing_components/presenters/breadcrumb_selector.rb
 - lib/govuk_publishing_components/presenters/breadcrumbs.rb
-- lib/govuk_publishing_components/presenters/brexit_cta_helper.rb
 - lib/govuk_publishing_components/presenters/button_helper.rb
 - lib/govuk_publishing_components/presenters/checkboxes_helper.rb
 - lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_ancestors.rb
@@ -969,6 +969,7 @@ files:
 - lib/govuk_publishing_components/presenters/schema_org.rb
 - lib/govuk_publishing_components/presenters/select.rb
 - lib/govuk_publishing_components/presenters/shared_helper.rb
+- lib/govuk_publishing_components/presenters/single_page_notification_button_helper.rb
 - lib/govuk_publishing_components/presenters/step_by_step_nav_helper.rb
 - lib/govuk_publishing_components/presenters/subscription_links_helper.rb
 - lib/govuk_publishing_components/presenters/taxonomy_list_helper.rb

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_summary.scss

@@ -1,27 +0,0 @@
-.govspeak, // Legacy class name that's still used in some content items - needs to be kept until `.govspeak` is removed from the content items.
-.gem-c-govspeak {
-  .summary {
-    margin: 0 0 2em;
-    padding: 0;
-    color: $govuk-text-colour;
-
-    p {
-      @include govuk-font($size: 19);
-    }
-
-    @include govuk-media-query($until: tablet) {
-      margin: 0 0 2em;
-      padding: 0;
-    }
-
-    p,
-    h2 {
-      border: 0;
-      margin: 0 .75em 0 0;
-    }
-
-    h2 {
-      line-height: 1.35em;
-    }
-  }
-}

data/lib/govuk_publishing_components/presenters/brexit_cta_helper.rb

@@ -1,33 +0,0 @@
-module GovukPublishingComponents
-  module Presenters
-    class BrexitCtaHelper
-      BREXIT_HUB_PAGE_IDS = %w[
-        6555e0bf-c270-4cf9-a0c5-d20b95fab7f1
-        91cd6143-69d5-4f27-99ff-a52fb0d51c78
-      ].freeze
-
-      def initialize(content_item)
-        @content_item = content_item
-      end
-
-      def title_key
-        use_brexit_hub_page_navigation? ? "components.related_navigation.transition.hub_page_title" : "components.related_navigation.transition.title"
-      end
-
-      def link_text_key
-        use_brexit_hub_page_navigation? ? "components.related_navigation.transition.hub_page_link_text" : "components.related_navigation.transition.link_text"
-      end
-
-      def link_path_key
-        use_brexit_hub_page_navigation? ? "components.related_navigation.transition.hub_page_link_path" : "components.related_navigation.transition.link_path"
-      end
-
-    private
-
-      def use_brexit_hub_page_navigation?
-        I18n.locale == :en &&
-          BREXIT_HUB_PAGE_IDS.include?(@content_item["content_id"])
-      end
-    end
-  end
-end