Skip to content

Commit bde54ca

Browse files
committed
129694: fixed lint issues
1 parent 8140ed2 commit bde54ca

File tree

7 files changed

+27
-16
lines changed

7 files changed

+27
-16
lines changed

src/app/app-routes.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ import { reloadGuard } from './core/reload/reload.guard';
3333
import { forgotPasswordCheckGuard } from './core/rest-property/forgot-password-check-guard.guard';
3434
import { ServerCheckGuard } from './core/server-check/server-check.guard';
3535
import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
36+
import { homePageResolver } from './home-page/home-page.resolver';
3637
import { ITEM_MODULE_PATH } from './item-page/item-page-routing-paths';
3738
import { provideSuggestionNotificationsState } from './notifications/provide-suggestion-notifications-state';
3839
import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
3940
import { ThemedPageInternalServerErrorComponent } from './page-internal-server-error/themed-page-internal-server-error.component';
4041
import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component';
4142
import { PROCESS_MODULE_PATH } from './process-page/process-page-routing.paths';
43+
import { viewTrackerResolver } from './statistics/angulartics/dspace/view-tracker.resolver';
4244
import { provideSubmissionState } from './submission/provide-submission-state';
4345
import { SUGGESTION_MODULE_PATH } from './suggestions-page/suggestions-page-routing-paths';
44-
import { homePageResolver } from './home-page/home-page.resolver';
45-
import { viewTrackerResolver } from './statistics/angulartics/dspace/view-tracker.resolver';
4646

