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 new file mode 100644 index 0000000000..b280d3eff6 --- /dev/null +++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routes.ts @@ -0,0 +1,48 @@ +import { Route } from '@angular/router'; + +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'; +import { AdminNotifyIncomingComponent } from './admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component'; +import { AdminNotifyOutgoingComponent } from './admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component'; + +export const ROUTES: Route[] = [ + { + canActivate: [SiteAdministratorGuard, NotifyInfoGuard], + path: '', + resolve: { + breadcrumb: I18nBreadcrumbResolver, + }, + component: AdminNotifyDashboardComponent, + pathMatch: 'full', + data: { + title: 'admin.notify.dashboard.page.title', + breadcrumbKey: 'admin.notify.dashboard', + }, + }, + { + path: 'inbound', + resolve: { + breadcrumb: I18nBreadcrumbResolver, + }, + component: AdminNotifyIncomingComponent, + canActivate: [SiteAdministratorGuard, NotifyInfoGuard], + data: { + title: 'admin.notify.dashboard.page.title', + breadcrumbKey: 'admin.notify.dashboard', + }, + }, + { + path: 'outbound', + resolve: { + breadcrumb: I18nBreadcrumbResolver, + }, + component: AdminNotifyOutgoingComponent, + canActivate: [SiteAdministratorGuard, NotifyInfoGuard], + data: { + title: 'admin.notify.dashboard.page.title', + breadcrumbKey: 'admin.notify.dashboard', + }, + }, +]; diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routing.module.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routing.module.ts deleted file mode 100644 index dc9312ec28..0000000000 --- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routing.module.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -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'; -import { AdminNotifyIncomingComponent } from './admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component'; -import { AdminNotifyOutgoingComponent } from './admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - canActivate: [SiteAdministratorGuard, NotifyInfoGuard], - path: '', - resolve: { - breadcrumb: I18nBreadcrumbResolver, - }, - component: AdminNotifyDashboardComponent, - pathMatch: 'full', - data: { - title: 'admin.notify.dashboard.page.title', - breadcrumbKey: 'admin.notify.dashboard', - }, - }, - { - path: 'inbound', - resolve: { - breadcrumb: I18nBreadcrumbResolver, - }, - component: AdminNotifyIncomingComponent, - canActivate: [SiteAdministratorGuard, NotifyInfoGuard], - data: { - title: 'admin.notify.dashboard.page.title', - breadcrumbKey: 'admin.notify.dashboard', - }, - }, - { - path: 'outbound', - resolve: { - breadcrumb: I18nBreadcrumbResolver, - }, - component: AdminNotifyOutgoingComponent, - canActivate: [SiteAdministratorGuard, NotifyInfoGuard], - data: { - title: 'admin.notify.dashboard.page.title', - breadcrumbKey: 'admin.notify.dashboard', - }, - }, - ]), - ], -}) -/** - * Routing module for the Notifications section of the admin sidebar - */ -export class AdminNotifyDashboardRoutingModule { - -} diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts index bc81aad227..f1c8d9ead6 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts @@ -33,6 +33,7 @@ import { AdminNotifyMessagesService } from '../services/admin-notify-messages.se selector: 'ds-admin-notify-search-result', templateUrl: './admin-notify-search-result.component.html', providers: [ + DatePipe, { provide: SEARCH_CONFIG_SERVICE, useClass: SearchConfigurationService, diff --git a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts index 04f26c29af..6420a0fe42 100644 --- a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts +++ b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts @@ -32,13 +32,13 @@ import { AdminNotifyMessage } from '../models/admin-notify-message.model'; import { ADMIN_NOTIFY_MESSAGE } from '../models/admin-notify-message.resource-type'; /** - * Injectable service responsible for fetching/sending data from/to the REST API on the messages endpoint. + * Injectable service responsible for fetching/sending data from/to the REST API on the messages' endpoint. * * @export * @class AdminNotifyMessagesService * @extends {IdentifiableDataService} */ -@Injectable() +@Injectable({ providedIn: 'root' }) @dataService(ADMIN_NOTIFY_MESSAGE) export class AdminNotifyMessagesService extends IdentifiableDataService { diff --git a/src/app/admin/admin-reports/admin-reports-routes.ts b/src/app/admin/admin-reports/admin-reports-routes.ts index e90e6d2288..7f19cc4bce 100644 --- a/src/app/admin/admin-reports/admin-reports-routes.ts +++ b/src/app/admin/admin-reports/admin-reports-routes.ts @@ -1,8 +1,10 @@ +import { Route } from '@angular/router'; + 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 = [ +export const ROUTES: Route[] = [ { path: 'collections', resolve: { breadcrumb: I18nBreadcrumbResolver }, diff --git a/src/app/admin/admin-routes.ts b/src/app/admin/admin-routes.ts index 937f32c2e9..282d428e61 100644 --- a/src/app/admin/admin-routes.ts +++ b/src/app/admin/admin-routes.ts @@ -8,6 +8,7 @@ import { MetadataImportPageComponent } from './admin-import-metadata-page/metada import { LDN_PATH, NOTIFICATIONS_MODULE_PATH, + NOTIFY_DASHBOARD_MODULE_PATH, REGISTRIES_MODULE_PATH, REPORTS_MODULE_PATH, } from './admin-routing-paths'; @@ -90,4 +91,9 @@ export const ROUTES: Route[] = [ loadChildren: () => import('./admin-reports/admin-reports-routes') .then((m) => m.ROUTES), }, + { + path: NOTIFY_DASHBOARD_MODULE_PATH, + loadChildren: () => import('./admin-notify-dashboard/admin-notify-dashboard-routes') + .then((m) => m.ROUTES), + }, ]; diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts index 2bb8551621..bb323a4880 100644 --- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts +++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts @@ -1,3 +1,4 @@ +import { AdminNotifySearchResultComponent } from '../../../../admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component'; import { AdminNotifySearchResult } from '../../../../admin/admin-notify-dashboard/models/admin-notify-message-search-result.model'; import { Context } from '../../../../core/shared/context.model'; import { GenericConstructor } from '../../../../core/shared/generic-constructor'; @@ -22,7 +23,7 @@ export const TABUTABLE_DECORATOR_MAP = new Map, Map>>>([ [AdminNotifySearchResult, new Map([ [ViewMode.Table, new Map([ - [Context.CoarNotify, new Map([[DEFAULT_THEME, TabulatableResultListElementsComponent as any]])], + [Context.CoarNotify, new Map([[DEFAULT_THEME, AdminNotifySearchResultComponent as any]])], ])], ])], ]); diff --git a/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts b/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts index 262df49bbf..779a31e7ae 100644 --- a/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts +++ b/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts @@ -7,6 +7,7 @@ import { SearchResult } from '../../../search/models/search-result.model'; @Component({ selector: 'ds-search-result-table-element', template: ``, + standalone: true, }) /** * Component that describes the implementations and interfaces needed from any extension of this class to be used in search results for visualization in ViewMode.Table