UFAL/Load the matomo configuration from the environment (#755)

* Added volume into docker-compose

* Take a matomo configuration from the environment

config/config.example.yml

@@ -393,3 +393,7 @@ vocabularies:
 comcolSelectionSort:
   sortField: 'dc.title'
   sortDirection: 'ASC'
+
+matomo:
+  hostUrl: http://localhost:8135/
+  siteId: 1

src/config/app-config.interface.ts

@@ -22,6 +22,7 @@ import { HomeConfig } from './homepage-config.interface';
 import { MarkdownConfig } from './markdown-config.interface';
 import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
+import { MatomoConfig } from './matomo-config';
 
 interface AppConfig extends Config {
   ui: UIServerConfig;
@@ -49,6 +50,7 @@ interface AppConfig extends Config {
   vocabularies: FilterVocabularyConfig[];
   comcolSelectionSort: DiscoverySortConfig;
   signpostingEnabled: boolean;
+  matomo: MatomoConfig;
 }
 
 /**

src/config/default-app-config.ts

@@ -22,6 +22,7 @@ import { HomeConfig } from './homepage-config.interface';
 import { MarkdownConfig } from './markdown-config.interface';
 import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
+import { MatomoConfig } from './matomo-config';
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -428,4 +429,10 @@ export class DefaultAppConfig implements AppConfig {
 
   // NOTE: you must disable/enable in the backend the signposting feature to make it work `signposting.enabled`
   signpostingEnabled = false;
+
+  // Matomo configuration
+  matomo: MatomoConfig = {
+    hostUrl: 'http://localhost:8135/',
+    siteId: '1'
+  };
 }

src/config/matomo-config.ts

@@ -0,0 +1,11 @@
+import { Config } from './config.interface';
+
+/**
+ * Configuration for Matomo statistics.
+ */
+export class MatomoConfig implements Config {
+
+  public hostUrl: string;
+
+  public siteId: string;
+}

src/environments/environment.production.ts

@@ -9,5 +9,10 @@ export const environment: Partial<BuildConfig> = {
     async: true,
     time: false,
     inlineCriticalCss: false,
+  },
+
+  matomo: {
+    hostUrl: 'http://localhost:8135/',
+    siteId: '1',
   }
 };

src/environments/environment.test.ts

@@ -315,5 +315,10 @@ export const environment: BuildConfig = {
     }
   ],
 
-  signpostingEnabled: true
+  signpostingEnabled: true,
+
+  matomo: {
+    hostUrl: 'http://localhost:8135/',
+    siteId: '1',
+  }
 };

src/environments/environment.ts

@@ -25,7 +25,12 @@ export const environment: Partial<BuildConfig> = {
     nameSpace: '/server',
   },
 
-  signpostingEnabled: false
+  signpostingEnabled: false,
+
+  matomo: {
+    hostUrl: 'http://localhost:8135/',
+    siteId: '1',
+  }
 };
 
 /*

src/main.browser.ts

@@ -10,7 +10,6 @@ import { environment } from './environments/environment';
 import { AppConfig } from './config/app-config.interface';
 import { extendEnvironmentWithAppConfig } from './config/config.util';
 import { enableProdMode } from '@angular/core';
-import { matomoSettings } from './matomo/matomo-settings';
 
 const bootstrap = () => platformBrowserDynamic()
   .bootstrapModule(BrowserAppModule, {});
@@ -27,8 +26,8 @@ const main = () => {
   if (environment.production) {
     enableProdMode();
   }
-  addMatomoStatistics();
 
+  addMatomoStatistics();
   if (hasTransferState) {
     // Configuration will be taken from transfer state during initialization
     return bootstrap();
@@ -48,15 +47,15 @@ function addMatomoStatistics() {
   (window as any)._paq = (window as any)._paq || [];
 
   // Push all configuration commands first
-  (window as any)._paq.push(['setTrackerUrl', matomoSettings.hostUrl + 'matomo.php']);
-  (window as any)._paq.push(['setSiteId', matomoSettings.siteId]);
+  (window as any)._paq.push(['setTrackerUrl', environment.matomo.hostUrl + 'matomo.php']);
+  (window as any)._paq.push(['setSiteId', environment.matomo.siteId]);
   (window as any)._paq.push(['enableLinkTracking']);
 
   const g = document.createElement('script');
   g.type = 'text/javascript';
   g.async = true;
   g.defer = true;
-  g.src = matomoSettings.hostUrl + 'matomo.js';
+  g.src = environment.matomo.hostUrl + 'matomo.js';
   document.getElementsByTagName('head')[0].appendChild(g);
 }