Skip to content

Commit ea92837

Browse files
author
Zahraa Chreim
committed
114858: Fix Lint Errors
1 parent f1cac6e commit ea92837

6 files changed

Lines changed: 13 additions & 28 deletions

File tree

src/app/access-control/access-control-routes.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import { AbstractControl } from '@angular/forms';
2-
import {
3-
mapToCanActivate,
4-
Route,
5-
} from '@angular/router';
2+
import { Route } from '@angular/router';
63
import {
74
DYNAMIC_ERROR_MESSAGES_MATCHER,
85
DynamicErrorMessagesMatcher,
96
} from '@ng-dynamic-forms/core';
107

118
import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
9+
import { siteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
1210
import {
1311
EPERSON_PATH,
1412
GROUP_PATH,
@@ -19,9 +17,6 @@ import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-fo
1917
import { EPersonResolver } from './epeople-registry/eperson-resolver.service';
2018
import { GroupFormComponent } from './group-registry/group-form/group-form.component';
2119
import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
22-
import {
23-
siteAdministratorGuard
24-
} from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
2520

2621
/**
2722
* Condition for displaying error messages on email form field

src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routes.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
import {
2-
mapToCanActivate,
3-
Route,
4-
} from '@angular/router';
1+
import { Route } from '@angular/router';
52

63
import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
74
import { notifyInfoGuard } from '../../core/coar-notify/notify-info/notify-info.guard';
5+
import { siteAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
86
import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
97
import { AdminNotifyIncomingComponent } from './admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component';
108
import { AdminNotifyOutgoingComponent } from './admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component';
11-
import {
12-
siteAdministratorGuard
13-
} from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
149

1510
export const ROUTES: Route[] = [
1611
{

src/app/app-routes.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ import { COLLECTION_MODULE_PATH } from './collection-page/collection-page-routin
2626
import { COMMUNITY_MODULE_PATH } from './community-page/community-page-routing-paths';
2727
import { authBlockingGuard } from './core/auth/auth-blocking.guard';
2828
import { authenticatedGuard } from './core/auth/authenticated.guard';
29+
import { groupAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
30+
import { siteAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
2931
import { siteRegisterGuard } from './core/data/feature-authorization/feature-authorization-guard/site-register.guard';
3032
import { EndUserAgreementCurrentUserGuard } from './core/end-user-agreement/end-user-agreement-current-user.guard';
3133
import { reloadGuard } from './core/reload/reload.guard';
@@ -41,12 +43,6 @@ import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.
4143
import { PROCESS_MODULE_PATH } from './process-page/process-page-routing.paths';
4244
import { provideSubmissionState } from './submission/provide-submission-state';
4345
import { SUGGESTION_MODULE_PATH } from './suggestions-page/suggestions-page-routing-paths';
44-
import {
45-
siteAdministratorGuard
46-
} from './core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
47-
import {
48-
groupAdministratorGuard
49-
} from './core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
5046

5147
export const APP_ROUTES: Route[] = [
5248
{ path: INTERNAL_SERVER_ERROR, component: ThemedPageInternalServerErrorComponent },

src/app/bitstream-page/bitstream-page-authorizations.guard.spec.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@ import {
33
Router,
44
UrlTree,
55
} from '@angular/router';
6-
import { Store } from '@ngrx/store';
7-
import { TranslateService } from '@ngx-translate/core';
86
import {
97
Observable,
108
of as observableOf,
119
} from 'rxjs';
1210
import { AuthService } from 'src/app/core/auth/auth.service';
1311
import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
1412
import { FeatureID } from 'src/app/core/data/feature-authorization/feature-id';
15-
import { bitstreamPageAuthorizationsGuard } from './bitstream-page-authorizations.guard';
13+
1614
import { BitstreamDataService } from '../core/data/bitstream-data.service';
1715
import { Bitstream } from '../core/shared/bitstream.model';
1816
import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
17+
import { bitstreamPageAuthorizationsGuard } from './bitstream-page-authorizations.guard';
1918

2019
describe('bitstreamPageAuthorizationsGuard', () => {
2120
let authorizationService: AuthorizationDataService;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import { resourcePolicyTargetResolver } from '../shared/resource-policies/resolv
1010
import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
1111
import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component';
1212
import { bitstreamPageResolver } from './bitstream-page.resolver';
13+
import { bitstreamPageAuthorizationsGuard } from './bitstream-page-authorizations.guard';
1314
import { ThemedEditBitstreamPageComponent } from './edit-bitstream-page/themed-edit-bitstream-page.component';
1415
import { legacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
15-
import { bitstreamPageAuthorizationsGuard } from './bitstream-page-authorizations.guard';
1616

1717
const EDIT_BITSTREAM_PATH = ':id/edit';
1818
const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ import { itemPageAccessControlGuard } from './item-page-access-control.guard';
2828
import { itemPageBitstreamsGuard } from './item-page-bitstreams.guard';
2929
import { itemPageCollectionMapperGuard } from './item-page-collection-mapper.guard';
3030
import { itemPageCurateGuard } from './item-page-curate.guard';
31+
import { itemPageDeleteGuard } from './item-page-delete.guard';
32+
import { itemPageEditAuthorizationsGuard } from './item-page-edit-authorizations.guard';
3133
import { itemPageMetadataGuard } from './item-page-metadata.guard';
34+
import { itemPageMoveGuard } from './item-page-move.guard';
35+
import { itemPagePrivateGuard } from './item-page-private.guard';
3236
import { itemPageRegisterDoiGuard } from './item-page-register-doi.guard';
3337
import { itemPageReinstateGuard } from './item-page-reinstate.guard';
3438
import { itemPageRelationshipsGuard } from './item-page-relationships.guard';
@@ -43,10 +47,6 @@ import { ItemRelationshipsComponent } from './item-relationships/item-relationsh
4347
import { ThemedItemStatusComponent } from './item-status/themed-item-status.component';
4448
import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component';
4549
import { ItemWithdrawComponent } from './item-withdraw/item-withdraw.component';
46-
import { itemPageEditAuthorizationsGuard } from './item-page-edit-authorizations.guard';
47-
import { itemPagePrivateGuard } from './item-page-private.guard';
48-
import { itemPageMoveGuard } from './item-page-move.guard';
49-
import { itemPageDeleteGuard } from './item-page-delete.guard';
5050

5151
/**
5252
* Routing module that handles the routing for the Edit Item page administrator functionality

0 commit comments

Comments
 (0)