govuk_publishing_components 29.11.0 → 29.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4908ab95bb70e9f55096b46cae08b0ea6fff5f168da24aa427c810a39de96e4a
-  data.tar.gz: 99873d158278fbbf30eb341558a5424b9957054b0711486312bd4e18b9c45b35
+  metadata.gz: dafa42cbe074f0cac7f3d82ad2475eee0cbd895e755279ff94a0fb8862d0f7c2
+  data.tar.gz: 2b06381bc10381652f927ce42a46dc3d1a008b3e78c26646816b6f4809bd2605
 SHA512:
-  metadata.gz: 7c6a51b33e3f4fccb750bdc8ab05171bb7d3e877f5ee8e9f0a601be977baa390162cfbab07a94facf2905d7eadd5f504640e25e86260d5b756e82959a8532522
-  data.tar.gz: 5531061592b4e1db78a34d8ecf15f613f05140585df1d5edb76224e82b317a62be16fb7ae4345d75c075297f164b3eb1569c794a7337a09d7345fee4061e0daf
+  metadata.gz: f5adab3000ea81b5eaae1506a4d2070ac0e35bf499e4d4ca2500534a087fb67b8e79ac6012faae9590142122f432f7ea36d3c90db819a515d2b623d570e6cb70
+  data.tar.gz: 278fabdee01f0785b2fc2b26dfc07f9c122cd640cf78a8666a846d54d3b44b5e009544c1428d4ed7a24e3ea8af07cfa9d440710e8606bf19e3bc94b46d7e0b2b

data/README.md

