DON-950: WIP replacing matomo library

src/app/app.component.spec.ts

@@ -10,12 +10,13 @@ import { MatSelectModule } from '@angular/material/select';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { RecaptchaModule } from 'ng-recaptcha';
-import { MatomoModule } from 'ngx-matomo';
+import {NgxMatomoModule, provideMatomo, withRouter} from 'ngx-matomo-client';
 import { InMemoryStorageService } from 'ngx-webstorage-service';
 
 import { AppComponent } from './app.component';
 import { TBG_DONATE_STORAGE } from './donation.service';
 import { TBG_DONATE_ID_STORAGE } from './identity.service'
+import {environment} from "../environments/environment";
 
 describe('AppComponent', () => {
   beforeEach(waitForAsync(() => {
@@ -28,12 +29,9 @@ describe('AppComponent', () => {
         MatIconModule,
         MatInputModule,
         MatListModule,
-        MatomoModule.forRoot({
+        NgxMatomoModule.forRoot({
           scriptUrl: `https://example.com/matomo.js`,
-          trackers: [],
-          routeTracking: {
-            enable: true,
-          }
+          trackers: [{siteId: '', trackerUrl: ''}],
         }),
         MatSelectModule,
         NoopAnimationsModule,
@@ -47,6 +45,7 @@ describe('AppComponent', () => {
         // Inject in-memory storage for tests, in place of local storage.
         { provide: TBG_DONATE_STORAGE, useExisting: InMemoryStorageService },
         { provide: TBG_DONATE_ID_STORAGE, useExisting: InMemoryStorageService },
+        provideMatomo({ trackerUrl: '', siteId: ''}, withRouter()),
       ],
     }).compileComponents();
   }));

src/app/app.module.ts

@@ -9,7 +9,7 @@ import { RouterModule, RouterOutlet } from '@angular/router';
 import { ComponentsModule } from '@biggive/components-angular';
 import { TransferHttpCacheModule } from '@nguniversal/common';
 import {RECAPTCHA_BASE_URL, RECAPTCHA_NONCE} from 'ng-recaptcha';
-import { MatomoModule } from 'ngx-matomo';
+import { NgxMatomoModule } from 'ngx-matomo-client';
 import { LOCAL_STORAGE } from 'ngx-webstorage-service';
 
 import { AppComponent } from './app.component';
@@ -42,14 +42,9 @@ const matomoTrackers = environment.matomoSiteId ? [
     BrowserModule,
     ComponentsModule,
     HttpClientModule,
-    // Matomo module always imported, but with 0 trackers set if site ID omitted for the env.
-    MatomoModule.forRoot({
+    NgxMatomoModule.forRoot({
       scriptUrl: `${matomoBaseUri}/matomo.js`,
       trackers: matomoTrackers,
-      routeTracking: {
-        enable: true,
-      },
-      requireCookieConsent: true,
     }),
     RouterModule.forRoot(routes, {
       bindToComponentInputs: true,
@@ -81,7 +76,7 @@ const matomoTrackers = environment.matomoSiteId ? [
       provide: RECAPTCHA_BASE_URL,
       useValue: 'https://recaptcha.net/recaptcha/api.js'  // using this URL instead of default google.com means we avoid google.com cookies.
     },
-    provideMatomo({ trackerUrl: `${matomoBaseUri}/matomo.php`, siteId: environment.matomoSiteId}, withRouter())
+    provideMatomo({ trackerUrl: `${matomoBaseUri}/matomo.php`, siteId: environment.matomoSiteId}, withRouter()),
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
   bootstrap: [AppComponent],

src/app/donation-start/donation-start-container/donation-start-container.component.spec.ts

@@ -3,7 +3,7 @@ import {Component} from "@angular/core";
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import { MatDialogModule } from '@angular/material/dialog';
 import {ActivatedRoute} from "@angular/router";
-import { MatomoModule } from 'ngx-matomo';
+import { NgxMatomoModule } from 'ngx-matomo-client';
 import {InMemoryStorageService} from "ngx-webstorage-service";
 import {of} from "rxjs";
 
@@ -38,12 +38,9 @@ describe('DonationStartContainer', () => {
       imports: [
         HttpClientTestingModule,
         MatDialogModule,
-        MatomoModule.forRoot({
+        NgxMatomoModule.forRoot({
           scriptUrl: `https://example.com/matomo.js`,
-          trackers: [],
-          routeTracking: {
-            enable: true,
-          }
+          trackers: [{siteId: '', trackerUrl: ''}],
         }),
       ],
       providers: [

src/app/donation-start/donation-start-form/donation-start-form.component.spec.ts

@@ -15,7 +15,7 @@ import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {ActivatedRoute, Router} from '@angular/router';
 import {RouterTestingModule} from '@angular/router/testing';
 import {RecaptchaModule} from 'ng-recaptcha';
-import {MatomoModule, MatomoTracker} from 'ngx-matomo';
+import {MatomoTracker} from 'ngx-matomo-client';
 import {InMemoryStorageService} from 'ngx-webstorage-service';
 import {of} from 'rxjs';
 
@@ -32,6 +32,7 @@ import {PostcodeService} from "../../postcode.service";
 import {StripeService} from "../../stripe.service";
 import {Donation} from "../../donation.model";
 import {MatSnackBar} from '@angular/material/snack-bar';
+import {NgxMatomoModule} from "ngx-matomo-client";
 
 function makeDonationStartFormComponent(donationService: DonationService,) {
   const mockIdentityService = TestBed.inject(IdentityService);
@@ -108,6 +109,10 @@ describe('DonationStartNewPrimaryComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
+        NgxMatomoModule.forRoot({
+          scriptUrl: `https://example.com/matomo.js`,
+          trackers: [{siteId: '', trackerUrl: ''}],
+        }),
       ],
       providers: [
         TimeLeftPipe,
@@ -206,13 +211,9 @@ describe('DonationStartNewPrimaryComponent', () => {
         MatDialogModule,
         MatIconModule,
         MatInputModule,
-        MatomoModule.forRoot({
+        NgxMatomoModule.forRoot({
           scriptUrl: `https://example.com/matomo.js`,
-          trackers: [],
-          routeTracking: {
-            enable: true,
-          }
-        }),
+          trackers: [{siteId: '', trackerUrl: ''}],        }),
         MatRadioModule,
         MatProgressSpinnerModule,
         MatSelectModule,

src/app/donation-start/donation-start-form/donation-start-form.component.ts

@@ -22,7 +22,7 @@ import {MatSnackBar} from '@angular/material/snack-bar';
 import {MatStepper} from '@angular/material/stepper';
 import {ActivatedRoute, Router} from '@angular/router';
 import {RecaptchaComponent} from 'ng-recaptcha';
-import {MatomoTracker} from 'ngx-matomo';
+import {MatomoTracker} from 'ngx-matomo-client';
 import {debounceTime, distinctUntilChanged, retryWhen, startWith, switchMap, tap} from 'rxjs/operators';
 import {
   PaymentIntent,

src/app/donation-thanks/donation-thanks.component.spec.ts

@@ -5,7 +5,7 @@ import {MatDialogModule} from '@angular/material/dialog';
 import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
 import {ActivatedRoute} from '@angular/router';
 import {RouterTestingModule} from '@angular/router/testing';
-import { MatomoModule } from 'ngx-matomo';
+import { NgxMatomoModule } from 'ngx-matomo-client';
 import {InMemoryStorageService} from 'ngx-webstorage-service';
 import {of} from 'rxjs';
 
@@ -25,12 +25,9 @@ describe('DonationThanksComponent', () => {
         HttpClientTestingModule,
         MatButtonModule,
         MatDialogModule,
-        MatomoModule.forRoot({
+        NgxMatomoModule.forRoot({
           scriptUrl: `https://example.com/matomo.js`,
-          trackers: [],
-          routeTracking: {
-            enable: true,
-          }
+          trackers: [{siteId: '', trackerUrl: ''}],
         }),
         MatProgressSpinnerModule,
         RouterTestingModule.withRoutes([

src/app/donation-thanks/donation-thanks.component.ts

@@ -3,7 +3,7 @@ import { Component, Input, OnInit, ViewChild } from '@angular/core';
 import {DomSanitizer, SafeHtml} from "@angular/platform-browser";
 import { MatDialog } from '@angular/material/dialog';
 import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
-import { MatomoTracker } from 'ngx-matomo';
+import { MatomoTracker } from 'ngx-matomo-client';
 import { RecaptchaComponent } from 'ng-recaptcha';
 
 import { Campaign } from '../campaign.model';

src/app/donation.service.spec.ts

@@ -1,7 +1,7 @@
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { inject, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { MatomoModule } from 'ngx-matomo';
+import { NgxMatomoModule } from 'ngx-matomo-client';
 import {InMemoryStorageService, SESSION_STORAGE} from 'ngx-webstorage-service';
 
 import { Donation } from './donation.model';
@@ -44,12 +44,9 @@ describe('DonationService', () => {
   beforeEach(() => TestBed.configureTestingModule({
     imports: [
       HttpClientTestingModule,
-      MatomoModule.forRoot({
+      NgxMatomoModule.forRoot({
         scriptUrl: `https://example.com/matomo.js`,
-        trackers: [],
-        routeTracking: {
-          enable: true,
-        }
+        trackers: [{siteId: '-', trackerUrl: ''}],
       }),
       RouterTestingModule,
     ],

src/app/donation.service.ts

@@ -10,7 +10,7 @@ import {Donation} from './donation.model';
 import {DonationCreatedResponse} from './donation-created-response.model';
 import {environment} from '../environments/environment';
 import {Person} from "./person.model";
-import {MatomoTracker} from 'ngx-matomo';
+import {MatomoTracker} from 'ngx-matomo-client';
 
 export const TBG_DONATE_STORAGE = new InjectionToken<StorageService>('TBG_DONATE_STORAGE');
 

src/app/identity.service.spec.ts

@@ -1,7 +1,7 @@
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { inject, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { MatomoModule } from 'ngx-matomo';
+import { NgxMatomoModule } from 'ngx-matomo-client';
 import { InMemoryStorageService } from 'ngx-webstorage-service';
 
 import { IdentityService, TBG_DONATE_ID_STORAGE } from './identity.service';
@@ -20,12 +20,9 @@ describe('IdentityService', () => {
   beforeEach(() => TestBed.configureTestingModule({
     imports: [
       HttpClientTestingModule,
-      MatomoModule.forRoot({
+      NgxMatomoModule.forRoot({
         scriptUrl: `https://example.com/matomo.js`,
-        trackers: [],
-        routeTracking: {
-          enable: true,
-        }
+        trackers: [{siteId: '', trackerUrl: ''}],
       }),
       RouterTestingModule,
     ],

src/app/identity.service.ts

@@ -2,7 +2,7 @@ import {HttpClient, HttpHeaders} from '@angular/common/http';
 import {EventEmitter, Inject, Injectable, InjectionToken} from '@angular/core';
 import jwtDecode from 'jwt-decode';
 import {CookieService} from 'ngx-cookie-service';
-import {MatomoTracker} from 'ngx-matomo';
+import {MatomoTracker} from 'ngx-matomo-client';
 import {StorageService} from 'ngx-webstorage-service';
 import {Observable, of} from 'rxjs';
 import {delay, retry, tap} from 'rxjs/operators';

src/app/login-modal/login-modal.component.spec.ts

@@ -5,7 +5,7 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
-import { MatomoModule } from 'ngx-matomo';
+import { NgxMatomoModule } from 'ngx-matomo-client';
 import { InMemoryStorageService } from 'ngx-webstorage-service';
 
 import { LoginModalComponent } from './login-modal.component';
@@ -23,12 +23,9 @@ describe('LoginModalComponent', () => {
         HttpClientTestingModule,
         MatButtonModule,
         MatDialogModule,
-        MatomoModule.forRoot({
+        NgxMatomoModule.forRoot({
           scriptUrl: `https://example.com/matomo.js`,
-          trackers: [],
-          routeTracking: {
-            enable: true,
-          }
+          trackers: [{siteId: '', trackerUrl: ''}],
         }),
         NoopAnimationsModule,
         ReactiveFormsModule,

src/app/my-account/my-account.component.spec.ts

@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import {HttpClientModule} from "@angular/common/http";
 import {NO_ERRORS_SCHEMA} from "@angular/core";
 import {MatDialogModule} from "@angular/material/dialog";
-import { MatomoModule } from 'ngx-matomo';
+import { NgxMatomoModule } from 'ngx-matomo-client';
 import {InMemoryStorageService} from "ngx-webstorage-service";
 import {of} from "rxjs";
 import {PaymentMethod} from "@stripe/stripe-js";
@@ -26,12 +26,9 @@ describe('MyAccountComponent', () => {
       imports: [
         HttpClientModule,
         MatDialogModule,
-        MatomoModule.forRoot({
+        NgxMatomoModule.forRoot({
           scriptUrl: `https://example.com/matomo.js`,
-          trackers: [],
-          routeTracking: {
-            enable: true,
-          }
+          trackers: [{siteId: '', trackerUrl: ''}],
         }),
       ],
       providers: [

src/app/register-modal/register-modal.component.spec.ts

@@ -4,7 +4,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
 import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { MatomoModule } from 'ngx-matomo';
+import { NgxMatomoModule } from 'ngx-matomo-client';
 import { InMemoryStorageService } from 'ngx-webstorage-service';
 
 import { RegisterModalComponent } from './register-modal.component';
@@ -23,12 +23,9 @@ describe('RegisterModalComponent', () => {
         HttpClientTestingModule,
         MatButtonModule,
         MatDialogModule,
-        MatomoModule.forRoot({
+        NgxMatomoModule.forRoot({
           scriptUrl: `https://example.com/matomo.js`,
-          trackers: [],
-          routeTracking: {
-            enable: true,
-          }
+          trackers: [{siteId: '', trackerUrl: ''}],
         }),
         NoopAnimationsModule,
         ReactiveFormsModule,

src/app/reset-password/reset-password.component.spec.ts

@@ -7,7 +7,7 @@ import { MatInputModule } from '@angular/material/input';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { MatomoModule } from 'ngx-matomo';
+import { NgxMatomoModule } from 'ngx-matomo-client';
 import { InMemoryStorageService } from 'ngx-webstorage-service';
 
 import { TBG_DONATE_STORAGE } from '../donation.service';
@@ -29,12 +29,9 @@ describe('ResetPasswordComponent', () => {
         MatButtonModule,
         MatDialogModule,
         MatInputModule,
-        MatomoModule.forRoot({
+        NgxMatomoModule.forRoot({
           scriptUrl: `https://example.com/matomo.js`,
-          trackers: [],
-          routeTracking: {
-            enable: true,
-          }
+          trackers: [{siteId: '', trackerUrl: ''}],
         }),
         MatProgressSpinnerModule,
         NoopAnimationsModule,

src/app/stripe.service.spec.ts

@@ -1,7 +1,7 @@
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { MatomoModule } from 'ngx-matomo';
+import { NgxMatomoModule } from 'ngx-matomo-client';
 import { InMemoryStorageService } from 'ngx-webstorage-service';
 
 import { TBG_DONATE_STORAGE } from './donation.service';
@@ -14,12 +14,9 @@ describe('StripeService', () => {
     TestBed.configureTestingModule({
       imports: [
         HttpClientTestingModule,
-        MatomoModule.forRoot({
+        NgxMatomoModule.forRoot({
           scriptUrl: `https://example.com/matomo.js`,
-          trackers: [],
-          routeTracking: {
-            enable: true,
-          }
+          trackers: [{siteId: '', trackerUrl: ''}],
         }),
         RouterTestingModule,
       ],

src/app/transfer-funds/transfer-funds.component.spec.ts

@@ -12,7 +12,7 @@ import { MatSelectModule } from '@angular/material/select';
 import { MatStepperModule } from '@angular/material/stepper';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { MatomoModule } from 'ngx-matomo';
+import { NgxMatomoModule } from 'ngx-matomo-client';
 import { InMemoryStorageService } from 'ngx-webstorage-service';
 
 import { TBG_DONATE_STORAGE } from '../donation.service';
@@ -34,12 +34,9 @@ describe('TransferFundsComponent', () => {
         MatDialogModule,
         MatIconModule,
         MatInputModule,
-        MatomoModule.forRoot({
+        NgxMatomoModule.forRoot({
           scriptUrl: `https://example.com/matomo.js`,
-          trackers: [],
-          routeTracking: {
-            enable: true,
-          }
+          trackers: [{siteId: '', trackerUrl: ''}],
         }),
         MatRadioModule,
         MatProgressSpinnerModule,