govuk_publishing_components 31.1.1 → 31.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8f89b321d55b2623a30beb4b0f53a54a6b5174bbcc1ba7f4e15097fbaf0e4b0
-  data.tar.gz: db8e005e0bf1068eededf53799905388fe09ea2ca8bb0c5fe62de95e8347e3de
+  metadata.gz: 91b9d62f7f0bee126ffb2fa60dcca311f06489100cdc686a4c4404f54ae4c4e3
+  data.tar.gz: df1410de982d60ae348bad56b9dda41ea67666d1c4117b5f61260998aaac9bea
 SHA512:
-  metadata.gz: 29904c326d8df2559116c9adfaaed028ff593a371585a04c1409067b7d21221a937bdace0ab8904b421e744fdc2cd12dcefda6428b370c98dcd3defe7da0b03e
-  data.tar.gz: 016de6ad1910ffa3563760f7dc8dd79102b4258bf7c56f0f1f72da4815925753252e7b3682e23e4b40942f9f3ca5536e3aeea7afc2fa8f070f8d913bd4bcf5ce
+  metadata.gz: 3ce3821fa73df20270408a383dba70232b5312628fe31299bc8b3b6577dc786da3e1afe24e72dcd38a1217e04739563b2a09bde9f4a8228f50c1a63c656ca7b9
+  data.tar.gz: 8ea5b431d7ed318852c4c1fdd1991b09f28d8abca00d8732b5cb6cf4de698a1a66a98fb5298ac49769666867d5641275e284fff04d8f12e950ee22c0809a4359

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

@@ -22,6 +22,7 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
       } else {
         // initialise GTM
         window.dataLayer = window.dataLayer || []
+        window.dataLayer.push({ 'gtm.blocklist': ['customPixels', 'customScripts', 'html', 'nonGoogleScripts'] })
         window.dataLayer.push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' })
 
         var auth = window.GOVUK.analyticsGa4.vars.auth || ''
@@ -36,7 +37,6 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
         this.googleSrc = 'https://www.googletagmanager.com/gtm.js?id=' + window.GOVUK.analyticsGa4.vars.id + auth + preview
         newScript.src = this.googleSrc
         firstScript.parentNode.insertBefore(newScript, firstScript)
-        window.dataLayer.push({ 'gtm.blocklist': ['customPixels', 'customScripts', 'html', 'nonGoogleScripts'] })
       }
     },
 

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

@@ -44,17 +44,15 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
         return
       }
 
-      var clickData = {}
       var href = element.getAttribute('href')
 
       if (!href) {
         return
       }
-
+      var clickData = {}
       var linkAttributes = element.getAttribute('data-ga4-link')
       if (linkAttributes) {
-        linkAttributes = JSON.parse(linkAttributes)
-        clickData = window.GOVUK.extendObject(clickData, linkAttributes)
+        clickData = JSON.parse(linkAttributes)
 
         /* Since external links can't be determined in the template, we use populated-via-js as a signal
         for our JavaScript to determine this value. */
@@ -62,41 +60,47 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
           clickData.external = this.isExternalLink(clickData.url) ? 'true' : 'false'
         }
 
-        if (clickData.link_method === 'populated-via-js') {
-          clickData.link_method = this.getClickType(event)
+        if (clickData.method === 'populated-via-js') {
+          clickData.method = this.getClickType(event)
         }
 
         if (clickData.index) {
-          clickData.index = parseInt(linkAttributes.index)
+          clickData.index = parseInt(clickData.index)
         }
 
         if (clickData.index_total) {
-          clickData.index_total = parseInt(linkAttributes.index_total)
+          clickData.index_total = parseInt(clickData.index_total)
         }
       } else if (this.isMailToLink(href)) {
         clickData.event_name = 'navigation'
         clickData.type = 'email'
         clickData.external = 'true'
         clickData.url = href
-        clickData.text = element.textContent.trim()
-        clickData.link_method = this.getClickType(event)
+        clickData.text = this.removeLinesAndExtraSpaces(element.textContent)
+        clickData.method = this.getClickType(event)
       } else if (this.isDownloadLink(href)) {
         clickData.event_name = 'file_download'
         clickData.type = this.isPreviewLink(href) ? 'preview' : 'generic download'
         clickData.external = this.isExternalLink(href) ? 'true' : 'false'
         clickData.url = href
-        clickData.text = element.textContent.trim()
-        clickData.link_method = this.getClickType(event)
+        clickData.text = this.removeLinesAndExtraSpaces(element.textContent)
+        clickData.method = this.getClickType(event)
       } else if (this.isExternalLink(href)) {
         clickData.event_name = 'navigation'
         clickData.type = 'generic link'
         clickData.external = 'true'
         clickData.url = href
-        clickData.text = element.textContent.trim()
-        clickData.link_method = this.getClickType(event)
+        clickData.text = this.removeLinesAndExtraSpaces(element.textContent)
+        clickData.method = this.getClickType(event)
       }
 
       if (Object.keys(clickData).length > 0) {
+        if (clickData.url) {
+          clickData.url = this.removeCrossDomainParams(clickData.url)
+          clickData.link_domain = this.populateLinkDomain(clickData.url)
+          clickData.link_path_parts = this.populateLinkPathParts(clickData.url)
+        }
+
         var schema = new window.GOVUK.analyticsGa4.Schemas().eventSchema()
         schema.event = 'event_data'
 
@@ -112,6 +116,49 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
       }
     },
 
