govuk_publishing_components 37.1.0 → 37.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43da95e575a63b626abef7368fbe99d286682778b3933f9b021768277b3a8d17
-  data.tar.gz: a2959e0efd156b0c5d5a70b61561725d55a4c67e58f0e60537970439af0088db
+  metadata.gz: 6371bbc7ca91fdd7a004050d47b2f09ac4d55244a8c7475692022e87af313b80
+  data.tar.gz: aa375ef7ebb426df626123c3832df1b926b562633c36d8af8202a82cff4d1f65
 SHA512:
-  metadata.gz: 60593190a4219cf35788d97f6f491c9f36ad873772d2b3908bcb21c347fcadcd061e35c25225acaa89199f5cabb6f0769376847521738cc26ff23eb088febce5
-  data.tar.gz: 22a37d5ff61c2164ef441774aae4f9268a9a46b19e7d5dbc847b7e290af706ce038894cd70a992ffe525a17e61ad205476bdb1d4eedc5e486a9f006a38532183
+  metadata.gz: 7bc4e2777a12f8a6e6a68de36a0d4bb92d6d5f97e2b16e1a07eb264285c0a5f97c2b0b0d205946c570436368dc7319da9c5796de4c97a700939e3be39f27b120
+  data.tar.gz: 24472468c3ebe08a695d1a1f3b03f7e2a21a1850257d8ca0a121663a1ff3d9176de1421746c0e292b589d7f08f7127ec1670946349e2e830ebb080cd1964e9a8

data/app/assets/config/govuk_publishing_components_manifest.js

@@ -11,5 +11,3 @@
 //= link govuk_publishing_components/vendor/modernizr.js
 //= link govuk_publishing_components/vendor/lux/lux-reporter.js
 //= link govuk_publishing_components/vendor/lux/lux-measurer.js
-
-//= link_tree ../builds

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

@@ -7,6 +7,7 @@
   classes = %w(gem-c-layout-footer govuk-footer)
   classes << "gem-c-layout-footer--border" if with_border
   layout_footer_helper = GovukPublishingComponents::Presenters::LayoutFooterHelper.new(navigation, meta)
+  absolute_links_helper = GovukPublishingComponents::Presenters::AbsoluteLinksHelper.new()
 %>
 <%= tag.footer class: classes, role: "contentinfo", 'data-module': "ga4-link-tracker" do %>
   <div class="govuk-width-container">
@@ -51,6 +52,8 @@
                           unless attributes[:data][:ga4_link]
                             attributes[:data][:ga4_link] = layout_footer_helper.generate_ga4_link_attribute(index, ga4_section_index, section[:title], index_total)
                           end
+
+                          item[:href] = absolute_links_helper.make_url_absolute(item[:href])
                         %>
                         <%= link_to item[:text], item[:href], attributes %>
                       </li>
@@ -82,6 +85,8 @@
                   unless attributes[:data][:ga4_link]
                     attributes[:data][:ga4_link] = layout_footer_helper.generate_ga4_link_attribute(index, navigation.length, "Support links", index_total)
                   end
+
+                  item[:href] = absolute_links_helper.make_url_absolute(item[:href])
                 %>
                 <%= link_to item[:text], item[:href], attributes %>
               </li>

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

@@ -70,6 +70,8 @@
 
   popular_links_heading_classes = %w(govuk-heading-m)
   popular_links_heading_classes << "gem-c-layout-super-navigation-header__popular-links-heading--large-navbar" if large_navbar
