Merge branch 'release' into 'master'

Release 69.13

See merge request buckinghamshire-council/bc!678

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+Compare: <https://git.torchbox.com/buckinghamshire-council/bc/compare/69.13...HEAD>
+
+## 69.13 (2024-01-08)
+
+Compare: <https://git.torchbox.com/buckinghamshire-council/bc/compare/69.12...69.13>
+
+- Update cookie message to hide from devices which have previously declined cookies.
+
 ## 69.12 (2023-11-27)
 
 Compare: <https://git.torchbox.com/buckinghamshire-council/bc/compare/69.11...69.12>

bc/static_src/javascript/components/cookie-message.js

@@ -30,8 +30,12 @@ class CookieWarning {
             return;
         }
 
+        // If cookie has been declined, do not show the cookie message
+        if (Cookies.get(this.cookieName) === this.declineValue) {
+            this.messageContainer.classList.add(this.inactiveClass);
+        }
         // If consent is required and not given, show the cookie message
-        if (!this.hasConsent()) {
+        else if (!this.hasConsent()) {
             this.messageContainer.classList.add(this.activeClass);
         }
     }

bc/static_src/javascript/components/cookie-message.test.js

@@ -64,4 +64,13 @@ describe('CookieWarning', () => {
         );
         expect(Cookies.get('client-cookie')).toBe('decline cookies');
     });
+
+    it('does not activate if cookie is rejected', () => {
+        Cookies.set('client-cookie', 'decline cookies');
+
+        new CookieWarning(document.querySelector(CookieWarning.selector()));
+        expect(document.querySelector('[data-cookie-message]').className).toBe(
+            'cookie inactive',
+        );
+    });
 });