metadata_presenter 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49a8b135a7731b934944bb08412296c01ccc2a4335d5b87343f29418f01a1684
-  data.tar.gz: c71338cb5abd67cbb1662dfc4a70e44a7dc348a9d91eb1f5582a0014a4f68556
+  metadata.gz: af42807af0ac2b52ab40d11ea1b03317cd15d31d6c91445e406bde92f53a8642
+  data.tar.gz: 68f4c9ffda9100950999f0c1ab5885082f9e74f237636a1a4a1364a72b6dbe5c
 SHA512:
-  metadata.gz: 442292304fa1dcc3a3cd5f4192e14930601d88572d7c54f9b3e19478cdd0670f533fbf04f992783c800a6d4a283635f1b42ed514bcc944f238324206efcae7f4
-  data.tar.gz: dbc66263b1a60a131663ca5de9a34a6fa5d7756d4282ff91160270caffc783e32faf390524483fe99751ab1f225a66764d2742b5afe94285f2244ae789358faf
+  metadata.gz: b0ab87b1481df79a1e74c268446c5f0077d9c8a68803863bad5585aac36ec1ee4a2a1e3e63d5aab6faf5786737b36f83fe18677b1df65c5c1cb6cbd44a52592e
+  data.tar.gz: b0f714ea5732ce9d37aa3fc18a41b88c02e4be202ff809a8aaf103de315c083202c29f44d926b0222c3bbb81924aff8061fef9c37846ea044181e1fb89c47d94

data/app/views/metadata_presenter/analytics/_cookie_banner_confirmation.html.erb

@@ -1,6 +1,6 @@
 
-<div class="govuk-cookie-banner" id="govuk-cookie-banner" data-nosnippet role="region" aria-label="<%= t('presenter.analytics.heading', service_name: service.service_name) %>">
-  <div class="govuk-cookie-banner__message govuk-width-container" id="govuk-cookie-banner-message-accepted" role="alert" style="display: none;">
+<div class="govuk-cookie-banner" id="govuk-cookie-banner" data-nosnippet role="region" aria-label="<%= t('presenter.analytics.heading', service_name: service.service_name) %>" data-module="cookie-banner">
+  <div class="govuk-cookie-banner__message govuk-width-container" id="govuk-cookie-banner-message-accepted" role="alert" data-cookie-banner-element="message-accepted" hidden>
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-two-thirds">
         <div class="govuk-cookie-banner__content">
@@ -10,15 +10,10 @@
         </div>
       </div>
     </div>
-
-    <div class="govuk-button-group">
-      <button class="govuk-button" data-module="govuk-button" onclick="analytics.hideCookieBanner()">
-        <%= t('presenter.analytics.hide') %>
-      </button>
-    </div>
+    <%= render partial: 'metadata_presenter/analytics/hide_cookie_banner' %>
   </div>
 
-  <div class="govuk-cookie-banner__message govuk-width-container" id="govuk-cookie-banner-message-rejected" role="alert" style="display: none;">
+  <div class="govuk-cookie-banner__message govuk-width-container" id="govuk-cookie-banner-message-rejected" role="alert" data-cookie-banner-element="message-rejected" hidden>
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-two-thirds">
         <div class="govuk-cookie-banner__content">
@@ -28,11 +23,6 @@
         </div>
       </div>
     </div>
-
-    <div class="govuk-button-group">
-      <button class="govuk-button" data-module="govuk-button" onclick="analytics.hideCookieBanner()">
-        <%= t('presenter.analytics.hide') %>
-      </button>
-    </div>
+    <%= render partial: 'metadata_presenter/analytics/hide_cookie_banner' %>
   </div>
 </div>

data/app/views/metadata_presenter/analytics/_cookie_banner_request.html.erb

@@ -1,5 +1,5 @@
-<div class="govuk-cookie-banner" id="govuk-cookie-banner" data-nosnippet role="region" aria-label="<%= t('presenter.analytics.heading', service_name: service.service_name) %>">
-  <div class="govuk-cookie-banner__message govuk-width-container" id="govuk-cookie-banner-message">
+<div class="govuk-cookie-banner" id="govuk-cookie-banner" data-nosnippet role="region" aria-label="<%= t('presenter.analytics.heading', service_name: service.service_name) %>" data-module="cookie-banner">
+  <div class="govuk-cookie-banner__message govuk-width-container" id="govuk-cookie-banner-message" data-cookie-banner-element="message">
 
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-two-thirds">
@@ -14,11 +14,11 @@
       </div>
     </div>
 
-    <div class="govuk-button-group">
-      <button type="button" class="govuk-button" data-module="govuk-button" onclick='analytics.accept("<%= analytics_cookie_name %>")'>
+    <div class="govuk-button-group" >
+      <button id="cookies-accept" type="button" class="govuk-button" data-module="govuk-button" data-cookie-banner-element="accept-button" data-cookie-name="<%= analytics_cookie_name %>">
         <%= t('presenter.analytics.accept') %>
       </button>
-      <button type="button" class="govuk-button" data-module="govuk-button" onclick='analytics.reject("<%= analytics_cookie_name %>")'>
+      <button id="cookies-reject" type="button" class="govuk-button" data-module="govuk-button" data-cookie-banner-element="reject-button" data-cookie-name="<%= analytics_cookie_name %>">
         <%= t('presenter.analytics.reject') %>
       </button>
       <a class="govuk-link" href="/cookies"><%= t('presenter.analytics.view_cookies') %></a>

data/app/views/metadata_presenter/analytics/_hide_cookie_banner.html.erb

@@ -0,0 +1,6 @@
+<div class="govuk-button-group">
+  <button id="hide-cookie-banner" class="govuk-button" data-module="govuk-button" data-cookie-banner-element="hide-button">
+    <%= t('presenter.analytics.hide') %>
+  </button>
+</div>
+

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '3.0.7'.freeze
+  VERSION = '3.0.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-26 00:00:00.000000000 Z
+date: 2023-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -387,6 +387,7 @@ files:
 - app/views/metadata_presenter/analytics/_global_analytics.html.erb
 - app/views/metadata_presenter/analytics/_google.html.erb
 - app/views/metadata_presenter/analytics/_gtm.html.erb
+- app/views/metadata_presenter/analytics/_hide_cookie_banner.html.erb
 - app/views/metadata_presenter/analytics/_ua.html.erb
 - app/views/metadata_presenter/analytics/analytics.html.erb
 - app/views/metadata_presenter/attribute/_body.html.erb