prevent regression in runtime enablement

Author: Paurikova2

src/main.browser.ts

@@ -27,9 +27,9 @@ const main = () => {
     enableProdMode();
   }
 
-  addMatomoStatistics();
   if (hasTransferState) {
     // Configuration will be taken from transfer state during initialization
+    addMatomoStatistics();
     return bootstrap();
   } else {
     // Configuration must be fetched explicitly
@@ -38,18 +38,21 @@ const main = () => {
       .then((appConfig: AppConfig) => {
         // extend environment with app config for browser when not prerendered
         extendEnvironmentWithAppConfig(environment, appConfig);
+        addMatomoStatistics();
         return bootstrap();
       });
   }
 };
 
 function addMatomoStatistics() {
   // Debug: Log the matomo configuration
-  console.log('Matomo config check:', {
-    hasMatomo: !!environment.matomo,
-    enabled: environment.matomo?.enabled,
-    full: environment.matomo
-  });
+  if (!environment.production) {
+    console.log('Matomo config check:', {
+      hasMatomo: !!environment.matomo,
+      enabled: environment.matomo?.enabled,
+      full: environment.matomo
+    });
+  }
 
   // Check if Matomo is enabled in the environment configuration
   if (!environment.matomo || !environment.matomo.enabled) {

src/modules/app/browser-init.service.ts

@@ -113,18 +113,19 @@ export class BrowserInitService extends InitService {
         // ideally we'd add the custom dimension to the 'trackPageView' action only, but don't have that information
         // in pageTrack context. So we add it to page_view events, and remove it after the page view.
         // page_view events are fired via view-track.component, and exposes dc.identifier.uri via properties
+        const dimensionId = this.appConfig.matomo.dimensionId;
         this.angulartics2Matomo.eventTrack = function (action: string, properties?: any) {
           if (action === 'page_view') {
             if (properties.dc_identifier) {
-              (window as any)._paq.push(['setCustomDimension', this.appConfig.matomo.dimensionId, properties.dc_identifier]);
+              (window as any)._paq.push(['setCustomDimension', dimensionId, properties.dc_identifier]);
             }
           }
-        }.bind(this);
+        };
         let pageTrack = this.angulartics2Matomo.pageTrack;
         this.angulartics2Matomo.pageTrack = function (path: string) {
           pageTrack.call(this, path);
-          (window as any)._paq.push(['deleteCustomDimension', this.appConfig.matomo.dimensionId]);
-        }.bind(this);
+          (window as any)._paq.push(['deleteCustomDimension', dimensionId]);
+        };
         this.angulartics2Matomo.startTracking();
       }