Fixes after rebase

Author: nigel-wells

src/SIL.XForge.Scripture/ClientApp/src/app/app.component.ts

@@ -8,8 +8,8 @@ import { CookieService } from 'ngx-cookie-service';
 import { SystemRole } from 'realtime-server/lib/esm/common/models/system-role';
 import { AuthType, getAuthType, User } from 'realtime-server/lib/esm/common/models/user';
 import { SFProjectRole } from 'realtime-server/lib/esm/scriptureforge/models/sf-project-role';
-import { Observable, pipe, Subscription } from 'rxjs';
-import { debounceTime, distinctUntilChanged, filter, map } from 'rxjs/operators';
+import { Observable, Subscription } from 'rxjs';
+import { distinctUntilChanged, filter, map } from 'rxjs/operators';
 import { ActivatedProjectService } from 'xforge-common/activated-project.service';
 import { AuthService } from 'xforge-common/auth.service';
 import { DataLoadingComponent } from 'xforge-common/data-loading-component';
@@ -36,7 +36,7 @@ import { quietTakeUntilDestroyed } from 'xforge-common/util/rxjs-util';
 import { issuesEmailTemplate, supportedBrowser } from 'xforge-common/utils';
 import { ThemeService } from 'xforge-common/theme.service';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { AnalyticsService, PageViewEvent, TagEventType } from 'xforge-common/analytics.service';
+import { AnalyticsService, PageViewEvent } from 'xforge-common/analytics.service';
 import versionData from '../../../version.json';
 import { environment } from '../environments/environment';
 import { SFProjectProfileDoc } from './core/models/sf-project-profile-doc';
@@ -45,8 +45,6 @@ import { SFProjectUserConfigDoc } from './core/models/sf-project-user-config-doc
 import { SFProjectService } from './core/sf-project.service';
 import { checkAppAccess } from './shared/utils';
 
-declare function gtag(...args: any): void;
-
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
@@ -133,7 +131,6 @@ export class AppComponent extends DataLoadingComponent implements OnInit, OnDest
       distinctUntilChanged((previous, current) => {
         const previousUrl = new URL((previous as NavigationEnd).urlAfterRedirects, location.origin);
         const currentUrl = new URL((current as NavigationEnd).urlAfterRedirects, location.origin);
-        console.log(previousUrl, currentUrl);
         return previousUrl.pathname === currentUrl.pathname;
       }),
       map(e => {
@@ -146,7 +143,9 @@ export class AppComponent extends DataLoadingComponent implements OnInit, OnDest
         } as PageViewEvent;
       })
     );
-    this.subscribe(navEndEvent$, pageViewEvent => this.analytics.logNavigation(pageViewEvent));
+    navEndEvent$
+      .pipe(quietTakeUntilDestroyed(this.destroyRef))
+      .subscribe(pageViewEvent => this.analytics.logNavigation(pageViewEvent));
   }
 
   get canInstallOnDevice$(): Observable<boolean> {

src/SIL.XForge.Scripture/ClientApp/src/xforge-common/analytics.service.ts

@@ -18,7 +18,10 @@ export enum TagEventType {
 
 @Injectable({ providedIn: 'root' })
 export class AnalyticsService {
-  constructor(private readonly onlineStatus: OnlineStatusService, private gtmService: GoogleTagManagerService) {}
+  constructor(
+    private readonly onlineStatus: OnlineStatusService,
+    private gtmService: GoogleTagManagerService
+  ) {}
 
   /**
    * Logs the page navigation event to the analytics service. This method is responsible for sanitizing the URL before
@@ -28,8 +31,7 @@ export class AnalyticsService {
   logNavigation(event: PageViewEvent): void {
     event.event = TagEventType.PageView;
     event.pageName = sanitizeUrl(event.pageName);
-    console.log(event);
-    // this.gtmService.pushTag(event);
+    this.gtmService.pushTag(event);
   }
 }