@@ -35,19 +35,30 @@ yarn run jasmine:browser
 yarn run jasmine:ci
 ```
 
-### Further documentation
+### Using the gem
 
 - [Install and use this gem](docs/install-and-use.md)
 - [Use a component in your application](docs/use-components.md)
-- [Generate a new component](docs/generate-a-new-component.md)
-- [Testing a component](docs/testing-components.md)
-- [Move a component from an application to the gem](docs/moving-components-upstream-into-this-gem.md)
+
+### Managing the gem
+
 - [Publish/release a new version of the gem](docs/publishing-to-rubygems.md)
 - [Keep this gem in sync with the Design System](docs/upgrade-govuk-frontend.md)
-- [Code documentation on rubydoc.info](http://www.rubydoc.info/gems/govuk_publishing_components)
+- [Move a component from an application to the gem](docs/moving-components-upstream-into-this-gem.md)
+
+### Making components
+
+- [Generate a new component](docs/generate-a-new-component.md)
 - [Component conventions](docs/component_conventions.md)
 - [Component principles](docs/component_principles.md)
+
+### Further documentation
+
+- [Testing a component](docs/testing-components.md)
 - [Component auditing](docs/auditing.md)
+- [Code documentation on rubydoc.info](http://www.rubydoc.info/gems/govuk_publishing_components)
+
+More documentation can be found in the [docs directory](docs/).
 
 ## Licence
 

data/app/assets/javascripts/govuk_publishing_components/analytics/custom-dimensions.js

@@ -64,7 +64,7 @@
       'taxon-slugs': { dimension: 58, defaultValue: 'other' },
       'taxon-ids': { dimension: 59, defaultValue: 'other' },
       'content-has-history': { dimension: 39, defaultValue: 'false' },
-      'publishing-application': { dimension: 89 },
+      'publishing-app': { dimension: 89 },
       'brexit-audience': { dimension: 112 },
       'brexit-superbreadcrumb': { dimension: 111 },
       stepnavs: { dimension: 96 },

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/gtm-click-tracking.js

@@ -25,11 +25,28 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
           link_url: window.location.href.substring(window.location.origin.length),
           ui: JSON.parse(target.getAttribute('data-gtm-attributes')) || {}
         }
-        var ariaExpanded = this.checkExpandedState(target)
+
+        // Ensure it only tracks aria-expanded in an accordion element, instead of in any child of the clicked element
+        if (target.closest('.gem-c-accordion')) {
+          var ariaExpanded = this.getClosestAttribute(target, 'aria-expanded')
+        }
+
+        /*
+          the details component uses an 'open' attribute instead of aria-expanded, so we need to check if we're on a details component.
+          since details deletes the 'open' attribute when closed, we need this boolean, otherwise every element which
+          doesn't contain an 'open' attr would be pushed to gtm as a closed element.
+        */
+        var detailsElement = target.closest('details')
+
         if (ariaExpanded) {
-          data.ui.state = ariaExpanded === 'false' ? 'opened' : 'closed'
           data.ui.text = data.ui.text || target.innerText
+          data.ui.action = (ariaExpanded === 'false') ? 'opened' : 'closed'
+        } else if (detailsElement) {
+          data.ui.text = data.ui.text || detailsElement.textContent
+          var openAttribute = detailsElement.getAttribute('open')
+          data.ui.action = (openAttribute == null) ? 'opened' : 'closed'
         }
+
         window.dataLayer.push(data)
       }
     }
@@ -43,15 +60,15 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     }
   }
 
-  // check either element is expandable or contains expandable element
-  GtmClickTracking.prototype.checkExpandedState = function (clicked) {
-    var isExpandable = clicked.getAttribute('aria-expanded')
-    var containsExpandable = clicked.querySelector('[aria-expanded]')
+  // check if an attribute exists or contains the attribute
+  GtmClickTracking.prototype.getClosestAttribute = function (clicked, attribute) {
+    var isAttributeOnElement = clicked.getAttribute(attribute)
+    var containsAttribute = clicked.querySelector('[' + attribute + ']')
 
-    if (isExpandable) {
-      return isExpandable
-    } else if (containsExpandable) {
-      return containsExpandable.getAttribute('aria-expanded')
+    if (isAttributeOnElement || isAttributeOnElement === '') { // checks for "" as some attribute names can contain no value making them falsy
+      return isAttributeOnElement
+    } else if (containsAttribute) {
+      return containsAttribute.getAttribute(attribute)
     }
   }
 

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/gtm-page-views.js

@@ -0,0 +1,98 @@
+;(function (global) {
+  'use strict'
+
+  var GOVUK = global.GOVUK || {}
+
+  GOVUK.Gtm = {
+    sendPageView: function () {
+      if (window.dataLayer) {
+        var data = {
+          event: 'config_ready',
+          page: {
+            location: this.getLocation(),
+            referrer: this.getReferrer(),
+            title: this.getTitle(),
+            status_code: this.getStatusCode()
+          },
+          publishing: {
+            document_type: this.getMetaContent('format'),
+            publishing_app: this.getMetaContent('publishing-app'),
+            rendering_app: this.getMetaContent('rendering-app'),
+            schema_name: this.getMetaContent('schema-name'),
+            content_id: this.getMetaContent('content-id')
+          },
+          taxonomy: {
+            section: this.getMetaContent('section'),
+            taxon_slug: this.getMetaContent('taxon-slug'),
+            taxon_id: this.getMetaContent('taxon-id'),
+            themes: this.getMetaContent('themes'),
+            taxon_slugs: this.getMetaContent('taxon-slugs'),
+            taxon_ids: this.getMetaContent('taxon-ids')
+          },
+          content: {
+            language: this.getLanguage(),
+            history: this.getHistory(),
+            withdrawn: this.getWithDrawn(),
+            first_published_at: this.getMetaContent('first-published-at'),
+            updated_at: this.getMetaContent('updated-at'),
+            public_updated_at: this.getMetaContent('public-updated-at'),
+            publishing_government: this.getMetaContent('publishing-government'),
+            political_status: this.getMetaContent('political-status'),
+            primary_publishing_organisation: this.getMetaContent('primary-publishing-organisation'),
+            organisations: this.getMetaContent('analytics:organisations'),
+            world_locations: this.getMetaContent('analytics:world-locations')
+          }
+        }
+        window.dataLayer.push(data)
+      }
+    },
+
+    getLocation: function () {
+      return document.location.href
+    },
+
+    getReferrer: function () {
+      return document.referrer
+    },
+
+    getTitle: function () {
+      return document.title
+    },
+
+    // window.httpStatusCode is set in the source of the error page in static
+    // https://github.com/alphagov/static/blob/main/app/views/root/_error_page.html.erb#L32
+    getStatusCode: function () {
+      if (window.httpStatusCode) {
+        return window.httpStatusCode
+      } else {
+        return 200
+      }
+    },
+
+    getMetaContent: function (name) {
+      var tag = document.querySelector('meta[name="govuk:' + name + '"]')
+      if (tag) {
+        return tag.getAttribute('content')
+      } else {
+        return 'n/a'
+      }
+    },
+
+    getLanguage: function () {
+      var html = document.querySelector('html')
+      return html.getAttribute('lang') || 'n/a'
+    },
+
+    getHistory: function () {
+      var history = this.getMetaContent('content-has-history')
+      return (history === 'true') ? 'true' : 'false'
+    },
+
+    getWithDrawn: function () {
+      var withdrawn = this.getMetaContent('withdrawn')
+      return (withdrawn === 'withdrawn') ? 'true' : 'false'
+    }
+  }
+
+  global.GOVUK = GOVUK
+})(window)

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4.js

@@ -1 +1,4 @@
+//= require ./analytics-ga4/gtm-page-views
 //= require ./analytics-ga4/gtm-click-tracking
+
+window.GOVUK.Gtm.sendPageView() // this will need integrating with cookie consent before production

data/app/assets/javascripts/govuk_publishing_components/components/accordion.js

@@ -91,7 +91,7 @@ window.GOVUK.Modules.GovukAccordion = window.GOVUKFrontend.Accordion;
     var $expanded = this.getContainingSection($section)
     var $parent = $header.parentElement
 
-    // manuals-frontend features:
+    // government-frontend features (inherited from manuals-frontend):
     // Should the target anchor link be within the same page, open section - navigate normally
     // Should the target anchor link be within a different, closed section, open this section
     // Should the target anchor link be within a different page and different, closed section open this section
@@ -144,6 +144,18 @@ window.GOVUK.Modules.GovukAccordion = window.GOVUKFrontend.Accordion;
     var action = expanded ? 'accordionOpened' : 'accordionClosed'
     var options = { transport: 'beacon', label: label }
 
+    // optional parameters are added to the parent
+    // heading not the button that is clicked
+    var extraOptions = section.parentElement && section.parentElement.getAttribute('data-track-options')
+
+    // this uses the same logic as track-click.js handleClick
+    // means we can add a custom dimensions on click
+    // (such as the index of the accordion on the page)
+    if (extraOptions) {
+      extraOptions = JSON.parse(extraOptions)
+      for (var k in extraOptions) options[k] = extraOptions[k]
+    }
+
     if (window.GOVUK.analytics && window.GOVUK.analytics.trackEvent) {
       window.GOVUK.analytics.trackEvent('pageElementInteraction', action, options)
     }

data/app/assets/javascripts/govuk_publishing_components/components/feedback.js

@@ -19,6 +19,8 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     this.promptSuccessMessage = this.$module.querySelector('.js-prompt-success')
     this.surveyWrapper = this.$module.querySelector('#survey-wrapper')
     this.jshiddenClass = 'js-hidden'
+    this.whatDoingInput = this.$module.querySelector('[name=what_doing]')
+    this.whatWrongInput = this.$module.querySelector('[name=what_wrong]')
   }
 
   Feedback.prototype.init = function () {
@@ -74,6 +76,13 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       this.setHiddenValuesNotUsefulForm(gaClientId)
     }.bind(this))
 
+    this.somethingIsWrongButton.addEventListener('click', function (e) {
+      this.timerInterval = setInterval(function () {
+        this.timer = this.timer + 1
+        this.timerHoneyPot.setAttribute('value', this.timer)
+      }.bind(this), 1000)
+    }.bind(this))
+
     // much of the JS needed to support sending the form contents via this script is
     // unsupported by IE, even IE11. This check causes IE to not intercept form submits
     // and let them happen normally, which is handled already by the backend
@@ -94,6 +103,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
               this.revealInitialPrompt()
               this.setInitialAriaAttributes()
               this.activeForm.hidden = true
+              clearInterval(this.timerInterval)
             } else {
               this.showError(xhr)
               this.enableSubmitFormButton($form)
@@ -142,6 +152,14 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       '<h2>Sorry, we’re unable to send your message as you haven’t given us any information.</h2>',
       ' <p>Please tell us what you were doing or what went wrong</p>'
     ].join('')
+
+    this.timer = 0
+
+    this.timerHoneyPot = document.createElement('input')
+    this.timerHoneyPot.setAttribute('type', 'hidden')
+    this.timerHoneyPot.setAttribute('name', 'timer')
+    this.timerHoneyPot.setAttribute('value', this.timer)
+    this.somethingIsWrongForm.appendChild(this.timerHoneyPot)
   }
 
   Feedback.prototype.setHiddenValuesNotUsefulForm = function (gaClientId) {
@@ -185,6 +203,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         .focus()
     } else {
       this.activeForm = false
+      clearInterval(this.timerInterval)
     }
   }
 

data/app/assets/javascripts/govuk_publishing_components/vendor/lux/lux-measurer.js

@@ -175,8 +175,8 @@ if (
 var measureHTTPProtocol = function () {
   var getEntriesByType = performance.getEntriesByType('navigation')
 
-  if (getEntriesByType.length > 0) {
-    var httpProtocol = JSON.parse(JSON.stringify(performance.getEntriesByType('navigation')[0].nextHopProtocol))
+  if (typeof getEntriesByType !== 'undefined' && getEntriesByType.length > 0) {
+    var httpProtocol = getEntriesByType[0].nextHopProtocol
     LUX.addData("http-protocol", httpProtocol)
   }
 }

data/app/controllers/govuk_publishing_components/audit_controller.rb

@@ -15,7 +15,6 @@ module GovukPublishingComponents
         govspeak-preview
         info-frontend
         licence-finder
-        manuals-frontend
         release
         search-admin
         service-manual-frontend

data/app/models/govuk_publishing_components/audit_comparer.rb

@@ -13,7 +13,6 @@ module GovukPublishingComponents
           government-frontend
           info-frontend
           licence-finder
-          manuals-frontend
           service-manual-frontend
           smart-answers
           whitehall

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

@@ -83,9 +83,7 @@
       <% end %>
     <% end %>
 
-    <% if attachment.display_accessible_format_request_form_link? %>
-      <%= link_to "Request an accessible format of this document", "/contact/govuk/request-accessible-format?content_id=#{attachment.owning_document_content_id}&attachment_id=#{attachment.attachment_id}", class: "govuk-link" %>
-    <% elsif attachment.alternative_format_contact_email %>
+    <% if attachment.alternative_format_contact_email %>
       <%= tag.p t("components.attachment.request_format_text"), class: "gem-c-attachment__metadata" %>
       <%= render "govuk_publishing_components/components/details", {
         title: t("components.attachment.request_format_cta")

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

@@ -6,7 +6,7 @@
     { :name => "month", :width => 2 },
     { :name => "year", :width => 4 }
   ]
-
+  autocomplete_date_of_birth ||= nil
   legend_text ||= nil
   hint ||= nil
   error_message ||= nil
@@ -64,7 +64,7 @@
             id: item[:id],
             type: "number",
             data: item[:data],
-            autocomplete: item[:autocomplete]
+            autocomplete: autocomplete_date_of_birth ? "bday-#{item[:name]}" : nil
           } %>
         <% end %>
       <% end %>

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

@@ -1,7 +1,10 @@
-<% description ||= nil %>
-<% data_attributes ||= {} %>
+<%
+  id ||= nil
+  description ||= nil
+  data_attributes ||= {}
+%>
 
-<%= tag.div class: "gem-c-error-alert", data: { module: "initial-focus" }.merge(data_attributes), role: "alert", tabindex: "-1" do %>
+<%= tag.div id: id, class: "gem-c-error-alert", data: { module: "initial-focus" }.merge(data_attributes), role: "alert", tabindex: "-1" do %>
   <% if description.present? %>
     <%= tag.h2 message, class: "gem-c-error-summary__title" %>
     <%= tag.div description, class: "gem-c-error-summary__body" %>

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

@@ -6,9 +6,9 @@
   classes << "gem-c-layout-footer--border" if with_border
 %>
 <%= tag.footer class: classes, role: "contentinfo" do %>
-  <div class="govuk-width-container" data-module="gem-track-click">
+  <div class="govuk-width-container">
     <% if navigation.any? %>
-      <div class="govuk-footer__navigation">
+      <div class="govuk-footer__navigation" data-module="gem-track-click" data-track-links-only>
         <% navigation.each do |item| %>
           <% if item[:items] %>
             <%
@@ -60,7 +60,7 @@
       <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
         <% if meta.any? %>
           <h2 class="govuk-visually-hidden"><%= t("components.layout_footer.support_links") %></h2>
-          <ul class="govuk-footer__inline-list govuk-!-display-none-print">
+          <ul class="govuk-footer__inline-list govuk-!-display-none-print" data-module="gem-track-click" data-track-links-only>
             <% meta[:items].each do |item| %>
               <li class="govuk-footer__inline-list-item">
                 <%

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

@@ -15,12 +15,11 @@
   hide_navigation_menu_text = t("components.layout_super_navigation_header.menu_toggle_label.hide", :label => "navigation")
   show_navigation_menu_text = t("components.layout_super_navigation_header.menu_toggle_label.show", :label => "navigation")
 %>
-<header role="banner" class="gem-c-layout-super-navigation-header">
+<header role="banner" class="gem-c-layout-super-navigation-header" data-module="gem-track-click" data-track-links-only>
   <div class="gem-c-layout-super-navigation-header__container govuk-width-container govuk-clearfix">
     <div class="gem-c-layout-super-navigation-header__header-logo">
       <a
         class="govuk-header__link govuk-header__link--homepage"
-        data-module="gem-track-click"
         data-track-action="logoLink"
         data-track-category="headerClicked"
         data-track-label="<%= logo_link %>"
@@ -100,7 +99,6 @@
               <%= link_to link[:label], link[:href], {
                 class: "gem-c-layout-super-navigation-header__navigation-item-link",
                 data: {
-                  module: "gem-track-click",
                   track_action: "#{tracking_label}Link",
                   track_category: "headerClicked",
                   track_label: link[:href],
@@ -141,9 +139,9 @@
                   <div class="govuk-grid-row">
                     <div class="govuk-grid-column-one-third-from-desktop">
                       <% if link[:description].present? %>
-                        <p class="govuk-body-l gem-c-layout-super-navigation-header__menu-description">
+                        <h3 class="govuk-body-l gem-c-layout-super-navigation-header__menu-description">
                           <%= link[:description] %>
-                        </p>
+                        </h3>
                       <% end %>
                     </div>
                     <div class="govuk-grid-column-two-thirds-from-desktop">
@@ -159,7 +157,6 @@
                                 <%= link_to item[:label], item[:href], {
                                   class: link_classes,
                                   data: {
-                                    module: "gem-track-click",
                                     track_action: "#{tracking_label}Link",
                                     track_category: "headerClicked",
                                     track_label: item[:href],
@@ -183,7 +180,6 @@
                                   "gem-c-layout-super-navigation-header__navigation-second-footer-link",
                                 ],
                                 data: {
-                                  module: "gem-track-click",
                                   track_action: "#{tracking_label}Link",
                                   track_category: "headerClicked",
                                   track_label: item[:href],
@@ -312,7 +308,6 @@
                         "gem-c-layout-super-navigation-header__popular-link",
                       ],
                       data: {
-                        module: "gem-track-click",
                         track_action: "popularLink",
                         track_category: "headerClicked",
                         track_label: popular_link[:href],

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

@@ -195,11 +195,8 @@ examples:
           gtm: gtm-accordion
           ga: ga-accordion
       data_attributes_show_all:
-        module: example
-        track-action: click
-        ui:
-          type: test
-          text: something
+        gtm-event-name: example
+        gtm-attributes: "{ 'ui': { 'type': 'type value', 'section': 'section value' } }"
       items:
         - heading:
             text: Writing well for the web
@@ -337,6 +334,8 @@ examples:
       To switch on Google Analytics for each section, on click, pass `track_sections: true` the values passed on open will be
       `Event Action: accordionOpened` / `accordionClosed` `Event Category: pageElementInteraction` and the `Event Label` being the heading text.
 
+      If `track_options` in an item is set, then it is possible to pass a custom dimension when the section is clicked.
+
       (`track_show_all_clicks: true` can be added to track the "Show all sections" button as well, if required)
     data:
       track_sections: true
@@ -346,6 +345,9 @@ examples:
             id: writing-well-for-the-web-3
           content:
             html: <p class="govuk-body">This is content for accordion 1 of 2</p><p class="govuk-body">This content contains a <a href="#anchor-nav-test" class="govuk-link">link</a></p>
+          data_attributes:
+            track_options:
+              dimension114: 1
         - heading:
             text: Writing well for specialists
           content:

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

@@ -76,17 +76,6 @@ examples:
         content_type: application/pdf
         file_size: 20000
         alternative_format_contact_email: defra.helpline@defra.gsi.gov.uk
-  with_link_to_request_accessible_format_form:
-    data:
-      attachment:
-        title: "Department for Transport information asset register"
-        url: https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/747661/department-for-transport-information-asset-register.csv
-        filename: department-for-transport-information-asset-register.csv
-        content_type: application/pdf
-        file_size: 20000
-        owning_document_content_id: 456_abc
-        attachment_id: 123
-        alternative_format_contact_email: govuk_publishing_components@example.com
   with_data_attributes:
     data:
       attachment:

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

@@ -26,6 +26,13 @@ examples:
       component as follows: `custom-name[day]`, `custom-name[month]`, `custom-name[year]`
     data:
       name: "dob"
+  with_autocomplete_for_date_of_birth_fields:
+    description: |
+      Use the `autocomplete_date_of_birth` option when you're asking for the user's date of birth. This supports browsers or tools that can autofill the information on a user's behalf if they've entered it previously.
+
+      Note that the option should only be passed to the component if the date of birth asked for is the date of birth of the person filling the form in and not asked for on behalf of someone else.
+    data:
+      autocomplete_date_of_birth: true
   with_legend:
     data:
       legend_text: "What is your date of birth?"

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

@@ -27,3 +27,7 @@ examples:
       description: A further description
       data_attributes:
         tracking: GTM-123AB
+  with_specified_id_attribute:
+    data:
+      id: test-id
+      message: Message to alert the user to a unsuccessful action goes here

data/config/locales/en.yml

@@ -234,8 +234,8 @@ en:
         href: "/coronavirus"
       - label: Find a job
         href: "/find-a-job"
-      - label: 'Personal tax account: sign in'
-        href: "/personal-tax-account"
+      - label: 'Check benefits and financial support you can get'
+        href: "/check-benefits-financial-support"
       - label: 'Universal Credit account: sign in'
         href: "/sign-in-universal-credit"
       popular_links_heading: Popular on GOV.UK

data/lib/govuk_publishing_components/presenters/attachment_helper.rb

@@ -1,13 +1,6 @@
 module GovukPublishingComponents
   module Presenters
     class AttachmentHelper
-      # Various departments are taking part in a pilot to use a form
-      # rather than direct email for users to request accessible formats. When the pilot
-      # scheme is rolled out further this can be removed.
-      # Currently DfE, DWP and DVSA are participating in the pilot.
-      EMAILS_IN_ACCESSIBLE_FORMAT_REQUEST_PILOT = %w[govuk_publishing_components@example.com
-                                                     alternative.formats@education.gov.uk].freeze
-
       delegate :opendocument?, :document?, :spreadsheet?, to: :content_type
 
       attr_reader :attachment_data
@@ -15,7 +8,6 @@ module GovukPublishingComponents
       # Expects a hash of attachment data
       # * title and url are required
       # * content_type, filename, file_size, number of pages, alternative_format_contact_email can be provided
-      # * attachment_id and owning_document_content_id are required to use the accessible format request form
       def initialize(attachment_data)
         @attachment_data = attachment_data.with_indifferent_access
       end
@@ -55,14 +47,6 @@ module GovukPublishingComponents
         attachment_data[:alternative_format_contact_email]
       end
 
-      def attachment_id
-        attachment_data[:attachment_id]
-      end
-
-      def owning_document_content_id
-        attachment_data[:owning_document_content_id]
-      end
-
       def reference
         reference = []
         reference << "ISBN #{attachment_data[:isbn]}" if attachment_data[:isbn].present?
@@ -87,10 +71,6 @@ module GovukPublishingComponents
         attachment_data[:command_paper_number].present? || attachment_data[:hoc_paper_number].present? || attachment_data[:unnumbered_command_paper].eql?(true) || attachment_data[:unnumbered_hoc_paper].eql?(true)
       end
 
-      def display_accessible_format_request_form_link?
-        EMAILS_IN_ACCESSIBLE_FORMAT_REQUEST_PILOT.include?(alternative_format_contact_email) && owning_document_content_id.present? && attachment_id.present?
-      end
-
       class SupportedContentType
         attr_reader :content_type_data
 

data/lib/govuk_publishing_components/presenters/meta_tags.rb

@@ -27,9 +27,12 @@ module GovukPublishingComponents
 
     private
 
+      # other meta tags are inserted by slimmer here:
+      # https://github.com/alphagov/slimmer/blob/82144be372aa4afc1f8ff30917c96c2ee3a47ed8/lib/slimmer/processors/metadata_inserter.rb#L15
       def add_core_tags(meta_tags)
         meta_tags["govuk:format"] = content_item[:document_type] if content_item[:document_type]
-        meta_tags["govuk:publishing-application"] = content_item[:publishing_app] if content_item[:publishing_app]
+        meta_tags["govuk:publishing-app"] = content_item[:publishing_app] if content_item[:publishing_app]
+        meta_tags["govuk:rendering-app"] = content_item[:rendering_app] if content_item[:rendering_app]
         meta_tags["govuk:schema-name"] = content_item[:schema_name] if content_item[:schema_name]
         meta_tags["govuk:content-id"] = content_item[:content_id] if content_item[:content_id]
         meta_tags["govuk:navigation-page-type"] = content_item[:navigation_page_type] if content_item[:navigation_page_type]
@@ -39,6 +42,12 @@ module GovukPublishingComponents
         meta_tags["govuk:content-has-history"] = "true" if has_content_history?
         meta_tags["govuk:static-analytics:strip-dates"] = "true" if should_strip_dates_pii?(content_item, local_assigns)
         meta_tags["govuk:static-analytics:strip-postcodes"] = "true" if should_strip_postcode_pii?(content_item, local_assigns)
+        meta_tags["govuk:first-published-at"] = content_item[:first_published_at] if content_item[:first_published_at]
+        meta_tags["govuk:updated-at"] = content_item[:updated_at] if content_item[:updated_at]
+        meta_tags["govuk:public-updated-at"] = content_item[:public_updated_at] if content_item[:public_updated_at]
+        primary_publisher = content_item.dig(:links, :primary_publishing_organisation)
+        primary_publisher = primary_publisher.first[:title] unless primary_publisher.blank?
+        meta_tags["govuk:primary-publishing-organisation"] = primary_publisher unless primary_publisher.blank?
 
         meta_tags
       end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "29.11.0".freeze
+  VERSION = "29.13.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 29.11.0
+  version: 29.13.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-26 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -435,6 +435,7 @@ files:
 - app/assets/javascripts/govuk_publishing_components/all_components.js
 - app/assets/javascripts/govuk_publishing_components/analytics-ga4.js
 - app/assets/javascripts/govuk_publishing_components/analytics-ga4/gtm-click-tracking.js
+- app/assets/javascripts/govuk_publishing_components/analytics-ga4/gtm-page-views.js
 - app/assets/javascripts/govuk_publishing_components/analytics.js
 - app/assets/javascripts/govuk_publishing_components/analytics/analytics.js
 - app/assets/javascripts/govuk_publishing_components/analytics/auto-scroll-tracker.js
@@ -1918,7 +1919,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.14
+rubygems_version: 3.3.17
 signing_key: 
 specification_version: 4
 summary: A gem to document components in GOV.UK frontend applications