Merge pull request #600 from City-of-Helsinki/UHF-8678

UHF-8678 Use Drupal.cookieConsent functions

public/themes/custom/hdbt_subtheme/hdbt_subtheme.libraries.yml

@@ -10,7 +10,6 @@ siteimprove-analytics:
     dist/js/siteimprove_analytics.min.js: {}
   dependencies:
   - core/drupal
-  - eu_cookie_compliance/eu_cookie_compliance
 
 # Turn datetime into text, f.ex "today"
 datetime_comparison:

public/themes/custom/hdbt_subtheme/src/js/siteimprove_analytics.js

@@ -1,12 +1,9 @@
 // eslint-disable-next-line func-names
 (function (Drupal) {
-  function loadSiteimproveAnalytics() {
-    if (typeof Drupal.eu_cookie_compliance === 'undefined') {
-      return;
-    }
+  const loadSiteimproveAnalytics = () => {
 
     // Load Siteimprove analytics only if statistics cookies are allowed.
-    if (Drupal.eu_cookie_compliance.hasAgreed('statistics')) {
+    if (Drupal.cookieConsent.getConsentStatus(['statistics'])) {
       // eslint-disable-next-line no-multi-assign
       const d = document;
       const b = d.body;
@@ -16,11 +13,12 @@
       g.src = '//siteimproveanalytics.com/js/siteanalyze_6047173.js';
       b.appendChild(g);
     }
-  }
+  };
 
-  // Load when cookie settings are changed.
-  document.addEventListener('eu_cookie_compliance.changeStatus', loadSiteimproveAnalytics, false);
-
-  // Load on page load.
-  document.addEventListener('DOMContentLoaded', loadSiteimproveAnalytics, false);
+  // Initialize Siteimprove analytics.
+  if (Drupal.cookieConsent.initialized()) {
+    loadSiteimproveAnalytics();
+  } else {
+    Drupal.cookieConsent.loadFunction(loadSiteimproveAnalytics);
+  }
 })(Drupal);