govuk_publishing_components 23.10.2 → 23.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 737265f42ca1a81cb1a854d9858c053b36da1dd49096d4ab271880e40a0d265a
-  data.tar.gz: 53e08f6b824be9665c54eb1e421463d63d8a761cc0aa8b432fdea43025fe173f
+  metadata.gz: ee5a24f565f5900b36058d428d5944f205d001d89d4fec819ce73696cab40f92
+  data.tar.gz: a3c714fac1eace552f26dabf2da1f357ac0b8a0dc79a7e328f99c748206bcec9
 SHA512:
-  metadata.gz: d668236b7496da22426217927da594ff3dc3da9a903fafe647ca9ab47cc7877d779aef7dd841dde4b1f514571155a149a8d81bc40ff0b4e506ec8d90eeb6b80b
-  data.tar.gz: 5ea78e25ed6a8ca39346ce90b46262b96c793ebd0fcc84a83715378099f029aa2c72bc29f758ba1b414d81fc7a73a3b21e7bd35603313d621d8c7fb112b1364f
+  metadata.gz: 6354ef8debf4cab296f119140d6a4018a0484b6c5ef61734a3d4e1920d9e7ea6c0b60219ca14a2275ec0b9d32ae73aae61a9a116218a5eab8651526fd09b9d72
+  data.tar.gz: fe69a6990d168343f224155fa7430d22e7f023fab8a9af88ae95f0d08de457bb088c0411e80c85b66e8aef75b5164f2ed5f20e1a5cbc5f350f31a87a8dcf7612

data/app/assets/javascripts/govuk_publishing_components/analytics/external-link-tracker.js

@@ -10,7 +10,6 @@
     var externalLinkUploadCustomDimension = options.externalLinkUploadCustomDimension
     var currentHost = GOVUK.analyticsPlugins.externalLinkTracker.getHostname()
     var externalLinkSelector = 'a[href^="http"]:not(a[href*="' + currentHost + '"])'
-
     $('body').on('click', externalLinkSelector, trackClickEvent)
 
     function trackClickEvent (evt) {
@@ -33,7 +32,6 @@
 
         GOVUK.analytics.setDimension(externalLinkUploadCustomDimension, externalLinkToJoinUploadOn)
       }
-
       GOVUK.analytics.trackEvent('External Link Clicked', href, options)
     }
 

data/app/assets/javascripts/govuk_publishing_components/analytics/pii.js

@@ -5,8 +5,9 @@
 
   var GOVUK = global.GOVUK || {}
   var EMAIL_PATTERN = /[^\s=/?&]+(?:@|%40)[^\s=/?&]+/g
-  var POSTCODE_PATTERN = /[A-PR-UWYZ][A-HJ-Z]?[0-9][0-9A-HJKMNPR-Y]?(?:[\s+]|%20)*[0-9][ABD-HJLNPQ-Z]{2}/gi
+  var POSTCODE_PATTERN = /[A-PR-UWYZ][A-HJ-Z]?[0-9][0-9A-HJKMNPR-Y]?(?:[\s+]|%20)*[0-9](?!refund)[ABD-HJLNPQ-Z]{2,3}/gi
   var DATE_PATTERN = /\d{4}(-?)\d{2}(-?)\d{2}/g
+  var ESCAPE_REGEX_PATTERN = /[|\\{}()[\]^$+*?.]/g
 
   // specific URL parameters to be redacted from accounts URLs
   var RESET_PASSWORD_TOKEN_PATTERN = /reset_password_token=[a-zA-Z0-9-]+/g
@@ -21,9 +22,24 @@
     return ($('meta[name="govuk:static-analytics:strip-postcodes"]').length > 0)
   }
 
