Skip to content

Commit

Permalink
114858: Fix Lint Errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Zahraa Chreim committed May 10, 2024
1 parent f1cac6e commit ea92837
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 28 deletions.
9 changes: 2 additions & 7 deletions src/app/access-control/access-control-routes.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import { AbstractControl } from '@angular/forms';
import {
mapToCanActivate,
Route,
} from '@angular/router';
import { Route } from '@angular/router';
import {
DYNAMIC_ERROR_MESSAGES_MATCHER,
DynamicErrorMessagesMatcher,
} from '@ng-dynamic-forms/core';

import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
import { siteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
import {
EPERSON_PATH,
GROUP_PATH,
Expand All @@ -19,9 +17,6 @@ import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-fo
import { EPersonResolver } from './epeople-registry/eperson-resolver.service';
import { GroupFormComponent } from './group-registry/group-form/group-form.component';
import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
import {
siteAdministratorGuard
} from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';

/**
* Condition for displaying error messages on email form field
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
import {
mapToCanActivate,
Route,
} from '@angular/router';
import { Route } from '@angular/router';

import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
import { notifyInfoGuard } from '../../core/coar-notify/notify-info/notify-info.guard';
import { siteAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
import { AdminNotifyIncomingComponent } from './admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component';
import { AdminNotifyOutgoingComponent } from './admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component';
import {
siteAdministratorGuard
} from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';

export const ROUTES: Route[] = [
{
Expand Down
8 changes: 2 additions & 6 deletions src/app/app-routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import { COLLECTION_MODULE_PATH } from './collection-page/collection-page-routin
import { COMMUNITY_MODULE_PATH } from './community-page/community-page-routing-paths';
import { authBlockingGuard } from './core/auth/auth-blocking.guard';
import { authenticatedGuard } from './core/auth/authenticated.guard';
import { groupAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
import { siteAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
import { siteRegisterGuard } from './core/data/feature-authorization/feature-authorization-guard/site-register.guard';
import { EndUserAgreementCurrentUserGuard } from './core/end-user-agreement/end-user-agreement-current-user.guard';
import { reloadGuard } from './core/reload/reload.guard';
Expand All @@ -41,12 +43,6 @@ import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.
import { PROCESS_MODULE_PATH } from './process-page/process-page-routing.paths';
import { provideSubmissionState } from './submission/provide-submission-state';
import { SUGGESTION_MODULE_PATH } from './suggestions-page/suggestions-page-routing-paths';
import {
siteAdministratorGuard
} from './core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
import {
groupAdministratorGuard
} from './core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';

export const APP_ROUTES: Route[] = [
{ path: INTERNAL_SERVER_ERROR, component: ThemedPageInternalServerErrorComponent },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@ import {
Router,
UrlTree,
} from '@angular/router';
import { Store } from '@ngrx/store';
import { TranslateService } from '@ngx-translate/core';
import {
Observable,
of as observableOf,
} from 'rxjs';
import { AuthService } from 'src/app/core/auth/auth.service';
import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
import { FeatureID } from 'src/app/core/data/feature-authorization/feature-id';
import { bitstreamPageAuthorizationsGuard } from './bitstream-page-authorizations.guard';

import { BitstreamDataService } from '../core/data/bitstream-data.service';
import { Bitstream } from '../core/shared/bitstream.model';
import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
import { bitstreamPageAuthorizationsGuard } from './bitstream-page-authorizations.guard';

describe('bitstreamPageAuthorizationsGuard', () => {
let authorizationService: AuthorizationDataService;
Expand Down
2 changes: 1 addition & 1 deletion src/app/bitstream-page/bitstream-page-routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import { resourcePolicyTargetResolver } from '../shared/resource-policies/resolv
import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component';
import { bitstreamPageResolver } from './bitstream-page.resolver';
import { bitstreamPageAuthorizationsGuard } from './bitstream-page-authorizations.guard';
import { ThemedEditBitstreamPageComponent } from './edit-bitstream-page/themed-edit-bitstream-page.component';
import { legacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
import { bitstreamPageAuthorizationsGuard } from './bitstream-page-authorizations.guard';

const EDIT_BITSTREAM_PATH = ':id/edit';
const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
Expand Down
8 changes: 4 additions & 4 deletions src/app/item-page/edit-item-page/edit-item-page-routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ import { itemPageAccessControlGuard } from './item-page-access-control.guard';
import { itemPageBitstreamsGuard } from './item-page-bitstreams.guard';
import { itemPageCollectionMapperGuard } from './item-page-collection-mapper.guard';
import { itemPageCurateGuard } from './item-page-curate.guard';
import { itemPageDeleteGuard } from './item-page-delete.guard';
import { itemPageEditAuthorizationsGuard } from './item-page-edit-authorizations.guard';
import { itemPageMetadataGuard } from './item-page-metadata.guard';
import { itemPageMoveGuard } from './item-page-move.guard';
import { itemPagePrivateGuard } from './item-page-private.guard';
import { itemPageRegisterDoiGuard } from './item-page-register-doi.guard';
import { itemPageReinstateGuard } from './item-page-reinstate.guard';
import { itemPageRelationshipsGuard } from './item-page-relationships.guard';
Expand All @@ -43,10 +47,6 @@ import { ItemRelationshipsComponent } from './item-relationships/item-relationsh
import { ThemedItemStatusComponent } from './item-status/themed-item-status.component';
import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component';
import { ItemWithdrawComponent } from './item-withdraw/item-withdraw.component';
import { itemPageEditAuthorizationsGuard } from './item-page-edit-authorizations.guard';
import { itemPagePrivateGuard } from './item-page-private.guard';
import { itemPageMoveGuard } from './item-page-move.guard';
import { itemPageDeleteGuard } from './item-page-delete.guard';

/**
* Routing module that handles the routing for the Edit Item page administrator functionality
Expand Down

0 comments on commit ea92837

Please sign in to comment.