diff --git a/package.json b/package.json index 2697f06a32..b4a40c0a19 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "angular-idle-preload": "3.0.0", "angular-sortablejs": "^2.5.0", "angular2-text-mask": "9.0.0", - "angulartics2": "^6.2.0", + "angulartics2": "7.5.2", "body-parser": "1.18.2", "bootstrap": "4.3.1", "cerialize": "0.1.18", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 1d0d765130..1f3da086c2 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -82,6 +82,7 @@ export class AppComponent implements OnInit, AfterViewInit { } } + angulartics2GoogleAnalytics.startTracking(); angulartics2DSpace.startTracking(); metadata.listenForRouteChange(); diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts index 87b830ee7d..0dbe4f58fe 100644 --- a/src/modules/app/browser-app.module.ts +++ b/src/modules/app/browser-app.module.ts @@ -19,9 +19,7 @@ import { ClientCookieService } from '../../app/core/services/client-cookie.servi import { CookieService } from '../../app/core/services/cookie.service'; import { AuthService } from '../../app/core/auth/auth.service'; import { Angulartics2Module } from 'angulartics2'; -import { Angulartics2GoogleAnalytics } from 'angulartics2/ga'; import { SubmissionService } from '../../app/submission/submission.service'; -import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider'; import { StatisticsModule } from '../../app/statistics/statistics.module'; export const REQ_KEY = makeStateKey('req'); @@ -50,7 +48,7 @@ export function getRequest(transferState: TransferState): any { IdlePreload }), StatisticsModule.forRoot(), - Angulartics2Module.forRoot([Angulartics2GoogleAnalytics, Angulartics2DSpace]), + Angulartics2Module.forRoot(), BrowserAnimationsModule, DSpaceBrowserTransferStateModule, TranslateModule.forRoot({ diff --git a/src/modules/app/server-app.module.ts b/src/modules/app/server-app.module.ts index 44b21859bd..286e878d9b 100644 --- a/src/modules/app/server-app.module.ts +++ b/src/modules/app/server-app.module.ts @@ -47,7 +47,7 @@ export function createTranslateLoader() { deps: [] } }), - Angulartics2Module.forRoot([Angulartics2GoogleAnalytics, Angulartics2DSpace]), + Angulartics2Module.forRoot(), ServerModule, AppModule ], diff --git a/yarn.lock b/yarn.lock index 75bf4cd399..68ead65df8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1217,10 +1217,10 @@ angular2-text-mask@9.0.0: dependencies: text-mask-core "^5.0.0" -angulartics2@^6.2.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/angulartics2/-/angulartics2-6.3.0.tgz#85107238fe021e1e1e5cb492c5979aed829a1240" - integrity sha512-5BwRYCLF6ypBl7rlarW403v4AdotIldJhN+2rQeTIw/rTtngJ4SewNhf4zlRnKBSItlhbZRrDJBl9uR2TUuCdw== +angulartics2@7.5.2: + version "7.5.2" + resolved "https://registry.yarnpkg.com/angulartics2/-/angulartics2-7.5.2.tgz#58ea8eca811581350f5067ddedecd9f070d82598" + integrity sha512-gfQ/kRtrKD0fLOGZsWlcD8obIWTAJGSdiVRp6lH+LxLD8shKnl1/StWlUJeOioUkU0ps4QGRb0tCSlCdnI5DAw== dependencies: tslib "^1.9.0"