+  function queryStringParametersToStrip () {
+    var value = $('meta[name="govuk:static-analytics:strip-query-string-parameters"]').attr('content')
+    var parameters = []
+
+    if (value) {
+      var split = value.split(',')
+      for (var i = 0; i < split.length; i++) {
+        parameters.push(split[i].trim())
+      }
+    }
+
+    return parameters
+  }
+
   var pii = function () {
     this.stripDatePII = shouldStripDates()
     this.stripPostcodePII = shouldStripPostcodes()
+    this.queryStringParametersToStrip = queryStringParametersToStrip()
   }
 
   pii.prototype.stripPII = function (value) {
@@ -43,6 +59,7 @@
     stripped = stripped.replace(RESET_PASSWORD_TOKEN_PATTERN, 'reset_password_token=[reset_password_token]')
     stripped = stripped.replace(UNLOCK_TOKEN_PATTERN, 'unlock_token=[unlock_token]')
     stripped = stripped.replace(STATE_PATTERN, 'state=[state]')
+    stripped = this.stripQueryStringParameters(stripped)
 
     if (this.stripDatePII === true) {
       stripped = stripped.replace(DATE_PATTERN, '[date]')
@@ -77,6 +94,17 @@
     return array
   }
 
+  pii.prototype.stripQueryStringParameters = function (string) {
+    for (var i = 0; i < this.queryStringParametersToStrip.length; i++) {
+      var parameter = this.queryStringParametersToStrip[i]
+      var escaped = parameter.replace(ESCAPE_REGEX_PATTERN, '\\$&')
+      var regexp = new RegExp('((?:\\?|&)' + escaped + '=)(?:[^&#\\s]*)', 'g')
+      string = string.replace(regexp, '$1[' + parameter + ']')
+    }
+
+    return string
+  }
+
   GOVUK.Pii = pii
 
   global.GOVUK = GOVUK

data/app/assets/javascripts/govuk_publishing_components/lib/govspeak/magna-charta.js

@@ -11,9 +11,12 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     this.options = {
       outOf: 65,
       applyOnInit: true,
-      toggleText: 'Toggle between chart and table',
       autoOutdent: false,
       outdentAll: false,
+      chartVisibleText: 'Change to table and accessible view',
+      tableVisibleText: 'Change to chart view',
+      chartAlertText: 'Chart visible',
+      tableAlertText: 'Table visible',
       toggleAfter: false, // BOOL set TRUE to append the toggle link
       returnReference: false // for testing purposes
     }
@@ -27,6 +30,10 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     // store a reference to the table in the object
     this.$table = $module
 
+    // a container around the graph element so that it can be targeted by screen readers, allowing us to inform screen reader users that the graph isn't accessible
+    this.$graphContainer = document.createElement('div')
+    this.$graphContainer.className = 'mc-chart-container'
+
     // lets make what will become the new graph
     this.$graph = document.createElement('div')
 
@@ -39,6 +46,9 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     this.$graph.setAttribute('class', this.$table.className)
     this.$graph.classList.add('mc-chart')
 
+    // get the id of the current chart within the page so that it can be used during the generation of the toggleLink
+    this.chartId = this.getChartId($module)
+
     // set the stacked option based on
     // giving the table a class of mc-stacked
     this.options.stacked = this.$table.classList.contains('mc-stacked')
@@ -102,7 +112,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       this.addClassesToHeader()
       this.applyWidths()
       this.insert()
-      this.$table.classList.add('visually-hidden')
+      this.$table.classList.add('mc-hidden')
       this.applyOutdent()
     }
   }
@@ -164,24 +174,42 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   }
 
   // construct a link to allow the user to toggle between chart and table
