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 index ee7a8e7906..eb1eda9a56 100644 --- 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 @@ -1,7 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { I18nBreadcrumbsService } from '../../core/breadcrumbs/i18n-breadcrumbs.service'; import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component'; import { SiteAdministratorGuard @@ -19,11 +18,11 @@ import { { canActivate: [SiteAdministratorGuard], path: '', - component: AdminNotifyDashboardComponent, - pathMatch: 'full', resolve: { breadcrumb: I18nBreadcrumbResolver, }, + component: AdminNotifyDashboardComponent, + pathMatch: 'full', data: { title: 'admin.notify.dashboard.page.title', breadcrumbKey: 'admin.notify.dashboard', @@ -31,11 +30,11 @@ import { }, { path: 'inbound', - component: AdminNotifyIncomingComponent, - canActivate: [SiteAdministratorGuard], resolve: { breadcrumb: I18nBreadcrumbResolver, }, + component: AdminNotifyIncomingComponent, + canActivate: [SiteAdministratorGuard], data: { title: 'admin.notify.dashboard.page.title', breadcrumbKey: 'admin.notify.dashboard', @@ -43,11 +42,11 @@ import { }, { path: 'outbound', - component: AdminNotifyOutgoingComponent, - canActivate: [SiteAdministratorGuard], resolve: { breadcrumb: I18nBreadcrumbResolver, }, + component: AdminNotifyOutgoingComponent, + canActivate: [SiteAdministratorGuard], data: { title: 'admin.notify.dashboard.page.title', breadcrumbKey: 'admin.notify.dashboard', @@ -55,10 +54,6 @@ import { } ]) ], - providers: [ - I18nBreadcrumbResolver, - I18nBreadcrumbsService, - ] }) /** * Routing module for the Notifications section of the admin sidebar diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html index 1318cdc966..6a2ac3968e 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html +++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html @@ -14,8 +14,9 @@ -
+
; public isInbound$: Observable; protected readonly context = Context.CoarNotify; + constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService, private router: Router, - private route: ActivatedRoute) { + private route: ActivatedRoute, + protected cdRef: ChangeDetectorRef) { } ngOnInit() { - // override the route reuse strategy to prevent issue on result loading - this.router.routeReuseStrategy.shouldReuseRoute = () => { - return false; - }; - this.selectedSearchConfig$ = this.searchConfigService.getCurrentConfiguration(this.defaultConfiguration); this.isInbound$ = this.selectedSearchConfig$.pipe( map(config => config.startsWith('NOTIFY.incoming')) ); } + public resetDefaultConfiguration() { + // we prevent cache use on reset so that the result are rendered properly + this.searchComponent.useCachedVersionIfAvailable = false; this.router.navigate([this.getResolvedUrl(this.route.snapshot)], { queryParams: { configuration: this.defaultConfiguration,