Skip to content

Commit

Permalink
resolve conflicts after alignment with main
Browse files Browse the repository at this point in the history
  • Loading branch information
FrancescoMolinaro committed Feb 29, 2024
1 parent 6fc4c05 commit cd6a00e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
6 changes: 6 additions & 0 deletions src/app/admin/admin-routing-paths.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import { getQualityAssuranceEditRoute } from './admin-notifications/admin-notifi
export const REGISTRIES_MODULE_PATH = 'registries';
export const NOTIFICATIONS_MODULE_PATH = 'notifications';
export const LDN_PATH = 'ldn';
export const REPORTS_MODULE_PATH = 'reports';



export function getRegistriesModuleRoute() {
Expand All @@ -22,3 +24,7 @@ export function getNotificationsModuleRoute() {
export function getNotificatioQualityAssuranceRoute() {
return new URLCombiner(`/${NOTIFICATIONS_MODULE_PATH}`, getQualityAssuranceEditRoute()).toString();
}

export function getReportsModuleRoute() {
return new URLCombiner(getAdminModuleRoute(), REPORTS_MODULE_PATH).toString();
}
11 changes: 10 additions & 1 deletion src/app/admin/admin-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component';
import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
import { LDN_PATH, NOTIFICATIONS_MODULE_PATH, REGISTRIES_MODULE_PATH } from './admin-routing-paths';
import {
LDN_PATH,
NOTIFICATIONS_MODULE_PATH,
REGISTRIES_MODULE_PATH, REPORTS_MODULE_PATH,
} from './admin-routing-paths';
import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
import {
SiteAdministratorGuard
Expand Down Expand Up @@ -79,6 +83,11 @@ import {
}
],
},
{
path: REPORTS_MODULE_PATH,
loadChildren: () => import('./admin-reports/admin-reports.module')
.then((m) => m.AdminReportsModule),
},
])
],
providers: [
Expand Down

0 comments on commit cd6a00e

Please sign in to comment.