-  MagnaCharta.prototype.construct.toggleLink = function (toggleText) {
-    var link = document.createElement('a')
-    link.setAttribute('href', '#')
-    link.classList.add('mc-toggle-link')
-    link.innerHTML = toggleText
-    link.setAttribute('aria-hidden', 'true')
+  MagnaCharta.prototype.construct.toggleLink = function (chartVisibleText) {
+    var link = document.createElement('button')
+
+    // These spans are for managing the content within the button
+    // toggleText is the public facing content whilst toggleStatus is visually hidden content that we use to let screen reader users know that the toggle link has been clicked
+    var toggleText = document.createElement('span')
+    var toggleStatus = document.createElement('span')
+
+    toggleText.classList.add('mc-toggle-text')
+    toggleText.innerHTML = chartVisibleText
+
+    toggleStatus.classList.add('govuk-visually-hidden', 'mc-toggle-status')
+    toggleStatus.setAttribute('role', 'alert')
+
+    link.classList.add('mc-toggle-button')
+    link.appendChild(toggleText)
+    link.appendChild(toggleStatus)
 
     return link
   }
 
   // toggles between showing the table and showing the chart
-  MagnaCharta.prototype.addToggleClick = function () {
+  MagnaCharta.prototype.addToggleClick = function (chartVisible, tableVisible, chartAlert, tableAlert) {
     var that = this
 
     this.toggleLink.addEventListener('click', function (e) {
       e.preventDefault()
-      that.$graph.classList.toggle('visually-hidden')
-      that.$table.classList.toggle('visually-hidden')
+
+      var toggleText = that.toggleLink.querySelector('.mc-toggle-text')
+      var toggleStatus = that.toggleLink.querySelector('.mc-toggle-status')
+
+      that.$graphContainer.classList.toggle('mc-hidden')
+      that.$table.classList.toggle('mc-hidden')
+
+      toggleText.innerHTML = toggleText.innerHTML === tableVisible ? chartVisible : tableVisible
+      toggleStatus.innerHTML = toggleStatus.innerHTML === tableAlert ? chartAlert : tableAlert
     })
   }
 
@@ -191,8 +219,8 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     // get at options and properties
     var thead = this.construct.thead.call(this)
     var tbody = this.construct.tbody.call(this)
-    this.toggleLink = this.construct.toggleLink(this.options.toggleText)
-    this.addToggleClick(this.toggleLink)
+    this.toggleLink = this.construct.toggleLink(this.options.chartVisibleText)
+    this.addToggleClick(this.options.chartVisibleText, this.options.tableVisibleText, this.options.chartAlertText, this.options.tableAlertText)
 
     if (this.options.hasCaption) {
       var caption = this.construct.caption.call(this)
@@ -379,7 +407,18 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   }
 
   MagnaCharta.prototype.insert = function () {
-    this.$table.insertAdjacentElement('afterend', this.$graph)
+    var label = document.createElement('span')
+    var labelId = 'mc-chart-not-accessible-' + this.chartId
+
+    label.innerHTML = 'This content is not accessible - switch to table'
+    label.className = 'mc-hidden'
+    label.id = labelId
+
+    this.$graphContainer.setAttribute('aria-labelledby', labelId)
+    this.$graphContainer.appendChild(this.$graph)
+    this.$graphContainer.appendChild(label)
+
+    this.$table.insertAdjacentElement('afterend', this.$graphContainer)
   }
 
   MagnaCharta.prototype.applyOutdent = function () {
@@ -419,5 +458,18 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     }
   }
 
+  MagnaCharta.prototype.getChartId = function (module) {
+    var allCharts = document.querySelectorAll('table.js-barchart-table')
+    var id = null
+
+    allCharts.forEach(function (chart, i) {
+      if (chart === module) {
+        id = i
+      }
+    })
+
+    return id
+  }
+
   Modules.MagnaCharta = MagnaCharta
 })(window.GOVUK.Modules)

data/app/assets/stylesheets/govuk_publishing_components/components/_contextual-sidebar.scss

@@ -1,11 +1,51 @@
-@import 'transition-countdown';
+$transition-campaign-red: #ff003b;
+$transition-campaign-dark-blue: #1e1348;
 
