Merge branch 'main' of https://github.com/City-of-Helsinki/drupal-hdbt …

…into UHF-X_linters_and_updates

hdbt.libraries.yml

@@ -164,15 +164,6 @@ environment-indicator:
         minified: true
       }
 
-disable_genesys_button:
-  version: 1.x
-  js:
-    src/js/disable-genesys-button.js: {}
-  dependencies:
-  - core/jquery
-  - core/drupal
-  - core/drupalSettings
-
 nav-toggle:
   version: 1.x
   js:

hdbt.theme

@@ -102,9 +102,6 @@ function hdbt_preprocess_html(&$variables): void {
     $variables['#attached']['library'][] = 'hdbt/matomo';
   }
 
-  // Disable Genesys button if the chat element does not exist.
-  $variables['#attached']['library'][] = 'hdbt/disable_genesys_button';
-
   // Toggle between global and local navigation libraries for CSS and JS.
   $navigation_enabled = \Drupal::moduleHandler()->moduleExists('helfi_navigation');
   $variables['#attached']['library'][] = $navigation_enabled ? 'hdbt/nav-global' : 'hdbt/nav-local';

src/js/matomo.js

@@ -1,13 +1,15 @@
 // eslint-disable-next-line func-names
 (function ($, Drupal) {
   function loadMatomoAnalytics() {
+
     /**
-     * If the queryparameter is found, the script will be loaded
-     * regardless of cookie consents etc.
+     * Temporary hard-coded value for using Matomo js client.
+     * This will be reworked into a general feature, for now use this for testing.
+     *
+     * @todo implement a general feature
      */
-    const useJSAPI = window.location.search === '?9mt5bfb2bGk=';
-    if (useJSAPI) {
-      console.info('Using JavaScript Tracking');
+    const instanceName = drupalSettings.helfi_instance_name;
+    if (instanceName === 'asuminen' && Drupal.cookieConsent.getConsentStatus(['statistics'])) {
       const getViewportWidth = () => window.innerWidth;
       const getViewportHeight = () => window.innerHeight;
       const getLanguage = () => document.querySelector('html')?.attributes?.lang?.value || 'unkown';
@@ -33,14 +35,14 @@
         const u='//webanalytics.digiaiiris.com/js/';
         _paq.push(['setTrackerUrl', `${u}tracker.php`]);
         _paq.push(['setSiteId', '141']);
+        _paq.push(['addTracker', `${u}tracker.php`, '1098']);
         const d=document; const g=d.createElement('script'); const s=d.getElementsByTagName('script')[0];
         // Consider integrity hash check
         g.async=true; g.src=`${u}piwik.min.js`; s.parentNode.insertBefore(g,s);
       })();
     }
-
-    // Load Matomo only if statistics cookies are allowed.
-    if (!useJSAPI && Drupal.cookieConsent.getConsentStatus(['statistics'])) {
+    // Use Matomo tag manager if statistics cookies are allowed.
+    else if (Drupal.cookieConsent.getConsentStatus(['statistics'])) {
       // Matomo Tag Manager
       // eslint-disable-next-line no-multi-assign
       const _mtm = (window._mtm = window._mtm || []);

src/js/nav-toggle/toggle-widgets.js

@@ -5,7 +5,6 @@
 
 const HIDE_SELECTORS = [
   '.si-toggle-container', // Siteimprove accessibility tool
-  '.cx-theme-helsinki-blue', // Genesys chat in sote
   '.aca--button--desktop, .aca--button--mobile, .aca--widget--mobile, .aca--widget--desktop, #aca--widget-button-close', // Watson chatbot in asuminen
   '#telia-ace-leijuke', // Telia ACE chat leijuke
   '.humany-trigger, .humany-widget', // Telia ACE chat button and widget