hof 22.10.4-update-country-list-beta → 22.11.0-frontend-v4-beta.2

package/frontend/themes/gov-uk/client-js/cookieSettings.js

@@ -1,22 +1,22 @@
-/* eslint-disable max-len, no-var, vars-on-top, no-undef */
+/* eslint-disable max-len, no-undef */
 'use strict';
 
 // TODO: update package.json(s)
 
 function hideFallbackContent(containerId) {
-  var container = document.getElementById(containerId);
+  const container = document.getElementById(containerId);
   if (container === null) return;
-  var fallbackContent = container.getElementsByClassName('js-disabled');
-  for (var i = 0; i < fallbackContent.length; i++) {
+  const fallbackContent = container.getElementsByClassName('js-disabled');
+  for (let i = 0; i < fallbackContent.length; i++) {
     fallbackContent[i].style.display = 'none';
   }
 }
 
 function showInteractiveContent(containerId) {
-  var container = document.getElementById(containerId);
+  const container = document.getElementById(containerId);
   if (container === null) return;
-  var interactiveContent = container.getElementsByClassName('js-enabled');
-  for (var i = 0; i < interactiveContent.length; i++) {
+  const interactiveContent = container.getElementsByClassName('js-enabled');
+  for (let i = 0; i < interactiveContent.length; i++) {
     interactiveContent[i].style.display = 'block';
   }
 }
@@ -34,41 +34,53 @@ function setCookiePreferences(preferences) {
 function showCookieBannerSubmitted() {
   document.getElementById('cookie-banner-info').style.display = 'none';
   document.getElementById('cookie-banner-actions').style.display = 'none';
-  var cookieBannerSubmitted = document.getElementById('cookie-banner-submitted');
+  let cookieBannerSubmitted;
+  const cookieBannerDiv = document.getElementById('cookie-banner-submitted-accepted');
+  if (cookieBannerDiv.dataset.acceptCookies === 'true') {
+    cookieBannerSubmitted = document.getElementById('cookie-banner-submitted-accepted');
+  } else {
+    cookieBannerSubmitted = document.getElementById('cookie-banner-submitted-rejected');
+  }
   cookieBannerSubmitted.style.display = 'block';
   cookieBannerSubmitted.focus();
 }
 
+function hideCookieBanner() {
+  document.getElementById('cookie-banner').style.display = 'none';
+}
+
 function initialiseBannerButtons() {
+  const acceptedCookieBannerDiv = document.getElementById('cookie-banner-submitted-accepted');
   document.getElementById('accept-cookies-button').addEventListener('click', function () {
-    setCookiePreferences({essential: true, usage: true});
+    setCookiePreferences({ essential: true, usage: true });
     showCookieBannerSubmitted();
     sessionStorage.setItem('reloading', 'true');
     window.location = document.URL;
   });
 
   document.getElementById('reject-cookies-button').addEventListener('click', function () {
-    setCookiePreferences({essential: true, usage: false});
+    setCookiePreferences({ essential: true, usage: false });
+    acceptedCookieBannerDiv.dataset.acceptCookies = 'false';
     showCookieBannerSubmitted();
   });
 
-  document.getElementById('hide-cookie-banner').addEventListener('click', function () {
-    document.getElementById('cookie-banner').style.display = 'none';
-  });
+  document.getElementById('hide-accept-cookie-banner').addEventListener('click', hideCookieBanner);
+
+  document.getElementById('hide-reject-cookie-banner').addEventListener('click', hideCookieBanner);
 }
 
 function initialiseCookieBanner() {
-  var preferences = GOVUK.cookie('cookie_preferences');
+  const preferences = GOVUK.cookie('cookie_preferences');
 
   if (preferences !== null) {
     return;
   }
 
   // the default cookie message container from hof-govuk-template
-  var bannerContainer = document.getElementById('global-cookie-message');
+  const bannerContainer = document.getElementById('global-cookie-message');
 
   // the cookie banner that will replace the container's default content if using google analytics
-  var cookieBanner = document.getElementById('cookie-banner');
+  const cookieBanner = document.getElementById('cookie-banner');
 
   if (bannerContainer !== null && cookieBanner !== null) {
     hideFallbackContent('global-cookie-message');
@@ -82,8 +94,8 @@ function handleSaveSettings(e) {
   e.preventDefault();
   setCookiePreferences({ essential: true, usage: document.getElementById('radio-1').checked });
 
-  var cookieNotification = document.getElementById('cookie-notification');
-  var cookieBanner = document.getElementById('cookie-banner');
+  const cookieNotification = document.getElementById('cookie-notification');
+  const cookieBanner = document.getElementById('cookie-banner');
 
   if (cookieBanner !== null) {
     cookieBanner.style.display = 'none';
@@ -96,8 +108,8 @@ function handleSaveSettings(e) {
 }
 
 function initialiseFormControls() {
-  var preferences = JSON.parse(GOVUK.cookie('cookie_preferences'));
-  var usage;
+  const preferences = JSON.parse(GOVUK.cookie('cookie_preferences'));
+  let usage;
 
   if (preferences !== null && preferences.usage !== undefined && typeof preferences.usage === 'boolean') {
     usage = preferences.usage;
@@ -111,7 +123,7 @@ function initialiseFormControls() {
 }
 
 function initialiseCookiePage() {
-  var shouldDisplayCookieControls = document.getElementById('cookie-settings') !== null;
+  const shouldDisplayCookieControls = document.getElementById('cookie-settings') !== null;
 
   if (shouldDisplayCookieControls) {
     hideFallbackContent('cookie-settings');
@@ -122,12 +134,12 @@ function initialiseCookiePage() {
 
 function onLoad() {
   window.onload = function () {
-    var reloading = sessionStorage.getItem('reloading');
+    const reloading = sessionStorage.getItem('reloading');
     if (reloading) {
       sessionStorage.removeItem('reloading');
 
-      var bannerContainer = document.getElementById('global-cookie-message');
-      var cookieBanner = document.getElementById('cookie-banner');
+      const bannerContainer = document.getElementById('global-cookie-message');
+      const cookieBanner = document.getElementById('cookie-banner');
 
       if (bannerContainer !== null && cookieBanner !== null) {
         bannerContainer.style.display = 'block';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "22.10.4-update-country-list-beta",
+  "version": "22.11.0-frontend-v4-beta.2",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",
@@ -60,7 +60,7 @@
     "findup": "^0.1.5",
     "glob": "^7.2.0",
     "govuk-elements-sass": "^3.1.3",
-    "govuk-frontend": "3.15",
+    "govuk-frontend": "4.10.1",
     "govuk_template_mustache": "^0.26.0",
     "helmet": "^3.22.0",
     "hogan-express-strict": "^0.5.4",

package/sandbox/package.json

@@ -15,7 +15,7 @@
   },
   "author": "",
   "dependencies": {
-    "govuk-frontend": "3.14",
+    "govuk-frontend": "4.10.1",
     "jquery": "^3.7.1",
     "sass": "^1.53.0",
     "typeahead-aria": "^1.0.4"