-.gem-c-contextual-sidebar__brexit-cta {
+.gem-c-contextual-sidebar__brexit-related-links {
   border-top: 2px solid $govuk-brand-colour;
+
+  .gem-c-contextual-sidebar__brexit-heading {
+    @include govuk-font(19, $weight: bold);
+    padding-top: govuk-spacing(3);
+    margin-bottom: govuk-spacing(2);
+  }
+}
+
+.gem-c-contextual-sidebar__brexit-cta {
+  @include govuk-font(19);
+  margin-bottom: govuk-spacing(6);
+  background-color: govuk-colour('light-grey', $legacy: 'grey-4');
+  border-top: 4px solid $transition-campaign-red;
+  display: block;
+  padding: govuk-spacing(3);
+  text-decoration: none;
+
+  .gem-c-contextual-sidebar__brexit-heading {
+    @extend %govuk-heading-m;
+    color: $transition-campaign-dark-blue;
+  }
+
+  .gem-c-contextual-sidebar__brexit-text {
+    @extend %govuk-link;
+
+    margin-top: 0;
+    margin-bottom: 0;
+    text-decoration: underline;
+
+    @include govuk-media-query($from: tablet) {
+      margin-bottom: govuk-spacing(2);
+    }
+  }
+
+  @include govuk-compatibility(govuk_template) {
+    .gem-c-contextual-sidebar__brexit-title {
+      margin-bottom: govuk-spacing(3);
+    }
+  }
 }
 
-.gem-c-contextual-sidebar__brexit-heading {
-  @include govuk-font(19, $weight: bold);
-  padding-top: govuk-spacing(3);
-  margin-bottom: govuk-spacing(2);
+.gem-c-contextual-sidebar__brexit-cta:focus {
+  .gem-c-contextual-sidebar__brexit-text {
+    text-decoration: none;
+  }
 }

data/app/assets/stylesheets/govuk_publishing_components/components/_show-password.scss

@@ -14,6 +14,10 @@
     &:focus {
       z-index: 1;
     }
+
+    &::-ms-reveal {
+      display: none;
+    }
   }
 }
 

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

@@ -270,15 +270,26 @@
     text-align: left;
   }
 
