diff --git a/src/app/app-routes.ts b/src/app/app-routes.ts index d1759dd60d..dc9b427634 100644 --- a/src/app/app-routes.ts +++ b/src/app/app-routes.ts @@ -33,16 +33,16 @@ import { reloadGuard } from './core/reload/reload.guard'; import { forgotPasswordCheckGuard } from './core/rest-property/forgot-password-check-guard.guard'; import { ServerCheckGuard } from './core/server-check/server-check.guard'; import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component'; +import { homePageResolver } from './home-page/home-page.resolver'; import { ITEM_MODULE_PATH } from './item-page/item-page-routing-paths'; import { provideSuggestionNotificationsState } from './notifications/provide-suggestion-notifications-state'; import { ThemedPageErrorComponent } from './page-error/themed-page-error.component'; import { ThemedPageInternalServerErrorComponent } from './page-internal-server-error/themed-page-internal-server-error.component'; import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component'; import { PROCESS_MODULE_PATH } from './process-page/process-page-routing.paths'; +import { viewTrackerResolver } from './statistics/angulartics/dspace/view-tracker.resolver'; import { provideSubmissionState } from './submission/provide-submission-state'; import { SUGGESTION_MODULE_PATH } from './suggestions-page/suggestions-page-routing-paths'; -import { homePageResolver } from './home-page/home-page.resolver'; -import { viewTrackerResolver } from './statistics/angulartics/dspace/view-tracker.resolver'; export const APP_ROUTES: Route[] = [ { path: INTERNAL_SERVER_ERROR, component: ThemedPageInternalServerErrorComponent }, @@ -66,7 +66,7 @@ export const APP_ROUTES: Route[] = [ data: { showBreadcrumbs: false, enableRSS: true, - dsoPath: 'site' + dsoPath: 'site', }, providers: [provideSuggestionNotificationsState()], canActivate: [endUserAgreementCurrentUserGuard], diff --git a/src/app/collection-page/collection-page-routes.ts b/src/app/collection-page/collection-page-routes.ts index 15d721607f..d03c57779f 100644 --- a/src/app/collection-page/collection-page-routes.ts +++ b/src/app/collection-page/collection-page-routes.ts @@ -9,6 +9,7 @@ import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso import { ComcolBrowseByComponent } from '../shared/comcol/sections/comcol-browse-by/comcol-browse-by.component'; import { ComcolSearchSectionComponent } from '../shared/comcol/sections/comcol-search-section/comcol-search-section.component'; import { MenuRoute } from '../shared/menu/menu-route.model'; +import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver'; import { collectionPageResolver } from './collection-page.resolver'; import { collectionPageAdministratorGuard } from './collection-page-administrator.guard'; import { @@ -22,7 +23,6 @@ import { DeleteCollectionPageComponent } from './delete-collection-page/delete-c import { itemTemplatePageResolver } from './edit-item-template-page/item-template-page.resolver'; import { ThemedEditItemTemplatePageComponent } from './edit-item-template-page/themed-edit-item-template-page.component'; import { ThemedCollectionPageComponent } from './themed-collection-page.component'; -import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver'; export const ROUTES: Route[] = [ { diff --git a/src/app/community-page/community-page-routes.ts b/src/app/community-page/community-page-routes.ts index c335966924..35eb7780c8 100644 --- a/src/app/community-page/community-page-routes.ts +++ b/src/app/community-page/community-page-routes.ts @@ -8,6 +8,7 @@ import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso import { ComcolBrowseByComponent } from '../shared/comcol/sections/comcol-browse-by/comcol-browse-by.component'; import { ComcolSearchSectionComponent } from '../shared/comcol/sections/comcol-search-section/comcol-search-section.component'; import { MenuRoute } from '../shared/menu/menu-route.model'; +import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver'; import { communityPageResolver } from './community-page.resolver'; import { communityPageAdministratorGuard } from './community-page-administrator.guard'; import { @@ -19,7 +20,6 @@ import { createCommunityPageGuard } from './create-community-page/create-communi import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component'; import { SubComColSectionComponent } from './sections/sub-com-col-section/sub-com-col-section.component'; import { ThemedCommunityPageComponent } from './themed-community-page.component'; -import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver'; export const ROUTES: Route[] = [ { diff --git a/src/app/home-page/home-page-routes.ts b/src/app/home-page/home-page-routes.ts index 3ae09d4ad7..0440315a2c 100644 --- a/src/app/home-page/home-page-routes.ts +++ b/src/app/home-page/home-page-routes.ts @@ -23,7 +23,7 @@ export const ROUTES: Route[] = [ link: 'statistics', } as LinkMenuItemModel, }], - } + }, }, }, ]; diff --git a/src/app/item-page/item-page-routes.ts b/src/app/item-page/item-page-routes.ts index 5494e59b28..beb6a74857 100644 --- a/src/app/item-page/item-page-routes.ts +++ b/src/app/item-page/item-page-routes.ts @@ -5,6 +5,7 @@ import { accessTokenResolver } from '../core/auth/access-token.resolver'; import { authenticatedGuard } from '../core/auth/authenticated.guard'; import { itemBreadcrumbResolver } from '../core/breadcrumbs/item-breadcrumb.resolver'; import { MenuRoute } from '../shared/menu/menu-route.model'; +import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver'; import { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component'; import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.component'; import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component'; @@ -20,7 +21,6 @@ import { orcidPageGuard } from './orcid-page/orcid-page.guard'; import { ThemedItemPageComponent } from './simple/themed-item-page.component'; import { versionResolver } from './version-page/version.resolver'; import { VersionPageComponent } from './version-page/version-page/version-page.component'; -import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver'; export const ROUTES: Route[] = [ { @@ -41,7 +41,7 @@ export const ROUTES: Route[] = [ }, resolve: { tracking: viewTrackerResolver, - } + }, }, { path: 'full', @@ -51,7 +51,7 @@ export const ROUTES: Route[] = [ }, resolve: { tracking: viewTrackerResolver, - } + }, }, { path: ITEM_EDIT_PATH, diff --git a/src/app/statistics/angulartics/dspace/view-tracker-resolver.service.ts b/src/app/statistics/angulartics/dspace/view-tracker-resolver.service.ts index cbe9bb77ef..004864cc68 100644 --- a/src/app/statistics/angulartics/dspace/view-tracker-resolver.service.ts +++ b/src/app/statistics/angulartics/dspace/view-tracker-resolver.service.ts @@ -1,18 +1,24 @@ +import { Injectable } from '@angular/core'; import { - Injectable, -} from '@angular/core'; + ActivatedRouteSnapshot, + ResolveEnd, + Router, + RouterStateSnapshot, +} from '@angular/router'; import { Angulartics2 } from 'angulartics2'; import { switchMap } from 'rxjs'; -import { filter, take } from 'rxjs/operators'; +import { + filter, + take, +} from 'rxjs/operators'; import { ReferrerService } from '../../../core/services/referrer.service'; -import { ActivatedRouteSnapshot, ResolveEnd, Router, RouterStateSnapshot } from '@angular/router'; /** * This component triggers a page view statistic */ @Injectable({ - providedIn: 'root' + providedIn: 'root', }) export class ViewTrackerResolverService { @@ -24,7 +30,7 @@ export class ViewTrackerResolverService { } resolve(routeSnapshot: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean { - const dsoPath = routeSnapshot.data['dsoPath'] || 'dso.payload'; // Fetch the resolvers passed via the route data + const dsoPath = routeSnapshot.data.dsoPath || 'dso.payload'; // Fetch the resolvers passed via the route data this.router.events.pipe( filter(event => event instanceof ResolveEnd), take(1), diff --git a/src/app/statistics/angulartics/dspace/view-tracker.resolver.ts b/src/app/statistics/angulartics/dspace/view-tracker.resolver.ts index 9b98185d61..78b6bb6f8a 100644 --- a/src/app/statistics/angulartics/dspace/view-tracker.resolver.ts +++ b/src/app/statistics/angulartics/dspace/view-tracker.resolver.ts @@ -1,5 +1,10 @@ import { inject } from '@angular/core'; -import { ActivatedRouteSnapshot, ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { + ActivatedRouteSnapshot, + ResolveFn, + RouterStateSnapshot, +} from '@angular/router'; + import { ViewTrackerResolverService } from './view-tracker-resolver.service'; export const viewTrackerResolver: ResolveFn = (