Properly implement allowed_pages in Hyva scripts

yireo · Sep 27, 2023 · b444534 · b444534
1 parent 3011c5d
commit b444534
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Fixed
+- Properly implement `allowed_pages` in Hyva scripts
 - Make sure `minicart_collapse` is only there if cart event is allowed everywhere
 - `Fatal error: Uncaught Error: Call to a member function getCarrierCode` (#192 @WGenie @bvmax)
 

diff --git a/view/frontend/templates/hyva/script-additions.phtml b/view/frontend/templates/hyva/script-additions.phtml
@@ -43,14 +43,10 @@ $commons = $block->getCommonsViewModel();
 
             const gtmEvents = event.detail.data[sectionName].gtm_events;
             for (const [eventId, eventData] of Object.entries(gtmEvents)) {
-                const metaData = eventData.meta;
-                const copyEventData = Object.assign({}, eventData);
-
-                if (metaData) {
-                    delete copyEventData.meta;
-                }
+                yireoGoogleTagManager2Logger('found event in section "' + sectionName + '"', eventData);
 
-                yireoGoogleTagManager2Pusher(copyEventData, 'push (customerData "' + sectionName + '"  event "' + eventId + '")');
+                const metaData = eventData.meta;
+                yireoGoogleTagManager2Pusher(eventData, 'push (customerData "' + sectionName + '"  event "' + eventId + '")');
 
                 if (!metaData || metaData.cacheable !== true) {
                     yireoGoogleTagManager2Logger('removing event "' + eventId + '" from section "' + sectionName + '"')

diff --git a/view/frontend/templates/hyva/script-pusher.phtml b/view/frontend/templates/hyva/script-pusher.phtml
@@ -13,7 +13,9 @@
         window.YIREO_GOOGLETAGMANAGER2_PAST_EVENTS = window.YIREO_GOOGLETAGMANAGER2_PAST_EVENTS || [];
 
         const copyEventData = Object.assign({}, eventData);
+        let metaData = {};
         if (copyEventData.meta) {
+            metaData = copyEventData.meta;
             delete copyEventData.meta;
         }
 
@@ -23,6 +25,12 @@
             return;
         }
 
+        if (metaData && metaData.allowed_pages && metaData.allowed_pages.length > 0
+            && false === metaData.allowed_pages.includes(window.location.pathname)) {
+            yireoGoogleTagManager2Logger('Warning: Skipping event, not in allowed pages', window.location.pathname, eventData);
+            return;
+        }
+
         if (!message) {
             message = 'push (unknown) [unknown]';
         }