govuk_publishing_components 34.8.0 → 34.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 858a7994e35203e75dfc40439dd630bcefefc4a549027d9b7fb404df0028e45b
-  data.tar.gz: a71a277c8860d002129d138e9e6c104ea040f1163e1cd27ee821c431ed109a2c
+  metadata.gz: b6da9ed1af8922136300b056ca61432de28330b478e25e23334917d0fdec9041
+  data.tar.gz: 2efcf7e5c91aaca82158059670b6b5ea7d4f52cb998b49a23e13deb32276958e
 SHA512:
-  metadata.gz: 5b7610f82890c3fd2f2ad862ed3443df843a8230cca1f0e2e294ba5cd02f4933dd8393f3be521f053ba8fef46b984fe0f692709d4d8457c1a478e4848de4495e
-  data.tar.gz: f66f9a9c0076b364293b3973cc1b85253d6c701a347967a253e5fe970c877fa7a5eb43edd95e927a155737037e427536e34f99eb0ccdb51712a9e02d6f5815fa
+  metadata.gz: c5b8de64f9ba866ce83e1ef48be8d42f3f57b74891f446cba362c83e1a4be599d67039fc9f4cd9ee2e3b77345a4fb2955310a2aefb45b9bfcdf59e69bc06fdd3
+  data.tar.gz: 75251f6417ec2c5e3e542eab3f2a914b93c9a5153f6b3be40848640d1e4944d2186e169a26198760cac76f482667e1d73e743105504c465b31974c583b4a0f3f

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

@@ -9,8 +9,12 @@
   <svg class="gem-c-single-page-notification-button__icon" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 459.334 459.334"><path fill="currentColor" d="M177.216 404.514c-.001.12-.009.239-.009.359 0 30.078 24.383 54.461 54.461 54.461s54.461-24.383 54.461-54.461c0-.12-.008-.239-.009-.359H175.216zM403.549 336.438l-49.015-72.002v-89.83c0-60.581-43.144-111.079-100.381-122.459V24.485C254.152 10.963 243.19 0 229.667 0s-24.485 10.963-24.485 24.485v27.663c-57.237 11.381-100.381 61.879-100.381 122.459v89.83l-49.015 72.002a24.76 24.76 0 0 0 20.468 38.693H383.08a24.761 24.761 0 0 0 20.469-38.694z"/></svg><span class="gem-c-single-page-notication-button__text"><%= component_helper.button_text %></span>
 <% end %>
 <%= tag.div class: wrapper_classes, data: { module: "gem-track-click"} do %>
-  <%= tag.form class: component_helper.classes, action: "/email/subscriptions/single-page/new", method: "POST", data: component_helper.data do %>
+  <%= tag.form class: component_helper.classes, action: component_helper.form_action, method: "POST", data: component_helper.data do %>
     <input type="hidden" name="base_path" value="<%= component_helper.base_path %>">
+    <% if component_helper.skip_account %>
+      <input type="hidden" name="<%= component_helper.skip_account_param %>" value="true">
+      <input type="hidden" name="link" value="<%= component_helper.base_path %>">
+    <% end %>
     <%= content_tag(:button, button_text, {
       class: "govuk-body-s gem-c-single-page-notification-button__submit",
       type: "submit",

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

@@ -57,3 +57,9 @@ examples:
       button_text:
         subscribe: 'Subscribe to this page of things'
         unsubscribe: 'Unsubscribe to this page of things'
+  with_skip_account:
+    description: If the skip_account flag is present, the button action will be set to the non GOV.UK account signup endpoint of /email-signup.
+    data:
+      base_path: '/current-page-path'
+      js_enhancement: true
+      skip_account: true

data/lib/govuk_publishing_components/presenters/related_navigation_helper.rb

@@ -12,6 +12,9 @@ module GovukPublishingComponents
         world_locations
         statistical_data_sets
       ].freeze
+      WORLD_LOCATION_SPECIAL_CASES = {
+        "UK Mission to the European Union" => "uk-mission-to-the-eu",
+      }.freeze
 
       def initialize(options = {})
         @content_item = options.fetch(:content_item) { raise ArgumentError, "missing argument: content_item" }
@@ -112,6 +115,10 @@ module GovukPublishingComponents
 
       def related_world_locations
         content_item_links_for("world_locations")
+          .map do |link|
+            slug = WORLD_LOCATION_SPECIAL_CASES[link[:text]] || link[:text].parameterize
+            link.merge(path: "/world/#{slug}/news")
+          end
       end
 
       def related_statistical_data_sets

data/lib/govuk_publishing_components/presenters/single_page_notification_button_helper.rb

@@ -1,7 +1,7 @@
 module GovukPublishingComponents
   module Presenters
     class SinglePageNotificationButtonHelper
-      attr_reader :already_subscribed, :data_attributes, :base_path, :js_enhancement, :button_type, :button_location, :classes
+      attr_reader :already_subscribed, :data_attributes, :base_path, :js_enhancement, :button_type, :button_location, :classes, :skip_account
 
       def initialize(local_assigns)
         @local_assigns = local_assigns
@@ -15,6 +15,7 @@ module GovukPublishingComponents
         @classes << "js-personalisation-enhancement" if js_enhancement
         @button_text_subscribe = custom_button_text_is_valid? ? custom_subscribe_text : default_subscribe_text
         @button_text_unsubscribe = custom_button_text_is_valid? ? custom_unsubscribe_text : default_unsubscribe_text
+        @skip_account = @local_assigns[:skip_account] || nil
       end
 
       def data
@@ -58,6 +59,22 @@ module GovukPublishingComponents
       def default_unsubscribe_text
         I18n.t("components.single_page_notification_button.unsubscribe_text")
       end
+
+      def form_action
+        @skip_account ? email_alert_frontend_endpoint_no_account : email_alert_frontend_endpoint_enforce_account
+      end
+
+      def email_alert_frontend_endpoint_enforce_account
+        "/email/subscriptions/single-page/new"
+      end
+
+      def email_alert_frontend_endpoint_no_account
+        "/email-signup"
+      end
+
+      def skip_account_param
+        "single_page_subscription"
+      end
     end
   end
 end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "34.8.0".freeze
+  VERSION = "34.9.0".freeze
 end

metadata

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