4747
export const APP_ROUTES: Route[] = [
4848
{ path: INTERNAL_SERVER_ERROR, component: ThemedPageInternalServerErrorComponent },
@@ -66,7 +66,7 @@ export const APP_ROUTES: Route[] = [
6666
data: {
6767
showBreadcrumbs: false,
6868
enableRSS: true,
69-
dsoPath: 'site'
69+
dsoPath: 'site',
7070
},
7171
providers: [provideSuggestionNotificationsState()],
7272
canActivate: [endUserAgreementCurrentUserGuard],

src/app/collection-page/collection-page-routes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
99
import { ComcolBrowseByComponent } from '../shared/comcol/sections/comcol-browse-by/comcol-browse-by.component';
1010
import { ComcolSearchSectionComponent } from '../shared/comcol/sections/comcol-search-section/comcol-search-section.component';
1111
import { MenuRoute } from '../shared/menu/menu-route.model';
12+
import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver';
1213
import { collectionPageResolver } from './collection-page.resolver';
1314
import { collectionPageAdministratorGuard } from './collection-page-administrator.guard';
1415
import {
@@ -22,7 +23,6 @@ import { DeleteCollectionPageComponent } from './delete-collection-page/delete-c
2223
import { itemTemplatePageResolver } from './edit-item-template-page/item-template-page.resolver';
2324
import { ThemedEditItemTemplatePageComponent } from './edit-item-template-page/themed-edit-item-template-page.component';
2425
import { ThemedCollectionPageComponent } from './themed-collection-page.component';
25-
import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver';
2626

2727
export const ROUTES: Route[] = [
2828
{

src/app/community-page/community-page-routes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
88
import { ComcolBrowseByComponent } from '../shared/comcol/sections/comcol-browse-by/comcol-browse-by.component';
99
import { ComcolSearchSectionComponent } from '../shared/comcol/sections/comcol-search-section/comcol-search-section.component';
1010
import { MenuRoute } from '../shared/menu/menu-route.model';
11+
import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver';
1112
import { communityPageResolver } from './community-page.resolver';
1213
import { communityPageAdministratorGuard } from './community-page-administrator.guard';
1314
import {
@@ -19,7 +20,6 @@ import { createCommunityPageGuard } from './create-community-page/create-communi
1920
import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component';
2021
import { SubComColSectionComponent } from './sections/sub-com-col-section/sub-com-col-section.component';
2122
import { ThemedCommunityPageComponent } from './themed-community-page.component';
22-
import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver';
2323

2424
export const ROUTES: Route[] = [
2525
{

src/app/home-page/home-page-routes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const ROUTES: Route[] = [
2323
link: 'statistics',
2424
} as LinkMenuItemModel,
2525
}],
26-
}
26+
},
2727
},
2828
},
2929
];

src/app/item-page/item-page-routes.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { accessTokenResolver } from '../core/auth/access-token.resolver';
55
import { authenticatedGuard } from '../core/auth/authenticated.guard';
66
import { itemBreadcrumbResolver } from '../core/breadcrumbs/item-breadcrumb.resolver';
77
import { MenuRoute } from '../shared/menu/menu-route.model';
8+
import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver';
89
import { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component';
910
import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.component';
1011
import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component';
@@ -20,7 +21,6 @@ import { orcidPageGuard } from './orcid-page/orcid-page.guard';
2021
import { ThemedItemPageComponent } from './simple/themed-item-page.component';
2122
import { versionResolver } from './version-page/version.resolver';
2223
import { VersionPageComponent } from './version-page/version-page/version-page.component';
23-
import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver';
2424

2525
export const ROUTES: Route[] = [
2626
{
@@ -41,7 +41,7 @@ export const ROUTES: Route[] = [
4141
},
4242
resolve: {
4343
tracking: viewTrackerResolver,
44-
}
44+
},
4545
},
4646
{
4747
path: 'full',
@@ -51,7 +51,7 @@ export const ROUTES: Route[] = [
5151
},
5252
resolve: {
5353
tracking: viewTrackerResolver,
54-
}
54+
},
5555
},
5656
{
5757
path: ITEM_EDIT_PATH,

src/app/statistics/angulartics/dspace/view-tracker-resolver.service.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
1+
import { Injectable } from '@angular/core';
12
import {
2-
Injectable,
3-
} from '@angular/core';
3+
ActivatedRouteSnapshot,
4+
ResolveEnd,
5+
Router,
6+
RouterStateSnapshot,
7+
} from '@angular/router';
48
import { Angulartics2 } from 'angulartics2';
59
import { switchMap } from 'rxjs';
6-
import { filter, take } from 'rxjs/operators';
10+
import {
11+
filter,
12+
take,
13+
} from 'rxjs/operators';
714

815
import { ReferrerService } from '../../../core/services/referrer.service';
9-
import { ActivatedRouteSnapshot, ResolveEnd, Router, RouterStateSnapshot } from '@angular/router';
1016

1117
/**
1218
* This component triggers a page view statistic
1319
*/
1420
@Injectable({
15-
providedIn: 'root'
21+
providedIn: 'root',
1622
})
1723
export class ViewTrackerResolverService {
1824

@@ -24,7 +30,7 @@ export class ViewTrackerResolverService {
2430
}
2531

2632
resolve(routeSnapshot: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
27-
const dsoPath = routeSnapshot.data['dsoPath'] || 'dso.payload'; // Fetch the resolvers passed via the route data
33+
const dsoPath = routeSnapshot.data.dsoPath || 'dso.payload'; // Fetch the resolvers passed via the route data
2834
this.router.events.pipe(
2935
filter(event => event instanceof ResolveEnd),
3036
take(1),

src/app/statistics/angulartics/dspace/view-tracker.resolver.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import { inject } from '@angular/core';
2-
import { ActivatedRouteSnapshot, ResolveFn, RouterStateSnapshot, } from '@angular/router';
2+
import {
3+
ActivatedRouteSnapshot,
4+
ResolveFn,
5+
RouterStateSnapshot,
6+
} from '@angular/router';
7+
38
import { ViewTrackerResolverService } from './view-tracker-resolver.service';
49

510
export const viewTrackerResolver: ResolveFn<boolean> = (

0 commit comments

Comments
 (0)