Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import { TestBed, ComponentFixture } from '@angular/core/testing';
import { AppComponent } from './app.component';
import { NO_ERRORS_SCHEMA } from '@angular/core';
import { RouterTestingModule } from '@angular/router/testing';
import { MediaChange, MediaObserver } from '@angular/flex-layout';
import { Observable, BehaviorSubject } from 'rxjs';
import { UtilService } from './services/util.service';
import { Announcement } from './domain/announcement';
import { ConfigService } from './services/config.service';
import { Config } from './domain/config';
import { environment } from '../environments/environment';
import { provideRouter } from '@angular/router';

export class MockConfigService {
private config$: BehaviorSubject<Config> = new BehaviorSubject<Config>(null);

getAnnouncement(): Observable<Announcement> {
return Observable.create((observer) => {
return new Observable((observer) => {
const announcement: Announcement = new Announcement();
announcement.visible = true;
observer.next(announcement);
Expand All @@ -25,20 +25,24 @@ export class MockConfigService {
getConfig(): Observable<Config> {
const config: Config = new Config();
config.googleAnalyticsId = 'UA-XXXXXX-1';
config.googleTagManagerId = 'GTM-XXXXXXXX';
this.config$.next(config);
return this.config$;
}

getGoogleAnalyticsId(): string {
return this.config$.getValue().googleAnalyticsId;
}

getGoogleTagManagerId(): string {
return this.config$.getValue().googleTagManagerId;
}
}

export class MockUtilService {
getMobileMenuState(): Observable<boolean> {
return Observable.create((observer) => {
const state: boolean = false;
observer.next(state);
return new Observable((observer) => {
observer.next(false);
observer.complete();
});
}
Expand All @@ -50,7 +54,7 @@ export class MockObservableMedia {
}

asObservable(): Observable<MediaChange> {
return Observable.create((observer) => {
return new Observable((observer) => {
observer.next(new MediaChange());
observer.complete();
});
Expand All @@ -64,13 +68,13 @@ describe('AppComponent', () => {

beforeEach(() => {
TestBed.configureTestingModule({
declarations: [AppComponent],
providers: [
{ provide: ConfigService, useClass: MockConfigService },
{ provide: UtilService, useClass: MockUtilService },
{ provide: MediaObserver, useClass: MockObservableMedia }
{ provide: MediaObserver, useClass: MockObservableMedia },
provideRouter([])
],
declarations: [AppComponent],
imports: [RouterTestingModule],
schemas: [NO_ERRORS_SCHEMA]
});
fixture = TestBed.createComponent(AppComponent);
Expand Down Expand Up @@ -99,4 +103,11 @@ describe('AppComponent', () => {
it(`should set Google Analytics tracking code`, () => {
expect(component.googleAnalyticsId).toEqual('UA-XXXXXX-1');
});

it(`should set Google Tag manager tracking script`, () => {
const scriptElement = document.querySelector(
'head > script[src="https://www.googletagmanager.com/gtm.js?id=GTM-XXXXXXXX"]'
);
expect(scriptElement).toBeTruthy();
});
});
17 changes: 16 additions & 1 deletion src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,11 @@ export class AppComponent {
});
}

setGTagManager() {
private setGTagManager(): void {
const googleTagManagerId = this.configService.getGoogleTagManagerId();
if (googleTagManagerId) {
this.activateGTM(window, document, 'script', 'dataLayer', googleTagManagerId);
}
this.googleAnalyticsId = this.configService.getGoogleAnalyticsId();
if (this.googleAnalyticsId) {
const gtagScript = this.document.createElement('script');
Expand All @@ -155,6 +159,17 @@ export class AppComponent {
}
}

private activateGTM(w, d, s, l, i): void {
w[l] = w[l] || [];
w[l].push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' });
var f = d.getElementsByTagName(s)[0],
j = d.createElement(s),
dl = l != 'dataLayer' ? '&l=' + l : '';
j.async = true;
j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
f.parentNode.insertBefore(j, f);
}

fixScrollTop(ev: any) {
const topElement = document.querySelector('.top-content');
if (!topElement) {
Expand Down
1 change: 1 addition & 0 deletions src/app/domain/config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export class Config {
contextPath: string;
googleAnalyticsId?: string;
googleTagManagerId?: string;
googleClientId?: string;
isGoogleClassroomEnabled?: boolean;
microsoftClientId?: string;
Expand Down
18 changes: 10 additions & 8 deletions src/app/services/config.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@ export class ConfigService {

retrieveConfig(): Observable<Config> {
const headers = new HttpHeaders({ 'Cache-Control': 'no-cache' });
return this.http
.get<Config>(this.userConfigUrl, { headers: headers })
.pipe(
tap((config) => {
this.config$.next(config);
this.timeDiff = Date.now() - config.currentTime;
})
);
return this.http.get<Config>(this.userConfigUrl, { headers: headers }).pipe(
tap((config) => {
this.config$.next(config);
this.timeDiff = Date.now() - config.currentTime;
})
);
}

getContextPath() {
Expand All @@ -45,6 +43,10 @@ export class ConfigService {
return this.config$.getValue().googleAnalyticsId;
}

getGoogleTagManagerId() {
return this.config$.getValue().googleTagManagerId;
}

getGoogleClientId() {
return this.config$.getValue().googleClientId;
}
Expand Down
Loading