+
+  absolute_links_helper = GovukPublishingComponents::Presenters::AbsoluteLinksHelper.new()
 %>
 <%= content_tag("header",
   {
@@ -311,9 +313,10 @@
                         link_classes = %w[govuk-link gem-c-layout-super-navigation-header__navigation-second-item-link]
                         link_classes << "gem-c-layout-super-navigation-header__navigation-second-item-link--with-description" if has_description
                         tracking_label = column[:label].downcase.gsub(/\s+/, "")
+                        link_href = absolute_links_helper.make_url_absolute(item[:href])
                       %>
                       <li class="gem-c-layout-super-navigation-header__dropdown-list-item">
-                        <%= link_to item[:label], item[:href], {
+                        <%= link_to item[:label], link_href, {
                           class: link_classes,
                           data: {
                             track_action: "#{tracking_label}Link",
@@ -360,7 +363,7 @@
                 data-ga4-form='{ "event_name": "search", "type": "header menu bar", "section": "Search GOV.UK", "action": "search", "url": "/search/all" }'
                 data-ga4-form-include-text
                 data-ga4-form-no-answer-undefined
-                action="/search"
+                action="<%= absolute_links_helper.make_url_absolute('/search') %>"
                 method="get"
                 role="search"
                 aria-label="Site-wide"
@@ -394,7 +397,8 @@
                 <% index_total = popular_links.length %>
                 <% popular_links.each_with_index do | popular_link, index | %>
                   <li class="gem-c-layout-super-navigation-header__popular-item">
-                    <%= link_to popular_link[:label], popular_link[:href], {
+                    <% link_href = absolute_links_helper.make_url_absolute(popular_link[:href]) %>
+                    <%= link_to popular_link[:label], link_href, {
                       class: [
                         "govuk-link",
                         "gem-c-layout-super-navigation-header__popular-link",

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

@@ -65,11 +65,7 @@
                     class="gem-c-metadata__definition-link govuk-!-display-none-print js-see-all-updates-link"
                     data-track-category="content-history"
                     data-track-action="see-all-updates-link-clicked"
-                    data-track-label="history"
-                    <% unless disable_ga4 %>
-                      data-module="ga4-link-tracker"
-                      data-ga4-link="<%= ga4_object %>"
-                    <% end%>>
+                    data-track-label="history">
             <%= t("components.metadata.see_all_updates") %>
           </a>
         <% end %>

data/app/views/govuk_publishing_components/components/feedback/_problem_form.html.erb

@@ -1,4 +1,8 @@
-<form action="/contact/govuk/problem_reports"
+<%
+ absolute_links_helper = GovukPublishingComponents::Presenters::AbsoluteLinksHelper.new()
+%>
+
+<form action="<%= absolute_links_helper.make_url_absolute('/contact/govuk/problem_reports') %>"
   id="something-is-wrong"
   class="gem-c-feedback__form js-feedback-form"
   data-track-category="Onsite Feedback"

data/app/views/govuk_publishing_components/components/feedback/_survey_signup_form.html.erb

@@ -1,4 +1,8 @@
-<form action="/contact/govuk/email-survey-signup"
+<%
+ absolute_links_helper = GovukPublishingComponents::Presenters::AbsoluteLinksHelper.new()
+%>
+
+<form action="<%= absolute_links_helper.make_url_absolute('/contact/govuk/email-survey-signup') %>"
   id="page-is-not-useful"
   class="gem-c-feedback__form gem-c-feedback__form--email gem-c-feedback__js-show js-feedback-form"
   data-track-category="yesNoFeedbackForm"

data/lib/govuk_publishing_components/presenters/absolute_links_helper.rb

@@ -0,0 +1,20 @@
+module GovukPublishingComponents
+  module Presenters
+    class AbsoluteLinksHelper
+      def make_url_absolute(href)
+        # If the URL is already absolute do nothing
+        unless href.start_with?("/")
+          return href
+        end
+
+        host = ENV["VIRTUAL_HOST"] || Plek.new.website_root
+
+        unless host.start_with?("http://", "https://", "//")
+          host = "//#{host}" # '//' preserves the current protocol, we shouldn't force https as that would break dev environments
+        end
+
+        "#{host}#{href}"
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "37.1.0".freeze
+  VERSION = "37.1.1".freeze
 end

data/lib/govuk_publishing_components.rb

@@ -7,6 +7,7 @@ require "govuk_publishing_components/engine"
 require "govuk_publishing_components/version"
 require "govuk_publishing_components/presenters/shared_helper"
 require "govuk_publishing_components/presenters/component_wrapper_helper"
+require "govuk_publishing_components/presenters/absolute_links_helper"
 require "govuk_publishing_components/presenters/accordion_helper"
 require "govuk_publishing_components/presenters/attachment_helper"
 require "govuk_publishing_components/presenters/big_number_helper"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 37.1.0
+  version: 37.1.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-15 00:00:00.000000000 Z
+date: 2023-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -943,6 +943,7 @@ files:
 - lib/govuk_publishing_components/config.rb
 - lib/govuk_publishing_components/engine.rb
 - lib/govuk_publishing_components/minitest/component_guide_test.rb
+- lib/govuk_publishing_components/presenters/absolute_links_helper.rb
 - lib/govuk_publishing_components/presenters/accordion_helper.rb
 - lib/govuk_publishing_components/presenters/attachment_helper.rb
 - lib/govuk_publishing_components/presenters/big_number_helper.rb
@@ -1496,7 +1497,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.1
 signing_key: 
 specification_version: 4
 summary: A gem to document components in GOV.UK frontend applications