Merge pull request #64 from webmatch/feature/WBMSWPLUG-98

increase performance in admin, fix cross selling by harden js-condition

Author: wbm-sbasler

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.1.4
+* increase performance in admin
+* fix cross selling clicks by harden js-condition
+
 # 2.1.3
 * add new store-api routes to import and export
 

composer.json

@@ -2,7 +2,7 @@
     "name": "webmatch/tag-manager-sw6",
     "keywords": ["shopware6", "shopware-6", "GTM", "datalayer", "datalayer-configuration", "google-tag-manager", "shopware-plugin"],
     "description": "Google Tag Manager + Enhanced E-Commerce Tracking",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "type": "shopware-platform-plugin",
     "license": "proprietary",
     "require": {

src/Resources/app/storefront/dist/storefront/js/wbm-tag-manager-ecomm.js

@@ -98,8 +98,10 @@ export default class ProductClickTracking extends Plugin {
         }
         // enabled quickview feature of SwagCmsExtension?
         const quickviewSelector = '[data-swag-cms-extensions-quickview="true"]';
-        if (this.el.closest('.cms-section').querySelector(quickviewSelector) !== null
+        if ((this.el.closest('.cms-section') !== null
+            && this.el.closest('.cms-section').querySelector(quickviewSelector) !== null)
             || (document.body.classList.contains('is-ctl-search')
+                && this.el.closest('.container-main') !== null
                 && this.el.closest('.container-main').querySelector(quickviewSelector) !== null)
         ) {
             redirect = false;

src/Resources/app/storefront/src/plugin/productClickTracking.plugin.js

@@ -6,15 +6,15 @@ interface DataLayerModulesInterface
 {
     public function getModules(): array;
 
-    public function getContainerId(): ?string;
+    public function getContainerId(?string $salesChannelId = null): ?string;
 
-    public function isActive(): ?bool;
+    public function isActive(?string $salesChannelId = null): ?bool;
 
-    public function isTrackingProductClicks(): ?bool;
+    public function isTrackingProductClicks(?string $salesChannelId = null): ?bool;
 
-    public function hasSWConsentSupport(): int;
+    public function hasSWConsentSupport(?string $salesChannelId = null): int;
 
-    public function getScriptTagAttributes(): string;
+    public function getScriptTagAttributes(?string $salesChannelId = null): string;
 
-    public function getExtendedURLParameter(): string;
+    public function getExtendedURLParameter(?string $salesChannelId = null): string;
 }

src/Services/DataLayerModulesInterface.php

@@ -51,17 +51,24 @@ public static function getSubscribedEvents(): array
 
     public function getDataLayerForXmlHttpRequest(ControllerEvent $event): void
     {
+        $modules = $this->modules->getModules();
+        $route = $event->getRequest()->attributes->get('_route');
+
+        if (!array_key_exists($route, $modules)
+            || empty($modules[$route])
+            || $this->session->has(SessionUtility::ATTRIBUTE_NAME)
+        ) {
+            return;
+        }
+
         $salesChannelId = $event->getRequest()->get('sw-sales-channel-id');
         $isActive = !empty($this->modules->getContainerId($salesChannelId)) && $this->modules->isActive($salesChannelId);
 
-        if ($isActive && !$this->session->get(SessionUtility::ATTRIBUTE_NAME)) {
-            $modules = $this->modules->getModules();
-            $route = $event->getRequest()->attributes->get('_route');
-
-            if (array_key_exists($route, $modules) && !empty($modules[$route])) {
-                $this->dataLayerRenderer->setVariables($route, [])->renderDataLayer($route);
-            }
+        if (!$isActive) {
+            return;
         }
+
+        $this->dataLayerRenderer->setVariables($route, [])->renderDataLayer($route);
     }
 
     public function prependDataLayerToResponse(ResponseEvent $event): void
@@ -71,7 +78,7 @@ public function prependDataLayerToResponse(ResponseEvent $event): void
         $storedDatalayer = $this->session->get(SessionUtility::ATTRIBUTE_NAME);
         $this->session->remove(SessionUtility::ATTRIBUTE_NAME);
 
-        $route = $event->getRequest()->attributes->get('_route');
+        $route = $request->attributes->get('_route');
         $dataLayer = $this->dataLayerRenderer->getDataLayer($route);
         if ($dataLayer !== null) {
             $dataLayer = $this->session->injectSessionVars($dataLayer);