-  .mc-toggle-link {
-    display: block;
-    margin-top: 30px;
+  .mc-toggle-button {
+    @extend %govuk-body-s;
+    border: 1px solid $govuk-border-colour;
+    color: $govuk-link-colour;
+    cursor: pointer;
+    margin: govuk-spacing(0);
+    padding: govuk-spacing(2);
+    background-color: govuk-colour("white");
+
+    &:focus {
+      @include govuk-focused-text;
+      background-color: $govuk-focus-colour;
+      border-color: transparent;
+    }
   }
 
   // Hides the original table
-  .visually-hidden,
-  .visually-hidden caption {
-    @include govuk-visually-hidden;
+  .mc-hidden,
+  .mc-hidden caption {
+    display: none;
 
     // It's reapplied to captions because Firefox can't hide
     // table captions unless it's applied directly to it. Go figure.

data/app/controllers/govuk_publishing_components/audit_controller.rb

@@ -21,12 +21,15 @@ module GovukPublishingComponents
         collections-publisher
         content-data-admin
         content-publisher
+        datagovuk_find
         email-alert-frontend
         feedback
         finder-frontend
         frontend
         government-frontend
         govspeak-preview
+        govuk-account-manager-prototype
+        govuk-coronavirus-vulnerable-people-form
         info-frontend
         licence-finder
         manuals-frontend

data/app/models/govuk_publishing_components/audit_applications.rb

@@ -7,6 +7,7 @@ module GovukPublishingComponents
       application_found = application_exists(path)
       components_found = []
       @gem_style_references = []
+      @jquery_references = []
 
       if application_found
         templates = Dir["#{path}/app/views/**/*.erb"]
@@ -65,6 +66,7 @@ module GovukPublishingComponents
         application_found: application_found,
         components_found: components_found,
         gem_style_references: @gem_style_references.flatten.uniq.sort,
+        jquery_references: @jquery_references.flatten.uniq.sort,
       }
     end
 
@@ -76,8 +78,14 @@ module GovukPublishingComponents
       files.each do |file|
         src = File.read(file)
         components_found << find_match(find, src, type)
-        gem_references = find_gem_references(file, src)
-        @gem_style_references << gem_references if gem_references
+
+        if type == "javascripts"
+          jquery_references = find_code_references(file, src, /\$\(/)
+          @jquery_references << jquery_references if jquery_references
+        else
+          gem_style_references = find_code_references(file, src, /gem-c-[-_a-zA-Z]+/)
+          @gem_style_references << gem_style_references if gem_style_references
+        end
       rescue StandardError
         puts "File #{file} not found"
       end
@@ -99,11 +107,10 @@ module GovukPublishingComponents
       all_matches
     end
 
-    def find_gem_references(file, src)
-      find_gem_classes = /gem-c-[-_a-zA-Z]+/
+    def find_code_references(file, src, regex)
       clean_file_path = /(?<=#{Regexp.escape(@path)}\/)[\/a-zA-Z_-]+.[a-zA-Z.]+/
 
-      return file[clean_file_path] if find_gem_classes.match?(src)
+      return file[clean_file_path] if regex.match?(src)
     end
 
     def clean_file_name(name)

data/app/models/govuk_publishing_components/audit_comparer.rb

@@ -37,6 +37,7 @@ module GovukPublishingComponents
           warnings << warn_about_missing_components(result[:components_found])
           warnings << warn_about_missing_assets(result[:components_found])
           warnings << warn_about_style_overrides(result[:gem_style_references])
+          warnings << warn_about_jquery_references(result[:jquery_references])
           warnings = warnings.flatten
 
           data << {
@@ -67,6 +68,7 @@ module GovukPublishingComponents
             warnings: warnings,
             warning_count: warnings.length,
             gem_style_references: result[:gem_style_references],
+            jquery_references: result[:jquery_references],
           }
         else
           data << {
@@ -163,6 +165,16 @@ module GovukPublishingComponents
       warnings
     end
 
+    def warn_about_jquery_references(results)
+      warnings = []
+
+      results.each do |result|
+        warnings << create_warning("Possible jQuery", result)
+      end
+
+      warnings
+    end
+
     def find_missing(needle, haystack)
       (haystack - needle).flatten.sort
     end

data/app/views/govuk_publishing_components/audit/show.html.erb

@@ -109,6 +109,21 @@
                       <% end %>
                     </ul>
                   <% end %>
+
+                  <% if application[:jquery_references].any? %>
+                    <%= render "govuk_publishing_components/components/heading", {
+                      text: "jQuery references",
+                      font_size: "m",
+                      margin_bottom: 4,
+                      heading_level: 3,
+                    } %>
+                    <p class="govuk-body">This shows JavaScript files that might contain jQuery, which we are trying to remove our dependency on.</p>
+                    <ul class="govuk-list govuk-list--bullet">
+                      <% application[:jquery_references].each do |ref| %>
+                        <li><%= ref %></li>
+                      <% end %>
+                    </ul>
+                  <% end %>
                 <% else %>
                   <p class="govuk-body">This application was not found. This could be because you do not have this repository checked out locally.</p>
                 <% end %>

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

@@ -2,23 +2,10 @@
 <% shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns) %>
 
 <div class="gem-c-contextual-sidebar">
-  <% if navigation.show_brexit_cta? && navigation.step_by_step_count.zero? %>
-    <%= render 'govuk_publishing_components/components/contextual_sidebar/brexit_cta' %>
+  <% if navigation.show_brexit_related_links? && navigation.step_by_step_count.zero? %>
+    <%= render 'govuk_publishing_components/components/contextual_sidebar/brexit_related_links' %>
   <% elsif navigation.step_by_step_count.zero? && !navigation.transition_countdown_exception? %>
-    <%= render 'govuk_publishing_components/components/transition_countdown', {
-      title: t("components.related_navigation.transition.title"),
-      url: t("components.related_navigation.transition.link_path"),
-      text: t("components.related_navigation.transition.link_text"),
-      data_attributes: {
-        "module": "track-click",
-        "track-category": "relatedLinkClicked",
-        "track-action": "1.0 Transition",
-        "track-label": t("components.related_navigation.transition.link_path"),
-        "track-dimension": t("components.related_navigation.transition.link_text"),
-        "track-dimension-index": "29",
-      },
-      lang: shared_helper.t_locale("components.related_navigation.transition.title"),
-    } %>
+    <%= render 'govuk_publishing_components/components/contextual_sidebar/brexit_cta' %>
   <% end %>
 
   <% if navigation.content_tagged_to_a_reasonable_number_of_step_by_steps? %>
@@ -43,7 +30,7 @@
     } %>
   <% end %>
 
-  <% if navigation.show_brexit_cta? && navigation.step_by_step_count > 0 %>
-    <%= render 'govuk_publishing_components/components/contextual_sidebar/brexit_cta' %>
+  <% if navigation.show_brexit_related_links? && navigation.step_by_step_count > 0 %>
+    <%= render 'govuk_publishing_components/components/contextual_sidebar/brexit_related_links' %>
   <% end %>
 </div>

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

@@ -9,7 +9,7 @@
 <% structured_data = GovukPublishingComponents::Presenters::SchemaOrg.new(page).structured_data %>
 
 <script type="application/ld+json">
-  <%= raw JSON.pretty_generate(structured_data) %>
+  <%= raw(json_escape(JSON.pretty_generate(structured_data))) %>
 </script>
 
 <link rel="canonical" href="<%= page.canonical_url %>" />

data/app/views/govuk_publishing_components/components/contextual_sidebar/_brexit_cta.html.erb

@@ -1,6 +1,20 @@
+<% shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns) %>
 <% link_text = t("components.related_navigation.transition.link_text") %>
 <% link_path = t("components.related_navigation.transition.link_path") %>
-<div class="gem-c-contextual-sidebar__brexit-cta govuk-!-margin-bottom-6" data-module="track-click" lang="en">
+
+<% data_attributes = {
+  "module": "track-click",
+  "track-category": "relatedLinkClicked",
+  "track-action": "1.0 Transition",
+  "track-label": link_path,
+  "track-dimension": link_text,
+  "track-dimension-index": "29",
+} %>
+
+<%= link_to link_path,
+    class: "govuk-link gem-c-contextual-sidebar__brexit-cta",
+    data: data_attributes,
+    lang: shared_helper.t_locale("components.related_navigation.transition.title") do %>
   <h2 class="gem-c-contextual-sidebar__brexit-heading"><%= t("components.related_navigation.transition.title") %></h2>
-  <a href="<%= link_path %>" class="govuk-link" data-track-category="relatedLinkClicked" data-track-action="1.0 Transition" data-track-label="<%= link_path %>" data-track-options='{"dimension29":"<%= link_text %>"}'><%= link_text %></a>
-</div>
+  <p class="gem-c-contextual-sidebar__brexit-text"><%= link_text %></p>
+<% end %>

data/app/views/govuk_publishing_components/components/contextual_sidebar/_brexit_related_links.html.erb

@@ -0,0 +1,6 @@
+<% link_text = t("components.related_navigation.transition.link_text") %>
+<% link_path = t("components.related_navigation.transition.link_path") %>
+<div class="gem-c-contextual-sidebar__brexit-related-links govuk-!-margin-bottom-6" data-module="track-click" lang="en">
+  <h2 class="gem-c-contextual-sidebar__brexit-heading"><%= t("components.related_navigation.transition.title") %></h2>
+  <a href="<%= link_path %>" class="govuk-link" data-track-category="relatedLinkClicked" data-track-action="1.0 Transition" data-track-label="<%= link_path %>" data-track-options='{"dimension29":"<%= link_text %>"}'><%= link_text %></a>
+</div>

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

@@ -81,7 +81,7 @@ examples:
                       - text: The Highway Code
                         href: "/guidance/the-highway-code"
                     optional: false
-  with_brexit_cta_and_related_links:
+  with_brexit_and_other_related_links:
     data:
       content_item:
         title: "A content item"
@@ -108,7 +108,7 @@ examples:
           - title: The future of jobs and skills
             base_path: /government/collections/the-future-of-jobs-and-skills
             document_type: document_collection
-  with_brexit_cta_and_step_by_steps:
+  with_brexit_related_links_and_step_by_steps:
     data:
       content_item:
         title: "A content item"

data/config/locales/cy.yml

@@ -10,9 +10,6 @@ cy:
       contents: Cynnwys
     related_navigation:
       transition:
-        title: "Pontio Brexit"
+        title: "Brexit"
         link_path: "/transition.cy"
-        link_text: "Gwiriwch eich bod chi'n barod ar gyfer 2021"
-    transition_countdown:
-      day_to_go: "diwrnod i fynd"
-      days_to_go: "diwrnod i fynd"
+        link_text: "Darganfyddwch sut mae’r rheolau Brexit newydd yn effeithio arnoch chi"

data/config/locales/en.yml

@@ -77,9 +77,9 @@ en:
       topical_events: "Topical event"
       world_locations: "World locations"
       transition:
-        title: "Brexit transition"
+        title: "Brexit"
         link_path: "/transition"
-        link_text: "Check you’re ready for 2021"
+        link_text: "Check how the new Brexit rules affect you"
     related_footer_navigation:
       collections: "Collections"
       policies: "Policies"
@@ -103,6 +103,3 @@ en:
     summary_list:
       edit: "Change"
       delete: "Delete"
-    transition_countdown:
-      day_to_go: "day to go"
-      days_to_go: "days to go"

data/lib/govuk_publishing_components.rb

@@ -34,7 +34,6 @@ require "govuk_publishing_components/presenters/taxonomy_list_helper"
 require "govuk_publishing_components/app_helpers/taxon_breadcrumbs"
 require "govuk_publishing_components/app_helpers/table_helper"
 require "govuk_publishing_components/app_helpers/brand_helper"
-require "govuk_publishing_components/app_helpers/countdown_helper"
 require "govuk_publishing_components/app_helpers/environment"
 
 # Add i18n paths and views for usage outside of a Rails app

data/lib/govuk_publishing_components/presenters/contextual_navigation.rb

@@ -104,7 +104,7 @@ module GovukPublishingComponents
         false
       end
 
-      def show_brexit_cta?
+      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

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "23.10.2".freeze
+  VERSION = "23.12.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 23.10.2
+  version: 23.12.2
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -678,13 +678,13 @@ files:
 - app/views/govuk_publishing_components/components/_taxonomy_list.html.erb
 - app/views/govuk_publishing_components/components/_textarea.html.erb
 - app/views/govuk_publishing_components/components/_title.html.erb
-- app/views/govuk_publishing_components/components/_transition_countdown.html.erb
 - app/views/govuk_publishing_components/components/_translation-nav.html.erb
 - app/views/govuk_publishing_components/components/_warning_text.html.erb
 - app/views/govuk_publishing_components/components/attachment/_thumbnail_document.svg
 - app/views/govuk_publishing_components/components/attachment/_thumbnail_generic.svg
 - app/views/govuk_publishing_components/components/attachment/_thumbnail_spreadsheet.svg
 - app/views/govuk_publishing_components/components/contextual_sidebar/_brexit_cta.html.erb
+- app/views/govuk_publishing_components/components/contextual_sidebar/_brexit_related_links.html.erb
 - app/views/govuk_publishing_components/components/docs/accordion.yml
 - app/views/govuk_publishing_components/components/docs/action_link.yml
 - app/views/govuk_publishing_components/components/docs/admin_analytics.yml
@@ -758,7 +758,6 @@ files:
 - app/views/govuk_publishing_components/components/docs/taxonomy_list.yml
 - app/views/govuk_publishing_components/components/docs/textarea.yml
 - app/views/govuk_publishing_components/components/docs/title.yml
-- app/views/govuk_publishing_components/components/docs/transition_countdown.yml
 - app/views/govuk_publishing_components/components/docs/translation-nav.yml
 - app/views/govuk_publishing_components/components/docs/warning_text.yml
 - app/views/govuk_publishing_components/components/feedback/_problem_form.html.erb
@@ -783,7 +782,6 @@ files:
 - lib/generators/govuk_publishing_components/templates/component.yml.erb
 - lib/govuk_publishing_components.rb
 - lib/govuk_publishing_components/app_helpers/brand_helper.rb
-- lib/govuk_publishing_components/app_helpers/countdown_helper.rb
 - lib/govuk_publishing_components/app_helpers/environment.rb
 - lib/govuk_publishing_components/app_helpers/table_helper.rb
 - lib/govuk_publishing_components/app_helpers/taxon_breadcrumbs.rb

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

@@ -1,35 +0,0 @@
-<%
-  countdown_clock = GovukPublishingComponents::AppHelpers::CountdownHelper.new
-  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
-
-  heading_level ||= 2
-  title ||= nil
-  text ||= nil
-  url ||= nil
-  data_attributes ||= {}
-  lang ||= "en"
-  direction ||= "ltr"
-  css_classes = %w(gem-c-transition-countdown)
-  css_classes << "gem-c-transition-countdown--cta" if url
-  css_classes << "govuk-link" if url
-%>
-
-<% countdown = capture do %>
-  <%= content_tag(shared_helper.get_heading_level, title, class: "gem-c-transition-countdown__title") if title %>
-  <% if countdown_clock.show? %>
-    <%= tag.p class: "gem-c-transition-countdown__countdown" do %>
-      <%= tag.span countdown_clock.days_left.first, class: "gem-c-transition-countdown__countdown-number" %><%= tag.span countdown_clock.days_left.last, class: "gem-c-transition-countdown__countdown-number" %> <%= tag.span countdown_clock.days_text, class: "gem-c-transition-countdown__countdown-text" %>
-    <% end %>
-  <% end %>
-  <%= tag.p text, class: "gem-c-transition-countdown__text" if text %>
-<% end %>
-
-<% if url %>
-  <%= link_to url, class: css_classes, data: data_attributes, lang: lang, dir: direction do %>
-    <%= countdown %>
-  <% end %>
-<% else %>
-  <%= tag.div class: css_classes, lang: lang, dir: direction do %>
-    <%= countdown %>
-  <% end %>
-<% end %>

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

@@ -1,17 +0,0 @@
-name: Transition countdown
-description: A countdown to 01 January 2021 used in the Brexit transition campaign
-body: When a URL is set it acts as a link to actions users need to take to prepare for brexit during the transition period
-shared_accessibility_criteria:
-  - link
-examples:
-  default:
-    data:
-  call_to_action:
-    data:
-      title: Brexit transition
-      text: Check you’re ready for 2021
-      url: "https://www.gov.uk/transition"
-      data_attributes:
-        "track-category": "Transition"
-        "track-action": "Brexit transition"
-        "track-label": "Check you’re ready for 2021"

data/lib/govuk_publishing_components/app_helpers/countdown_helper.rb

@@ -1,49 +0,0 @@
-module GovukPublishingComponents
-  module AppHelpers
-    class CountdownHelper
-      DEADLINE = Time.new(2020, 12, 31, 23, 59)
-
-      def days_left
-        sprintf "%02d", days_left_until_deadline
-      end
-
-      def show?
-        minutes_left_until_deadline >= 30
-      end
-
-      def days_text
-        if days_left_until_deadline == 1
-          I18n.t!("components.transition_countdown.day_to_go")
-        else
-          I18n.t!("components.transition_countdown.days_to_go")
-        end
-      end
-
-    private
-
-      def days_left_until_deadline
-        (minutes_left_until_deadline / 60 / 24).ceil
-      end
-
-      def minutes_left_until_deadline
-        (seconds_left_until_deadline / 60)
-      end
-
-      def seconds_left_until_deadline
-        end_of_transition_period - now_in_london
-      end
-
-      def end_of_transition_period
-        london_time_zone(DEADLINE)
-      end
-
-      def now_in_london
-        london_time_zone(Time.now)
-      end
-
-      def london_time_zone(time)
-        time.in_time_zone("Europe/London")
-      end
-    end
-  end
-end