From 6136d5dc92dbe9a0c448fa04257608bccba23de2 Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Wed, 10 Jan 2024 16:45:06 +0100 Subject: [PATCH] [DURACOM-191] change routing for admin-page --- .../admin-notifications-routes.ts | 95 +++++++++++++++++++ .../admin-notifications-routing.module.ts | 87 ----------------- .../admin-notifications.module.ts | 27 ------ .../admin-registries-routes.ts | 32 +++++++ .../admin-registries-routing.module.ts | 40 -------- .../admin-registries.module.ts | 27 ------ .../bitstream-formats-routes.ts | 36 +++++++ .../bitstream-formats-routing.module.ts | 42 -------- .../bitstream-formats.module.ts | 25 ----- src/app/admin/admin-routes.ts | 71 ++++++++++++++ src/app/admin/admin-routing.module.ts | 70 -------------- src/app/admin/admin.module.ts | 45 --------- src/app/app-routing.module.ts | 4 +- .../system-wide-alert-routes.ts | 14 +++ .../system-wide-alert-routing.module.ts | 22 ----- .../system-wide-alert.module.ts | 2 - src/themes/custom/lazy-theme.module.ts | 4 - src/themes/dspace/lazy-theme.module.ts | 4 - 18 files changed, 250 insertions(+), 397 deletions(-) create mode 100644 src/app/admin/admin-notifications/admin-notifications-routes.ts delete mode 100644 src/app/admin/admin-notifications/admin-notifications-routing.module.ts delete mode 100644 src/app/admin/admin-notifications/admin-notifications.module.ts create mode 100644 src/app/admin/admin-registries/admin-registries-routes.ts delete mode 100644 src/app/admin/admin-registries/admin-registries-routing.module.ts delete mode 100644 src/app/admin/admin-registries/admin-registries.module.ts create mode 100644 src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routes.ts delete mode 100644 src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts delete mode 100644 src/app/admin/admin-registries/bitstream-formats/bitstream-formats.module.ts create mode 100644 src/app/admin/admin-routes.ts delete mode 100644 src/app/admin/admin-routing.module.ts delete mode 100644 src/app/admin/admin.module.ts create mode 100644 src/app/system-wide-alert/system-wide-alert-routes.ts delete mode 100644 src/app/system-wide-alert/system-wide-alert-routing.module.ts diff --git a/src/app/admin/admin-notifications/admin-notifications-routes.ts b/src/app/admin/admin-notifications/admin-notifications-routes.ts new file mode 100644 index 0000000000..2efc89562d --- /dev/null +++ b/src/app/admin/admin-notifications/admin-notifications-routes.ts @@ -0,0 +1,95 @@ +import { Route, RouterModule } from '@angular/router'; + +import { AuthenticatedGuard } from '../../core/auth/authenticated.guard'; +import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { I18nBreadcrumbsService } from '../../core/breadcrumbs/i18n-breadcrumbs.service'; +import { QUALITY_ASSURANCE_EDIT_PATH } from './admin-notifications-routing-paths'; +import { + AdminQualityAssuranceTopicsPageComponent +} from './admin-quality-assurance-topics-page/admin-quality-assurance-topics-page.component'; +import { + AdminQualityAssuranceEventsPageComponent +} from './admin-quality-assurance-events-page/admin-quality-assurance-events-page.component'; +import { + AdminQualityAssuranceTopicsPageResolver +} from './admin-quality-assurance-topics-page/admin-quality-assurance-topics-page-resolver.service'; +import { + AdminQualityAssuranceEventsPageResolver +} from './admin-quality-assurance-events-page/admin-quality-assurance-events-page.resolver'; +import { + AdminQualityAssuranceSourcePageComponent +} from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page.component'; +import { + AdminQualityAssuranceSourcePageResolver +} from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page-resolver.service'; +import { QualityAssuranceBreadcrumbResolver } from '../../core/breadcrumbs/quality-assurance-breadcrumb.resolver'; +import { QualityAssuranceBreadcrumbService } from '../../core/breadcrumbs/quality-assurance-breadcrumb.service'; +import { + SourceDataResolver +} from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.resolver'; + +const providers = [ + I18nBreadcrumbResolver, + I18nBreadcrumbsService, + SourceDataResolver, + AdminQualityAssuranceTopicsPageResolver, + AdminQualityAssuranceEventsPageResolver, + AdminQualityAssuranceSourcePageResolver, + QualityAssuranceBreadcrumbResolver, + QualityAssuranceBreadcrumbService +]; + +export const ROUTES: Route[] = [ + RouterModule.forChild([ + { + canActivate: [AuthenticatedGuard], + path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId`, + component: AdminQualityAssuranceTopicsPageComponent, + pathMatch: 'full', + resolve: { + breadcrumb: QualityAssuranceBreadcrumbResolver, + openaireQualityAssuranceTopicsParams: AdminQualityAssuranceTopicsPageResolver + }, + providers, + data: { + title: 'admin.quality-assurance.page.title', + breadcrumbKey: 'admin.quality-assurance', + showBreadcrumbsFluid: false + } + }, + { + canActivate: [AuthenticatedGuard], + path: `${QUALITY_ASSURANCE_EDIT_PATH}`, + component: AdminQualityAssuranceSourcePageComponent, + pathMatch: 'full', + resolve: { + breadcrumb: I18nBreadcrumbResolver, + openaireQualityAssuranceSourceParams: AdminQualityAssuranceSourcePageResolver, + sourceData: SourceDataResolver + }, + providers, + data: { + title: 'admin.notifications.source.breadcrumbs', + breadcrumbKey: 'admin.notifications.source', + showBreadcrumbsFluid: false + } + }, + { + canActivate: [AuthenticatedGuard], + path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/:topicId`, + component: AdminQualityAssuranceEventsPageComponent, + pathMatch: 'full', + resolve: { + breadcrumb: QualityAssuranceBreadcrumbResolver, + openaireQualityAssuranceEventsParams: AdminQualityAssuranceEventsPageResolver + }, + providers, + data: { + title: 'admin.notifications.event.page.title', + breadcrumbKey: 'admin.notifications.event', + showBreadcrumbsFluid: false + } + } + ]) +]; + diff --git a/src/app/admin/admin-notifications/admin-notifications-routing.module.ts b/src/app/admin/admin-notifications/admin-notifications-routing.module.ts deleted file mode 100644 index 63d555d7b7..0000000000 --- a/src/app/admin/admin-notifications/admin-notifications-routing.module.ts +++ /dev/null @@ -1,87 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { AuthenticatedGuard } from '../../core/auth/authenticated.guard'; -import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { I18nBreadcrumbsService } from '../../core/breadcrumbs/i18n-breadcrumbs.service'; -import { QUALITY_ASSURANCE_EDIT_PATH } from './admin-notifications-routing-paths'; -import { AdminQualityAssuranceTopicsPageComponent } from './admin-quality-assurance-topics-page/admin-quality-assurance-topics-page.component'; -import { AdminQualityAssuranceEventsPageComponent } from './admin-quality-assurance-events-page/admin-quality-assurance-events-page.component'; -import { AdminQualityAssuranceTopicsPageResolver } from './admin-quality-assurance-topics-page/admin-quality-assurance-topics-page-resolver.service'; -import { AdminQualityAssuranceEventsPageResolver } from './admin-quality-assurance-events-page/admin-quality-assurance-events-page.resolver'; -import { AdminQualityAssuranceSourcePageComponent } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page.component'; -import { AdminQualityAssuranceSourcePageResolver } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page-resolver.service'; -import { QualityAssuranceBreadcrumbResolver } from '../../core/breadcrumbs/quality-assurance-breadcrumb.resolver'; -import { QualityAssuranceBreadcrumbService } from '../../core/breadcrumbs/quality-assurance-breadcrumb.service'; -import { - SourceDataResolver -} from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.resolver'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - canActivate: [ AuthenticatedGuard ], - path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId`, - component: AdminQualityAssuranceTopicsPageComponent, - pathMatch: 'full', - resolve: { - breadcrumb: QualityAssuranceBreadcrumbResolver, - openaireQualityAssuranceTopicsParams: AdminQualityAssuranceTopicsPageResolver - }, - data: { - title: 'admin.quality-assurance.page.title', - breadcrumbKey: 'admin.quality-assurance', - showBreadcrumbsFluid: false - } - }, - { - canActivate: [ AuthenticatedGuard ], - path: `${QUALITY_ASSURANCE_EDIT_PATH}`, - component: AdminQualityAssuranceSourcePageComponent, - pathMatch: 'full', - resolve: { - breadcrumb: I18nBreadcrumbResolver, - openaireQualityAssuranceSourceParams: AdminQualityAssuranceSourcePageResolver, - sourceData: SourceDataResolver - }, - data: { - title: 'admin.notifications.source.breadcrumbs', - breadcrumbKey: 'admin.notifications.source', - showBreadcrumbsFluid: false - } - }, - { - canActivate: [ AuthenticatedGuard ], - path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/:topicId`, - component: AdminQualityAssuranceEventsPageComponent, - pathMatch: 'full', - resolve: { - breadcrumb: QualityAssuranceBreadcrumbResolver, - openaireQualityAssuranceEventsParams: AdminQualityAssuranceEventsPageResolver - }, - data: { - title: 'admin.notifications.event.page.title', - breadcrumbKey: 'admin.notifications.event', - showBreadcrumbsFluid: false - } - } - ]) - ], - providers: [ - I18nBreadcrumbResolver, - I18nBreadcrumbsService, - SourceDataResolver, - AdminQualityAssuranceTopicsPageResolver, - AdminQualityAssuranceEventsPageResolver, - AdminQualityAssuranceSourcePageResolver, - QualityAssuranceBreadcrumbResolver, - QualityAssuranceBreadcrumbService - ] -}) -/** - * Routing module for the Notifications section of the admin sidebar - */ -export class AdminNotificationsRoutingModule { - -} diff --git a/src/app/admin/admin-notifications/admin-notifications.module.ts b/src/app/admin/admin-notifications/admin-notifications.module.ts deleted file mode 100644 index 27d8d46597..0000000000 --- a/src/app/admin/admin-notifications/admin-notifications.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { CoreModule } from '../../core/core.module'; -import { AdminNotificationsRoutingModule } from './admin-notifications-routing.module'; -import { AdminQualityAssuranceTopicsPageComponent } from './admin-quality-assurance-topics-page/admin-quality-assurance-topics-page.component'; -import { AdminQualityAssuranceEventsPageComponent } from './admin-quality-assurance-events-page/admin-quality-assurance-events-page.component'; -import { AdminQualityAssuranceSourcePageComponent } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page.component'; -import {NotificationsModule} from '../../notifications/notifications.module'; - -@NgModule({ - imports: [ - CommonModule, - CoreModule.forRoot(), - AdminNotificationsRoutingModule, - NotificationsModule, - AdminQualityAssuranceTopicsPageComponent, - AdminQualityAssuranceEventsPageComponent, - AdminQualityAssuranceSourcePageComponent - ], - entryComponents: [] -}) -/** - * This module handles all components related to the notifications pages - */ -export class AdminNotificationsModule { - -} diff --git a/src/app/admin/admin-registries/admin-registries-routes.ts b/src/app/admin/admin-registries/admin-registries-routes.ts new file mode 100644 index 0000000000..f10e5a0fad --- /dev/null +++ b/src/app/admin/admin-registries/admin-registries-routes.ts @@ -0,0 +1,32 @@ +import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component'; +import { Route } from '@angular/router'; +import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component'; +import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { BITSTREAMFORMATS_MODULE_PATH } from './admin-registries-routing-paths'; + +export const ROUTES: Route[] = [ + { + path: 'metadata', + resolve: {breadcrumb: I18nBreadcrumbResolver}, + data: {title: 'admin.registries.metadata.title', breadcrumbKey: 'admin.registries.metadata'}, + children: [ + { + path: '', + component: MetadataRegistryComponent + }, + { + path: ':schemaName', + resolve: {breadcrumb: I18nBreadcrumbResolver}, + component: MetadataSchemaComponent, + data: {title: 'admin.registries.schema.title', breadcrumbKey: 'admin.registries.schema'} + } + ] + }, + { + path: BITSTREAMFORMATS_MODULE_PATH, + 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/admin-registries-routing.module.ts b/src/app/admin/admin-registries/admin-registries-routing.module.ts deleted file mode 100644 index 49a76708cc..0000000000 --- a/src/app/admin/admin-registries/admin-registries-routing.module.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component'; -import { RouterModule } from '@angular/router'; -import { NgModule } from '@angular/core'; -import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component'; -import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { BITSTREAMFORMATS_MODULE_PATH } from './admin-registries-routing-paths'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - path: 'metadata', - resolve: { breadcrumb: I18nBreadcrumbResolver }, - data: {title: 'admin.registries.metadata.title', breadcrumbKey: 'admin.registries.metadata'}, - children: [ - { - path: '', - component: MetadataRegistryComponent - }, - { - path: ':schemaName', - resolve: { breadcrumb: I18nBreadcrumbResolver }, - component: MetadataSchemaComponent, - data: {title: 'admin.registries.schema.title', breadcrumbKey: 'admin.registries.schema'} - } - ] - }, - { - path: BITSTREAMFORMATS_MODULE_PATH, - resolve: { breadcrumb: I18nBreadcrumbResolver }, - loadChildren: () => import('./bitstream-formats/bitstream-formats.module') - .then((m) => m.BitstreamFormatsModule), - data: {title: 'admin.registries.bitstream-formats.title', breadcrumbKey: 'admin.registries.bitstream-formats'} - }, - ]) - ] -}) -export class AdminRegistriesRoutingModule { - -} diff --git a/src/app/admin/admin-registries/admin-registries.module.ts b/src/app/admin/admin-registries/admin-registries.module.ts deleted file mode 100644 index 1cfc1a9251..0000000000 --- a/src/app/admin/admin-registries/admin-registries.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { NgModule } from '@angular/core'; -import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component'; -import { AdminRegistriesRoutingModule } from './admin-registries-routing.module'; -import { CommonModule } from '@angular/common'; -import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component'; -import { RouterModule } from '@angular/router'; -import { MetadataSchemaFormComponent } from './metadata-registry/metadata-schema-form/metadata-schema-form.component'; -import { MetadataFieldFormComponent } from './metadata-schema/metadata-field-form/metadata-field-form.component'; -import { BitstreamFormatsModule } from './bitstream-formats/bitstream-formats.module'; -import { FormModule } from '../../shared/form/form.module'; - -@NgModule({ - imports: [ - CommonModule, - RouterModule, - BitstreamFormatsModule, - AdminRegistriesRoutingModule, - FormModule, - MetadataRegistryComponent, - MetadataSchemaComponent, - MetadataSchemaFormComponent, - MetadataFieldFormComponent - ] -}) -export class AdminRegistriesModule { - -} 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 new file mode 100644 index 0000000000..4fb0fd368c --- /dev/null +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routes.ts @@ -0,0 +1,36 @@ +import { Route } from '@angular/router'; +import { BitstreamFormatsResolver } from './bitstream-formats.resolver'; +import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component'; +import { BitstreamFormatsComponent } from './bitstream-formats.component'; +import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component'; +import { I18nBreadcrumbResolver } from '../../../core/breadcrumbs/i18n-breadcrumb.resolver'; + +const BITSTREAMFORMAT_EDIT_PATH = ':id/edit'; +const BITSTREAMFORMAT_ADD_PATH = 'add'; + +const providers = [BitstreamFormatsResolver] + +export const ROUTES: Route[] = [ + { + path: '', + providers, + component: BitstreamFormatsComponent + }, + { + path: BITSTREAMFORMAT_ADD_PATH, + resolve: {breadcrumb: I18nBreadcrumbResolver}, + providers, + component: AddBitstreamFormatComponent, + data: {breadcrumbKey: 'admin.registries.bitstream-formats.create'} + }, + { + path: BITSTREAMFORMAT_EDIT_PATH, + providers, + component: EditBitstreamFormatComponent, + resolve: { + bitstreamFormat: BitstreamFormatsResolver, + breadcrumb: I18nBreadcrumbResolver + }, + data: {breadcrumbKey: 'admin.registries.bitstream-formats.edit'} + }, +]; diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts deleted file mode 100644 index 2f08f8257c..0000000000 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { BitstreamFormatsResolver } from './bitstream-formats.resolver'; -import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component'; -import { BitstreamFormatsComponent } from './bitstream-formats.component'; -import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component'; -import { I18nBreadcrumbResolver } from '../../../core/breadcrumbs/i18n-breadcrumb.resolver'; - -const BITSTREAMFORMAT_EDIT_PATH = ':id/edit'; -const BITSTREAMFORMAT_ADD_PATH = 'add'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - path: '', - component: BitstreamFormatsComponent - }, - { - path: BITSTREAMFORMAT_ADD_PATH, - resolve: { breadcrumb: I18nBreadcrumbResolver }, - component: AddBitstreamFormatComponent, - data: {breadcrumbKey: 'admin.registries.bitstream-formats.create'} - }, - { - path: BITSTREAMFORMAT_EDIT_PATH, - component: EditBitstreamFormatComponent, - resolve: { - bitstreamFormat: BitstreamFormatsResolver, - breadcrumb: I18nBreadcrumbResolver - }, - data: {breadcrumbKey: 'admin.registries.bitstream-formats.edit'} - }, - ]) - ], - providers: [ - BitstreamFormatsResolver, - ] -}) -export class BitstreamFormatsRoutingModule { - -} diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.module.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.module.ts deleted file mode 100644 index 10565fa271..0000000000 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { RouterModule } from '@angular/router'; -import { BitstreamFormatsComponent } from './bitstream-formats.component'; -import { FormatFormComponent } from './format-form/format-form.component'; -import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component'; -import { BitstreamFormatsRoutingModule } from './bitstream-formats-routing.module'; -import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component'; -import { FormModule } from '../../../shared/form/form.module'; - -@NgModule({ - imports: [ - CommonModule, - RouterModule, - BitstreamFormatsRoutingModule, - FormModule, - BitstreamFormatsComponent, - EditBitstreamFormatComponent, - AddBitstreamFormatComponent, - FormatFormComponent - ] -}) -export class BitstreamFormatsModule { - -} diff --git a/src/app/admin/admin-routes.ts b/src/app/admin/admin-routes.ts new file mode 100644 index 0000000000..d6b2c9d593 --- /dev/null +++ b/src/app/admin/admin-routes.ts @@ -0,0 +1,71 @@ +import { Route } from '@angular/router'; +import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component'; +import { AdminSearchPageComponent } from './admin-search-page/admin-search-page.component'; +import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +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 { NOTIFICATIONS_MODULE_PATH, REGISTRIES_MODULE_PATH } from './admin-routing-paths'; +import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component'; + +const providers = [ + I18nBreadcrumbResolver, + I18nBreadcrumbsService +]; + +export const ROUTES: Route[] = [ + { + path: NOTIFICATIONS_MODULE_PATH, + providers, + loadChildren: () => import('./admin-notifications/admin-notifications-routes') + .then((m) => m.ROUTES), + }, + { + path: REGISTRIES_MODULE_PATH, + providers, + loadChildren: () => import('./admin-registries/admin-registries-routes') + .then((m) => m.ROUTES), + }, + { + path: 'search', + providers, + resolve: {breadcrumb: I18nBreadcrumbResolver}, + component: AdminSearchPageComponent, + data: {title: 'admin.search.title', breadcrumbKey: 'admin.search'} + }, + { + path: 'workflow', + providers, + resolve: {breadcrumb: I18nBreadcrumbResolver}, + component: AdminWorkflowPageComponent, + data: {title: 'admin.workflow.title', breadcrumbKey: 'admin.workflow'} + }, + { + path: 'curation-tasks', + providers, + resolve: {breadcrumb: I18nBreadcrumbResolver}, + component: AdminCurationTasksComponent, + data: {title: 'admin.curation-tasks.title', breadcrumbKey: 'admin.curation-tasks'} + }, + { + path: 'metadata-import', + providers, + resolve: {breadcrumb: I18nBreadcrumbResolver}, + component: MetadataImportPageComponent, + data: {title: 'admin.metadata-import.title', breadcrumbKey: 'admin.metadata-import'} + }, + { + path: 'batch-import', + providers, + resolve: {breadcrumb: I18nBreadcrumbResolver}, + component: BatchImportPageComponent, + data: {title: 'admin.batch-import.title', breadcrumbKey: 'admin.batch-import'} + }, + { + path: 'system-wide-alert', + providers, + 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/admin/admin-routing.module.ts b/src/app/admin/admin-routing.module.ts deleted file mode 100644 index a7d19a6935..0000000000 --- a/src/app/admin/admin-routing.module.ts +++ /dev/null @@ -1,70 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component'; -import { AdminSearchPageComponent } from './admin-search-page/admin-search-page.component'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; -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 { REGISTRIES_MODULE_PATH, NOTIFICATIONS_MODULE_PATH } from './admin-routing-paths'; -import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - path: NOTIFICATIONS_MODULE_PATH, - loadChildren: () => import('./admin-notifications/admin-notifications.module') - .then((m) => m.AdminNotificationsModule), - }, - { - path: REGISTRIES_MODULE_PATH, - loadChildren: () => import('./admin-registries/admin-registries.module') - .then((m) => m.AdminRegistriesModule), - }, - { - path: 'search', - resolve: { breadcrumb: I18nBreadcrumbResolver }, - component: AdminSearchPageComponent, - data: { title: 'admin.search.title', breadcrumbKey: 'admin.search' } - }, - { - path: 'workflow', - resolve: { breadcrumb: I18nBreadcrumbResolver }, - component: AdminWorkflowPageComponent, - data: { title: 'admin.workflow.title', breadcrumbKey: 'admin.workflow' } - }, - { - path: 'curation-tasks', - resolve: { breadcrumb: I18nBreadcrumbResolver }, - component: AdminCurationTasksComponent, - data: { title: 'admin.curation-tasks.title', breadcrumbKey: 'admin.curation-tasks' } - }, - { - path: 'metadata-import', - resolve: { breadcrumb: I18nBreadcrumbResolver }, - component: MetadataImportPageComponent, - data: { title: 'admin.metadata-import.title', breadcrumbKey: 'admin.metadata-import' } - }, - { - path: 'batch-import', - resolve: { breadcrumb: I18nBreadcrumbResolver }, - component: BatchImportPageComponent, - data: { title: 'admin.batch-import.title', breadcrumbKey: 'admin.batch-import' } - }, - { - path: 'system-wide-alert', - resolve: { breadcrumb: I18nBreadcrumbResolver }, - loadChildren: () => import('../system-wide-alert/system-wide-alert.module').then((m) => m.SystemWideAlertModule), - data: {title: 'admin.system-wide-alert.title', breadcrumbKey: 'admin.system-wide-alert'} - }, - ]) - ], - providers: [ - I18nBreadcrumbResolver, - I18nBreadcrumbsService - ] -}) -export class AdminRoutingModule { - -} diff --git a/src/app/admin/admin.module.ts b/src/app/admin/admin.module.ts deleted file mode 100644 index 2fd3f0eff7..0000000000 --- a/src/app/admin/admin.module.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { NgModule } from '@angular/core'; -import { AccessControlModule } from '../access-control/access-control.module'; -import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component'; -import { AdminRegistriesModule } from './admin-registries/admin-registries.module'; -import { AdminRoutingModule } from './admin-routing.module'; -import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component'; -import { AdminSidebarSectionComponent } from './admin-sidebar/admin-sidebar-section/admin-sidebar-section.component'; -import { - ExpandableAdminSidebarSectionComponent -} from './admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component'; -import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component'; -import { UiSwitchModule } from 'ngx-ui-switch'; -import { UploadModule } from '../shared/upload/upload.module'; - -const ENTRY_COMPONENTS = [ - // put only entry components that use custom decorator - AdminSidebarSectionComponent, - ExpandableAdminSidebarSectionComponent, -]; - - -@NgModule({ - imports: [ - AdminRoutingModule, - AdminRegistriesModule, - AccessControlModule, - UiSwitchModule, - UploadModule, - AdminCurationTasksComponent, - MetadataImportPageComponent, - BatchImportPageComponent - ] -}) -export class AdminModule { - /** - * NOTE: this method allows to resolve issue with components that using a custom decorator - * which are not loaded during SSR otherwise - */ - static withEntryComponents() { - return { - ngModule: AdminModule, - providers: ENTRY_COMPONENTS.map((component) => ({provide: component})) - }; - } -} diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 73c68ef9d8..49e4ca3135 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -152,8 +152,8 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone }, { path: ADMIN_MODULE_PATH, - loadChildren: () => import('./admin/admin.module') - .then((m) => m.AdminModule), + loadChildren: () => import('./admin/admin-routes') + .then((m) => m.ROUTES), canActivate: [SiteAdministratorGuard, EndUserAgreementCurrentUserGuard] }, { diff --git a/src/app/system-wide-alert/system-wide-alert-routes.ts b/src/app/system-wide-alert/system-wide-alert-routes.ts new file mode 100644 index 0000000000..6b58399ec3 --- /dev/null +++ b/src/app/system-wide-alert/system-wide-alert-routes.ts @@ -0,0 +1,14 @@ +import { + SiteAdministratorGuard +} from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard'; +import { SystemWideAlertFormComponent } from './alert-form/system-wide-alert-form.component'; +import { Route } from '@angular/router'; + +export const ROUTES: Route[] = [ + { + path: '', + canActivate: [SiteAdministratorGuard], + component: SystemWideAlertFormComponent, + }, + +]; diff --git a/src/app/system-wide-alert/system-wide-alert-routing.module.ts b/src/app/system-wide-alert/system-wide-alert-routing.module.ts deleted file mode 100644 index beb1b32187..0000000000 --- a/src/app/system-wide-alert/system-wide-alert-routing.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { - SiteAdministratorGuard -} from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard'; -import { SystemWideAlertFormComponent } from './alert-form/system-wide-alert-form.component'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - path: '', - canActivate: [SiteAdministratorGuard], - component: SystemWideAlertFormComponent, - }, - - ]) - ] -}) -export class SystemWideAlertRoutingModule { - -} diff --git a/src/app/system-wide-alert/system-wide-alert.module.ts b/src/app/system-wide-alert/system-wide-alert.module.ts index b450360860..0919b207ae 100644 --- a/src/app/system-wide-alert/system-wide-alert.module.ts +++ b/src/app/system-wide-alert/system-wide-alert.module.ts @@ -3,7 +3,6 @@ import { FormsModule } from '@angular/forms'; import { SystemWideAlertBannerComponent } from './alert-banner/system-wide-alert-banner.component'; import { SystemWideAlertFormComponent } from './alert-form/system-wide-alert-form.component'; import { SystemWideAlertDataService } from '../core/data/system-wide-alert-data.service'; -import { SystemWideAlertRoutingModule } from './system-wide-alert-routing.module'; import { UiSwitchModule } from 'ngx-ui-switch'; import { NgbDatepickerModule, NgbTimepickerModule } from '@ng-bootstrap/ng-bootstrap'; @@ -11,7 +10,6 @@ import { NgbDatepickerModule, NgbTimepickerModule } from '@ng-bootstrap/ng-boots imports: [ FormsModule, UiSwitchModule, - SystemWideAlertRoutingModule, NgbTimepickerModule, NgbDatepickerModule, SystemWideAlertBannerComponent, diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index 7b89d86d24..cca6507243 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -1,7 +1,5 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { AdminRegistriesModule } from '../../app/admin/admin-registries/admin-registries.module'; -import { BitstreamFormatsModule } from '../../app/admin/admin-registries/bitstream-formats/bitstream-formats.module'; import { CollectionFormModule } from '../../app/collection-page/collection-form/collection-form.module'; import { CommunityFormModule } from '../../app/community-page/community-form/community-form.module'; import { DragDropModule } from '@angular/cdk/drag-drop'; @@ -264,10 +262,8 @@ const DECLARATIONS = [ @NgModule({ imports: [ - AdminRegistriesModule, AppModule, RootModule, - BitstreamFormatsModule, CollectionFormModule, CollectionPageModule, CommonModule, diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts index 222f7cdaf8..a42e161108 100644 --- a/src/themes/dspace/lazy-theme.module.ts +++ b/src/themes/dspace/lazy-theme.module.ts @@ -1,7 +1,5 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { AdminRegistriesModule } from '../../app/admin/admin-registries/admin-registries.module'; -import { BitstreamFormatsModule } from '../../app/admin/admin-registries/bitstream-formats/bitstream-formats.module'; import { CollectionFormModule } from '../../app/collection-page/collection-form/collection-form.module'; import { CommunityFormModule } from '../../app/community-page/community-form/community-form.module'; import { DragDropModule } from '@angular/cdk/drag-drop'; @@ -43,10 +41,8 @@ const DECLARATIONS = [ @NgModule({ imports: [ - AdminRegistriesModule, AppModule, RootModule, - BitstreamFormatsModule, BrowseByPageModule, ResultsBackButtonModule, CollectionFormModule,