diff --git a/src/app/access-control/access-control-routes.ts b/src/app/access-control/access-control-routes.ts index 393cdbe818..a7cce461ef 100644 --- a/src/app/access-control/access-control-routes.ts +++ b/src/app/access-control/access-control-routes.ts @@ -8,7 +8,7 @@ import { DynamicErrorMessagesMatcher, } from '@ng-dynamic-forms/core'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; 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 { @@ -42,7 +42,7 @@ export const ROUTES: Route[] = [ path: EPERSON_PATH, component: EPeopleRegistryComponent, resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, providers, data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' }, @@ -52,7 +52,7 @@ export const ROUTES: Route[] = [ path: `${EPERSON_PATH}/create`, component: EPersonFormComponent, resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, providers, data: { title: 'admin.access-control.epeople.add.title', breadcrumbKey: 'admin.access-control.epeople.add' }, @@ -62,7 +62,7 @@ export const ROUTES: Route[] = [ path: `${EPERSON_PATH}/:id/edit`, component: EPersonFormComponent, resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, ePerson: EPersonResolver, }, providers, @@ -73,7 +73,7 @@ export const ROUTES: Route[] = [ path: GROUP_PATH, component: GroupsRegistryComponent, resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, providers, data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' }, @@ -83,7 +83,7 @@ export const ROUTES: Route[] = [ path: `${GROUP_PATH}/create`, component: GroupFormComponent, resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, providers, data: { @@ -96,7 +96,7 @@ export const ROUTES: Route[] = [ path: `${GROUP_PATH}/:groupId/edit`, component: GroupFormComponent, resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, providers, data: { @@ -109,7 +109,7 @@ export const ROUTES: Route[] = [ path: 'bulk-access', component: BulkAccessComponent, resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { title: 'admin.access-control.bulk-access.title', breadcrumbKey: 'admin.access-control.bulk-access' }, canActivate: mapToCanActivate([SiteAdministratorGuard]), diff --git a/src/app/admin/admin-ldn-services/admin-ldn-services-routes.ts b/src/app/admin/admin-ldn-services/admin-ldn-services-routes.ts index 1299ed53dc..66420f7a7b 100644 --- a/src/app/admin/admin-ldn-services/admin-ldn-services-routes.ts +++ b/src/app/admin/admin-ldn-services/admin-ldn-services-routes.ts @@ -1,7 +1,7 @@ import { Routes } from '@angular/router'; -import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { NavigationBreadcrumbResolver } from '../../core/breadcrumbs/navigation-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { navigationBreadcrumbResolver } from '../../core/breadcrumbs/navigation-breadcrumb.resolver'; import { LdnServiceFormComponent } from './ldn-service-form/ldn-service-form.component'; import { LdnServicesOverviewComponent } from './ldn-services-directory/ldn-services-directory.component'; @@ -10,18 +10,18 @@ const moduleRoutes: Routes = [ path: '', pathMatch: 'full', component: LdnServicesOverviewComponent, - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, data: { title: 'ldn-registered-services.title', breadcrumbKey: 'ldn-registered-services.new' }, }, { path: 'new', - resolve: { breadcrumb: NavigationBreadcrumbResolver }, + resolve: { breadcrumb: navigationBreadcrumbResolver }, component: LdnServiceFormComponent, data: { title: 'ldn-register-new-service.title', breadcrumbKey: 'ldn-register-new-service' }, }, { path: 'edit/:serviceId', - resolve: { breadcrumb: NavigationBreadcrumbResolver }, + resolve: { breadcrumb: navigationBreadcrumbResolver }, component: LdnServiceFormComponent, data: { title: 'ldn-edit-service.title', breadcrumbKey: 'ldn-edit-service' }, }, diff --git a/src/app/admin/admin-notifications/admin-notifications-routes.ts b/src/app/admin/admin-notifications/admin-notifications-routes.ts index 2d85da41bc..9953e5fa62 100644 --- a/src/app/admin/admin-notifications/admin-notifications-routes.ts +++ b/src/app/admin/admin-notifications/admin-notifications-routes.ts @@ -1,12 +1,12 @@ import { Route } from '@angular/router'; import { AuthenticatedGuard } from '../../core/auth/authenticated.guard'; -import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { QualityAssuranceBreadcrumbResolver } from '../../core/breadcrumbs/quality-assurance-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { qualityAssuranceBreadcrumbResolver } from '../../core/breadcrumbs/quality-assurance-breadcrumb.resolver'; import { AdminNotificationsPublicationClaimPageResolver } from '../../quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service'; import { QualityAssuranceEventsPageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component'; -import { QualityAssuranceEventsPageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver'; -import { SourceDataResolver } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver'; +import { qualityAssuranceEventsPageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver'; +import { qualityAssuranceSourceDataResolver } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver'; import { QualityAssuranceSourcePageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component'; import { QualityAssuranceSourcePageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service'; import { QualityAssuranceTopicsPageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component'; @@ -24,7 +24,7 @@ export const ROUTES: Route[] = [ component: AdminNotificationsPublicationClaimPageComponent, pathMatch: 'full', resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, suggestionTargetParams: AdminNotificationsPublicationClaimPageResolver, }, data: { @@ -39,7 +39,7 @@ export const ROUTES: Route[] = [ component: QualityAssuranceTopicsPageComponent, pathMatch: 'full', resolve: { - breadcrumb: QualityAssuranceBreadcrumbResolver, + breadcrumb: qualityAssuranceBreadcrumbResolver, openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver, }, data: { @@ -54,7 +54,7 @@ export const ROUTES: Route[] = [ component: QualityAssuranceTopicsPageComponent, pathMatch: 'full', resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver, }, data: { @@ -69,9 +69,9 @@ export const ROUTES: Route[] = [ component: QualityAssuranceSourcePageComponent, pathMatch: 'full', resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, openaireQualityAssuranceSourceParams: QualityAssuranceSourcePageResolver, - sourceData: SourceDataResolver, + sourceData: qualityAssuranceSourceDataResolver, }, data: { title: 'admin.notifications.source.breadcrumbs', @@ -85,8 +85,8 @@ export const ROUTES: Route[] = [ component: QualityAssuranceEventsPageComponent, pathMatch: 'full', resolve: { - breadcrumb: QualityAssuranceBreadcrumbResolver, - openaireQualityAssuranceEventsParams: QualityAssuranceEventsPageResolver, + breadcrumb: qualityAssuranceBreadcrumbResolver, + openaireQualityAssuranceEventsParams: qualityAssuranceEventsPageResolver, }, data: { title: 'admin.notifications.event.page.title', diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routes.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routes.ts index e4a67bd88e..39ad6756fb 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routes.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routes.ts @@ -3,7 +3,7 @@ import { Route, } from '@angular/router'; -import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; +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'; @@ -15,7 +15,7 @@ export const ROUTES: Route[] = [ canActivate: [...mapToCanActivate([SiteAdministratorGuard]), NotifyInfoGuard], path: '', resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, component: AdminNotifyDashboardComponent, pathMatch: 'full', @@ -27,7 +27,7 @@ export const ROUTES: Route[] = [ { path: 'inbound', resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, component: AdminNotifyIncomingComponent, canActivate: [...mapToCanActivate([SiteAdministratorGuard]), NotifyInfoGuard], @@ -39,7 +39,7 @@ export const ROUTES: Route[] = [ { path: 'outbound', resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, component: AdminNotifyOutgoingComponent, canActivate: [...mapToCanActivate([SiteAdministratorGuard]), NotifyInfoGuard], diff --git a/src/app/admin/admin-registries/admin-registries-routes.ts b/src/app/admin/admin-registries/admin-registries-routes.ts index b7c1bf1751..06aaa934ab 100644 --- a/src/app/admin/admin-registries/admin-registries-routes.ts +++ b/src/app/admin/admin-registries/admin-registries-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; -import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; import { BITSTREAMFORMATS_MODULE_PATH } from './admin-registries-routing-paths'; import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component'; import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component'; @@ -8,7 +8,7 @@ import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.compo export const ROUTES: Route[] = [ { path: 'metadata', - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, data: { title: 'admin.registries.metadata.title', breadcrumbKey: 'admin.registries.metadata' }, children: [ { @@ -17,7 +17,7 @@ export const ROUTES: Route[] = [ }, { path: ':schemaName', - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, component: MetadataSchemaComponent, data: { title: 'admin.registries.schema.title', breadcrumbKey: 'admin.registries.schema' }, }, @@ -25,7 +25,7 @@ export const ROUTES: Route[] = [ }, { path: BITSTREAMFORMATS_MODULE_PATH, - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, loadChildren: () => import('./bitstream-formats/bitstream-formats-routes') .then((m) => m.ROUTES), data: { title: 'admin.registries.bitstream-formats.title', breadcrumbKey: 'admin.registries.bitstream-formats' }, diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routes.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routes.ts index 27af558c44..5c85d194a5 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routes.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routes.ts @@ -1,9 +1,9 @@ import { Route } from '@angular/router'; -import { I18nBreadcrumbResolver } from '../../../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../../../core/breadcrumbs/i18n-breadcrumb.resolver'; import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component'; import { BitstreamFormatsComponent } from './bitstream-formats.component'; -import { BitstreamFormatsResolver } from './bitstream-formats.resolver'; +import { bitstreamFormatsResolver } from './bitstream-formats.resolver'; import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component'; const BITSTREAMFORMAT_EDIT_PATH = ':id/edit'; @@ -19,7 +19,7 @@ export const ROUTES: Route[] = [ }, { path: BITSTREAMFORMAT_ADD_PATH, - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, providers, component: AddBitstreamFormatComponent, data: { breadcrumbKey: 'admin.registries.bitstream-formats.create' }, @@ -29,8 +29,8 @@ export const ROUTES: Route[] = [ providers, component: EditBitstreamFormatComponent, resolve: { - bitstreamFormat: BitstreamFormatsResolver, - breadcrumb: I18nBreadcrumbResolver, + bitstreamFormat: bitstreamFormatsResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { breadcrumbKey: 'admin.registries.bitstream-formats.edit' }, }, diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts index e44dda8681..366f5a682b 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts @@ -19,7 +19,7 @@ import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; * @returns Observable<> Emits the found bitstreamFormat based on the parameters in the current route, * or an error if something went wrong */ -export const BitstreamFormatsResolver: ResolveFn> = ( +export const bitstreamFormatsResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, bitstreamFormatDataService: BitstreamFormatDataService = inject(BitstreamFormatDataService), diff --git a/src/app/admin/admin-reports/admin-reports-routes.ts b/src/app/admin/admin-reports/admin-reports-routes.ts index 7f19cc4bce..be1f7cc7a0 100644 --- a/src/app/admin/admin-reports/admin-reports-routes.ts +++ b/src/app/admin/admin-reports/admin-reports-routes.ts @@ -1,13 +1,13 @@ import { Route } from '@angular/router'; -import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; import { FilteredCollectionsComponent } from './filtered-collections/filtered-collections.component'; import { FilteredItemsComponent } from './filtered-items/filtered-items.component'; export const ROUTES: Route[] = [ { path: 'collections', - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, data: { title: 'admin.reports.collections.title', breadcrumbKey: 'admin.reports.collections' }, children: [ { @@ -18,7 +18,7 @@ export const ROUTES: Route[] = [ }, { path: 'queries', - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, data: { title: 'admin.reports.items.title', breadcrumbKey: 'admin.reports.items' }, children: [ { diff --git a/src/app/admin/admin-routes.ts b/src/app/admin/admin-routes.ts index 7df3bd289a..a89dbb2c0a 100644 --- a/src/app/admin/admin-routes.ts +++ b/src/app/admin/admin-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component'; import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component'; import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component'; @@ -27,37 +27,37 @@ export const ROUTES: Route[] = [ }, { path: 'search', - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, component: AdminSearchPageComponent, data: { title: 'admin.search.title', breadcrumbKey: 'admin.search' }, }, { path: 'workflow', - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, component: AdminWorkflowPageComponent, data: { title: 'admin.workflow.title', breadcrumbKey: 'admin.workflow' }, }, { path: 'curation-tasks', - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, component: AdminCurationTasksComponent, data: { title: 'admin.curation-tasks.title', breadcrumbKey: 'admin.curation-tasks' }, }, { path: 'metadata-import', - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, component: MetadataImportPageComponent, data: { title: 'admin.metadata-import.title', breadcrumbKey: 'admin.metadata-import' }, }, { path: 'batch-import', - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, component: BatchImportPageComponent, data: { title: 'admin.batch-import.title', breadcrumbKey: 'admin.batch-import' }, }, { path: 'system-wide-alert', - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, loadChildren: () => import('../system-wide-alert/system-wide-alert-routes').then((m) => m.ROUTES), data: { title: 'admin.system-wide-alert.title', breadcrumbKey: 'admin.system-wide-alert' }, }, diff --git a/src/app/app-routes.ts b/src/app/app-routes.ts index 9bf92d9cd4..b357de7734 100644 --- a/src/app/app-routes.ts +++ b/src/app/app-routes.ts @@ -35,7 +35,7 @@ import { ForgotPasswordCheckGuard } from './core/rest-property/forgot-password-c import { ServerCheckGuard } from './core/server-check/server-check.guard'; import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component'; import { ITEM_MODULE_PATH } from './item-page/item-page-routing-paths'; -import { MenuResolver } from './menu.resolver'; +import { menuResolver } from './menuResolver'; 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'; @@ -51,7 +51,7 @@ export const APP_ROUTES: Route[] = [ path: '', canActivate: [AuthBlockingGuard], canActivateChild: [ServerCheckGuard], - resolve: [MenuResolver], + resolve: [menuResolver], children: [ { path: '', redirectTo: '/home', pathMatch: 'full' }, { diff --git a/src/app/bitstream-page/bitstream-page-routes.ts b/src/app/bitstream-page/bitstream-page-routes.ts index 6f4c3378ce..206b301e38 100644 --- a/src/app/bitstream-page/bitstream-page-routes.ts +++ b/src/app/bitstream-page/bitstream-page-routes.ts @@ -1,17 +1,17 @@ import { Route } from '@angular/router'; import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; -import { BitstreamBreadcrumbResolver } from '../core/breadcrumbs/bitstream-breadcrumb.resolver'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { bitstreamBreadcrumbResolver } from '../core/breadcrumbs/bitstream-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ResourcePolicyCreateComponent } from '../shared/resource-policies/create/resource-policy-create.component'; import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/resource-policy-edit.component'; -import { ResourcePolicyResolver } from '../shared/resource-policies/resolvers/resource-policy.resolver'; -import { ResourcePolicyTargetResolver } from '../shared/resource-policies/resolvers/resource-policy-target.resolver'; +import { resourcePolicyResolver } from '../shared/resource-policies/resolvers/resource-policy.resolver'; +import { resourcePolicyTargetResolver } from '../shared/resource-policies/resolvers/resource-policy-target.resolver'; 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 { bitstreamPageResolver } from './bitstream-page.resolver'; import { ThemedEditBitstreamPageComponent } from './edit-bitstream-page/themed-edit-bitstream-page.component'; -import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver'; +import { legacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver'; const EDIT_BITSTREAM_PATH = ':id/edit'; const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations'; @@ -25,7 +25,7 @@ export const ROUTES: Route[] = [ path: 'handle/:prefix/:suffix/:filename', component: BitstreamDownloadPageComponent, resolve: { - bitstream: LegacyBitstreamUrlResolver, + bitstream: legacyBitstreamUrlResolver, }, }, { @@ -33,7 +33,7 @@ export const ROUTES: Route[] = [ path: ':prefix/:suffix/:sequence_id/:filename', component: BitstreamDownloadPageComponent, resolve: { - bitstream: LegacyBitstreamUrlResolver, + bitstream: legacyBitstreamUrlResolver, }, }, { @@ -41,15 +41,15 @@ export const ROUTES: Route[] = [ path: ':id/download', component: BitstreamDownloadPageComponent, resolve: { - bitstream: BitstreamPageResolver, + bitstream: bitstreamPageResolver, }, }, { path: EDIT_BITSTREAM_PATH, component: ThemedEditBitstreamPageComponent, resolve: { - bitstream: BitstreamPageResolver, - breadcrumb: BitstreamBreadcrumbResolver, + bitstream: bitstreamPageResolver, + breadcrumb: bitstreamBreadcrumbResolver, }, canActivate: [AuthenticatedGuard], }, @@ -59,7 +59,7 @@ export const ROUTES: Route[] = [ { path: 'create', resolve: { - resourcePolicyTarget: ResourcePolicyTargetResolver, + resourcePolicyTarget: resourcePolicyTargetResolver, }, component: ResourcePolicyCreateComponent, data: { title: 'resource-policies.create.page.title', showBreadcrumbs: true }, @@ -67,8 +67,8 @@ export const ROUTES: Route[] = [ { path: 'edit', resolve: { - breadcrumb: I18nBreadcrumbResolver, - resourcePolicy: ResourcePolicyResolver, + breadcrumb: i18nBreadcrumbResolver, + resourcePolicy: resourcePolicyResolver, }, component: ResourcePolicyEditComponent, data: { breadcrumbKey: 'item.edit', title: 'resource-policies.edit.page.title', showBreadcrumbs: true }, @@ -76,8 +76,8 @@ export const ROUTES: Route[] = [ { path: '', resolve: { - bitstream: BitstreamPageResolver, - breadcrumb: BitstreamBreadcrumbResolver, + bitstream: bitstreamPageResolver, + breadcrumb: bitstreamBreadcrumbResolver, }, component: BitstreamAuthorizationsComponent, data: { title: 'bitstream.edit.authorizations.title', showBreadcrumbs: true }, diff --git a/src/app/bitstream-page/bitstream-page.resolver.ts b/src/app/bitstream-page/bitstream-page.resolver.ts index f57153b75e..f6a039b1d8 100644 --- a/src/app/bitstream-page/bitstream-page.resolver.ts +++ b/src/app/bitstream-page/bitstream-page.resolver.ts @@ -32,7 +32,7 @@ export const BITSTREAM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig[] = [ * @returns Observable<> Emits the found bitstream based on the parameters in the current route, * or an error if something went wrong */ -export const BitstreamPageResolver: ResolveFn> = ( +export const bitstreamPageResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, bitstreamService: BitstreamDataService = inject(BitstreamDataService), diff --git a/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts b/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts index 408f9a245f..ec67d530df 100644 --- a/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts +++ b/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts @@ -4,9 +4,9 @@ import { TestScheduler } from 'rxjs/testing'; import { BitstreamDataService } from '../core/data/bitstream-data.service'; import { RemoteData } from '../core/data/remote-data'; import { RequestEntryState } from '../core/data/request-entry-state.model'; -import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver'; +import { legacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver'; -describe(`LegacyBitstreamUrlResolver`, () => { +describe(`legacyBitstreamUrlResolver`, () => { let resolver: any; let bitstreamDataService: BitstreamDataService; let testScheduler; @@ -33,7 +33,7 @@ describe(`LegacyBitstreamUrlResolver`, () => { bitstreamDataService = { findByItemHandle: () => undefined, } as any; - resolver = LegacyBitstreamUrlResolver; + resolver = legacyBitstreamUrlResolver; }); describe(`resolve`, () => { diff --git a/src/app/bitstream-page/legacy-bitstream-url.resolver.ts b/src/app/bitstream-page/legacy-bitstream-url.resolver.ts index d2e7a70b9b..8b9b1127b1 100644 --- a/src/app/bitstream-page/legacy-bitstream-url.resolver.ts +++ b/src/app/bitstream-page/legacy-bitstream-url.resolver.ts @@ -22,7 +22,7 @@ import { hasNoValue } from '../shared/empty.util'; * @returns Observable<> Emits the found bitstream based on the parameters in * current route, or an error if something went wrong */ -export const LegacyBitstreamUrlResolver: ResolveFn> = ( +export const legacyBitstreamUrlResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, bitstreamDataService: BitstreamDataService = inject(BitstreamDataService), diff --git a/src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts b/src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts index 34a054edfd..a5a233dcd6 100644 --- a/src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts +++ b/src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts @@ -27,7 +27,7 @@ import { hasValue } from '../shared/empty.util'; * @param {DSpaceObjectDataService} dataService * @returns BreadcrumbConfig object */ -export const BrowseByDSOBreadcrumbResolver: ResolveFn> = ( +export const browseByDSOBreadcrumbResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, breadcrumbService: DSOBreadcrumbsService = inject(DSOBreadcrumbsService), diff --git a/src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts b/src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts index 0a477681c3..64cf6df6db 100644 --- a/src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts +++ b/src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts @@ -5,7 +5,7 @@ import { } from '@angular/router'; import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; /** * Method for resolving a browse-by i18n breadcrumb configuration object @@ -13,11 +13,11 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso * @param {RouterStateSnapshot} state The current RouterStateSnapshot * @returns BreadcrumbConfig object for a browse-by page */ -export const BrowseByI18nBreadcrumbResolver: ResolveFn> = ( +export const browseByI18nBreadcrumbResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, ): BreadcrumbConfig => { const extendedBreadcrumbKey = route.data.breadcrumbKey + '.' + route.params.id; route.data = Object.assign({}, route.data, { breadcrumbKey: extendedBreadcrumbKey }); - return I18nBreadcrumbResolver(route, state) as BreadcrumbConfig; + return i18nBreadcrumbResolver(route, state) as BreadcrumbConfig; }; diff --git a/src/app/browse-by/browse-by-page-routes.ts b/src/app/browse-by/browse-by-page-routes.ts index 9e4c9cc786..65337b779e 100644 --- a/src/app/browse-by/browse-by-page-routes.ts +++ b/src/app/browse-by/browse-by-page-routes.ts @@ -1,24 +1,24 @@ import { Route } from '@angular/router'; -import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; -import { BrowseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver'; +import { dsoEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; +import { browseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver'; import { BrowseByGuard } from './browse-by-guard'; -import { BrowseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver'; +import { browseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver'; import { BrowseByPageComponent } from './browse-by-page/browse-by-page.component'; export const ROUTES: Route[] = [ { path: '', resolve: { - breadcrumb: BrowseByDSOBreadcrumbResolver, - menu: DSOEditMenuResolver, + breadcrumb: browseByDSOBreadcrumbResolver, + menu: dsoEditMenuResolver, }, children: [ { path: ':id', component: BrowseByPageComponent, canActivate: [BrowseByGuard], - resolve: { breadcrumb: BrowseByI18nBreadcrumbResolver }, + resolve: { breadcrumb: browseByI18nBreadcrumbResolver }, data: { title: 'browse.title.page', breadcrumbKey: 'browse.metadata' }, }, ], diff --git a/src/app/collection-page/collection-page-administrator.guard.ts b/src/app/collection-page/collection-page-administrator.guard.ts index 5dc93e0994..63e969b7c8 100644 --- a/src/app/collection-page/collection-page-administrator.guard.ts +++ b/src/app/collection-page/collection-page-administrator.guard.ts @@ -16,7 +16,7 @@ import { DsoPageSingleFeatureGuard } from '../core/data/feature-authorization/fe import { FeatureID } from '../core/data/feature-authorization/feature-id'; import { RemoteData } from '../core/data/remote-data'; import { Collection } from '../core/shared/collection.model'; -import { CollectionPageResolver } from './collection-page.resolver'; +import { collectionPageResolver } from './collection-page.resolver'; @Injectable({ providedIn: 'root', @@ -26,7 +26,7 @@ import { CollectionPageResolver } from './collection-page.resolver'; */ export class CollectionPageAdministratorGuard extends DsoPageSingleFeatureGuard { - protected resolver: ResolveFn> = CollectionPageResolver; + protected resolver: ResolveFn> = collectionPageResolver; constructor(protected authorizationService: AuthorizationDataService, protected router: Router, diff --git a/src/app/collection-page/collection-page-routes.ts b/src/app/collection-page/collection-page-routes.ts index 20c0937698..7d7afa58fb 100644 --- a/src/app/collection-page/collection-page-routes.ts +++ b/src/app/collection-page/collection-page-routes.ts @@ -4,16 +4,16 @@ import { } from '@angular/router'; import { BrowseByGuard } from '../browse-by/browse-by-guard'; -import { BrowseByI18nBreadcrumbResolver } from '../browse-by/browse-by-i18n-breadcrumb.resolver'; +import { browseByI18nBreadcrumbResolver } from '../browse-by/browse-by-i18n-breadcrumb.resolver'; import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; -import { CollectionBreadcrumbResolver } from '../core/breadcrumbs/collection-breadcrumb.resolver'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { collectionBreadcrumbResolver } from '../core/breadcrumbs/collection-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; 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 { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; +import { dsoEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model'; import { MenuItemType } from '../shared/menu/menu-item-type.model'; -import { CollectionPageResolver } from './collection-page.resolver'; +import { collectionPageResolver } from './collection-page.resolver'; import { CollectionPageAdministratorGuard } from './collection-page-administrator.guard'; import { COLLECTION_CREATE_PATH, @@ -23,7 +23,7 @@ import { import { CreateCollectionPageComponent } from './create-collection-page/create-collection-page.component'; import { CreateCollectionPageGuard } from './create-collection-page/create-collection-page.guard'; import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component'; -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 { ThemedCollectionPageComponent } from './themed-collection-page.component'; @@ -37,9 +37,9 @@ export const ROUTES: Route[] = [ { path: ':id', resolve: { - dso: CollectionPageResolver, - breadcrumb: CollectionBreadcrumbResolver, - menu: DSOEditMenuResolver, + dso: collectionPageResolver, + breadcrumb: collectionBreadcrumbResolver, + menu: dsoEditMenuResolver, }, runGuardsAndResolvers: 'always', children: [ @@ -60,8 +60,8 @@ export const ROUTES: Route[] = [ component: ThemedEditItemTemplatePageComponent, canActivate: [AuthenticatedGuard], resolve: { - item: ItemTemplatePageResolver, - breadcrumb: I18nBreadcrumbResolver, + item: itemTemplatePageResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { title: 'collection.edit.template.title', breadcrumbKey: 'collection.edit.template' }, }, @@ -80,7 +80,7 @@ export const ROUTES: Route[] = [ component: ComcolBrowseByComponent, canActivate: [BrowseByGuard], resolve: { - breadcrumb: BrowseByI18nBreadcrumbResolver, + breadcrumb: browseByI18nBreadcrumbResolver, }, data: { breadcrumbKey: 'browse.metadata' }, }, diff --git a/src/app/collection-page/collection-page.resolver.spec.ts b/src/app/collection-page/collection-page.resolver.spec.ts index 60ef0d5eb7..2c1e466729 100644 --- a/src/app/collection-page/collection-page.resolver.spec.ts +++ b/src/app/collection-page/collection-page.resolver.spec.ts @@ -2,9 +2,9 @@ import { Observable } from 'rxjs'; import { first } from 'rxjs/operators'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; -import { CollectionPageResolver } from './collection-page.resolver'; +import { collectionPageResolver } from './collection-page.resolver'; -describe('CollectionPageResolver', () => { +describe('collectionPageResolver', () => { describe('resolve', () => { let resolver: any; let collectionService: any; @@ -18,7 +18,7 @@ describe('CollectionPageResolver', () => { store = jasmine.createSpyObj('store', { dispatch: {}, }); - resolver = CollectionPageResolver; + resolver = collectionPageResolver; }); it('should resolve a collection with the correct id', (done) => { diff --git a/src/app/collection-page/collection-page.resolver.ts b/src/app/collection-page/collection-page.resolver.ts index e75adc29b8..6befefc152 100644 --- a/src/app/collection-page/collection-page.resolver.ts +++ b/src/app/collection-page/collection-page.resolver.ts @@ -38,7 +38,7 @@ export const COLLECTION_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig[] = [ * @returns Observable<> Emits the found collection based on the parameters in the current route, * or an error if something went wrong */ -export const CollectionPageResolver: ResolveFn> = ( +export const collectionPageResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, collectionService: CollectionDataService = inject(CollectionDataService), diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page-routes.ts b/src/app/collection-page/edit-collection-page/edit-collection-page-routes.ts index 28b73bb918..cf550c3223 100644 --- a/src/app/collection-page/edit-collection-page/edit-collection-page-routes.ts +++ b/src/app/collection-page/edit-collection-page/edit-collection-page-routes.ts @@ -3,12 +3,12 @@ import { Route, } from '@angular/router'; -import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; import { CollectionAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/collection-administrator.guard'; import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component'; import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component'; -import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver'; -import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver'; +import { resourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver'; +import { resourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver'; import { CollectionItemMapperComponent } from '../collection-item-mapper/collection-item-mapper.component'; import { CollectionAccessControlComponent } from './collection-access-control/collection-access-control.component'; import { CollectionAuthorizationsComponent } from './collection-authorizations/collection-authorizations.component'; @@ -26,7 +26,7 @@ export const ROUTES: Route[] = [ { path: '', resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { breadcrumbKey: 'collection.edit' }, component: EditCollectionPageComponent, @@ -73,7 +73,7 @@ export const ROUTES: Route[] = [ { path: 'create', resolve: { - resourcePolicyTarget: ResourcePolicyTargetResolver, + resourcePolicyTarget: resourcePolicyTargetResolver, }, component: ResourcePolicyCreateComponent, data: { title: 'resource-policies.create.page.title' }, @@ -81,7 +81,7 @@ export const ROUTES: Route[] = [ { path: 'edit', resolve: { - resourcePolicy: ResourcePolicyResolver, + resourcePolicy: resourcePolicyResolver, }, component: ResourcePolicyEditComponent, data: { title: 'resource-policies.edit.page.title' }, diff --git a/src/app/collection-page/edit-item-template-page/item-template-page.resolver.spec.ts b/src/app/collection-page/edit-item-template-page/item-template-page.resolver.spec.ts index 53a3110acb..c622c62267 100644 --- a/src/app/collection-page/edit-item-template-page/item-template-page.resolver.spec.ts +++ b/src/app/collection-page/edit-item-template-page/item-template-page.resolver.spec.ts @@ -2,9 +2,9 @@ import { Observable } from 'rxjs'; import { first } from 'rxjs/operators'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; -import { ItemTemplatePageResolver } from './item-template-page.resolver'; +import { itemTemplatePageResolver } from './item-template-page.resolver'; -describe('ItemTemplatePageResolver', () => { +describe('itemTemplatePageResolver', () => { describe('resolve', () => { let resolver: any; let itemTemplateService: any; @@ -14,7 +14,7 @@ describe('ItemTemplatePageResolver', () => { itemTemplateService = { findByCollectionID: (id: string) => createSuccessfulRemoteDataObject$({ id }), }; - resolver = ItemTemplatePageResolver; + resolver = itemTemplatePageResolver; }); it('should resolve an item template with the correct id', (done) => { diff --git a/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts b/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts index 69a850db6e..d35cd0a3b0 100644 --- a/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts +++ b/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts @@ -12,7 +12,7 @@ import { Item } from '../../core/shared/item.model'; import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { followLink } from '../../shared/utils/follow-link-config.model'; -export const ItemTemplatePageResolver: ResolveFn> = ( +export const itemTemplatePageResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, itemTemplateService: ItemTemplateDataService = inject(ItemTemplateDataService), diff --git a/src/app/community-list-page/community-list-page-routes.ts b/src/app/community-list-page/community-list-page-routes.ts index e1f9f9ff3b..9990efb437 100644 --- a/src/app/community-list-page/community-list-page-routes.ts +++ b/src/app/community-list-page/community-list-page-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ThemedCommunityListPageComponent } from './themed-community-list-page.component'; /** @@ -12,7 +12,7 @@ export const ROUTES: Route[] = [ component: ThemedCommunityListPageComponent, pathMatch: 'full', resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { title: 'communityList.tabTitle', breadcrumbKey: 'communityList' }, }, diff --git a/src/app/community-page/community-page-administrator.guard.ts b/src/app/community-page/community-page-administrator.guard.ts index 22f91b58c1..23d429b484 100644 --- a/src/app/community-page/community-page-administrator.guard.ts +++ b/src/app/community-page/community-page-administrator.guard.ts @@ -16,7 +16,7 @@ import { DsoPageSingleFeatureGuard } from '../core/data/feature-authorization/fe import { FeatureID } from '../core/data/feature-authorization/feature-id'; import { RemoteData } from '../core/data/remote-data'; import { Community } from '../core/shared/community.model'; -import { CommunityPageResolver } from './community-page.resolver'; +import { communityPageResolver } from './community-page.resolver'; @Injectable({ providedIn: 'root', @@ -26,7 +26,7 @@ import { CommunityPageResolver } from './community-page.resolver'; */ export class CommunityPageAdministratorGuard extends DsoPageSingleFeatureGuard { - protected resolver: ResolveFn> = CommunityPageResolver; + protected resolver: ResolveFn> = communityPageResolver; constructor(protected authorizationService: AuthorizationDataService, protected router: Router, diff --git a/src/app/community-page/community-page-routes.ts b/src/app/community-page/community-page-routes.ts index 8061807364..87cc058b01 100644 --- a/src/app/community-page/community-page-routes.ts +++ b/src/app/community-page/community-page-routes.ts @@ -4,16 +4,16 @@ import { } from '@angular/router'; import { BrowseByGuard } from '../browse-by/browse-by-guard'; -import { BrowseByI18nBreadcrumbResolver } from '../browse-by/browse-by-i18n-breadcrumb.resolver'; +import { browseByI18nBreadcrumbResolver } from '../browse-by/browse-by-i18n-breadcrumb.resolver'; import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; -import { CommunityBreadcrumbResolver } from '../core/breadcrumbs/community-breadcrumb.resolver'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { communityBreadcrumbResolver } from '../core/breadcrumbs/community-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; 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 { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; +import { dsoEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model'; import { MenuItemType } from '../shared/menu/menu-item-type.model'; -import { CommunityPageResolver } from './community-page.resolver'; +import { communityPageResolver } from './community-page.resolver'; import { CommunityPageAdministratorGuard } from './community-page-administrator.guard'; import { COMMUNITY_CREATE_PATH, @@ -34,9 +34,9 @@ export const ROUTES: Route[] = [ { path: ':id', resolve: { - dso: CommunityPageResolver, - breadcrumb: CommunityBreadcrumbResolver, - menu: DSOEditMenuResolver, + dso: communityPageResolver, + breadcrumb: communityBreadcrumbResolver, + menu: dsoEditMenuResolver, }, runGuardsAndResolvers: 'always', children: [ @@ -66,7 +66,7 @@ export const ROUTES: Route[] = [ pathMatch: 'full', component: SubComColSectionComponent, resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { breadcrumbKey: 'community.subcoms-cols' }, }, @@ -76,7 +76,7 @@ export const ROUTES: Route[] = [ component: ComcolBrowseByComponent, canActivate: [BrowseByGuard], resolve: { - breadcrumb: BrowseByI18nBreadcrumbResolver, + breadcrumb: browseByI18nBreadcrumbResolver, }, data: { breadcrumbKey: 'browse.metadata' }, }, diff --git a/src/app/community-page/community-page.resolver.spec.ts b/src/app/community-page/community-page.resolver.spec.ts index b13f66b077..e429ecf17c 100644 --- a/src/app/community-page/community-page.resolver.spec.ts +++ b/src/app/community-page/community-page.resolver.spec.ts @@ -2,9 +2,9 @@ import { Observable } from 'rxjs'; import { first } from 'rxjs/operators'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; -import { CommunityPageResolver } from './community-page.resolver'; +import { communityPageResolver } from './community-page.resolver'; -describe('CommunityPageResolver', () => { +describe('communityPageResolver', () => { describe('resolve', () => { let resolver: any; let communityService: any; @@ -18,7 +18,7 @@ describe('CommunityPageResolver', () => { store = jasmine.createSpyObj('store', { dispatch: {}, }); - resolver = CommunityPageResolver; + resolver = communityPageResolver; }); it('should resolve a community with the correct id', (done) => { diff --git a/src/app/community-page/community-page.resolver.ts b/src/app/community-page/community-page.resolver.ts index f9b52258ac..b8820629e7 100644 --- a/src/app/community-page/community-page.resolver.ts +++ b/src/app/community-page/community-page.resolver.ts @@ -38,7 +38,7 @@ export const COMMUNITY_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig[] = [ * @returns Observable<> Emits the found community based on the parameters in the current route, * or an error if something went wrong */ -export const CommunityPageResolver: ResolveFn> = ( +export const communityPageResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, communityService: CommunityDataService = inject(CommunityDataService), diff --git a/src/app/community-page/edit-community-page/edit-community-page-routes.ts b/src/app/community-page/edit-community-page/edit-community-page-routes.ts index 64695673c9..a15312a216 100644 --- a/src/app/community-page/edit-community-page/edit-community-page-routes.ts +++ b/src/app/community-page/edit-community-page/edit-community-page-routes.ts @@ -3,12 +3,12 @@ import { Route, } from '@angular/router'; -import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; import { CommunityAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/community-administrator.guard'; import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component'; import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component'; -import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver'; -import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver'; +import { resourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver'; +import { resourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver'; import { CommunityAccessControlComponent } from './community-access-control/community-access-control.component'; import { CommunityAuthorizationsComponent } from './community-authorizations/community-authorizations.component'; import { CommunityCurateComponent } from './community-curate/community-curate.component'; @@ -24,7 +24,7 @@ export const ROUTES: Route[] = [ { path: '', resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { breadcrumbKey: 'community.edit' }, component: EditCommunityPageComponent, @@ -66,7 +66,7 @@ export const ROUTES: Route[] = [ { path: 'create', resolve: { - resourcePolicyTarget: ResourcePolicyTargetResolver, + resourcePolicyTarget: resourcePolicyTargetResolver, }, component: ResourcePolicyCreateComponent, data: { title: 'resource-policies.create.page.title' }, @@ -74,7 +74,7 @@ export const ROUTES: Route[] = [ { path: 'edit', resolve: { - resourcePolicy: ResourcePolicyResolver, + resourcePolicy: resourcePolicyResolver, }, component: ResourcePolicyEditComponent, data: { title: 'resource-policies.edit.page.title' }, diff --git a/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts index 6191bdb1f7..5628fe6583 100644 --- a/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts +++ b/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts @@ -18,7 +18,7 @@ import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver'; /** * The resolve function that resolves the BreadcrumbConfig object for an Item */ -export const BitstreamBreadcrumbResolver: ResolveFn> = ( +export const bitstreamBreadcrumbResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, breadcrumbService: BitstreamBreadcrumbsService = inject(BitstreamBreadcrumbsService), diff --git a/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts index 91d7943883..7df656a961 100644 --- a/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts +++ b/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts @@ -18,7 +18,7 @@ import { DSOBreadcrumbsService } from './dso-breadcrumbs.service'; /** * The resolve function that resolves the BreadcrumbConfig object for a Collection */ -export const CollectionBreadcrumbResolver: ResolveFn> = ( +export const collectionBreadcrumbResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, breadcrumbService: DSOBreadcrumbsService = inject(DSOBreadcrumbsService), diff --git a/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts index c2e667369b..1064a1cc19 100644 --- a/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts +++ b/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts @@ -18,7 +18,7 @@ import { DSOBreadcrumbsService } from './dso-breadcrumbs.service'; /** * The resolve function that resolves the BreadcrumbConfig object for a Community */ -export const CommunityBreadcrumbResolver: ResolveFn> = ( +export const communityBreadcrumbResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, breadcrumbService: DSOBreadcrumbsService = inject(DSOBreadcrumbsService), diff --git a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.spec.ts b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.spec.ts index e27da93d41..ae19128d4e 100644 --- a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.spec.ts +++ b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.spec.ts @@ -2,7 +2,7 @@ import { getTestScheduler } from 'jasmine-marbles'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { Collection } from '../shared/collection.model'; -import { CollectionBreadcrumbResolver } from './collection-breadcrumb.resolver'; +import { collectionBreadcrumbResolver } from './collection-breadcrumb.resolver'; describe('DSOBreadcrumbResolver', () => { describe('resolve', () => { @@ -23,7 +23,7 @@ describe('DSOBreadcrumbResolver', () => { collectionService = { findById: () => createSuccessfulRemoteDataObject$(testCollection), }; - resolver = CollectionBreadcrumbResolver; + resolver = collectionBreadcrumbResolver; }); it('should resolve a breadcrumb config for the correct DSO', () => { diff --git a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts index 132c7abb08..a85338c490 100644 --- a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts +++ b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts @@ -1,7 +1,7 @@ import { URLCombiner } from '../url-combiner/url-combiner'; -import { I18nBreadcrumbResolver } from './i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from './i18n-breadcrumb.resolver'; -describe('I18nBreadcrumbResolver', () => { +describe('i18nBreadcrumbResolver', () => { describe('resolve', () => { let resolver: any; let i18nBreadcrumbService: any; @@ -27,7 +27,7 @@ describe('I18nBreadcrumbResolver', () => { }; expectedPath = new URLCombiner(parentSegment, segment).toString(); i18nBreadcrumbService = {}; - resolver = I18nBreadcrumbResolver; + resolver = i18nBreadcrumbResolver; }); it('should resolve the breadcrumb config', () => { diff --git a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts index 536eb0194b..5f5c779211 100644 --- a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts +++ b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts @@ -17,7 +17,7 @@ import { I18nBreadcrumbsService } from './i18n-breadcrumbs.service'; * @param {I18nBreadcrumbsService} breadcrumbService * @returns BreadcrumbConfig object */ -export const I18nBreadcrumbResolver: ResolveFn> = ( +export const i18nBreadcrumbResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, breadcrumbService: I18nBreadcrumbsService = inject(I18nBreadcrumbsService), diff --git a/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts index 28eb9efbf5..cb16cedb42 100644 --- a/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts +++ b/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts @@ -18,7 +18,7 @@ import { DSOBreadcrumbsService } from './dso-breadcrumbs.service'; /** * The resolve function that resolves the BreadcrumbConfig object for an Item */ -export const ItemBreadcrumbResolver: ResolveFn> = ( +export const itemBreadcrumbResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, breadcrumbService: DSOBreadcrumbsService = inject(DSOBreadcrumbsService), diff --git a/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.spec.ts b/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.spec.ts index 778d6090d6..a6bbe49ddd 100644 --- a/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.spec.ts +++ b/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.spec.ts @@ -1,6 +1,6 @@ -import { NavigationBreadcrumbResolver } from './navigation-breadcrumb.resolver'; +import { navigationBreadcrumbResolver } from './navigation-breadcrumb.resolver'; -describe('NavigationBreadcrumbResolver', () => { +describe('navigationBreadcrumbResolver', () => { describe('resolve', () => { let resolver: any; let NavigationBreadcrumbService: any; @@ -40,7 +40,7 @@ describe('NavigationBreadcrumbResolver', () => { }; expectedPath = '/base/example:/base'; NavigationBreadcrumbService = {}; - resolver = NavigationBreadcrumbResolver; + resolver = navigationBreadcrumbResolver; }); it('should resolve the breadcrumb config', () => { diff --git a/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.ts index 811c537268..ac306ee3f5 100644 --- a/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.ts +++ b/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.ts @@ -15,7 +15,7 @@ import { NavigationBreadcrumbsService } from './navigation-breadcrumb.service'; * @param {NavigationBreadcrumbsService} breadcrumbService * @returns BreadcrumbConfig object */ -export const NavigationBreadcrumbResolver: ResolveFn> = ( +export const navigationBreadcrumbResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, breadcrumbService: NavigationBreadcrumbsService = inject(NavigationBreadcrumbsService), diff --git a/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.spec.ts b/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.spec.ts index f0ae3c59c6..7c2c34d479 100644 --- a/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.spec.ts +++ b/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.spec.ts @@ -1,6 +1,6 @@ -import { PublicationClaimBreadcrumbResolver } from './publication-claim-breadcrumb.resolver'; +import { publicationClaimBreadcrumbResolver } from './publication-claim-breadcrumb.resolver'; -describe('PublicationClaimBreadcrumbResolver', () => { +describe('publicationClaimBreadcrumbResolver', () => { describe('resolve', () => { let resolver: any; let publicationClaimBreadcrumbService: any; @@ -19,7 +19,7 @@ describe('PublicationClaimBreadcrumbResolver', () => { }, }; publicationClaimBreadcrumbService = {}; - resolver = PublicationClaimBreadcrumbResolver; + resolver = publicationClaimBreadcrumbResolver; }); it('should resolve the breadcrumb config', () => { diff --git a/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.ts index db2fe0dceb..a1b52ce333 100644 --- a/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.ts +++ b/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.ts @@ -8,7 +8,7 @@ import { import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model'; import { PublicationClaimBreadcrumbService } from './publication-claim-breadcrumb.service'; -export const PublicationClaimBreadcrumbResolver: ResolveFn> = ( +export const publicationClaimBreadcrumbResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, breadcrumbService: PublicationClaimBreadcrumbService = inject(PublicationClaimBreadcrumbService), diff --git a/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.spec.ts b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.spec.ts index 1965e50cf6..fe2fe77e7f 100644 --- a/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.spec.ts +++ b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.spec.ts @@ -1,6 +1,6 @@ -import { QualityAssuranceBreadcrumbResolver } from './quality-assurance-breadcrumb.resolver'; +import { qualityAssuranceBreadcrumbResolver } from './quality-assurance-breadcrumb.resolver'; -describe('QualityAssuranceBreadcrumbResolver', () => { +describe('qualityAssuranceBreadcrumbResolver', () => { describe('resolve', () => { let resolver: any; let qualityAssuranceBreadcrumbService: any; @@ -19,7 +19,7 @@ describe('QualityAssuranceBreadcrumbResolver', () => { }, }; qualityAssuranceBreadcrumbService = {}; - resolver = QualityAssuranceBreadcrumbResolver; + resolver = qualityAssuranceBreadcrumbResolver; }); it('should resolve the breadcrumb config', () => { diff --git a/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.ts index ef01ef10cf..6507a75de6 100644 --- a/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.ts +++ b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.ts @@ -8,7 +8,7 @@ import { import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model'; import { QualityAssuranceBreadcrumbService } from './quality-assurance-breadcrumb.service'; -export const QualityAssuranceBreadcrumbResolver: ResolveFn> = ( +export const qualityAssuranceBreadcrumbResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, breadcrumbService: QualityAssuranceBreadcrumbService = inject(QualityAssuranceBreadcrumbService), diff --git a/src/app/health-page/health-page-routes.ts b/src/app/health-page/health-page-routes.ts index 614c5ee55a..4c02bc548f 100644 --- a/src/app/health-page/health-page-routes.ts +++ b/src/app/health-page/health-page-routes.ts @@ -3,14 +3,14 @@ import { Route, } from '@angular/router'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard'; import { HealthPageComponent } from './health-page.component'; export const ROUTES: Route[] = [ { path: '', - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, data: { breadcrumbKey: 'health', title: 'health-page.title', diff --git a/src/app/home-page/home-page-routes.ts b/src/app/home-page/home-page-routes.ts index ae1282abc8..6e4a8f353f 100644 --- a/src/app/home-page/home-page-routes.ts +++ b/src/app/home-page/home-page-routes.ts @@ -2,7 +2,7 @@ import { Route } from '@angular/router'; import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model'; import { MenuItemType } from '../shared/menu/menu-item-type.model'; -import { HomePageResolver } from './home-page.resolver'; +import { homePageResolver } from './home-page.resolver'; import { ThemedHomePageComponent } from './themed-home-page.component'; export const ROUTES: Route[] = [ @@ -27,7 +27,7 @@ export const ROUTES: Route[] = [ }, }, resolve: { - site: HomePageResolver, + site: homePageResolver, }, }, ]; diff --git a/src/app/home-page/home-page.resolver.ts b/src/app/home-page/home-page.resolver.ts index a25973fe45..76f27edbf1 100644 --- a/src/app/home-page/home-page.resolver.ts +++ b/src/app/home-page/home-page.resolver.ts @@ -10,7 +10,7 @@ import { take } from 'rxjs/operators'; import { SiteDataService } from '../core/data/site-data.service'; import { Site } from '../core/shared/site.model'; -export const HomePageResolver: ResolveFn = ( +export const homePageResolver: ResolveFn = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, siteService: SiteDataService = inject(SiteDataService), diff --git a/src/app/info/info-routes.ts b/src/app/info/info-routes.ts index 8697529619..982bbac94e 100644 --- a/src/app/info/info-routes.ts +++ b/src/app/info/info-routes.ts @@ -1,5 +1,5 @@ import { environment } from '../../environments/environment'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { FeedbackGuard } from '../core/feedback/feedback.guard'; import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component'; import { ThemedFeedbackComponent } from './feedback/themed-feedback.component'; @@ -15,20 +15,20 @@ export const ROUTES = [ { path: FEEDBACK_PATH, component: ThemedFeedbackComponent, - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, data: { title: 'info.feedback.title', breadcrumbKey: 'info.feedback' }, canActivate: [FeedbackGuard], }, environment.info.enableEndUserAgreement ? { path: END_USER_AGREEMENT_PATH, component: ThemedEndUserAgreementComponent, - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, data: { title: 'info.end-user-agreement.title', breadcrumbKey: 'info.end-user-agreement' }, } : undefined, environment.info.enablePrivacyStatement ? { path: PRIVACY_PATH, component: ThemedPrivacyComponent, - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, data: { title: 'info.privacy.title', breadcrumbKey: 'info.privacy' }, } : undefined, ]; diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts index 49b1ffa5fb..e8b216aa52 100644 --- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts +++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts @@ -146,7 +146,7 @@ export class UploadBitstreamComponent implements OnInit, OnDestroy { /** * Initialize component properties: - * itemRD$ Fetched from the current route data (populated by BitstreamPageResolver) + * itemRD$ Fetched from the current route data (populated by bitstreamPageResolver) * selectedBundleId Starts off by checking if the route's queryParams contain a "bundle" parameter. If none is found, * the ID of the first bundle in the list is selected. * Calls setUploadUrl after setting the selected bundle diff --git a/src/app/item-page/edit-item-page/edit-item-page-routes.ts b/src/app/item-page/edit-item-page/edit-item-page-routes.ts index fe1fb11c7c..1b1e43a883 100644 --- a/src/app/item-page/edit-item-page/edit-item-page-routes.ts +++ b/src/app/item-page/edit-item-page/edit-item-page-routes.ts @@ -3,12 +3,12 @@ import { Route, } from '@angular/router'; -import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component'; import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component'; import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component'; -import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver'; -import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver'; +import { resourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver'; +import { resourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver'; import { EditItemPageComponent } from './edit-item-page.component'; import { ITEM_EDIT_AUTHORIZATIONS_PATH, @@ -55,7 +55,7 @@ export const ROUTES: Route[] = [ { path: '', resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { breadcrumbKey: 'item.edit' }, children: [ @@ -173,7 +173,7 @@ export const ROUTES: Route[] = [ { path: 'create', resolve: { - resourcePolicyTarget: ResourcePolicyTargetResolver, + resourcePolicyTarget: resourcePolicyTargetResolver, }, component: ResourcePolicyCreateComponent, data: { title: 'resource-policies.create.page.title' }, @@ -181,7 +181,7 @@ export const ROUTES: Route[] = [ { path: 'edit', resolve: { - resourcePolicy: ResourcePolicyResolver, + resourcePolicy: resourcePolicyResolver, }, component: ResourcePolicyEditComponent, data: { title: 'resource-policies.edit.page.title' }, diff --git a/src/app/item-page/edit-item-page/item-page-access-control.guard.ts b/src/app/item-page/edit-item-page/item-page-access-control.guard.ts index e6c503e6ad..42ee1f3d15 100644 --- a/src/app/item-page/edit-item-page/item-page-access-control.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-access-control.guard.ts @@ -16,7 +16,7 @@ import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { RemoteData } from '../../core/data/remote-data'; import { Item } from '../../core/shared/item.model'; -import { ItemPageResolver } from '../item-page.resolver'; +import { itemPageResolver } from '../item-page.resolver'; @Injectable({ providedIn: 'root', @@ -26,7 +26,7 @@ import { ItemPageResolver } from '../item-page.resolver'; */ export class ItemPageAccessControlGuard extends DsoPageSingleFeatureGuard { - protected resolver: ResolveFn> = ItemPageResolver; + protected resolver: ResolveFn> = itemPageResolver; constructor(protected authorizationService: AuthorizationDataService, protected router: Router, diff --git a/src/app/item-page/edit-item-page/item-page-bitstreams.guard.ts b/src/app/item-page/edit-item-page/item-page-bitstreams.guard.ts index db9f09be28..396064b524 100644 --- a/src/app/item-page/edit-item-page/item-page-bitstreams.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-bitstreams.guard.ts @@ -16,7 +16,7 @@ import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { RemoteData } from '../../core/data/remote-data'; import { Item } from '../../core/shared/item.model'; -import { ItemPageResolver } from '../item-page.resolver'; +import { itemPageResolver } from '../item-page.resolver'; @Injectable({ providedIn: 'root', @@ -26,7 +26,7 @@ import { ItemPageResolver } from '../item-page.resolver'; */ export class ItemPageBitstreamsGuard extends DsoPageSingleFeatureGuard { - protected resolver: ResolveFn> = ItemPageResolver; + protected resolver: ResolveFn> = itemPageResolver; constructor(protected authorizationService: AuthorizationDataService, protected router: Router, diff --git a/src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts b/src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts index f536e0b000..aee0a60371 100644 --- a/src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts @@ -16,7 +16,7 @@ import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { RemoteData } from '../../core/data/remote-data'; import { Item } from '../../core/shared/item.model'; -import { ItemPageResolver } from '../item-page.resolver'; +import { itemPageResolver } from '../item-page.resolver'; @Injectable({ providedIn: 'root', @@ -26,7 +26,7 @@ import { ItemPageResolver } from '../item-page.resolver'; */ export class ItemPageCollectionMapperGuard extends DsoPageSingleFeatureGuard { - protected resolver: ResolveFn> = ItemPageResolver; + protected resolver: ResolveFn> = itemPageResolver; constructor(protected authorizationService: AuthorizationDataService, protected router: Router, diff --git a/src/app/item-page/edit-item-page/item-page-curate.guard.ts b/src/app/item-page/edit-item-page/item-page-curate.guard.ts index 3aed5122a0..392bc5c523 100644 --- a/src/app/item-page/edit-item-page/item-page-curate.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-curate.guard.ts @@ -16,7 +16,7 @@ import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { RemoteData } from '../../core/data/remote-data'; import { Item } from '../../core/shared/item.model'; -import { ItemPageResolver } from '../item-page.resolver'; +import { itemPageResolver } from '../item-page.resolver'; @Injectable({ providedIn: 'root', @@ -26,7 +26,7 @@ import { ItemPageResolver } from '../item-page.resolver'; */ export class ItemPageCurateGuard extends DsoPageSingleFeatureGuard { - protected resolver: ResolveFn> = ItemPageResolver; + protected resolver: ResolveFn> = itemPageResolver; constructor(protected authorizationService: AuthorizationDataService, protected router: Router, diff --git a/src/app/item-page/edit-item-page/item-page-metadata.guard.ts b/src/app/item-page/edit-item-page/item-page-metadata.guard.ts index dd1a5b996a..1d6d75df2a 100644 --- a/src/app/item-page/edit-item-page/item-page-metadata.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-metadata.guard.ts @@ -16,7 +16,7 @@ import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { RemoteData } from '../../core/data/remote-data'; import { Item } from '../../core/shared/item.model'; -import { ItemPageResolver } from '../item-page.resolver'; +import { itemPageResolver } from '../item-page.resolver'; @Injectable({ providedIn: 'root', @@ -26,7 +26,7 @@ import { ItemPageResolver } from '../item-page.resolver'; */ export class ItemPageMetadataGuard extends DsoPageSingleFeatureGuard { - protected resolver: ResolveFn> = ItemPageResolver; + protected resolver: ResolveFn> = itemPageResolver; constructor(protected authorizationService: AuthorizationDataService, protected router: Router, diff --git a/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts b/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts index b886d2a8eb..18c7939852 100644 --- a/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts @@ -16,7 +16,7 @@ import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { RemoteData } from '../../core/data/remote-data'; import { Item } from '../../core/shared/item.model'; -import { ItemPageResolver } from '../item-page.resolver'; +import { itemPageResolver } from '../item-page.resolver'; @Injectable({ providedIn: 'root', @@ -26,7 +26,7 @@ import { ItemPageResolver } from '../item-page.resolver'; */ export class ItemPageRegisterDoiGuard extends DsoPageSingleFeatureGuard { - protected resolver: ResolveFn> = ItemPageResolver; + protected resolver: ResolveFn> = itemPageResolver; constructor(protected authorizationService: AuthorizationDataService, protected router: Router, diff --git a/src/app/item-page/edit-item-page/item-page-reinstate.guard.ts b/src/app/item-page/edit-item-page/item-page-reinstate.guard.ts index 0e2d345a7a..aacf2f3e7d 100644 --- a/src/app/item-page/edit-item-page/item-page-reinstate.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-reinstate.guard.ts @@ -16,7 +16,7 @@ import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { RemoteData } from '../../core/data/remote-data'; import { Item } from '../../core/shared/item.model'; -import { ItemPageResolver } from '../item-page.resolver'; +import { itemPageResolver } from '../item-page.resolver'; @Injectable({ providedIn: 'root', @@ -26,7 +26,7 @@ import { ItemPageResolver } from '../item-page.resolver'; */ export class ItemPageReinstateGuard extends DsoPageSingleFeatureGuard { - protected resolver: ResolveFn> = ItemPageResolver; + protected resolver: ResolveFn> = itemPageResolver; constructor(protected authorizationService: AuthorizationDataService, protected router: Router, diff --git a/src/app/item-page/edit-item-page/item-page-relationships.guard.ts b/src/app/item-page/edit-item-page/item-page-relationships.guard.ts index 556a032f30..5d16ae8751 100644 --- a/src/app/item-page/edit-item-page/item-page-relationships.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-relationships.guard.ts @@ -16,7 +16,7 @@ import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { RemoteData } from '../../core/data/remote-data'; import { Item } from '../../core/shared/item.model'; -import { ItemPageResolver } from '../item-page.resolver'; +import { itemPageResolver } from '../item-page.resolver'; @Injectable({ providedIn: 'root', @@ -26,7 +26,7 @@ import { ItemPageResolver } from '../item-page.resolver'; */ export class ItemPageRelationshipsGuard extends DsoPageSingleFeatureGuard { - protected resolver: ResolveFn> = ItemPageResolver; + protected resolver: ResolveFn> = itemPageResolver; constructor(protected authorizationService: AuthorizationDataService, protected router: Router, diff --git a/src/app/item-page/edit-item-page/item-page-status.guard.ts b/src/app/item-page/edit-item-page/item-page-status.guard.ts index 803f3c15f6..372b072e19 100644 --- a/src/app/item-page/edit-item-page/item-page-status.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-status.guard.ts @@ -16,7 +16,7 @@ import { DsoPageSomeFeatureGuard } from '../../core/data/feature-authorization/f import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { RemoteData } from '../../core/data/remote-data'; import { Item } from '../../core/shared/item.model'; -import { ItemPageResolver } from '../item-page.resolver'; +import { itemPageResolver } from '../item-page.resolver'; @Injectable({ providedIn: 'root', @@ -27,7 +27,7 @@ import { ItemPageResolver } from '../item-page.resolver'; */ export class ItemPageStatusGuard extends DsoPageSomeFeatureGuard { - protected resolver: ResolveFn> = ItemPageResolver; + protected resolver: ResolveFn> = itemPageResolver; constructor(protected authorizationService: AuthorizationDataService, protected router: Router, diff --git a/src/app/item-page/edit-item-page/item-page-version-history.guard.ts b/src/app/item-page/edit-item-page/item-page-version-history.guard.ts index 757312a4c3..dc512527ad 100644 --- a/src/app/item-page/edit-item-page/item-page-version-history.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-version-history.guard.ts @@ -16,7 +16,7 @@ import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { RemoteData } from '../../core/data/remote-data'; import { Item } from '../../core/shared/item.model'; -import { ItemPageResolver } from '../item-page.resolver'; +import { itemPageResolver } from '../item-page.resolver'; @Injectable({ providedIn: 'root', @@ -26,7 +26,7 @@ import { ItemPageResolver } from '../item-page.resolver'; */ export class ItemPageVersionHistoryGuard extends DsoPageSingleFeatureGuard { - protected resolver: ResolveFn> = ItemPageResolver; + protected resolver: ResolveFn> = itemPageResolver; constructor(protected authorizationService: AuthorizationDataService, protected router: Router, diff --git a/src/app/item-page/edit-item-page/item-page-withdraw.guard.ts b/src/app/item-page/edit-item-page/item-page-withdraw.guard.ts index bafe80e3d8..464386edfc 100644 --- a/src/app/item-page/edit-item-page/item-page-withdraw.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-withdraw.guard.ts @@ -16,7 +16,7 @@ import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { RemoteData } from '../../core/data/remote-data'; import { Item } from '../../core/shared/item.model'; -import { ItemPageResolver } from '../item-page.resolver'; +import { itemPageResolver } from '../item-page.resolver'; @Injectable({ providedIn: 'root', @@ -26,7 +26,7 @@ import { ItemPageResolver } from '../item-page.resolver'; */ export class ItemPageWithdrawGuard extends DsoPageSingleFeatureGuard { - protected resolver: ResolveFn> = ItemPageResolver; + protected resolver: ResolveFn> = itemPageResolver; constructor(protected authorizationService: AuthorizationDataService, protected router: Router, diff --git a/src/app/item-page/item-page-administrator.guard.ts b/src/app/item-page/item-page-administrator.guard.ts index 4947acd8ad..117ebf5899 100644 --- a/src/app/item-page/item-page-administrator.guard.ts +++ b/src/app/item-page/item-page-administrator.guard.ts @@ -16,7 +16,7 @@ import { DsoPageSingleFeatureGuard } from '../core/data/feature-authorization/fe import { FeatureID } from '../core/data/feature-authorization/feature-id'; import { RemoteData } from '../core/data/remote-data'; import { Item } from '../core/shared/item.model'; -import { ItemPageResolver } from './item-page.resolver'; +import { itemPageResolver } from './item-page.resolver'; @Injectable({ providedIn: 'root', @@ -26,7 +26,7 @@ import { ItemPageResolver } from './item-page.resolver'; */ export class ItemPageAdministratorGuard extends DsoPageSingleFeatureGuard { - protected resolver: ResolveFn> = ItemPageResolver; + protected resolver: ResolveFn> = itemPageResolver; constructor(protected authorizationService: AuthorizationDataService, protected router: Router, diff --git a/src/app/item-page/item-page-routes.ts b/src/app/item-page/item-page-routes.ts index 357028d68e..cfa6cf22d2 100644 --- a/src/app/item-page/item-page-routes.ts +++ b/src/app/item-page/item-page-routes.ts @@ -5,14 +5,14 @@ import { import { REQUEST_COPY_MODULE_PATH } from '../app-routing-paths'; import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; -import { ItemBreadcrumbResolver } from '../core/breadcrumbs/item-breadcrumb.resolver'; -import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; +import { itemBreadcrumbResolver } from '../core/breadcrumbs/item-breadcrumb.resolver'; +import { dsoEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model'; import { MenuItemType } from '../shared/menu/menu-item-type.model'; 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'; -import { ItemPageResolver } from './item-page.resolver'; +import { itemPageResolver } from './item-page.resolver'; import { ITEM_EDIT_PATH, ORCID_PATH, @@ -21,16 +21,16 @@ import { import { OrcidPageComponent } from './orcid-page/orcid-page.component'; import { OrcidPageGuard } from './orcid-page/orcid-page.guard'; 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'; export const ROUTES: Route[] = [ { path: ':id', resolve: { - dso: ItemPageResolver, - breadcrumb: ItemBreadcrumbResolver, - menu: DSOEditMenuResolver, + dso: itemPageResolver, + breadcrumb: itemBreadcrumbResolver, + menu: dsoEditMenuResolver, }, runGuardsAndResolvers: 'always', children: [ @@ -86,7 +86,7 @@ export const ROUTES: Route[] = [ path: ':id', component: VersionPageComponent, resolve: { - dso: VersionResolver, + dso: versionResolver, }, }, ], diff --git a/src/app/item-page/item-page.resolver.spec.ts b/src/app/item-page/item-page.resolver.spec.ts index 4a59af8ce0..43b111211b 100644 --- a/src/app/item-page/item-page.resolver.spec.ts +++ b/src/app/item-page/item-page.resolver.spec.ts @@ -6,9 +6,9 @@ import { first } from 'rxjs/operators'; import { DSpaceObject } from '../core/shared/dspace-object.model'; import { MetadataValueFilter } from '../core/shared/metadata.models'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; -import { ItemPageResolver } from './item-page.resolver'; +import { itemPageResolver } from './item-page.resolver'; -describe('ItemPageResolver', () => { +describe('itemPageResolver', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [RouterTestingModule.withRoutes([{ @@ -42,7 +42,7 @@ describe('ItemPageResolver', () => { store = jasmine.createSpyObj('store', { dispatch: {}, }); - resolver = ItemPageResolver; + resolver = itemPageResolver; }); it('should redirect to the correct route for the entity type', (done) => { diff --git a/src/app/item-page/item-page.resolver.ts b/src/app/item-page/item-page.resolver.ts index 01e4a3db09..b4556886cc 100644 --- a/src/app/item-page/item-page.resolver.ts +++ b/src/app/item-page/item-page.resolver.ts @@ -29,7 +29,7 @@ import { getItemPageRoute } from './item-page-routing-paths'; * @returns Observable<> Emits the found item based on the parameters in the current route, * or an error if something went wrong */ -export const ItemPageResolver: ResolveFn> = ( +export const itemPageResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, router: Router = inject(Router), diff --git a/src/app/item-page/item.resolver.ts b/src/app/item-page/item.resolver.ts index c41fe86d0c..343e0d1983 100644 --- a/src/app/item-page/item.resolver.ts +++ b/src/app/item-page/item.resolver.ts @@ -32,7 +32,7 @@ export const ITEM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig[] = [ followLink('thumbnail'), ]; -export const ItemResolver: ResolveFn> = ( +export const itemResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, itemService: ItemDataService = inject(ItemDataService), diff --git a/src/app/item-page/orcid-page/orcid-page.guard.ts b/src/app/item-page/orcid-page/orcid-page.guard.ts index b1fc7cea2f..44c74c684e 100644 --- a/src/app/item-page/orcid-page/orcid-page.guard.ts +++ b/src/app/item-page/orcid-page/orcid-page.guard.ts @@ -16,7 +16,7 @@ import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { RemoteData } from '../../core/data/remote-data'; import { Item } from '../../core/shared/item.model'; -import { ItemPageResolver } from '../item-page.resolver'; +import { itemPageResolver } from '../item-page.resolver'; @Injectable({ providedIn: 'root', @@ -26,7 +26,7 @@ import { ItemPageResolver } from '../item-page.resolver'; */ export class OrcidPageGuard extends DsoPageSingleFeatureGuard { - protected resolver: ResolveFn> = ItemPageResolver; + protected resolver: ResolveFn> = itemPageResolver; constructor(protected authorizationService: AuthorizationDataService, protected router: Router, diff --git a/src/app/item-page/version-page/version.resolver.ts b/src/app/item-page/version-page/version.resolver.ts index 1e20e1fefc..0364d4ac0d 100644 --- a/src/app/item-page/version-page/version.resolver.ts +++ b/src/app/item-page/version-page/version.resolver.ts @@ -35,7 +35,7 @@ export const VERSION_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig[] = [ * @returns Observable<> Emits the found item based on the parameters in the current route, * or an error if something went wrong */ -export const VersionResolver: ResolveFn> = ( +export const versionResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, versionService: VersionDataService = inject(VersionDataService), diff --git a/src/app/login-page/login-page-routes.ts b/src/app/login-page/login-page-routes.ts index 4833a80076..661c9f9858 100644 --- a/src/app/login-page/login-page-routes.ts +++ b/src/app/login-page/login-page-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ThemedLoginPageComponent } from './themed-login-page.component'; export const ROUTES: Route[] = [ @@ -8,7 +8,7 @@ export const ROUTES: Route[] = [ path: '', pathMatch: 'full', component: ThemedLoginPageComponent, - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, data: { breadcrumbKey: 'login', title: 'login.title' }, }, ]; diff --git a/src/app/menu.resolver.spec.ts b/src/app/menu.resolver.spec.ts index bc35655f01..386bbb0cae 100644 --- a/src/app/menu.resolver.spec.ts +++ b/src/app/menu.resolver.spec.ts @@ -38,7 +38,7 @@ const BROWSE_DEFINITIONS = [ { id: 'definition3' }, ]; -describe('MenuResolver', () => { +describe('menuResolver', () => { let resolver: MenuResolverService; let menuService; diff --git a/src/app/menu.resolver.ts b/src/app/menuResolver.ts similarity index 90% rename from src/app/menu.resolver.ts rename to src/app/menuResolver.ts index ec99ee753d..68ad4494dd 100644 --- a/src/app/menu.resolver.ts +++ b/src/app/menuResolver.ts @@ -12,7 +12,7 @@ import { MenuResolverService } from './menu-resolver.service'; /** * Initialize all menus */ -export const MenuResolver: ResolveFn = ( +export const menuResolver: ResolveFn = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, menuResolverService: MenuResolverService = inject(MenuResolverService), diff --git a/src/app/my-dspace-page/my-dspace-page-routes.ts b/src/app/my-dspace-page/my-dspace-page-routes.ts index 706385563f..ac13667ec9 100644 --- a/src/app/my-dspace-page/my-dspace-page-routes.ts +++ b/src/app/my-dspace-page/my-dspace-page-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { MyDSpaceGuard } from './my-dspace.guard'; import { ThemedMyDSpacePageComponent } from './themed-my-dspace-page.component'; @@ -9,7 +9,7 @@ export const ROUTES: Route[] = [ path: '', component: ThemedMyDSpacePageComponent, resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { title: 'mydspace.title', breadcrumbKey: 'mydspace' }, canActivate: [ diff --git a/src/app/process-page/process-breadcrumb.resolver.spec.ts b/src/app/process-page/process-breadcrumb.resolver.spec.ts index 6384b01917..ce579e715f 100644 --- a/src/app/process-page/process-breadcrumb.resolver.spec.ts +++ b/src/app/process-page/process-breadcrumb.resolver.spec.ts @@ -1,9 +1,9 @@ import { ProcessDataService } from '../core/data/processes/process-data.service'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; -import { ProcessBreadcrumbResolver } from './process-breadcrumb.resolver'; +import { processBreadcrumbResolver } from './process-breadcrumb.resolver'; import { Process } from './processes/process.model'; -describe('ProcessBreadcrumbResolver', () => { +describe('processBreadcrumbResolver', () => { describe('resolve', () => { let resolver: any; let processDataService: ProcessDataService; @@ -19,7 +19,7 @@ describe('ProcessBreadcrumbResolver', () => { processDataService = { findById: () => createSuccessfulRemoteDataObject$(process), } as any; - resolver = ProcessBreadcrumbResolver; + resolver = processBreadcrumbResolver; }); it('should resolve the breadcrumb config', (done) => { diff --git a/src/app/process-page/process-breadcrumb.resolver.ts b/src/app/process-page/process-breadcrumb.resolver.ts index a23d790c71..95596cfe2f 100644 --- a/src/app/process-page/process-breadcrumb.resolver.ts +++ b/src/app/process-page/process-breadcrumb.resolver.ts @@ -24,7 +24,7 @@ import { Process } from './processes/process.model'; * @returns Observable<> Emits the found process based on the parameters in the current route, * or an error if something went wrong */ -export const ProcessBreadcrumbResolver: ResolveFn> = ( +export const processBreadcrumbResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, breadcrumbService: ProcessBreadcrumbsService = inject(ProcessBreadcrumbsService), diff --git a/src/app/process-page/process-page-routes.ts b/src/app/process-page/process-page-routes.ts index 55893090b7..c132ebf515 100644 --- a/src/app/process-page/process-page-routes.ts +++ b/src/app/process-page/process-page-routes.ts @@ -1,17 +1,17 @@ import { Route } from '@angular/router'; import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ProcessDetailComponent } from './detail/process-detail.component'; import { NewProcessComponent } from './new/new-process.component'; import { ProcessOverviewComponent } from './overview/process-overview.component'; -import { ProcessBreadcrumbResolver } from './process-breadcrumb.resolver'; -import { ProcessPageResolver } from './process-page.resolver'; +import { processBreadcrumbResolver } from './process-breadcrumb.resolver'; +import { processPageResolver } from './process-page.resolver'; export const ROUTES: Route[] = [ { path: '', - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, data: { breadcrumbKey: 'process.overview' }, canActivate: [AuthenticatedGuard], children: [ @@ -23,15 +23,15 @@ export const ROUTES: Route[] = [ { path: 'new', component: NewProcessComponent, - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, data: { title: 'process.new.title', breadcrumbKey: 'process.new' }, }, { path: ':id', component: ProcessDetailComponent, resolve: { - process: ProcessPageResolver, - breadcrumb: ProcessBreadcrumbResolver, + process: processPageResolver, + breadcrumb: processBreadcrumbResolver, }, }, ], diff --git a/src/app/process-page/process-page.resolver.ts b/src/app/process-page/process-page.resolver.ts index 029e1dfd8f..3a074ce225 100644 --- a/src/app/process-page/process-page.resolver.ts +++ b/src/app/process-page/process-page.resolver.ts @@ -24,7 +24,7 @@ export const PROCESS_PAGE_FOLLOW_LINKS = [ * @returns Observable<> Emits the found process based on the parameters in the current route, * or an error if something went wrong */ -export const ProcessPageResolver: ResolveFn> = ( +export const processPageResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, processService: ProcessDataService = inject(ProcessDataService), diff --git a/src/app/profile-page/profile-page-routes.ts b/src/app/profile-page/profile-page-routes.ts index baeabedc0c..a4e8d6925f 100644 --- a/src/app/profile-page/profile-page-routes.ts +++ b/src/app/profile-page/profile-page-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ThemedProfilePageComponent } from './themed-profile-page.component'; export const ROUTES: Route[] = [ @@ -8,7 +8,7 @@ export const ROUTES: Route[] = [ path: '', pathMatch: 'full', component: ThemedProfilePageComponent, - resolve: { breadcrumb: I18nBreadcrumbResolver }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, data: { breadcrumbKey: 'profile', title: 'profile.title' }, }, ]; diff --git a/src/app/quality-assurance-notifications-pages/notifications-pages-routes.ts b/src/app/quality-assurance-notifications-pages/notifications-pages-routes.ts index 661fe02f24..9e468b4035 100644 --- a/src/app/quality-assurance-notifications-pages/notifications-pages-routes.ts +++ b/src/app/quality-assurance-notifications-pages/notifications-pages-routes.ts @@ -1,8 +1,8 @@ import { Route } from '@angular/router'; import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { QualityAssuranceBreadcrumbResolver } from '../core/breadcrumbs/quality-assurance-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { qualityAssuranceBreadcrumbResolver } from '../core/breadcrumbs/quality-assurance-breadcrumb.resolver'; import { NOTIFICATIONS_RECITER_SUGGESTION_PATH, QUALITY_ASSURANCE_EDIT_PATH, @@ -10,8 +10,8 @@ import { import { NotificationsSuggestionTargetsPageComponent } from './notifications-suggestion-targets-page/notifications-suggestion-targets-page.component'; import { AdminNotificationsPublicationClaimPageResolver } from './notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service'; import { QualityAssuranceEventsPageComponent } from './quality-assurance-events-page/quality-assurance-events-page.component'; -import { QualityAssuranceEventsPageResolver } from './quality-assurance-events-page/quality-assurance-events-page.resolver'; -import { SourceDataResolver } from './quality-assurance-source-page-component/quality-assurance-source-data.resolver'; +import { qualityAssuranceEventsPageResolver } from './quality-assurance-events-page/quality-assurance-events-page.resolver'; +import { qualityAssuranceSourceDataResolver } from './quality-assurance-source-page-component/quality-assurance-source-data.resolver'; import { QualityAssuranceSourcePageComponent } from './quality-assurance-source-page-component/quality-assurance-source-page.component'; import { QualityAssuranceSourcePageResolver } from './quality-assurance-source-page-component/quality-assurance-source-page-resolver.service'; import { QualityAssuranceTopicsPageComponent } from './quality-assurance-topics-page/quality-assurance-topics-page.component'; @@ -24,7 +24,7 @@ export const ROUTES: Route[] = [ component: NotificationsSuggestionTargetsPageComponent, pathMatch: 'full', resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, reciterSuggestionTargetParams: AdminNotificationsPublicationClaimPageResolver, }, data: { @@ -39,7 +39,7 @@ export const ROUTES: Route[] = [ component: QualityAssuranceTopicsPageComponent, pathMatch: 'full', resolve: { - breadcrumb: QualityAssuranceBreadcrumbResolver, + breadcrumb: qualityAssuranceBreadcrumbResolver, openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver, }, data: { @@ -54,7 +54,7 @@ export const ROUTES: Route[] = [ component: QualityAssuranceTopicsPageComponent, pathMatch: 'full', resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver, }, data: { @@ -69,9 +69,9 @@ export const ROUTES: Route[] = [ component: QualityAssuranceSourcePageComponent, pathMatch: 'full', resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, openaireQualityAssuranceSourceParams: QualityAssuranceSourcePageResolver, - sourceData: SourceDataResolver, + sourceData: qualityAssuranceSourceDataResolver, }, data: { title: 'admin.notifications.source.breadcrumbs', @@ -85,8 +85,8 @@ export const ROUTES: Route[] = [ component: QualityAssuranceEventsPageComponent, pathMatch: 'full', resolve: { - breadcrumb: QualityAssuranceBreadcrumbResolver, - openaireQualityAssuranceEventsParams: QualityAssuranceEventsPageResolver, + breadcrumb: qualityAssuranceBreadcrumbResolver, + openaireQualityAssuranceEventsParams: qualityAssuranceEventsPageResolver, }, data: { title: 'admin.notifications.event.page.title', diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver.ts index 9b61fc6209..b0c3bdc978 100644 --- a/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver.ts +++ b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver.ts @@ -19,7 +19,7 @@ export interface AssuranceEventsPageParams { * @param {RouterStateSnapshot} state The current RouterStateSnapshot * @returns AdminQualityAssuranceEventsPageParams Emits the route parameters */ -export const QualityAssuranceEventsPageResolver: ResolveFn = ( +export const qualityAssuranceEventsPageResolver: ResolveFn = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, ): AssuranceEventsPageParams => { diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts index 4d2d24dcf9..42ff19299e 100644 --- a/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts +++ b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts @@ -25,7 +25,7 @@ import { QualityAssuranceSourceService } from '../../notifications/qa/source/qua * @param appConfig * @returns Observable */ -export const SourceDataResolver: ResolveFn = ( +export const qualityAssuranceSourceDataResolver: ResolveFn = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, router: Router = inject(Router), diff --git a/src/app/register-email-form/registration.resolver.spec.ts b/src/app/register-email-form/registration.resolver.spec.ts index 3515383da3..f3b6b0e404 100644 --- a/src/app/register-email-form/registration.resolver.spec.ts +++ b/src/app/register-email-form/registration.resolver.spec.ts @@ -3,9 +3,9 @@ import { first } from 'rxjs/operators'; import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; import { Registration } from '../core/shared/registration.model'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; -import { RegistrationResolver } from './registration.resolver'; +import { registrationResolver } from './registration.resolver'; -describe('RegistrationResolver', () => { +describe('registrationResolver', () => { let resolver: any; let epersonRegistrationService: EpersonRegistrationService; @@ -16,7 +16,7 @@ describe('RegistrationResolver', () => { epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', { searchByToken: createSuccessfulRemoteDataObject$(registration), }); - resolver = RegistrationResolver; + resolver = registrationResolver; }); describe('resolve', () => { it('should resolve a registration based on the token', (done) => { diff --git a/src/app/register-email-form/registration.resolver.ts b/src/app/register-email-form/registration.resolver.ts index 43a8a2f624..b87f70bf4e 100644 --- a/src/app/register-email-form/registration.resolver.ts +++ b/src/app/register-email-form/registration.resolver.ts @@ -11,7 +11,7 @@ import { RemoteData } from '../core/data/remote-data'; import { getFirstCompletedRemoteData } from '../core/shared/operators'; import { Registration } from '../core/shared/registration.model'; -export const RegistrationResolver: ResolveFn> = ( +export const registrationResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, epersonRegistrationService: EpersonRegistrationService = inject(EpersonRegistrationService), diff --git a/src/app/request-copy/request-copy-routes.ts b/src/app/request-copy/request-copy-routes.ts index 17a2d39c1b..9eacb4b643 100644 --- a/src/app/request-copy/request-copy-routes.ts +++ b/src/app/request-copy/request-copy-routes.ts @@ -3,7 +3,7 @@ import { Route } from '@angular/router'; import { ThemedDenyRequestCopyComponent } from './deny-request-copy/themed-deny-request-copy.component'; import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component'; import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-grant-request-copy.component'; -import { RequestCopyResolver } from './request-copy.resolver'; +import { requestCopyResolver } from './request-copy.resolver'; import { REQUEST_COPY_DENY_PATH, REQUEST_COPY_GRANT_PATH, @@ -13,7 +13,7 @@ export const ROUTES: Route[] = [ { path: ':token', resolve: { - request: RequestCopyResolver, + request: requestCopyResolver, }, children: [ { diff --git a/src/app/request-copy/request-copy.resolver.ts b/src/app/request-copy/request-copy.resolver.ts index 7617239df5..b91e1b7d8c 100644 --- a/src/app/request-copy/request-copy.resolver.ts +++ b/src/app/request-copy/request-copy.resolver.ts @@ -11,7 +11,7 @@ import { RemoteData } from '../core/data/remote-data'; import { ItemRequest } from '../core/shared/item-request.model'; import { getFirstCompletedRemoteData } from '../core/shared/operators'; -export const RequestCopyResolver: ResolveFn> = ( +export const requestCopyResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, itemRequestDataService: ItemRequestDataService = inject(ItemRequestDataService), diff --git a/src/app/search-page/search-page-routes.ts b/src/app/search-page/search-page-routes.ts index f9214459b3..4fccad12ad 100644 --- a/src/app/search-page/search-page-routes.ts +++ b/src/app/search-page/search-page-routes.ts @@ -1,13 +1,13 @@ import { Route } from '@angular/router'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ConfigurationSearchPageGuard } from './configuration-search-page.guard'; import { ThemedConfigurationSearchPageComponent } from './themed-configuration-search-page.component'; import { ThemedSearchPageComponent } from './themed-search-page.component'; export const ROUTES: Route[] = [{ path: '', - resolve: { breadcrumb: I18nBreadcrumbResolver }, data: { title: 'search.title', breadcrumbKey: 'search' }, + resolve: { breadcrumb: i18nBreadcrumbResolver }, data: { title: 'search.title', breadcrumbKey: 'search' }, children: [ { path: '', component: ThemedSearchPageComponent }, { diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts index 8ed5ee9af2..461f0e3934 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts @@ -44,7 +44,7 @@ import { DSOEditMenuResolverService } from './dso-edit-menu-resolver.service'; import { DsoVersioningModalService } from './dso-versioning-modal-service/dso-versioning-modal.service'; import { DsoWithdrawnReinstateModalService } from './dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service'; -describe('DSOEditMenuResolver', () => { +describe('dsoEditMenuResolver', () => { const MENU_STATE = { id: 'some menu', diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts index 6058e63241..2592357b9a 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts @@ -12,7 +12,7 @@ import { DSOEditMenuResolverService } from './dso-edit-menu-resolver.service'; /** * Initialise all dspace object related menus */ -export const DSOEditMenuResolver: ResolveFn<{ [key: string]: MenuSection[] }> = ( +export const dsoEditMenuResolver: ResolveFn<{ [key: string]: MenuSection[] }> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, menuResolverService: DSOEditMenuResolverService = inject(DSOEditMenuResolverService), diff --git a/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts b/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts index ad28618cf1..76748efad1 100644 --- a/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts +++ b/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts @@ -31,7 +31,7 @@ import { isEmpty } from '../../empty.util'; * @returns Observable<> Emits the found item based on the parameters in the current route, * or an error if something went wrong */ -export const ResourcePolicyTargetResolver: ResolveFn> = ( +export const resourcePolicyTargetResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, dataServiceMap: InjectionToken = inject(InjectionToken), diff --git a/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts b/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts index 225c8383ec..70f4b48dcf 100644 --- a/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts +++ b/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts @@ -23,7 +23,7 @@ import { followLink } from '../../utils/follow-link-config.model'; * @returns Observable<> Emits the found item based on the parameters in the current route, * or an error if something went wrong */ -export const ResourcePolicyResolver: ResolveFn> = ( +export const resourcePolicyResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, router: Router = inject(Router), diff --git a/src/app/statistics-page/statistics-page-routes.ts b/src/app/statistics-page/statistics-page-routes.ts index 5a4f36abb8..41a91ee3aa 100644 --- a/src/app/statistics-page/statistics-page-routes.ts +++ b/src/app/statistics-page/statistics-page-routes.ts @@ -3,11 +3,11 @@ import { Route, } from '@angular/router'; -import { CollectionPageResolver } from '../collection-page/collection-page.resolver'; -import { CommunityPageResolver } from '../community-page/community-page.resolver'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { collectionPageResolver } from '../collection-page/collection-page.resolver'; +import { communityPageResolver } from '../community-page/community-page.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { StatisticsAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/statistics-administrator.guard'; -import { ItemResolver } from '../item-page/item.resolver'; +import { itemResolver } from '../item-page/item.resolver'; import { ThemedCollectionStatisticsPageComponent } from './collection-statistics-page/themed-collection-statistics-page.component'; import { ThemedCommunityStatisticsPageComponent } from './community-statistics-page/themed-community-statistics-page.component'; import { ThemedItemStatisticsPageComponent } from './item-statistics-page/themed-item-statistics-page.component'; @@ -17,7 +17,7 @@ export const ROUTES: Route[] = [ { path: '', resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { title: 'statistics.title', @@ -34,8 +34,8 @@ export const ROUTES: Route[] = [ { path: `items/:id`, resolve: { - scope: ItemResolver, - breadcrumb: I18nBreadcrumbResolver, + scope: itemResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { title: 'statistics.title', @@ -47,8 +47,8 @@ export const ROUTES: Route[] = [ { path: `collections/:id`, resolve: { - scope: CollectionPageResolver, - breadcrumb: I18nBreadcrumbResolver, + scope: collectionPageResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { title: 'statistics.title', @@ -60,8 +60,8 @@ export const ROUTES: Route[] = [ { path: `communities/:id`, resolve: { - scope: CommunityPageResolver, - breadcrumb: I18nBreadcrumbResolver, + scope: communityPageResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { title: 'statistics.title', diff --git a/src/app/submit-page/submit-page-routes.ts b/src/app/submit-page/submit-page-routes.ts index fc3b7113d1..c0c53a2e5a 100644 --- a/src/app/submit-page/submit-page-routes.ts +++ b/src/app/submit-page/submit-page-routes.ts @@ -1,7 +1,7 @@ import { Route } from '@angular/router'; import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ThemedSubmissionSubmitComponent } from '../submission/submit/themed-submission-submit.component'; export const ROUTES: Route[] = [ @@ -11,7 +11,7 @@ export const ROUTES: Route[] = [ pathMatch: 'full', component: ThemedSubmissionSubmitComponent, resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { title: 'submission.submit.title', breadcrumbKey: 'submission.submit' }, }, diff --git a/src/app/suggestions-page/suggestions-page-routes.ts b/src/app/suggestions-page/suggestions-page-routes.ts index 392a0e4d98..58b3afafb3 100644 --- a/src/app/suggestions-page/suggestions-page-routes.ts +++ b/src/app/suggestions-page/suggestions-page-routes.ts @@ -1,16 +1,16 @@ import { Route } from '@angular/router'; import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; -import { PublicationClaimBreadcrumbResolver } from '../core/breadcrumbs/publication-claim-breadcrumb.resolver'; +import { publicationClaimBreadcrumbResolver } from '../core/breadcrumbs/publication-claim-breadcrumb.resolver'; import { SuggestionsPageComponent } from './suggestions-page.component'; -import { SuggestionsPageResolver } from './suggestions-page.resolver'; +import { suggestionsPageResolver } from './suggestions-page.resolver'; export const ROUTES: Route[] = [ { path: ':targetId', resolve: { - suggestionTargets: SuggestionsPageResolver, - breadcrumb: PublicationClaimBreadcrumbResolver,//I18nBreadcrumbResolver + suggestionTargets: suggestionsPageResolver, + breadcrumb: publicationClaimBreadcrumbResolver,//i18nBreadcrumbResolver }, data: { title: 'admin.notifications.publicationclaim.page.title', diff --git a/src/app/suggestions-page/suggestions-page.resolver.ts b/src/app/suggestions-page/suggestions-page.resolver.ts index 375059a48d..48c5a40f31 100644 --- a/src/app/suggestions-page/suggestions-page.resolver.ts +++ b/src/app/suggestions-page/suggestions-page.resolver.ts @@ -20,7 +20,7 @@ import { hasValue } from '../shared/empty.util'; * @returns Observable<> Emits the found collection based on the parameters in the current route, * or an error if something went wrong */ -export const SuggestionsPageResolver: ResolveFn> = ( +export const suggestionsPageResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, suggestionsDataService: SuggestionTargetDataService = inject(SuggestionTargetDataService), diff --git a/src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts b/src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts index c4bdafd255..9ee8eaed06 100644 --- a/src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts +++ b/src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts @@ -2,9 +2,9 @@ import { first } from 'rxjs/operators'; import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; -import { ItemFromWorkflowResolver } from './item-from-workflow.resolver'; +import { itemFromWorkflowResolver } from './item-from-workflow.resolver'; -describe('ItemFromWorkflowResolver', () => { +describe('itemFromWorkflowResolver', () => { describe('resolve', () => { let resolver: any; let wfiService: WorkflowItemDataService; @@ -20,7 +20,7 @@ describe('ItemFromWorkflowResolver', () => { wfiService = { findById: (id: string) => createSuccessfulRemoteDataObject$(wfi), } as any; - resolver = ItemFromWorkflowResolver; + resolver = itemFromWorkflowResolver; }); it('should resolve a an item from from the workflow item with the correct id', (done) => { diff --git a/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts b/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts index 9ed5f8f991..e76a147f52 100644 --- a/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts +++ b/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts @@ -11,7 +11,7 @@ import { Item } from '../core/shared/item.model'; import { SubmissionObjectResolver } from '../core/submission/resolver/submission-object.resolver'; import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service'; -export const ItemFromWorkflowResolver: ResolveFn> = ( +export const itemFromWorkflowResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, workflowItemService: WorkflowItemDataService = inject(WorkflowItemDataService), diff --git a/src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts b/src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts index efb09505ee..02754776a9 100644 --- a/src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts +++ b/src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts @@ -2,9 +2,9 @@ import { first } from 'rxjs/operators'; import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; -import { WorkflowItemPageResolver } from './workflow-item-page.resolver'; +import { workflowItemPageResolver } from './workflow-item-page.resolver'; -describe('WorkflowItemPageResolver', () => { +describe('workflowItemPageResolver', () => { describe('resolve', () => { let resolver: any; let wfiService: WorkflowItemDataService; @@ -14,7 +14,7 @@ describe('WorkflowItemPageResolver', () => { wfiService = { findById: (id: string) => createSuccessfulRemoteDataObject$({ id }), } as any; - resolver = WorkflowItemPageResolver; + resolver = workflowItemPageResolver; }); it('should resolve a workflow item with the correct id', (done) => { diff --git a/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts b/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts index 6f0b7b986b..d0f49d5700 100644 --- a/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts +++ b/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts @@ -12,7 +12,7 @@ import { WorkflowItem } from '../core/submission/models/workflowitem.model'; import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service'; import { followLink } from '../shared/utils/follow-link-config.model'; -export const WorkflowItemPageResolver: ResolveFn> = ( +export const workflowItemPageResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, workflowItemService: WorkflowItemDataService = inject(WorkflowItemDataService), diff --git a/src/app/workflowitems-edit-page/workflowitems-edit-page-routes.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page-routes.ts index f5b8efaad4..37b0d15055 100644 --- a/src/app/workflowitems-edit-page/workflowitems-edit-page-routes.ts +++ b/src/app/workflowitems-edit-page/workflowitems-edit-page-routes.ts @@ -1,13 +1,13 @@ import { Routes } from '@angular/router'; import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-page.component'; import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component'; import { AdvancedWorkflowActionPageComponent } from './advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component'; -import { ItemFromWorkflowResolver } from './item-from-workflow.resolver'; +import { itemFromWorkflowResolver } from './item-from-workflow.resolver'; import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed-workflow-item-delete.component'; -import { WorkflowItemPageResolver } from './workflow-item-page.resolver'; +import { workflowItemPageResolver } from './workflow-item-page.resolver'; import { ThemedWorkflowItemSendBackComponent } from './workflow-item-send-back/themed-workflow-item-send-back.component'; import { ADVANCED_WORKFLOW_PATH, @@ -20,14 +20,14 @@ import { export const ROUTES: Routes = [ { path: ':id', - resolve: { wfi: WorkflowItemPageResolver }, + resolve: { wfi: workflowItemPageResolver }, children: [ { canActivate: [AuthenticatedGuard], path: WORKFLOW_ITEM_EDIT_PATH, component: ThemedSubmissionEditComponent, resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { title: 'workflow-item.edit.title', @@ -40,8 +40,8 @@ export const ROUTES: Routes = [ path: WORKFLOW_ITEM_VIEW_PATH, component: ThemedFullItemPageComponent, resolve: { - dso: ItemFromWorkflowResolver, - breadcrumb: I18nBreadcrumbResolver, + dso: itemFromWorkflowResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { title: 'workflow-item.view.title', breadcrumbKey: 'workflow-item.view' }, }, @@ -50,7 +50,7 @@ export const ROUTES: Routes = [ path: WORKFLOW_ITEM_DELETE_PATH, component: ThemedWorkflowItemDeleteComponent, resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { title: 'workflow-item.delete.title', breadcrumbKey: 'workflow-item.edit' }, }, @@ -59,7 +59,7 @@ export const ROUTES: Routes = [ path: WORKFLOW_ITEM_SEND_BACK_PATH, component: ThemedWorkflowItemSendBackComponent, resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { title: 'workflow-item.send-back.title', breadcrumbKey: 'workflow-item.edit' }, }, @@ -68,7 +68,7 @@ export const ROUTES: Routes = [ path: ADVANCED_WORKFLOW_PATH, component: AdvancedWorkflowActionPageComponent, resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { title: 'workflow-item.advanced.title', breadcrumbKey: 'workflow-item.edit' }, }, diff --git a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts index 90eca80c64..0dc9ad343d 100644 --- a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts +++ b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts @@ -2,9 +2,9 @@ import { first } from 'rxjs/operators'; import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; -import { ItemFromWorkspaceResolver } from './item-from-workspace.resolver'; +import { itemFromWorkspaceResolver } from './item-from-workspace.resolver'; -describe('ItemFromWorkspaceResolver', () => { +describe('itemFromWorkspaceResolver', () => { describe('resolve', () => { let resolver: any; let wfiService: WorkspaceitemDataService; @@ -20,7 +20,7 @@ describe('ItemFromWorkspaceResolver', () => { wfiService = { findById: (id: string) => createSuccessfulRemoteDataObject$(wfi), } as any; - resolver = ItemFromWorkspaceResolver; + resolver = itemFromWorkspaceResolver; }); it('should resolve a an item from from the workflow item with the correct id', (done) => { diff --git a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts index 78a8299afd..6e43fc7bea 100644 --- a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts +++ b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts @@ -14,7 +14,7 @@ import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data. /** * This method represents a resolver that requests a specific item before the route is activated */ -export const ItemFromWorkspaceResolver: ResolveFn> = ( +export const itemFromWorkspaceResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, workspaceItemService: WorkspaceitemDataService = inject(WorkspaceitemDataService), diff --git a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts index c2d902c165..4bf44de926 100644 --- a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts +++ b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts @@ -2,9 +2,9 @@ import { first } from 'rxjs/operators'; import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; -import { WorkspaceItemPageResolver } from './workspace-item-page.resolver'; +import { workspaceItemPageResolver } from './workspace-item-page.resolver'; -describe('WorkflowItemPageResolver', () => { +describe('workspaceItemPageResolver', () => { describe('resolve', () => { let resolver: any; let wsiService: WorkspaceitemDataService; @@ -14,7 +14,7 @@ describe('WorkflowItemPageResolver', () => { wsiService = { findById: (id: string) => createSuccessfulRemoteDataObject$({ id }), } as any; - resolver = WorkspaceItemPageResolver; + resolver = workspaceItemPageResolver; }); it('should resolve a workspace item with the correct id', (done) => { diff --git a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts index f8c2d9cc3c..1d3b8e946d 100644 --- a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts +++ b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts @@ -20,7 +20,7 @@ import { followLink } from '../shared/utils/follow-link-config.model'; * @returns Observable<> Emits the found workflow item based on the parameters in the current route, * or an error if something went wrong */ -export const WorkspaceItemPageResolver: ResolveFn> = ( +export const workspaceItemPageResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, workspaceItemService: WorkspaceitemDataService = inject(WorkspaceitemDataService), diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts index 70abb9d194..84845cebe8 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts +++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts @@ -1,11 +1,11 @@ import { Route } from '@angular/router'; import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-page.component'; import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component'; -import { ItemFromWorkspaceResolver } from './item-from-workspace.resolver'; -import { WorkspaceItemPageResolver } from './workspace-item-page.resolver'; +import { itemFromWorkspaceResolver } from './item-from-workspace.resolver'; +import { workspaceItemPageResolver } from './workspace-item-page.resolver'; import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/themed-workspaceitems-delete-page.component'; import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/workspaceitems-delete-page.component'; @@ -16,14 +16,14 @@ export const ROUTES: Route[] = [ }, { path: ':id', - resolve: { wsi: WorkspaceItemPageResolver }, + resolve: { wsi: workspaceItemPageResolver }, children: [ { canActivate: [AuthenticatedGuard], path: 'edit', component: ThemedSubmissionEditComponent, resolve: { - breadcrumb: I18nBreadcrumbResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { title: 'submission.edit.title', breadcrumbKey: 'submission.edit' }, }, @@ -32,8 +32,8 @@ export const ROUTES: Route[] = [ path: 'view', component: ThemedFullItemPageComponent, resolve: { - dso: ItemFromWorkspaceResolver, - breadcrumb: I18nBreadcrumbResolver, + dso: itemFromWorkspaceResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { title: 'workspace-item.view.title', breadcrumbKey: 'workspace-item.view' }, }, @@ -42,8 +42,8 @@ export const ROUTES: Route[] = [ path: 'delete', component: WorkspaceItemsDeletePageComponent, resolve: { - dso: ItemFromWorkspaceResolver, - breadcrumb: I18nBreadcrumbResolver, + dso: itemFromWorkspaceResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { title: 'workspace-item.delete', breadcrumbKey: 'workspace-item.delete' }, }, @@ -52,8 +52,8 @@ export const ROUTES: Route[] = [ path: 'delete', component: ThemedWorkspaceItemsDeletePageComponent, resolve: { - dso: ItemFromWorkspaceResolver, - breadcrumb: I18nBreadcrumbResolver, + dso: itemFromWorkspaceResolver, + breadcrumb: i18nBreadcrumbResolver, }, data: { title: 'workspace-item.delete', breadcrumbKey: 'workspace-item.delete' }, },