+    populateLinkPathParts: function (href) {
+      var path = ''
+      if (this.hrefIsRelative(href) || this.isMailToLink(href)) {
+        path = href
+      } else {
+        // This regex matches a protocol and domain name at the start of a string such as https://www.gov.uk, http://gov.uk, //gov.uk
+        path = href.replace(/^(http:||https:)?(\/\/)([^\/]*)/, '') // eslint-disable-line no-useless-escape
+      }
+
+      if (path === '/' || path.length === 0) {
+        return
+      }
+
+      /*
+      This will create an object with 5 keys that are indexes ("1", "2", etc.)
+      The values will be each part of the link path split every 100 characters, or undefined.
+      For example: {"1": "/hello/world/etc...", "2": "/more/path/text...", "3": undefined, "4": undefined, "5": undefined}
+      Undefined values are needed to override the persistent object in GTM so that any values from old pushes are overwritten.
+      */
+      var parts = path.match(/.{1,100}/g)
+      var obj = {}
+      for (var i = 0; i < 5; i++) {
+        obj[(i + 1).toString()] = parts[i]
+      }
+      return obj
+    },
+
+    populateLinkDomain: function (href) {
+      // We always want mailto links to have an undefined link_domain
+      if (this.isMailToLink(href)) {
+        return undefined
+      }
+
+      if (this.hrefIsRelative(href)) {
+        return this.getProtocol() + '//' + this.getHostname()
+      } else {
+        // This regex matches a protocol and domain name at the start of a string such as https://www.gov.uk, http://gov.uk, //gov.uk
+        var domainRegex = /^(http:||https:)?(\/\/)([^\/]*)/ // eslint-disable-line no-useless-escape
+        var domain = domainRegex.exec(href)[0]
+        return domain
+      }
+    },
+
     appendDomainsWithoutWWW: function (domainsArrays) {
       // Add domains with www. removed, in case site hrefs are marked up without www. included.
       for (var i = 0; i < domainsArrays.length; i++) {
@@ -123,6 +170,13 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
       }
     },
 
+    removeLinesAndExtraSpaces: function (text) {
+      text = text.trim()
+      text = text.replace(/(\r\n|\n|\r)/gm, ' ') // Replace line breaks with 1 space
+      text = text.replace(/\s+/g, ' ') // Replace instances of 2+ spaces with 1 space
+      return text
+    },
+
     getClickType: function (event) {
       switch (event.type) {
         case 'click':
@@ -236,6 +290,10 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
       return string.substring(0, stringToFind.length) === stringToFind
     },
 
+    stringEndsWith: function (string, stringToFind) {
+      return string.substring(string.length - stringToFind.length, string.length) === stringToFind
+    },
+
     hrefIsRelative: function (href) {
       // Checks that a link is relative, but is not a protocol relative url
       return href[0] === '/' && href[1] !== '/'
@@ -247,6 +305,25 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
 
     getHostname: function () {
       return window.location.hostname
+    },
+
+    getProtocol: function () {
+      return window.location.protocol
+    },
+
+    removeCrossDomainParams: function (href) {
+      if (href.indexOf('_ga') !== -1 || href.indexOf('_gl') !== -1) {
+        // _ga & _gl are values needed for cross domain tracking, but we don't want them included in our click tracking.
+        href = href.replaceAll(/_g[al]=([^&]*)/g, '')
+
+        // The following code cleans up inconsistencies such as gov.uk/&&, gov.uk/?&hello=world, gov.uk/?, and gov.uk/&.
+        href = href.replaceAll(/(&&)+/g, '&')
+        href = href.replace('?&', '?')
+        if (this.stringEndsWith(href, '?') || this.stringEndsWith(href, '&')) {
+          href = href.substring(0, href.length - 1)
+        }
+      }
+      return href
     }
   }
 

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

@@ -21,7 +21,9 @@
         section: this.undefined,
         action: this.undefined,
         external: this.undefined,
-        link_method: this.undefined
+        method: this.undefined,
+        link_domain: this.undefined,
+        link_path_parts: this.undefined
       }
     }
   }

