feat(orga): updating matomo config

1024pix · Dec 5, 2024 · 458d2d8 · 458d2d8
1 parent e65a74f
commit 458d2d8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/orga/app/routes/application.js b/orga/app/routes/application.js
@@ -7,8 +7,10 @@ export default class ApplicationRoute extends Route {
   @service currentUser;
   @service session;
   @service intl;
+  @service metrics;
 
   async beforeModel(transition) {
+    this.metrics.initialize();
     await this.session.setup();
     await this.featureToggles.load();
     const isFranceDomain = this.currentDomain.isFranceDomain;

diff --git a/orga/config/environment.js b/orga/config/environment.js
@@ -105,8 +105,6 @@ module.exports = function (environment) {
       warnIfNoIconsIncluded: false,
     },
 
-    matomo: {},
-
     'ember-cli-notifications': {
       autoClear: true,
       clearDuration: 5000,
@@ -120,6 +118,11 @@ module.exports = function (environment) {
     'ember-cli-mirage': {
       usingProxy: true,
     },
+
+    metrics: {
+      enabled: analyticsEnabled,
+      matomoUrl: process.env.WEB_ANALYTICS_URL,
+    },
   };
 
   if (environment === 'development') {
@@ -132,10 +135,6 @@ module.exports = function (environment) {
     // ENV.APP.LOG_TRANSITIONS = true;
     // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
     // ENV.APP.LOG_VIEW_LOOKUPS = true;
-    if (analyticsEnabled) {
-      ENV.matomo.url = process.env.WEB_ANALYTICS_URL;
-      ENV.matomo.debug = true;
-    }
   }
 
   if (environment === 'test') {
@@ -157,16 +156,12 @@ module.exports = function (environment) {
       autoClear: null,
       clearDuration: null,
     };
-
+    ENV.metrics.enabled = false;
     ENV.pagination.debounce = 0;
   }
 
   if (environment === 'production') {
     // here you can enable a production-specific feature
-
-    if (analyticsEnabled) {
-      ENV.matomo.url = process.env.WEB_ANALYTICS_URL;
-    }
   }
 
   return ENV;

diff --git a/orga/package-lock.json b/orga/package-lock.json
diff --git a/orga/package.json b/orga/package.json
@@ -52,6 +52,7 @@
   },
   "devDependencies": {
     "@1024pix/ember-cli-notifications": "^8.0.2",
+    "@1024pix/ember-matomo-tag-manager": "^2.4.3",
     "@1024pix/ember-testing-library": "^3.0.6",
     "@1024pix/eslint-config": "^1.3.8",
     "@1024pix/pix-ui": "^48.7.1",
@@ -80,7 +81,6 @@
     "ember-cli-dependency-checker": "^3.3.2",
     "ember-cli-htmlbars": "^6.3.0",
     "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-cli-matomo-tag-manager": "^1.3.1",
     "ember-cli-mirage": "^3.0.4",
     "ember-cli-sass": "^11.0.1",
     "ember-click-outside": "^6.1.1",