mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-18 15:33:04 +00:00
129694: fixed lint issues
This commit is contained in:
@@ -33,16 +33,16 @@ import { reloadGuard } from './core/reload/reload.guard';
|
|||||||
import { forgotPasswordCheckGuard } from './core/rest-property/forgot-password-check-guard.guard';
|
import { forgotPasswordCheckGuard } from './core/rest-property/forgot-password-check-guard.guard';
|
||||||
import { ServerCheckGuard } from './core/server-check/server-check.guard';
|
import { ServerCheckGuard } from './core/server-check/server-check.guard';
|
||||||
import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
|
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 { ITEM_MODULE_PATH } from './item-page/item-page-routing-paths';
|
||||||
import { provideSuggestionNotificationsState } from './notifications/provide-suggestion-notifications-state';
|
import { provideSuggestionNotificationsState } from './notifications/provide-suggestion-notifications-state';
|
||||||
import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
|
import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
|
||||||
import { ThemedPageInternalServerErrorComponent } from './page-internal-server-error/themed-page-internal-server-error.component';
|
import { ThemedPageInternalServerErrorComponent } from './page-internal-server-error/themed-page-internal-server-error.component';
|
||||||
import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component';
|
import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component';
|
||||||
import { PROCESS_MODULE_PATH } from './process-page/process-page-routing.paths';
|
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 { provideSubmissionState } from './submission/provide-submission-state';
|
||||||
import { SUGGESTION_MODULE_PATH } from './suggestions-page/suggestions-page-routing-paths';
|
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[] = [
|
export const APP_ROUTES: Route[] = [
|
||||||
{ path: INTERNAL_SERVER_ERROR, component: ThemedPageInternalServerErrorComponent },
|
{ path: INTERNAL_SERVER_ERROR, component: ThemedPageInternalServerErrorComponent },
|
||||||
@@ -66,7 +66,7 @@ export const APP_ROUTES: Route[] = [
|
|||||||
data: {
|
data: {
|
||||||
showBreadcrumbs: false,
|
showBreadcrumbs: false,
|
||||||
enableRSS: true,
|
enableRSS: true,
|
||||||
dsoPath: 'site'
|
dsoPath: 'site',
|
||||||
},
|
},
|
||||||
providers: [provideSuggestionNotificationsState()],
|
providers: [provideSuggestionNotificationsState()],
|
||||||
canActivate: [endUserAgreementCurrentUserGuard],
|
canActivate: [endUserAgreementCurrentUserGuard],
|
||||||
|
@@ -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 { 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 { ComcolSearchSectionComponent } from '../shared/comcol/sections/comcol-search-section/comcol-search-section.component';
|
||||||
import { MenuRoute } from '../shared/menu/menu-route.model';
|
import { MenuRoute } from '../shared/menu/menu-route.model';
|
||||||
|
import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver';
|
||||||
import { collectionPageResolver } from './collection-page.resolver';
|
import { collectionPageResolver } from './collection-page.resolver';
|
||||||
import { collectionPageAdministratorGuard } from './collection-page-administrator.guard';
|
import { collectionPageAdministratorGuard } from './collection-page-administrator.guard';
|
||||||
import {
|
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 { itemTemplatePageResolver } from './edit-item-template-page/item-template-page.resolver';
|
||||||
import { ThemedEditItemTemplatePageComponent } from './edit-item-template-page/themed-edit-item-template-page.component';
|
import { ThemedEditItemTemplatePageComponent } from './edit-item-template-page/themed-edit-item-template-page.component';
|
||||||
import { ThemedCollectionPageComponent } from './themed-collection-page.component';
|
import { ThemedCollectionPageComponent } from './themed-collection-page.component';
|
||||||
import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver';
|
|
||||||
|
|
||||||
export const ROUTES: Route[] = [
|
export const ROUTES: Route[] = [
|
||||||
{
|
{
|
||||||
|
@@ -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 { 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 { ComcolSearchSectionComponent } from '../shared/comcol/sections/comcol-search-section/comcol-search-section.component';
|
||||||
import { MenuRoute } from '../shared/menu/menu-route.model';
|
import { MenuRoute } from '../shared/menu/menu-route.model';
|
||||||
|
import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver';
|
||||||
import { communityPageResolver } from './community-page.resolver';
|
import { communityPageResolver } from './community-page.resolver';
|
||||||
import { communityPageAdministratorGuard } from './community-page-administrator.guard';
|
import { communityPageAdministratorGuard } from './community-page-administrator.guard';
|
||||||
import {
|
import {
|
||||||
@@ -19,7 +20,6 @@ import { createCommunityPageGuard } from './create-community-page/create-communi
|
|||||||
import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component';
|
import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component';
|
||||||
import { SubComColSectionComponent } from './sections/sub-com-col-section/sub-com-col-section.component';
|
import { SubComColSectionComponent } from './sections/sub-com-col-section/sub-com-col-section.component';
|
||||||
import { ThemedCommunityPageComponent } from './themed-community-page.component';
|
import { ThemedCommunityPageComponent } from './themed-community-page.component';
|
||||||
import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver';
|
|
||||||
|
|
||||||
export const ROUTES: Route[] = [
|
export const ROUTES: Route[] = [
|
||||||
{
|
{
|
||||||
|
@@ -23,7 +23,7 @@ export const ROUTES: Route[] = [
|
|||||||
link: 'statistics',
|
link: 'statistics',
|
||||||
} as LinkMenuItemModel,
|
} as LinkMenuItemModel,
|
||||||
}],
|
}],
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
@@ -5,6 +5,7 @@ import { accessTokenResolver } from '../core/auth/access-token.resolver';
|
|||||||
import { authenticatedGuard } from '../core/auth/authenticated.guard';
|
import { authenticatedGuard } from '../core/auth/authenticated.guard';
|
||||||
import { itemBreadcrumbResolver } from '../core/breadcrumbs/item-breadcrumb.resolver';
|
import { itemBreadcrumbResolver } from '../core/breadcrumbs/item-breadcrumb.resolver';
|
||||||
import { MenuRoute } from '../shared/menu/menu-route.model';
|
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 { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component';
|
||||||
import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.component';
|
import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.component';
|
||||||
import { ThemedFullItemPageComponent } from './full/themed-full-item-page.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 { ThemedItemPageComponent } from './simple/themed-item-page.component';
|
||||||
import { versionResolver } from './version-page/version.resolver';
|
import { versionResolver } from './version-page/version.resolver';
|
||||||
import { VersionPageComponent } from './version-page/version-page/version-page.component';
|
import { VersionPageComponent } from './version-page/version-page/version-page.component';
|
||||||
import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver';
|
|
||||||
|
|
||||||
export const ROUTES: Route[] = [
|
export const ROUTES: Route[] = [
|
||||||
{
|
{
|
||||||
@@ -41,7 +41,7 @@ export const ROUTES: Route[] = [
|
|||||||
},
|
},
|
||||||
resolve: {
|
resolve: {
|
||||||
tracking: viewTrackerResolver,
|
tracking: viewTrackerResolver,
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'full',
|
path: 'full',
|
||||||
@@ -51,7 +51,7 @@ export const ROUTES: Route[] = [
|
|||||||
},
|
},
|
||||||
resolve: {
|
resolve: {
|
||||||
tracking: viewTrackerResolver,
|
tracking: viewTrackerResolver,
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: ITEM_EDIT_PATH,
|
path: ITEM_EDIT_PATH,
|
||||||
|
@@ -1,18 +1,24 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
import {
|
import {
|
||||||
Injectable,
|
ActivatedRouteSnapshot,
|
||||||
} from '@angular/core';
|
ResolveEnd,
|
||||||
|
Router,
|
||||||
|
RouterStateSnapshot,
|
||||||
|
} from '@angular/router';
|
||||||
import { Angulartics2 } from 'angulartics2';
|
import { Angulartics2 } from 'angulartics2';
|
||||||
import { switchMap } from 'rxjs';
|
import { switchMap } from 'rxjs';
|
||||||
import { filter, take } from 'rxjs/operators';
|
import {
|
||||||
|
filter,
|
||||||
|
take,
|
||||||
|
} from 'rxjs/operators';
|
||||||
|
|
||||||
import { ReferrerService } from '../../../core/services/referrer.service';
|
import { ReferrerService } from '../../../core/services/referrer.service';
|
||||||
import { ActivatedRouteSnapshot, ResolveEnd, Router, RouterStateSnapshot } from '@angular/router';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This component triggers a page view statistic
|
* This component triggers a page view statistic
|
||||||
*/
|
*/
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class ViewTrackerResolverService {
|
export class ViewTrackerResolverService {
|
||||||
|
|
||||||
@@ -24,7 +30,7 @@ export class ViewTrackerResolverService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
resolve(routeSnapshot: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
|
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(
|
this.router.events.pipe(
|
||||||
filter(event => event instanceof ResolveEnd),
|
filter(event => event instanceof ResolveEnd),
|
||||||
take(1),
|
take(1),
|
||||||
|
@@ -1,5 +1,10 @@
|
|||||||
import { inject } from '@angular/core';
|
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';
|
import { ViewTrackerResolverService } from './view-tracker-resolver.service';
|
||||||
|
|
||||||
export const viewTrackerResolver: ResolveFn<boolean> = (
|
export const viewTrackerResolver: ResolveFn<boolean> = (
|
||||||
|
Reference in New Issue
Block a user