Skip to content

Commit f1686d5

Browse files
committed
[DURACOM-234] rename resolvers in order to be complaint to function name convention
1 parent aba0491 commit f1686d5

102 files changed

Lines changed: 312 additions & 312 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
DynamicErrorMessagesMatcher,
99
} from '@ng-dynamic-forms/core';
1010

11-
import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
11+
import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
1212
import { GroupAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
1313
import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
1414
import {
@@ -42,7 +42,7 @@ export const ROUTES: Route[] = [
4242
path: EPERSON_PATH,
4343
component: EPeopleRegistryComponent,
4444
resolve: {
45-
breadcrumb: I18nBreadcrumbResolver,
45+
breadcrumb: i18nBreadcrumbResolver,
4646
},
4747
providers,
4848
data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' },
@@ -52,7 +52,7 @@ export const ROUTES: Route[] = [
5252
path: `${EPERSON_PATH}/create`,
5353
component: EPersonFormComponent,
5454
resolve: {
55-
breadcrumb: I18nBreadcrumbResolver,
55+
breadcrumb: i18nBreadcrumbResolver,
5656
},
5757
providers,
5858
data: { title: 'admin.access-control.epeople.add.title', breadcrumbKey: 'admin.access-control.epeople.add' },
@@ -62,7 +62,7 @@ export const ROUTES: Route[] = [
6262
path: `${EPERSON_PATH}/:id/edit`,
6363
component: EPersonFormComponent,
6464
resolve: {
65-
breadcrumb: I18nBreadcrumbResolver,
65+
breadcrumb: i18nBreadcrumbResolver,
6666
ePerson: EPersonResolver,
6767
},
6868
providers,
@@ -73,7 +73,7 @@ export const ROUTES: Route[] = [
7373
path: GROUP_PATH,
7474
component: GroupsRegistryComponent,
7575
resolve: {
76-
breadcrumb: I18nBreadcrumbResolver,
76+
breadcrumb: i18nBreadcrumbResolver,
7777
},
7878
providers,
7979
data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' },
@@ -83,7 +83,7 @@ export const ROUTES: Route[] = [
8383
path: `${GROUP_PATH}/create`,
8484
component: GroupFormComponent,
8585
resolve: {
86-
breadcrumb: I18nBreadcrumbResolver,
86+
breadcrumb: i18nBreadcrumbResolver,
8787
},
8888
providers,
8989
data: {
@@ -96,7 +96,7 @@ export const ROUTES: Route[] = [
9696
path: `${GROUP_PATH}/:groupId/edit`,
9797
component: GroupFormComponent,
9898
resolve: {
99-
breadcrumb: I18nBreadcrumbResolver,
99+
breadcrumb: i18nBreadcrumbResolver,
100100
},
101101
providers,
102102
data: {
@@ -109,7 +109,7 @@ export const ROUTES: Route[] = [
109109
path: 'bulk-access',
110110
component: BulkAccessComponent,
111111
resolve: {
112-
breadcrumb: I18nBreadcrumbResolver,
112+
breadcrumb: i18nBreadcrumbResolver,
113113
},
114114
data: { title: 'admin.access-control.bulk-access.title', breadcrumbKey: 'admin.access-control.bulk-access' },
115115
canActivate: mapToCanActivate([SiteAdministratorGuard]),

src/app/admin/admin-ldn-services/admin-ldn-services-routes.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Routes } from '@angular/router';
22

3-
import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
4-
import { NavigationBreadcrumbResolver } from '../../core/breadcrumbs/navigation-breadcrumb.resolver';
3+
import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
4+
import { navigationBreadcrumbResolver } from '../../core/breadcrumbs/navigation-breadcrumb.resolver';
55
import { LdnServiceFormComponent } from './ldn-service-form/ldn-service-form.component';
66
import { LdnServicesOverviewComponent } from './ldn-services-directory/ldn-services-directory.component';
77

@@ -10,18 +10,18 @@ const moduleRoutes: Routes = [
1010
path: '',
1111
pathMatch: 'full',
1212
component: LdnServicesOverviewComponent,
13-
resolve: { breadcrumb: I18nBreadcrumbResolver },
13+
resolve: { breadcrumb: i18nBreadcrumbResolver },
1414
data: { title: 'ldn-registered-services.title', breadcrumbKey: 'ldn-registered-services.new' },
1515
},
1616
{
1717
path: 'new',
18-
resolve: { breadcrumb: NavigationBreadcrumbResolver },
18+
resolve: { breadcrumb: navigationBreadcrumbResolver },
1919
component: LdnServiceFormComponent,
2020
data: { title: 'ldn-register-new-service.title', breadcrumbKey: 'ldn-register-new-service' },
2121
},
2222
{
2323
path: 'edit/:serviceId',
24-
resolve: { breadcrumb: NavigationBreadcrumbResolver },
24+
resolve: { breadcrumb: navigationBreadcrumbResolver },
2525
component: LdnServiceFormComponent,
2626
data: { title: 'ldn-edit-service.title', breadcrumbKey: 'ldn-edit-service' },
2727
},

src/app/admin/admin-notifications/admin-notifications-routes.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { Route } from '@angular/router';
22

33
import { AuthenticatedGuard } from '../../core/auth/authenticated.guard';
4-
import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
5-
import { QualityAssuranceBreadcrumbResolver } from '../../core/breadcrumbs/quality-assurance-breadcrumb.resolver';
4+
import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
5+
import { qualityAssuranceBreadcrumbResolver } from '../../core/breadcrumbs/quality-assurance-breadcrumb.resolver';
66
import { AdminNotificationsPublicationClaimPageResolver } from '../../quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service';
77
import { QualityAssuranceEventsPageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component';
8-
import { QualityAssuranceEventsPageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver';
9-
import { SourceDataResolver } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver';
8+
import { qualityAssuranceEventsPageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver';
9+
import { qualityAssuranceSourceDataResolver } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver';
1010
import { QualityAssuranceSourcePageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component';
1111
import { QualityAssuranceSourcePageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service';
1212
import { QualityAssuranceTopicsPageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component';
@@ -24,7 +24,7 @@ export const ROUTES: Route[] = [
2424
component: AdminNotificationsPublicationClaimPageComponent,
2525
pathMatch: 'full',
2626
resolve: {
27-
breadcrumb: I18nBreadcrumbResolver,
27+
breadcrumb: i18nBreadcrumbResolver,
2828
suggestionTargetParams: AdminNotificationsPublicationClaimPageResolver,
2929
},
3030
data: {
@@ -39,7 +39,7 @@ export const ROUTES: Route[] = [
3939
component: QualityAssuranceTopicsPageComponent,
4040
pathMatch: 'full',
4141
resolve: {
42-
breadcrumb: QualityAssuranceBreadcrumbResolver,
42+
breadcrumb: qualityAssuranceBreadcrumbResolver,
4343
openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver,
4444
},
4545
data: {
@@ -54,7 +54,7 @@ export const ROUTES: Route[] = [
5454
component: QualityAssuranceTopicsPageComponent,
5555
pathMatch: 'full',
5656
resolve: {
57-
breadcrumb: I18nBreadcrumbResolver,
57+
breadcrumb: i18nBreadcrumbResolver,
5858
openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver,
5959
},
6060
data: {
@@ -69,9 +69,9 @@ export const ROUTES: Route[] = [
6969
component: QualityAssuranceSourcePageComponent,
7070
pathMatch: 'full',
7171
resolve: {
72-
breadcrumb: I18nBreadcrumbResolver,
72+
breadcrumb: i18nBreadcrumbResolver,
7373
openaireQualityAssuranceSourceParams: QualityAssuranceSourcePageResolver,
74-
sourceData: SourceDataResolver,
74+
sourceData: qualityAssuranceSourceDataResolver,
7575
},
7676
data: {
7777
title: 'admin.notifications.source.breadcrumbs',
@@ -85,8 +85,8 @@ export const ROUTES: Route[] = [
8585
component: QualityAssuranceEventsPageComponent,
8686
pathMatch: 'full',
8787
resolve: {
88-
breadcrumb: QualityAssuranceBreadcrumbResolver,
89-
openaireQualityAssuranceEventsParams: QualityAssuranceEventsPageResolver,
88+
breadcrumb: qualityAssuranceBreadcrumbResolver,
89+
openaireQualityAssuranceEventsParams: qualityAssuranceEventsPageResolver,
9090
},
9191
data: {
9292
title: 'admin.notifications.event.page.title',

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
Route,
44
} from '@angular/router';
55

6-
import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
6+
import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
77
import { NotifyInfoGuard } from '../../core/coar-notify/notify-info/notify-info.guard';
88
import { SiteAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
99
import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
@@ -15,7 +15,7 @@ export const ROUTES: Route[] = [
1515
canActivate: [...mapToCanActivate([SiteAdministratorGuard]), NotifyInfoGuard],
1616
path: '',
1717
resolve: {
18-
breadcrumb: I18nBreadcrumbResolver,
18+
breadcrumb: i18nBreadcrumbResolver,
1919
},
2020
component: AdminNotifyDashboardComponent,
2121
pathMatch: 'full',
@@ -27,7 +27,7 @@ export const ROUTES: Route[] = [
2727
{
2828
path: 'inbound',
2929
resolve: {
30-
breadcrumb: I18nBreadcrumbResolver,
30+
breadcrumb: i18nBreadcrumbResolver,
3131
},
3232
component: AdminNotifyIncomingComponent,
3333
canActivate: [...mapToCanActivate([SiteAdministratorGuard]), NotifyInfoGuard],
@@ -39,7 +39,7 @@ export const ROUTES: Route[] = [
3939
{
4040
path: 'outbound',
4141
resolve: {
42-
breadcrumb: I18nBreadcrumbResolver,
42+
breadcrumb: i18nBreadcrumbResolver,
4343
},
4444
component: AdminNotifyOutgoingComponent,
4545
canActivate: [...mapToCanActivate([SiteAdministratorGuard]), NotifyInfoGuard],

src/app/admin/admin-registries/admin-registries-routes.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { Route } from '@angular/router';
22

3-
import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
3+
import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
44
import { BITSTREAMFORMATS_MODULE_PATH } from './admin-registries-routing-paths';
55
import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component';
66
import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
77

88
export const ROUTES: Route[] = [
99
{
1010
path: 'metadata',
11-
resolve: { breadcrumb: I18nBreadcrumbResolver },
11+
resolve: { breadcrumb: i18nBreadcrumbResolver },
1212
data: { title: 'admin.registries.metadata.title', breadcrumbKey: 'admin.registries.metadata' },
1313
children: [
1414
{
@@ -17,15 +17,15 @@ export const ROUTES: Route[] = [
1717
},
1818
{
1919
path: ':schemaName',
20-
resolve: { breadcrumb: I18nBreadcrumbResolver },
20+
resolve: { breadcrumb: i18nBreadcrumbResolver },
2121
component: MetadataSchemaComponent,
2222
data: { title: 'admin.registries.schema.title', breadcrumbKey: 'admin.registries.schema' },
2323
},
2424
],
2525
},
2626
{
2727
path: BITSTREAMFORMATS_MODULE_PATH,
28-
resolve: { breadcrumb: I18nBreadcrumbResolver },
28+
resolve: { breadcrumb: i18nBreadcrumbResolver },
2929
loadChildren: () => import('./bitstream-formats/bitstream-formats-routes')
3030
.then((m) => m.ROUTES),
3131
data: { title: 'admin.registries.bitstream-formats.title', breadcrumbKey: 'admin.registries.bitstream-formats' },

src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routes.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Route } from '@angular/router';
22

3-
import { I18nBreadcrumbResolver } from '../../../core/breadcrumbs/i18n-breadcrumb.resolver';
3+
import { i18nBreadcrumbResolver } from '../../../core/breadcrumbs/i18n-breadcrumb.resolver';
44
import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component';
55
import { BitstreamFormatsComponent } from './bitstream-formats.component';
6-
import { BitstreamFormatsResolver } from './bitstream-formats.resolver';
6+
import { bitstreamFormatsResolver } from './bitstream-formats.resolver';
77
import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component';
88

99
const BITSTREAMFORMAT_EDIT_PATH = ':id/edit';
@@ -19,7 +19,7 @@ export const ROUTES: Route[] = [
1919
},
2020
{
2121
path: BITSTREAMFORMAT_ADD_PATH,
22-
resolve: { breadcrumb: I18nBreadcrumbResolver },
22+
resolve: { breadcrumb: i18nBreadcrumbResolver },
2323
providers,
2424
component: AddBitstreamFormatComponent,
2525
data: { breadcrumbKey: 'admin.registries.bitstream-formats.create' },
@@ -29,8 +29,8 @@ export const ROUTES: Route[] = [
2929
providers,
3030
component: EditBitstreamFormatComponent,
3131
resolve: {
32-
bitstreamFormat: BitstreamFormatsResolver,
33-
breadcrumb: I18nBreadcrumbResolver,
32+
bitstreamFormat: bitstreamFormatsResolver,
33+
breadcrumb: i18nBreadcrumbResolver,
3434
},
3535
data: { breadcrumbKey: 'admin.registries.bitstream-formats.edit' },
3636
},

src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
1919
* @returns Observable<<RemoteData<BitstreamFormat>> Emits the found bitstreamFormat based on the parameters in the current route,
2020
* or an error if something went wrong
2121
*/
22-
export const BitstreamFormatsResolver: ResolveFn<RemoteData<BitstreamFormat>> = (
22+
export const bitstreamFormatsResolver: ResolveFn<RemoteData<BitstreamFormat>> = (
2323
route: ActivatedRouteSnapshot,
2424
state: RouterStateSnapshot,
2525
bitstreamFormatDataService: BitstreamFormatDataService = inject(BitstreamFormatDataService),

src/app/admin/admin-reports/admin-reports-routes.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { Route } from '@angular/router';
22

3-
import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
3+
import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
44
import { FilteredCollectionsComponent } from './filtered-collections/filtered-collections.component';
55
import { FilteredItemsComponent } from './filtered-items/filtered-items.component';
66

77
export const ROUTES: Route[] = [
88
{
99
path: 'collections',
10-
resolve: { breadcrumb: I18nBreadcrumbResolver },
10+
resolve: { breadcrumb: i18nBreadcrumbResolver },
1111
data: { title: 'admin.reports.collections.title', breadcrumbKey: 'admin.reports.collections' },
1212
children: [
1313
{
@@ -18,7 +18,7 @@ export const ROUTES: Route[] = [
1818
},
1919
{
2020
path: 'queries',
21-
resolve: { breadcrumb: I18nBreadcrumbResolver },
21+
resolve: { breadcrumb: i18nBreadcrumbResolver },
2222
data: { title: 'admin.reports.items.title', breadcrumbKey: 'admin.reports.items' },
2323
children: [
2424
{

src/app/admin/admin-routes.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Route } from '@angular/router';
22

3-
import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
3+
import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
44
import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
55
import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
66
import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
@@ -27,37 +27,37 @@ export const ROUTES: Route[] = [
2727
},
2828
{
2929
path: 'search',
30-
resolve: { breadcrumb: I18nBreadcrumbResolver },
30+
resolve: { breadcrumb: i18nBreadcrumbResolver },
3131
component: AdminSearchPageComponent,
3232
data: { title: 'admin.search.title', breadcrumbKey: 'admin.search' },
3333
},
3434
{
3535
path: 'workflow',
36-
resolve: { breadcrumb: I18nBreadcrumbResolver },
36+
resolve: { breadcrumb: i18nBreadcrumbResolver },
3737
component: AdminWorkflowPageComponent,
3838
data: { title: 'admin.workflow.title', breadcrumbKey: 'admin.workflow' },
3939
},
4040
{
4141
path: 'curation-tasks',
42-
resolve: { breadcrumb: I18nBreadcrumbResolver },
42+
resolve: { breadcrumb: i18nBreadcrumbResolver },
4343
component: AdminCurationTasksComponent,
4444
data: { title: 'admin.curation-tasks.title', breadcrumbKey: 'admin.curation-tasks' },
4545
},
4646
{
4747
path: 'metadata-import',
48-
resolve: { breadcrumb: I18nBreadcrumbResolver },
48+
resolve: { breadcrumb: i18nBreadcrumbResolver },
4949
component: MetadataImportPageComponent,
5050
data: { title: 'admin.metadata-import.title', breadcrumbKey: 'admin.metadata-import' },
5151
},
5252
{
5353
path: 'batch-import',
54-
resolve: { breadcrumb: I18nBreadcrumbResolver },
54+
resolve: { breadcrumb: i18nBreadcrumbResolver },
5555
component: BatchImportPageComponent,
5656
data: { title: 'admin.batch-import.title', breadcrumbKey: 'admin.batch-import' },
5757
},
5858
{
5959
path: 'system-wide-alert',
60-
resolve: { breadcrumb: I18nBreadcrumbResolver },
60+
resolve: { breadcrumb: i18nBreadcrumbResolver },
6161
loadChildren: () => import('../system-wide-alert/system-wide-alert-routes').then((m) => m.ROUTES),
6262
data: { title: 'admin.system-wide-alert.title', breadcrumbKey: 'admin.system-wide-alert' },
6363
},

src/app/app-routes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import { ForgotPasswordCheckGuard } from './core/rest-property/forgot-password-c
3535
import { ServerCheckGuard } from './core/server-check/server-check.guard';
3636
import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
3737
import { ITEM_MODULE_PATH } from './item-page/item-page-routing-paths';
38-
import { MenuResolver } from './menu.resolver';
38+
import { menuResolver } from './menuResolver';
3939
import { provideSuggestionNotificationsState } from './notifications/provide-suggestion-notifications-state';
4040
import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
4141
import { ThemedPageInternalServerErrorComponent } from './page-internal-server-error/themed-page-internal-server-error.component';
@@ -51,7 +51,7 @@ export const APP_ROUTES: Route[] = [
5151
path: '',
5252
canActivate: [AuthBlockingGuard],
5353
canActivateChild: [ServerCheckGuard],
54-
resolve: [MenuResolver],
54+
resolve: [menuResolver],
5555
children: [
5656
{ path: '', redirectTo: '/home', pathMatch: 'full' },
5757
{

0 commit comments

Comments
 (0)