@ons/design-system 72.4.0 → 72.6.0

package/js/cookies-functions.js

@@ -75,7 +75,6 @@ export function getConsentCookie() {
 
 export function setConsentCookie(options) {
     const domain = getDomain(document.domain);
-
     let cookieConsent = getConsentCookie();
     if (!cookieConsent) {
         cookieConsent = JSON.parse(JSON.stringify(DEFAULT_COOKIE_CONSENT).replace(/'/g, '"'));
@@ -168,15 +167,21 @@ export function getCookie(name) {
     return null;
 }
 
-export function getDomain(domain) {
+export function getDomain(domain, cookieHandler = document) {
+    if (domain.startsWith('www.')) {
+        domain = domain.substring(4);
+    }
     let i = 0,
         domainName = domain,
         p = domainName.split('.'),
         s = '_gd' + new Date().getTime();
-    while (i < p.length - 1 && document.cookie.indexOf(s + '=' + s) == -1) {
-        domainName = p.slice(-1 - ++i).join('.');
-        document.cookie = s + '=' + s + ';domain=' + domainName + ';';
+    while (i < p.length - 1 && cookieHandler.cookie.indexOf(s + '=' + s) == -1) {
+        // Loop until we find a valid cookie set at the domain or until we've checked all possible domains
+        domainName = p.slice(i, p.length).join('.');
+        cookieHandler.cookie = s + '=' + s + ';domain=' + domainName + ';';
+
+        i++;
     }
-    document.cookie = s + '=;expires=Thu, 01 Jan 1970 00:00:01 GMT;domain=' + domainName + ';';
+    cookieHandler.cookie = s + '=;expires=Thu, 01 Jan 1970 00:00:01 GMT;domain=' + domainName + ';';
     return domainName;
 }

package/js/cookies-functions.spec.js

@@ -0,0 +1,44 @@
+/** @jest-environment jsdom */
+
+import { getDomain } from './cookies-functions';
+let mockCookieStore = {};
+
+// Mocking document.cookie which is used for setting domain name in `getDomain()`
+export const setMockcookie = {
+    get cookie() {
+        return Object.entries(mockCookieStore)
+            .map(([key, value]) => `${key}=${value}`)
+            .join('; ');
+    },
+    set cookie(value) {
+        const domainMatch = value.match(/domain=([^;]+)/i);
+        const domain = domainMatch?.[1]?.trim();
+
+        // Simulate failure to set cookie on this domain
+        if (domain === 'new-website.ons.gov.uk') return;
+
+        const [key, val] = value.split('=');
+        mockCookieStore[key] = val.split(';')[0];
+    },
+};
+
+describe('script: getDomain()', () => {
+    beforeEach(() => {
+        mockCookieStore = {}; // clear the cookie between tests
+    });
+
+    test('should return service-manual.ons.gov.uk as the domain name when cookies can be set at the full subdomain', () => {
+        const result = getDomain('service-manual.ons.gov.uk', setMockcookie);
+        expect(result).toBe('service-manual.ons.gov.uk');
+    });
+
+    test('should remove `www` from the domain name www.ons.gov.uk', () => {
+        const result = getDomain('www.ons.gov.uk', setMockcookie);
+        expect(result).toBe('ons.gov.uk');
+    });
+
+    test('returns `ons.gov.uk` as the domain name when cookies can not be set at subdomain `new-website.ons.gov.uk`', () => {
+        const result = getDomain('new-website.ons.gov.uk', setMockcookie);
+        expect(result).toBe('ons.gov.uk');
+    });
+});

package/js/main.js

@@ -30,3 +30,5 @@ import '../components/modal/modal.dom';
 import '../components/timeout-modal/timeout-modal.dom';
 import '../components/timeout-panel/timeout-panel.dom';
 import '../components/video/video.dom';
+import '../components/chart/chart';
+import '../components/chart/chart.dom';

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@ons/design-system",
     "description": "ONS Design System built CSS, JS, and Nunjucks templates",
-    "version": "72.4.0",
+    "version": "72.6.0",
     "main": "index.js",
     "license": "MIT",
     "author": {
@@ -132,5 +132,8 @@
     },
     "publishConfig": {
         "access": "public"
+    },
+    "dependencies": {
+        "highcharts": "^12.1.2"
     }
 }