govuk_publishing_components 17.0.0 → 17.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed1bcff194d6bc6a10597abb3bbe2124905ccc3ce57325fb6821428a5bab6146
-  data.tar.gz: 12ebe47472df27104c8b895c8b6508438aa1beefebe93ace51973406090a92ed
+  metadata.gz: fdff9dda5418e5d8d7f623c9fc4b3b94a295a82596b321152c6864c947bab8a4
+  data.tar.gz: 1c8f0eb15da82343cebf689fd158b5a1279772353778798d5dc888958f1db7d3
 SHA512:
-  metadata.gz: eddef82c2d0e79b00a3f67b51f4ad965b0c8a706fe9ea2494f528f5ca67e7ef36bb674f2c5ff07d9dff70f14438771eba2efe5a47e69eef4384bd15c37fb752e
-  data.tar.gz: c8df18bbdaad629df80e26201428186515fd1f9b93d8b28c47bc9ea7adb1d68b9e2a1b1ff4bb89a422a3d9d6dafb12340a94631f0989b9ea36c963c8888f0c87
+  metadata.gz: 7e8000957b8665357cb95acab25a73187e89b6d1afe747be4964ad975806858eed0543dcbdf14618aa49c2eecad8ed8f4e02f2c56c675e59c733fe204d48d4dd
+  data.tar.gz: 317bd5e756d44f0819566ace557a744835cd95f654d11770f4e339ad22cef530fbe6e173eeed34d1b3b6c1bb3bfea22fcdf42291dfe31fff192ed1cd2040d0ba

data/app/assets/javascripts/govuk_publishing_components/components/cookie-banner.js

@@ -42,6 +42,14 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       this.$acceptCookiesLink.addEventListener('click', this.$module.setCookieConsent)
     }
 
+    // Force the new cookie banner to show if we don't think the user has seen it before
+    // This involves resetting the seen_cookie_message cookie, which may be set to true if they've seen the old cookie banner
+    if (!window.GOVUK.cookie('cookie_policy')) {
+      if (window.GOVUK.cookie('seen_cookie_message') === 'true') {
+        window.GOVUK.cookie('seen_cookie_message', false)
+      }
+    }
+
     this.showNewCookieMessage()
   }
 
@@ -59,16 +67,16 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     // Hide the cookie banner on the cookie settings page, to avoid circular journeys
     if (newCookieBanner && window.location.pathname === '/help/cookies') {
       this.$module.style.display = 'none'
-    }
-
-    var shouldHaveCookieMessage = (this.$module && window.GOVUK.cookie('seen_cookie_message') !== 'true')
+    } else {
+      var shouldHaveCookieMessage = (this.$module && window.GOVUK.cookie('seen_cookie_message') !== 'true')
 
-    if (shouldHaveCookieMessage) {
-      this.$module.style.display = 'block'
+      if (shouldHaveCookieMessage) {
+        this.$module.style.display = 'block'
 
-      // Set the default consent cookie if it isn't already present
-      if (!window.GOVUK.cookie('cookie_policy')) {
-        window.GOVUK.setDefaultConsentCookie()
+        // Set the default consent cookie if it isn't already present
+        if (!window.GOVUK.cookie('cookie_policy')) {
+          window.GOVUK.setDefaultConsentCookie()
+        }
       }
     }
   }

data/app/assets/javascripts/govuk_publishing_components/lib/cookie-functions.js

@@ -74,17 +74,6 @@
     window.GOVUK.setCookie('cookie_policy', JSON.stringify(approvedConsent))
   }
 
-  window.GOVUK.denyAllCookieTypes = function () {
-    var deniedConsent = {
-      'essential': false,
-      'settings': false,
-      'usage': false,
-      'campaigns': false
-    }
-
-    window.GOVUK.setCookie('cookie_policy', JSON.stringify(deniedConsent))
-  }
-
   window.GOVUK.getConsentCookie = function () {
     var consentCookie = window.GOVUK.cookie('cookie_policy')
     var consentCookieObj
@@ -115,6 +104,19 @@
 
     for (var cookieType in options) {
       cookieConsent[cookieType] = options[cookieType]
+
+      // Delete cookies of that type if consent being set to false
+      if (!options[cookieType]) {
+        for (var cookie in COOKIE_CATEGORIES) {
+          if (COOKIE_CATEGORIES[cookie] === cookieType) {
+            window.GOVUK.cookie(cookie, null)
+
+            if (window.GOVUK.cookie(cookie)) {
+              document.cookie = cookie + '=;expires=' + new Date() + ';domain=.' + window.location.hostname + ';path=/'
+            }
+          }
+        }
+      }
     }
 
     window.GOVUK.setCookie('cookie_policy', JSON.stringify(cookieConsent))
@@ -140,6 +142,8 @@
   }
 
   window.GOVUK.checkConsentCookie = function (cookieName, cookieValue) {
+    var currentConsentCookie = window.GOVUK.getConsentCookie()
+
     // If we're setting the consent cookie OR deleting a cookie, allow by default
     if (cookieName === 'cookie_policy' || (cookieValue === null || cookieValue === false)) {
       return true
@@ -150,6 +154,11 @@
       return window.GOVUK.checkConsentCookieCategory('essential')
     }
 
+    // If the consent cookie doesn't exist, set the default consent cookie
+    if (!currentConsentCookie && COOKIE_CATEGORIES[cookieName]) {
+      return true
+    }
+
     if (COOKIE_CATEGORIES[cookieName]) {
       var cookieCategory = COOKIE_CATEGORIES[cookieName]
 

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

@@ -47,12 +47,9 @@
   <% if new_cookie_banner %>
     <div class="gem-c-cookie-banner__confirmation govuk-width-container">
       <p class="gem-c-cookie-banner__confirmation-message">
-        You&#8217;ve accepted all cookies. You can
-        <a class="govuk-link" href="/help/cookies" data-module="track-click" data-track-category="cookieBanner" data-track-action="Cookie banner settings clicked from confirmation">
-          change your cookie settings
-        </a> at any time.
+        You&#8217;ve accepted all cookies. You can <a class="govuk-link" href="/help/cookies" data-module="track-click" data-track-category="cookieBanner" data-track-action="Cookie banner settings clicked from confirmation">change your cookie settings</a> at any time.
       </p>
-      <button class="gem-c-cookie-banner__hide-button" data-hide-cookie-banner="true">Hide</button>
+      <button class="gem-c-cookie-banner__hide-button" data-hide-cookie-banner="true" data-module="track-click" data-track-category="cookieBanner" data-track-action="Hide cookie banner">Hide</button>
     </div>
   <% end %>
 </div>

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '17.0.0'.freeze
+  VERSION = '17.1.0'.freeze
 end

data/node_modules/accessible-autocomplete/package.json

@@ -49,7 +49,7 @@
     "/"
   ],
   "_resolved": "git://github.com/alphagov/accessible-autocomplete.git#3523dd9fffc70cbd9f6f555f75863c33a709f49e",
-  "_shasum": "c879cd6aa8ca0a320815c4e756ff62f40fb22e92",
+  "_shasum": "bf4c71ceba91fbe87d23ae3cd32a3085e265b83f",
   "_shrinkwrap": null,
   "_spec": "accessible-autocomplete@git://github.com/alphagov/accessible-autocomplete.git#add-multiselect-support",
   "_where": "/var/lib/jenkins/workspace/ublishing_components_master-N4FWJIUY4CIFHKGZOAAEVVXODRY3YBORQOPIBBXWX72VUPSGJRRQ",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 17.0.0
+  version: 17.1.0
 platform: ruby
 authors:
 - GOV.UK Dev