Skip to content

Commit cd6a00e

Browse files
resolve conflicts after alignment with main
1 parent 6fc4c05 commit cd6a00e

2 files changed

Lines changed: 16 additions & 1 deletion

File tree

src/app/admin/admin-routing-paths.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import { getQualityAssuranceEditRoute } from './admin-notifications/admin-notifi
55
export const REGISTRIES_MODULE_PATH = 'registries';
66
export const NOTIFICATIONS_MODULE_PATH = 'notifications';
77
export const LDN_PATH = 'ldn';
8+
export const REPORTS_MODULE_PATH = 'reports';
9+
810

911

1012
export function getRegistriesModuleRoute() {
@@ -22,3 +24,7 @@ export function getNotificationsModuleRoute() {
2224
export function getNotificatioQualityAssuranceRoute() {
2325
return new URLCombiner(`/${NOTIFICATIONS_MODULE_PATH}`, getQualityAssuranceEditRoute()).toString();
2426
}
27+
28+
export function getReportsModuleRoute() {
29+
return new URLCombiner(getAdminModuleRoute(), REPORTS_MODULE_PATH).toString();
30+
}

src/app/admin/admin-routing.module.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
66
import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component';
77
import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
88
import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
9-
import { LDN_PATH, NOTIFICATIONS_MODULE_PATH, REGISTRIES_MODULE_PATH } from './admin-routing-paths';
9+
import {
10+
LDN_PATH,
11+
NOTIFICATIONS_MODULE_PATH,
12+
REGISTRIES_MODULE_PATH, REPORTS_MODULE_PATH,
13+
} from './admin-routing-paths';
1014
import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
1115
import {
1216
SiteAdministratorGuard
@@ -79,6 +83,11 @@ import {
7983
}
8084
],
8185
},
86+
{
87+
path: REPORTS_MODULE_PATH,
88+
loadChildren: () => import('./admin-reports/admin-reports.module')
89+
.then((m) => m.AdminReportsModule),
90+
},
8291
])
8392
],
8493
providers: [

0 commit comments

Comments
 (0)