data/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss

@@ -2,11 +2,20 @@
   background: govuk-colour("white");
   margin-top: govuk-spacing(6);
 
-  @include govuk-media-query($from: tablet) {
+  @include govuk-media-query($from: desktop) {
     margin-top: govuk-spacing(9);
-    border-bottom: 1px solid govuk-colour("white");
   }
 
+  // New design has the box flush with edges of smaller screens
+  // We need to compensate for `govuk-width-container` margins:
+  @include govuk-media-query($until: tablet) {
+    margin-right: govuk-spacing(-3);
+    margin-left: govuk-spacing(-3);
+  }
+  @include govuk-media-query($from: tablet, $until: desktop) {
+    margin-right: govuk-spacing(-6);
+    margin-left: govuk-spacing(-6);
+  }
   // Scoped to the feedback component temporarily
   [hidden] {
     // stylelint-disable-next-line declaration-no-important
@@ -14,92 +23,88 @@
   }
 }
 
-.gem-c-feedback__prompt-questions {
-  text-align: center;
-  border-bottom: 1px solid govuk-colour("white");
-  padding: govuk-spacing(5) govuk-spacing(5) govuk-spacing(5) govuk-spacing(5);
-  box-sizing: border-box;
+.gem-c-feedback__prompt {
+  background-color: govuk-colour("light-grey");
+  color: govuk-colour("black");
+  border-top: 1px solid $govuk-border-colour;
+  outline: 0;
+}
 
+.gem-c-feedback__prompt-content {
+  display: flex;
+  flex-direction: column;
+  padding: 0 govuk-spacing(3);
   @include govuk-media-query($from: tablet) {
-    width: 50%;
-    display: table-cell;
-    text-align: left;
-    border-bottom: 0;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
   }
 }
 
-.gem-c-feedback__prompt-questions--something-is-wrong {
-  text-align: center;
-
+.gem-c-feedback__prompt-questions {
+  text-align: left;
+  padding: govuk-spacing(4) 0;
   @include govuk-media-query($from: tablet) {
-    text-align: right;
-    vertical-align: bottom;
-    float: none;
+    margin: 0 govuk-spacing(3);
   }
 }
 
-.gem-c-feedback__prompt {
-  @include govuk-clearfix;
-  background-color: govuk-colour("blue");
-  color: govuk-colour("white");
-  outline: 0;
-
+.gem-c-feedback__prompt-questions--something-is-wrong {
+  border-top: 1px solid $govuk-border-colour;
   @include govuk-media-query($from: tablet) {
-    @include govuk-font(16, $weight: bold);
-    display: table;
-    width: 100%;
+    border: 0;
+  }
+}
+
+.gem-c-feedback__prompt-question-answer {
+  display: flex;
+  align-items: center;
+  @include govuk-media-query($until: mobile) {
+    justify-content: center;
+    flex-wrap: wrap;
   }
 }
 
 .gem-c-feedback__prompt-question,
 .gem-c-feedback__prompt-success {
   @include govuk-font(19, $weight: bold);
-
   @include govuk-media-query($from: tablet) {
     @include govuk-font(16, $weight: bold);
   }
 }
 
 .gem-c-feedback__prompt-question {
-  vertical-align: top;
-  display: inline-block;
-  margin: govuk-spacing(2) govuk-spacing(4);
+  margin: 0;
+  padding-bottom: govuk-spacing(2);
 
   &:focus {
     outline: 0;
   }
-
-  @include govuk-media-query($from: tablet) {
-    margin-left: 0;
-    margin-top: 0;
-    display: block;
-  }
-
-  // This custom media-query is to account for some awkward positioning where the yes and no buttons are too big to sit inline with the prompt question
-  @include govuk-media-query($from: 950px) {
-    display: inline-block;
-    margin-top: govuk-spacing(2);
+  @include govuk-media-query($from: mobile) {
+    padding-bottom: 0;
+    margin-right: govuk-spacing(2);
   }
 }
 
 .gem-c-feedback__prompt-link {
   @include govuk-font(19);
   background: transparent;
-  box-shadow: 0 2px 0 govuk-colour("white");
-  border: 1px govuk-colour("white") solid;
-  min-width: 100%;
+  color: govuk-colour("black");
+  box-shadow: 0 3px 0 govuk-colour("black");
+  border: 1px govuk-colour("black") solid;
+  margin-bottom: 0;
+  width: 100%;
 
   &:hover {
     // backup style for browsers that don't support rgba
-    background: govuk-colour("black");
+    background: govuk-colour("mid-grey");
     background: rgba(govuk-colour("black"), .2);
+    color: govuk-colour("black");
   }
 
-  @include govuk-media-query($from: mobile) {
-    min-width: 100px;
-    margin-bottom: 0;
+  &:active:focus:not(:hover) {
+    background: govuk-colour("yellow");
   }
-
   @include govuk-media-query($from: tablet) {
     @include govuk-font(16);
   }
@@ -108,42 +113,44 @@
 .gem-c-feedback__email-link,
 .gem-c-feedback__prompt-link {
   position: relative;
+
+  &:focus:not(:active):not(:hover) {
+    border-color: govuk-colour("black");
+  }
+
+  &:focus,
+  &:active {
+    color: $govuk-focus-text-colour;
+  }
 }
 
 .gem-c-feedback__prompt-link:link,
 .gem-c-feedback__prompt-link:visited {
-  color: govuk-colour("white");
+  color: govuk-colour("black");
 
-  &:focus {
+  &:focus,
+  &:active {
     color: $govuk-focus-text-colour;
   }
 }
 
 .gem-c-feedback__option-list {
+  display: flex;
   list-style-type: none;
   margin: 0;
   padding: 0;
-  margin-top: govuk-spacing(2);
-
-  @include govuk-media-query($from: mobile) {
-    display: inline-block;
-    margin-right: govuk-spacing(2);
-  }
-
-  @include govuk-media-query($from: tablet) {
-    margin-top: 0;
-  }
 }
 
 .gem-c-feedback__option-list-item {
-  @include govuk-media-query($from: mobile) {
-    display: inline-block;
+  &:last-child {
+    margin-left: govuk-spacing(2);
   }
 }
 
-.gem-c-feedback__option-list-item:last-child {
-  @include govuk-media-query($from: mobile) {
-    margin-left: govuk-spacing(4);
+.gem-c-feedback__option-list-item .gem-c-feedback__prompt-link {
+  min-width: 100px;
+  @include govuk-media-query($until: desktop) {
+    min-width: 80px;
   }
 }
 
@@ -158,7 +165,7 @@
     outline: solid 3px $govuk-focus-colour;
   }
 
-  @include govuk-media-query($from: tablet) {
+  @include govuk-media-query($from: desktop) {
     border-width: $govuk-border-width;
   }
 
@@ -190,11 +197,11 @@
 }
 
 .gem-c-feedback__form {
-  padding: govuk-spacing(3) 0;
-  border-top: govuk-spacing(2) solid govuk-colour("blue");
+  padding: govuk-spacing(3);
+  border-top: 1px solid $govuk-border-colour;
 
   @include govuk-media-query($from: tablet) {
-    padding: govuk-spacing(6) 0;
+    padding: govuk-spacing(6);
   }
 }
 
@@ -217,8 +224,10 @@
 }
 
 .gem-c-feedback__close {
-  float: right;
-  margin: 0 govuk-spacing(1) govuk-spacing(2) 0;
+  margin: 0 govuk-spacing(2);
+  @include govuk-media-query($until: tablet) {
+    margin: govuk-spacing(4) 0 0;
+  }
 }
 
 .gem-c-feedback__email-link {
@@ -228,7 +237,6 @@
   @include govuk-media-query($from: desktop) {
     display: inline-block;
     margin-top: govuk-spacing(2);
-    margin-left: govuk-spacing(3);
   }
 }
 

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

@@ -49,7 +49,7 @@
                 'index': index + 1,
                 'index_total': links.length,
                 'text': link[:icon],
-                'link_method': 'populated-via-js'
+                'method': 'populated-via-js'
               }
             end
             if track_as_follow
@@ -61,7 +61,7 @@
                 'text': link[:text],
                 'external': 'populated-via-js',
                 'url': link[:href],
-                'link_method': 'populated-via-js'
+                'method': 'populated-via-js'
               }
             end
           %>

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

@@ -5,14 +5,6 @@
   data-track-action="GOV.UK Send Form"
   method="post"
   hidden>
-  <button
-    class="govuk-button govuk-button--secondary gem-c-feedback__close gem-c-feedback__js-show js-close-form"
-    data-track-category="Onsite Feedback"
-    data-track-action="GOV.UK Close Form"
-    aria-controls="something-is-wrong"
-    aria-expanded="true">
-    <%= t("components.feedback.close") %>
-  </button>
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
@@ -49,6 +41,16 @@
       <%= render "govuk_publishing_components/components/button", {
         text: t("components.feedback.send")
       } %>
+
+    <button
+      class="govuk-button govuk-button--secondary gem-c-feedback__close gem-c-feedback__js-show js-close-form"
+      data-track-category="Onsite Feedback"
+      data-track-action="GOV.UK Close Form"
+      aria-controls="something-is-wrong"
+      aria-expanded="true">
+      <%= t("components.feedback.close") %>
+    </button>
+
     </div>
   </div>
 </form>

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

@@ -4,15 +4,6 @@
   data-track-category="yesNoFeedbackForm"
   data-track-action="Send Form"
   method="post">
-  <button
-    class="govuk-button govuk-button--secondary gem-c-feedback__close js-close-form"
-    data-track-category="yesNoFeedbackForm"
-    data-track-action="ffFormClose"
-    aria-controls="page-is-not-useful"
-    aria-expanded="true"
-    hidden>
-    <%= t("components.feedback.close") %>
-  </button>
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds" id="survey-wrapper">
@@ -37,6 +28,17 @@
        <%= render "govuk_publishing_components/components/button", {
         text: t("components.feedback.send_me_survey"),
       } %>
+
+      <button
+        class="govuk-button govuk-button--secondary gem-c-feedback__close js-close-form"
+        data-track-category="yesNoFeedbackForm"
+        data-track-action="ffFormClose"
+        aria-controls="page-is-not-useful"
+        aria-expanded="true"
+        hidden>
+        <%= t("components.feedback.close") %>
+      </button>
+      
     </div>
   </div>
 </form>

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

@@ -1,42 +1,48 @@
 <div class="gem-c-feedback__prompt gem-c-feedback__js-show js-prompt" tabindex="-1">
-  <div class="gem-c-feedback__prompt-questions js-prompt-questions" hidden>
-    <h2 class="gem-c-feedback__prompt-question"><%= t("components.feedback.is_this_page_useful") %></h2>
+  <div class="gem-c-feedback__prompt-content">
+    <div class="gem-c-feedback__prompt-questions js-prompt-questions" hidden>
+      <div class="gem-c-feedback__prompt-question-answer">
+        <h2 class="gem-c-feedback__prompt-question"><%= t("components.feedback.is_this_page_useful") %></h2>
+        <ul class="gem-c-feedback__option-list">
+          <li class="gem-c-feedback__option-list-item govuk-visually-hidden" style="display: none" hidden>
+            <% # Maybe button exists only to try and capture clicks by bots %>
+            <%= link_to "/contact/govuk", {
+              class: 'gem-c-feedback__prompt-link',
+              data: {
+                'track-category' => 'yesNoFeedbackForm',
+                'track-action' => 'ffMaybeClick'
+              },
+              role: 'button',
+              style: 'display: none',
+              hidden: 'hidden',
+              'aria-hidden': 'true',
+            } do %>
+              <%= t("components.feedback.maybe") %>
+            <% end %>
+          </li>
+          <li class="gem-c-feedback__option-list-item">
+            <button class="govuk-button gem-c-feedback__prompt-link js-page-is-useful" data-track-category="yesNoFeedbackForm" data-track-action="ffYesClick" data-ga4='{"event_name":"form_submit","type":"feedback","text":"Yes", "section": "Is this page useful?"}'>
+              <%= t("components.feedback.yes") %> <span class="govuk-visually-hidden"><%= t("components.feedback.is_useful") %></span>
+            </button>
+          </li>
+          <li class="gem-c-feedback__option-list-item">
+            <button class="govuk-button gem-c-feedback__prompt-link js-toggle-form js-page-is-not-useful" data-track-category="yesNoFeedbackForm" data-track-action="ffNoClick" aria-controls="page-is-not-useful" aria-expanded="false" data-ga4='{"event_name":"form_submit","type":"feedback","text":"No", "section": "Is this page useful?"}'>
+              <%= t("components.feedback.no") %> <span class="govuk-visually-hidden"><%= t("components.feedback.is_not_useful") %></span>
+            </button>
+          </li>
+        </ul>
+      </div>
+    </div>
+
+    <div class="gem-c-feedback__prompt-questions gem-c-feedback__prompt-success js-prompt-success" role="alert" hidden>
+      <%= t("components.feedback.thank_you_for_feedback") %>
+    </div>
+
+    <div class="gem-c-feedback__prompt-questions gem-c-feedback__prompt-questions--something-is-wrong js-prompt-questions" hidden>
+      <button class="govuk-button gem-c-feedback__prompt-link js-toggle-form js-something-is-wrong" data-track-category="Onsite Feedback" data-track-action="GOV-UK Open Form" aria-controls="something-is-wrong" aria-expanded="false">
+        <%= t("components.feedback.something_wrong") %>
+      </button>
+    </div>
     
-    <ul class="gem-c-feedback__option-list">
-      <li class="gem-c-feedback__option-list-item govuk-visually-hidden" style="display: none" hidden>
-        <% # Maybe button exists only to try and capture clicks by bots %>
-        <%= link_to "/contact/govuk", {
-          class: 'gem-c-feedback__prompt-link',
-          data: {
-            'track-category' => 'yesNoFeedbackForm',
-            'track-action' => 'ffMaybeClick'
-          },
-          role: 'button',
-          style: 'display: none',
-          hidden: 'hidden',
-          'aria-hidden': 'true',
-        } do %>
-          <%= t("components.feedback.maybe") %>
-        <% end %>
-      </li>
-      <li class="gem-c-feedback__option-list-item">
-        <button class="govuk-button gem-c-feedback__prompt-link js-page-is-useful" data-track-category="yesNoFeedbackForm" data-track-action="ffYesClick" data-ga4='{"event_name":"form_submit","type":"feedback","text":"Yes", "section": "Is this page useful?"}'>
-          <%= t("components.feedback.yes") %> <span class="govuk-visually-hidden"><%= t("components.feedback.is_useful") %></span>
-        </button>
-      </li>
-      <li class="gem-c-feedback__option-list-item">
-        <button class="govuk-button gem-c-feedback__prompt-link js-toggle-form js-page-is-not-useful" data-track-category="yesNoFeedbackForm" data-track-action="ffNoClick" aria-controls="page-is-not-useful" aria-expanded="false" data-ga4='{"event_name":"form_submit","type":"feedback","text":"No", "section": "Is this page useful?"}'>
-          <%= t("components.feedback.no") %> <span class="govuk-visually-hidden"><%= t("components.feedback.is_not_useful") %></span>
-        </button>
-      </li>
-    </ul>
-  </div>
-  <div class="gem-c-feedback__prompt-questions gem-c-feedback__prompt-success js-prompt-success" role="alert" hidden>
-    <%= t("components.feedback.thank_you_for_feedback") %>
-  </div>
-  <div class="gem-c-feedback__prompt-questions gem-c-feedback__prompt-questions--something-is-wrong js-prompt-questions" hidden>
-    <button class="govuk-button gem-c-feedback__prompt-link js-toggle-form js-something-is-wrong" data-track-category="Onsite Feedback" data-track-action="GOV-UK Open Form" aria-controls="something-is-wrong" aria-expanded="false">
-      <%= t("components.feedback.something_wrong") %>
-    </button>
   </div>
 </div>

data/config/locales/en.yml

@@ -61,7 +61,7 @@ en:
         publication: Publication for %{nation}
       wales: Wales
     feedback:
-      close: Close
+      close: Cancel
       dont_include_personal_info: Don’t include personal or financial information like your National Insurance number or credit card details.
       email_address: Email address
       help_us_improve_govuk: Help us improve GOV.UK

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "31.1.1".freeze
+  VERSION = "31.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 31.1.1
+  version: 31.2.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-12 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -1361,7 +1361,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.23
+rubygems_version: 3.3.24
 signing_key: 
 specification_version: 4
 summary: A gem to document components in GOV.UK frontend applications