From e1cda4fa049fb1c437e07f7860ef2ff81e11b5da Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 21 Dec 2023 18:06:39 +0100
Subject: [PATCH 01/45] prepare dashboard config

---
 .../admin-notify-dashboard.component.html     |  1 +
 .../admin-notify-dashboard.component.scss     |  0
 .../admin-notify-dashboard.component.spec.ts  | 23 +++++++++++++++++++
 .../admin-notify-dashboard.component.ts       | 10 ++++++++
 src/app/admin/admin.module.ts                 |  4 +++-
 src/app/menu.resolver.ts                      | 12 ++++++++++
 src/assets/i18n/en.json5                      |  2 ++
 7 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.scss
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
new file mode 100644
index 0000000000..90fa077e91
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
@@ -0,0 +1 @@
+<p>admin-notify-dashboard works!</p>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.scss b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
new file mode 100644
index 0000000000..4df980e1df
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
+
+describe('AdminNotifyDashboardComponent', () => {
+  let component: AdminNotifyDashboardComponent;
+  let fixture: ComponentFixture<AdminNotifyDashboardComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ AdminNotifyDashboardComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifyDashboardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
new file mode 100644
index 0000000000..7959d9917f
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-admin-notify-dashboard',
+  templateUrl: './admin-notify-dashboard.component.html',
+  styleUrls: ['./admin-notify-dashboard.component.scss']
+})
+export class AdminNotifyDashboardComponent {
+
+}
diff --git a/src/app/admin/admin.module.ts b/src/app/admin/admin.module.ts
index 3dc0036854..ee0d3b0d4e 100644
--- a/src/app/admin/admin.module.ts
+++ b/src/app/admin/admin.module.ts
@@ -12,6 +12,7 @@ import { ExpandableAdminSidebarSectionComponent } from './admin-sidebar/expandab
 import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
 import { UiSwitchModule } from 'ngx-ui-switch';
 import { UploadModule } from '../shared/upload/upload.module';
+import { AdminNotifyDashboardComponent } from './admin-notify-dashboard/admin-notify-dashboard.component';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -34,7 +35,8 @@ const ENTRY_COMPONENTS = [
   declarations: [
     AdminCurationTasksComponent,
     MetadataImportPageComponent,
-    BatchImportPageComponent
+    BatchImportPageComponent,
+    AdminNotifyDashboardComponent
   ]
 })
 export class AdminModule {
diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts
index 23ba31b103..c4f2991fe2 100644
--- a/src/app/menu.resolver.ts
+++ b/src/app/menu.resolver.ts
@@ -679,6 +679,18 @@ export class MenuResolver implements Resolve<boolean> {
           icon: 'exclamation-circle',
           index: 12
         },
+        {
+          id: 'notify_dashboard',
+          active: false,
+          visible: authorized,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.notify-dasboard',
+            link: '/admin/notify-dasboard'
+          } as LinkMenuItemModel,
+          icon: 'gauge',
+          index: 13
+        },
       ];
 
       menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, Object.assign(menuSection, {
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index f7a9e2c072..d68229f19b 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3075,6 +3075,8 @@
 
   "menu.section.icon.export": "Export menu section",
 
+  "menu.section.notify-dasboard": "Notify Dashboard",
+
   "menu.section.icon.find": "Find menu section",
 
   "menu.section.icon.health": "Health check menu section",

From 7445591148e068b9ac300dcfd972fa1c014dbc6c Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 21 Dec 2023 18:10:45 +0100
Subject: [PATCH 02/45] add route, renaming

---
 src/app/admin/admin-routing.module.ts | 7 +++++++
 src/app/menu.resolver.ts              | 4 ++--
 src/assets/i18n/en.json5              | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/app/admin/admin-routing.module.ts b/src/app/admin/admin-routing.module.ts
index 3acc219bce..ecafa0232f 100644
--- a/src/app/admin/admin-routing.module.ts
+++ b/src/app/admin/admin-routing.module.ts
@@ -8,6 +8,7 @@ import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.ser
 import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
 import { LDN_PATH, REGISTRIES_MODULE_PATH, NOTIFICATIONS_MODULE_PATH } from './admin-routing-paths';
 import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
+import { AdminNotifyDashboardComponent } from "./admin-notify-dashboard/admin-notify-dashboard.component";
 
 @NgModule({
   imports: [
@@ -69,6 +70,12 @@ import { BatchImportPageComponent } from './admin-import-batch-page/batch-import
         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'}
       },
+      {
+        path: 'notify-dashboard',
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        component: AdminNotifyDashboardComponent,
+        data: {title: 'todo', breadcrumbKey: 'todo'}
+      },
     ]),
   ],
   providers: [
diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts
index c4f2991fe2..671440d48d 100644
--- a/src/app/menu.resolver.ts
+++ b/src/app/menu.resolver.ts
@@ -685,8 +685,8 @@ export class MenuResolver implements Resolve<boolean> {
           visible: authorized,
           model: {
             type: MenuItemType.LINK,
-            text: 'menu.section.notify-dasboard',
-            link: '/admin/notify-dasboard'
+            text: 'menu.section.notify-dashboard',
+            link: '/admin/notify-dashboard'
           } as LinkMenuItemModel,
           icon: 'gauge',
           index: 13
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index d68229f19b..8a504fac47 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3075,7 +3075,7 @@
 
   "menu.section.icon.export": "Export menu section",
 
-  "menu.section.notify-dasboard": "Notify Dashboard",
+  "menu.section.notify-dashboard": "Notify Dashboard",
 
   "menu.section.icon.find": "Find menu section",
 

From 604fb4f3d172360e22d79e283d6858f42e23490d Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 22 Dec 2023 10:42:38 +0100
Subject: [PATCH 03/45] add components, refactor sidebar section, add config

---
 .../admin-notify-dashboard-routing.module.ts  | 37 +++++++++++
 .../admin-notify-dashboard.component.html     | 29 ++++++++-
 .../admin-notify-dashboard.module.ts          | 25 ++++++++
 .../admin-notify-logs.component.html          |  1 +
 .../admin-notify-logs.component.scss          |  0
 .../admin-notify-logs.component.spec.ts       | 23 +++++++
 .../admin-notify-logs.component.ts            | 10 +++
 .../admin-notify-metrics.component.html       | 11 ++++
 .../admin-notify-metrics.component.scss       |  0
 .../admin-notify-metrics.component.spec.ts    | 23 +++++++
 .../admin-notify-metrics.component.ts         | 13 ++++
 .../admin-notify-metrics.config.ts            | 64 +++++++++++++++++++
 .../admin-notify-metrics.model.ts             | 10 +++
 src/app/admin/admin-routing-paths.ts          |  3 +-
 src/app/admin/admin-routing.module.ts         | 14 ++--
 src/app/admin/admin.module.ts                 |  2 -
 src/app/menu.resolver.ts                      | 44 ++++++++-----
 src/assets/i18n/en.json5                      | 14 +++-
 18 files changed, 296 insertions(+), 27 deletions(-)
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routing.module.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.html
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.scss
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.spec.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.scss
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.config.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts

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
new file mode 100644
index 0000000000..447a1fe39a
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routing.module.ts
@@ -0,0 +1,37 @@
+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 { AuthenticatedGuard } from "../../core/auth/authenticated.guard";
+import { AdminNotifyDashboardComponent } from "./admin-notify-dashboard.component";
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: '',
+        component: AdminNotifyDashboardComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+        },
+        data: {
+          title: 'admin.notify.dashboard.page.title',
+          breadcrumbKey: 'admin.notify.dashboard',
+          showBreadcrumbsFluid: false
+        }
+      },
+    ])
+  ],
+  providers: [
+    I18nBreadcrumbResolver,
+    I18nBreadcrumbsService,
+  ]
+})
+/**
+ * Routing module for the Notifications section of the admin sidebar
+ */
+export class AdminNotifyDashboardRoutingModule {
+
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
index 90fa077e91..4b432adb38 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
@@ -1 +1,28 @@
-<p>admin-notify-dashboard works!</p>
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h2 class="border-bottom pb-2">{{'admin-notify-dashboard.title'| translate}}</h2>
+      <div>
+        <ul ngbNav #nav="ngbNav" [activeId]="'metrics'" class="nav-tabs">
+          <li [ngbNavItem]="'metrics'">
+            <a ngbNavLink>{{'admin-notify-dashboard.metrics' | translate}}</a>
+            <ng-template ngbNavContent>
+              <div id="metrics">
+                <ds-admin-notify-metrics></ds-admin-notify-metrics>
+              </div>
+            </ng-template>
+          </li>
+          <li [ngbNavItem]="'logs'">
+            <a ngbNavLink>{{'admin-notify-dashboard.logs' | translate}}</a>
+            <ng-template ngbNavContent>
+              <div id="logs">
+                <ds-admin-notify-logs></ds-admin-notify-logs>
+              </div>
+            </ng-template>
+          </li>
+        </ul>
+        <div [ngbNavOutlet]="nav" class="mt-2"></div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
new file mode 100644
index 0000000000..0074d13ce0
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
@@ -0,0 +1,25 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterModule } from '@angular/router';
+import { SharedModule } from '../../shared/shared.module';
+import { AdminNotifyDashboardComponent } from "./admin-notify-dashboard.component";
+import { AdminNotifyDashboardRoutingModule } from "./admin-notify-dashboard-routing.module";
+import { AdminNotifyMetricsComponent } from './admin-notify-metrics/admin-notify-metrics.component';
+import { AdminNotifyLogsComponent } from './admin-notify-logs/admin-notify-logs.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    RouterModule,
+    AdminNotifyDashboardRoutingModule,
+  ],
+  declarations: [
+    AdminNotifyDashboardComponent,
+    AdminNotifyMetricsComponent,
+    AdminNotifyLogsComponent
+  ]
+})
+export class AdminNotifyDashboardModule {
+
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.html
new file mode 100644
index 0000000000..494e082ddf
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.html
@@ -0,0 +1 @@
+<p>admin-notify-logs works!</p>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.scss b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.spec.ts
new file mode 100644
index 0000000000..12a0feae64
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AdminNotifyLogsComponent } from './admin-notify-logs.component';
+
+describe('AdminNotifyLogsComponent', () => {
+  let component: AdminNotifyLogsComponent;
+  let fixture: ComponentFixture<AdminNotifyLogsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ AdminNotifyLogsComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifyLogsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.ts
new file mode 100644
index 0000000000..67552130a0
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-admin-notify-logs',
+  templateUrl: './admin-notify-logs.component.html',
+  styleUrls: ['./admin-notify-logs.component.scss']
+})
+export class AdminNotifyLogsComponent {
+
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
new file mode 100644
index 0000000000..f4e0e45279
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
@@ -0,0 +1,11 @@
+<div class="container-fluid">
+  <div *ngFor="let rows of boxesConfig">
+    <div *ngFor="let box of rows.boxes">
+      <div [ngStyle]="{'background-color': box.color}">
+        <!--Here will go the actual count coming from the REST endpoint -->
+        <div>0</div>
+        <div>{{ box.title | translate }}</div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.scss b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts
new file mode 100644
index 0000000000..10e256a701
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AdminNotifyMetricsComponent } from './admin-notify-metrics.component';
+
+describe('AdminNotifyMetricsComponent', () => {
+  let component: AdminNotifyMetricsComponent;
+  let fixture: ComponentFixture<AdminNotifyMetricsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ AdminNotifyMetricsComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifyMetricsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
new file mode 100644
index 0000000000..d1d7ca4bd5
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+import { AdminNotifyMetricsRow } from "./admin-notify-metrics.model";
+import { AdminNotifyMetricsRowsConfig } from "./admin-notify-metrics.config";
+
+@Component({
+  selector: 'ds-admin-notify-metrics',
+  templateUrl: './admin-notify-metrics.component.html',
+  styleUrls: ['./admin-notify-metrics.component.scss']
+})
+export class AdminNotifyMetricsComponent {
+
+  boxesConfig: AdminNotifyMetricsRow[] = AdminNotifyMetricsRowsConfig;
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.config.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.config.ts
new file mode 100644
index 0000000000..7880e78ebf
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.config.ts
@@ -0,0 +1,64 @@
+import { AdminNotifyMetricsRow } from "./admin-notify-metrics.model";
+
+export const AdminNotifyMetricsRowsConfig: AdminNotifyMetricsRow[] = [
+  {
+    title: 'Number of received LDN',
+    boxes: [
+      {
+        color: 'blue',
+        title: 'Accepted',
+        index: 0
+      },
+      {
+        color: 'green',
+        title: 'Processed LDN',
+        index: 1
+      },
+      {
+        color: 'red',
+        title: 'Failure',
+        index: 2
+      },
+      {
+        color: 'red',
+        title: 'Untrusted',
+        index: 3
+      },
+      {
+        color: 'grey',
+        title: 'Incoming LDM messages',
+        index: 4
+      },
+    ]
+  },
+  {
+    title: 'Number of generated LDN',
+    boxes: [
+      {
+        color: 'green',
+        title: 'Delivered',
+        index: 0
+      },
+      {
+        color: 'blue',
+        title: 'Queued',
+        index: 1
+      },
+      {
+        color: 'yellow',
+        title: 'Queued for retry',
+        index: 2
+      },
+      {
+        color: 'red',
+        title: 'Failure',
+        index: 3
+      },
+      {
+        color: 'grey',
+        title: 'Outgoing LDM messages',
+        index: 4
+      },
+    ]
+  }
+]
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts
new file mode 100644
index 0000000000..3b47deffa1
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts
@@ -0,0 +1,10 @@
+export interface AdminNotifyMetricsBox {
+  color: string;
+  title: string;
+  index: number
+}
+
+export interface AdminNotifyMetricsRow {
+  title: string;
+  boxes: AdminNotifyMetricsBox[]
+}
diff --git a/src/app/admin/admin-routing-paths.ts b/src/app/admin/admin-routing-paths.ts
index 511680bfd8..c08139bd87 100644
--- a/src/app/admin/admin-routing-paths.ts
+++ b/src/app/admin/admin-routing-paths.ts
@@ -4,6 +4,8 @@ import { getAdminModuleRoute } from '../app-routing-paths';
 export const REGISTRIES_MODULE_PATH = 'registries';
 export const NOTIFICATIONS_MODULE_PATH = 'notifications';
 
+export const NOTIFY_DASHBOARD_MODULE_PATH = 'notify-dashboard';
+
 export const LDN_PATH = 'ldn';
 
 export function getRegistriesModuleRoute() {
@@ -13,7 +15,6 @@ export function getRegistriesModuleRoute() {
 export function getNotificationsModuleRoute() {
   return new URLCombiner(getAdminModuleRoute(), NOTIFICATIONS_MODULE_PATH).toString();
 }
-
 export function getLdnServicesModuleRoute() {
   return new URLCombiner(getAdminModuleRoute(), LDN_PATH).toString();
 }
diff --git a/src/app/admin/admin-routing.module.ts b/src/app/admin/admin-routing.module.ts
index ecafa0232f..e30a5b20fb 100644
--- a/src/app/admin/admin-routing.module.ts
+++ b/src/app/admin/admin-routing.module.ts
@@ -6,7 +6,12 @@ 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, REGISTRIES_MODULE_PATH, NOTIFICATIONS_MODULE_PATH } from './admin-routing-paths';
+import {
+  LDN_PATH,
+  REGISTRIES_MODULE_PATH,
+  NOTIFICATIONS_MODULE_PATH,
+  NOTIFY_DASHBOARD_MODULE_PATH
+} from './admin-routing-paths';
 import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
 import { AdminNotifyDashboardComponent } from "./admin-notify-dashboard/admin-notify-dashboard.component";
 
@@ -71,10 +76,9 @@ import { AdminNotifyDashboardComponent } from "./admin-notify-dashboard/admin-no
         data: {title: 'admin.system-wide-alert.title', breadcrumbKey: 'admin.system-wide-alert'}
       },
       {
-        path: 'notify-dashboard',
-        resolve: { breadcrumb: I18nBreadcrumbResolver },
-        component: AdminNotifyDashboardComponent,
-        data: {title: 'todo', breadcrumbKey: 'todo'}
+        path: NOTIFY_DASHBOARD_MODULE_PATH,
+        loadChildren: () => import('./admin-notify-dashboard/admin-notify-dashboard.module')
+          .then((m) => m.AdminNotifyDashboardModule),
       },
     ]),
   ],
diff --git a/src/app/admin/admin.module.ts b/src/app/admin/admin.module.ts
index ee0d3b0d4e..d77c3213b3 100644
--- a/src/app/admin/admin.module.ts
+++ b/src/app/admin/admin.module.ts
@@ -12,7 +12,6 @@ import { ExpandableAdminSidebarSectionComponent } from './admin-sidebar/expandab
 import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
 import { UiSwitchModule } from 'ngx-ui-switch';
 import { UploadModule } from '../shared/upload/upload.module';
-import { AdminNotifyDashboardComponent } from './admin-notify-dashboard/admin-notify-dashboard.component';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -36,7 +35,6 @@ const ENTRY_COMPONENTS = [
     AdminCurationTasksComponent,
     MetadataImportPageComponent,
     BatchImportPageComponent,
-    AdminNotifyDashboardComponent
   ]
 })
 export class AdminModule {
diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts
index 671440d48d..15848963c9 100644
--- a/src/app/menu.resolver.ts
+++ b/src/app/menu.resolver.ts
@@ -362,19 +362,6 @@ export class MenuResolver implements Resolve<boolean> {
           icon: 'terminal',
           index: 10
         },
-        /* LDN Services */
-        {
-          id: 'ldn_services',
-          active: false,
-          visible: isSiteAdmin,
-          model: {
-            type: MenuItemType.LINK,
-            text: 'menu.section.services',
-            link: '/admin/ldn/services'
-          } as LinkMenuItemModel,
-          icon: 'inbox',
-          index: 14
-        },
         {
           id: 'health',
           active: false,
@@ -679,17 +666,40 @@ export class MenuResolver implements Resolve<boolean> {
           icon: 'exclamation-circle',
           index: 12
         },
+        /* COAR Notify section */
         {
-          id: 'notify_dashboard',
+          id: 'coar_notify',
           active: false,
           visible: authorized,
+          model: {
+            type: MenuItemType.TEXT,
+            text: 'menu.section.coar_notify'
+          } as TextMenuItemModel,
+          icon: 'inbox',
+          index: 13
+        },
+        {
+          id: 'notify_dashboard',
+          active: false,
+          parentID: 'coar_notify',
+          visible: authorized,
           model: {
             type: MenuItemType.LINK,
-            text: 'menu.section.notify-dashboard',
+            text: 'menu.section.notify_dashboard',
             link: '/admin/notify-dashboard'
           } as LinkMenuItemModel,
-          icon: 'gauge',
-          index: 13
+        },
+        /* LDN Services */
+        {
+          id: 'ldn_services',
+          active: false,
+          parentID: 'coar_notify',
+          visible: authorized,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.services',
+            link: '/admin/ldn/services'
+          } as LinkMenuItemModel,
         },
       ];
 
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 8a504fac47..0acbba29c7 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -28,6 +28,8 @@
 
   "admin.notifications.recitersuggestion.page.title": "Suggestions",
 
+  "admin.notify.dashboard": "Dashboard",
+
   "error-page.description.401": "unauthorized",
 
   "error-page.description.403": "forbidden",
@@ -3075,7 +3077,9 @@
 
   "menu.section.icon.export": "Export menu section",
 
-  "menu.section.notify-dashboard": "Notify Dashboard",
+  "menu.section.notify_dashboard": "Dashboard",
+
+  "menu.section.coar_notify": "COAR Notify",
 
   "menu.section.icon.find": "Find menu section",
 
@@ -3439,6 +3443,14 @@
 
   "quality-assurance.event.reason": "Reason",
 
+  "admin-notify-dashboard.title": "Notify Dashboard",
+
+  "admin-notify-dashboard.metrics": "Notify metrics",
+
+  "admin-notify-dashboard.logs": "Notify logs",
+
+  "admin.notify.dashboard.breadcrumbs": "Dashboard",
+
   "orgunit.listelement.badge": "Organizational Unit",
 
   "orgunit.listelement.no-title": "Untitled",

From 5d8ba546764b16124bb536d34f419164586ea390 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 22 Dec 2023 17:26:46 +0100
Subject: [PATCH 04/45] add new component, add mock, refactor

---
 .../admin-notify-dashboard-routing.module.ts  |  4 +-
 .../admin-notify-dashboard.component.spec.ts  |  3 ++
 .../admin-notify-dashboard.component.ts       | 43 +++++++++++++++++--
 .../admin-notify-dashboard.module.ts          | 11 ++---
 .../admin-notify-logs.component.spec.ts       |  2 +
 .../admin-notify-metrics.component.html       | 14 +++---
 .../admin-notify-metrics.component.spec.ts    |  2 +
 .../admin-notify-metrics.component.ts         |  4 +-
 .../admin-notify-metrics.config.ts            | 36 ++++++----------
 .../admin-notify-metrics.model.ts             |  3 +-
 src/app/admin/admin-routing.module.ts         |  1 -
 .../notification-box.component.html           |  6 +++
 .../notification-box.component.scss           |  7 +++
 .../notification-box.component.spec.ts        | 23 ++++++++++
 .../notification-box.component.ts             | 13 ++++++
 src/app/shared/shared.module.ts               |  4 +-
 16 files changed, 131 insertions(+), 45 deletions(-)
 create mode 100644 src/app/shared/notification-box/notification-box.component.html
 create mode 100644 src/app/shared/notification-box/notification-box.component.scss
 create mode 100644 src/app/shared/notification-box/notification-box.component.spec.ts
 create mode 100644 src/app/shared/notification-box/notification-box.component.ts

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 447a1fe39a..778815e1fb 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
@@ -2,8 +2,8 @@ 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 { AuthenticatedGuard } from "../../core/auth/authenticated.guard";
-import { AdminNotifyDashboardComponent } from "./admin-notify-dashboard.component";
+import { AuthenticatedGuard } from '../../core/auth/authenticated.guard';
+import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
 
 @NgModule({
   imports: [
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
index 4df980e1df..c5afaa3b59 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
@@ -1,6 +1,8 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
 
 describe('AdminNotifyDashboardComponent', () => {
   let component: AdminNotifyDashboardComponent;
@@ -8,6 +10,7 @@ describe('AdminNotifyDashboardComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot(), NgbNavModule],
       declarations: [ AdminNotifyDashboardComponent ]
     })
     .compileComponents();
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index 7959d9917f..56f5091969 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -1,10 +1,47 @@
-import { Component } from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
+import { SearchConfigurationService } from "../../core/shared/search/search-configuration.service";
+import { SearchService } from "../../core/shared/search/search.service";
+import { PaginatedSearchOptions } from "../../shared/search/models/paginated-search-options.model";
+import { SEARCH_CONFIG_SERVICE } from "../../my-dspace-page/my-dspace-page.component";
+import { PaginationComponentOptions } from "../../shared/pagination/pagination-component-options.model";
+import { SearchFilterConfig } from "../../shared/search/models/search-filter-config.model";
 
 @Component({
   selector: 'ds-admin-notify-dashboard',
   templateUrl: './admin-notify-dashboard.component.html',
-  styleUrls: ['./admin-notify-dashboard.component.scss']
+  styleUrls: ['./admin-notify-dashboard.component.scss'],
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService
+    }
+  ]
 })
-export class AdminNotifyDashboardComponent {
+export class AdminNotifyDashboardComponent implements OnInit{
+  mockFilterConfig : SearchFilterConfig = Object.assign(new SearchFilterConfig(), {
+    type: {
+      value: "discovery-filter"
+    },
+    pageSize: 10,
+    name: "author",
+    filterType: "text",
+    _links: {
+      self: {
+        href: "https://dspace-coar.4science.cloud/server/api/discover/facets/author"
+      }
+    }
+  });
 
+  mockPaginatedSearchOptions = new PaginatedSearchOptions({
+    pagination: Object.assign(new PaginationComponentOptions(), { id: 'page-id', currentPage: 1, pageSize: 20 }),
+    configuration: '',
+  });
+
+  constructor(private searchService: SearchService,
+              @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
+  ) {}
+
+  ngOnInit() {
+    this.searchService.getFacetValuesFor(this.mockFilterConfig, 1, this.mockPaginatedSearchOptions).subscribe(c => console.log(c))
+  }
 }
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
index 0074d13ce0..ec6d63d8e1 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
@@ -1,18 +1,19 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
-import { SharedModule } from '../../shared/shared.module';
-import { AdminNotifyDashboardComponent } from "./admin-notify-dashboard.component";
-import { AdminNotifyDashboardRoutingModule } from "./admin-notify-dashboard-routing.module";
+import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
+import { AdminNotifyDashboardRoutingModule } from './admin-notify-dashboard-routing.module';
 import { AdminNotifyMetricsComponent } from './admin-notify-metrics/admin-notify-metrics.component';
 import { AdminNotifyLogsComponent } from './admin-notify-logs/admin-notify-logs.component';
+import { SharedModule } from '../../shared/shared.module';
+
 
 @NgModule({
   imports: [
     CommonModule,
-    SharedModule,
     RouterModule,
-    AdminNotifyDashboardRoutingModule,
+    SharedModule,
+    AdminNotifyDashboardRoutingModule
   ],
   declarations: [
     AdminNotifyDashboardComponent,
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.spec.ts
index 12a0feae64..b1f89a4f76 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AdminNotifyLogsComponent } from './admin-notify-logs.component';
+import { TranslateModule } from '@ngx-translate/core';
 
 describe('AdminNotifyLogsComponent', () => {
   let component: AdminNotifyLogsComponent;
@@ -8,6 +9,7 @@ describe('AdminNotifyLogsComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
       declarations: [ AdminNotifyLogsComponent ]
     })
     .compileComponents();
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
index f4e0e45279..c3ba6364dc 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
@@ -1,11 +1,9 @@
-<div class="container-fluid">
-  <div *ngFor="let rows of boxesConfig">
-    <div *ngFor="let box of rows.boxes">
-      <div [ngStyle]="{'background-color': box.color}">
-        <!--Here will go the actual count coming from the REST endpoint -->
-        <div>0</div>
-        <div>{{ box.title | translate }}</div>
-      </div>
+<div class="mb-5" *ngFor="let row of boxesConfig">
+  <div class="mb-2">{{ row.title | translate }}</div>
+  <div class="row justify-content-between">
+    <div class="col-sm" *ngFor="let box of row.boxes">
+      <ds-notification-box [boxConfig]="box"></ds-notification-box>
     </div>
   </div>
 </div>
+
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts
index 10e256a701..bf3a86ec2e 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AdminNotifyMetricsComponent } from './admin-notify-metrics.component';
+import { TranslateModule } from '@ngx-translate/core';
 
 describe('AdminNotifyMetricsComponent', () => {
   let component: AdminNotifyMetricsComponent;
@@ -8,6 +9,7 @@ describe('AdminNotifyMetricsComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
       declarations: [ AdminNotifyMetricsComponent ]
     })
     .compileComponents();
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
index d1d7ca4bd5..bea0f654ec 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
-import { AdminNotifyMetricsRow } from "./admin-notify-metrics.model";
-import { AdminNotifyMetricsRowsConfig } from "./admin-notify-metrics.config";
+import { AdminNotifyMetricsRow } from './admin-notify-metrics.model';
+import { AdminNotifyMetricsRowsConfig } from './admin-notify-metrics.config';
 
 @Component({
   selector: 'ds-admin-notify-metrics',
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.config.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.config.ts
index 7880e78ebf..6406f91d0b 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.config.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.config.ts
@@ -1,33 +1,29 @@
-import { AdminNotifyMetricsRow } from "./admin-notify-metrics.model";
+import { AdminNotifyMetricsRow } from './admin-notify-metrics.model';
 
 export const AdminNotifyMetricsRowsConfig: AdminNotifyMetricsRow[] = [
   {
     title: 'Number of received LDN',
     boxes: [
       {
-        color: 'blue',
+        color: '#B8DAFF',
         title: 'Accepted',
-        index: 0
       },
       {
-        color: 'green',
+        color: '#D4EDDA',
         title: 'Processed LDN',
-        index: 1
       },
       {
-        color: 'red',
+        color: '#FDBBC7',
         title: 'Failure',
-        index: 2
       },
       {
-        color: 'red',
+        color: '#FDBBC7',
         title: 'Untrusted',
-        index: 3
       },
       {
-        color: 'grey',
+        color: '#43515F',
         title: 'Incoming LDM messages',
-        index: 4
+        textColor: '#fff'
       },
     ]
   },
@@ -35,30 +31,26 @@ export const AdminNotifyMetricsRowsConfig: AdminNotifyMetricsRow[] = [
     title: 'Number of generated LDN',
     boxes: [
       {
-        color: 'green',
+        color: '#D4EDDA',
         title: 'Delivered',
-        index: 0
       },
       {
-        color: 'blue',
+        color: '#B8DAFF',
         title: 'Queued',
-        index: 1
       },
       {
-        color: 'yellow',
+        color: '#FDEEBB',
         title: 'Queued for retry',
-        index: 2
       },
       {
-        color: 'red',
+        color: '#FDBBC7',
         title: 'Failure',
-        index: 3
       },
       {
-        color: 'grey',
+        color: '#43515F',
         title: 'Outgoing LDM messages',
-        index: 4
+        textColor: '#fff'
       },
     ]
   }
-]
+];
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts
index 3b47deffa1..6fb673575c 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts
@@ -1,7 +1,8 @@
 export interface AdminNotifyMetricsBox {
   color: string;
+  textColor?: string;
   title: string;
-  index: number
+  count?: number
 }
 
 export interface AdminNotifyMetricsRow {
diff --git a/src/app/admin/admin-routing.module.ts b/src/app/admin/admin-routing.module.ts
index e30a5b20fb..801b698d56 100644
--- a/src/app/admin/admin-routing.module.ts
+++ b/src/app/admin/admin-routing.module.ts
@@ -13,7 +13,6 @@ import {
   NOTIFY_DASHBOARD_MODULE_PATH
 } from './admin-routing-paths';
 import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
-import { AdminNotifyDashboardComponent } from "./admin-notify-dashboard/admin-notify-dashboard.component";
 
 @NgModule({
   imports: [
diff --git a/src/app/shared/notification-box/notification-box.component.html b/src/app/shared/notification-box/notification-box.component.html
new file mode 100644
index 0000000000..1c83717f96
--- /dev/null
+++ b/src/app/shared/notification-box/notification-box.component.html
@@ -0,0 +1,6 @@
+<div class="w-100 h-100 pt-4 pb-3 px-2 box-container" [ngStyle]="{'background-color': boxConfig.color}">
+  <div [ngStyle]="{'color': boxConfig.textColor}" class="d-flex flex-column justify-content-center align-items-center">
+    <div class="mb-4 font-weight-bold box-counter">{{ boxConfig.count ?? 0 }}</div>
+    <div class="font-weight-bold d-flex justify-content-center w-100">{{ boxConfig.title | translate }}</div>
+  </div>
+</div>
diff --git a/src/app/shared/notification-box/notification-box.component.scss b/src/app/shared/notification-box/notification-box.component.scss
new file mode 100644
index 0000000000..9813f4aa7a
--- /dev/null
+++ b/src/app/shared/notification-box/notification-box.component.scss
@@ -0,0 +1,7 @@
+.box-container {
+  min-width: max-content;
+}
+.box-counter {
+  font-size: calc(var(--bs-font-size-lg) * 1.5);
+}
+
diff --git a/src/app/shared/notification-box/notification-box.component.spec.ts b/src/app/shared/notification-box/notification-box.component.spec.ts
new file mode 100644
index 0000000000..2e4346dba6
--- /dev/null
+++ b/src/app/shared/notification-box/notification-box.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NotificationBoxComponent } from './notification-box.component';
+
+describe('NotificationBoxComponent', () => {
+  let component: NotificationBoxComponent;
+  let fixture: ComponentFixture<NotificationBoxComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ NotificationBoxComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(NotificationBoxComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/notification-box/notification-box.component.ts b/src/app/shared/notification-box/notification-box.component.ts
new file mode 100644
index 0000000000..fc28620cc2
--- /dev/null
+++ b/src/app/shared/notification-box/notification-box.component.ts
@@ -0,0 +1,13 @@
+import { Component, Input } from '@angular/core';
+import {
+  AdminNotifyMetricsBox
+} from "../../admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model";
+
+@Component({
+  selector: 'ds-notification-box',
+  templateUrl: './notification-box.component.html',
+  styleUrls: ['./notification-box.component.scss']
+})
+export class NotificationBoxComponent {
+  @Input() boxConfig: AdminNotifyMetricsBox;
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 7f59016f8c..61482fb61a 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -285,6 +285,7 @@ import { NgxPaginationModule } from 'ngx-pagination';
 import { SplitPipe } from './utils/split.pipe';
 import { ThemedUserMenuComponent } from './auth-nav-menu/user-menu/themed-user-menu.component';
 import { ThemedLangSwitchComponent } from './lang-switch/themed-lang-switch.component';
+import { NotificationBoxComponent } from './notification-box/notification-box.component';
 
 const MODULES = [
   CommonModule,
@@ -469,7 +470,8 @@ const ENTRY_COMPONENTS = [
   AdvancedClaimedTaskActionRatingComponent,
   EpersonGroupListComponent,
   EpersonSearchBoxComponent,
-  GroupSearchBoxComponent
+  GroupSearchBoxComponent,
+  NotificationBoxComponent
 ];
 
 const PROVIDERS = [

From e39e034329627e0fdf7ad4d429dedba285bd6a7c Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 28 Dec 2023 17:06:27 +0100
Subject: [PATCH 05/45] update config and integrate rest

---
 .../admin-notify-dashboard.component.html     |  2 +-
 .../admin-notify-dashboard.component.ts       | 50 ++++++--------
 .../admin-notify-metrics.component.ts         |  6 +-
 .../admin-notify-metrics.config.ts            | 56 ---------------
 .../admin-notify-metrics.model.ts             |  1 +
 src/config/app-config.interface.ts            |  4 ++
 src/config/default-app-config.ts              | 68 +++++++++++++++++++
 src/environments/environment.test.ts          | 65 ++++++++++++++++++
 8 files changed, 161 insertions(+), 91 deletions(-)
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.config.ts

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
index 4b432adb38..e366fbc909 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
@@ -8,7 +8,7 @@
             <a ngbNavLink>{{'admin-notify-dashboard.metrics' | translate}}</a>
             <ng-template ngbNavContent>
               <div id="metrics">
-                <ds-admin-notify-metrics></ds-admin-notify-metrics>
+                <ds-admin-notify-metrics [boxesConfig]="metricsConfig"></ds-admin-notify-metrics>
               </div>
             </ng-template>
           </li>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index 56f5091969..abaf9f05b5 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -1,47 +1,35 @@
-import { Component, Inject, OnInit } from '@angular/core';
-import { SearchConfigurationService } from "../../core/shared/search/search-configuration.service";
+import { Component, OnInit } from '@angular/core';
 import { SearchService } from "../../core/shared/search/search.service";
+import { environment } from "../../../environments/environment";
 import { PaginatedSearchOptions } from "../../shared/search/models/paginated-search-options.model";
-import { SEARCH_CONFIG_SERVICE } from "../../my-dspace-page/my-dspace-page.component";
 import { PaginationComponentOptions } from "../../shared/pagination/pagination-component-options.model";
-import { SearchFilterConfig } from "../../shared/search/models/search-filter-config.model";
+import { concatAll, concatWith, flatMap, forkJoin, from, mergeAll, switchMap } from "rxjs";
+import { concat, delay } from "rxjs/operators";
+import { getFirstSucceededRemoteData } from "../../core/shared/operators";
 
 @Component({
   selector: 'ds-admin-notify-dashboard',
   templateUrl: './admin-notify-dashboard.component.html',
   styleUrls: ['./admin-notify-dashboard.component.scss'],
-  providers: [
-    {
-      provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
 })
 export class AdminNotifyDashboardComponent implements OnInit{
-  mockFilterConfig : SearchFilterConfig = Object.assign(new SearchFilterConfig(), {
-    type: {
-      value: "discovery-filter"
-    },
-    pageSize: 10,
-    name: "author",
-    filterType: "text",
-    _links: {
-      self: {
-        href: "https://dspace-coar.4science.cloud/server/api/discover/facets/author"
-      }
-    }
-  });
 
-  mockPaginatedSearchOptions = new PaginatedSearchOptions({
-    pagination: Object.assign(new PaginationComponentOptions(), { id: 'page-id', currentPage: 1, pageSize: 20 }),
-    configuration: '',
+  metricsConfig = environment.notifyMetrics;
+  private singleResultOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'single-result-options',
+    pageSize: 1
   });
-
-  constructor(private searchService: SearchService,
-              @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
-  ) {}
+  constructor(private searchService: SearchService) {}
 
   ngOnInit() {
-    this.searchService.getFacetValuesFor(this.mockFilterConfig, 1, this.mockPaginatedSearchOptions).subscribe(c => console.log(c))
+    const discoveryConfigurations = this.metricsConfig
+      .map(row => row.boxes)
+      .map(boxes => boxes.map(box => box.config).filter(config => !!config));
+    const mergedConfigurations = discoveryConfigurations[0].concat(discoveryConfigurations[1]);
+    const searchConfigurations = mergedConfigurations
+      .map(config => Object.assign(new PaginatedSearchOptions({}),
+      { configuration: config, pagination: this.singleResultOptions }
+    ));
+    // TODO: check for search completion before executing next one
   }
 }
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
index bea0f654ec..57f834f872 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
@@ -1,6 +1,5 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { AdminNotifyMetricsRow } from './admin-notify-metrics.model';
-import { AdminNotifyMetricsRowsConfig } from './admin-notify-metrics.config';
 
 @Component({
   selector: 'ds-admin-notify-metrics',
@@ -9,5 +8,6 @@ import { AdminNotifyMetricsRowsConfig } from './admin-notify-metrics.config';
 })
 export class AdminNotifyMetricsComponent {
 
-  boxesConfig: AdminNotifyMetricsRow[] = AdminNotifyMetricsRowsConfig;
+  @Input()
+  boxesConfig: AdminNotifyMetricsRow[];
 }
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.config.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.config.ts
deleted file mode 100644
index 6406f91d0b..0000000000
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.config.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { AdminNotifyMetricsRow } from './admin-notify-metrics.model';
-
-export const AdminNotifyMetricsRowsConfig: AdminNotifyMetricsRow[] = [
-  {
-    title: 'Number of received LDN',
-    boxes: [
-      {
-        color: '#B8DAFF',
-        title: 'Accepted',
-      },
-      {
-        color: '#D4EDDA',
-        title: 'Processed LDN',
-      },
-      {
-        color: '#FDBBC7',
-        title: 'Failure',
-      },
-      {
-        color: '#FDBBC7',
-        title: 'Untrusted',
-      },
-      {
-        color: '#43515F',
-        title: 'Incoming LDM messages',
-        textColor: '#fff'
-      },
-    ]
-  },
-  {
-    title: 'Number of generated LDN',
-    boxes: [
-      {
-        color: '#D4EDDA',
-        title: 'Delivered',
-      },
-      {
-        color: '#B8DAFF',
-        title: 'Queued',
-      },
-      {
-        color: '#FDEEBB',
-        title: 'Queued for retry',
-      },
-      {
-        color: '#FDBBC7',
-        title: 'Failure',
-      },
-      {
-        color: '#43515F',
-        title: 'Outgoing LDM messages',
-        textColor: '#fff'
-      },
-    ]
-  }
-];
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts
index 6fb673575c..ab0f9cfa91 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts
@@ -2,6 +2,7 @@ export interface AdminNotifyMetricsBox {
   color: string;
   textColor?: string;
   title: string;
+  config: string;
   count?: number
 }
 
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index e610257dbf..e3f2b40db4 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -23,6 +23,9 @@ import { HomeConfig } from './homepage-config.interface';
 import { MarkdownConfig } from './markdown-config.interface';
 import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
+import {
+  AdminNotifyMetricsRow
+} from "../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model";
 
 interface AppConfig extends Config {
   ui: UIServerConfig;
@@ -50,6 +53,7 @@ interface AppConfig extends Config {
   markdown: MarkdownConfig;
   vocabularies: FilterVocabularyConfig[];
   comcolSelectionSort: DiscoverySortConfig;
+  notifyMetrics: AdminNotifyMetricsRow[];
 }
 
 /**
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 6150e1ad02..22f9d8322d 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -23,6 +23,9 @@ import { HomeConfig } from './homepage-config.interface';
 import { MarkdownConfig } from './markdown-config.interface';
 import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
+import {
+  AdminNotifyMetricsRow
+} from "../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model";
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -443,4 +446,69 @@ export class DefaultAppConfig implements AppConfig {
     sortField:'dc.title',
     sortDirection:'ASC',
   };
+
+  notifyMetrics: AdminNotifyMetricsRow[] = [
+    {
+      title: 'Number of received LDN',
+      boxes: [
+        {
+          color: '#B8DAFF',
+          title: 'Accepted',
+          config: 'NOTIFY.incoming.accepted'
+        },
+        {
+          color: '#D4EDDA',
+          title: 'Processed LDN',
+          config: 'NOTIFY.incoming.processed'
+        },
+        {
+          color: '#FDBBC7',
+          title: 'Failure',
+          config: 'NOTIFY.incoming.failure'
+        },
+        {
+          color: '#FDBBC7',
+          title: 'Untrusted',
+          config: 'NOTIFY.incoming.untrusted'
+        },
+        {
+          color: '#43515F',
+          title: 'Involved items',
+          textColor: '#fff',
+          config: ''
+        },
+      ]
+    },
+    {
+      title: 'Number of generated LDN',
+      boxes: [
+        {
+          color: '#D4EDDA',
+          title: 'Delivered',
+          config: 'NOTIFY.outgoing.delivered'
+        },
+        {
+          color: '#B8DAFF',
+          title: 'Queued',
+          config: 'NOTIFY.outgoing.queued'
+        },
+        {
+          color: '#FDEEBB',
+          title: 'Queued for retry',
+          config: 'NOTIFY.outgoing.queued_for_retry'
+        },
+        {
+          color: '#FDBBC7',
+          title: 'Failure',
+          config: 'NOTIFY.outgoing.failure'
+        },
+        {
+          color: '#43515F',
+          title: 'Involved items',
+          textColor: '#fff',
+          config: ''
+        },
+      ]
+    }
+  ]
 }
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 806a45fbd5..8858e95a2a 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -317,5 +317,70 @@ export const environment: BuildConfig = {
       vocabulary: 'srsc',
       enabled: true
     }
+  ],
+
+  notifyMetrics: [
+    {
+      title: 'Number of received LDN',
+      boxes: [
+        {
+          color: '#B8DAFF',
+          title: 'Accepted',
+          config: 'NOTIFY.incoming.accepted'
+        },
+        {
+          color: '#D4EDDA',
+          title: 'Processed LDN',
+          config: 'NOTIFY.incoming.processed'
+        },
+        {
+          color: '#FDBBC7',
+          title: 'Failure',
+          config: 'NOTIFY.incoming.failure'
+        },
+        {
+          color: '#FDBBC7',
+          title: 'Untrusted',
+          config: 'NOTIFY.incoming.untrusted'
+        },
+        {
+          color: '#43515F',
+          title: 'Incoming LDM messages',
+          textColor: '#fff',
+          config: ''
+        },
+      ]
+    },
+    {
+      title: 'Number of generated LDN',
+      boxes: [
+        {
+          color: '#D4EDDA',
+          title: 'Delivered',
+          config: 'NOTIFY.outgoing.delivered'
+        },
+        {
+          color: '#B8DAFF',
+          title: 'Queued',
+          config: 'NOTIFY.outgoing.queued'
+        },
+        {
+          color: '#FDEEBB',
+          title: 'Queued for retry',
+          config: 'NOTIFY.outgoing.queued_for_retry'
+        },
+        {
+          color: '#FDBBC7',
+          title: 'Failure',
+          config: 'NOTIFY.outgoing.failure'
+        },
+        {
+          color: '#43515F',
+          title: 'Outgoing LDM messages',
+          textColor: '#fff',
+          config: ''
+        },
+      ]
+    }
   ]
 };

From fec6550cba8b0fefdfeb87d3c242a97f1c77db51 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 29 Dec 2023 11:45:13 +0100
Subject: [PATCH 06/45] finalize config and mapping

---
 .../admin-notify-dashboard.component.html     |  2 +-
 .../admin-notify-dashboard.component.ts       | 71 ++++++++++++++++---
 ...dmin-notify-message-search-result.model.ts |  8 +++
 .../models/admin-notify-message.model.ts      | 31 ++++++++
 .../admin-notify-message.resource-type.ts     |  9 +++
 src/app/core/core.module.ts                   |  2 +
 6 files changed, 114 insertions(+), 9 deletions(-)
 create mode 100644 src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
index e366fbc909..2975fdde9c 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
@@ -8,7 +8,7 @@
             <a ngbNavLink>{{'admin-notify-dashboard.metrics' | translate}}</a>
             <ng-template ngbNavContent>
               <div id="metrics">
-                <ds-admin-notify-metrics [boxesConfig]="metricsConfig"></ds-admin-notify-metrics>
+                <ds-admin-notify-metrics [boxesConfig]="notifyMetricsRows$ | async"></ds-admin-notify-metrics>
               </div>
             </ng-template>
           </li>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index abaf9f05b5..b4e03d5ec7 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -3,10 +3,21 @@ import { SearchService } from "../../core/shared/search/search.service";
 import { environment } from "../../../environments/environment";
 import { PaginatedSearchOptions } from "../../shared/search/models/paginated-search-options.model";
 import { PaginationComponentOptions } from "../../shared/pagination/pagination-component-options.model";
-import { concatAll, concatWith, flatMap, forkJoin, from, mergeAll, switchMap } from "rxjs";
-import { concat, delay } from "rxjs/operators";
-import { getFirstSucceededRemoteData } from "../../core/shared/operators";
+import {
+  listableObjectComponent
+} from "../../shared/object-collection/shared/listable-object/listable-object.decorator";
+import { ViewMode } from "../../core/shared/view-mode.model";
+import { Context } from "../../core/shared/context.model";
+import { AdminNotifySearchResult } from "./models/admin-notify-message-search-result.model";
+import { forkJoin, Observable } from "rxjs";
+import { getFirstCompletedRemoteData } from "../../core/shared/operators";
+import { map } from "rxjs/operators";
+import { SearchObjects } from "../../shared/search/models/search-objects.model";
+import { AdminNotifyMetricsBox, AdminNotifyMetricsRow } from "./admin-notify-metrics/admin-notify-metrics.model";
+import { DSpaceObject } from "../../core/shared/dspace-object.model";
 
+
+@listableObjectComponent(AdminNotifySearchResult, ViewMode.GridElement, Context.AdminSearch)
 @Component({
   selector: 'ds-admin-notify-dashboard',
   templateUrl: './admin-notify-dashboard.component.html',
@@ -14,7 +25,9 @@ import { getFirstSucceededRemoteData } from "../../core/shared/operators";
 })
 export class AdminNotifyDashboardComponent implements OnInit{
 
-  metricsConfig = environment.notifyMetrics;
+  public notifyMetricsRows$: Observable<AdminNotifyMetricsRow[]>
+
+  private metricsConfig = environment.notifyMetrics;
   private singleResultOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'single-result-options',
     pageSize: 1
@@ -22,14 +35,56 @@ export class AdminNotifyDashboardComponent implements OnInit{
   constructor(private searchService: SearchService) {}
 
   ngOnInit() {
-    const discoveryConfigurations = this.metricsConfig
+    const mertricsRowsConfigurations = this.metricsConfig
       .map(row => row.boxes)
       .map(boxes => boxes.map(box => box.config).filter(config => !!config));
-    const mergedConfigurations = discoveryConfigurations[0].concat(discoveryConfigurations[1]);
-    const searchConfigurations = mergedConfigurations
+    const flatConfigurations = [].concat(...mertricsRowsConfigurations.map((config) => config));
+    const searchConfigurations = flatConfigurations
       .map(config => Object.assign(new PaginatedSearchOptions({}),
       { configuration: config, pagination: this.singleResultOptions }
     ));
-    // TODO: check for search completion before executing next one
+
+    this.notifyMetricsRows$ = forkJoin(searchConfigurations.map(config => this.searchService.search(config)
+        .pipe(
+          getFirstCompletedRemoteData(),
+          map(response => this.mapSearchObjectsToMetricsBox(response.payload)),
+        )
+      )
+    ).pipe(
+      map(metricBoxes => this.mapUpdatedBoxesToMetricsRows(metricBoxes))
+    )
+  }
+
+  /**
+   * Function to map received SearchObjects to notify boxes config
+   *
+   * @param searchObject The object to map
+   * @private
+   */
+  private mapSearchObjectsToMetricsBox(searchObject: SearchObjects<DSpaceObject>) : AdminNotifyMetricsBox {
+    const objectConfig = searchObject.configuration;
+    const count = searchObject.pageInfo.totalElements;
+    const metricsBoxes = [].concat(...this.metricsConfig.map((config) => config.boxes));
+
+    return {
+      ...metricsBoxes.find(box => box.config === objectConfig),
+      count
+    }
+  }
+
+  /**
+   * Function to map updated boxes with count to each row of the configuration
+   *
+   * @param boxes The object to map
+   * @private
+   */
+  private mapUpdatedBoxesToMetricsRows(boxes: AdminNotifyMetricsBox[]) : AdminNotifyMetricsRow[] {
+    return this.metricsConfig.map(row => {
+        return {
+          ...row,
+          boxes: row.boxes.map(box => boxes.find(boxWithCount => boxWithCount.config === box.config))
+            .filter(box => !!box)
+        }
+    })
   }
 }
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts
new file mode 100644
index 0000000000..254151ce76
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts
@@ -0,0 +1,8 @@
+import { AdminNotifyMessage } from "./admin-notify-message.model";
+import { searchResultFor } from "../../../shared/search/search-result-element-decorator";
+import { SearchResult } from "../../../shared/search/models/search-result.model";
+
+
+@searchResultFor(AdminNotifyMessage)
+export class AdminNotifySearchResult extends SearchResult<AdminNotifyMessage> {
+}
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
new file mode 100644
index 0000000000..440c084d0f
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
@@ -0,0 +1,31 @@
+import { deserialize, inheritSerialization } from 'cerialize';
+import { typedObject } from "../../../core/cache/builders/build-decorators";
+import { ADMIN_NOTIFY_MESSAGE } from "./admin-notify-message.resource-type";
+import { excludeFromEquals } from "../../../core/utilities/equals.decorators";
+import { DSpaceObject } from "../../../core/shared/dspace-object.model";
+
+/**
+ * A message that includes admin notify info
+ */
+@typedObject
+@inheritSerialization(DSpaceObject)
+export class AdminNotifyMessage extends DSpaceObject {
+  static type = ADMIN_NOTIFY_MESSAGE;
+
+  /**
+   * The type of the message
+   */
+  @excludeFromEquals
+  type = ADMIN_NOTIFY_MESSAGE;
+
+  @deserialize
+  _links: {
+    self: {
+      href: string;
+    };
+  };
+
+  get self(): string {
+    return this._links.self.href;
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts
new file mode 100644
index 0000000000..f8d7c4d1f6
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from "../../../core/shared/resource-type";
+
+/**
+ * The resource type for AdminNotifyMessage
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const ADMIN_NOTIFY_MESSAGE = new ResourceType('message');
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index eef4f1f68e..728419c574 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -197,6 +197,7 @@ import {
 import { SubmissionCoarNotifyConfig } from '../submission/sections/section-coar-notify/submission-coar-notify.config';
 import { NotifyRequestsStatus } from '../item-page/simple/notify-requests-status/notify-requests-status.model';
 import { NotifyRequestsStatusDataService } from './data/notify-services-status-data.service';
+import { AdminNotifyMessage } from "../admin/admin-notify-dashboard/models/admin-notify-message.model";
 
 
 /**
@@ -410,6 +411,7 @@ export const models =
     Itemfilter,
     SubmissionCoarNotifyConfig,
     NotifyRequestsStatus,
+    AdminNotifyMessage
   ];
 
 @NgModule({

From 01a41570d630e103c3f24962efa206956baaf837 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 29 Dec 2023 12:23:45 +0100
Subject: [PATCH 07/45] fix lint, fix aggregate count, add translations

---
 .../admin-notify-dashboard.component.html     |  2 +-
 .../admin-notify-dashboard.component.ts       | 67 ++++++++++++-------
 .../admin-notify-logs.component.html          |  1 -
 .../admin-notify-metrics.model.ts             |  3 +-
 ...dmin-notify-message-search-result.model.ts |  6 +-
 .../models/admin-notify-message.model.ts      |  8 +--
 .../admin-notify-message.resource-type.ts     |  2 +-
 src/app/core/core.module.ts                   |  2 +-
 .../notification-box.component.ts             |  2 +-
 src/assets/i18n/en.json5                      | 20 ++++++
 src/config/app-config.interface.ts            |  2 +-
 src/config/default-app-config.ts              | 34 +++++-----
 src/environments/environment.test.ts          | 30 +++++----
 13 files changed, 110 insertions(+), 69 deletions(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
index 2975fdde9c..2402583c61 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
@@ -8,7 +8,7 @@
             <a ngbNavLink>{{'admin-notify-dashboard.metrics' | translate}}</a>
             <ng-template ngbNavContent>
               <div id="metrics">
-                <ds-admin-notify-metrics [boxesConfig]="notifyMetricsRows$ | async"></ds-admin-notify-metrics>
+                <ds-admin-notify-metrics *ngIf="(notifyMetricsRows$ | async)?.length" [boxesConfig]="notifyMetricsRows$ | async"></ds-admin-notify-metrics>
               </div>
             </ng-template>
           </li>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index b4e03d5ec7..1307974fc9 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -1,20 +1,20 @@
 import { Component, OnInit } from '@angular/core';
-import { SearchService } from "../../core/shared/search/search.service";
-import { environment } from "../../../environments/environment";
-import { PaginatedSearchOptions } from "../../shared/search/models/paginated-search-options.model";
-import { PaginationComponentOptions } from "../../shared/pagination/pagination-component-options.model";
+import { SearchService } from '../../core/shared/search/search.service';
+import { environment } from '../../../environments/environment';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import {
   listableObjectComponent
-} from "../../shared/object-collection/shared/listable-object/listable-object.decorator";
-import { ViewMode } from "../../core/shared/view-mode.model";
-import { Context } from "../../core/shared/context.model";
-import { AdminNotifySearchResult } from "./models/admin-notify-message-search-result.model";
-import { forkJoin, Observable } from "rxjs";
-import { getFirstCompletedRemoteData } from "../../core/shared/operators";
-import { map } from "rxjs/operators";
-import { SearchObjects } from "../../shared/search/models/search-objects.model";
-import { AdminNotifyMetricsBox, AdminNotifyMetricsRow } from "./admin-notify-metrics/admin-notify-metrics.model";
-import { DSpaceObject } from "../../core/shared/dspace-object.model";
+} from '../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { Context } from '../../core/shared/context.model';
+import { AdminNotifySearchResult } from './models/admin-notify-message-search-result.model';
+import { forkJoin, Observable } from 'rxjs';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { map } from 'rxjs/operators';
+import { SearchObjects } from '../../shared/search/models/search-objects.model';
+import { AdminNotifyMetricsBox, AdminNotifyMetricsRow } from './admin-notify-metrics/admin-notify-metrics.model';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
 
 
 @listableObjectComponent(AdminNotifySearchResult, ViewMode.GridElement, Context.AdminSearch)
@@ -25,7 +25,7 @@ import { DSpaceObject } from "../../core/shared/dspace-object.model";
 })
 export class AdminNotifyDashboardComponent implements OnInit{
 
-  public notifyMetricsRows$: Observable<AdminNotifyMetricsRow[]>
+  public notifyMetricsRows$: Observable<AdminNotifyMetricsRow[]>;
 
   private metricsConfig = environment.notifyMetrics;
   private singleResultOptions = Object.assign(new PaginationComponentOptions(), {
@@ -52,7 +52,7 @@ export class AdminNotifyDashboardComponent implements OnInit{
       )
     ).pipe(
       map(metricBoxes => this.mapUpdatedBoxesToMetricsRows(metricBoxes))
-    )
+    );
   }
 
   /**
@@ -61,30 +61,47 @@ export class AdminNotifyDashboardComponent implements OnInit{
    * @param searchObject The object to map
    * @private
    */
-  private mapSearchObjectsToMetricsBox(searchObject: SearchObjects<DSpaceObject>) : AdminNotifyMetricsBox {
-    const objectConfig = searchObject.configuration;
+  private mapSearchObjectsToMetricsBox(searchObject: SearchObjects<DSpaceObject>): AdminNotifyMetricsBox {
     const count = searchObject.pageInfo.totalElements;
+    const objectConfig = searchObject.configuration;
     const metricsBoxes = [].concat(...this.metricsConfig.map((config) => config.boxes));
 
     return {
       ...metricsBoxes.find(box => box.config === objectConfig),
       count
-    }
+    };
   }
 
   /**
    * Function to map updated boxes with count to each row of the configuration
    *
-   * @param boxes The object to map
+   * @param boxesWithCount The object to map
    * @private
    */
-  private mapUpdatedBoxesToMetricsRows(boxes: AdminNotifyMetricsBox[]) : AdminNotifyMetricsRow[] {
+  private mapUpdatedBoxesToMetricsRows(boxesWithCount: AdminNotifyMetricsBox[]): AdminNotifyMetricsRow[] {
     return this.metricsConfig.map(row => {
         return {
           ...row,
-          boxes: row.boxes.map(box => boxes.find(boxWithCount => boxWithCount.config === box.config))
-            .filter(box => !!box)
-        }
-    })
+          boxes: row.boxes.map(rowBox => {
+            if (rowBox.isRowAggregateCount) {
+              const currentRowBoxesWithCount = row.boxes.filter(box => !box.isRowAggregateCount)
+                .map(notAggregateBox => {
+                  return {
+                    ...notAggregateBox,
+                    count: boxesWithCount.find(boxWithCount => boxWithCount.config === notAggregateBox.config)?.count
+                  }
+              })
+              return {
+                ...rowBox,
+                count: currentRowBoxesWithCount.map(box => box.count).reduce((accumulator, currentValue) => {
+                  return accumulator + currentValue;
+                },0)
+              };
+            } else {
+              return boxesWithCount.find(boxWithCount => boxWithCount.config === rowBox.config);
+            }
+          })
+        };
+    });
   }
 }
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.html
index 494e082ddf..e69de29bb2 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.html
@@ -1 +0,0 @@
-<p>admin-notify-logs works!</p>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts
index ab0f9cfa91..190d14df0a 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts
@@ -3,7 +3,8 @@ export interface AdminNotifyMetricsBox {
   textColor?: string;
   title: string;
   config: string;
-  count?: number
+  count?: number;
+  isRowAggregateCount?: boolean;
 }
 
 export interface AdminNotifyMetricsRow {
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts
index 254151ce76..236a564f20 100644
--- a/src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts
@@ -1,6 +1,6 @@
-import { AdminNotifyMessage } from "./admin-notify-message.model";
-import { searchResultFor } from "../../../shared/search/search-result-element-decorator";
-import { SearchResult } from "../../../shared/search/models/search-result.model";
+import { AdminNotifyMessage } from './admin-notify-message.model';
+import { searchResultFor } from '../../../shared/search/search-result-element-decorator';
+import { SearchResult } from '../../../shared/search/models/search-result.model';
 
 
 @searchResultFor(AdminNotifyMessage)
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
index 440c084d0f..d0047ec392 100644
--- a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
@@ -1,8 +1,8 @@
 import { deserialize, inheritSerialization } from 'cerialize';
-import { typedObject } from "../../../core/cache/builders/build-decorators";
-import { ADMIN_NOTIFY_MESSAGE } from "./admin-notify-message.resource-type";
-import { excludeFromEquals } from "../../../core/utilities/equals.decorators";
-import { DSpaceObject } from "../../../core/shared/dspace-object.model";
+import { typedObject } from '../../../core/cache/builders/build-decorators';
+import { ADMIN_NOTIFY_MESSAGE } from './admin-notify-message.resource-type';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 
 /**
  * A message that includes admin notify info
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts
index f8d7c4d1f6..994146adb3 100644
--- a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts
@@ -1,4 +1,4 @@
-import { ResourceType } from "../../../core/shared/resource-type";
+import { ResourceType } from '../../../core/shared/resource-type';
 
 /**
  * The resource type for AdminNotifyMessage
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 728419c574..fd0ff1e39c 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -197,7 +197,7 @@ import {
 import { SubmissionCoarNotifyConfig } from '../submission/sections/section-coar-notify/submission-coar-notify.config';
 import { NotifyRequestsStatus } from '../item-page/simple/notify-requests-status/notify-requests-status.model';
 import { NotifyRequestsStatusDataService } from './data/notify-services-status-data.service';
-import { AdminNotifyMessage } from "../admin/admin-notify-dashboard/models/admin-notify-message.model";
+import { AdminNotifyMessage } from '../admin/admin-notify-dashboard/models/admin-notify-message.model';
 
 
 /**
diff --git a/src/app/shared/notification-box/notification-box.component.ts b/src/app/shared/notification-box/notification-box.component.ts
index fc28620cc2..899d55cd74 100644
--- a/src/app/shared/notification-box/notification-box.component.ts
+++ b/src/app/shared/notification-box/notification-box.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 import {
   AdminNotifyMetricsBox
-} from "../../admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model";
+} from '../../admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model';
 
 @Component({
   selector: 'ds-notification-box',
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 0acbba29c7..fa5326c92c 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3449,6 +3449,26 @@
 
   "admin-notify-dashboard.logs": "Notify logs",
 
+  "admin-notify-dashboard.received-ldn": "Number of received LDN",
+
+  "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+
+  "admin-notify-dashboard.accepted": "Accepted",
+
+  "admin-notify-dashboard.processed": "Processed LDN",
+
+  "admin-notify-dashboard.failure": "Failure",
+
+  "admin-notify-dashboard.untrusted": "Untrusted",
+
+  "admin-notify-dashboard.delivered": "Delivered",
+
+  "admin-notify-dashboard.queued": "Queued",
+
+  "admin-notify-dashboard.queued-for-retry": "Queued for retry",
+
+  "admin-notify-dashboard.involved-items": "Involved items",
+
   "admin.notify.dashboard.breadcrumbs": "Dashboard",
 
   "orgunit.listelement.badge": "Organizational Unit",
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index e3f2b40db4..c2433272f5 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -25,7 +25,7 @@ import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
 import {
   AdminNotifyMetricsRow
-} from "../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model";
+} from '../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model';
 
 interface AppConfig extends Config {
   ui: UIServerConfig;
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 22f9d8322d..3b8717ba86 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -25,7 +25,7 @@ import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
 import {
   AdminNotifyMetricsRow
-} from "../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model";
+} from '../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model';
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -449,66 +449,68 @@ export class DefaultAppConfig implements AppConfig {
 
   notifyMetrics: AdminNotifyMetricsRow[] = [
     {
-      title: 'Number of received LDN',
+      title: 'admin-notify-dashboard.received-ldn',
       boxes: [
         {
           color: '#B8DAFF',
-          title: 'Accepted',
+          title: 'admin-notify-dashboard.accepted',
           config: 'NOTIFY.incoming.accepted'
         },
         {
           color: '#D4EDDA',
-          title: 'Processed LDN',
+          title: 'admin-notify-dashboard.processed',
           config: 'NOTIFY.incoming.processed'
         },
         {
           color: '#FDBBC7',
-          title: 'Failure',
+          title: 'admin-notify-dashboard.failure',
           config: 'NOTIFY.incoming.failure'
         },
         {
           color: '#FDBBC7',
-          title: 'Untrusted',
+          title: 'admin-notify-dashboard.untrusted',
           config: 'NOTIFY.incoming.untrusted'
         },
         {
           color: '#43515F',
-          title: 'Involved items',
+          title: 'admin-notify-dashboard.involved-items',
           textColor: '#fff',
-          config: ''
+          config: '',
+          isRowAggregateCount: true
         },
       ]
     },
     {
-      title: 'Number of generated LDN',
+      title: 'admin-notify-dashboard.generated-ldn',
       boxes: [
         {
           color: '#D4EDDA',
-          title: 'Delivered',
+          title: 'admin-notify-dashboard.delivered',
           config: 'NOTIFY.outgoing.delivered'
         },
         {
           color: '#B8DAFF',
-          title: 'Queued',
+          title: 'admin-notify-dashboard.queued',
           config: 'NOTIFY.outgoing.queued'
         },
         {
           color: '#FDEEBB',
-          title: 'Queued for retry',
+          title: 'admin-notify-dashboard.queued-for-retry',
           config: 'NOTIFY.outgoing.queued_for_retry'
         },
         {
           color: '#FDBBC7',
-          title: 'Failure',
+          title: 'admin-notify-dashboard.failure',
           config: 'NOTIFY.outgoing.failure'
         },
         {
           color: '#43515F',
-          title: 'Involved items',
+          title: 'admin-notify-dashboard.involved-items',
           textColor: '#fff',
-          config: ''
+          config: '',
+          isRowAggregateCount: true
         },
       ]
     }
-  ]
+  ];
 }
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 8858e95a2a..165b311de8 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -321,64 +321,66 @@ export const environment: BuildConfig = {
 
   notifyMetrics: [
     {
-      title: 'Number of received LDN',
+      title: 'admin-notify-dashboard.received-ldn',
       boxes: [
         {
           color: '#B8DAFF',
-          title: 'Accepted',
+          title: 'admin-notify-dashboard.accepted',
           config: 'NOTIFY.incoming.accepted'
         },
         {
           color: '#D4EDDA',
-          title: 'Processed LDN',
+          title: 'admin-notify-dashboard.processed',
           config: 'NOTIFY.incoming.processed'
         },
         {
           color: '#FDBBC7',
-          title: 'Failure',
+          title: 'admin-notify-dashboard.failure',
           config: 'NOTIFY.incoming.failure'
         },
         {
           color: '#FDBBC7',
-          title: 'Untrusted',
+          title: 'admin-notify-dashboard.untrusted',
           config: 'NOTIFY.incoming.untrusted'
         },
         {
           color: '#43515F',
-          title: 'Incoming LDM messages',
+          title: 'admin-notify-dashboard.involved-items',
           textColor: '#fff',
-          config: ''
+          config: '',
+          isRowAggregateCount: true
         },
       ]
     },
     {
-      title: 'Number of generated LDN',
+      title: 'admin-notify-dashboard.generated-ldn',
       boxes: [
         {
           color: '#D4EDDA',
-          title: 'Delivered',
+          title: 'admin-notify-dashboard.delivered',
           config: 'NOTIFY.outgoing.delivered'
         },
         {
           color: '#B8DAFF',
-          title: 'Queued',
+          title: 'admin-notify-dashboard.queued',
           config: 'NOTIFY.outgoing.queued'
         },
         {
           color: '#FDEEBB',
-          title: 'Queued for retry',
+          title: 'admin-notify-dashboard.queued-for-retry',
           config: 'NOTIFY.outgoing.queued_for_retry'
         },
         {
           color: '#FDBBC7',
-          title: 'Failure',
+          title: 'admin-notify-dashboard.failure',
           config: 'NOTIFY.outgoing.failure'
         },
         {
           color: '#43515F',
-          title: 'Outgoing LDM messages',
+          title: 'admin-notify-dashboard.involved-items',
           textColor: '#fff',
-          config: ''
+          config: '',
+          isRowAggregateCount: true
         },
       ]
     }

From a43cb352fd8df72e38bedabfbfe34099a53728e5 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 29 Dec 2023 12:25:54 +0100
Subject: [PATCH 08/45] fix lint

---
 .../admin-notify-dashboard.component.ts                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index 1307974fc9..e25a5688a9 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -89,8 +89,8 @@ export class AdminNotifyDashboardComponent implements OnInit{
                   return {
                     ...notAggregateBox,
                     count: boxesWithCount.find(boxWithCount => boxWithCount.config === notAggregateBox.config)?.count
-                  }
-              })
+                  };
+                });
               return {
                 ...rowBox,
                 count: currentRowBoxesWithCount.map(box => box.count).reduce((accumulator, currentValue) => {

From 6a41dce3be037a241af912bf9027bd4e8de4b116 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 29 Dec 2023 12:45:47 +0100
Subject: [PATCH 09/45] fix tests

---
 .../admin-notify-dashboard.component.spec.ts  | 24 ++++++++++++++++++-
 .../admin-notify-dashboard.component.ts       |  1 +
 .../notification-box.component.spec.ts        | 14 +++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
index c5afaa3b59..47ff2b2fde 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
@@ -3,15 +3,37 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
+import { SearchService } from "../../core/shared/search/search.service";
+import { createSuccessfulRemoteDataObject$ } from "../../shared/remote-data.utils";
+import { buildPaginatedList } from "../../core/data/paginated-list.model";
+import { AdminNotifySearchResult } from "./models/admin-notify-message-search-result.model";
+import { AdminNotifyMessage } from "./models/admin-notify-message.model";
 
 describe('AdminNotifyDashboardComponent', () => {
   let component: AdminNotifyDashboardComponent;
   let fixture: ComponentFixture<AdminNotifyDashboardComponent>;
 
+  let item1;
+  let item2;
+  let item3;
+  let searchResult1;
+  let searchResult2;
+  let searchResult3;
+  let results;
+
   beforeEach(async () => {
+    item1 = Object.assign(new AdminNotifyMessage(), { uuid: 'e1c51c69-896d-42dc-8221-1d5f2ad5516e' });
+    item2 = Object.assign(new AdminNotifyMessage(), { uuid: 'c8279647-1acc-41ae-b036-951d5f65649b' });
+    item3 = Object.assign(new AdminNotifyMessage(), { uuid: 'c3bcbff5-ec0c-4831-8e4c-94b9c933ccac' });
+    searchResult1 = Object.assign(new AdminNotifySearchResult(), { indexableObject: item1 });
+    searchResult2 = Object.assign(new AdminNotifySearchResult(), { indexableObject: item2 });
+    searchResult3 = Object.assign(new AdminNotifySearchResult(), { indexableObject: item3 });
+    results = buildPaginatedList(undefined, [searchResult1, searchResult2, searchResult3]);
+
     await TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NgbNavModule],
-      declarations: [ AdminNotifyDashboardComponent ]
+      declarations: [ AdminNotifyDashboardComponent ],
+      providers: [{ provide: SearchService, useValue: { search: () => createSuccessfulRemoteDataObject$(results)}}]
     })
     .compileComponents();
 
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index e25a5688a9..a03333d276 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -83,6 +83,7 @@ export class AdminNotifyDashboardComponent implements OnInit{
         return {
           ...row,
           boxes: row.boxes.map(rowBox => {
+            // TODO remove aggregate once rest is updated
             if (rowBox.isRowAggregateCount) {
               const currentRowBoxesWithCount = row.boxes.filter(box => !box.isRowAggregateCount)
                 .map(notAggregateBox => {
diff --git a/src/app/shared/notification-box/notification-box.component.spec.ts b/src/app/shared/notification-box/notification-box.component.spec.ts
index 2e4346dba6..99070740e4 100644
--- a/src/app/shared/notification-box/notification-box.component.spec.ts
+++ b/src/app/shared/notification-box/notification-box.component.spec.ts
@@ -1,19 +1,33 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { NotificationBoxComponent } from './notification-box.component';
+import { TranslateModule } from "@ngx-translate/core";
+import {
+  AdminNotifyMetricsBox
+} from "../../admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model";
 
 describe('NotificationBoxComponent', () => {
   let component: NotificationBoxComponent;
   let fixture: ComponentFixture<NotificationBoxComponent>;
+  let mockBoxConfig: AdminNotifyMetricsBox;
 
   beforeEach(async () => {
+    mockBoxConfig = {
+      "color": "#D4EDDA",
+      "title": "admin-notify-dashboard.delivered",
+      "config": "NOTIFY.outgoing.delivered",
+      "count": 79
+    }
+
     await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
       declarations: [ NotificationBoxComponent ]
     })
     .compileComponents();
 
     fixture = TestBed.createComponent(NotificationBoxComponent);
     component = fixture.componentInstance;
+    component.boxConfig = mockBoxConfig;
     fixture.detectChanges();
   });
 

From 055cc50cfb77000f551baa075264b8a8e4a37b7b Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 29 Dec 2023 12:49:31 +0100
Subject: [PATCH 10/45] reduce inner space

---
 src/app/shared/notification-box/notification-box.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/notification-box/notification-box.component.html b/src/app/shared/notification-box/notification-box.component.html
index 1c83717f96..924db37d9d 100644
--- a/src/app/shared/notification-box/notification-box.component.html
+++ b/src/app/shared/notification-box/notification-box.component.html
@@ -1,6 +1,6 @@
 <div class="w-100 h-100 pt-4 pb-3 px-2 box-container" [ngStyle]="{'background-color': boxConfig.color}">
   <div [ngStyle]="{'color': boxConfig.textColor}" class="d-flex flex-column justify-content-center align-items-center">
-    <div class="mb-4 font-weight-bold box-counter">{{ boxConfig.count ?? 0 }}</div>
+    <div class="mb-3 font-weight-bold box-counter">{{ boxConfig.count ?? 0 }}</div>
     <div class="font-weight-bold d-flex justify-content-center w-100">{{ boxConfig.title | translate }}</div>
   </div>
 </div>

From cd4b6a416989c3aa62232ee24a507bb5a61532fd Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 29 Dec 2023 15:09:37 +0100
Subject: [PATCH 11/45] refactor, align config with rest

---
 .../admin-notify-dashboard.component.ts       | 21 +------------------
 .../admin-notify-metrics.model.ts             |  1 -
 src/config/default-app-config.ts              |  6 ++----
 src/environments/environment.test.ts          |  6 ++----
 4 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index a03333d276..71be6424df 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -82,26 +82,7 @@ export class AdminNotifyDashboardComponent implements OnInit{
     return this.metricsConfig.map(row => {
         return {
           ...row,
-          boxes: row.boxes.map(rowBox => {
-            // TODO remove aggregate once rest is updated
-            if (rowBox.isRowAggregateCount) {
-              const currentRowBoxesWithCount = row.boxes.filter(box => !box.isRowAggregateCount)
-                .map(notAggregateBox => {
-                  return {
-                    ...notAggregateBox,
-                    count: boxesWithCount.find(boxWithCount => boxWithCount.config === notAggregateBox.config)?.count
-                  };
-                });
-              return {
-                ...rowBox,
-                count: currentRowBoxesWithCount.map(box => box.count).reduce((accumulator, currentValue) => {
-                  return accumulator + currentValue;
-                },0)
-              };
-            } else {
-              return boxesWithCount.find(boxWithCount => boxWithCount.config === rowBox.config);
-            }
-          })
+          boxes: row.boxes.map(rowBox =>boxesWithCount.find(boxWithCount => boxWithCount.config === rowBox.config))
         };
     });
   }
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts
index 190d14df0a..bbceb10c20 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts
@@ -4,7 +4,6 @@ export interface AdminNotifyMetricsBox {
   title: string;
   config: string;
   count?: number;
-  isRowAggregateCount?: boolean;
 }
 
 export interface AdminNotifyMetricsRow {
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 3b8717ba86..12a99397d5 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -475,8 +475,7 @@ export class DefaultAppConfig implements AppConfig {
           color: '#43515F',
           title: 'admin-notify-dashboard.involved-items',
           textColor: '#fff',
-          config: '',
-          isRowAggregateCount: true
+          config: 'NOTIFY.incoming.involvedItems',
         },
       ]
     },
@@ -507,8 +506,7 @@ export class DefaultAppConfig implements AppConfig {
           color: '#43515F',
           title: 'admin-notify-dashboard.involved-items',
           textColor: '#fff',
-          config: '',
-          isRowAggregateCount: true
+          config: 'NOTIFY.outgoing.involvedItems',
         },
       ]
     }
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 165b311de8..de07503343 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -347,8 +347,7 @@ export const environment: BuildConfig = {
           color: '#43515F',
           title: 'admin-notify-dashboard.involved-items',
           textColor: '#fff',
-          config: '',
-          isRowAggregateCount: true
+          config: 'NOTIFY.incoming.involvedItems',
         },
       ]
     },
@@ -379,8 +378,7 @@ export const environment: BuildConfig = {
           color: '#43515F',
           title: 'admin-notify-dashboard.involved-items',
           textColor: '#fff',
-          config: '',
-          isRowAggregateCount: true
+          config: 'NOTIFY.outgoing.involvedItems',
         },
       ]
     }

From 664dd855ea7a74c38d4cfc05121eef3bc1d018b8 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 29 Dec 2023 15:19:03 +0100
Subject: [PATCH 12/45] fix lint

---
 .../admin-notify-dashboard.component.spec.ts       | 10 +++++-----
 .../notification-box.component.spec.ts             | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
index 47ff2b2fde..51486024a9 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
@@ -3,11 +3,11 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
-import { SearchService } from "../../core/shared/search/search.service";
-import { createSuccessfulRemoteDataObject$ } from "../../shared/remote-data.utils";
-import { buildPaginatedList } from "../../core/data/paginated-list.model";
-import { AdminNotifySearchResult } from "./models/admin-notify-message-search-result.model";
-import { AdminNotifyMessage } from "./models/admin-notify-message.model";
+import { SearchService } from '../../core/shared/search/search.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { AdminNotifySearchResult } from './models/admin-notify-message-search-result.model';
+import { AdminNotifyMessage } from './models/admin-notify-message.model';
 
 describe('AdminNotifyDashboardComponent', () => {
   let component: AdminNotifyDashboardComponent;
diff --git a/src/app/shared/notification-box/notification-box.component.spec.ts b/src/app/shared/notification-box/notification-box.component.spec.ts
index 99070740e4..a4118f81e3 100644
--- a/src/app/shared/notification-box/notification-box.component.spec.ts
+++ b/src/app/shared/notification-box/notification-box.component.spec.ts
@@ -1,10 +1,10 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { NotificationBoxComponent } from './notification-box.component';
-import { TranslateModule } from "@ngx-translate/core";
+import { TranslateModule } from '@ngx-translate/core';
 import {
   AdminNotifyMetricsBox
-} from "../../admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model";
+} from '../../admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model';
 
 describe('NotificationBoxComponent', () => {
   let component: NotificationBoxComponent;
@@ -13,11 +13,11 @@ describe('NotificationBoxComponent', () => {
 
   beforeEach(async () => {
     mockBoxConfig = {
-      "color": "#D4EDDA",
-      "title": "admin-notify-dashboard.delivered",
-      "config": "NOTIFY.outgoing.delivered",
-      "count": 79
-    }
+      'color': '#D4EDDA',
+      'title': 'admin-notify-dashboard.delivered',
+      'config': 'NOTIFY.outgoing.delivered',
+      'count': 79
+    };
 
     await TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],

From c4b8eaba72649f02eca0d576e0f4d19217fdf545 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 2 Jan 2024 14:47:15 +0100
Subject: [PATCH 13/45] add base config

---
 .../admin-notify-dashboard.module.ts          |  6 +-
 ...admin-notify-logs-configuration.service.ts | 93 +++++++++++++++++++
 .../admin-notify-logs.component.html          |  3 +
 .../admin-notify-logs.component.ts            | 17 +++-
 4 files changed, 116 insertions(+), 3 deletions(-)
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-configuration.service.ts

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
index ec6d63d8e1..efcb8dfe70 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
@@ -6,6 +6,8 @@ import { AdminNotifyDashboardRoutingModule } from './admin-notify-dashboard-rout
 import { AdminNotifyMetricsComponent } from './admin-notify-metrics/admin-notify-metrics.component';
 import { AdminNotifyLogsComponent } from './admin-notify-logs/admin-notify-logs.component';
 import { SharedModule } from '../../shared/shared.module';
+import { SearchModule } from "../../shared/search/search.module";
+import { SearchPageModule } from "../../search-page/search-page.module";
 
 
 @NgModule({
@@ -13,7 +15,9 @@ import { SharedModule } from '../../shared/shared.module';
     CommonModule,
     RouterModule,
     SharedModule,
-    AdminNotifyDashboardRoutingModule
+    AdminNotifyDashboardRoutingModule,
+    SearchModule,
+    SearchPageModule,
   ],
   declarations: [
     AdminNotifyDashboardComponent,
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-configuration.service.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-configuration.service.ts
new file mode 100644
index 0000000000..51033e9819
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-configuration.service.ts
@@ -0,0 +1,93 @@
+import { SearchConfigurationService } from "../../../core/shared/search/search-configuration.service";
+import { PaginationComponentOptions } from "../../../shared/pagination/pagination-component-options.model";
+import { SortDirection, SortOptions } from "../../../core/cache/models/sort-options.model";
+import { RouteService } from "../../../core/services/route.service";
+import { ActivatedRoute } from "@angular/router";
+import { LinkService } from "../../../core/cache/builders/link.service";
+import { HALEndpointService } from "../../../core/shared/hal-endpoint.service";
+import { RequestService } from "../../../core/data/request.service";
+import { RemoteDataBuildService } from "../../../core/cache/builders/remote-data-build.service";
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { Injectable } from "@angular/core";
+import { PaginatedSearchOptions } from "../../../shared/search/models/paginated-search-options.model";
+import { Observable } from "rxjs";
+import { map } from "rxjs/operators";
+import { hasValue } from "../../../shared/empty.util";
+
+
+
+/**
+ * Service that performs all actions that have to do with the current notify configuration
+ */
+@Injectable()
+export class AdminNotifyLogsConfigurationService extends SearchConfigurationService {
+
+
+  /**
+   * Endpoint link path for retrieving general search results
+   */
+  private searchLinkPath = 'discover/search/objects';
+  /**
+   * Default pagination settings
+   */
+  protected defaultPagination = Object.assign(new PaginationComponentOptions(), {
+    id: 'notify-logs-page',
+    pageSize: 10,
+    currentPage: 1
+  });
+  /**
+   * Default sort settings
+   */
+  protected defaultSort = new SortOptions('dc.date.issued', SortDirection.DESC);
+
+  /**
+   * Default scope setting
+   */
+  protected defaultScope = '';
+
+  /**
+   * Default query setting
+   */
+  protected defaultQuery = '';
+
+
+  /**
+   * Initialize class
+   *
+   * @param {roleService} roleService
+   * @param {RouteService} routeService
+   * @param {PaginationService} paginationService
+   * @param {ActivatedRoute} route
+   * @param linkService
+   * @param halService
+   * @param requestService
+   * @param rdb
+   */
+  constructor(
+              protected routeService: RouteService,
+              protected paginationService: PaginationService,
+              protected route: ActivatedRoute,
+              protected linkService: LinkService,
+              protected halService: HALEndpointService,
+              protected requestService: RequestService,
+              protected rdb: RemoteDataBuildService) {
+
+    super(routeService, paginationService, route, linkService, halService, requestService, rdb);
+
+    // override parent class initialization
+    this._defaults = null;
+    this.initDefaults();
+  }
+
+  getEndpoint(searchOptions?: PaginatedSearchOptions): Observable<string> {
+    return this.halService.getEndpoint(this.searchLinkPath).pipe(
+      map((url: string) => {
+        if (hasValue(searchOptions)) {
+          return (searchOptions as PaginatedSearchOptions).toRestUrl(url);
+        } else {
+          return url;
+        }
+      })
+    );
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.html
index e69de29bb2..2378b97a9d 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.html
@@ -0,0 +1,3 @@
+<ds-themed-search configuration="NOTIFY.incoming'"></ds-themed-search>
+
+<ds-themed-search configuration="NOTIFY.outgoing'"></ds-themed-search>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.ts
index 67552130a0..7db2fe5f20 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.ts
@@ -1,10 +1,23 @@
-import { Component } from '@angular/core';
+import { Component, Inject } from '@angular/core';
+import {  SEARCH_CONFIG_SERVICE } from "../../../my-dspace-page/my-dspace-page.component";
+import { AdminNotifyLogsConfigurationService } from "./admin-notify-logs-configuration.service";
+import { SearchConfigurationService } from "../../../core/shared/search/search-configuration.service";
+import { Context } from "../../../core/shared/context.model";
 
 @Component({
   selector: 'ds-admin-notify-logs',
   templateUrl: './admin-notify-logs.component.html',
-  styleUrls: ['./admin-notify-logs.component.scss']
+  styleUrls: ['./admin-notify-logs.component.scss'],
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: AdminNotifyLogsConfigurationService
+    }
+  ]
 })
 export class AdminNotifyLogsComponent {
+    constructor(@Inject(SEARCH_CONFIG_SERVICE) private searchConfigService: SearchConfigurationService) {
+    }
 
+  protected readonly context = Context.Search;
 }

From 457c3b351f9304264fc1efff63010fe971eb95a1 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 3 Jan 2024 17:27:38 +0100
Subject: [PATCH 14/45] refactor, decouple pagination and configuration

---
 .../admin-notify-dashboard-routing.module.ts  |  6 +-
 .../admin-notify-dashboard.component.html     |  3 +-
 .../admin-notify-dashboard.component.ts       |  8 --
 .../admin-notify-dashboard.module.ts          | 14 ++-
 .../admin-notify-incoming.component.html      |  9 ++
 .../admin-notify-incoming.component.scss}     |  0
 .../admin-notify-incoming.component.spec.ts}  | 10 +-
 .../admin-notify-incoming.component.ts        | 20 ++++
 ...admin-notify-logs-configuration.service.ts | 93 -------------------
 .../admin-notify-logs.component.html          |  3 -
 .../admin-notify-logs.component.ts            | 23 -----
 .../admin-notify-outgoing.component.html      |  9 ++
 .../admin-notify-outgoing.component.scss      |  0
 .../admin-notify-outgoing.component.spec.ts   | 25 +++++
 .../admin-notify-outgoing.component.ts        | 20 ++++
 .../admin-notify-search-result.component.html |  7 ++
 .../admin-notify-search-result.component.scss |  0
 ...min-notify-search-result.component.spec.ts | 22 +++++
 .../admin-notify-search-result.component.ts   | 24 +++++
 .../models/admin-notify-message.model.ts      | 46 ++++++++-
 src/app/core/shared/context.model.ts          |  2 +
 .../search/search-configuration.service.ts    | 21 ++++-
 .../notification-box.component.ts             |  6 ++
 src/app/shared/search/search.component.ts     | 11 ++-
 .../shared/search/themed-search.component.ts  |  4 +-
 src/assets/i18n/en.json5                      | 16 ++++
 26 files changed, 256 insertions(+), 146 deletions(-)
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html
 rename src/app/admin/admin-notify-dashboard/admin-notify-logs/{admin-notify-logs.component.scss => admin-notify-incoming/admin-notify-incoming.component.scss} (100%)
 rename src/app/admin/admin-notify-dashboard/admin-notify-logs/{admin-notify-logs.component.spec.ts => admin-notify-incoming/admin-notify-incoming.component.spec.ts} (60%)
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-configuration.service.ts
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.html
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.scss
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.scss
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts

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 778815e1fb..b917116216 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
@@ -2,14 +2,16 @@ 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 { AuthenticatedGuard } from '../../core/auth/authenticated.guard';
 import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
+import {
+  SiteAdministratorGuard
+} from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       {
-        canActivate: [ AuthenticatedGuard ],
+        canActivate: [SiteAdministratorGuard],
         path: '',
         component: AdminNotifyDashboardComponent,
         pathMatch: 'full',
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
index 2402583c61..6d4e340299 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
@@ -16,7 +16,8 @@
             <a ngbNavLink>{{'admin-notify-dashboard.logs' | translate}}</a>
             <ng-template ngbNavContent>
               <div id="logs">
-                <ds-admin-notify-logs></ds-admin-notify-logs>
+                <ds-admin-notify-incoming></ds-admin-notify-incoming>
+                <ds-admin-notify-outgoing></ds-admin-notify-outgoing>
               </div>
             </ng-template>
           </li>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index 71be6424df..d6d8a24cd9 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -3,12 +3,6 @@ import { SearchService } from '../../core/shared/search/search.service';
 import { environment } from '../../../environments/environment';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import {
-  listableObjectComponent
-} from '../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../core/shared/view-mode.model';
-import { Context } from '../../core/shared/context.model';
-import { AdminNotifySearchResult } from './models/admin-notify-message-search-result.model';
 import { forkJoin, Observable } from 'rxjs';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { map } from 'rxjs/operators';
@@ -16,8 +10,6 @@ import { SearchObjects } from '../../shared/search/models/search-objects.model';
 import { AdminNotifyMetricsBox, AdminNotifyMetricsRow } from './admin-notify-metrics/admin-notify-metrics.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 
-
-@listableObjectComponent(AdminNotifySearchResult, ViewMode.GridElement, Context.AdminSearch)
 @Component({
   selector: 'ds-admin-notify-dashboard',
   templateUrl: './admin-notify-dashboard.component.html',
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
index efcb8dfe70..06747dd2d5 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
@@ -4,10 +4,14 @@ import { RouterModule } from '@angular/router';
 import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
 import { AdminNotifyDashboardRoutingModule } from './admin-notify-dashboard-routing.module';
 import { AdminNotifyMetricsComponent } from './admin-notify-metrics/admin-notify-metrics.component';
-import { AdminNotifyLogsComponent } from './admin-notify-logs/admin-notify-logs.component';
+import { AdminNotifyIncomingComponent } from './admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component';
 import { SharedModule } from '../../shared/shared.module';
-import { SearchModule } from "../../shared/search/search.module";
-import { SearchPageModule } from "../../search-page/search-page.module";
+import { SearchModule } from '../../shared/search/search.module';
+import { SearchPageModule } from '../../search-page/search-page.module';
+import { AdminNotifySearchResultComponent } from './admin-notify-search-result/admin-notify-search-result.component';
+import {
+  AdminNotifyOutgoingComponent
+} from './admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component';
 
 
 @NgModule({
@@ -22,7 +26,9 @@ import { SearchPageModule } from "../../search-page/search-page.module";
   declarations: [
     AdminNotifyDashboardComponent,
     AdminNotifyMetricsComponent,
-    AdminNotifyLogsComponent
+    AdminNotifyIncomingComponent,
+    AdminNotifyOutgoingComponent,
+    AdminNotifySearchResultComponent
   ]
 })
 export class AdminNotifyDashboardModule {
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html
new file mode 100644
index 0000000000..868469ad55
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html
@@ -0,0 +1,9 @@
+<ds-themed-search
+  [configuration]="'NOTIFY.incoming'"
+  [showViewModes]="false"
+  [searchEnabled]="false"
+  [context]="context"
+  [useUniquePageId]="true"
+  [routeConfigParam]="'configuration-incoming'"
+></ds-themed-search>
+
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.scss b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.scss
similarity index 100%
rename from src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.scss
rename to src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.scss
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
similarity index 60%
rename from src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.spec.ts
rename to src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
index b1f89a4f76..d32e100686 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
@@ -1,20 +1,20 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { AdminNotifyLogsComponent } from './admin-notify-logs.component';
+import { AdminNotifyIncomingComponent } from './admin-notify-incoming.component';
 import { TranslateModule } from '@ngx-translate/core';
 
 describe('AdminNotifyLogsComponent', () => {
-  let component: AdminNotifyLogsComponent;
-  let fixture: ComponentFixture<AdminNotifyLogsComponent>;
+  let component: AdminNotifyIncomingComponent;
+  let fixture: ComponentFixture<AdminNotifyIncomingComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [ AdminNotifyLogsComponent ]
+      declarations: [ AdminNotifyIncomingComponent ]
     })
     .compileComponents();
 
-    fixture = TestBed.createComponent(AdminNotifyLogsComponent);
+    fixture = TestBed.createComponent(AdminNotifyIncomingComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
new file mode 100644
index 0000000000..b1a05616a8
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
@@ -0,0 +1,20 @@
+import { Component } from '@angular/core';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { Context } from '../../../../core/shared/context.model';
+
+
+@Component({
+  selector: 'ds-admin-notify-incoming',
+  templateUrl: './admin-notify-incoming.component.html',
+  styleUrls: ['./admin-notify-incoming.component.scss'],
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService
+    }
+  ]
+})
+export class AdminNotifyIncomingComponent {
+  protected readonly context = Context.CoarNotify;
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-configuration.service.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-configuration.service.ts
deleted file mode 100644
index 51033e9819..0000000000
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-configuration.service.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { SearchConfigurationService } from "../../../core/shared/search/search-configuration.service";
-import { PaginationComponentOptions } from "../../../shared/pagination/pagination-component-options.model";
-import { SortDirection, SortOptions } from "../../../core/cache/models/sort-options.model";
-import { RouteService } from "../../../core/services/route.service";
-import { ActivatedRoute } from "@angular/router";
-import { LinkService } from "../../../core/cache/builders/link.service";
-import { HALEndpointService } from "../../../core/shared/hal-endpoint.service";
-import { RequestService } from "../../../core/data/request.service";
-import { RemoteDataBuildService } from "../../../core/cache/builders/remote-data-build.service";
-import { PaginationService } from '../../../core/pagination/pagination.service';
-import { Injectable } from "@angular/core";
-import { PaginatedSearchOptions } from "../../../shared/search/models/paginated-search-options.model";
-import { Observable } from "rxjs";
-import { map } from "rxjs/operators";
-import { hasValue } from "../../../shared/empty.util";
-
-
-
-/**
- * Service that performs all actions that have to do with the current notify configuration
- */
-@Injectable()
-export class AdminNotifyLogsConfigurationService extends SearchConfigurationService {
-
-
-  /**
-   * Endpoint link path for retrieving general search results
-   */
-  private searchLinkPath = 'discover/search/objects';
-  /**
-   * Default pagination settings
-   */
-  protected defaultPagination = Object.assign(new PaginationComponentOptions(), {
-    id: 'notify-logs-page',
-    pageSize: 10,
-    currentPage: 1
-  });
-  /**
-   * Default sort settings
-   */
-  protected defaultSort = new SortOptions('dc.date.issued', SortDirection.DESC);
-
-  /**
-   * Default scope setting
-   */
-  protected defaultScope = '';
-
-  /**
-   * Default query setting
-   */
-  protected defaultQuery = '';
-
-
-  /**
-   * Initialize class
-   *
-   * @param {roleService} roleService
-   * @param {RouteService} routeService
-   * @param {PaginationService} paginationService
-   * @param {ActivatedRoute} route
-   * @param linkService
-   * @param halService
-   * @param requestService
-   * @param rdb
-   */
-  constructor(
-              protected routeService: RouteService,
-              protected paginationService: PaginationService,
-              protected route: ActivatedRoute,
-              protected linkService: LinkService,
-              protected halService: HALEndpointService,
-              protected requestService: RequestService,
-              protected rdb: RemoteDataBuildService) {
-
-    super(routeService, paginationService, route, linkService, halService, requestService, rdb);
-
-    // override parent class initialization
-    this._defaults = null;
-    this.initDefaults();
-  }
-
-  getEndpoint(searchOptions?: PaginatedSearchOptions): Observable<string> {
-    return this.halService.getEndpoint(this.searchLinkPath).pipe(
-      map((url: string) => {
-        if (hasValue(searchOptions)) {
-          return (searchOptions as PaginatedSearchOptions).toRestUrl(url);
-        } else {
-          return url;
-        }
-      })
-    );
-  }
-}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.html
deleted file mode 100644
index 2378b97a9d..0000000000
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<ds-themed-search configuration="NOTIFY.incoming'"></ds-themed-search>
-
-<ds-themed-search configuration="NOTIFY.outgoing'"></ds-themed-search>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.ts
deleted file mode 100644
index 7db2fe5f20..0000000000
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs.component.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Component, Inject } from '@angular/core';
-import {  SEARCH_CONFIG_SERVICE } from "../../../my-dspace-page/my-dspace-page.component";
-import { AdminNotifyLogsConfigurationService } from "./admin-notify-logs-configuration.service";
-import { SearchConfigurationService } from "../../../core/shared/search/search-configuration.service";
-import { Context } from "../../../core/shared/context.model";
-
-@Component({
-  selector: 'ds-admin-notify-logs',
-  templateUrl: './admin-notify-logs.component.html',
-  styleUrls: ['./admin-notify-logs.component.scss'],
-  providers: [
-    {
-      provide: SEARCH_CONFIG_SERVICE,
-      useClass: AdminNotifyLogsConfigurationService
-    }
-  ]
-})
-export class AdminNotifyLogsComponent {
-    constructor(@Inject(SEARCH_CONFIG_SERVICE) private searchConfigService: SearchConfigurationService) {
-    }
-
-  protected readonly context = Context.Search;
-}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html
new file mode 100644
index 0000000000..af64c69e7a
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html
@@ -0,0 +1,9 @@
+<ds-themed-search
+  [configuration]="'NOTIFY.outgoing'"
+  [showViewModes]="false"
+  [searchEnabled]="false"
+  [context]="context"
+  [routeConfigParam]="'configuration-outgoing'"
+  [useUniquePageId]="true"
+></ds-themed-search>
+
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.scss b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
new file mode 100644
index 0000000000..dafa72c52e
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AdminNotifyOutgoingComponent } from './admin-notify-outgoing.component';
+import { TranslateModule } from '@ngx-translate/core';
+
+describe('AdminNotifyLogsComponent', () => {
+  let component: AdminNotifyOutgoingComponent;
+  let fixture: ComponentFixture<AdminNotifyOutgoingComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ AdminNotifyOutgoingComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifyOutgoingComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
new file mode 100644
index 0000000000..9248b9c25e
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
@@ -0,0 +1,20 @@
+import { Component } from '@angular/core';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { Context } from '../../../../core/shared/context.model';
+
+
+@Component({
+  selector: 'ds-admin-notify-outgoing',
+  templateUrl: './admin-notify-outgoing.component.html',
+  styleUrls: ['./admin-notify-outgoing.component.scss'],
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService
+    }
+  ]
+})
+export class AdminNotifyOutgoingComponent {
+  protected readonly context = Context.CoarNotify;
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
new file mode 100644
index 0000000000..b82a55b903
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -0,0 +1,7 @@
+<div class="d-flex bg-light w-100 align-items-center">
+  <div class="p-2">{{indexableObject.queueTimeout}}</div>
+  <div class="p-2">{{indexableObject.source}}</div>
+  <div class="p-2">{{indexableObject.target}}</div>
+  <div class="p-2">{{indexableObject.coarNotifyType}}</div>
+  <div class="p-2">{{indexableObject.queueStatusLabel}}</div>
+</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.scss b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
new file mode 100644
index 0000000000..b17a03274f
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { AdminNotifySearchResultComponent } from './admin-notify-search-result.component';
+
+describe('AdminNotifySearchResultComponent', () => {
+  let component: AdminNotifySearchResultComponent;
+  let fixture: ComponentFixture<AdminNotifySearchResultComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ AdminNotifySearchResultComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifySearchResultComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
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
new file mode 100644
index 0000000000..0df2159b38
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
@@ -0,0 +1,24 @@
+import { Component, OnInit } from '@angular/core';
+import {
+  listableObjectComponent
+} from '../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { AdminNotifySearchResult } from '../models/admin-notify-message-search-result.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { Context } from '../../../core/shared/context.model';
+import {
+  SearchResultListElementComponent
+} from '../../../shared/object-list/search-result-list-element/search-result-list-element.component';
+import { AdminNotifyMessage } from '../models/admin-notify-message.model';
+
+@listableObjectComponent(AdminNotifySearchResult, ViewMode.ListElement, Context.CoarNotify)
+@Component({
+  selector: 'ds-admin-notify-search-result',
+  templateUrl: './admin-notify-search-result.component.html',
+  styleUrls: ['./admin-notify-search-result.component.scss']
+})
+export class AdminNotifySearchResultComponent  extends SearchResultListElementComponent<AdminNotifySearchResult, AdminNotifyMessage> implements OnInit{
+    indexableObject: AdminNotifyMessage;
+    ngOnInit() {
+      this.indexableObject  = this.object.indexableObject;
+    }
+}
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
index d0047ec392..42bdc7b3c2 100644
--- a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
@@ -1,8 +1,10 @@
-import { deserialize, inheritSerialization } from 'cerialize';
+import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
 import { typedObject } from '../../../core/cache/builders/build-decorators';
 import { ADMIN_NOTIFY_MESSAGE } from './admin-notify-message.resource-type';
 import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { GenericConstructor } from '../../../core/shared/generic-constructor';
+import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
 
 /**
  * A message that includes admin notify info
@@ -13,11 +15,47 @@ export class AdminNotifyMessage extends DSpaceObject {
   static type = ADMIN_NOTIFY_MESSAGE;
 
   /**
-   * The type of the message
+   * The type of the resource
    */
   @excludeFromEquals
   type = ADMIN_NOTIFY_MESSAGE;
 
+  /**
+   * The type of the notification
+   */
+  @autoserialize
+  coarNotifyType: string;
+
+  /**
+   * The type of the activity stream
+   */
+  @autoserialize
+  source: number;
+
+  /**
+   * The type of the activity stream
+   */
+  @autoserialize
+  target: number;
+
+  /**
+   * The label for the status of the queue
+   */
+  @autoserialize
+  queueStatusLabel: string;
+
+  /**
+   * The timeout of the queue
+   */
+  @autoserialize
+  queueTimeout: string;
+
+  /**
+   * The status of the queue
+   */
+  @autoserialize
+  queueStatus: number;
+
   @deserialize
   _links: {
     self: {
@@ -28,4 +66,8 @@ export class AdminNotifyMessage extends DSpaceObject {
   get self(): string {
     return this._links.self.href;
   }
+
+  getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
+    return [this.constructor as GenericConstructor<ListableObject>];
+  }
 }
diff --git a/src/app/core/shared/context.model.ts b/src/app/core/shared/context.model.ts
index b4c02bee63..deb7bbeca3 100644
--- a/src/app/core/shared/context.model.ts
+++ b/src/app/core/shared/context.model.ts
@@ -39,4 +39,6 @@ export enum Context {
   MyDSpaceValidation = 'mydspaceValidation',
 
   Bitstream = 'bitstream',
+
+  CoarNotify = 'coarNotify'
 }
diff --git a/src/app/core/shared/search/search-configuration.service.ts b/src/app/core/shared/search/search-configuration.service.ts
index eed93ae201..dbc2f44bc4 100644
--- a/src/app/core/shared/search/search-configuration.service.ts
+++ b/src/app/core/shared/search/search-configuration.service.ts
@@ -28,6 +28,7 @@ import { FacetConfigResponseParsingService } from '../../data/facet-config-respo
 import { ViewMode } from '../view-mode.model';
 import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
 import { FacetConfigResponse } from '../../../shared/search/models/facet-config-response.model';
+import { DspaceRestResponseParsingService } from '../../data/dspace-rest-response-parsing.service';
 
 /**
  * Service that performs all actions that have to do with the current search configuration
@@ -60,6 +61,11 @@ export class SearchConfigurationService implements OnDestroy {
    */
   public paginatedSearchOptions: BehaviorSubject<PaginatedSearchOptions>;
 
+  /**
+   * The name of the param to enhance and store the route config
+   */
+  public routeConfigurationName: string;
+
   /**
    * Default pagination settings
    */
@@ -105,7 +111,7 @@ export class SearchConfigurationService implements OnDestroy {
               protected linkService: LinkService,
               protected halService: HALEndpointService,
               protected requestService: RequestService,
-              protected rdb: RemoteDataBuildService,) {
+              protected rdb: RemoteDataBuildService) {
 
     this.initDefaults();
   }
@@ -131,7 +137,7 @@ export class SearchConfigurationService implements OnDestroy {
   getCurrentConfiguration(defaultConfiguration: string) {
     return observableCombineLatest([
       this.routeService.getQueryParameterValue('configuration').pipe(startWith(undefined)),
-      this.routeService.getRouteParameterValue('configuration').pipe(startWith(undefined))
+      this.routeService.getRouteParameterValue(this.routeConfigurationName ?? 'configuration').pipe(startWith(undefined))
     ]).pipe(
       map(([queryConfig, routeConfig]) => {
         return queryConfig || routeConfig || defaultConfiguration;
@@ -483,7 +489,7 @@ export class SearchConfigurationService implements OnDestroy {
    * @param {string} configurationName the name of the configuration
    * @returns {Observable<RemoteData<SearchFilterConfig[]>>} The found filter configuration
    */
-  getConfig(scope?: string, configurationName?: string): Observable<RemoteData<SearchFilterConfig[]>> {
+  getConfig(scope?: string, configurationName?: string, facetParser?: DspaceRestResponseParsingService): Observable<RemoteData<SearchFilterConfig[]>> {
     const href$ = this.halService.getEndpoint(this.facetLinkPathPrefix).pipe(
       map((url: string) => this.getConfigUrl(url, scope, configurationName)),
     );
@@ -534,4 +540,13 @@ export class SearchConfigurationService implements OnDestroy {
       return { view };
     }));
   }
+
+  /**
+   * Set param to use for multiple configurations on same page and reload search subscriptions
+   */
+  setRouteConfigurationParamName(configName: string): void {
+    this.routeConfigurationName = configName;
+    this.unsubscribeFromSearchOptions(this.paginationID);
+    this.setSearchSubscription(this.paginationID, this.paginatedSearchOptions.value);
+  }
 }
diff --git a/src/app/shared/notification-box/notification-box.component.ts b/src/app/shared/notification-box/notification-box.component.ts
index 899d55cd74..00082e938f 100644
--- a/src/app/shared/notification-box/notification-box.component.ts
+++ b/src/app/shared/notification-box/notification-box.component.ts
@@ -2,7 +2,13 @@ import { Component, Input } from '@angular/core';
 import {
   AdminNotifyMetricsBox
 } from '../../admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model';
+import { listableObjectComponent } from '../object-collection/shared/listable-object/listable-object.decorator';
+import {
+  AdminNotifySearchResult
+} from '../../admin/admin-notify-dashboard/models/admin-notify-message-search-result.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
 
+@listableObjectComponent(AdminNotifySearchResult, ViewMode.ListElement)
 @Component({
   selector: 'ds-notification-box',
   templateUrl: './notification-box.component.html',
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 61f3a119c8..184dc2fb21 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -101,6 +101,11 @@ export class SearchComponent implements OnInit {
    */
   @Input() searchEnabled = true;
 
+  /**
+   * Config param for route service
+   */
+  @Input() routeConfigParam: string;
+
   /**
    * The width of the sidebar (bootstrap columns)
    */
@@ -292,8 +297,12 @@ export class SearchComponent implements OnInit {
 
     this.searchConfigService.setPaginationId(this.paginationId);
 
+    if (this.routeConfigParam) {
+      this.searchConfigService.setRouteConfigurationParamName(this.routeConfigParam);
+    }
+
     if (hasValue(this.configuration)) {
-      this.routeService.setParameter('configuration', this.configuration);
+      this.routeService.setParameter(this.routeConfigParam ?? 'configuration', this.configuration);
     }
     if (hasValue(this.fixedFilterQuery)) {
       this.routeService.setParameter('fixedFilterQuery', this.fixedFilterQuery);
diff --git a/src/app/shared/search/themed-search.component.ts b/src/app/shared/search/themed-search.component.ts
index 03f6f37e25..555056eacc 100644
--- a/src/app/shared/search/themed-search.component.ts
+++ b/src/app/shared/search/themed-search.component.ts
@@ -20,7 +20,7 @@ import { ListableObject } from '../object-collection/shared/listable-object.mode
 })
 export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
 
-  protected inAndOutputNames: (keyof SearchComponent & keyof this)[] = ['configurationList', 'context', 'configuration', 'fixedFilterQuery', 'useCachedVersionIfAvailable', 'inPlaceSearch', 'linkType', 'paginationId', 'searchEnabled', 'sideBarWidth', 'searchFormPlaceholder', 'selectable', 'selectionConfig', 'showCsvExport', 'showSidebar', 'showThumbnails', 'showViewModes', 'useUniquePageId', 'viewModeList', 'showScopeSelector', 'resultFound', 'deselectObject', 'selectObject', 'trackStatistics', 'query'];
+  protected inAndOutputNames: (keyof SearchComponent & keyof this)[] = ['configurationList', 'context', 'configuration', 'fixedFilterQuery', 'routeConfigParam', 'useCachedVersionIfAvailable', 'inPlaceSearch', 'linkType', 'paginationId', 'searchEnabled', 'sideBarWidth', 'searchFormPlaceholder', 'selectable', 'selectionConfig', 'showCsvExport', 'showSidebar', 'showThumbnails', 'showViewModes', 'useUniquePageId', 'viewModeList', 'showScopeSelector', 'resultFound', 'deselectObject', 'selectObject', 'trackStatistics', 'query'];
 
   @Input() configurationList: SearchConfigurationOption[];
 
@@ -30,6 +30,8 @@ export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
 
   @Input() fixedFilterQuery: string;
 
+  @Input() routeConfigParam: string;
+
   @Input() useCachedVersionIfAvailable: boolean;
 
   @Input() inPlaceSearch: boolean;
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index fa5326c92c..68e6e8cd9d 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3471,6 +3471,22 @@
 
   "admin.notify.dashboard.breadcrumbs": "Dashboard",
 
+  "NOTIFY.incoming.search.results.head": "Incoming",
+
+  "search.filters.filter.relateditem.head": "Related item",
+
+  "search.filters.filter.origin.head": "Origin",
+
+  "search.filters.filter.target.head": "Target",
+
+  "search.filters.filter.queue_status.head": "Queue status",
+
+  "search.filters.filter.activity_stream_type.head": "Activity stream type",
+
+  "search.filters.filter.coar_notify_type.head": "Coar notify type",
+
+  "search.filters.filter.notification_type.head": "Notification type",
+
   "orgunit.listelement.badge": "Organizational Unit",
 
   "orgunit.listelement.no-title": "Untitled",

From d72f522f63560a7beb5c6d10ed3327ff636bfe94 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 3 Jan 2024 18:01:40 +0100
Subject: [PATCH 15/45] add header translations

---
 .../admin-notify-dashboard.component.html     |  2 +
 src/assets/i18n/en.json5                      | 38 +++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
index 6d4e340299..37cc33f92a 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
@@ -16,7 +16,9 @@
             <a ngbNavLink>{{'admin-notify-dashboard.logs' | translate}}</a>
             <ng-template ngbNavContent>
               <div id="logs">
+                <div class="col-12 text-left h4 my-4">{{'admin.notify.dashboard.inbound' | translate}}</div>
                 <ds-admin-notify-incoming></ds-admin-notify-incoming>
+                <div class="col-12 text-left h4 my-4">{{'admin.notify.dashboard.outbound' | translate}}</div>
                 <ds-admin-notify-outgoing></ds-admin-notify-outgoing>
               </div>
             </ng-template>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 68e6e8cd9d..ce5004832e 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3471,6 +3471,12 @@
 
   "admin.notify.dashboard.breadcrumbs": "Dashboard",
 
+  "admin.notify.dashboard.inbound": "Inbound messages",
+
+  "admin.notify.dashboard.outbound": "Outbound messages",
+
+  "admin.notify.dashboard.breadcrumbs": "Dashboard",
+
   "NOTIFY.incoming.search.results.head": "Incoming",
 
   "search.filters.filter.relateditem.head": "Related item",
@@ -3487,6 +3493,38 @@
 
   "search.filters.filter.notification_type.head": "Notification type",
 
+  "search.filters.filter.relateditem.label": "Search related items",
+
+  "search.filters.filter.queue_status.label": "Search queue status",
+
+  "search.filters.filter.target.label": "Search target",
+
+  "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+
+  "search.filters.filter.coar_notify_type.label": "Search COAR notify type",
+
+  "search.filters.filter.notification_type.label": "Search notification type",
+
+  "search.filters.filter.relateditem.placeholder": "Related items",
+
+  "search.filters.filter.target.placeholder": "Target",
+
+  "search.filters.filter.queue_status.placeholder": "Queue status",
+
+  "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+
+  "search.filters.filter.coar_notify_type.placeholder": "COAR notify type",
+
+  "search.filters.filter.notification_type.placeholder": "Notification type",
+
+  "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+
+  "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+
+  "sorting.queue_attempts.DESC": "Queue attempted Descending",
+
+  "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+
   "orgunit.listelement.badge": "Organizational Unit",
 
   "orgunit.listelement.no-title": "Untitled",

From 9617329683ef8b4e664dde691313c7a8b19dd5e9 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 4 Jan 2024 13:22:53 +0100
Subject: [PATCH 16/45] add new dependencies for facets filters isolation

---
 .../admin-notify-dashboard.component.ts       |  23 ++-
 .../admin-notify-incoming.component.ts        |  25 ++-
 .../admin-notify-outgoing.component.ts        |  27 +++-
 .../admin-notify-search-result.component.html |  10 +-
 ...dmin-notify-facet-config-response.model.ts |  35 ++++
 ...n-notify-facet-response-parsing.service.ts |  38 +++++
 .../config/admin-notify-filter-service.ts     |  36 +++++
 ...min-notify-search-configuration.service.ts | 149 ++++++++++++++++++
 .../admin-notify-search-filter-config.ts      |  90 +++++++++++
 src/app/core/core.module.ts                   |  12 +-
 .../search/search-configuration.service.ts    |   4 +-
 .../shared/search/search-filter.service.ts    |   4 +-
 src/app/core/shared/search/search.service.ts  |   1 -
 .../search-facet-option.component.ts          |   5 +-
 .../search-facet-range-option.component.ts    |   5 +-
 .../search-facet-selected-option.component.ts |   5 +-
 .../search-facet-filter.component.ts          |   3 +-
 .../search-filter/search-filter.component.ts  |   5 +-
 .../search-hierarchy-filter.component.ts      |   3 +-
 .../search-range-filter.component.ts          |   3 +-
 .../search-filters.component.ts               |   3 +-
 21 files changed, 457 insertions(+), 29 deletions(-)
 create mode 100644 src/app/admin/admin-notify-dashboard/config/admin-notify-facet-config-response.model.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/config/admin-notify-facet-response-parsing.service.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/config/admin-notify-filter-service.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/config/admin-notify-search-configuration.service.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/config/admin-notify-search-filter-config.ts

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index d6d8a24cd9..14c5fde08e 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, InjectionToken, OnInit } from '@angular/core';
 import { SearchService } from '../../core/shared/search/search.service';
 import { environment } from '../../../environments/environment';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
@@ -9,11 +9,32 @@ import { map } from 'rxjs/operators';
 import { SearchObjects } from '../../shared/search/models/search-objects.model';
 import { AdminNotifyMetricsBox, AdminNotifyMetricsRow } from './admin-notify-metrics/admin-notify-metrics.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { FILTER_CONFIG, SearchFilterService } from "../../core/shared/search/search-filter.service";
+import { SEARCH_CONFIG_SERVICE } from "../../my-dspace-page/my-dspace-page.component";
+import { AdminNotifySearchConfigurationService } from "./config/admin-notify-search-configuration.service";
+import { AdminNotifySearchFilterService } from "./config/admin-notify-filter-service";
+import { AdminNotifySearchFilterConfig } from "./config/admin-notify-search-filter-config";
+
+export const FILTER_SEARCH: InjectionToken<SearchFilterService> = new InjectionToken<SearchFilterService>('searchFilterService');
 
 @Component({
   selector: 'ds-admin-notify-dashboard',
   templateUrl: './admin-notify-dashboard.component.html',
   styleUrls: ['./admin-notify-dashboard.component.scss'],
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: AdminNotifySearchConfigurationService
+    },
+    {
+      provide: FILTER_SEARCH,
+      useClass: AdminNotifySearchFilterService
+    },
+    {
+      provide: FILTER_CONFIG,
+      useClass: AdminNotifySearchFilterConfig
+    }
+  ]
 })
 export class AdminNotifyDashboardComponent implements OnInit{
 
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
index b1a05616a8..05a882ba6f 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
@@ -1,7 +1,12 @@
-import { Component } from '@angular/core';
+import { Component, Inject } from '@angular/core';
 import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { Context } from '../../../../core/shared/context.model';
+import { AdminNotifySearchConfigurationService } from "../../config/admin-notify-search-configuration.service";
+import { FILTER_SEARCH } from "../../admin-notify-dashboard.component";
+import { AdminNotifySearchFilterService } from "../../config/admin-notify-filter-service";
+import { FILTER_CONFIG } from "../../../../core/shared/search/search-filter.service";
+import { AdminNotifySearchFilterConfig } from "../../config/admin-notify-search-filter-config";
 
 
 @Component({
@@ -11,10 +16,26 @@ import { Context } from '../../../../core/shared/context.model';
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
+      useClass: AdminNotifySearchConfigurationService
+    },
+    {
+      provide: FILTER_SEARCH,
+      useClass: AdminNotifySearchFilterService
+    },
+    {
+      provide: FILTER_CONFIG,
+      useClass: AdminNotifySearchFilterConfig
     }
   ]
 })
 export class AdminNotifyIncomingComponent {
   protected readonly context = Context.CoarNotify;
+  constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: AdminNotifySearchConfigurationService,
+              @Inject(FILTER_SEARCH) public searchFilterService: AdminNotifySearchFilterService,
+              @Inject(FILTER_CONFIG) public filterConfig: AdminNotifySearchFilterConfig) {
+    const incomingPrefix = 'incoming.f'
+    this.searchConfigService.setParamPrefix(incomingPrefix);
+    this.searchFilterService.setParamPrefix(incomingPrefix);
+    this.filterConfig.paramNamePrefix = incomingPrefix;
+  }
 }
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
index 9248b9c25e..45043820fe 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
@@ -1,7 +1,11 @@
-import { Component } from '@angular/core';
+import { Component, Inject } from '@angular/core';
 import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { Context } from '../../../../core/shared/context.model';
+import { AdminNotifySearchConfigurationService } from "../../config/admin-notify-search-configuration.service";
+import { FILTER_SEARCH } from "../../admin-notify-dashboard.component";
+import { AdminNotifySearchFilterService } from "../../config/admin-notify-filter-service";
+import { FILTER_CONFIG } from "../../../../core/shared/search/search-filter.service";
+import { AdminNotifySearchFilterConfig } from "../../config/admin-notify-search-filter-config";
 
 
 @Component({
@@ -11,10 +15,27 @@ import { Context } from '../../../../core/shared/context.model';
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
+      useClass: AdminNotifySearchConfigurationService
+    },
+    {
+      provide: FILTER_SEARCH,
+      useClass: AdminNotifySearchFilterService
+    },
+    {
+      provide: FILTER_CONFIG,
+      useClass: AdminNotifySearchFilterConfig
     }
   ]
 })
 export class AdminNotifyOutgoingComponent {
   protected readonly context = Context.CoarNotify;
+
+  constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: AdminNotifySearchConfigurationService,
+              @Inject(FILTER_SEARCH) public searchFilterService: AdminNotifySearchFilterService,
+              @Inject(FILTER_CONFIG) public filterConfig: AdminNotifySearchFilterConfig) {
+    const outgoingPrefix = 'outgoing.f'
+    this.searchConfigService.setParamPrefix(outgoingPrefix);
+    this.searchFilterService.setParamPrefix(outgoingPrefix);
+    this.filterConfig.paramNamePrefix = outgoingPrefix;
+  }
 }
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
index b82a55b903..40e5cbc195 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -1,7 +1,7 @@
 <div class="d-flex bg-light w-100 align-items-center">
-  <div class="p-2">{{indexableObject.queueTimeout}}</div>
-  <div class="p-2">{{indexableObject.source}}</div>
-  <div class="p-2">{{indexableObject.target}}</div>
-  <div class="p-2">{{indexableObject.coarNotifyType}}</div>
-  <div class="p-2">{{indexableObject.queueStatusLabel}}</div>
+  <div class="p-2 text-truncate">{{indexableObject.queueTimeout ?? 'n/a'}}</div>
+  <div class="p-2 text-truncate">{{indexableObject.source ?? 'n/a'}}</div>
+  <div class="p-2 text-truncate">{{indexableObject.target ?? 'n/a'}}</div>
+  <div class="p-2 text-truncate">{{indexableObject.coarNotifyType ?? 'n/a'}}</div>
+  <div class="p-2 text-truncate">{{indexableObject.queueStatusLabel ?? 'n/a'}}</div>
 </div>
diff --git a/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-config-response.model.ts b/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-config-response.model.ts
new file mode 100644
index 0000000000..c7ead2b159
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-config-response.model.ts
@@ -0,0 +1,35 @@
+import { typedObject } from '../../../core/cache/builders/build-decorators';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { deserialize } from 'cerialize';
+import { HALLink } from '../../../core/shared/hal-link.model';
+import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { AdminNotifySearchFilterConfig } from "./admin-notify-search-filter-config";
+import { FACET_CONFIG_RESPONSE } from "../../../shared/search/models/types/facet-config-response.resouce-type";
+
+/**
+ * The response from the discover/facets endpoint
+ */
+@typedObject
+export class AdminNotifyFacetConfigResponse implements CacheableObject {
+  static type = FACET_CONFIG_RESPONSE;
+
+  /**
+   * The object type,
+   * hardcoded because rest doesn't a unique one.
+   */
+  @excludeFromEquals
+  type = FACET_CONFIG_RESPONSE;
+
+  /**
+   * the filters in this response
+   */
+  filters: AdminNotifySearchFilterConfig[];
+
+  /**
+   * The {@link HALLink}s for this SearchFilterConfig
+   */
+  @deserialize
+  _links: {
+    self: HALLink;
+  };
+}
diff --git a/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-response-parsing.service.ts b/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-response-parsing.service.ts
new file mode 100644
index 0000000000..854e0800fe
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-response-parsing.service.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@angular/core';
+import { FacetConfigResponseParsingService } from "../../../core/data/facet-config-response-parsing.service";
+import { RestRequest } from "../../../core/data/rest-request.model";
+import { RawRestResponse } from "../../../core/dspace-rest/raw-rest-response.model";
+import { ParsedResponse } from "../../../core/cache/response.models";
+import { DSpaceSerializer } from "../../../core/dspace-rest/dspace.serializer";
+import { AdminNotifySearchFilterConfig } from "./admin-notify-search-filter-config";
+import { FacetConfigResponse } from "../../../shared/search/models/facet-config-response.model";
+
+@Injectable()
+export class AdminNotifyFacetResponseParsingService extends FacetConfigResponseParsingService {
+  parse(request: RestRequest, data: RawRestResponse): ParsedResponse {
+
+    const config = data.payload._embedded.facets;
+    const serializer = new DSpaceSerializer(AdminNotifySearchFilterConfig);
+    const filters = serializer.deserializeArray(config);
+
+    const _links = {
+      self: data.payload._links.self
+    };
+
+    // fill in the missing links section
+    filters.forEach((filterConfig: AdminNotifySearchFilterConfig) => {
+      _links[filterConfig.name] = {
+        href: filterConfig._links.self.href
+      };
+    });
+
+    const facetConfigResponse = Object.assign(new FacetConfigResponse(), {
+      filters,
+      _links
+    });
+
+    this.addToObjectCache(facetConfigResponse, request, data);
+
+    return new ParsedResponse(data.statusCode, facetConfigResponse._links.self);
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/config/admin-notify-filter-service.ts b/src/app/admin/admin-notify-dashboard/config/admin-notify-filter-service.ts
new file mode 100644
index 0000000000..55537fcb22
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/config/admin-notify-filter-service.ts
@@ -0,0 +1,36 @@
+import { Inject, Injectable } from "@angular/core";
+import { FILTER_CONFIG, SearchFilterService } from "../../../core/shared/search/search-filter.service";
+import { Store } from "@ngrx/store";
+import { SearchFiltersState } from "../../../shared/search/search-filters/search-filter/search-filter.reducer";
+import { RouteService } from "../../../core/services/route.service";
+import { SearchFilterConfig } from "../../../shared/search/models/search-filter-config.model";
+
+
+/**
+ * Service that performs all actions that have to do with search filters and facets
+ */
+@Injectable()
+export class AdminNotifySearchFilterService extends SearchFilterService {
+
+  public filterPrefix: string;
+  constructor(protected store: Store<SearchFiltersState>,
+              protected routeService: RouteService) {
+    super(store, routeService)
+  }
+
+  /**
+   * Fetch the current active filters from the query parameters
+   * @returns {Observable<Params>}
+   */
+  getCurrentFilters() {
+    return this.routeService.getQueryParamsWithPrefix(`${this.filterPrefix}.`);
+  }
+
+  /**
+   * Set prefix to be used for route filters
+   * @param prefix
+   */
+  setParamPrefix(prefix: string) : void {
+    this.filterPrefix = prefix;
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/config/admin-notify-search-configuration.service.ts b/src/app/admin/admin-notify-dashboard/config/admin-notify-search-configuration.service.ts
new file mode 100644
index 0000000000..d90aff290e
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/config/admin-notify-search-configuration.service.ts
@@ -0,0 +1,149 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRoute, Params } from '@angular/router';
+import { combineLatest, Observable } from 'rxjs';
+import { first, map, take } from 'rxjs/operators';
+import { SearchConfigurationService } from "../../../core/shared/search/search-configuration.service";
+import { RouteService } from "../../../core/services/route.service";
+import { LinkService } from "../../../core/cache/builders/link.service";
+import { HALEndpointService } from "../../../core/shared/hal-endpoint.service";
+import { RequestService } from "../../../core/data/request.service";
+import { RemoteDataBuildService } from "../../../core/cache/builders/remote-data-build.service";
+import { PaginationService } from "../../../core/pagination/pagination.service";
+import { DspaceRestResponseParsingService } from "../../../core/data/dspace-rest-response-parsing.service";
+import { RemoteData } from "../../../core/data/remote-data";
+import { SearchFilterConfig } from "../../../shared/search/models/search-filter-config.model";
+import { GetRequest } from "../../../core/data/request.models";
+import { GenericConstructor } from "../../../core/shared/generic-constructor";
+import { ResponseParsingService } from "../../../core/data/parsing.service";
+import { FacetConfigResponseParsingService } from "../../../core/data/facet-config-response-parsing.service";
+import { FacetConfigResponse } from "../../../shared/search/models/facet-config-response.model";
+import { hasNoValue, isNotEmpty } from "../../../shared/empty.util";
+import { AdminNotifyFacetResponseParsingService } from "./admin-notify-facet-response-parsing.service";
+import { AdminNotifySearchFilterConfig } from "./admin-notify-search-filter-config";
+import { AdminNotifyFacetConfigResponse } from "./admin-notify-facet-config-response.model";
+import { SearchFilter } from "../../../shared/search/models/search-filter.model";
+
+
+
+/**
+ * Service that performs all actions that have to do with the current admin notify configuration
+ */
+@Injectable()
+export class AdminNotifySearchConfigurationService extends SearchConfigurationService {
+
+  public paramPrefix: string;
+  /**
+   * Initialize class
+   *
+   * @param {RouteService} routeService
+   * @param {PaginationService} paginationService
+   * @param {ActivatedRoute} route
+   * @param linkService
+   * @param halService
+   * @param requestService
+   * @param rdb
+   */
+  constructor(protected routeService: RouteService,
+              protected paginationService: PaginationService,
+              protected route: ActivatedRoute,
+              protected linkService: LinkService,
+              protected halService: HALEndpointService,
+              protected requestService: RequestService,
+              protected rdb: RemoteDataBuildService) {
+    super(routeService, paginationService, route, linkService, halService, requestService, rdb);
+  }
+
+  /**
+   * @returns {Observable<Params>} Emits the current active filters with their values as they are displayed in the frontend URL
+   */
+  getCurrentFrontendFilters(): Observable<Params> {
+    return this.routeService.getQueryParamsWithPrefix(`${this.paramPrefix}.`);
+  }
+
+  /**
+   * Set prefix to be used for route filters
+   * @param prefix
+   */
+  setParamPrefix(prefix: string) : void {
+    this.paramPrefix = prefix;
+  }
+
+  /**
+   * Request the filter configuration for a given scope or the whole repository
+   * @param {string} scope UUID of the object for which config the filter config is requested, when no scope is provided the configuration for the whole repository is loaded
+   * @param {string} configurationName the name of the configuration
+   * @returns {Observable<RemoteData<SearchFilterConfig[]>>} The found filter configuration
+   */
+  getConfig(scope?: string, configurationName?: string): Observable<RemoteData<AdminNotifySearchFilterConfig[]>> {
+    const href$ = this.halService.getEndpoint(this.facetLinkPathPrefix).pipe(
+      map((url: string) => this.getConfigUrl(url, scope, configurationName)),
+    );
+
+    href$.pipe(take(1)).subscribe((url: string) => {
+      let request = new GetRequest(this.requestService.generateRequestId(), url);
+      request = Object.assign(request, {
+        getResponseParser(): GenericConstructor<ResponseParsingService> {
+          return AdminNotifyFacetResponseParsingService;
+        }
+      });
+      this.requestService.send(request, true);
+    });
+
+    return this.rdb.buildFromHref(href$).pipe(
+      map((rd: RemoteData<AdminNotifyFacetConfigResponse>) => {
+        if (rd.hasSucceeded) {
+          let filters: AdminNotifySearchFilterConfig[];
+          if (isNotEmpty(rd.payload.filters)) {
+            filters = rd.payload.filters
+              .map((filter: any) => Object.assign(new AdminNotifySearchFilterConfig(), filter));
+            filters.forEach(filter => filter.namePrefix = this.paramPrefix);
+          } else {
+            filters = [];
+          }
+
+          return new RemoteData(
+            rd.timeCompleted,
+            rd.msToLive,
+            rd.lastUpdated,
+            rd.state,
+            rd.errorMessage,
+            filters,
+            rd.statusCode,
+          );
+        } else {
+          return rd as any as RemoteData<AdminNotifySearchFilterConfig[]>;
+        }
+      })
+    );
+  }
+
+  /**
+   * @returns {Observable<Params>} Emits the current active filters with their values as they are sent to the backend
+   */
+  getCurrentFilters(): Observable<SearchFilter[]> {
+    return this.getCurrentFrontendFilters().pipe(map((filterParams) => {
+      if (isNotEmpty(filterParams)) {
+        const filters = [];
+        Object.keys(filterParams).forEach((key) => {
+          // we add one to keep in account the point at the end of the prefix and set back the prefix f.
+          const updatedKey = `f.${key.substring(this.paramPrefix.length + 1, key.length)}`;
+
+          delete Object.assign(filterParams, {[updatedKey]: filterParams[key] })[key];
+          key = updatedKey;
+          if (key.endsWith('.min') || key.endsWith('.max')) {
+            const realKey = key.slice(0, -4);
+            if (hasNoValue(filters.find((f) => f.key === realKey))) {
+              const min = filterParams[realKey + '.min'] ? filterParams[realKey + '.min'][0] : '*';
+              const max = filterParams[realKey + '.max'] ? filterParams[realKey + '.max'][0] : '*';
+              filters.push(new SearchFilter(realKey, ['[' + min + ' TO ' + max + ']'], 'equals'));
+            }
+          } else {
+            filters.push(new SearchFilter(key, filterParams[key]));
+          }
+        });
+        return filters;
+      }
+      return [];
+    }));
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/config/admin-notify-search-filter-config.ts b/src/app/admin/admin-notify-dashboard/config/admin-notify-search-filter-config.ts
new file mode 100644
index 0000000000..8172a52b1d
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/config/admin-notify-search-filter-config.ts
@@ -0,0 +1,90 @@
+import { typedObject } from '../../../core/cache/builders/build-decorators';
+import { SearchFilterConfig } from "../../../shared/search/models/search-filter-config.model";
+import { autoserialize, autoserializeAs, deserialize } from "cerialize";
+import { HALLink } from "../../../core/shared/hal-link.model";
+import { excludeFromEquals } from "../../../core/utilities/equals.decorators";
+import { SEARCH_FILTER_CONFIG } from "../../../shared/search/models/types/search-filter-config.resource-type";
+import { FilterType } from "../../../shared/search/models/filter-type.model";
+
+/**
+ * The configuration for a search filter
+ */
+@typedObject
+export class AdminNotifySearchFilterConfig implements SearchFilterConfig {
+  @autoserialize
+  namePrefix: string;
+
+  static type = SEARCH_FILTER_CONFIG;
+
+  /**
+   * The object type,
+   * hardcoded because rest doesn't set one.
+   */
+  @excludeFromEquals
+  type = SEARCH_FILTER_CONFIG;
+
+  /**
+   * The name of this filter
+   */
+  @autoserialize
+  name: string;
+
+  /**
+   * The FilterType of this filter
+   */
+  @autoserializeAs(String, 'facetType')
+  filterType: FilterType;
+
+  /**
+   * True if the filter has facets
+   */
+  @autoserialize
+  hasFacets: boolean;
+
+  /**
+   * @type {number} The page size used for this facet
+   */
+  @autoserializeAs(String, 'facetLimit')
+  pageSize = 5;
+
+  /**
+   * Defines if the item facet is collapsed by default or not on the search page
+   */
+  @autoserialize
+  isOpenByDefault: boolean;
+
+  /**
+   * Minimum value possible for this facet in the repository
+   */
+  @autoserialize
+  maxValue: string;
+
+  /**
+   * Maximum value possible for this facet in the repository
+   */
+  @autoserialize
+  minValue: string;
+
+  /**
+   * The {@link HALLink}s for this SearchFilterConfig
+   */
+  @deserialize
+  _links: {
+    self: HALLink;
+  };
+
+  /**
+   * Set prefix to be used for route filters
+   * @param namePrefix
+   */
+  set paramNamePrefix(namePrefix: string) {
+    this.namePrefix = namePrefix;
+  }
+
+  /**
+   * Name of this configuration that can be used in a url
+   * @returns Parameter name
+   */
+  get paramName(): string {
+    return `${this.namePrefix}.${this.name}`;
+  }}
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index fd0ff1e39c..7c3f1771da 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -198,6 +198,11 @@ import { SubmissionCoarNotifyConfig } from '../submission/sections/section-coar-
 import { NotifyRequestsStatus } from '../item-page/simple/notify-requests-status/notify-requests-status.model';
 import { NotifyRequestsStatusDataService } from './data/notify-services-status-data.service';
 import { AdminNotifyMessage } from '../admin/admin-notify-dashboard/models/admin-notify-message.model';
+import {
+  AdminNotifyFacetResponseParsingService
+} from "../admin/admin-notify-dashboard/config/admin-notify-facet-response-parsing.service";
+import { FILTER_SEARCH } from "../admin/admin-notify-dashboard/admin-notify-dashboard.component";
+import { AdminNotifySearchFilterService } from "../admin/admin-notify-dashboard/config/admin-notify-filter-service";
 
 
 /**
@@ -230,6 +235,10 @@ const PROVIDERS = [
   DSOResponseParsingService,
   { provide: MOCK_RESPONSE_MAP, useValue: mockResponseMap },
   { provide: DspaceRestService, useFactory: restServiceFactory, deps: [MOCK_RESPONSE_MAP, HttpClient] },
+  {
+    provide: FILTER_SEARCH,
+    useClass: SearchFilterService
+  },
   EPersonDataService,
   LinkHeadService,
   HALEndpointService,
@@ -245,6 +254,7 @@ const PROVIDERS = [
   EndpointMapResponseParsingService,
   FacetValueResponseParsingService,
   FacetConfigResponseParsingService,
+  AdminNotifyFacetResponseParsingService,
   DebugResponseParsingService,
   SearchResponseParsingService,
   MyDSpaceResponseParsingService,
@@ -284,7 +294,7 @@ const PROVIDERS = [
   SearchService,
   SidebarService,
   SearchFilterService,
-  SearchFilterService,
+  AdminNotifySearchFilterService,
   SearchConfigurationService,
   SelectableListService,
   RelationshipTypeDataService,
diff --git a/src/app/core/shared/search/search-configuration.service.ts b/src/app/core/shared/search/search-configuration.service.ts
index dbc2f44bc4..36202ae11c 100644
--- a/src/app/core/shared/search/search-configuration.service.ts
+++ b/src/app/core/shared/search/search-configuration.service.ts
@@ -44,7 +44,7 @@ export class SearchConfigurationService implements OnDestroy {
   /**
    * Endpoint link path for retrieving facet config incl values
    */
-  private facetLinkPathPrefix = 'discover/facets/';
+  protected facetLinkPathPrefix = 'discover/facets/';
 
   /**
    * Default pagination id
@@ -463,7 +463,7 @@ export class SearchConfigurationService implements OnDestroy {
     return this.rdb.buildFromHref(href$);
   }
 
-  private getConfigUrl(url: string, scope?: string, configurationName?: string) {
+  protected getConfigUrl(url: string, scope?: string, configurationName?: string) {
     const args: string[] = [];
 
     if (isNotEmpty(scope)) {
diff --git a/src/app/core/shared/search/search-filter.service.ts b/src/app/core/shared/search/search-filter.service.ts
index 80ba200d38..4b4d7a80d7 100644
--- a/src/app/core/shared/search/search-filter.service.ts
+++ b/src/app/core/shared/search/search-filter.service.ts
@@ -34,8 +34,8 @@ export const REFRESH_FILTER: InjectionToken<BehaviorSubject<any>> = new Injectio
 @Injectable()
 export class SearchFilterService {
 
-  constructor(private store: Store<SearchFiltersState>,
-              private routeService: RouteService) {
+  constructor(protected store: Store<SearchFiltersState>,
+              protected routeService: RouteService) {
   }
 
   /**
diff --git a/src/app/core/shared/search/search.service.ts b/src/app/core/shared/search/search.service.ts
index a88a8b0d16..9d85d0db5f 100644
--- a/src/app/core/shared/search/search.service.ts
+++ b/src/app/core/shared/search/search.service.ts
@@ -162,7 +162,6 @@ export class SearchService implements OnDestroy {
         getResponseParser: getResponseParserFn,
         searchOptions: searchOptions
       });
-
       this.requestService.send(request, useCachedVersionIfAvailable);
     });
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
index cdbab61a30..ad64dc36b6 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
@@ -1,6 +1,6 @@
 import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { Component, Inject, Input, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { FacetValue } from '../../../../models/facet-value.model';
 import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
@@ -11,6 +11,7 @@ import { hasValue } from '../../../../../empty.util';
 import { currentPath } from '../../../../../utils/route.utils';
 import { getFacetValueForType } from '../../../../search.utils';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { FILTER_SEARCH } from "../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 @Component({
   selector: 'ds-search-facet-option',
@@ -64,7 +65,7 @@ export class SearchFacetOptionComponent implements OnInit, OnDestroy {
   paginationId: string;
 
   constructor(protected searchService: SearchService,
-              protected filterService: SearchFilterService,
+              @Inject(FILTER_SEARCH) protected filterService: SearchFilterService,
               protected searchConfigService: SearchConfigurationService,
               protected router: Router,
               protected paginationService: PaginationService
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
index b08a54e42b..880262fe17 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
@@ -1,6 +1,6 @@
 import { Observable, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { Component, Inject, Input, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { FacetValue } from '../../../../models/facet-value.model';
 import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
@@ -14,6 +14,7 @@ import { SearchConfigurationService } from '../../../../../../core/shared/search
 import { hasValue } from '../../../../../empty.util';
 import { currentPath } from '../../../../../utils/route.utils';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { FILTER_SEARCH } from "../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 const rangeDelimiter = '-';
 
@@ -64,7 +65,7 @@ export class SearchFacetRangeOptionComponent implements OnInit, OnDestroy {
   searchLink: string;
 
   constructor(protected searchService: SearchService,
-              protected filterService: SearchFilterService,
+              @Inject(FILTER_SEARCH) protected filterService: SearchFilterService,
               protected searchConfigService: SearchConfigurationService,
               protected router: Router,
               protected paginationService: PaginationService
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
index 4566b882eb..796a8e652f 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
@@ -1,5 +1,5 @@
 import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { Component, Inject, Input, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
 import { SearchService } from '../../../../../../core/shared/search/search.service';
@@ -10,6 +10,7 @@ import { FacetValue } from '../../../../models/facet-value.model';
 import { currentPath } from '../../../../../utils/route.utils';
 import { getFacetValueForType } from '../../../../search.utils';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { FILTER_SEARCH } from "../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 @Component({
   selector: 'ds-search-facet-selected-option',
@@ -57,7 +58,7 @@ export class SearchFacetSelectedOptionComponent implements OnInit, OnDestroy {
   searchLink: string;
 
   constructor(protected searchService: SearchService,
-              protected filterService: SearchFilterService,
+              @Inject(FILTER_SEARCH) protected filterService: SearchFilterService,
               protected searchConfigService: SearchConfigurationService,
               protected router: Router,
               protected paginationService: PaginationService
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index 2b2eb9b11a..4d031b30a3 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -35,6 +35,7 @@ import { currentPath } from '../../../../utils/route.utils';
 import { getFacetValueForType, stripOperatorFromFilterValue } from '../../../search.utils';
 import { createPendingRemoteDataObject } from '../../../../remote-data.utils';
 import { FacetValues } from '../../../models/facet-values.model';
+import { FILTER_SEARCH } from "../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 @Component({
   selector: 'ds-search-facet-filter',
@@ -98,7 +99,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
   currentUrl: string;
 
   constructor(protected searchService: SearchService,
-              protected filterService: SearchFilterService,
+              @Inject(FILTER_SEARCH) protected filterService: SearchFilterService,
               protected rdbs: RemoteDataBuildService,
               protected router: Router,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index d1d3bd729d..4ed73345ef 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject, Input, OnInit } from '@angular/core';
+import { Component, Inject, Input, OnInit, Optional } from '@angular/core';
 
 import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
 import { filter, map, startWith, switchMap, take } from 'rxjs/operators';
@@ -11,6 +11,7 @@ import { SearchService } from '../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
 import { SequenceService } from '../../../../core/shared/sequence.service';
+import { FILTER_SEARCH } from "../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 @Component({
   selector: 'ds-search-filter',
@@ -71,7 +72,7 @@ export class SearchFilterComponent implements OnInit {
   private readonly sequenceId: number;
 
   constructor(
-    private filterService: SearchFilterService,
+    @Inject(FILTER_SEARCH) private filterService: SearchFilterService,
     private searchService: SearchService,
     @Inject(SEARCH_CONFIG_SERVICE) private searchConfigService: SearchConfigurationService,
     private sequenceService: SequenceService,
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
index f9b3f2bff9..bbb40781a7 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
@@ -26,6 +26,7 @@ import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { environment } from '../../../../../../environments/environment';
 import { addOperatorToFilterValue } from '../../../search.utils';
 import { VocabularyTreeviewModalComponent } from '../../../../form/vocabulary-treeview-modal/vocabulary-treeview-modal.component';
+import { FILTER_SEARCH } from "../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 @Component({
   selector: 'ds-search-hierarchy-filter',
@@ -41,7 +42,7 @@ import { VocabularyTreeviewModalComponent } from '../../../../form/vocabulary-tr
 export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent implements OnInit {
 
   constructor(protected searchService: SearchService,
-              protected filterService: SearchFilterService,
+              @Inject(FILTER_SEARCH) protected filterService: SearchFilterService,
               protected rdbs: RemoteDataBuildService,
               protected router: Router,
               protected modalService: NgbModal,
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index ed20e63c52..d15ac1639c 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -21,6 +21,7 @@ import { SearchConfigurationService } from '../../../../../core/shared/search/se
 import { RouteService } from '../../../../../core/services/route.service';
 import { hasValue } from '../../../../empty.util';
 import { yearFromString } from 'src/app/shared/date.util';
+import { FILTER_SEARCH } from "../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 /**
  * The suffix for a range filters' minimum in the frontend URL
@@ -92,7 +93,7 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
   keyboardControl: boolean;
 
   constructor(protected searchService: SearchService,
-              protected filterService: SearchFilterService,
+              @Inject(FILTER_SEARCH) protected filterService: SearchFilterService,
               protected router: Router,
               protected rdbs: RemoteDataBuildService,
               private translateService: TranslateService,
diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
index 766939226d..7e252e780d 100644
--- a/src/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -12,6 +12,7 @@ import { SearchFilterService } from '../../../core/shared/search/search-filter.s
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { currentPath } from '../../utils/route.utils';
 import { hasValue } from '../../empty.util';
+import { FILTER_SEARCH } from "../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 @Component({
   selector: 'ds-search-filters',
@@ -71,7 +72,7 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
    */
   constructor(
     private searchService: SearchService,
-    private filterService: SearchFilterService,
+    @Inject(FILTER_SEARCH) protected filterService: SearchFilterService,
     private router: Router,
     @Inject(SEARCH_CONFIG_SERVICE) private searchConfigService: SearchConfigurationService) {
   }

From 9386536ca95bfc30863cc9907247c1fc56f3ab5e Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 4 Jan 2024 14:37:01 +0100
Subject: [PATCH 17/45] fix lint

---
 .../admin-notify-dashboard.component.ts       | 10 ++---
 .../admin-notify-incoming.component.ts        | 13 +++---
 .../admin-notify-outgoing.component.ts        | 12 +++---
 ...dmin-notify-facet-config-response.model.ts |  4 +-
 ...n-notify-facet-response-parsing.service.ts | 14 +++----
 .../config/admin-notify-filter-service.ts     | 15 ++++---
 ...min-notify-search-configuration.service.ts | 42 +++++++++----------
 .../admin-notify-search-filter-config.ts      | 22 ++++++----
 src/app/core/core.module.ts                   |  6 +--
 .../search-facet-option.component.ts          |  2 +-
 .../search-facet-range-option.component.ts    |  2 +-
 .../search-facet-selected-option.component.ts |  2 +-
 .../search-facet-filter.component.ts          |  2 +-
 .../search-filter/search-filter.component.ts  |  4 +-
 .../search-hierarchy-filter.component.ts      |  2 +-
 .../search-range-filter.component.ts          |  2 +-
 .../search-filters.component.ts               |  2 +-
 17 files changed, 77 insertions(+), 79 deletions(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index 14c5fde08e..5adc71a497 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -9,11 +9,11 @@ import { map } from 'rxjs/operators';
 import { SearchObjects } from '../../shared/search/models/search-objects.model';
 import { AdminNotifyMetricsBox, AdminNotifyMetricsRow } from './admin-notify-metrics/admin-notify-metrics.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { FILTER_CONFIG, SearchFilterService } from "../../core/shared/search/search-filter.service";
-import { SEARCH_CONFIG_SERVICE } from "../../my-dspace-page/my-dspace-page.component";
-import { AdminNotifySearchConfigurationService } from "./config/admin-notify-search-configuration.service";
-import { AdminNotifySearchFilterService } from "./config/admin-notify-filter-service";
-import { AdminNotifySearchFilterConfig } from "./config/admin-notify-search-filter-config";
+import { FILTER_CONFIG, SearchFilterService } from '../../core/shared/search/search-filter.service';
+import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
+import { AdminNotifySearchConfigurationService } from './config/admin-notify-search-configuration.service';
+import { AdminNotifySearchFilterService } from './config/admin-notify-filter-service';
+import { AdminNotifySearchFilterConfig } from './config/admin-notify-search-filter-config';
 
 export const FILTER_SEARCH: InjectionToken<SearchFilterService> = new InjectionToken<SearchFilterService>('searchFilterService');
 
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
index 05a882ba6f..b43866dc82 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
@@ -1,12 +1,11 @@
 import { Component, Inject } from '@angular/core';
 import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { Context } from '../../../../core/shared/context.model';
-import { AdminNotifySearchConfigurationService } from "../../config/admin-notify-search-configuration.service";
-import { FILTER_SEARCH } from "../../admin-notify-dashboard.component";
-import { AdminNotifySearchFilterService } from "../../config/admin-notify-filter-service";
-import { FILTER_CONFIG } from "../../../../core/shared/search/search-filter.service";
-import { AdminNotifySearchFilterConfig } from "../../config/admin-notify-search-filter-config";
+import { AdminNotifySearchConfigurationService } from '../../config/admin-notify-search-configuration.service';
+import { FILTER_SEARCH } from '../../admin-notify-dashboard.component';
+import { AdminNotifySearchFilterService } from '../../config/admin-notify-filter-service';
+import { FILTER_CONFIG } from '../../../../core/shared/search/search-filter.service';
+import { AdminNotifySearchFilterConfig } from '../../config/admin-notify-search-filter-config';
 
 
 @Component({
@@ -33,7 +32,7 @@ export class AdminNotifyIncomingComponent {
   constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: AdminNotifySearchConfigurationService,
               @Inject(FILTER_SEARCH) public searchFilterService: AdminNotifySearchFilterService,
               @Inject(FILTER_CONFIG) public filterConfig: AdminNotifySearchFilterConfig) {
-    const incomingPrefix = 'incoming.f'
+    const incomingPrefix = 'incoming.f';
     this.searchConfigService.setParamPrefix(incomingPrefix);
     this.searchFilterService.setParamPrefix(incomingPrefix);
     this.filterConfig.paramNamePrefix = incomingPrefix;
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
index 45043820fe..ae8cd0f13b 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
@@ -1,11 +1,11 @@
 import { Component, Inject } from '@angular/core';
 import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
 import { Context } from '../../../../core/shared/context.model';
-import { AdminNotifySearchConfigurationService } from "../../config/admin-notify-search-configuration.service";
-import { FILTER_SEARCH } from "../../admin-notify-dashboard.component";
-import { AdminNotifySearchFilterService } from "../../config/admin-notify-filter-service";
-import { FILTER_CONFIG } from "../../../../core/shared/search/search-filter.service";
-import { AdminNotifySearchFilterConfig } from "../../config/admin-notify-search-filter-config";
+import { AdminNotifySearchConfigurationService } from '../../config/admin-notify-search-configuration.service';
+import { FILTER_SEARCH } from '../../admin-notify-dashboard.component';
+import { AdminNotifySearchFilterService } from '../../config/admin-notify-filter-service';
+import { FILTER_CONFIG } from '../../../../core/shared/search/search-filter.service';
+import { AdminNotifySearchFilterConfig } from '../../config/admin-notify-search-filter-config';
 
 
 @Component({
@@ -33,7 +33,7 @@ export class AdminNotifyOutgoingComponent {
   constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: AdminNotifySearchConfigurationService,
               @Inject(FILTER_SEARCH) public searchFilterService: AdminNotifySearchFilterService,
               @Inject(FILTER_CONFIG) public filterConfig: AdminNotifySearchFilterConfig) {
-    const outgoingPrefix = 'outgoing.f'
+    const outgoingPrefix = 'outgoing.f';
     this.searchConfigService.setParamPrefix(outgoingPrefix);
     this.searchFilterService.setParamPrefix(outgoingPrefix);
     this.filterConfig.paramNamePrefix = outgoingPrefix;
diff --git a/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-config-response.model.ts b/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-config-response.model.ts
index c7ead2b159..d9f9460a65 100644
--- a/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-config-response.model.ts
+++ b/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-config-response.model.ts
@@ -3,8 +3,8 @@ import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
 import { deserialize } from 'cerialize';
 import { HALLink } from '../../../core/shared/hal-link.model';
 import { CacheableObject } from '../../../core/cache/cacheable-object.model';
-import { AdminNotifySearchFilterConfig } from "./admin-notify-search-filter-config";
-import { FACET_CONFIG_RESPONSE } from "../../../shared/search/models/types/facet-config-response.resouce-type";
+import { AdminNotifySearchFilterConfig } from './admin-notify-search-filter-config';
+import { FACET_CONFIG_RESPONSE } from '../../../shared/search/models/types/facet-config-response.resouce-type';
 
 /**
  * The response from the discover/facets endpoint
diff --git a/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-response-parsing.service.ts b/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-response-parsing.service.ts
index 854e0800fe..16c986fef6 100644
--- a/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-response-parsing.service.ts
+++ b/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-response-parsing.service.ts
@@ -1,11 +1,11 @@
 import { Injectable } from '@angular/core';
-import { FacetConfigResponseParsingService } from "../../../core/data/facet-config-response-parsing.service";
-import { RestRequest } from "../../../core/data/rest-request.model";
-import { RawRestResponse } from "../../../core/dspace-rest/raw-rest-response.model";
-import { ParsedResponse } from "../../../core/cache/response.models";
-import { DSpaceSerializer } from "../../../core/dspace-rest/dspace.serializer";
-import { AdminNotifySearchFilterConfig } from "./admin-notify-search-filter-config";
-import { FacetConfigResponse } from "../../../shared/search/models/facet-config-response.model";
+import { FacetConfigResponseParsingService } from '../../../core/data/facet-config-response-parsing.service';
+import { RestRequest } from '../../../core/data/rest-request.model';
+import { RawRestResponse } from '../../../core/dspace-rest/raw-rest-response.model';
+import { ParsedResponse } from '../../../core/cache/response.models';
+import { DSpaceSerializer } from '../../../core/dspace-rest/dspace.serializer';
+import { AdminNotifySearchFilterConfig } from './admin-notify-search-filter-config';
+import { FacetConfigResponse } from '../../../shared/search/models/facet-config-response.model';
 
 @Injectable()
 export class AdminNotifyFacetResponseParsingService extends FacetConfigResponseParsingService {
diff --git a/src/app/admin/admin-notify-dashboard/config/admin-notify-filter-service.ts b/src/app/admin/admin-notify-dashboard/config/admin-notify-filter-service.ts
index 55537fcb22..ca421957b8 100644
--- a/src/app/admin/admin-notify-dashboard/config/admin-notify-filter-service.ts
+++ b/src/app/admin/admin-notify-dashboard/config/admin-notify-filter-service.ts
@@ -1,9 +1,8 @@
-import { Inject, Injectable } from "@angular/core";
-import { FILTER_CONFIG, SearchFilterService } from "../../../core/shared/search/search-filter.service";
-import { Store } from "@ngrx/store";
-import { SearchFiltersState } from "../../../shared/search/search-filters/search-filter/search-filter.reducer";
-import { RouteService } from "../../../core/services/route.service";
-import { SearchFilterConfig } from "../../../shared/search/models/search-filter-config.model";
+import { Injectable } from '@angular/core';
+import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
+import { Store } from '@ngrx/store';
+import { SearchFiltersState } from '../../../shared/search/search-filters/search-filter/search-filter.reducer';
+import { RouteService } from '../../../core/services/route.service';
 
 
 /**
@@ -15,7 +14,7 @@ export class AdminNotifySearchFilterService extends SearchFilterService {
   public filterPrefix: string;
   constructor(protected store: Store<SearchFiltersState>,
               protected routeService: RouteService) {
-    super(store, routeService)
+    super(store, routeService);
   }
 
   /**
@@ -30,7 +29,7 @@ export class AdminNotifySearchFilterService extends SearchFilterService {
    * Set prefix to be used for route filters
    * @param prefix
    */
-  setParamPrefix(prefix: string) : void {
+  setParamPrefix(prefix: string): void {
     this.filterPrefix = prefix;
   }
 }
diff --git a/src/app/admin/admin-notify-dashboard/config/admin-notify-search-configuration.service.ts b/src/app/admin/admin-notify-dashboard/config/admin-notify-search-configuration.service.ts
index d90aff290e..127aa2a5a1 100644
--- a/src/app/admin/admin-notify-dashboard/config/admin-notify-search-configuration.service.ts
+++ b/src/app/admin/admin-notify-dashboard/config/admin-notify-search-configuration.service.ts
@@ -1,27 +1,23 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRoute, Params } from '@angular/router';
-import { combineLatest, Observable } from 'rxjs';
-import { first, map, take } from 'rxjs/operators';
-import { SearchConfigurationService } from "../../../core/shared/search/search-configuration.service";
-import { RouteService } from "../../../core/services/route.service";
-import { LinkService } from "../../../core/cache/builders/link.service";
-import { HALEndpointService } from "../../../core/shared/hal-endpoint.service";
-import { RequestService } from "../../../core/data/request.service";
-import { RemoteDataBuildService } from "../../../core/cache/builders/remote-data-build.service";
-import { PaginationService } from "../../../core/pagination/pagination.service";
-import { DspaceRestResponseParsingService } from "../../../core/data/dspace-rest-response-parsing.service";
-import { RemoteData } from "../../../core/data/remote-data";
-import { SearchFilterConfig } from "../../../shared/search/models/search-filter-config.model";
-import { GetRequest } from "../../../core/data/request.models";
-import { GenericConstructor } from "../../../core/shared/generic-constructor";
-import { ResponseParsingService } from "../../../core/data/parsing.service";
-import { FacetConfigResponseParsingService } from "../../../core/data/facet-config-response-parsing.service";
-import { FacetConfigResponse } from "../../../shared/search/models/facet-config-response.model";
-import { hasNoValue, isNotEmpty } from "../../../shared/empty.util";
-import { AdminNotifyFacetResponseParsingService } from "./admin-notify-facet-response-parsing.service";
-import { AdminNotifySearchFilterConfig } from "./admin-notify-search-filter-config";
-import { AdminNotifyFacetConfigResponse } from "./admin-notify-facet-config-response.model";
-import { SearchFilter } from "../../../shared/search/models/search-filter.model";
+import { Observable } from 'rxjs';
+import { map, take } from 'rxjs/operators';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { RouteService } from '../../../core/services/route.service';
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { RequestService } from '../../../core/data/request.service';
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { GetRequest } from '../../../core/data/request.models';
+import { GenericConstructor } from '../../../core/shared/generic-constructor';
+import { ResponseParsingService } from '../../../core/data/parsing.service';
+import { hasNoValue, isNotEmpty } from '../../../shared/empty.util';
+import { AdminNotifyFacetResponseParsingService } from './admin-notify-facet-response-parsing.service';
+import { AdminNotifySearchFilterConfig } from './admin-notify-search-filter-config';
+import { AdminNotifyFacetConfigResponse } from './admin-notify-facet-config-response.model';
+import { SearchFilter } from '../../../shared/search/models/search-filter.model';
 
 
 
@@ -64,7 +60,7 @@ export class AdminNotifySearchConfigurationService extends SearchConfigurationSe
    * Set prefix to be used for route filters
    * @param prefix
    */
-  setParamPrefix(prefix: string) : void {
+  setParamPrefix(prefix: string): void {
     this.paramPrefix = prefix;
   }
 
diff --git a/src/app/admin/admin-notify-dashboard/config/admin-notify-search-filter-config.ts b/src/app/admin/admin-notify-dashboard/config/admin-notify-search-filter-config.ts
index 8172a52b1d..2372313c0d 100644
--- a/src/app/admin/admin-notify-dashboard/config/admin-notify-search-filter-config.ts
+++ b/src/app/admin/admin-notify-dashboard/config/admin-notify-search-filter-config.ts
@@ -1,21 +1,24 @@
 import { typedObject } from '../../../core/cache/builders/build-decorators';
-import { SearchFilterConfig } from "../../../shared/search/models/search-filter-config.model";
-import { autoserialize, autoserializeAs, deserialize } from "cerialize";
-import { HALLink } from "../../../core/shared/hal-link.model";
-import { excludeFromEquals } from "../../../core/utilities/equals.decorators";
-import { SEARCH_FILTER_CONFIG } from "../../../shared/search/models/types/search-filter-config.resource-type";
-import { FilterType } from "../../../shared/search/models/filter-type.model";
+import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
+import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
+import { HALLink } from '../../../core/shared/hal-link.model';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { SEARCH_FILTER_CONFIG } from '../../../shared/search/models/types/search-filter-config.resource-type';
+import { FilterType } from '../../../shared/search/models/filter-type.model';
 
 /**
  * The configuration for a search filter
  */
 @typedObject
 export class AdminNotifySearchFilterConfig implements SearchFilterConfig {
+  static type = SEARCH_FILTER_CONFIG;
+
+  /**
+   * The prefix of this filter
+   */
   @autoserialize
   namePrefix: string;
 
-  static type = SEARCH_FILTER_CONFIG;
-
   /**
    * The object type,
    * hardcoded because rest doesn't set one.
@@ -87,4 +90,5 @@ export class AdminNotifySearchFilterConfig implements SearchFilterConfig {
    */
   get paramName(): string {
     return `${this.namePrefix}.${this.name}`;
-  }}
+  }
+}
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 7c3f1771da..abfd303799 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -200,9 +200,9 @@ import { NotifyRequestsStatusDataService } from './data/notify-services-status-d
 import { AdminNotifyMessage } from '../admin/admin-notify-dashboard/models/admin-notify-message.model';
 import {
   AdminNotifyFacetResponseParsingService
-} from "../admin/admin-notify-dashboard/config/admin-notify-facet-response-parsing.service";
-import { FILTER_SEARCH } from "../admin/admin-notify-dashboard/admin-notify-dashboard.component";
-import { AdminNotifySearchFilterService } from "../admin/admin-notify-dashboard/config/admin-notify-filter-service";
+} from '../admin/admin-notify-dashboard/config/admin-notify-facet-response-parsing.service';
+import { FILTER_SEARCH } from '../admin/admin-notify-dashboard/admin-notify-dashboard.component';
+import { AdminNotifySearchFilterService } from '../admin/admin-notify-dashboard/config/admin-notify-filter-service';
 
 
 /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
index ad64dc36b6..fcf8b334e9 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
@@ -11,7 +11,7 @@ import { hasValue } from '../../../../../empty.util';
 import { currentPath } from '../../../../../utils/route.utils';
 import { getFacetValueForType } from '../../../../search.utils';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { FILTER_SEARCH } from "../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
+import { FILTER_SEARCH } from '../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component';
 
 @Component({
   selector: 'ds-search-facet-option',
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
index 880262fe17..7d0a575c25 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
@@ -14,7 +14,7 @@ import { SearchConfigurationService } from '../../../../../../core/shared/search
 import { hasValue } from '../../../../../empty.util';
 import { currentPath } from '../../../../../utils/route.utils';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { FILTER_SEARCH } from "../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
+import { FILTER_SEARCH } from '../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component';
 
 const rangeDelimiter = '-';
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
index 796a8e652f..25f5883a00 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
@@ -10,7 +10,7 @@ import { FacetValue } from '../../../../models/facet-value.model';
 import { currentPath } from '../../../../../utils/route.utils';
 import { getFacetValueForType } from '../../../../search.utils';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { FILTER_SEARCH } from "../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
+import { FILTER_SEARCH } from '../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component';
 
 @Component({
   selector: 'ds-search-facet-selected-option',
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index 4d031b30a3..37a540a39c 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -35,7 +35,7 @@ import { currentPath } from '../../../../utils/route.utils';
 import { getFacetValueForType, stripOperatorFromFilterValue } from '../../../search.utils';
 import { createPendingRemoteDataObject } from '../../../../remote-data.utils';
 import { FacetValues } from '../../../models/facet-values.model';
-import { FILTER_SEARCH } from "../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
+import { FILTER_SEARCH } from '../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component';
 
 @Component({
   selector: 'ds-search-facet-filter',
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index 4ed73345ef..d7967e6642 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject, Input, OnInit, Optional } from '@angular/core';
+import { Component, Inject, Input, OnInit } from '@angular/core';
 
 import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
 import { filter, map, startWith, switchMap, take } from 'rxjs/operators';
@@ -11,7 +11,7 @@ import { SearchService } from '../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
 import { SequenceService } from '../../../../core/shared/sequence.service';
-import { FILTER_SEARCH } from "../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
+import { FILTER_SEARCH } from '../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component';
 
 @Component({
   selector: 'ds-search-filter',
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
index bbb40781a7..fd62e49e32 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
@@ -26,7 +26,7 @@ import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { environment } from '../../../../../../environments/environment';
 import { addOperatorToFilterValue } from '../../../search.utils';
 import { VocabularyTreeviewModalComponent } from '../../../../form/vocabulary-treeview-modal/vocabulary-treeview-modal.component';
-import { FILTER_SEARCH } from "../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
+import { FILTER_SEARCH } from '../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component';
 
 @Component({
   selector: 'ds-search-hierarchy-filter',
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index d15ac1639c..788971b4cb 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -21,7 +21,7 @@ import { SearchConfigurationService } from '../../../../../core/shared/search/se
 import { RouteService } from '../../../../../core/services/route.service';
 import { hasValue } from '../../../../empty.util';
 import { yearFromString } from 'src/app/shared/date.util';
-import { FILTER_SEARCH } from "../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
+import { FILTER_SEARCH } from '../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component';
 
 /**
  * The suffix for a range filters' minimum in the frontend URL
diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
index 7e252e780d..e7bedbb30a 100644
--- a/src/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -12,7 +12,7 @@ import { SearchFilterService } from '../../../core/shared/search/search-filter.s
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { currentPath } from '../../utils/route.utils';
 import { hasValue } from '../../empty.util';
-import { FILTER_SEARCH } from "../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
+import { FILTER_SEARCH } from '../../../admin/admin-notify-dashboard/admin-notify-dashboard.component';
 
 @Component({
   selector: 'ds-search-filters',

From de8c0c952876119496c0948cfe10d50a5f944388 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 4 Jan 2024 17:15:25 +0100
Subject: [PATCH 18/45] add tabulatable loader and related configuration

---
 .../admin-notify-dashboard.component.html     |   2 +-
 .../admin-notify-dashboard.component.ts       |  29 ++-
 .../admin-notify-search-result.component.html |  37 +++-
 .../admin-notify-search-result.component.ts   |  22 +-
 .../models/admin-notify-message.model.ts      |   6 +
 src/app/core/shared/view-mode.model.ts        |   1 +
 .../object-collection.component.html          |  17 ++
 ...table-object-component-loader.component.ts |   1 -
 .../tabulatable-objects.decorator.ts          | 194 ++++++++++++++++
 .../tabulatable-objects.directive.ts          |  11 +
 ...ulatable-result-list-elements.component.ts |  22 ++
 .../object-table/object-table.component.html  |  32 +++
 .../object-table/object-table.component.scss  |   0
 .../object-table.component.spec.ts            |  23 ++
 .../object-table/object-table.component.ts    | 209 ++++++++++++++++++
 src/app/shared/shared.module.ts               |  18 +-
 16 files changed, 605 insertions(+), 19 deletions(-)
 create mode 100644 src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts
 create mode 100644 src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.directive.ts
 create mode 100644 src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts
 create mode 100644 src/app/shared/object-table/object-table.component.html
 create mode 100644 src/app/shared/object-table/object-table.component.scss
 create mode 100644 src/app/shared/object-table/object-table.component.spec.ts
 create mode 100644 src/app/shared/object-table/object-table.component.ts

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
index 37cc33f92a..a8aae4998b 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
@@ -12,7 +12,7 @@
               </div>
             </ng-template>
           </li>
-          <li [ngbNavItem]="'logs'">
+          <li [ngbNavItem]="'logs'" (click)="activateTableMode()">
             <a ngbNavLink>{{'admin-notify-dashboard.logs' | translate}}</a>
             <ng-template ngbNavContent>
               <div id="logs">
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index 5adc71a497..77116d97d3 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -14,6 +14,8 @@ import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.compo
 import { AdminNotifySearchConfigurationService } from './config/admin-notify-search-configuration.service';
 import { AdminNotifySearchFilterService } from './config/admin-notify-filter-service';
 import { AdminNotifySearchFilterConfig } from './config/admin-notify-search-filter-config';
+import { ViewMode } from "../../core/shared/view-mode.model";
+import { Router } from "@angular/router";
 
 export const FILTER_SEARCH: InjectionToken<SearchFilterService> = new InjectionToken<SearchFilterService>('searchFilterService');
 
@@ -45,7 +47,8 @@ export class AdminNotifyDashboardComponent implements OnInit{
     id: 'single-result-options',
     pageSize: 1
   });
-  constructor(private searchService: SearchService) {}
+  constructor(private searchService: SearchService,
+              private router: Router) {}
 
   ngOnInit() {
     const mertricsRowsConfigurations = this.metricsConfig
@@ -99,4 +102,28 @@ export class AdminNotifyDashboardComponent implements OnInit{
         };
     });
   }
+
+  /**
+   * Activate Table view mode for search result rendering
+   */
+  activateTableMode() {
+    this.searchService.setViewMode(ViewMode.Table, this.getSearchLinkParts());
+  }
+
+  /**
+   * @returns {string} The base path to the search page, or the current page when inPlaceSearch is true
+   */
+  public getSearchLink(): string {
+    return this.searchService.getSearchLink();
+  }
+
+  /**
+   * @returns {string[]} The base path to the search page, or the current page when inPlaceSearch is true, split in separate pieces
+   */
+  public getSearchLinkParts(): string[] {
+    if (this.searchService) {
+      return [];
+    }
+    return this.getSearchLink().split('/');
+  }
 }
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
index 40e5cbc195..bc703576b2 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -1,7 +1,34 @@
 <div class="d-flex bg-light w-100 align-items-center">
-  <div class="p-2 text-truncate">{{indexableObject.queueTimeout ?? 'n/a'}}</div>
-  <div class="p-2 text-truncate">{{indexableObject.source ?? 'n/a'}}</div>
-  <div class="p-2 text-truncate">{{indexableObject.target ?? 'n/a'}}</div>
-  <div class="p-2 text-truncate">{{indexableObject.coarNotifyType ?? 'n/a'}}</div>
-  <div class="p-2 text-truncate">{{indexableObject.queueStatusLabel ?? 'n/a'}}</div>
+  <div class="table-responsive">
+    <table id="formats" class="table table-striped table-hover">
+      <thead>
+        <tr>
+          <th scope="col">Timestamp</th>
+          <th scope="col">Source</th>
+          <th scope="col">Target</th>
+          <th scope="col">Type</th>
+          <th scope="col">Status</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let object of indexableObjects">
+          <td>
+              <div>{{object.queueTimeout}}</div>
+          </td>
+          <td>
+              <div>{{object.source}}</div>
+          </td>
+          <td>
+            <div>{{object.target}}</div>
+          </td>
+          <td>
+            <div>{{object.coarNotifyType}}</div>
+          </td>
+          <td>
+            <div>{{object.queueStatusLabel}}</div>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
 </div>
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 0df2159b38..4e2a4088d2 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
@@ -1,24 +1,26 @@
 import { Component, OnInit } from '@angular/core';
-import {
-  listableObjectComponent
-} from '../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AdminNotifySearchResult } from '../models/admin-notify-message-search-result.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { Context } from '../../../core/shared/context.model';
-import {
-  SearchResultListElementComponent
-} from '../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 import { AdminNotifyMessage } from '../models/admin-notify-message.model';
+import {
+  tabulatableObjectsComponent
+} from "../../../shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator";
+import {
+  TabulatableResultListElementsComponent
+} from "../../../shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component";
+import { PaginatedList } from "../../../core/data/paginated-list.model";
 
-@listableObjectComponent(AdminNotifySearchResult, ViewMode.ListElement, Context.CoarNotify)
+@tabulatableObjectsComponent(AdminNotifySearchResult, ViewMode.Table, Context.CoarNotify)
 @Component({
   selector: 'ds-admin-notify-search-result',
   templateUrl: './admin-notify-search-result.component.html',
   styleUrls: ['./admin-notify-search-result.component.scss']
 })
-export class AdminNotifySearchResultComponent  extends SearchResultListElementComponent<AdminNotifySearchResult, AdminNotifyMessage> implements OnInit{
-    indexableObject: AdminNotifyMessage;
+export class AdminNotifySearchResultComponent  extends TabulatableResultListElementsComponent<PaginatedList<AdminNotifyMessage>, AdminNotifyMessage> implements OnInit{
+    public indexableObjects: AdminNotifyMessage[];
     ngOnInit() {
-      this.indexableObject  = this.object.indexableObject;
+      this.indexableObjects = this.objects.page.map(object => object.indexableObject);
+      console.log(this.objects.page)
     }
 }
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
index 42bdc7b3c2..be861861b4 100644
--- a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
@@ -56,6 +56,12 @@ export class AdminNotifyMessage extends DSpaceObject {
   @autoserialize
   queueStatus: number;
 
+  /**
+   * The status of the queue
+   */
+  @autoserialize
+  indexableObject: AdminNotifyMessage;
+
   @deserialize
   _links: {
     self: {
diff --git a/src/app/core/shared/view-mode.model.ts b/src/app/core/shared/view-mode.model.ts
index a27cb6954b..9c2f499b3d 100644
--- a/src/app/core/shared/view-mode.model.ts
+++ b/src/app/core/shared/view-mode.model.ts
@@ -7,4 +7,5 @@ export enum ViewMode {
   GridElement = 'grid',
   DetailedListElement = 'detailed',
   StandalonePage = 'standalone',
+  Table = 'table',
 }
diff --git a/src/app/shared/object-collection/object-collection.component.html b/src/app/shared/object-collection/object-collection.component.html
index 3b0dca80ac..45b82dd859 100644
--- a/src/app/shared/object-collection/object-collection.component.html
+++ b/src/app/shared/object-collection/object-collection.component.html
@@ -58,3 +58,20 @@
 </ds-object-detail>
 
 
+<ds-object-table
+  [config]="config"
+  [sortConfig]="sortConfig"
+  [objects]="objects"
+  [hideGear]="hideGear"
+  [linkType]="linkType"
+  [context]="context"
+  [hidePaginationDetail]="hidePaginationDetail"
+  [showPaginator]="showPaginator"
+  [showThumbnails]="showThumbnails"
+  (paginationChange)="onPaginationChange($event)"
+  (pageChange)="onPageChange($event)"
+  (pageSizeChange)="onPageSizeChange($event)"
+  (sortDirectionChange)="onSortDirectionChange($event)"
+  (sortFieldChange)="onSortFieldChange($event)"
+  *ngIf="(currentMode$ | async) === viewModeEnum.Table">
+</ds-object-table>
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
index 7a3cc42bf5..3110283ddd 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
@@ -154,7 +154,6 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges
   }
 
   private instantiateComponent(object: ListableObject, changes?: SimpleChanges): void {
-
     const component = this.getComponent(object.getRenderTypes(), this.viewMode, this.context);
 
     const viewContainerRef = this.listableObjectDirective.viewContainerRef;
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
new file mode 100644
index 0000000000..9ab9e7c53d
--- /dev/null
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts
@@ -0,0 +1,194 @@
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { Context } from '../../../../core/shared/context.model';
+import { hasNoValue, hasValue, isNotEmpty } from '../../../empty.util';
+import { GenericConstructor } from '../../../../core/shared/generic-constructor';
+import { ListableObject } from '../listable-object.model';
+import { environment } from '../../../../../environments/environment';
+import { ThemeConfig } from '../../../../../config/theme.config';
+import { InjectionToken } from '@angular/core';
+
+export const DEFAULT_VIEW_MODE = ViewMode.ListElement;
+export const DEFAULT_CONTEXT = Context.Any;
+export const DEFAULT_THEME = '*';
+
+/**
+ * A class used to compare two matches and their relevancy to determine which of the two gains priority over the other
+ *
+ * "level" represents the index of the first default value that was used to find the match with:
+ * ViewMode being index 0, Context index 1 and theme index 2. Examples:
+ * - If a default value was used for context, but not view-mode and theme, the "level" will be 1
+ * - If a default value was used for view-mode and context, but not for theme, the "level" will be 0
+ * - If no default value was used for any of the fields, the "level" will be 3
+ *
+ * "relevancy" represents the amount of values that didn't require a default value to fall back on. Examples:
+ * - If a default value was used for theme, but not view-mode and context, the "relevancy" will be 2
+ * - If a default value was used for view-mode and context, but not for theme, the "relevancy" will be 1
+ * - If a default value was used for all fields, the "relevancy" will be 0
+ * - If no default value was used for any of the fields, the "relevancy" will be 3
+ *
+ * To determine which of two MatchRelevancies is the most relevant, we compare "level" and "relevancy" in that order.
+ * If any of the two is higher than the other, that match is most relevant. Examples:
+ * - { level: 1, relevancy: 1 } is more relevant than { level: 0, relevancy: 2 }
+ * - { level: 1, relevancy: 1 } is less relevant than { level: 1, relevancy: 2 }
+ * - { level: 1, relevancy: 1 } is more relevant than { level: 1, relevancy: 0 }
+ * - { level: 1, relevancy: 1 } is less relevant than { level: 2, relevancy: 0 }
+ * - { level: 1, relevancy: 1 } is more relevant than null
+ */
+class MatchRelevancy {
+  constructor(public match: any,
+              public level: number,
+              public relevancy: number) {
+  }
+
+  isMoreRelevantThan(otherMatch: MatchRelevancy): boolean {
+    if (hasNoValue(otherMatch)) {
+      return true;
+    }
+    if (otherMatch.level > this.level) {
+      return false;
+    }
+    if (otherMatch.level === this.level && otherMatch.relevancy > this.relevancy) {
+      return false;
+    }
+    return true;
+  }
+
+  isLessRelevantThan(otherMatch: MatchRelevancy): boolean {
+    return !this.isMoreRelevantThan(otherMatch);
+  }
+}
+
+/**
+ * Factory to allow us to inject getThemeConfigFor so we can mock it in tests
+ */
+export const GET_THEME_CONFIG_FOR_FACTORY = new InjectionToken<(str) => ThemeConfig>('getThemeConfigFor', {
+  providedIn: 'root',
+  factory: () => getThemeConfigFor
+});
+
+const map = new Map();
+
+/**
+ * Decorator used for rendering a listable object
+ * @param objectType The object type or entity type the component represents
+ * @param viewMode The view mode the component represents
+ * @param context The optional context the component represents
+ * @param theme The optional theme for the component
+ */
+export function tabulatableObjectsComponent(objectsType: string | GenericConstructor<ListableObject>, viewMode: ViewMode, context: Context = DEFAULT_CONTEXT, theme = DEFAULT_THEME) {
+  return function decorator(component: any) {
+    if (hasNoValue(objectsType)) {
+      return;
+    }
+    if (hasNoValue(map.get(objectsType))) {
+      map.set(objectsType, new Map());
+    }
+    if (hasNoValue(map.get(objectsType).get(viewMode))) {
+      map.get(objectsType).set(viewMode, new Map());
+    }
+    if (hasNoValue(map.get(objectsType).get(viewMode).get(context))) {
+      map.get(objectsType).get(viewMode).set(context, new Map());
+    }
+    map.get(objectsType).get(viewMode).get(context).set(theme, component);
+  };
+}
+
+/**
+ * Getter to retrieve the matching listable object component
+ *
+ * Looping over the provided types, it'll attempt to find the best match depending on the {@link MatchRelevancy} returned by getMatch()
+ * The most relevant match between types is kept and eventually returned
+ *
+ * @param types The types of which one should match the listable component
+ * @param viewMode The view mode that should match the components
+ * @param context The context that should match the components
+ * @param theme The theme that should match the components
+ */
+export function getTabulatableObjectsComponent(types: (string | GenericConstructor<ListableObject>)[], viewMode: ViewMode, context: Context = DEFAULT_CONTEXT, theme: string = DEFAULT_THEME) {
+  let currentBestMatch: MatchRelevancy = null;
+  for (const type of types) {
+    const typeMap = map.get(type);
+    if (hasValue(typeMap)) {
+      const match = getMatch(typeMap, [viewMode, context, theme], [DEFAULT_VIEW_MODE, DEFAULT_CONTEXT, DEFAULT_THEME]);
+      if (hasNoValue(currentBestMatch) || currentBestMatch.isLessRelevantThan(match)) {
+        currentBestMatch = match;
+      }
+    }
+  }
+  return hasValue(currentBestMatch) ? currentBestMatch.match : null;
+}
+
+/**
+ * Find an object within a nested map, matching the provided keys as best as possible, falling back on defaults wherever
+ * needed.
+ *
+ * Starting off with a Map, it loops over the provided keys, going deeper into the map until it finds a value
+ * If at some point, no value is found, it'll attempt to use the default value for that index instead
+ * If the default value exists, the index is stored in the "level"
+ * If no default value exists, 1 is added to "relevancy"
+ * See {@link MatchRelevancy} what these represent
+ *
+ * @param typeMap         a multi-dimensional map
+ * @param keys            the keys of the multi-dimensional map to loop over. Each key represents a level within the map
+ * @param defaults        the default values to use for each level, in case no value is found for the key at that index
+ * @returns matchAndLevel a {@link MatchRelevancy} object containing the match and its level of relevancy
+ */
+function getMatch(typeMap: Map<any, any>, keys: any[], defaults: any[]): MatchRelevancy {
+  let currentMap = typeMap;
+  let level = -1;
+  let relevancy = 0;
+  for (let i = 0; i < keys.length; i++) {
+    // If we're currently checking the theme, resolve it first to take extended themes into account
+    let currentMatch = defaults[i] === DEFAULT_THEME ? resolveTheme(currentMap, keys[i]) : currentMap.get(keys[i]);
+    if (hasNoValue(currentMatch)) {
+      currentMatch = currentMap.get(defaults[i]);
+      if (level === -1) {
+        level = i;
+      }
+    } else {
+      relevancy++;
+    }
+    if (hasValue(currentMatch)) {
+      if (currentMatch instanceof Map) {
+        currentMap = currentMatch as Map<any, any>;
+      } else {
+        return new MatchRelevancy(currentMatch, level > -1 ? level : i + 1, relevancy);
+      }
+    } else {
+      return null;
+    }
+  }
+  return null;
+}
+
+/**
+ * Searches for a ThemeConfig by its name;
+ */
+export const getThemeConfigFor = (themeName: string): ThemeConfig => {
+  return environment.themes.find(theme => theme.name === themeName);
+};
+
+/**
+ * Find a match in the given map for the given theme name, taking theme extension into account
+ *
+ * @param contextMap A map of theme names to components
+ * @param themeName The name of the theme to check
+ * @param checkedThemeNames The list of theme names that are already checked
+ */
+export const resolveTheme = (contextMap: Map<any, any>, themeName: string, checkedThemeNames: string[] = []): any => {
+  const match = contextMap.get(themeName);
+  if (hasValue(match)) {
+    return match;
+  } else {
+    const cfg = getThemeConfigFor(themeName);
+    if (hasValue(cfg) && isNotEmpty(cfg.extends)) {
+      const nextTheme = cfg.extends;
+      const nextCheckedThemeNames = [...checkedThemeNames, themeName];
+      if (checkedThemeNames.includes(nextTheme)) {
+        throw new Error('Theme extension cycle detected: ' + [...nextCheckedThemeNames, nextTheme].join(' -> '));
+      } else {
+        return resolveTheme(contextMap, nextTheme, nextCheckedThemeNames);
+      }
+    }
+  }
+};
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.directive.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.directive.ts
new file mode 100644
index 0000000000..88c12dfe76
--- /dev/null
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.directive.ts
@@ -0,0 +1,11 @@
+import { Directive, ViewContainerRef } from '@angular/core';
+
+@Directive({
+  selector: '[dsTabulatableObjects]',
+})
+/**
+ * Directive used as a hook to know where to inject the dynamic listable object component
+ */
+export class TabulatableObjectsDirective {
+  constructor(public viewContainerRef: ViewContainerRef) { }
+}
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
new file mode 100644
index 0000000000..5aa2ca84ee
--- /dev/null
+++ b/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts
@@ -0,0 +1,22 @@
+import { Component, Inject, OnInit } from '@angular/core';
+import {
+  AbstractTabulatableElementComponent
+} from "../../../object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component";
+import { DSpaceObject } from "../../../../core/shared/dspace-object.model";
+import { TruncatableService } from "../../../truncatable/truncatable.service";
+import { DSONameService } from "../../../../core/breadcrumbs/dso-name.service";
+import { APP_CONFIG, AppConfig } from "../../../../../config/app-config.interface";
+import { PaginatedList } from "../../../../core/data/paginated-list.model";
+
+@Component({
+  selector: 'ds-search-result-list-element',
+  template: ``
+})
+export class TabulatableResultListElementsComponent<T extends PaginatedList<K>, K extends DSpaceObject> extends AbstractTabulatableElementComponent<T> {
+  public constructor(protected truncatableService: TruncatableService,
+                     public dsoNameService: DSONameService,
+                     @Inject(APP_CONFIG) protected appConfig?: AppConfig) {
+    super(dsoNameService);
+  }
+
+}
diff --git a/src/app/shared/object-table/object-table.component.html b/src/app/shared/object-table/object-table.component.html
new file mode 100644
index 0000000000..a4fe8cfc38
--- /dev/null
+++ b/src/app/shared/object-table/object-table.component.html
@@ -0,0 +1,32 @@
+<ds-pagination
+  [paginationOptions]="config"
+  [pageInfoState]="objects?.payload"
+  [collectionSize]="objects?.payload?.totalElements"
+  [sortOptions]="sortConfig"
+  [hideGear]="hideGear"
+  [objects]="objects"
+  [hidePagerWhenSinglePage]="hidePagerWhenSinglePage"
+  [hidePaginationDetail]="hidePaginationDetail"
+  [showPaginator]="showPaginator"
+  (pageChange)="onPageChange($event)"
+  (pageSizeChange)="onPageSizeChange($event)"
+  (sortDirectionChange)="onSortDirectionChange($event)"
+  (sortFieldChange)="onSortFieldChange($event)"
+  (paginationChange)="onPaginationChange($event)"
+  (prev)="goPrev()"
+  (next)="goNext()"
+>
+  <div class="row" *ngIf="objects?.hasSucceeded">
+    <div  @fadeIn>
+      <ds-tabulatable-objects-loader [objects]="objects.payload"
+                                     [context]="context"
+                                     [showThumbnails]="showThumbnails"
+                                     [linkType]="linkType">
+      </ds-tabulatable-objects-loader>
+    </div>
+  </div>
+  <ds-error *ngIf="objects.hasFailed" message="{{'error.objects' | translate}}"></ds-error>
+  <ds-themed-loading *ngIf="objects.isLoading" message="{{'loading.objects' | translate}}"></ds-themed-loading>
+</ds-pagination>
+
+
diff --git a/src/app/shared/object-table/object-table.component.scss b/src/app/shared/object-table/object-table.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/object-table/object-table.component.spec.ts b/src/app/shared/object-table/object-table.component.spec.ts
new file mode 100644
index 0000000000..b20bed8d89
--- /dev/null
+++ b/src/app/shared/object-table/object-table.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ObjectTableComponent } from './object-table.component';
+
+describe('ObjectTableComponent', () => {
+  let component: ObjectTableComponent;
+  let fixture: ComponentFixture<ObjectTableComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ObjectTableComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(ObjectTableComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/object-table/object-table.component.ts b/src/app/shared/object-table/object-table.component.ts
new file mode 100644
index 0000000000..c202c0b865
--- /dev/null
+++ b/src/app/shared/object-table/object-table.component.ts
@@ -0,0 +1,209 @@
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core';
+import { ViewMode } from "../../core/shared/view-mode.model";
+import { PaginationComponentOptions } from "../pagination/pagination-component-options.model";
+import { SortDirection, SortOptions } from "../../core/cache/models/sort-options.model";
+import { CollectionElementLinkType } from "../object-collection/collection-element-link.type";
+import { Context } from "../../core/shared/context.model";
+import { BehaviorSubject} from "rxjs";
+import { RemoteData } from "../../core/data/remote-data";
+import { PaginatedList } from "../../core/data/paginated-list.model";
+import { ListableObject } from "../object-collection/shared/listable-object.model";
+import { fadeIn } from "../animations/fade";
+
+
+@Component({
+  changeDetection: ChangeDetectionStrategy.Default,
+  encapsulation: ViewEncapsulation.Emulated,
+  selector: 'ds-object-table',
+  templateUrl: './object-table.component.html',
+  styleUrls: ['./object-table.component.scss'],
+  animations: [fadeIn]
+})
+export class ObjectTableComponent {
+  /**
+   * The view mode of this component
+   */
+  viewMode = ViewMode.Table;
+
+  /**
+   * The current pagination configuration
+   */
+  @Input() config: PaginationComponentOptions;
+
+  /**
+   * The current sort configuration
+   */
+  @Input() sortConfig: SortOptions;
+
+  /**
+   * Whether or not the pagination should be rendered as simple previous and next buttons instead of the normal pagination
+   */
+  @Input() showPaginator = true;
+
+  /**
+   * Whether to show the thumbnail preview
+   */
+  @Input() showThumbnails;
+
+  /**
+   * The whether or not the gear is hidden
+   */
+  @Input() hideGear = false;
+
+  /**
+   * Whether or not the pager is visible when there is only a single page of results
+   */
+  @Input() hidePagerWhenSinglePage = true;
+
+  /**
+   * The link type of the listable elements
+   */
+  @Input() linkType: CollectionElementLinkType;
+
+  /**
+   * The context of the listable elements
+   */
+  @Input() context: Context;
+
+  /**
+   * Option for hiding the pagination detail
+   */
+  @Input() hidePaginationDetail = false;
+
+  /**
+   * Behavior subject to output the current listable objects
+   */
+  private _objects$: BehaviorSubject<RemoteData<PaginatedList<ListableObject>>>;
+
+  /**
+   * Setter to make sure the observable is turned into an observable
+   * @param objects The new objects to output
+   */
+  @Input() set objects(objects: RemoteData<PaginatedList<ListableObject>>) {
+    this._objects$.next(objects);
+  }
+
+  /**
+   * Getter to return the current objects
+   */
+  get objects() {
+    return this._objects$.getValue();
+  }
+
+  /**
+   * An event fired when the page is changed.
+   * Event's payload equals to the newly selected page.
+   */
+  @Output() change: EventEmitter<{
+    pagination: PaginationComponentOptions,
+    sort: SortOptions
+  }> = new EventEmitter<{
+    pagination: PaginationComponentOptions,
+    sort: SortOptions
+  }>();
+
+  /**
+   * An event fired when the page is changed.
+   * Event's payload equals to the newly selected page.
+   */
+  @Output() pageChange: EventEmitter<number> = new EventEmitter<number>();
+
+  /**
+   * An event fired when the page wsize is changed.
+   * Event's payload equals to the newly selected page size.
+   */
+  @Output() pageSizeChange: EventEmitter<number> = new EventEmitter<number>();
+
+  /**
+   * An event fired when the sort direction is changed.
+   * Event's payload equals to the newly selected sort direction.
+   */
+  @Output() sortDirectionChange: EventEmitter<SortDirection> = new EventEmitter<SortDirection>();
+
+  /**
+   * An event fired when on of the pagination parameters changes
+   */
+  @Output() paginationChange: EventEmitter<any> = new EventEmitter<any>();
+
+  /**
+   * An event fired when the sort field is changed.
+   * Event's payload equals to the newly selected sort field.
+   */
+  @Output() sortFieldChange: EventEmitter<string> = new EventEmitter<string>();
+
+  /**
+   * If showPaginator is set to true, emit when the previous button is clicked
+   */
+  @Output() prev = new EventEmitter<boolean>();
+
+  /**
+   * If showPaginator is set to true, emit when the next button is clicked
+   */
+  @Output() next = new EventEmitter<boolean>();
+
+  data: any = {};
+
+  constructor() {
+    this._objects$ = new BehaviorSubject(undefined);
+  }
+
+  /**
+   * Initialize the instance variables
+   */
+  ngOnInit(): void {
+    console.log('table rendered')
+  }
+
+  /**
+   * Emits the current page when it changes
+   * @param event The new page
+   */
+  onPageChange(event) {
+    this.pageChange.emit(event);
+  }
+  /**
+   * Emits the current page size when it changes
+   * @param event The new page size
+   */
+  onPageSizeChange(event) {
+    this.pageSizeChange.emit(event);
+  }
+  /**
+   * Emits the current sort direction when it changes
+   * @param event The new sort direction
+   */
+  onSortDirectionChange(event) {
+    this.sortDirectionChange.emit(event);
+  }
+
+  /**
+   * Emits the current sort field when it changes
+   * @param event The new sort field
+   */
+  onSortFieldChange(event) {
+    this.sortFieldChange.emit(event);
+  }
+
+  /**
+   * Emits the current pagination when it changes
+   * @param event The new pagination
+   */
+  onPaginationChange(event) {
+    this.paginationChange.emit(event);
+  }
+
+  /**
+   * Go to the previous page
+   */
+  goPrev() {
+    this.prev.emit(true);
+  }
+
+  /**
+   * Go to the next page
+   */
+  goNext() {
+    this.next.emit(true);
+  }
+
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 61482fb61a..ce4cb1ed06 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -286,6 +286,17 @@ import { SplitPipe } from './utils/split.pipe';
 import { ThemedUserMenuComponent } from './auth-nav-menu/user-menu/themed-user-menu.component';
 import { ThemedLangSwitchComponent } from './lang-switch/themed-lang-switch.component';
 import { NotificationBoxComponent } from './notification-box/notification-box.component';
+import { ObjectTableComponent } from './object-table/object-table.component';
+import { TabulatableObjectsLoaderComponent } from './object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component';
+import {
+  TabulatableObjectsDirective
+} from "./object-collection/shared/tabulatable-objects/tabulatable-objects.directive";
+import {
+  AbstractTabulatableElementComponent
+} from "./object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component";
+import {
+  TabulatableResultListElementsComponent
+} from "./object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component";
 
 const MODULES = [
   CommonModule,
@@ -349,7 +360,9 @@ const COMPONENTS = [
   ThemedObjectListComponent,
   ObjectDetailComponent,
   ObjectGridComponent,
+  ObjectTableComponent,
   AbstractListableElementComponent,
+  AbstractTabulatableElementComponent,
   ObjectCollectionComponent,
   PaginationComponent,
   RSSComponent,
@@ -415,6 +428,7 @@ const ENTRY_COMPONENTS = [
   CollectionListElementComponent,
   CommunityListElementComponent,
   SearchResultListElementComponent,
+  TabulatableResultListElementsComponent,
   CommunitySearchResultListElementComponent,
   CollectionSearchResultListElementComponent,
   CollectionGridElementComponent,
@@ -471,7 +485,8 @@ const ENTRY_COMPONENTS = [
   EpersonGroupListComponent,
   EpersonSearchBoxComponent,
   GroupSearchBoxComponent,
-  NotificationBoxComponent
+  NotificationBoxComponent,
+  TabulatableObjectsLoaderComponent,
 ];
 
 const PROVIDERS = [
@@ -490,6 +505,7 @@ const DIRECTIVES = [
   RoleDirective,
   MetadataRepresentationDirective,
   ListableObjectDirective,
+  TabulatableObjectsDirective,
   ClaimedTaskActionsDirective,
   FileValueAccessorDirective,
   FileValidator,

From b8e353d51c5fb58d286152dd2b36bea41a76b84f Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 4 Jan 2024 17:16:21 +0100
Subject: [PATCH 19/45] add tabulatable loader missing files

---
 ...bjects-collection-tabulatable.component.ts |  83 +++++++
 .../tabulatable-objects-loader.component.html |   1 +
 .../tabulatable-objects-loader.component.scss |   3 +
 ...bulatable-objects-loader.component.spec.ts |  23 ++
 .../tabulatable-objects-loader.component.ts   | 207 ++++++++++++++++++
 5 files changed, 317 insertions(+)
 create mode 100644 src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
 create mode 100644 src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.html
 create mode 100644 src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.scss
 create mode 100644 src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts
 create mode 100644 src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts

diff --git a/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts b/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
new file mode 100644
index 0000000000..57b7c39771
--- /dev/null
+++ b/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
@@ -0,0 +1,83 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { ListableObject } from "../listable-object.model";
+import { CollectionElementLinkType } from "../../collection-element-link.type";
+import { Context } from "../../../../core/shared/context.model";
+import { ViewMode } from "../../../../core/shared/view-mode.model";
+import { DSpaceObject } from "../../../../core/shared/dspace-object.model";
+import { DSONameService } from "../../../../core/breadcrumbs/dso-name.service";
+import { RemoteData } from "../../../../core/data/remote-data";
+import { PaginatedList } from "../../../../core/data/paginated-list.model";
+
+@Component({
+  selector: 'ds-objects-collection-tabulatable',
+  template: ``,
+})
+export class AbstractTabulatableElementComponent<T extends PaginatedList<ListableObject>> {
+
+  /**
+   * The object to render in this list element
+   */
+  @Input() objects: T;
+
+  /**
+   * The link type to determine the type of link rendered in this element
+   */
+  @Input() linkType: CollectionElementLinkType;
+
+  /**
+   * The identifier of the list this element resides in
+   */
+  @Input() listID: string;
+
+  /**
+   * The value to display for this element
+   */
+  @Input() value: string;
+
+  /**
+   * Whether to show the badge label or not
+   */
+  @Input() showLabel = true;
+
+  /**
+   * Whether to show the thumbnail preview
+   */
+  @Input() showThumbnails;
+
+  /**
+   * The context we matched on to get this component
+   */
+  @Input() context: Context;
+
+  /**
+   * The viewmode we matched on to get this component
+   */
+  @Input() viewMode: ViewMode;
+
+  /**
+   * Emit when the object has been reloaded.
+   */
+  @Output() reloadedObject = new EventEmitter<RemoteData<PaginatedList<ListableObject>>>();
+
+  /**
+   * The available link types
+   */
+  linkTypes = CollectionElementLinkType;
+
+  /**
+   * The available view modes
+   */
+  viewModes = ViewMode;
+
+  /**
+   * The available contexts
+   */
+  contexts = Context;
+
+  constructor(
+    public dsoNameService: DSONameService,
+  ) {
+  }
+
+}
+
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.html b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.html
new file mode 100644
index 0000000000..ff51746cb9
--- /dev/null
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.html
@@ -0,0 +1 @@
+<ng-template dsTabulatableObjects></ng-template>
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.scss b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.scss
new file mode 100644
index 0000000000..b9bc65ea45
--- /dev/null
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.scss
@@ -0,0 +1,3 @@
+:host {
+  width: 100%;
+}
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts
new file mode 100644
index 0000000000..59d0a42ecd
--- /dev/null
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TabulatableObjectsLoaderComponent } from './tabulatable-objects-loader.component';
+
+describe('TabulatableObjectsComponent', () => {
+  let component: TabulatableObjectsLoaderComponent;
+  let fixture: ComponentFixture<TabulatableObjectsLoaderComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ TabulatableObjectsLoaderComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(TabulatableObjectsLoaderComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
new file mode 100644
index 0000000000..b3c83294b4
--- /dev/null
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
@@ -0,0 +1,207 @@
+import {
+  ChangeDetectorRef,
+  Component,
+  ComponentRef,
+  EventEmitter,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  Output,
+  SimpleChanges,
+  ViewChild
+} from '@angular/core';
+import { ListableObject } from "../listable-object.model";
+import { ViewMode } from "../../../../core/shared/view-mode.model";
+import { Context } from "../../../../core/shared/context.model";
+import { CollectionElementLinkType } from "../../collection-element-link.type";
+import { combineLatest, Observable, of as observableOf, Subscription } from "rxjs";
+import { ThemeService } from "../../../theme-support/theme.service";
+import { hasNoValue, hasValue, isNotEmpty } from "../../../empty.util";
+import { take } from "rxjs/operators";
+import { GenericConstructor } from "../../../../core/shared/generic-constructor";
+import { TabulatableObjectsDirective } from "./tabulatable-objects.directive";
+import { PaginatedList } from "../../../../core/data/paginated-list.model";
+import { getTabulatableObjectsComponent } from "./tabulatable-objects.decorator";
+
+@Component({
+  selector: 'ds-tabulatable-objects-loader',
+  templateUrl: './tabulatable-objects-loader.component.html',
+  styleUrls: ['./tabulatable-objects-loader.component.scss']
+})
+/**
+ * Component for determining what component to use depending on the item's entity type (dspace.entity.type)
+ */
+export class TabulatableObjectsLoaderComponent implements OnInit, OnChanges, OnDestroy {
+  /**
+   * The items to determine the component for
+   */
+  @Input() objects: PaginatedList<ListableObject>;
+
+
+  /**
+   * The context of listable object
+   */
+  @Input() context: Context;
+
+  /**
+   * The type of link used to render the links inside the listable object
+   */
+  @Input() linkType: CollectionElementLinkType;
+
+  /**
+   * The identifier of the list this element resides in
+   */
+  @Input() listID: string;
+
+  /**
+   * Whether to show the badge label or not
+   */
+  @Input() showLabel = true;
+
+  /**
+   * Whether to show the thumbnail preview
+   */
+  @Input() showThumbnails;
+
+  /**
+   * The value to display for this element
+   */
+  @Input() value: string;
+
+  /**
+   * Directive hook used to place the dynamic child component
+   */
+  @ViewChild(TabulatableObjectsDirective, { static: true }) tabulatableObjectsDirective: TabulatableObjectsDirective;
+
+  /**
+   * Emit when the listable object has been reloaded.
+   */
+  @Output() contentChange = new EventEmitter<PaginatedList<ListableObject>>();
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * The reference to the dynamic component
+   */
+  protected compRef: ComponentRef<Component>;
+
+  /**
+   * The view mode used to identify the components
+   */
+  protected viewMode: ViewMode = ViewMode.Table;
+
+  /**
+   * The list of input and output names for the dynamic component
+   */
+  protected inAndOutputNames: string[] = [
+    'objects',
+    'linkType',
+    'listID',
+    'showLabel',
+    'showThumbnails',
+    'context',
+    'viewMode',
+    'value',
+    'hideBadges',
+    'contentChange',
+  ];
+
+  constructor(private cdr: ChangeDetectorRef, private themeService: ThemeService) {
+  }
+
+  /**
+   * Setup the dynamic child component
+   */
+  ngOnInit(): void {
+    this.instantiateComponent(this.objects);
+  }
+
+  /**
+   * Whenever the inputs change, update the inputs of the dynamic component
+   */
+  ngOnChanges(changes: SimpleChanges): void {
+    if (hasNoValue(this.compRef)) {
+      // sometimes the component has not been initialized yet, so it first needs to be initialized
+      // before being called again
+      this.instantiateComponent(this.objects, changes);
+    } else {
+      // if an input or output has changed
+      if (this.inAndOutputNames.some((name: any) => hasValue(changes[name]))) {
+        this.connectInputsAndOutputs();
+        if (this.compRef?.instance && 'ngOnChanges' in this.compRef.instance) {
+          (this.compRef.instance as any).ngOnChanges(changes);
+        }
+      }
+    }
+  }
+
+  ngOnDestroy() {
+    this.subs
+      .filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe());
+  }
+
+  private instantiateComponent(objects: PaginatedList<ListableObject>, changes?: SimpleChanges): void {
+    // objects need to have same render type so we access just the first in the page
+    const component = this.getComponent(objects.page[0].getRenderTypes(), this.viewMode, this.context);
+
+    const viewContainerRef = this.tabulatableObjectsDirective.viewContainerRef;
+    viewContainerRef.clear();
+
+    this.compRef = viewContainerRef.createComponent(
+      component, {
+        index: 0,
+        injector: undefined
+      }
+    );
+
+    if (hasValue(changes)) {
+      this.ngOnChanges(changes);
+    } else {
+      this.connectInputsAndOutputs();
+    }
+
+    if ((this.compRef.instance as any).reloadedObject) {
+      combineLatest([
+        observableOf(changes),
+        (this.compRef.instance as any).reloadedObject.pipe(take(1)) as Observable<PaginatedList<ListableObject>>,
+      ]).subscribe(([simpleChanges, reloadedObjects]: [SimpleChanges, PaginatedList<ListableObject>]) => {
+        if (reloadedObjects) {
+          this.compRef.destroy();
+          this.objects = reloadedObjects;
+          this.instantiateComponent(reloadedObjects, simpleChanges);
+          this.cdr.detectChanges();
+          this.contentChange.emit(reloadedObjects);
+        }
+      });
+    }
+  }
+
+  /**
+   * Fetch the component depending on the item's entity type, view mode and context
+   * @returns {GenericConstructor<Component>}
+   */
+  getComponent(renderTypes: (string | GenericConstructor<ListableObject>)[],
+               viewMode: ViewMode,
+               context: Context): GenericConstructor<Component> {
+    return getTabulatableObjectsComponent(renderTypes, viewMode, context, this.themeService.getThemeName());
+  }
+
+  /**
+   * Connect the in and outputs of this component to the dynamic component,
+   * to ensure they're in sync
+   */
+  protected connectInputsAndOutputs(): void {
+    if (isNotEmpty(this.inAndOutputNames) && hasValue(this.compRef) && hasValue(this.compRef.instance)) {
+      this.inAndOutputNames.filter((name: any) => this[name] !== undefined).forEach((name: any) => {
+        this.compRef.instance[name] = this[name];
+      });
+    }
+  }
+
+}

From 566c8b34a992676cb2a9bc4bf062f8a9fbca9614 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 4 Jan 2024 17:21:03 +0100
Subject: [PATCH 20/45] remove log

---
 .../admin-notify-search-result.component.ts                      | 1 -
 1 file changed, 1 deletion(-)

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 4e2a4088d2..3ee86eb3ea 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
@@ -21,6 +21,5 @@ export class AdminNotifySearchResultComponent  extends TabulatableResultListElem
     public indexableObjects: AdminNotifyMessage[];
     ngOnInit() {
       this.indexableObjects = this.objects.page.map(object => object.indexableObject);
-      console.log(this.objects.page)
     }
 }

From c434c06b04034c0e3542bc74a908127e390b6da2 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 4 Jan 2024 17:23:29 +0100
Subject: [PATCH 21/45] refactor, fix lint

---
 .../admin-notify-dashboard.component.ts       |  4 ++--
 .../admin-notify-search-result.component.html | 14 +++++------
 .../admin-notify-search-result.component.ts   | 10 ++++----
 src/app/core/shared/search/search.service.ts  |  8 +++----
 ...bjects-collection-tabulatable.component.ts | 15 ++++++------
 .../tabulatable-objects-loader.component.ts   | 24 +++++++++----------
 ...ulatable-result-list-elements.component.ts | 14 +++++------
 .../object-table/object-table.component.ts    | 22 ++++++++---------
 src/app/shared/shared.module.ts               |  6 ++---
 9 files changed, 58 insertions(+), 59 deletions(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index 77116d97d3..ba88ce4e6d 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -14,8 +14,8 @@ import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.compo
 import { AdminNotifySearchConfigurationService } from './config/admin-notify-search-configuration.service';
 import { AdminNotifySearchFilterService } from './config/admin-notify-filter-service';
 import { AdminNotifySearchFilterConfig } from './config/admin-notify-search-filter-config';
-import { ViewMode } from "../../core/shared/view-mode.model";
-import { Router } from "@angular/router";
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { Router } from '@angular/router';
 
 export const FILTER_SEARCH: InjectionToken<SearchFilterService> = new InjectionToken<SearchFilterService>('searchFilterService');
 
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
index bc703576b2..89b2285422 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -1,4 +1,4 @@
-<div class="d-flex bg-light w-100 align-items-center">
+<div class="w-100">
   <div class="table-responsive">
     <table id="formats" class="table table-striped table-hover">
       <thead>
@@ -11,21 +11,21 @@
         </tr>
       </thead>
       <tbody>
-        <tr *ngFor="let object of indexableObjects">
+        <tr *ngFor="let message of notifyMessages">
           <td>
-              <div>{{object.queueTimeout}}</div>
+              <div>{{message.queueTimeout}}</div>
           </td>
           <td>
-              <div>{{object.source}}</div>
+              <div>{{message.source}}</div>
           </td>
           <td>
-            <div>{{object.target}}</div>
+            <div>{{message.target}}</div>
           </td>
           <td>
-            <div>{{object.coarNotifyType}}</div>
+            <div>{{message.coarNotifyType}}</div>
           </td>
           <td>
-            <div>{{object.queueStatusLabel}}</div>
+            <div>{{message.queueStatusLabel}}</div>
           </td>
         </tr>
       </tbody>
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 3ee86eb3ea..93eca302c1 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
@@ -5,11 +5,11 @@ import { Context } from '../../../core/shared/context.model';
 import { AdminNotifyMessage } from '../models/admin-notify-message.model';
 import {
   tabulatableObjectsComponent
-} from "../../../shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator";
+} from '../../../shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator';
 import {
   TabulatableResultListElementsComponent
-} from "../../../shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component";
-import { PaginatedList } from "../../../core/data/paginated-list.model";
+} from '../../../shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
 
 @tabulatableObjectsComponent(AdminNotifySearchResult, ViewMode.Table, Context.CoarNotify)
 @Component({
@@ -18,8 +18,8 @@ import { PaginatedList } from "../../../core/data/paginated-list.model";
   styleUrls: ['./admin-notify-search-result.component.scss']
 })
 export class AdminNotifySearchResultComponent  extends TabulatableResultListElementsComponent<PaginatedList<AdminNotifyMessage>, AdminNotifyMessage> implements OnInit{
-    public indexableObjects: AdminNotifyMessage[];
+    public notifyMessages: AdminNotifyMessage[];
     ngOnInit() {
-      this.indexableObjects = this.objects.page.map(object => object.indexableObject);
+      this.notifyMessages = this.objects.page.map(object => object.indexableObject);
     }
 }
diff --git a/src/app/core/shared/search/search.service.ts b/src/app/core/shared/search/search.service.ts
index 9d85d0db5f..986352f29f 100644
--- a/src/app/core/shared/search/search.service.ts
+++ b/src/app/core/shared/search/search.service.ts
@@ -188,11 +188,11 @@ export class SearchService implements OnDestroy {
   }
 
   /**
-   * Method to directly attach the indexableObjects to search results, instead of using RemoteData.
+   * Method to directly attach the notifyMessages to search results, instead of using RemoteData.
    * For compatibility with the way the search was written originally
    *
    * @param sqr$:                       a SearchObjects RemotaData Observable without its
-   *                                    indexableObjects attached
+   *                                    notifyMessages attached
    * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
    *                                    no valid cached version. Defaults to true
    * @param reRequestOnStale            Whether or not the request should automatically be re-
@@ -205,7 +205,7 @@ export class SearchService implements OnDestroy {
     return sqr$.pipe(
       switchMap((resultsRd: RemoteData<SearchObjects<T>>) => {
         if (hasValue(resultsRd.payload) && isNotEmpty(resultsRd.payload.page)) {
-          // retrieve the indexableObjects for all search results on the page
+          // retrieve the notifyMessages for all search results on the page
           const searchResult$Array: Observable<SearchResult<T>>[] = resultsRd.payload.page.map((result: SearchResult<T>) =>
             this.dspaceObjectService.findByHref(result._links.indexableObject.href, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow as any).pipe(
               getFirstCompletedRemoteData(),
@@ -227,7 +227,7 @@ export class SearchService implements OnDestroy {
           );
 
           // Swap the original page in the remoteData with the new one, now that the results have the
-          // correct types, and all indexableObjects are directly attached.
+          // correct types, and all notifyMessages are directly attached.
           return observableCombineLatest(searchResult$Array).pipe(
             map((page: SearchResult<T>[]) => {
 
diff --git a/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts b/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
index 57b7c39771..c6b6b1bb5b 100644
--- a/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
+++ b/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
@@ -1,12 +1,11 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { ListableObject } from "../listable-object.model";
-import { CollectionElementLinkType } from "../../collection-element-link.type";
-import { Context } from "../../../../core/shared/context.model";
-import { ViewMode } from "../../../../core/shared/view-mode.model";
-import { DSpaceObject } from "../../../../core/shared/dspace-object.model";
-import { DSONameService } from "../../../../core/breadcrumbs/dso-name.service";
-import { RemoteData } from "../../../../core/data/remote-data";
-import { PaginatedList } from "../../../../core/data/paginated-list.model";
+import { ListableObject } from '../listable-object.model';
+import { CollectionElementLinkType } from '../../collection-element-link.type';
+import { Context } from '../../../../core/shared/context.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
 
 @Component({
   selector: 'ds-objects-collection-tabulatable',
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
index b3c83294b4..1c68718bd6 100644
--- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
@@ -11,18 +11,18 @@ import {
   SimpleChanges,
   ViewChild
 } from '@angular/core';
-import { ListableObject } from "../listable-object.model";
-import { ViewMode } from "../../../../core/shared/view-mode.model";
-import { Context } from "../../../../core/shared/context.model";
-import { CollectionElementLinkType } from "../../collection-element-link.type";
-import { combineLatest, Observable, of as observableOf, Subscription } from "rxjs";
-import { ThemeService } from "../../../theme-support/theme.service";
-import { hasNoValue, hasValue, isNotEmpty } from "../../../empty.util";
-import { take } from "rxjs/operators";
-import { GenericConstructor } from "../../../../core/shared/generic-constructor";
-import { TabulatableObjectsDirective } from "./tabulatable-objects.directive";
-import { PaginatedList } from "../../../../core/data/paginated-list.model";
-import { getTabulatableObjectsComponent } from "./tabulatable-objects.decorator";
+import { ListableObject } from '../listable-object.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { Context } from '../../../../core/shared/context.model';
+import { CollectionElementLinkType } from '../../collection-element-link.type';
+import { combineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
+import { ThemeService } from '../../../theme-support/theme.service';
+import { hasNoValue, hasValue, isNotEmpty } from '../../../empty.util';
+import { take } from 'rxjs/operators';
+import { GenericConstructor } from '../../../../core/shared/generic-constructor';
+import { TabulatableObjectsDirective } from './tabulatable-objects.directive';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { getTabulatableObjectsComponent } from './tabulatable-objects.decorator';
 
 @Component({
   selector: 'ds-tabulatable-objects-loader',
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 5aa2ca84ee..ed30e78c73 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
@@ -1,12 +1,12 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, Inject } from '@angular/core';
 import {
   AbstractTabulatableElementComponent
-} from "../../../object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component";
-import { DSpaceObject } from "../../../../core/shared/dspace-object.model";
-import { TruncatableService } from "../../../truncatable/truncatable.service";
-import { DSONameService } from "../../../../core/breadcrumbs/dso-name.service";
-import { APP_CONFIG, AppConfig } from "../../../../../config/app-config.interface";
-import { PaginatedList } from "../../../../core/data/paginated-list.model";
+} from '../../../object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
 
 @Component({
   selector: 'ds-search-result-list-element',
diff --git a/src/app/shared/object-table/object-table.component.ts b/src/app/shared/object-table/object-table.component.ts
index c202c0b865..b046818707 100644
--- a/src/app/shared/object-table/object-table.component.ts
+++ b/src/app/shared/object-table/object-table.component.ts
@@ -1,14 +1,14 @@
 import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core';
-import { ViewMode } from "../../core/shared/view-mode.model";
-import { PaginationComponentOptions } from "../pagination/pagination-component-options.model";
-import { SortDirection, SortOptions } from "../../core/cache/models/sort-options.model";
-import { CollectionElementLinkType } from "../object-collection/collection-element-link.type";
-import { Context } from "../../core/shared/context.model";
-import { BehaviorSubject} from "rxjs";
-import { RemoteData } from "../../core/data/remote-data";
-import { PaginatedList } from "../../core/data/paginated-list.model";
-import { ListableObject } from "../object-collection/shared/listable-object.model";
-import { fadeIn } from "../animations/fade";
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
+import { Context } from '../../core/shared/context.model';
+import { BehaviorSubject} from 'rxjs';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { fadeIn } from '../animations/fade';
 
 
 @Component({
@@ -151,7 +151,7 @@ export class ObjectTableComponent {
    * Initialize the instance variables
    */
   ngOnInit(): void {
-    console.log('table rendered')
+    console.log('table rendered');
   }
 
   /**
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index ce4cb1ed06..7e95ba74ee 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -290,13 +290,13 @@ import { ObjectTableComponent } from './object-table/object-table.component';
 import { TabulatableObjectsLoaderComponent } from './object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component';
 import {
   TabulatableObjectsDirective
-} from "./object-collection/shared/tabulatable-objects/tabulatable-objects.directive";
+} from './object-collection/shared/tabulatable-objects/tabulatable-objects.directive';
 import {
   AbstractTabulatableElementComponent
-} from "./object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component";
+} from './object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component';
 import {
   TabulatableResultListElementsComponent
-} from "./object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component";
+} from './object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
 
 const MODULES = [
   CommonModule,

From 6254efa0849bd6d5a8f1f3b31d2271c421970c24 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 5 Jan 2024 12:54:35 +0100
Subject: [PATCH 22/45] add modal, refine table,refactor, fix lint

---
 .../admin-notify-dashboard.module.ts          |   4 +-
 .../admin-notify-detail-modal.component.html  |  14 +++
 .../admin-notify-detail-modal.component.scss  |   0
 ...dmin-notify-detail-modal.component.spec.ts |  23 ++++
 .../admin-notify-detail-modal.component.ts    |  32 ++++++
 .../admin-notify-search-result.component.html |  19 ++--
 .../admin-notify-search-result.component.ts   |  54 ++++++++-
 .../models/admin-notify-message.model.ts      |  31 ++++-
 .../object-collection.component.html          |  31 +++--
 .../listable-object.decorator.ts              |   2 +-
 .../tabulatable-objects.decorator.ts          | 106 ++----------------
 ...ulatable-result-list-elements.component.ts |   4 +-
 .../object-table/object-table.component.html  |   3 +-
 .../object-table/object-table.component.ts    |   8 --
 14 files changed, 188 insertions(+), 143 deletions(-)
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.scss
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
index 06747dd2d5..23200bb9fc 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
@@ -12,6 +12,7 @@ import { AdminNotifySearchResultComponent } from './admin-notify-search-result/a
 import {
   AdminNotifyOutgoingComponent
 } from './admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component';
+import { AdminNotifyDetailModalComponent } from './admin-notify-detail-modal/admin-notify-detail-modal.component';
 
 
 @NgModule({
@@ -28,7 +29,8 @@ import {
     AdminNotifyMetricsComponent,
     AdminNotifyIncomingComponent,
     AdminNotifyOutgoingComponent,
-    AdminNotifySearchResultComponent
+    AdminNotifySearchResultComponent,
+    AdminNotifyDetailModalComponent
   ]
 })
 export class AdminNotifyDashboardModule {
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
new file mode 100644
index 0000000000..57e1b40c1d
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
@@ -0,0 +1,14 @@
+<div class="modal-header">
+  <h4 class="modal-title">Message Detail</h4>
+  <button type="button" class="close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
+<div class="d-flex modal-body flex-column p-4">
+    <div *ngFor="let key of notifyMessageKeys">
+      <div class="d-flex w-100 justify-content-between mb-4">
+        <div class="font-weight-bold mr-5">{{ key }}</div>
+        <div class="text-nowrap text-truncate">{{ notifyMessage[key] }}</div>
+      </div>
+    </div>
+</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.scss b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts
new file mode 100644
index 0000000000..7ac979050c
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AdminNotifyDetailModalComponent } from './admin-notify-detail-modal.component';
+
+describe('AdminNotifyDetailModalComponent', () => {
+  let component: AdminNotifyDetailModalComponent;
+  let fixture: ComponentFixture<AdminNotifyDetailModalComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ AdminNotifyDetailModalComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifyDetailModalComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
new file mode 100644
index 0000000000..3227e52420
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
@@ -0,0 +1,32 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { AdminNotifyMessage } from '../models/admin-notify-message.model';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+@Component({
+  selector: 'ds-admin-notify-detail-modal',
+  templateUrl: './admin-notify-detail-modal.component.html',
+  styleUrls: ['./admin-notify-detail-modal.component.scss']
+})
+export class AdminNotifyDetailModalComponent {
+  @Input() notifyMessage: AdminNotifyMessage;
+  @Input() notifyMessageKeys: string[];
+
+  /**
+   * An event fired when the modal is closed
+   */
+  @Output()
+  response = new EventEmitter<boolean>();
+
+
+  constructor(protected activeModal: NgbActiveModal) {
+  }
+
+
+  /**
+   * Close the modal and set the response to true so RootComponent knows the modal was closed
+   */
+  closeModal() {
+    this.activeModal.close();
+    this.response.emit(true);
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
index 89b2285422..80c7faa086 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -1,22 +1,22 @@
-<div class="w-100">
-  <div class="table-responsive">
-    <table id="formats" class="table table-striped table-hover">
+  <div class="table-responsive mt-2">
+    <table class="table table-striped table-hover">
       <thead>
         <tr>
           <th scope="col">Timestamp</th>
-          <th scope="col">Source</th>
+          <th scope="col">Origin</th>
           <th scope="col">Target</th>
           <th scope="col">Type</th>
           <th scope="col">Status</th>
+          <th scope="col">Action</th>
         </tr>
       </thead>
       <tbody>
         <tr *ngFor="let message of notifyMessages">
           <td>
-              <div>{{message.queueTimeout}}</div>
+            <div class="text-nowrap">{{message.queueTimeout}}</div>
           </td>
           <td>
-              <div>{{message.source}}</div>
+            <div>{{message.origin}}</div>
           </td>
           <td>
             <div>{{message.target}}</div>
@@ -27,8 +27,13 @@
           <td>
             <div>{{message.queueStatusLabel}}</div>
           </td>
+          <td>
+            <div class="d-flex flex-column">
+              <button class="btn mb-2 btn-dark" (click)="openDetailModal(message)">Detail</button>
+              <button class="btn btn-warning">Reprocess</button>
+            </div>
+          </td>
         </tr>
       </tbody>
     </table>
   </div>
-</div>
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 93eca302c1..f0c9e3f7d8 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
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
 import { AdminNotifySearchResult } from '../models/admin-notify-message-search-result.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { Context } from '../../../core/shared/context.model';
@@ -10,16 +10,60 @@ import {
   TabulatableResultListElementsComponent
 } from '../../../shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TruncatableService } from '../../../shared/truncatable/truncatable.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
+import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
 
-@tabulatableObjectsComponent(AdminNotifySearchResult, ViewMode.Table, Context.CoarNotify)
+@tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotify)
 @Component({
   selector: 'ds-admin-notify-search-result',
   templateUrl: './admin-notify-search-result.component.html',
   styleUrls: ['./admin-notify-search-result.component.scss']
 })
-export class AdminNotifySearchResultComponent  extends TabulatableResultListElementsComponent<PaginatedList<AdminNotifyMessage>, AdminNotifyMessage> implements OnInit{
+export class AdminNotifySearchResultComponent  extends TabulatableResultListElementsComponent<PaginatedList<AdminNotifySearchResult>, AdminNotifySearchResult> implements OnInit{
     public notifyMessages: AdminNotifyMessage[];
-    ngOnInit() {
-      this.notifyMessages = this.objects.page.map(object => object.indexableObject);
+
+    private queueStatusMap = {
+      QUEUE_STATUS_PROCESSED: 'Processed',
+      QUEUE_STATUS_FAILED: 'Failed',
+      QUEUE_STATUS_UNMAPPED_ACTION: 'Unmapped action',
+    };
+
+    constructor(private modalService: NgbModal,
+                protected truncatableService: TruncatableService,
+                public dsoNameService: DSONameService,
+                @Inject(APP_CONFIG) protected appConfig?: AppConfig) {
+      super(truncatableService, dsoNameService, appConfig);
     }
+
+  /**
+   * Map messages on init for readable representation
+   */
+  ngOnInit() {
+    this.notifyMessages = this.objects.page.map(object => {
+      const indexableObject = object.indexableObject;
+      indexableObject.coarNotifyType = indexableObject.coarNotifyType.split(':')[1];
+      indexableObject.queueStatusLabel = this.queueStatusMap[indexableObject.queueStatusLabel];
+      return indexableObject;
+    });
+  }
+
+  /**
+   * Open modal for details visualization
+   * @param message the message to be displayed
+   */
+  openDetailModal(message: AdminNotifyMessage) {
+    const modalRef = this.modalService.open(AdminNotifyDetailModalComponent);
+    const messageKeys = Object.keys(message);
+    const keysToRead = [];
+    messageKeys.forEach((key) => {
+      if (typeof message[key] !== 'object') {
+        keysToRead.push(key);
+      }
+    });
+    modalRef.componentInstance.notifyMessage = message;
+    modalRef.componentInstance.notifyMessageKeys = keysToRead;
+  }
 }
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
index be861861b4..a463de483a 100644
--- a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
@@ -26,11 +26,35 @@ export class AdminNotifyMessage extends DSpaceObject {
   @autoserialize
   coarNotifyType: string;
 
+  /**
+   * The type of the activity
+   */
+  @autoserialize
+  activityStreamType: string;
+
+  /**
+   * The object the message reply to
+   */
+  @autoserialize
+  inReplyTo: string;
+
+  /**
+   * The attempts of the queue
+   */
+  @autoserialize
+  queueAttempts: number;
+
+  /**
+   * Timestamp of the last queue attempt
+   */
+  @autoserialize
+  queueLastStartTime: string;
+
   /**
    * The type of the activity stream
    */
   @autoserialize
-  source: number;
+  origin: number;
 
   /**
    * The type of the activity stream
@@ -56,11 +80,6 @@ export class AdminNotifyMessage extends DSpaceObject {
   @autoserialize
   queueStatus: number;
 
-  /**
-   * The status of the queue
-   */
-  @autoserialize
-  indexableObject: AdminNotifyMessage;
 
   @deserialize
   _links: {
diff --git a/src/app/shared/object-collection/object-collection.component.html b/src/app/shared/object-collection/object-collection.component.html
index 45b82dd859..179a70bfd7 100644
--- a/src/app/shared/object-collection/object-collection.component.html
+++ b/src/app/shared/object-collection/object-collection.component.html
@@ -58,20 +58,19 @@
 </ds-object-detail>
 
 
-<ds-object-table
-  [config]="config"
-  [sortConfig]="sortConfig"
-  [objects]="objects"
-  [hideGear]="hideGear"
-  [linkType]="linkType"
-  [context]="context"
-  [hidePaginationDetail]="hidePaginationDetail"
-  [showPaginator]="showPaginator"
-  [showThumbnails]="showThumbnails"
-  (paginationChange)="onPaginationChange($event)"
-  (pageChange)="onPageChange($event)"
-  (pageSizeChange)="onPageSizeChange($event)"
-  (sortDirectionChange)="onSortDirectionChange($event)"
-  (sortFieldChange)="onSortFieldChange($event)"
-  *ngIf="(currentMode$ | async) === viewModeEnum.Table">
+<ds-object-table  [config]="config"
+                  [sortConfig]="sortConfig"
+                  [objects]="objects"
+                  [hideGear]="hideGear"
+                  [linkType]="linkType"
+                  [context]="context"
+                  [hidePaginationDetail]="hidePaginationDetail"
+                  [showPaginator]="showPaginator"
+                  [showThumbnails]="showThumbnails"
+                  (paginationChange)="onPaginationChange($event)"
+                  (pageChange)="onPageChange($event)"
+                  (pageSizeChange)="onPageSizeChange($event)"
+                  (sortDirectionChange)="onSortDirectionChange($event)"
+                  (sortFieldChange)="onSortFieldChange($event)"
+                  *ngIf="(currentMode$ | async) === viewModeEnum.Table">
 </ds-object-table>
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
index 470bcfcdaf..f56e983dff 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
@@ -34,7 +34,7 @@ export const DEFAULT_THEME = '*';
  * - { level: 1, relevancy: 1 } is less relevant than { level: 2, relevancy: 0 }
  * - { level: 1, relevancy: 1 } is more relevant than null
  */
-class MatchRelevancy {
+export class MatchRelevancy {
   constructor(public match: any,
               public level: number,
               public relevancy: number) {
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 9ab9e7c53d..bfe57149da 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,70 +1,16 @@
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { Context } from '../../../../core/shared/context.model';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../empty.util';
+import { hasNoValue, hasValue } from '../../../empty.util';
 import { GenericConstructor } from '../../../../core/shared/generic-constructor';
 import { ListableObject } from '../listable-object.model';
-import { environment } from '../../../../../environments/environment';
-import { ThemeConfig } from '../../../../../config/theme.config';
-import { InjectionToken } from '@angular/core';
+import {
+  DEFAULT_CONTEXT,
+  DEFAULT_THEME,
+  DEFAULT_VIEW_MODE,
+  MatchRelevancy, resolveTheme
+} from '../listable-object/listable-object.decorator';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
 
-export const DEFAULT_VIEW_MODE = ViewMode.ListElement;
-export const DEFAULT_CONTEXT = Context.Any;
-export const DEFAULT_THEME = '*';
-
-/**
- * A class used to compare two matches and their relevancy to determine which of the two gains priority over the other
- *
- * "level" represents the index of the first default value that was used to find the match with:
- * ViewMode being index 0, Context index 1 and theme index 2. Examples:
- * - If a default value was used for context, but not view-mode and theme, the "level" will be 1
- * - If a default value was used for view-mode and context, but not for theme, the "level" will be 0
- * - If no default value was used for any of the fields, the "level" will be 3
- *
- * "relevancy" represents the amount of values that didn't require a default value to fall back on. Examples:
- * - If a default value was used for theme, but not view-mode and context, the "relevancy" will be 2
- * - If a default value was used for view-mode and context, but not for theme, the "relevancy" will be 1
- * - If a default value was used for all fields, the "relevancy" will be 0
- * - If no default value was used for any of the fields, the "relevancy" will be 3
- *
- * To determine which of two MatchRelevancies is the most relevant, we compare "level" and "relevancy" in that order.
- * If any of the two is higher than the other, that match is most relevant. Examples:
- * - { level: 1, relevancy: 1 } is more relevant than { level: 0, relevancy: 2 }
- * - { level: 1, relevancy: 1 } is less relevant than { level: 1, relevancy: 2 }
- * - { level: 1, relevancy: 1 } is more relevant than { level: 1, relevancy: 0 }
- * - { level: 1, relevancy: 1 } is less relevant than { level: 2, relevancy: 0 }
- * - { level: 1, relevancy: 1 } is more relevant than null
- */
-class MatchRelevancy {
-  constructor(public match: any,
-              public level: number,
-              public relevancy: number) {
-  }
-
-  isMoreRelevantThan(otherMatch: MatchRelevancy): boolean {
-    if (hasNoValue(otherMatch)) {
-      return true;
-    }
-    if (otherMatch.level > this.level) {
-      return false;
-    }
-    if (otherMatch.level === this.level && otherMatch.relevancy > this.relevancy) {
-      return false;
-    }
-    return true;
-  }
-
-  isLessRelevantThan(otherMatch: MatchRelevancy): boolean {
-    return !this.isMoreRelevantThan(otherMatch);
-  }
-}
-
-/**
- * Factory to allow us to inject getThemeConfigFor so we can mock it in tests
- */
-export const GET_THEME_CONFIG_FOR_FACTORY = new InjectionToken<(str) => ThemeConfig>('getThemeConfigFor', {
-  providedIn: 'root',
-  factory: () => getThemeConfigFor
-});
 
 const map = new Map();
 
@@ -75,7 +21,7 @@ const map = new Map();
  * @param context The optional context the component represents
  * @param theme The optional theme for the component
  */
-export function tabulatableObjectsComponent(objectsType: string | GenericConstructor<ListableObject>, viewMode: ViewMode, context: Context = DEFAULT_CONTEXT, theme = DEFAULT_THEME) {
+export function tabulatableObjectsComponent(objectsType: string | GenericConstructor<PaginatedList<ListableObject>>, viewMode: ViewMode, context: Context = DEFAULT_CONTEXT, theme = DEFAULT_THEME) {
   return function decorator(component: any) {
     if (hasNoValue(objectsType)) {
       return;
@@ -107,7 +53,7 @@ export function tabulatableObjectsComponent(objectsType: string | GenericConstru
 export function getTabulatableObjectsComponent(types: (string | GenericConstructor<ListableObject>)[], viewMode: ViewMode, context: Context = DEFAULT_CONTEXT, theme: string = DEFAULT_THEME) {
   let currentBestMatch: MatchRelevancy = null;
   for (const type of types) {
-    const typeMap = map.get(type);
+    const typeMap = map.get(PaginatedList<typeof type>);
     if (hasValue(typeMap)) {
       const match = getMatch(typeMap, [viewMode, context, theme], [DEFAULT_VIEW_MODE, DEFAULT_CONTEXT, DEFAULT_THEME]);
       if (hasNoValue(currentBestMatch) || currentBestMatch.isLessRelevantThan(match)) {
@@ -160,35 +106,3 @@ function getMatch(typeMap: Map<any, any>, keys: any[], defaults: any[]): MatchRe
   }
   return null;
 }
-
-/**
- * Searches for a ThemeConfig by its name;
- */
-export const getThemeConfigFor = (themeName: string): ThemeConfig => {
-  return environment.themes.find(theme => theme.name === themeName);
-};
-
-/**
- * Find a match in the given map for the given theme name, taking theme extension into account
- *
- * @param contextMap A map of theme names to components
- * @param themeName The name of the theme to check
- * @param checkedThemeNames The list of theme names that are already checked
- */
-export const resolveTheme = (contextMap: Map<any, any>, themeName: string, checkedThemeNames: string[] = []): any => {
-  const match = contextMap.get(themeName);
-  if (hasValue(match)) {
-    return match;
-  } else {
-    const cfg = getThemeConfigFor(themeName);
-    if (hasValue(cfg) && isNotEmpty(cfg.extends)) {
-      const nextTheme = cfg.extends;
-      const nextCheckedThemeNames = [...checkedThemeNames, themeName];
-      if (checkedThemeNames.includes(nextTheme)) {
-        throw new Error('Theme extension cycle detected: ' + [...nextCheckedThemeNames, nextTheme].join(' -> '));
-      } else {
-        return resolveTheme(contextMap, nextTheme, nextCheckedThemeNames);
-      }
-    }
-  }
-};
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 ed30e78c73..956f750b9e 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
@@ -2,17 +2,17 @@ import { Component, Inject } from '@angular/core';
 import {
   AbstractTabulatableElementComponent
 } from '../../../object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { SearchResult } from '../../../search/models/search-result.model';
 
 @Component({
   selector: 'ds-search-result-list-element',
   template: ``
 })
-export class TabulatableResultListElementsComponent<T extends PaginatedList<K>, K extends DSpaceObject> extends AbstractTabulatableElementComponent<T> {
+export class TabulatableResultListElementsComponent<T extends PaginatedList<K>, K extends SearchResult<any>> extends AbstractTabulatableElementComponent<T> {
   public constructor(protected truncatableService: TruncatableService,
                      public dsoNameService: DSONameService,
                      @Inject(APP_CONFIG) protected appConfig?: AppConfig) {
diff --git a/src/app/shared/object-table/object-table.component.html b/src/app/shared/object-table/object-table.component.html
index a4fe8cfc38..fcfa4aa691 100644
--- a/src/app/shared/object-table/object-table.component.html
+++ b/src/app/shared/object-table/object-table.component.html
@@ -15,9 +15,10 @@
   (paginationChange)="onPaginationChange($event)"
   (prev)="goPrev()"
   (next)="goNext()"
+  [retainScrollPosition]="true"
 >
   <div class="row" *ngIf="objects?.hasSucceeded">
-    <div  @fadeIn>
+    <div @fadeIn>
       <ds-tabulatable-objects-loader [objects]="objects.payload"
                                      [context]="context"
                                      [showThumbnails]="showThumbnails"
diff --git a/src/app/shared/object-table/object-table.component.ts b/src/app/shared/object-table/object-table.component.ts
index b046818707..8d930a27c2 100644
--- a/src/app/shared/object-table/object-table.component.ts
+++ b/src/app/shared/object-table/object-table.component.ts
@@ -147,13 +147,6 @@ export class ObjectTableComponent {
     this._objects$ = new BehaviorSubject(undefined);
   }
 
-  /**
-   * Initialize the instance variables
-   */
-  ngOnInit(): void {
-    console.log('table rendered');
-  }
-
   /**
    * Emits the current page when it changes
    * @param event The new page
@@ -205,5 +198,4 @@ export class ObjectTableComponent {
   goNext() {
     this.next.emit(true);
   }
-
 }

From 4292c01d8fbaf38a86afcad299da4ed784cafa42 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 5 Jan 2024 13:22:17 +0100
Subject: [PATCH 23/45] clean up

---
 .../admin-notify-search-result.component.ts   |  9 ++--
 .../listable-object.decorator.ts              |  2 +-
 ...bjects-collection-tabulatable.component.ts |  4 --
 .../tabulatable-objects.decorator.ts          | 51 ++-----------------
 ...ulatable-result-list-elements.component.ts |  9 +---
 5 files changed, 9 insertions(+), 66 deletions(-)

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 f0c9e3f7d8..0f4fbb28d3 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
@@ -31,11 +31,8 @@ export class AdminNotifySearchResultComponent  extends TabulatableResultListElem
       QUEUE_STATUS_UNMAPPED_ACTION: 'Unmapped action',
     };
 
-    constructor(private modalService: NgbModal,
-                protected truncatableService: TruncatableService,
-                public dsoNameService: DSONameService,
-                @Inject(APP_CONFIG) protected appConfig?: AppConfig) {
-      super(truncatableService, dsoNameService, appConfig);
+    constructor(private modalService: NgbModal) {
+      super();
     }
 
   /**
@@ -50,7 +47,7 @@ export class AdminNotifySearchResultComponent  extends TabulatableResultListElem
     });
   }
 
-  /**
+    /**
    * Open modal for details visualization
    * @param message the message to be displayed
    */
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
index f56e983dff..4f1a04a985 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
@@ -133,7 +133,7 @@ export function getListableObjectComponent(types: (string | GenericConstructor<L
  * @param defaults        the default values to use for each level, in case no value is found for the key at that index
  * @returns matchAndLevel a {@link MatchRelevancy} object containing the match and its level of relevancy
  */
-function getMatch(typeMap: Map<any, any>, keys: any[], defaults: any[]): MatchRelevancy {
+export function getMatch(typeMap: Map<any, any>, keys: any[], defaults: any[]): MatchRelevancy {
   let currentMap = typeMap;
   let level = -1;
   let relevancy = 0;
diff --git a/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts b/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
index c6b6b1bb5b..3118ec255e 100644
--- a/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
+++ b/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
@@ -73,10 +73,6 @@ export class AbstractTabulatableElementComponent<T extends PaginatedList<Listabl
    */
   contexts = Context;
 
-  constructor(
-    public dsoNameService: DSONameService,
-  ) {
-  }
 
 }
 
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 bfe57149da..c3c23e67fc 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
@@ -6,7 +6,7 @@ import { ListableObject } from '../listable-object.model';
 import {
   DEFAULT_CONTEXT,
   DEFAULT_THEME,
-  DEFAULT_VIEW_MODE,
+  DEFAULT_VIEW_MODE, getMatch,
   MatchRelevancy, resolveTheme
 } from '../listable-object/listable-object.decorator';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
@@ -15,7 +15,7 @@ import { PaginatedList } from '../../../../core/data/paginated-list.model';
 const map = new Map();
 
 /**
- * Decorator used for rendering a listable object
+ * Decorator used for rendering tabulatable objects
  * @param objectType The object type or entity type the component represents
  * @param viewMode The view mode the component represents
  * @param context The optional context the component represents
@@ -40,12 +40,12 @@ export function tabulatableObjectsComponent(objectsType: string | GenericConstru
 }
 
 /**
- * Getter to retrieve the matching listable object component
+ * Getter to retrieve the matching tabulatable objects component
  *
  * Looping over the provided types, it'll attempt to find the best match depending on the {@link MatchRelevancy} returned by getMatch()
  * The most relevant match between types is kept and eventually returned
  *
- * @param types The types of which one should match the listable component
+ * @param types The types of which one should match the tabulatable component
  * @param viewMode The view mode that should match the components
  * @param context The context that should match the components
  * @param theme The theme that should match the components
@@ -63,46 +63,3 @@ export function getTabulatableObjectsComponent(types: (string | GenericConstruct
   }
   return hasValue(currentBestMatch) ? currentBestMatch.match : null;
 }
-
-/**
- * Find an object within a nested map, matching the provided keys as best as possible, falling back on defaults wherever
- * needed.
- *
- * Starting off with a Map, it loops over the provided keys, going deeper into the map until it finds a value
- * If at some point, no value is found, it'll attempt to use the default value for that index instead
- * If the default value exists, the index is stored in the "level"
- * If no default value exists, 1 is added to "relevancy"
- * See {@link MatchRelevancy} what these represent
- *
- * @param typeMap         a multi-dimensional map
- * @param keys            the keys of the multi-dimensional map to loop over. Each key represents a level within the map
- * @param defaults        the default values to use for each level, in case no value is found for the key at that index
- * @returns matchAndLevel a {@link MatchRelevancy} object containing the match and its level of relevancy
- */
-function getMatch(typeMap: Map<any, any>, keys: any[], defaults: any[]): MatchRelevancy {
-  let currentMap = typeMap;
-  let level = -1;
-  let relevancy = 0;
-  for (let i = 0; i < keys.length; i++) {
-    // If we're currently checking the theme, resolve it first to take extended themes into account
-    let currentMatch = defaults[i] === DEFAULT_THEME ? resolveTheme(currentMap, keys[i]) : currentMap.get(keys[i]);
-    if (hasNoValue(currentMatch)) {
-      currentMatch = currentMap.get(defaults[i]);
-      if (level === -1) {
-        level = i;
-      }
-    } else {
-      relevancy++;
-    }
-    if (hasValue(currentMatch)) {
-      if (currentMatch instanceof Map) {
-        currentMap = currentMatch as Map<any, any>;
-      } else {
-        return new MatchRelevancy(currentMatch, level > -1 ? level : i + 1, relevancy);
-      }
-    } else {
-      return null;
-    }
-  }
-  return null;
-}
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 956f750b9e..b1be6443b8 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
@@ -12,11 +12,4 @@ import { SearchResult } from '../../../search/models/search-result.model';
   selector: 'ds-search-result-list-element',
   template: ``
 })
-export class TabulatableResultListElementsComponent<T extends PaginatedList<K>, K extends SearchResult<any>> extends AbstractTabulatableElementComponent<T> {
-  public constructor(protected truncatableService: TruncatableService,
-                     public dsoNameService: DSONameService,
-                     @Inject(APP_CONFIG) protected appConfig?: AppConfig) {
-    super(dsoNameService);
-  }
-
-}
+export class TabulatableResultListElementsComponent<T extends PaginatedList<K>, K extends SearchResult<any>> extends AbstractTabulatableElementComponent<T> {}

From e9159ce4e808382a178d9ad87718932af2cea00b Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 5 Jan 2024 13:29:16 +0100
Subject: [PATCH 24/45] fix lint

---
 .../admin-notify-search-result.component.ts                  | 5 +----
 .../objects-collection-tabulatable.component.ts              | 1 -
 .../tabulatable-objects/tabulatable-objects.decorator.ts     | 2 +-
 .../tabulatable-result-list-elements.component.ts            | 5 +----
 4 files changed, 3 insertions(+), 10 deletions(-)

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 0f4fbb28d3..9c28a7e836 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
@@ -1,4 +1,4 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { AdminNotifySearchResult } from '../models/admin-notify-message-search-result.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { Context } from '../../../core/shared/context.model';
@@ -11,9 +11,6 @@ import {
 } from '../../../shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { TruncatableService } from '../../../shared/truncatable/truncatable.service';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
 import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
 
 @tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotify)
diff --git a/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts b/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
index 3118ec255e..9cc49ad134 100644
--- a/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
+++ b/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
@@ -3,7 +3,6 @@ import { ListableObject } from '../listable-object.model';
 import { CollectionElementLinkType } from '../../collection-element-link.type';
 import { Context } from '../../../../core/shared/context.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 
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 c3c23e67fc..ae7e71f2fc 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
@@ -7,7 +7,7 @@ import {
   DEFAULT_CONTEXT,
   DEFAULT_THEME,
   DEFAULT_VIEW_MODE, getMatch,
-  MatchRelevancy, resolveTheme
+  MatchRelevancy
 } from '../listable-object/listable-object.decorator';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 
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 b1be6443b8..94d132f822 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
@@ -1,10 +1,7 @@
-import { Component, Inject } from '@angular/core';
+import { Component } from '@angular/core';
 import {
   AbstractTabulatableElementComponent
 } from '../../../object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { SearchResult } from '../../../search/models/search-result.model';
 

From af3bfee74e6ec9419a9b016edf8a2dabc5fedc58 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 5 Jan 2024 15:56:58 +0100
Subject: [PATCH 25/45] fix test dependencies

---
 ...dmin-notify-detail-modal.component.spec.ts |  4 ++-
 .../admin-notify-incoming.component.spec.ts   |  4 ++-
 .../admin-notify-outgoing.component.spec.ts   |  4 ++-
 .../admin-notify-search-result.component.html |  2 +-
 .../admin-notify-search-result.component.ts   | 13 ++++----
 .../models/admin-notify-message.model.ts      |  9 ++++++
 ...bulatable-objects-loader.component.spec.ts | 30 +++++++++++++++++--
 .../tabulatable-objects-loader.component.ts   |  2 +-
 .../object-table/object-table.component.html  |  4 +--
 9 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts
index 7ac979050c..77a878429c 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AdminNotifyDetailModalComponent } from './admin-notify-detail-modal.component';
+import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
 
 describe('AdminNotifyDetailModalComponent', () => {
   let component: AdminNotifyDetailModalComponent;
@@ -8,7 +9,8 @@ describe('AdminNotifyDetailModalComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ AdminNotifyDetailModalComponent ]
+      declarations: [ AdminNotifyDetailModalComponent ],
+      providers: [NgbActiveModal]
     })
     .compileComponents();
 
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
index d32e100686..dba177f8f8 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AdminNotifyIncomingComponent } from './admin-notify-incoming.component';
 import { TranslateModule } from '@ngx-translate/core';
+import { ActivatedRoute } from "@angular/router";
 
 describe('AdminNotifyLogsComponent', () => {
   let component: AdminNotifyIncomingComponent;
@@ -10,7 +11,8 @@ describe('AdminNotifyLogsComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [ AdminNotifyIncomingComponent ]
+      declarations: [ AdminNotifyIncomingComponent ],
+      providers: [ActivatedRoute]
     })
     .compileComponents();
 
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
index dafa72c52e..3cb67e9636 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AdminNotifyOutgoingComponent } from './admin-notify-outgoing.component';
 import { TranslateModule } from '@ngx-translate/core';
+import { ActivatedRoute } from "@angular/router";
 
 describe('AdminNotifyLogsComponent', () => {
   let component: AdminNotifyOutgoingComponent;
@@ -10,7 +11,8 @@ describe('AdminNotifyLogsComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [ AdminNotifyOutgoingComponent ]
+      declarations: [ AdminNotifyOutgoingComponent ],
+      providers: [ActivatedRoute]
     })
     .compileComponents();
 
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
index 80c7faa086..a1ba0670bc 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -30,7 +30,7 @@
           <td>
             <div class="d-flex flex-column">
               <button class="btn mb-2 btn-dark" (click)="openDetailModal(message)">Detail</button>
-              <button class="btn btn-warning">Reprocess</button>
+              <button *ngIf="message.queueStatusLabel === reprocessStatus" class="btn btn-warning">Reprocess</button>
             </div>
           </td>
         </tr>
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 9c28a7e836..8d6430da9f 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
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { AdminNotifySearchResult } from '../models/admin-notify-message-search-result.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { Context } from '../../../core/shared/context.model';
-import { AdminNotifyMessage } from '../models/admin-notify-message.model';
+import { AdminNotifyMessage, QueueStatusMap } from '../models/admin-notify-message.model';
 import {
   tabulatableObjectsComponent
 } from '../../../shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator';
@@ -12,6 +12,7 @@ import {
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
+import { objects } from "../../../shared/search/search-results/search-results.component.spec";
 
 @tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotify)
 @Component({
@@ -21,12 +22,7 @@ import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/ad
 })
 export class AdminNotifySearchResultComponent  extends TabulatableResultListElementsComponent<PaginatedList<AdminNotifySearchResult>, AdminNotifySearchResult> implements OnInit{
     public notifyMessages: AdminNotifyMessage[];
-
-    private queueStatusMap = {
-      QUEUE_STATUS_PROCESSED: 'Processed',
-      QUEUE_STATUS_FAILED: 'Failed',
-      QUEUE_STATUS_UNMAPPED_ACTION: 'Unmapped action',
-    };
+    public reprocessStatus = QueueStatusMap.QUEUE_STATUS_QUEUED_FOR_RETRY;
 
     constructor(private modalService: NgbModal) {
       super();
@@ -36,10 +32,11 @@ export class AdminNotifySearchResultComponent  extends TabulatableResultListElem
    * Map messages on init for readable representation
    */
   ngOnInit() {
+    console.log(this.objects.page.splice(0,2))
     this.notifyMessages = this.objects.page.map(object => {
       const indexableObject = object.indexableObject;
       indexableObject.coarNotifyType = indexableObject.coarNotifyType.split(':')[1];
-      indexableObject.queueStatusLabel = this.queueStatusMap[indexableObject.queueStatusLabel];
+      indexableObject.queueStatusLabel = QueueStatusMap[indexableObject.queueStatusLabel];
       return indexableObject;
     });
   }
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
index a463de483a..6114ab6084 100644
--- a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
@@ -6,6 +6,15 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { GenericConstructor } from '../../../core/shared/generic-constructor';
 import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
 
+export enum QueueStatusMap {
+  QUEUE_STATUS_PROCESSED = 'Processed',
+  QUEUE_STATUS_FAILED = 'Failed',
+  QUEUE_STATUS_UNMAPPED_ACTION = 'Unmapped action',
+  QUEUE_STATUS_QUEUED_FOR_RETRY = 'Queued for retry',
+  QUEUE_STATUS_PROCESSING = 'Processing',
+  QUEUE_STATUS_QUEUED = 'Queued',
+  QUEUE_STATUS_UNTRUSTED = 'Untrusted',
+};
 /**
  * A message that includes admin notify info
  */
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts
index 59d0a42ecd..9fe3065714 100644
--- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts
@@ -1,19 +1,45 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TabulatableObjectsLoaderComponent } from './tabulatable-objects-loader.component';
+import { ThemeService } from "../../../theme-support/theme.service";
+import { provideMockStore } from "@ngrx/store/testing";
+import { ListableObject } from "../listable-object.model";
+import { PaginatedList } from "../../../../core/data/paginated-list.model";
+import { Context } from "../../../../core/shared/context.model";
+import { GenericConstructor } from "../../../../core/shared/generic-constructor";
 
-describe('TabulatableObjectsComponent', () => {
+const testType = 'TestType';
+class TestType extends ListableObject {
+  getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
+    return [testType];
+  }
+}
+
+class TestTypes extends PaginatedList<ListableObject> {
+  page: TestType[]
+}
+
+
+describe('TabulatableObjectsLoaderComponent', () => {
   let component: TabulatableObjectsLoaderComponent;
   let fixture: ComponentFixture<TabulatableObjectsLoaderComponent>;
 
+  let themeService: ThemeService;
+
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ TabulatableObjectsLoaderComponent ]
+      declarations: [ TabulatableObjectsLoaderComponent ],
+      providers: [
+        provideMockStore({}),
+        { provide: ThemeService, useValue: themeService },
+      ]
     })
     .compileComponents();
 
     fixture = TestBed.createComponent(TabulatableObjectsLoaderComponent);
     component = fixture.componentInstance;
+    component.objects = new TestTypes();
+    component.context = Context.Search;
     fixture.detectChanges();
   });
 
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
index 1c68718bd6..467f2a12fe 100644
--- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
@@ -148,7 +148,7 @@ export class TabulatableObjectsLoaderComponent implements OnInit, OnChanges, OnD
 
   private instantiateComponent(objects: PaginatedList<ListableObject>, changes?: SimpleChanges): void {
     // objects need to have same render type so we access just the first in the page
-    const component = this.getComponent(objects.page[0].getRenderTypes(), this.viewMode, this.context);
+    const component = this.getComponent(objects.page[0]?.getRenderTypes(), this.viewMode, this.context);
 
     const viewContainerRef = this.tabulatableObjectsDirective.viewContainerRef;
     viewContainerRef.clear();
diff --git a/src/app/shared/object-table/object-table.component.html b/src/app/shared/object-table/object-table.component.html
index fcfa4aa691..8212b5a796 100644
--- a/src/app/shared/object-table/object-table.component.html
+++ b/src/app/shared/object-table/object-table.component.html
@@ -26,8 +26,8 @@
       </ds-tabulatable-objects-loader>
     </div>
   </div>
-  <ds-error *ngIf="objects.hasFailed" message="{{'error.objects' | translate}}"></ds-error>
-  <ds-themed-loading *ngIf="objects.isLoading" message="{{'loading.objects' | translate}}"></ds-themed-loading>
+  <ds-error *ngIf="objects?.hasFailed" message="{{'error.objects' | translate}}"></ds-error>
+  <ds-themed-loading *ngIf="objects?.isLoading" message="{{'loading.objects' | translate}}"></ds-themed-loading>
 </ds-pagination>
 
 

From 7185c5548acad9ef74645c1b8e649daee5c61f91 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 5 Jan 2024 17:39:00 +0100
Subject: [PATCH 26/45] fix test dependencies, move components in two tabs

---
 .../admin-notify-dashboard.component.html     | 13 ++++--
 .../admin-notify-incoming.component.spec.ts   | 40 ++++++++++++++++++-
 .../admin-notify-outgoing.component.spec.ts   | 39 +++++++++++++++++-
 .../admin-notify-search-result.component.ts   |  4 +-
 ...bulatable-objects-loader.component.spec.ts | 25 ++++++++++--
 .../tabulatable-objects-loader.component.ts   |  2 +-
 .../search-facet-option.component.spec.ts     |  3 +-
 ...earch-facet-range-option.component.spec.ts |  3 +-
 ...ch-facet-selected-option.component.spec.ts |  3 +-
 .../search-facet-filter.component.spec.ts     |  3 +-
 .../search-filter.component.spec.ts           |  3 +-
 .../search-hierarchy-filter.component.spec.ts |  3 +-
 .../search-range-filter.component.spec.ts     |  3 +-
 .../search-filters.component.spec.ts          |  3 +-
 src/assets/i18n/en.json5                      |  4 ++
 15 files changed, 128 insertions(+), 23 deletions(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
index a8aae4998b..0184141112 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
@@ -12,12 +12,19 @@
               </div>
             </ng-template>
           </li>
-          <li [ngbNavItem]="'logs'" (click)="activateTableMode()">
-            <a ngbNavLink>{{'admin-notify-dashboard.logs' | translate}}</a>
+          <li [ngbNavItem]="'inbound'" (click)="activateTableMode()">
+            <a ngbNavLink>{{'admin.notify.dashboard.inbound' | translate}}</a>
             <ng-template ngbNavContent>
-              <div id="logs">
+              <div id="inbound">
                 <div class="col-12 text-left h4 my-4">{{'admin.notify.dashboard.inbound' | translate}}</div>
                 <ds-admin-notify-incoming></ds-admin-notify-incoming>
+              </div>
+            </ng-template>
+          </li>
+          <li [ngbNavItem]="'outbound'" (click)="activateTableMode()">
+            <a ngbNavLink>{{'admin.notify.dashboard.outbound'| translate}}</a>
+            <ng-template ngbNavContent>
+              <div id="outbound">
                 <div class="col-12 text-left h4 my-4">{{'admin.notify.dashboard.outbound' | translate}}</div>
                 <ds-admin-notify-outgoing></ds-admin-notify-outgoing>
               </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
index dba177f8f8..44ef519164 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
@@ -3,16 +3,52 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AdminNotifyIncomingComponent } from './admin-notify-incoming.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { ActivatedRoute } from "@angular/router";
+import { MockActivatedRoute } from "../../../../shared/mocks/active-router.mock";
+import { provideMockStore } from "@ngrx/store/testing";
+import { HALEndpointService } from "../../../../core/shared/hal-endpoint.service";
+import { SEARCH_CONFIG_SERVICE } from "../../../../my-dspace-page/my-dspace-page.component";
+import { AdminNotifySearchConfigurationService } from "../../config/admin-notify-search-configuration.service";
+import { FILTER_SEARCH } from "../../admin-notify-dashboard.component";
+import { AdminNotifySearchFilterService } from "../../config/admin-notify-filter-service";
+import { FILTER_CONFIG } from "../../../../core/shared/search/search-filter.service";
+import { RouteService } from "../../../../core/services/route.service";
+import { routeServiceStub } from "../../../../shared/testing/route-service.stub";
+import { RequestService } from "../../../../core/data/request.service";
+import { RemoteDataBuildService } from "../../../../core/cache/builders/remote-data-build.service";
+import { getMockRemoteDataBuildService } from "../../../../shared/mocks/remote-data-build.service.mock";
 
-describe('AdminNotifyLogsComponent', () => {
+describe('AdminNotifyIncomingComponent', () => {
   let component: AdminNotifyIncomingComponent;
   let fixture: ComponentFixture<AdminNotifyIncomingComponent>;
+  let halService: HALEndpointService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+
+
 
   beforeEach(async () => {
+    rdbService = getMockRemoteDataBuildService();
+    halService = jasmine.createSpyObj('halService', {
+      'getRootHref': '/api'
+    });
+    requestService = jasmine.createSpyObj('requestService', {
+      'generateRequestId': 'client/1234',
+      'send': '',
+    });
     await TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [ AdminNotifyIncomingComponent ],
-      providers: [ActivatedRoute]
+      providers: [
+        { provide: SEARCH_CONFIG_SERVICE, useValue: AdminNotifySearchConfigurationService },
+        { provide: FILTER_SEARCH, useValue: AdminNotifySearchFilterService },
+        { provide: FILTER_CONFIG, useValue: AdminNotifySearchConfigurationService },
+        { provide: RouteService, useValue: routeServiceStub },
+        { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
+        { provide: HALEndpointService, useValue: halService },
+        { provide: RequestService, useValue: requestService },
+        { provide: RemoteDataBuildService, useValue: rdbService },
+        provideMockStore({}),
+      ]
     })
     .compileComponents();
 
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
index 3cb67e9636..0fd565fbf3 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
@@ -3,16 +3,51 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AdminNotifyOutgoingComponent } from './admin-notify-outgoing.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { ActivatedRoute } from "@angular/router";
+import { MockActivatedRoute } from "../../../../shared/mocks/active-router.mock";
+import { provideMockStore } from "@ngrx/store/testing";
+import { HALEndpointService } from "../../../../core/shared/hal-endpoint.service";
+import { SEARCH_CONFIG_SERVICE } from "../../../../my-dspace-page/my-dspace-page.component";
+import { AdminNotifySearchConfigurationService } from "../../config/admin-notify-search-configuration.service";
+import { FILTER_SEARCH } from "../../admin-notify-dashboard.component";
+import { AdminNotifySearchFilterService } from "../../config/admin-notify-filter-service";
+import { FILTER_CONFIG } from "../../../../core/shared/search/search-filter.service";
+import { RouteService } from "../../../../core/services/route.service";
+import { routeServiceStub } from "../../../../shared/testing/route-service.stub";
+import { RequestService } from "../../../../core/data/request.service";
+import { getMockRemoteDataBuildService } from "../../../../shared/mocks/remote-data-build.service.mock";
+import { RemoteDataBuildService } from "../../../../core/cache/builders/remote-data-build.service";
 
-describe('AdminNotifyLogsComponent', () => {
+describe('AdminNotifyOutgoingComponent', () => {
   let component: AdminNotifyOutgoingComponent;
   let fixture: ComponentFixture<AdminNotifyOutgoingComponent>;
+  let halService: HALEndpointService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+
 
   beforeEach(async () => {
+    rdbService = getMockRemoteDataBuildService();
+    requestService = jasmine.createSpyObj('requestService', {
+      'generateRequestId': 'client/1234',
+      'send': '',
+    });
+    halService = jasmine.createSpyObj('halService', {
+      'getRootHref': '/api'
+    });
     await TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [ AdminNotifyOutgoingComponent ],
-      providers: [ActivatedRoute]
+      providers: [
+        { provide: SEARCH_CONFIG_SERVICE, useValue: AdminNotifySearchConfigurationService },
+        { provide: FILTER_SEARCH, useValue: AdminNotifySearchFilterService },
+        { provide: FILTER_CONFIG, useValue: AdminNotifySearchConfigurationService },
+        { provide: RouteService, useValue: routeServiceStub },
+        { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
+        { provide: HALEndpointService, useValue: halService },
+        { provide: RequestService, useValue: requestService },
+        { provide: RemoteDataBuildService, useValue: rdbService },
+        provideMockStore({}),
+      ]
     })
     .compileComponents();
 
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 8d6430da9f..23d15002a8 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
@@ -12,7 +12,6 @@ import {
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
-import { objects } from "../../../shared/search/search-results/search-results.component.spec";
 
 @tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotify)
 @Component({
@@ -32,8 +31,7 @@ export class AdminNotifySearchResultComponent  extends TabulatableResultListElem
    * Map messages on init for readable representation
    */
   ngOnInit() {
-    console.log(this.objects.page.splice(0,2))
-    this.notifyMessages = this.objects.page.map(object => {
+    this.notifyMessages = this.objects?.page.map(object => {
       const indexableObject = object.indexableObject;
       indexableObject.coarNotifyType = indexableObject.coarNotifyType.split(':')[1];
       indexableObject.queueStatusLabel = QueueStatusMap[indexableObject.queueStatusLabel];
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts
index 9fe3065714..21fd2b94b2 100644
--- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts
@@ -7,6 +7,15 @@ import { ListableObject } from "../listable-object.model";
 import { PaginatedList } from "../../../../core/data/paginated-list.model";
 import { Context } from "../../../../core/shared/context.model";
 import { GenericConstructor } from "../../../../core/shared/generic-constructor";
+import { TabulatableObjectsDirective } from "./tabulatable-objects.directive";
+import { ListableObjectComponentLoaderComponent } from "../listable-object/listable-object-component-loader.component";
+import { ChangeDetectionStrategy } from "@angular/core";
+import {
+  ItemListElementComponent
+} from "../../../object-list/item-list-element/item-types/item/item-list-element.component";
+import {
+  TabulatableResultListElementsComponent
+} from "../../../object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component";
 
 const testType = 'TestType';
 class TestType extends ListableObject {
@@ -16,7 +25,7 @@ class TestType extends ListableObject {
 }
 
 class TestTypes extends PaginatedList<ListableObject> {
-  page: TestType[]
+  page: TestType[] = [new TestType()]
 }
 
 
@@ -27,19 +36,27 @@ describe('TabulatableObjectsLoaderComponent', () => {
   let themeService: ThemeService;
 
   beforeEach(async () => {
+    themeService = jasmine.createSpyObj('themeService', {
+      getThemeName: 'dspace',
+    });
     await TestBed.configureTestingModule({
-      declarations: [ TabulatableObjectsLoaderComponent ],
+      declarations: [ TabulatableObjectsLoaderComponent, TabulatableObjectsDirective ],
       providers: [
         provideMockStore({}),
         { provide: ThemeService, useValue: themeService },
       ]
-    })
-    .compileComponents();
+    }).overrideComponent(TabulatableObjectsLoaderComponent, {
+      set: {
+        changeDetection: ChangeDetectionStrategy.Default,
+        entryComponents: [TabulatableResultListElementsComponent]
+      }
+    }).compileComponents();
 
     fixture = TestBed.createComponent(TabulatableObjectsLoaderComponent);
     component = fixture.componentInstance;
     component.objects = new TestTypes();
     component.context = Context.Search;
+    spyOn(component, 'getComponent').and.returnValue(TabulatableResultListElementsComponent as any);
     fixture.detectChanges();
   });
 
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
index 467f2a12fe..0ba9e1cdd4 100644
--- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
@@ -148,7 +148,7 @@ export class TabulatableObjectsLoaderComponent implements OnInit, OnChanges, OnD
 
   private instantiateComponent(objects: PaginatedList<ListableObject>, changes?: SimpleChanges): void {
     // objects need to have same render type so we access just the first in the page
-    const component = this.getComponent(objects.page[0]?.getRenderTypes(), this.viewMode, this.context);
+    const component = this.getComponent(objects?.page[0]?.getRenderTypes(), this.viewMode, this.context);
 
     const viewContainerRef = this.tabulatableObjectsDirective.viewContainerRef;
     viewContainerRef.clear();
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
index 53acb1d911..8c27774f99 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
@@ -19,6 +19,7 @@ import { PaginationComponentOptions } from '../../../../../pagination/pagination
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
 import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
+import { FILTER_SEARCH } from "../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 describe('SearchFacetOptionComponent', () => {
   let comp: SearchFacetOptionComponent;
@@ -102,7 +103,7 @@ describe('SearchFacetOptionComponent', () => {
           }
         },
         {
-          provide: SearchFilterService, useValue: {
+          provide: FILTER_SEARCH, useValue: {
             getSelectedValuesForFilter: () => selectedValues,
             isFilterActiveWithValue: (paramName: string, filterValue: string) => observableOf(true),
             getPage: (paramName: string) => page,
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
index b0acf43c32..0f9655c1d5 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
@@ -23,6 +23,7 @@ import { PaginationComponentOptions } from '../../../../../pagination/pagination
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
 import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
+import { FILTER_SEARCH } from "../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 describe('SearchFacetRangeOptionComponent', () => {
   let comp: SearchFacetRangeOptionComponent;
@@ -76,7 +77,7 @@ describe('SearchFacetRangeOptionComponent', () => {
           }
         },
         {
-          provide: SearchFilterService, useValue: {
+          provide: FILTER_SEARCH, useValue: {
             isFilterActiveWithValue: (paramName: string, filterValue: string) => observableOf(true),
             getPage: (paramName: string) => page,
             /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
index 15e418842f..aa58d25d31 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
@@ -17,6 +17,7 @@ import { SearchFacetSelectedOptionComponent } from './search-facet-selected-opti
 import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
+import { FILTER_SEARCH } from "../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 describe('SearchFacetSelectedOptionComponent', () => {
   let comp: SearchFacetSelectedOptionComponent;
@@ -126,7 +127,7 @@ describe('SearchFacetSelectedOptionComponent', () => {
           }
         },
         {
-          provide: SearchFilterService, useValue: {
+          provide: FILTER_SEARCH, useValue: {
             getSelectedValuesForFilter: () => selectedValues,
             isFilterActiveWithValue: (paramName: string, filterValue: string) => observableOf(true),
             getPage: (paramName: string) => page,
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
index 92d2e5265b..40852f275d 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
@@ -24,6 +24,7 @@ import { RemoteDataBuildService } from '../../../../../core/cache/builders/remot
 import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
+import { FILTER_SEARCH } from "../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 describe('SearchFacetFilterComponent', () => {
   let comp: SearchFacetFilterComponent;
@@ -100,7 +101,7 @@ describe('SearchFacetFilterComponent', () => {
         { provide: IN_PLACE_SEARCH, useValue: false },
         { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false) },
         {
-          provide: SearchFilterService, useValue: {
+          provide: FILTER_SEARCH, useValue: {
             getSelectedValuesForFilter: () => observableOf(selectedValues),
             isFilterActiveWithValue: (paramName: string, filterValue: string) => true,
             getPage: (paramName: string) => page,
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
index 7abe45ca8c..8747747ec7 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
@@ -14,6 +14,7 @@ import { SearchConfigurationServiceStub } from '../../../testing/search-configur
 import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
 import { SequenceService } from '../../../../core/shared/sequence.service';
 import { BrowserOnlyMockPipe } from '../../../testing/browser-only-mock.pipe';
+import { FILTER_SEARCH } from "../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 describe('SearchFilterComponent', () => {
   let comp: SearchFilterComponent;
@@ -70,7 +71,7 @@ describe('SearchFilterComponent', () => {
       providers: [
         { provide: SearchService, useValue: searchServiceStub },
         {
-          provide: SearchFilterService,
+          provide: FILTER_SEARCH,
           useValue: mockFilterService
         },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
index e6c74d8047..6ca5c62334 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -26,6 +26,7 @@ import { SearchConfigurationServiceStub } from '../../../../testing/search-confi
 import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { FacetValue} from '../../../models/facet-value.model';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import { FILTER_SEARCH } from "../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 describe('SearchHierarchyFilterComponent', () => {
 
@@ -67,7 +68,7 @@ describe('SearchHierarchyFilterComponent', () => {
       ],
       providers: [
         { provide: SearchService, useValue: searchService },
-        { provide: SearchFilterService, useValue: searchFilterService },
+        { provide: FILTER_SEARCH, useValue: searchFilterService },
         { provide: RemoteDataBuildService, useValue: {} },
         { provide: Router, useValue: router },
         { provide: NgbModal, useValue: ngbModal },
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
index 3a146f5059..7569a33214 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
@@ -25,6 +25,7 @@ import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-p
 import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { RouteService } from '../../../../../core/services/route.service';
+import { FILTER_SEARCH } from "../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 describe('SearchRangeFilterComponent', () => {
   let comp: SearchRangeFilterComponent;
@@ -106,7 +107,7 @@ describe('SearchRangeFilterComponent', () => {
         { provide: IN_PLACE_SEARCH, useValue: false },
         { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false) },
         {
-          provide: SearchFilterService, useValue: {
+          provide: FILTER_SEARCH, useValue: {
             getSelectedValuesForFilter: () => selectedValues,
             isFilterActiveWithValue: (paramName: string, filterValue: string) => true,
             getPage: (paramName: string) => page,
diff --git a/src/app/shared/search/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts
index 522459b603..212174d241 100644
--- a/src/app/shared/search/search-filters/search-filters.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.spec.ts
@@ -9,6 +9,7 @@ import { SearchFiltersComponent } from './search-filters.component';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { FILTER_SEARCH } from "../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 describe('SearchFiltersComponent', () => {
   let comp: SearchFiltersComponent;
@@ -36,7 +37,7 @@ describe('SearchFiltersComponent', () => {
       providers: [
         { provide: SearchService, useValue: searchServiceStub },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
-        { provide: SearchFilterService, useValue: searchFiltersStub },
+        { provide: FILTER_SEARCH, useValue: searchFiltersStub },
 
       ],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index ce5004832e..60134d54e3 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3509,6 +3509,10 @@
 
   "search.filters.filter.target.placeholder": "Target",
 
+  "search.filters.filter.origin.label": "Search source",
+
+  "search.filters.filter.origin.placeholder": "Source",
+
   "search.filters.filter.queue_status.placeholder": "Queue status",
 
   "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",

From 4d30bc7035aff0214c6496c32afff7bdf93a51a7 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 8 Jan 2024 13:07:07 +0100
Subject: [PATCH 27/45] separate results, config routes, add data mapping, add
 service

---
 .../admin-notify-dashboard-routing.module.ts  |  18 ++-
 .../admin-notify-dashboard.component.html     |  36 ++---
 .../admin-notify-dashboard.component.ts       |  16 +-
 .../admin-notify-dashboard.module.ts          |  12 +-
 .../admin-notify-incoming.component.html      |  37 ++++-
 .../admin-notify-incoming.component.spec.ts   |  10 +-
 .../admin-notify-incoming.component.ts        |  26 +---
 .../admin-notify-outgoing.component.html      |  37 ++++-
 .../admin-notify-outgoing.component.spec.ts   |   8 +-
 .../admin-notify-outgoing.component.ts        |  26 +---
 ...min-notify-search-result.component.spec.ts |  22 ---
 .../admin-notify-search-result.component.ts   |  58 -------
 ...tify-incoming-search-result.component.html |  40 +++++
 ...ify-incoming-search-result.component.scss} |   0
 ...y-incoming-search-result.component.spec.ts |  22 +++
 ...notify-incoming-search-result.component.ts |  97 ++++++++++++
 ...ify-outgoing-search-result.component.html} |  12 +-
 ...tify-outgoing-search-result.component.scss |   0
 ...y-outgoing-search-result.component.spec.ts |  22 +++
 ...notify-outgoing-search-result.component.ts |  98 ++++++++++++
 ...dmin-notify-facet-config-response.model.ts |  35 -----
 ...n-notify-facet-response-parsing.service.ts |  38 -----
 .../config/admin-notify-filter-service.ts     |  35 -----
 ...min-notify-search-configuration.service.ts | 145 ------------------
 .../admin-notify-search-filter-config.ts      |  94 ------------
 .../models/admin-notify-message.model.ts      |  22 ++-
 .../services/admin-notify-messages.service.ts |  45 ++++++
 src/app/core/core.module.ts                   |  11 --
 src/app/core/shared/context.model.ts          |   3 +-
 .../search-facet-option.component.spec.ts     |   3 +-
 .../search-facet-option.component.ts          |   3 +-
 ...earch-facet-range-option.component.spec.ts |   3 +-
 .../search-facet-range-option.component.ts    |   3 +-
 ...ch-facet-selected-option.component.spec.ts |   3 +-
 .../search-facet-selected-option.component.ts |   3 +-
 .../search-facet-filter.component.spec.ts     |   3 +-
 .../search-facet-filter.component.ts          |   3 +-
 .../search-filter.component.spec.ts           |   3 +-
 .../search-filter/search-filter.component.ts  |   3 +-
 .../search-hierarchy-filter.component.spec.ts |   3 +-
 .../search-hierarchy-filter.component.ts      |   3 +-
 .../search-range-filter.component.spec.ts     |   3 +-
 .../search-range-filter.component.ts          |   3 +-
 .../search-filters.component.spec.ts          |   3 +-
 .../search-filters.component.ts               |   3 +-
 src/app/shared/search/search.component.ts     |  11 +-
 .../shared/search/themed-search.component.ts  |   4 +-
 47 files changed, 480 insertions(+), 608 deletions(-)
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.html
 rename src/app/admin/admin-notify-dashboard/admin-notify-search-result/{admin-notify-search-result.component.scss => incoming/admin-notify-incoming-search-result.component.scss} (100%)
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.spec.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.ts
 rename src/app/admin/admin-notify-dashboard/admin-notify-search-result/{admin-notify-search-result.component.html => outgoing/admin-notify-outgoing-search-result.component.html} (73%)
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.scss
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.spec.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.ts
 delete mode 100644 src/app/admin/admin-notify-dashboard/config/admin-notify-facet-config-response.model.ts
 delete mode 100644 src/app/admin/admin-notify-dashboard/config/admin-notify-facet-response-parsing.service.ts
 delete mode 100644 src/app/admin/admin-notify-dashboard/config/admin-notify-filter-service.ts
 delete mode 100644 src/app/admin/admin-notify-dashboard/config/admin-notify-search-configuration.service.ts
 delete mode 100644 src/app/admin/admin-notify-dashboard/config/admin-notify-search-filter-config.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts

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 b917116216..345dc31ce3 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
@@ -6,6 +6,12 @@ import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.componen
 import {
   SiteAdministratorGuard
 } from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+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: [
@@ -22,8 +28,18 @@ import {
           title: 'admin.notify.dashboard.page.title',
           breadcrumbKey: 'admin.notify.dashboard',
           showBreadcrumbsFluid: false
-        }
+        },
       },
+      {
+        path: 'inbound',
+        component: AdminNotifyIncomingComponent,
+        canActivate: [SiteAdministratorGuard],
+      },
+      {
+        path: 'outbound',
+        component: AdminNotifyOutgoingComponent,
+        canActivate: [SiteAdministratorGuard],
+      }
     ])
   ],
   providers: [
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
index 0184141112..17d9bf884d 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
@@ -3,35 +3,19 @@
     <div class="col-12">
       <h2 class="border-bottom pb-2">{{'admin-notify-dashboard.title'| translate}}</h2>
       <div>
-        <ul ngbNav #nav="ngbNav" [activeId]="'metrics'" class="nav-tabs">
-          <li [ngbNavItem]="'metrics'">
-            <a ngbNavLink>{{'admin-notify-dashboard.metrics' | translate}}</a>
-            <ng-template ngbNavContent>
-              <div id="metrics">
-                <ds-admin-notify-metrics *ngIf="(notifyMetricsRows$ | async)?.length" [boxesConfig]="notifyMetricsRows$ | async"></ds-admin-notify-metrics>
-              </div>
-            </ng-template>
+        <ul class="nav nav-tabs">
+          <li class="nav-item">
+            <a class="nav-link active">{{'admin-notify-dashboard.metrics' | translate}}</a>
           </li>
-          <li [ngbNavItem]="'inbound'" (click)="activateTableMode()">
-            <a ngbNavLink>{{'admin.notify.dashboard.inbound' | translate}}</a>
-            <ng-template ngbNavContent>
-              <div id="inbound">
-                <div class="col-12 text-left h4 my-4">{{'admin.notify.dashboard.inbound' | translate}}</div>
-                <ds-admin-notify-incoming></ds-admin-notify-incoming>
-              </div>
-            </ng-template>
-          </li>
-          <li [ngbNavItem]="'outbound'" (click)="activateTableMode()">
-            <a ngbNavLink>{{'admin.notify.dashboard.outbound'| translate}}</a>
-            <ng-template ngbNavContent>
-              <div id="outbound">
-                <div class="col-12 text-left h4 my-4">{{'admin.notify.dashboard.outbound' | translate}}</div>
-                <ds-admin-notify-outgoing></ds-admin-notify-outgoing>
-              </div>
-            </ng-template>
+          <li class="nav-item">
+            <a class="nav-link" [routerLink]="'inbound'" [queryParams]="{view: 'table'}">{{'admin.notify.dashboard.inbound' | translate}}</a>
           </li>
+          <li class="nav-item">
+            <a class="nav-link" [routerLink]="'outbound'" [queryParams]="{view: 'table'}">{{'admin.notify.dashboard.outbound' | translate}}</a>
         </ul>
-        <div [ngbNavOutlet]="nav" class="mt-2"></div>
+        <div class="mt-2">
+          <ds-admin-notify-metrics *ngIf="(notifyMetricsRows$ | async)?.length" [boxesConfig]="notifyMetricsRows$ | async"></ds-admin-notify-metrics>
+        </div>
       </div>
     </div>
   </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index ba88ce4e6d..3d4f35a54c 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -9,15 +9,11 @@ import { map } from 'rxjs/operators';
 import { SearchObjects } from '../../shared/search/models/search-objects.model';
 import { AdminNotifyMetricsBox, AdminNotifyMetricsRow } from './admin-notify-metrics/admin-notify-metrics.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { FILTER_CONFIG, SearchFilterService } from '../../core/shared/search/search-filter.service';
 import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
-import { AdminNotifySearchConfigurationService } from './config/admin-notify-search-configuration.service';
-import { AdminNotifySearchFilterService } from './config/admin-notify-filter-service';
-import { AdminNotifySearchFilterConfig } from './config/admin-notify-search-filter-config';
 import { ViewMode } from '../../core/shared/view-mode.model';
 import { Router } from '@angular/router';
+import { SearchConfigurationService } from "../../core/shared/search/search-configuration.service";
 
-export const FILTER_SEARCH: InjectionToken<SearchFilterService> = new InjectionToken<SearchFilterService>('searchFilterService');
 
 @Component({
   selector: 'ds-admin-notify-dashboard',
@@ -26,15 +22,7 @@ export const FILTER_SEARCH: InjectionToken<SearchFilterService> = new InjectionT
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: AdminNotifySearchConfigurationService
-    },
-    {
-      provide: FILTER_SEARCH,
-      useClass: AdminNotifySearchFilterService
-    },
-    {
-      provide: FILTER_CONFIG,
-      useClass: AdminNotifySearchFilterConfig
+      useClass: SearchConfigurationService
     }
   ]
 })
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
index 23200bb9fc..498c40a58d 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
@@ -8,11 +8,15 @@ import { AdminNotifyIncomingComponent } from './admin-notify-logs/admin-notify-i
 import { SharedModule } from '../../shared/shared.module';
 import { SearchModule } from '../../shared/search/search.module';
 import { SearchPageModule } from '../../search-page/search-page.module';
-import { AdminNotifySearchResultComponent } from './admin-notify-search-result/admin-notify-search-result.component';
+import { AdminNotifyIncomingSearchResultComponent } from './admin-notify-search-result/incoming/admin-notify-incoming-search-result.component';
 import {
   AdminNotifyOutgoingComponent
 } from './admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component';
 import { AdminNotifyDetailModalComponent } from './admin-notify-detail-modal/admin-notify-detail-modal.component';
+import {
+  AdminNotifyOutgoingSearchResultComponent
+} from "./admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component";
+import { AdminNotifyMessagesService } from "./services/admin-notify-messages.service";
 
 
 @NgModule({
@@ -24,12 +28,16 @@ import { AdminNotifyDetailModalComponent } from './admin-notify-detail-modal/adm
     SearchModule,
     SearchPageModule,
   ],
+  providers: [
+    AdminNotifyMessagesService
+  ],
   declarations: [
     AdminNotifyDashboardComponent,
     AdminNotifyMetricsComponent,
     AdminNotifyIncomingComponent,
     AdminNotifyOutgoingComponent,
-    AdminNotifySearchResultComponent,
+    AdminNotifyIncomingSearchResultComponent,
+    AdminNotifyOutgoingSearchResultComponent,
     AdminNotifyDetailModalComponent
   ]
 })
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html
index 868469ad55..3b7272186a 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html
@@ -1,9 +1,30 @@
-<ds-themed-search
-  [configuration]="'NOTIFY.incoming'"
-  [showViewModes]="false"
-  [searchEnabled]="false"
-  [context]="context"
-  [useUniquePageId]="true"
-  [routeConfigParam]="'configuration-incoming'"
-></ds-themed-search>
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h2 class="border-bottom pb-2">{{'admin-notify-dashboard.title'| translate}}</h2>
+      <div>
+        <div>
+          <ul class="nav nav-tabs">
+            <li class="nav-item">
+              <a class="nav-link" [routerLink]="'../'">{{'admin-notify-dashboard.metrics' | translate}}</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link active">{{'admin.notify.dashboard.inbound' | translate}}</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" [routerLink]="'../outbound'" [queryParams]="{view: 'table'}">{{'admin.notify.dashboard.outbound' | translate}}</a>
+          </ul>
 
+          <div class="col-12 text-left h4 my-4">{{'admin.notify.dashboard.inbound' | translate}}</div>
+          <ds-themed-search
+            [configuration]="'NOTIFY.incoming'"
+            [showViewModes]="false"
+            [searchEnabled]="false"
+            [context]="context"
+            [useUniquePageId]="true"
+          ></ds-themed-search>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
index 44ef519164..14d6c6a1eb 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
@@ -7,15 +7,13 @@ import { MockActivatedRoute } from "../../../../shared/mocks/active-router.mock"
 import { provideMockStore } from "@ngrx/store/testing";
 import { HALEndpointService } from "../../../../core/shared/hal-endpoint.service";
 import { SEARCH_CONFIG_SERVICE } from "../../../../my-dspace-page/my-dspace-page.component";
-import { AdminNotifySearchConfigurationService } from "../../config/admin-notify-search-configuration.service";
-import { FILTER_SEARCH } from "../../admin-notify-dashboard.component";
-import { AdminNotifySearchFilterService } from "../../config/admin-notify-filter-service";
-import { FILTER_CONFIG } from "../../../../core/shared/search/search-filter.service";
+import { FILTER_CONFIG, SearchFilterService } from "../../../../core/shared/search/search-filter.service";
 import { RouteService } from "../../../../core/services/route.service";
 import { routeServiceStub } from "../../../../shared/testing/route-service.stub";
 import { RequestService } from "../../../../core/data/request.service";
 import { RemoteDataBuildService } from "../../../../core/cache/builders/remote-data-build.service";
 import { getMockRemoteDataBuildService } from "../../../../shared/mocks/remote-data-build.service.mock";
+import { SearchConfigurationService } from "../../../../core/shared/search/search-configuration.service";
 
 describe('AdminNotifyIncomingComponent', () => {
   let component: AdminNotifyIncomingComponent;
@@ -39,9 +37,7 @@ describe('AdminNotifyIncomingComponent', () => {
       imports: [TranslateModule.forRoot()],
       declarations: [ AdminNotifyIncomingComponent ],
       providers: [
-        { provide: SEARCH_CONFIG_SERVICE, useValue: AdminNotifySearchConfigurationService },
-        { provide: FILTER_SEARCH, useValue: AdminNotifySearchFilterService },
-        { provide: FILTER_CONFIG, useValue: AdminNotifySearchConfigurationService },
+        { provide: SEARCH_CONFIG_SERVICE, useValue: SearchConfigurationService },
         { provide: RouteService, useValue: routeServiceStub },
         { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
         { provide: HALEndpointService, useValue: halService },
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
index b43866dc82..ffb5306643 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
@@ -1,11 +1,7 @@
 import { Component, Inject } from '@angular/core';
 import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
 import { Context } from '../../../../core/shared/context.model';
-import { AdminNotifySearchConfigurationService } from '../../config/admin-notify-search-configuration.service';
-import { FILTER_SEARCH } from '../../admin-notify-dashboard.component';
-import { AdminNotifySearchFilterService } from '../../config/admin-notify-filter-service';
-import { FILTER_CONFIG } from '../../../../core/shared/search/search-filter.service';
-import { AdminNotifySearchFilterConfig } from '../../config/admin-notify-search-filter-config';
+import { SearchConfigurationService } from "../../../../core/shared/search/search-configuration.service";
 
 
 @Component({
@@ -15,26 +11,12 @@ import { AdminNotifySearchFilterConfig } from '../../config/admin-notify-search-
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: AdminNotifySearchConfigurationService
-    },
-    {
-      provide: FILTER_SEARCH,
-      useClass: AdminNotifySearchFilterService
-    },
-    {
-      provide: FILTER_CONFIG,
-      useClass: AdminNotifySearchFilterConfig
+      useClass: SearchConfigurationService
     }
   ]
 })
 export class AdminNotifyIncomingComponent {
-  protected readonly context = Context.CoarNotify;
-  constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: AdminNotifySearchConfigurationService,
-              @Inject(FILTER_SEARCH) public searchFilterService: AdminNotifySearchFilterService,
-              @Inject(FILTER_CONFIG) public filterConfig: AdminNotifySearchFilterConfig) {
-    const incomingPrefix = 'incoming.f';
-    this.searchConfigService.setParamPrefix(incomingPrefix);
-    this.searchFilterService.setParamPrefix(incomingPrefix);
-    this.filterConfig.paramNamePrefix = incomingPrefix;
+  protected readonly context = Context.CoarNotifyIncoming;
+  constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
   }
 }
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html
index af64c69e7a..050e25c241 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html
@@ -1,9 +1,30 @@
-<ds-themed-search
-  [configuration]="'NOTIFY.outgoing'"
-  [showViewModes]="false"
-  [searchEnabled]="false"
-  [context]="context"
-  [routeConfigParam]="'configuration-outgoing'"
-  [useUniquePageId]="true"
-></ds-themed-search>
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h2 class="border-bottom pb-2">{{'admin-notify-dashboard.title'| translate}}</h2>
+      <div>
+        <div>
+          <ul class="nav nav-tabs">
+            <li class="nav-item">
+              <a class="nav-link" [routerLink]="'../'">{{'admin-notify-dashboard.metrics' | translate}}</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" [routerLink]="'../inbound'" [queryParams]="{view: 'table'}">{{'admin.notify.dashboard.inbound' | translate}}</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link active">{{'admin.notify.dashboard.outbound' | translate}}</a>
+          </ul>
 
+          <div class="col-12 text-left h4 my-4">{{'admin.notify.dashboard.outbound' | translate}}</div>
+          <ds-themed-search
+            [configuration]="'NOTIFY.outgoing'"
+            [showViewModes]="false"
+            [searchEnabled]="false"
+            [context]="context"
+            [useUniquePageId]="true"
+          ></ds-themed-search>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
index 0fd565fbf3..9d3ab2fe46 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
@@ -7,15 +7,13 @@ import { MockActivatedRoute } from "../../../../shared/mocks/active-router.mock"
 import { provideMockStore } from "@ngrx/store/testing";
 import { HALEndpointService } from "../../../../core/shared/hal-endpoint.service";
 import { SEARCH_CONFIG_SERVICE } from "../../../../my-dspace-page/my-dspace-page.component";
-import { AdminNotifySearchConfigurationService } from "../../config/admin-notify-search-configuration.service";
-import { FILTER_SEARCH } from "../../admin-notify-dashboard.component";
-import { AdminNotifySearchFilterService } from "../../config/admin-notify-filter-service";
 import { FILTER_CONFIG } from "../../../../core/shared/search/search-filter.service";
 import { RouteService } from "../../../../core/services/route.service";
 import { routeServiceStub } from "../../../../shared/testing/route-service.stub";
 import { RequestService } from "../../../../core/data/request.service";
 import { getMockRemoteDataBuildService } from "../../../../shared/mocks/remote-data-build.service.mock";
 import { RemoteDataBuildService } from "../../../../core/cache/builders/remote-data-build.service";
+import { SearchConfigurationService } from "../../../../core/shared/search/search-configuration.service";
 
 describe('AdminNotifyOutgoingComponent', () => {
   let component: AdminNotifyOutgoingComponent;
@@ -38,9 +36,7 @@ describe('AdminNotifyOutgoingComponent', () => {
       imports: [TranslateModule.forRoot()],
       declarations: [ AdminNotifyOutgoingComponent ],
       providers: [
-        { provide: SEARCH_CONFIG_SERVICE, useValue: AdminNotifySearchConfigurationService },
-        { provide: FILTER_SEARCH, useValue: AdminNotifySearchFilterService },
-        { provide: FILTER_CONFIG, useValue: AdminNotifySearchConfigurationService },
+        { provide: SEARCH_CONFIG_SERVICE, useValue: SearchConfigurationService },
         { provide: RouteService, useValue: routeServiceStub },
         { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
         { provide: HALEndpointService, useValue: halService },
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
index ae8cd0f13b..ac7a5cfafa 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
@@ -1,11 +1,7 @@
 import { Component, Inject } from '@angular/core';
 import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
 import { Context } from '../../../../core/shared/context.model';
-import { AdminNotifySearchConfigurationService } from '../../config/admin-notify-search-configuration.service';
-import { FILTER_SEARCH } from '../../admin-notify-dashboard.component';
-import { AdminNotifySearchFilterService } from '../../config/admin-notify-filter-service';
-import { FILTER_CONFIG } from '../../../../core/shared/search/search-filter.service';
-import { AdminNotifySearchFilterConfig } from '../../config/admin-notify-search-filter-config';
+import { SearchConfigurationService } from "../../../../core/shared/search/search-configuration.service";
 
 
 @Component({
@@ -15,27 +11,13 @@ import { AdminNotifySearchFilterConfig } from '../../config/admin-notify-search-
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: AdminNotifySearchConfigurationService
-    },
-    {
-      provide: FILTER_SEARCH,
-      useClass: AdminNotifySearchFilterService
-    },
-    {
-      provide: FILTER_CONFIG,
-      useClass: AdminNotifySearchFilterConfig
+      useClass: SearchConfigurationService
     }
   ]
 })
 export class AdminNotifyOutgoingComponent {
-  protected readonly context = Context.CoarNotify;
+  protected readonly context = Context.CoarNotifyOutgoing;
 
-  constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: AdminNotifySearchConfigurationService,
-              @Inject(FILTER_SEARCH) public searchFilterService: AdminNotifySearchFilterService,
-              @Inject(FILTER_CONFIG) public filterConfig: AdminNotifySearchFilterConfig) {
-    const outgoingPrefix = 'outgoing.f';
-    this.searchConfigService.setParamPrefix(outgoingPrefix);
-    this.searchFilterService.setParamPrefix(outgoingPrefix);
-    this.filterConfig.paramNamePrefix = outgoingPrefix;
+  constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
   }
 }
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
deleted file mode 100644
index b17a03274f..0000000000
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AdminNotifySearchResultComponent } from './admin-notify-search-result.component';
-
-describe('AdminNotifySearchResultComponent', () => {
-  let component: AdminNotifySearchResultComponent;
-  let fixture: ComponentFixture<AdminNotifySearchResultComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ AdminNotifySearchResultComponent ]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(AdminNotifySearchResultComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
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
deleted file mode 100644
index 23d15002a8..0000000000
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { AdminNotifySearchResult } from '../models/admin-notify-message-search-result.model';
-import { ViewMode } from '../../../core/shared/view-mode.model';
-import { Context } from '../../../core/shared/context.model';
-import { AdminNotifyMessage, QueueStatusMap } from '../models/admin-notify-message.model';
-import {
-  tabulatableObjectsComponent
-} from '../../../shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator';
-import {
-  TabulatableResultListElementsComponent
-} from '../../../shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
-
-@tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotify)
-@Component({
-  selector: 'ds-admin-notify-search-result',
-  templateUrl: './admin-notify-search-result.component.html',
-  styleUrls: ['./admin-notify-search-result.component.scss']
-})
-export class AdminNotifySearchResultComponent  extends TabulatableResultListElementsComponent<PaginatedList<AdminNotifySearchResult>, AdminNotifySearchResult> implements OnInit{
-    public notifyMessages: AdminNotifyMessage[];
-    public reprocessStatus = QueueStatusMap.QUEUE_STATUS_QUEUED_FOR_RETRY;
-
-    constructor(private modalService: NgbModal) {
-      super();
-    }
-
-  /**
-   * Map messages on init for readable representation
-   */
-  ngOnInit() {
-    this.notifyMessages = this.objects?.page.map(object => {
-      const indexableObject = object.indexableObject;
-      indexableObject.coarNotifyType = indexableObject.coarNotifyType.split(':')[1];
-      indexableObject.queueStatusLabel = QueueStatusMap[indexableObject.queueStatusLabel];
-      return indexableObject;
-    });
-  }
-
-    /**
-   * Open modal for details visualization
-   * @param message the message to be displayed
-   */
-  openDetailModal(message: AdminNotifyMessage) {
-    const modalRef = this.modalService.open(AdminNotifyDetailModalComponent);
-    const messageKeys = Object.keys(message);
-    const keysToRead = [];
-    messageKeys.forEach((key) => {
-      if (typeof message[key] !== 'object') {
-        keysToRead.push(key);
-      }
-    });
-    modalRef.componentInstance.notifyMessage = message;
-    modalRef.componentInstance.notifyMessageKeys = keysToRead;
-  }
-}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.html
new file mode 100644
index 0000000000..06aa551a44
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.html
@@ -0,0 +1,40 @@
+
+<div class="table-responsive mt-2">
+    <table class="table table-striped table-hover">
+      <thead>
+        <tr>
+          <th scope="col">Timestamp</th>
+          <th scope="col">LDN Service</th>
+          <th scope="col">Repository Item</th>
+          <th scope="col">Type</th>
+          <th scope="col">Status</th>
+          <th scope="col">Action</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let message of (notifyMessages$ | async)">
+          <td>
+            <div>{{message.queueTimeout}}</div>
+          </td>
+          <td>
+            <div>{{message.origin}}</div>
+          </td>
+          <td>
+            <div>{{message.context}}</div>
+          </td>
+          <td>
+            <div>{{message.coarNotifyType}}</div>
+          </td>
+          <td>
+            <div>{{message.queueStatusLabel}}</div>
+          </td>
+          <td>
+            <div class="d-flex flex-column">
+              <button class="btn mb-2 btn-dark" (click)="openDetailModal(message)">Detail</button>
+              <button *ngIf="message.queueStatusLabel === reprocessStatus" (click)="reprocessMessage(message)" class="btn btn-warning">Reprocess</button>
+            </div>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.scss b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.scss
similarity index 100%
rename from src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.scss
rename to src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.scss
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.spec.ts
new file mode 100644
index 0000000000..2db8920d7f
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { AdminNotifyIncomingSearchResultComponent } from './admin-notify-incoming-search-result.component';
+
+describe('AdminNotifySearchResultComponent', () => {
+  let component: AdminNotifyIncomingSearchResultComponent;
+  let fixture: ComponentFixture<AdminNotifyIncomingSearchResultComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ AdminNotifyIncomingSearchResultComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifyIncomingSearchResultComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.ts
new file mode 100644
index 0000000000..11e94c05c5
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.ts
@@ -0,0 +1,97 @@
+import { Component, OnInit } from '@angular/core';
+import { AdminNotifySearchResult } from '../../models/admin-notify-message-search-result.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { Context } from '../../../../core/shared/context.model';
+import { AdminNotifyMessage, QueueStatusMap } from '../../models/admin-notify-message.model';
+import {
+  tabulatableObjectsComponent
+} from '../../../../shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator';
+import {
+  TabulatableResultListElementsComponent
+} from '../../../../shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { AdminNotifyDetailModalComponent } from '../../admin-notify-detail-modal/admin-notify-detail-modal.component';
+import { LdnServicesService } from "../../../admin-ldn-services/ldn-services-data/ldn-services-data.service";
+import { BehaviorSubject, concatMap, from, Observable, of, scan, switchMap } from "rxjs";
+import { RemoteData } from "../../../../core/data/remote-data";
+import { LdnService } from "../../../admin-ldn-services/ldn-services-model/ldn-services.model";
+import { filter, map, mergeMap, take, tap, toArray } from "rxjs/operators";
+import { getAllSucceededRemoteDataPayload } from "../../../../core/shared/operators";
+import { ItemDataService } from "../../../../core/data/item-data.service";
+import { AdminNotifyMessagesService } from "../../services/admin-notify-messages.service";
+
+@tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotifyIncoming)
+@Component({
+  selector: 'ds-admin-notify-search-result',
+  templateUrl: './admin-notify-incoming-search-result.component.html',
+  styleUrls: ['./admin-notify-incoming-search-result.component.scss']
+})
+export class AdminNotifyIncomingSearchResultComponent extends TabulatableResultListElementsComponent<PaginatedList<AdminNotifySearchResult>, AdminNotifySearchResult> implements OnInit{
+  public notifyMessages: AdminNotifyMessage[];
+  public notifyMessages$: Observable<AdminNotifyMessage[]>;
+  public reprocessStatus = QueueStatusMap.QUEUE_STATUS_QUEUED_FOR_RETRY;
+
+
+
+  constructor(private modalService: NgbModal,
+              private ldnServicesService: LdnServicesService,
+              private itemDataService: ItemDataService,
+              private adminNotifyMessagesService: AdminNotifyMessagesService) {
+      super();
+    }
+
+  /**
+   * Map messages on init for readable representation
+   */
+  ngOnInit() {
+    this.notifyMessages = this.objects?.page.map(object => {
+      const indexableObject = object.indexableObject;
+      indexableObject.coarNotifyType = indexableObject.coarNotifyType.split(':')[1];
+      indexableObject.queueStatusLabel = QueueStatusMap[indexableObject.queueStatusLabel];
+      return indexableObject;
+    });
+
+    this.notifyMessages$ = from(this.notifyMessages).pipe(
+      mergeMap(message => of(message)),
+      mergeMap(message =>
+        message.origin ? this.ldnServicesService.findById(message.origin.toString()).pipe(
+          getAllSucceededRemoteDataPayload(),
+          map(detail => ({...message, origin: detail.name}))
+        ) : of(message),
+      ),
+      mergeMap(message =>
+        message.context ? this.itemDataService.findById(message.context.toString()).pipe(
+          getAllSucceededRemoteDataPayload(),
+          map(detail => ({...message, context: detail.name}))
+        ) : of(message),
+      ),
+      scan((acc: any, value: any) => [...acc, value], []),
+    )
+  }
+
+    /**
+   * Open modal for details visualization
+   * @param message the message to be displayed
+   */
+  openDetailModal(message: AdminNotifyMessage) {
+    const modalRef = this.modalService.open(AdminNotifyDetailModalComponent);
+    const messageKeys = Object.keys(message);
+    const keysToRead = [];
+    messageKeys.forEach((key) => {
+      if (typeof message[key] !== 'object') {
+        keysToRead.push(key);
+      }
+    });
+    modalRef.componentInstance.notifyMessage = message;
+    modalRef.componentInstance.notifyMessageKeys = keysToRead;
+  }
+
+  /**
+   * Reprocess message in status QUEUE_STATUS_QUEUED_FOR_RETRY and update results
+   * @param message
+   */
+  reprocessMessage(message: AdminNotifyMessage) {
+   // TODO implement reprocess
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.html
similarity index 73%
rename from src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
rename to src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.html
index a1ba0670bc..639d66a1f3 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.html
@@ -3,20 +3,20 @@
       <thead>
         <tr>
           <th scope="col">Timestamp</th>
-          <th scope="col">Origin</th>
-          <th scope="col">Target</th>
+          <th scope="col">Repository Item</th>
+          <th scope="col">LDN Service</th>
           <th scope="col">Type</th>
           <th scope="col">Status</th>
           <th scope="col">Action</th>
         </tr>
       </thead>
       <tbody>
-        <tr *ngFor="let message of notifyMessages">
+        <tr *ngFor="let message of (notifyMessages$ | async)">
           <td>
-            <div class="text-nowrap">{{message.queueTimeout}}</div>
+            <div>{{message.queueTimeout}}</div>
           </td>
           <td>
-            <div>{{message.origin}}</div>
+            <div>{{message.object}}</div>
           </td>
           <td>
             <div>{{message.target}}</div>
@@ -30,7 +30,7 @@
           <td>
             <div class="d-flex flex-column">
               <button class="btn mb-2 btn-dark" (click)="openDetailModal(message)">Detail</button>
-              <button *ngIf="message.queueStatusLabel === reprocessStatus" class="btn btn-warning">Reprocess</button>
+              <button *ngIf="message.queueStatusLabel === reprocessStatus" (click)="reprocessMessage(message)" class="btn btn-warning">Reprocess</button>
             </div>
           </td>
         </tr>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.scss b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.spec.ts
new file mode 100644
index 0000000000..110feb2e0c
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { AdminNotifyOutgoingSearchResultComponent } from './admin-notify-outgoing-search-result.component';
+
+describe('AdminNotifySearchResultComponent', () => {
+  let component: AdminNotifyOutgoingSearchResultComponent;
+  let fixture: ComponentFixture<AdminNotifyOutgoingSearchResultComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ AdminNotifyOutgoingSearchResultComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifyOutgoingSearchResultComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.ts
new file mode 100644
index 0000000000..b5b49a8a71
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.ts
@@ -0,0 +1,98 @@
+import { Component, OnInit } from '@angular/core';
+import { AdminNotifySearchResult } from '../../models/admin-notify-message-search-result.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { Context } from '../../../../core/shared/context.model';
+import { AdminNotifyMessage, QueueStatusMap } from '../../models/admin-notify-message.model';
+import {
+  tabulatableObjectsComponent
+} from '../../../../shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator';
+import {
+  TabulatableResultListElementsComponent
+} from '../../../../shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { AdminNotifyDetailModalComponent } from '../../admin-notify-detail-modal/admin-notify-detail-modal.component';
+import { LdnServicesService } from "../../../admin-ldn-services/ldn-services-data/ldn-services-data.service";
+import { from, Observable, of, scan, switchMap } from "rxjs";
+import { combineLatest, filter, map, mergeMap } from "rxjs/operators";
+import { getAllSucceededRemoteDataPayload } from "../../../../core/shared/operators";
+import { ItemDataService } from "../../../../core/data/item-data.service";
+import { AdminNotifyMessagesService } from "../../services/admin-notify-messages.service";
+
+@tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotifyOutgoing)
+@Component({
+  selector: 'ds-admin-notify-search-result',
+  templateUrl: './admin-notify-outgoing-search-result.component.html',
+  styleUrls: ['./admin-notify-outgoing-search-result.component.scss']
+})
+export class AdminNotifyOutgoingSearchResultComponent extends TabulatableResultListElementsComponent<PaginatedList<AdminNotifySearchResult>, AdminNotifySearchResult> implements OnInit{
+  public notifyMessages: AdminNotifyMessage[];
+  public notifyMessages$: Observable<AdminNotifyMessage[]>;
+  public reprocessStatus = QueueStatusMap.QUEUE_STATUS_QUEUED_FOR_RETRY;
+
+    constructor(private modalService: NgbModal,
+                private ldnServicesService: LdnServicesService,
+                private itemDataService: ItemDataService,
+                private adminNotifyMessagesService: AdminNotifyMessagesService) {
+      super();
+    }
+
+  /**
+   * Map messages on init for readable representation
+   */
+  ngOnInit() {
+    this.mapDetailsToMessages()
+  }
+
+    /**
+   * Open modal for details visualization
+   * @param message the message to be displayed
+   */
+  openDetailModal(message: AdminNotifyMessage) {
+    const modalRef = this.modalService.open(AdminNotifyDetailModalComponent);
+    const messageKeys = Object.keys(message);
+    modalRef.componentInstance.notifyMessage = message;
+    modalRef.componentInstance.notifyMessageKeys = messageKeys;
+  }
+
+  /**
+   * Reprocess message in status QUEUE_STATUS_QUEUED_FOR_RETRY and update results
+   * @param message
+   */
+  reprocessMessage(message: AdminNotifyMessage) {
+    this.adminNotifyMessagesService.findById(message.id).pipe(getAllSucceededRemoteDataPayload()).subscribe(response => {
+      console.log(response);
+    })
+  }
+
+
+  /**
+   * Map readable results to messages
+   * @private
+   */
+  private mapDetailsToMessages() {
+    this.notifyMessages = this.objects?.page.map(object => {
+      const indexableObject = object.indexableObject;
+      indexableObject.coarNotifyType = indexableObject.coarNotifyType.split(':')[1];
+      indexableObject.queueStatusLabel = QueueStatusMap[indexableObject.queueStatusLabel];
+      return indexableObject;
+    });
+
+    this.notifyMessages$ = from(this.notifyMessages).pipe(
+      mergeMap(message => of(message)),
+      mergeMap(message =>
+        message.target ? this.ldnServicesService.findById(message.target.toString()).pipe(
+          getAllSucceededRemoteDataPayload(),
+          map(detail => ({...message, target: detail.name}))
+        ) : of(message),
+      ),
+      mergeMap(message =>
+        message.object ? this.itemDataService.findById(message.object.toString()).pipe(
+          getAllSucceededRemoteDataPayload(),
+          map(detail => ({...message, object: detail.name}))
+        ) : of(message),
+      ),
+      scan((acc: any, value: any) => [...acc, value], []),
+    )
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-config-response.model.ts b/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-config-response.model.ts
deleted file mode 100644
index d9f9460a65..0000000000
--- a/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-config-response.model.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { typedObject } from '../../../core/cache/builders/build-decorators';
-import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
-import { deserialize } from 'cerialize';
-import { HALLink } from '../../../core/shared/hal-link.model';
-import { CacheableObject } from '../../../core/cache/cacheable-object.model';
-import { AdminNotifySearchFilterConfig } from './admin-notify-search-filter-config';
-import { FACET_CONFIG_RESPONSE } from '../../../shared/search/models/types/facet-config-response.resouce-type';
-
-/**
- * The response from the discover/facets endpoint
- */
-@typedObject
-export class AdminNotifyFacetConfigResponse implements CacheableObject {
-  static type = FACET_CONFIG_RESPONSE;
-
-  /**
-   * The object type,
-   * hardcoded because rest doesn't a unique one.
-   */
-  @excludeFromEquals
-  type = FACET_CONFIG_RESPONSE;
-
-  /**
-   * the filters in this response
-   */
-  filters: AdminNotifySearchFilterConfig[];
-
-  /**
-   * The {@link HALLink}s for this SearchFilterConfig
-   */
-  @deserialize
-  _links: {
-    self: HALLink;
-  };
-}
diff --git a/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-response-parsing.service.ts b/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-response-parsing.service.ts
deleted file mode 100644
index 16c986fef6..0000000000
--- a/src/app/admin/admin-notify-dashboard/config/admin-notify-facet-response-parsing.service.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Injectable } from '@angular/core';
-import { FacetConfigResponseParsingService } from '../../../core/data/facet-config-response-parsing.service';
-import { RestRequest } from '../../../core/data/rest-request.model';
-import { RawRestResponse } from '../../../core/dspace-rest/raw-rest-response.model';
-import { ParsedResponse } from '../../../core/cache/response.models';
-import { DSpaceSerializer } from '../../../core/dspace-rest/dspace.serializer';
-import { AdminNotifySearchFilterConfig } from './admin-notify-search-filter-config';
-import { FacetConfigResponse } from '../../../shared/search/models/facet-config-response.model';
-
-@Injectable()
-export class AdminNotifyFacetResponseParsingService extends FacetConfigResponseParsingService {
-  parse(request: RestRequest, data: RawRestResponse): ParsedResponse {
-
-    const config = data.payload._embedded.facets;
-    const serializer = new DSpaceSerializer(AdminNotifySearchFilterConfig);
-    const filters = serializer.deserializeArray(config);
-
-    const _links = {
-      self: data.payload._links.self
-    };
-
-    // fill in the missing links section
-    filters.forEach((filterConfig: AdminNotifySearchFilterConfig) => {
-      _links[filterConfig.name] = {
-        href: filterConfig._links.self.href
-      };
-    });
-
-    const facetConfigResponse = Object.assign(new FacetConfigResponse(), {
-      filters,
-      _links
-    });
-
-    this.addToObjectCache(facetConfigResponse, request, data);
-
-    return new ParsedResponse(data.statusCode, facetConfigResponse._links.self);
-  }
-}
diff --git a/src/app/admin/admin-notify-dashboard/config/admin-notify-filter-service.ts b/src/app/admin/admin-notify-dashboard/config/admin-notify-filter-service.ts
deleted file mode 100644
index ca421957b8..0000000000
--- a/src/app/admin/admin-notify-dashboard/config/admin-notify-filter-service.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Injectable } from '@angular/core';
-import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
-import { Store } from '@ngrx/store';
-import { SearchFiltersState } from '../../../shared/search/search-filters/search-filter/search-filter.reducer';
-import { RouteService } from '../../../core/services/route.service';
-
-
-/**
- * Service that performs all actions that have to do with search filters and facets
- */
-@Injectable()
-export class AdminNotifySearchFilterService extends SearchFilterService {
-
-  public filterPrefix: string;
-  constructor(protected store: Store<SearchFiltersState>,
-              protected routeService: RouteService) {
-    super(store, routeService);
-  }
-
-  /**
-   * Fetch the current active filters from the query parameters
-   * @returns {Observable<Params>}
-   */
-  getCurrentFilters() {
-    return this.routeService.getQueryParamsWithPrefix(`${this.filterPrefix}.`);
-  }
-
-  /**
-   * Set prefix to be used for route filters
-   * @param prefix
-   */
-  setParamPrefix(prefix: string): void {
-    this.filterPrefix = prefix;
-  }
-}
diff --git a/src/app/admin/admin-notify-dashboard/config/admin-notify-search-configuration.service.ts b/src/app/admin/admin-notify-dashboard/config/admin-notify-search-configuration.service.ts
deleted file mode 100644
index 127aa2a5a1..0000000000
--- a/src/app/admin/admin-notify-dashboard/config/admin-notify-search-configuration.service.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRoute, Params } from '@angular/router';
-import { Observable } from 'rxjs';
-import { map, take } from 'rxjs/operators';
-import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
-import { RouteService } from '../../../core/services/route.service';
-import { LinkService } from '../../../core/cache/builders/link.service';
-import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
-import { RequestService } from '../../../core/data/request.service';
-import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
-import { PaginationService } from '../../../core/pagination/pagination.service';
-import { RemoteData } from '../../../core/data/remote-data';
-import { GetRequest } from '../../../core/data/request.models';
-import { GenericConstructor } from '../../../core/shared/generic-constructor';
-import { ResponseParsingService } from '../../../core/data/parsing.service';
-import { hasNoValue, isNotEmpty } from '../../../shared/empty.util';
-import { AdminNotifyFacetResponseParsingService } from './admin-notify-facet-response-parsing.service';
-import { AdminNotifySearchFilterConfig } from './admin-notify-search-filter-config';
-import { AdminNotifyFacetConfigResponse } from './admin-notify-facet-config-response.model';
-import { SearchFilter } from '../../../shared/search/models/search-filter.model';
-
-
-
-/**
- * Service that performs all actions that have to do with the current admin notify configuration
- */
-@Injectable()
-export class AdminNotifySearchConfigurationService extends SearchConfigurationService {
-
-  public paramPrefix: string;
-  /**
-   * Initialize class
-   *
-   * @param {RouteService} routeService
-   * @param {PaginationService} paginationService
-   * @param {ActivatedRoute} route
-   * @param linkService
-   * @param halService
-   * @param requestService
-   * @param rdb
-   */
-  constructor(protected routeService: RouteService,
-              protected paginationService: PaginationService,
-              protected route: ActivatedRoute,
-              protected linkService: LinkService,
-              protected halService: HALEndpointService,
-              protected requestService: RequestService,
-              protected rdb: RemoteDataBuildService) {
-    super(routeService, paginationService, route, linkService, halService, requestService, rdb);
-  }
-
-  /**
-   * @returns {Observable<Params>} Emits the current active filters with their values as they are displayed in the frontend URL
-   */
-  getCurrentFrontendFilters(): Observable<Params> {
-    return this.routeService.getQueryParamsWithPrefix(`${this.paramPrefix}.`);
-  }
-
-  /**
-   * Set prefix to be used for route filters
-   * @param prefix
-   */
-  setParamPrefix(prefix: string): void {
-    this.paramPrefix = prefix;
-  }
-
-  /**
-   * Request the filter configuration for a given scope or the whole repository
-   * @param {string} scope UUID of the object for which config the filter config is requested, when no scope is provided the configuration for the whole repository is loaded
-   * @param {string} configurationName the name of the configuration
-   * @returns {Observable<RemoteData<SearchFilterConfig[]>>} The found filter configuration
-   */
-  getConfig(scope?: string, configurationName?: string): Observable<RemoteData<AdminNotifySearchFilterConfig[]>> {
-    const href$ = this.halService.getEndpoint(this.facetLinkPathPrefix).pipe(
-      map((url: string) => this.getConfigUrl(url, scope, configurationName)),
-    );
-
-    href$.pipe(take(1)).subscribe((url: string) => {
-      let request = new GetRequest(this.requestService.generateRequestId(), url);
-      request = Object.assign(request, {
-        getResponseParser(): GenericConstructor<ResponseParsingService> {
-          return AdminNotifyFacetResponseParsingService;
-        }
-      });
-      this.requestService.send(request, true);
-    });
-
-    return this.rdb.buildFromHref(href$).pipe(
-      map((rd: RemoteData<AdminNotifyFacetConfigResponse>) => {
-        if (rd.hasSucceeded) {
-          let filters: AdminNotifySearchFilterConfig[];
-          if (isNotEmpty(rd.payload.filters)) {
-            filters = rd.payload.filters
-              .map((filter: any) => Object.assign(new AdminNotifySearchFilterConfig(), filter));
-            filters.forEach(filter => filter.namePrefix = this.paramPrefix);
-          } else {
-            filters = [];
-          }
-
-          return new RemoteData(
-            rd.timeCompleted,
-            rd.msToLive,
-            rd.lastUpdated,
-            rd.state,
-            rd.errorMessage,
-            filters,
-            rd.statusCode,
-          );
-        } else {
-          return rd as any as RemoteData<AdminNotifySearchFilterConfig[]>;
-        }
-      })
-    );
-  }
-
-  /**
-   * @returns {Observable<Params>} Emits the current active filters with their values as they are sent to the backend
-   */
-  getCurrentFilters(): Observable<SearchFilter[]> {
-    return this.getCurrentFrontendFilters().pipe(map((filterParams) => {
-      if (isNotEmpty(filterParams)) {
-        const filters = [];
-        Object.keys(filterParams).forEach((key) => {
-          // we add one to keep in account the point at the end of the prefix and set back the prefix f.
-          const updatedKey = `f.${key.substring(this.paramPrefix.length + 1, key.length)}`;
-
-          delete Object.assign(filterParams, {[updatedKey]: filterParams[key] })[key];
-          key = updatedKey;
-          if (key.endsWith('.min') || key.endsWith('.max')) {
-            const realKey = key.slice(0, -4);
-            if (hasNoValue(filters.find((f) => f.key === realKey))) {
-              const min = filterParams[realKey + '.min'] ? filterParams[realKey + '.min'][0] : '*';
-              const max = filterParams[realKey + '.max'] ? filterParams[realKey + '.max'][0] : '*';
-              filters.push(new SearchFilter(realKey, ['[' + min + ' TO ' + max + ']'], 'equals'));
-            }
-          } else {
-            filters.push(new SearchFilter(key, filterParams[key]));
-          }
-        });
-        return filters;
-      }
-      return [];
-    }));
-  }
-}
diff --git a/src/app/admin/admin-notify-dashboard/config/admin-notify-search-filter-config.ts b/src/app/admin/admin-notify-dashboard/config/admin-notify-search-filter-config.ts
deleted file mode 100644
index 2372313c0d..0000000000
--- a/src/app/admin/admin-notify-dashboard/config/admin-notify-search-filter-config.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { typedObject } from '../../../core/cache/builders/build-decorators';
-import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
-import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
-import { HALLink } from '../../../core/shared/hal-link.model';
-import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
-import { SEARCH_FILTER_CONFIG } from '../../../shared/search/models/types/search-filter-config.resource-type';
-import { FilterType } from '../../../shared/search/models/filter-type.model';
-
-/**
- * The configuration for a search filter
- */
-@typedObject
-export class AdminNotifySearchFilterConfig implements SearchFilterConfig {
-  static type = SEARCH_FILTER_CONFIG;
-
-  /**
-   * The prefix of this filter
-   */
-  @autoserialize
-  namePrefix: string;
-
-  /**
-   * The object type,
-   * hardcoded because rest doesn't set one.
-   */
-  @excludeFromEquals
-  type = SEARCH_FILTER_CONFIG;
-
-  /**
-   * The name of this filter
-   */
-  @autoserialize
-  name: string;
-
-  /**
-   * The FilterType of this filter
-   */
-  @autoserializeAs(String, 'facetType')
-  filterType: FilterType;
-
-  /**
-   * True if the filter has facets
-   */
-  @autoserialize
-  hasFacets: boolean;
-
-  /**
-   * @type {number} The page size used for this facet
-   */
-  @autoserializeAs(String, 'facetLimit')
-  pageSize = 5;
-
-  /**
-   * Defines if the item facet is collapsed by default or not on the search page
-   */
-  @autoserialize
-  isOpenByDefault: boolean;
-
-  /**
-   * Minimum value possible for this facet in the repository
-   */
-  @autoserialize
-  maxValue: string;
-
-  /**
-   * Maximum value possible for this facet in the repository
-   */
-  @autoserialize
-  minValue: string;
-
-  /**
-   * The {@link HALLink}s for this SearchFilterConfig
-   */
-  @deserialize
-  _links: {
-    self: HALLink;
-  };
-
-  /**
-   * Set prefix to be used for route filters
-   * @param namePrefix
-   */
-  set paramNamePrefix(namePrefix: string) {
-    this.namePrefix = namePrefix;
-  }
-
-  /**
-   * Name of this configuration that can be used in a url
-   * @returns Parameter name
-   */
-  get paramName(): string {
-    return `${this.namePrefix}.${this.name}`;
-  }
-}
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
index 6114ab6084..1fda25d1ef 100644
--- a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
@@ -29,6 +29,12 @@ export class AdminNotifyMessage extends DSpaceObject {
   @excludeFromEquals
   type = ADMIN_NOTIFY_MESSAGE;
 
+  /**
+   * The id of the message
+   */
+  @autoserialize
+  id: string;
+
   /**
    * The type of the notification
    */
@@ -47,6 +53,18 @@ export class AdminNotifyMessage extends DSpaceObject {
   @autoserialize
   inReplyTo: string;
 
+  /**
+   * The object the message relates to
+   */
+  @autoserialize
+  object: string;
+
+  /**
+   * The context of the message
+   */
+  @autoserialize
+  context: string;
+
   /**
    * The attempts of the queue
    */
@@ -63,13 +81,13 @@ export class AdminNotifyMessage extends DSpaceObject {
    * The type of the activity stream
    */
   @autoserialize
-  origin: number;
+  origin: number | string;
 
   /**
    * The type of the activity stream
    */
   @autoserialize
-  target: number;
+  target: number | string;
 
   /**
    * The label for the status of the queue
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
new file mode 100644
index 0000000000..8f710d987d
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts
@@ -0,0 +1,45 @@
+import {Injectable} from '@angular/core';
+import {dataService} from '../../../core/data/base/data-service.decorator';
+import {IdentifiableDataService} from '../../../core/data/base/identifiable-data.service';
+import {FindAllData, FindAllDataImpl} from '../../../core/data/base/find-all-data';
+import {DeleteData, DeleteDataImpl} from '../../../core/data/base/delete-data';
+import {RequestService} from '../../../core/data/request.service';
+import {RemoteDataBuildService} from '../../../core/cache/builders/remote-data-build.service';
+import {ObjectCacheService} from '../../../core/cache/object-cache.service';
+import {HALEndpointService} from '../../../core/shared/hal-endpoint.service';
+import {NotificationsService} from '../../../shared/notifications/notifications.service';
+import {FindListOptions} from '../../../core/data/find-list-options.model';
+import {FollowLinkConfig} from '../../../shared/utils/follow-link-config.model';
+import {Observable} from 'rxjs';
+import {RemoteData} from '../../../core/data/remote-data';
+import {PaginatedList} from '../../../core/data/paginated-list.model';
+import {NoContent} from '../../../core/shared/NoContent.model';
+import {PatchData, PatchDataImpl} from '../../../core/data/base/patch-data';
+import {ChangeAnalyzer} from '../../../core/data/change-analyzer';
+import {Operation} from 'fast-json-patch';
+import {RestRequestMethod} from '../../../core/data/rest-request-method';
+import {CreateData, CreateDataImpl} from '../../../core/data/base/create-data';
+import {SearchDataImpl} from '../../../core/data/base/search-data';
+import { ADMIN_NOTIFY_MESSAGE } from "../models/admin-notify-message.resource-type";
+import { AdminNotifyMessage } from "../models/admin-notify-message.model";
+
+/**
+ * Injectable service responsible for fetching/sending data from/to the REST API on the messages endpoint.
+ *
+ * @export
+ * @class AdminNotifyMessagesService
+ * @extends {IdentifiableDataService<AdminNotifyMessage>}
+ */
+@Injectable()
+@dataService(ADMIN_NOTIFY_MESSAGE)
+export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNotifyMessage> {
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('messages', requestService, rdbService, objectCache, halService);
+  }
+}
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index abfd303799..26e32d34e7 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -198,11 +198,6 @@ import { SubmissionCoarNotifyConfig } from '../submission/sections/section-coar-
 import { NotifyRequestsStatus } from '../item-page/simple/notify-requests-status/notify-requests-status.model';
 import { NotifyRequestsStatusDataService } from './data/notify-services-status-data.service';
 import { AdminNotifyMessage } from '../admin/admin-notify-dashboard/models/admin-notify-message.model';
-import {
-  AdminNotifyFacetResponseParsingService
-} from '../admin/admin-notify-dashboard/config/admin-notify-facet-response-parsing.service';
-import { FILTER_SEARCH } from '../admin/admin-notify-dashboard/admin-notify-dashboard.component';
-import { AdminNotifySearchFilterService } from '../admin/admin-notify-dashboard/config/admin-notify-filter-service';
 
 
 /**
@@ -235,10 +230,6 @@ const PROVIDERS = [
   DSOResponseParsingService,
   { provide: MOCK_RESPONSE_MAP, useValue: mockResponseMap },
   { provide: DspaceRestService, useFactory: restServiceFactory, deps: [MOCK_RESPONSE_MAP, HttpClient] },
-  {
-    provide: FILTER_SEARCH,
-    useClass: SearchFilterService
-  },
   EPersonDataService,
   LinkHeadService,
   HALEndpointService,
@@ -254,7 +245,6 @@ const PROVIDERS = [
   EndpointMapResponseParsingService,
   FacetValueResponseParsingService,
   FacetConfigResponseParsingService,
-  AdminNotifyFacetResponseParsingService,
   DebugResponseParsingService,
   SearchResponseParsingService,
   MyDSpaceResponseParsingService,
@@ -294,7 +284,6 @@ const PROVIDERS = [
   SearchService,
   SidebarService,
   SearchFilterService,
-  AdminNotifySearchFilterService,
   SearchConfigurationService,
   SelectableListService,
   RelationshipTypeDataService,
diff --git a/src/app/core/shared/context.model.ts b/src/app/core/shared/context.model.ts
index deb7bbeca3..1526be1033 100644
--- a/src/app/core/shared/context.model.ts
+++ b/src/app/core/shared/context.model.ts
@@ -40,5 +40,6 @@ export enum Context {
 
   Bitstream = 'bitstream',
 
-  CoarNotify = 'coarNotify'
+  CoarNotifyIncoming = 'coarNotifyIncoming',
+  CoarNotifyOutgoing = 'coarNotifyOutgoing',
 }
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
index 8c27774f99..53acb1d911 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
@@ -19,7 +19,6 @@ import { PaginationComponentOptions } from '../../../../../pagination/pagination
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
 import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
-import { FILTER_SEARCH } from "../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 describe('SearchFacetOptionComponent', () => {
   let comp: SearchFacetOptionComponent;
@@ -103,7 +102,7 @@ describe('SearchFacetOptionComponent', () => {
           }
         },
         {
-          provide: FILTER_SEARCH, useValue: {
+          provide: SearchFilterService, useValue: {
             getSelectedValuesForFilter: () => selectedValues,
             isFilterActiveWithValue: (paramName: string, filterValue: string) => observableOf(true),
             getPage: (paramName: string) => page,
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
index fcf8b334e9..b14d3187d7 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
@@ -11,7 +11,6 @@ import { hasValue } from '../../../../../empty.util';
 import { currentPath } from '../../../../../utils/route.utils';
 import { getFacetValueForType } from '../../../../search.utils';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { FILTER_SEARCH } from '../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component';
 
 @Component({
   selector: 'ds-search-facet-option',
@@ -65,7 +64,7 @@ export class SearchFacetOptionComponent implements OnInit, OnDestroy {
   paginationId: string;
 
   constructor(protected searchService: SearchService,
-              @Inject(FILTER_SEARCH) protected filterService: SearchFilterService,
+              protected filterService: SearchFilterService,
               protected searchConfigService: SearchConfigurationService,
               protected router: Router,
               protected paginationService: PaginationService
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
index 0f9655c1d5..b0acf43c32 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
@@ -23,7 +23,6 @@ import { PaginationComponentOptions } from '../../../../../pagination/pagination
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
 import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
-import { FILTER_SEARCH } from "../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 describe('SearchFacetRangeOptionComponent', () => {
   let comp: SearchFacetRangeOptionComponent;
@@ -77,7 +76,7 @@ describe('SearchFacetRangeOptionComponent', () => {
           }
         },
         {
-          provide: FILTER_SEARCH, useValue: {
+          provide: SearchFilterService, useValue: {
             isFilterActiveWithValue: (paramName: string, filterValue: string) => observableOf(true),
             getPage: (paramName: string) => page,
             /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
index 7d0a575c25..6afe994f2f 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
@@ -14,7 +14,6 @@ import { SearchConfigurationService } from '../../../../../../core/shared/search
 import { hasValue } from '../../../../../empty.util';
 import { currentPath } from '../../../../../utils/route.utils';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { FILTER_SEARCH } from '../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component';
 
 const rangeDelimiter = '-';
 
@@ -65,7 +64,7 @@ export class SearchFacetRangeOptionComponent implements OnInit, OnDestroy {
   searchLink: string;
 
   constructor(protected searchService: SearchService,
-              @Inject(FILTER_SEARCH) protected filterService: SearchFilterService,
+              protected filterService: SearchFilterService,
               protected searchConfigService: SearchConfigurationService,
               protected router: Router,
               protected paginationService: PaginationService
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
index aa58d25d31..15e418842f 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
@@ -17,7 +17,6 @@ import { SearchFacetSelectedOptionComponent } from './search-facet-selected-opti
 import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
-import { FILTER_SEARCH } from "../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 describe('SearchFacetSelectedOptionComponent', () => {
   let comp: SearchFacetSelectedOptionComponent;
@@ -127,7 +126,7 @@ describe('SearchFacetSelectedOptionComponent', () => {
           }
         },
         {
-          provide: FILTER_SEARCH, useValue: {
+          provide: SearchFilterService, useValue: {
             getSelectedValuesForFilter: () => selectedValues,
             isFilterActiveWithValue: (paramName: string, filterValue: string) => observableOf(true),
             getPage: (paramName: string) => page,
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
index 25f5883a00..8479417c57 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
@@ -10,7 +10,6 @@ import { FacetValue } from '../../../../models/facet-value.model';
 import { currentPath } from '../../../../../utils/route.utils';
 import { getFacetValueForType } from '../../../../search.utils';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { FILTER_SEARCH } from '../../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component';
 
 @Component({
   selector: 'ds-search-facet-selected-option',
@@ -58,7 +57,7 @@ export class SearchFacetSelectedOptionComponent implements OnInit, OnDestroy {
   searchLink: string;
 
   constructor(protected searchService: SearchService,
-              @Inject(FILTER_SEARCH) protected filterService: SearchFilterService,
+              protected filterService: SearchFilterService,
               protected searchConfigService: SearchConfigurationService,
               protected router: Router,
               protected paginationService: PaginationService
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
index 40852f275d..92d2e5265b 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
@@ -24,7 +24,6 @@ import { RemoteDataBuildService } from '../../../../../core/cache/builders/remot
 import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
-import { FILTER_SEARCH } from "../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 describe('SearchFacetFilterComponent', () => {
   let comp: SearchFacetFilterComponent;
@@ -101,7 +100,7 @@ describe('SearchFacetFilterComponent', () => {
         { provide: IN_PLACE_SEARCH, useValue: false },
         { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false) },
         {
-          provide: FILTER_SEARCH, useValue: {
+          provide: SearchFilterService, useValue: {
             getSelectedValuesForFilter: () => observableOf(selectedValues),
             isFilterActiveWithValue: (paramName: string, filterValue: string) => true,
             getPage: (paramName: string) => page,
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index 37a540a39c..2b2eb9b11a 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -35,7 +35,6 @@ import { currentPath } from '../../../../utils/route.utils';
 import { getFacetValueForType, stripOperatorFromFilterValue } from '../../../search.utils';
 import { createPendingRemoteDataObject } from '../../../../remote-data.utils';
 import { FacetValues } from '../../../models/facet-values.model';
-import { FILTER_SEARCH } from '../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component';
 
 @Component({
   selector: 'ds-search-facet-filter',
@@ -99,7 +98,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
   currentUrl: string;
 
   constructor(protected searchService: SearchService,
-              @Inject(FILTER_SEARCH) protected filterService: SearchFilterService,
+              protected filterService: SearchFilterService,
               protected rdbs: RemoteDataBuildService,
               protected router: Router,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
index 8747747ec7..7abe45ca8c 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
@@ -14,7 +14,6 @@ import { SearchConfigurationServiceStub } from '../../../testing/search-configur
 import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
 import { SequenceService } from '../../../../core/shared/sequence.service';
 import { BrowserOnlyMockPipe } from '../../../testing/browser-only-mock.pipe';
-import { FILTER_SEARCH } from "../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 describe('SearchFilterComponent', () => {
   let comp: SearchFilterComponent;
@@ -71,7 +70,7 @@ describe('SearchFilterComponent', () => {
       providers: [
         { provide: SearchService, useValue: searchServiceStub },
         {
-          provide: FILTER_SEARCH,
+          provide: SearchFilterService,
           useValue: mockFilterService
         },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index d7967e6642..d1d3bd729d 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -11,7 +11,6 @@ import { SearchService } from '../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
 import { SequenceService } from '../../../../core/shared/sequence.service';
-import { FILTER_SEARCH } from '../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component';
 
 @Component({
   selector: 'ds-search-filter',
@@ -72,7 +71,7 @@ export class SearchFilterComponent implements OnInit {
   private readonly sequenceId: number;
 
   constructor(
-    @Inject(FILTER_SEARCH) private filterService: SearchFilterService,
+    private filterService: SearchFilterService,
     private searchService: SearchService,
     @Inject(SEARCH_CONFIG_SERVICE) private searchConfigService: SearchConfigurationService,
     private sequenceService: SequenceService,
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
index 6ca5c62334..e6c74d8047 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -26,7 +26,6 @@ import { SearchConfigurationServiceStub } from '../../../../testing/search-confi
 import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { FacetValue} from '../../../models/facet-value.model';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
-import { FILTER_SEARCH } from "../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 describe('SearchHierarchyFilterComponent', () => {
 
@@ -68,7 +67,7 @@ describe('SearchHierarchyFilterComponent', () => {
       ],
       providers: [
         { provide: SearchService, useValue: searchService },
-        { provide: FILTER_SEARCH, useValue: searchFilterService },
+        { provide: SearchFilterService, useValue: searchFilterService },
         { provide: RemoteDataBuildService, useValue: {} },
         { provide: Router, useValue: router },
         { provide: NgbModal, useValue: ngbModal },
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
index fd62e49e32..f9b3f2bff9 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
@@ -26,7 +26,6 @@ import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { environment } from '../../../../../../environments/environment';
 import { addOperatorToFilterValue } from '../../../search.utils';
 import { VocabularyTreeviewModalComponent } from '../../../../form/vocabulary-treeview-modal/vocabulary-treeview-modal.component';
-import { FILTER_SEARCH } from '../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component';
 
 @Component({
   selector: 'ds-search-hierarchy-filter',
@@ -42,7 +41,7 @@ import { FILTER_SEARCH } from '../../../../../admin/admin-notify-dashboard/admin
 export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent implements OnInit {
 
   constructor(protected searchService: SearchService,
-              @Inject(FILTER_SEARCH) protected filterService: SearchFilterService,
+              protected filterService: SearchFilterService,
               protected rdbs: RemoteDataBuildService,
               protected router: Router,
               protected modalService: NgbModal,
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
index 7569a33214..3a146f5059 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
@@ -25,7 +25,6 @@ import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-p
 import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { RouteService } from '../../../../../core/services/route.service';
-import { FILTER_SEARCH } from "../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 describe('SearchRangeFilterComponent', () => {
   let comp: SearchRangeFilterComponent;
@@ -107,7 +106,7 @@ describe('SearchRangeFilterComponent', () => {
         { provide: IN_PLACE_SEARCH, useValue: false },
         { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false) },
         {
-          provide: FILTER_SEARCH, useValue: {
+          provide: SearchFilterService, useValue: {
             getSelectedValuesForFilter: () => selectedValues,
             isFilterActiveWithValue: (paramName: string, filterValue: string) => true,
             getPage: (paramName: string) => page,
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index 788971b4cb..ed20e63c52 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -21,7 +21,6 @@ import { SearchConfigurationService } from '../../../../../core/shared/search/se
 import { RouteService } from '../../../../../core/services/route.service';
 import { hasValue } from '../../../../empty.util';
 import { yearFromString } from 'src/app/shared/date.util';
-import { FILTER_SEARCH } from '../../../../../admin/admin-notify-dashboard/admin-notify-dashboard.component';
 
 /**
  * The suffix for a range filters' minimum in the frontend URL
@@ -93,7 +92,7 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
   keyboardControl: boolean;
 
   constructor(protected searchService: SearchService,
-              @Inject(FILTER_SEARCH) protected filterService: SearchFilterService,
+              protected filterService: SearchFilterService,
               protected router: Router,
               protected rdbs: RemoteDataBuildService,
               private translateService: TranslateService,
diff --git a/src/app/shared/search/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts
index 212174d241..522459b603 100644
--- a/src/app/shared/search/search-filters/search-filters.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.spec.ts
@@ -9,7 +9,6 @@ import { SearchFiltersComponent } from './search-filters.component';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
-import { FILTER_SEARCH } from "../../../admin/admin-notify-dashboard/admin-notify-dashboard.component";
 
 describe('SearchFiltersComponent', () => {
   let comp: SearchFiltersComponent;
@@ -37,7 +36,7 @@ describe('SearchFiltersComponent', () => {
       providers: [
         { provide: SearchService, useValue: searchServiceStub },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
-        { provide: FILTER_SEARCH, useValue: searchFiltersStub },
+        { provide: SearchFilterService, useValue: searchFiltersStub },
 
       ],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
index e7bedbb30a..63235b3e57 100644
--- a/src/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -12,7 +12,6 @@ import { SearchFilterService } from '../../../core/shared/search/search-filter.s
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { currentPath } from '../../utils/route.utils';
 import { hasValue } from '../../empty.util';
-import { FILTER_SEARCH } from '../../../admin/admin-notify-dashboard/admin-notify-dashboard.component';
 
 @Component({
   selector: 'ds-search-filters',
@@ -72,7 +71,7 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
    */
   constructor(
     private searchService: SearchService,
-    @Inject(FILTER_SEARCH) protected filterService: SearchFilterService,
+    protected filterService: SearchFilterService,
     private router: Router,
     @Inject(SEARCH_CONFIG_SERVICE) private searchConfigService: SearchConfigurationService) {
   }
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 184dc2fb21..61f3a119c8 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -101,11 +101,6 @@ export class SearchComponent implements OnInit {
    */
   @Input() searchEnabled = true;
 
-  /**
-   * Config param for route service
-   */
-  @Input() routeConfigParam: string;
-
   /**
    * The width of the sidebar (bootstrap columns)
    */
@@ -297,12 +292,8 @@ export class SearchComponent implements OnInit {
 
     this.searchConfigService.setPaginationId(this.paginationId);
 
-    if (this.routeConfigParam) {
-      this.searchConfigService.setRouteConfigurationParamName(this.routeConfigParam);
-    }
-
     if (hasValue(this.configuration)) {
-      this.routeService.setParameter(this.routeConfigParam ?? 'configuration', this.configuration);
+      this.routeService.setParameter('configuration', this.configuration);
     }
     if (hasValue(this.fixedFilterQuery)) {
       this.routeService.setParameter('fixedFilterQuery', this.fixedFilterQuery);
diff --git a/src/app/shared/search/themed-search.component.ts b/src/app/shared/search/themed-search.component.ts
index 555056eacc..03f6f37e25 100644
--- a/src/app/shared/search/themed-search.component.ts
+++ b/src/app/shared/search/themed-search.component.ts
@@ -20,7 +20,7 @@ import { ListableObject } from '../object-collection/shared/listable-object.mode
 })
 export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
 
-  protected inAndOutputNames: (keyof SearchComponent & keyof this)[] = ['configurationList', 'context', 'configuration', 'fixedFilterQuery', 'routeConfigParam', 'useCachedVersionIfAvailable', 'inPlaceSearch', 'linkType', 'paginationId', 'searchEnabled', 'sideBarWidth', 'searchFormPlaceholder', 'selectable', 'selectionConfig', 'showCsvExport', 'showSidebar', 'showThumbnails', 'showViewModes', 'useUniquePageId', 'viewModeList', 'showScopeSelector', 'resultFound', 'deselectObject', 'selectObject', 'trackStatistics', 'query'];
+  protected inAndOutputNames: (keyof SearchComponent & keyof this)[] = ['configurationList', 'context', 'configuration', 'fixedFilterQuery', 'useCachedVersionIfAvailable', 'inPlaceSearch', 'linkType', 'paginationId', 'searchEnabled', 'sideBarWidth', 'searchFormPlaceholder', 'selectable', 'selectionConfig', 'showCsvExport', 'showSidebar', 'showThumbnails', 'showViewModes', 'useUniquePageId', 'viewModeList', 'showScopeSelector', 'resultFound', 'deselectObject', 'selectObject', 'trackStatistics', 'query'];
 
   @Input() configurationList: SearchConfigurationOption[];
 
@@ -30,8 +30,6 @@ export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
 
   @Input() fixedFilterQuery: string;
 
-  @Input() routeConfigParam: string;
-
   @Input() useCachedVersionIfAvailable: boolean;
 
   @Input() inPlaceSearch: boolean;

From c57ad8eeb7dd9c2b81520e523d92ff0d8d7f83e7 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 8 Jan 2024 16:47:24 +0100
Subject: [PATCH 28/45] refactor, add detail mapping, add missing translation,
 optimize modal

---
 .../admin-notify-dashboard-routing.module.ts  |  16 +++
 .../admin-notify-dashboard.module.ts          |   8 +-
 .../admin-notify-detail-modal.component.html  |  10 +-
 .../admin-notify-incoming.component.html      |   1 -
 .../admin-notify-incoming.component.ts        |   2 +-
 .../admin-notify-outgoing.component.html      |   1 -
 .../admin-notify-outgoing.component.ts        |   2 +-
 .../admin-notify-search-result.component.html |  43 ++++++
 ...admin-notify-search-result.component.scss} |   0
 ...min-notify-search-result.component.spec.ts |  22 ++++
 .../admin-notify-search-result.component.ts   | 122 ++++++++++++++++++
 ...tify-incoming-search-result.component.html |  40 ------
 ...y-incoming-search-result.component.spec.ts |  22 ----
 ...notify-incoming-search-result.component.ts |  97 --------------
 ...tify-outgoing-search-result.component.html |  39 ------
 ...tify-outgoing-search-result.component.scss |   0
 ...y-outgoing-search-result.component.spec.ts |  22 ----
 ...notify-outgoing-search-result.component.ts |  98 --------------
 .../models/admin-notify-message.model.ts      |  22 +++-
 .../services/admin-notify-messages.service.ts |  80 +++++++++++-
 src/app/core/shared/context.model.ts          |   3 +-
 src/assets/i18n/en.json5                      |  46 ++++++-
 22 files changed, 358 insertions(+), 338 deletions(-)
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
 rename src/app/admin/admin-notify-dashboard/admin-notify-search-result/{incoming/admin-notify-incoming-search-result.component.scss => admin-notify-search-result.component.scss} (100%)
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.html
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.spec.ts
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.ts
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.html
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.scss
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.spec.ts
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.ts

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 345dc31ce3..7f74c023ff 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
@@ -34,11 +34,27 @@ import {
         path: 'inbound',
         component: AdminNotifyIncomingComponent,
         canActivate: [SiteAdministratorGuard],
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+        },
+        data: {
+          title: 'admin.notify.dashboard.page.title',
+          breadcrumbKey: 'admin.notify.dashboard',
+          showBreadcrumbsFluid: false
+        },
       },
       {
         path: 'outbound',
         component: AdminNotifyOutgoingComponent,
         canActivate: [SiteAdministratorGuard],
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+        },
+        data: {
+          title: 'admin.notify.dashboard.page.title',
+          breadcrumbKey: 'admin.notify.dashboard',
+          showBreadcrumbsFluid: false
+        },
       }
     ])
   ],
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
index 498c40a58d..1383b14443 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
@@ -8,14 +8,13 @@ import { AdminNotifyIncomingComponent } from './admin-notify-logs/admin-notify-i
 import { SharedModule } from '../../shared/shared.module';
 import { SearchModule } from '../../shared/search/search.module';
 import { SearchPageModule } from '../../search-page/search-page.module';
-import { AdminNotifyIncomingSearchResultComponent } from './admin-notify-search-result/incoming/admin-notify-incoming-search-result.component';
 import {
   AdminNotifyOutgoingComponent
 } from './admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component';
 import { AdminNotifyDetailModalComponent } from './admin-notify-detail-modal/admin-notify-detail-modal.component';
 import {
-  AdminNotifyOutgoingSearchResultComponent
-} from "./admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component";
+  AdminNotifySearchResultComponent
+} from "./admin-notify-search-result/admin-notify-search-result.component";
 import { AdminNotifyMessagesService } from "./services/admin-notify-messages.service";
 
 
@@ -36,8 +35,7 @@ import { AdminNotifyMessagesService } from "./services/admin-notify-messages.ser
     AdminNotifyMetricsComponent,
     AdminNotifyIncomingComponent,
     AdminNotifyOutgoingComponent,
-    AdminNotifyIncomingSearchResultComponent,
-    AdminNotifyOutgoingSearchResultComponent,
+    AdminNotifySearchResultComponent,
     AdminNotifyDetailModalComponent
   ]
 })
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
index 57e1b40c1d..bbbfc22ed4 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
@@ -1,14 +1,14 @@
 <div class="modal-header">
-  <h4 class="modal-title">Message Detail</h4>
+  <h4 class="modal-title">{{'notify-message-modal.title' | translate}}</h4>
   <button type="button" class="close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
     <span aria-hidden="true">&times;</span>
   </button>
 </div>
-<div class="d-flex modal-body flex-column p-4">
+<div class="container p-4">
     <div *ngFor="let key of notifyMessageKeys">
-      <div class="d-flex w-100 justify-content-between mb-4">
-        <div class="font-weight-bold mr-5">{{ key }}</div>
-        <div class="text-nowrap text-truncate">{{ notifyMessage[key] }}</div>
+      <div class="row mb-4">
+        <div class="font-weight-bold col-sm">{{ key + '.notify-detail-modal' | translate}}</div>
+        <div class="text-nowrap col-sm text-right">{{ notifyMessage[key] }}</div>
       </div>
     </div>
 </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html
index 3b7272186a..9fd21e21a1 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html
@@ -21,7 +21,6 @@
             [showViewModes]="false"
             [searchEnabled]="false"
             [context]="context"
-            [useUniquePageId]="true"
           ></ds-themed-search>
         </div>
       </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
index ffb5306643..d895e35ede 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
@@ -16,7 +16,7 @@ import { SearchConfigurationService } from "../../../../core/shared/search/searc
   ]
 })
 export class AdminNotifyIncomingComponent {
-  protected readonly context = Context.CoarNotifyIncoming;
+  protected readonly context = Context.CoarNotify;
   constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
   }
 }
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html
index 050e25c241..8b9c031776 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html
@@ -21,7 +21,6 @@
             [showViewModes]="false"
             [searchEnabled]="false"
             [context]="context"
-            [useUniquePageId]="true"
           ></ds-themed-search>
         </div>
       </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
index ac7a5cfafa..d85ec2daae 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
@@ -16,7 +16,7 @@ import { SearchConfigurationService } from "../../../../core/shared/search/searc
   ]
 })
 export class AdminNotifyOutgoingComponent {
-  protected readonly context = Context.CoarNotifyOutgoing;
+  protected readonly context = Context.CoarNotify;
 
   constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
   }
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
new file mode 100644
index 0000000000..310a04c1ed
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -0,0 +1,43 @@
+  <div class="table-responsive mt-2">
+    <table class="table table-striped table-hover">
+      <thead>
+        <tr class="text-nowrap">
+          <th scope="col">{{ 'notify-message-result.timestamp' | translate}}</th>
+          <th scope="col">{{'notify-message-result.repositoryItem' | translate}}</th>
+          <th scope="col">{{ 'notify-message-result.ldnService' | translate}}</th>
+          <th scope="col">{{ 'notify-message-result.type' | translate }}</th>
+          <th scope="col">{{ 'notify-message-result.status' | translate  }}</th>
+          <th scope="col">{{ 'notify-message-result.action' | translate }}</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let message of (messagesSubject$ | async)">
+          <td>
+            <div>{{message.queueTimeout}}</div>
+          </td>
+          <td>
+            <div *ngIf="isInbound">{{message.context}}</div>
+            <div *ngIf="!isInbound">{{message.object}}</div>
+          </td>
+          <td>
+            <div *ngIf="isInbound">{{message.origin}}</div>
+            <div *ngIf="!isInbound">{{message.target}}</div>
+          </td>
+          <td>
+            <div>{{message.coarNotifyType}}</div>
+          </td>
+          <td>
+            <div>{{message.queueStatusLabel}}</div>
+          </td>
+          <td>
+            <div class="d-flex flex-column">
+              <button class="btn mb-2 btn-dark" (click)="openDetailModal(message)">{{ 'notify-message-result.detail' | translate }}</button>
+              <button *ngIf="message.queueStatusLabel === reprocessStatus" (click)="reprocessMessage(message)" class="btn btn-warning">
+                {{ 'notify-message-result.reprocess' | translate }}
+              </button>
+            </div>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.scss b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.scss
similarity index 100%
rename from src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.scss
rename to src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.scss
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
new file mode 100644
index 0000000000..b17a03274f
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { AdminNotifySearchResultComponent } from './admin-notify-search-result.component';
+
+describe('AdminNotifySearchResultComponent', () => {
+  let component: AdminNotifySearchResultComponent;
+  let fixture: ComponentFixture<AdminNotifySearchResultComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ AdminNotifySearchResultComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifySearchResultComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
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
new file mode 100644
index 0000000000..f75eab3366
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
@@ -0,0 +1,122 @@
+import { ChangeDetectorRef, Component, Inject, OnDestroy, OnInit } from '@angular/core';
+import { AdminNotifySearchResult } from '../models/admin-notify-message-search-result.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { Context } from '../../../core/shared/context.model';
+import { AdminNotifyMessage, QueueStatusMap } from '../models/admin-notify-message.model';
+import {
+  tabulatableObjectsComponent
+} from '../../../shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator';
+import {
+  TabulatableResultListElementsComponent
+} from '../../../shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
+import { LdnServicesService } from "../../admin-ldn-services/ldn-services-data/ldn-services-data.service";
+import { BehaviorSubject, from, Observable, of, scan, Subscription, switchMap } from "rxjs";
+import { combineLatest, filter, map, mergeMap, tap } from "rxjs/operators";
+import { getAllSucceededRemoteDataPayload } from "../../../core/shared/operators";
+import { ItemDataService } from "../../../core/data/item-data.service";
+import { AdminNotifyMessagesService } from "../services/admin-notify-messages.service";
+import { SearchConfigurationService } from "../../../core/shared/search/search-configuration.service";
+import { SEARCH_CONFIG_SERVICE } from "../../../my-dspace-page/my-dspace-page.component";
+
+@tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotify)
+@Component({
+  selector: 'ds-admin-notify-search-result',
+  templateUrl: './admin-notify-search-result.component.html',
+  styleUrls: ['./admin-notify-search-result.component.scss'],
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService
+    }
+  ]
+})
+export class AdminNotifySearchResultComponent extends TabulatableResultListElementsComponent<PaginatedList<AdminNotifySearchResult>, AdminNotifySearchResult> implements OnInit, OnDestroy{
+  public messagesSubject$: BehaviorSubject<AdminNotifyMessage[]> = new BehaviorSubject([]);
+  public reprocessStatus = QueueStatusMap.QUEUE_STATUS_QUEUED_FOR_RETRY;
+  //we check on one type of config to render specific table headers
+  public isInbound: boolean;
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  private subs: Subscription[] = [];
+
+    constructor(private modalService: NgbModal,
+                private adminNotifyMessagesService: AdminNotifyMessagesService,
+                @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
+      super();
+    }
+
+  /**
+   * Map messages on init for readable representation
+   */
+  ngOnInit() {
+    this.mapDetailsToMessages()
+    this.subs.push(this.searchConfigService.getCurrentConfiguration('')
+      .subscribe(configuration => {
+        this.isInbound = configuration === 'NOTIFY.incoming';
+      })
+    );
+  }
+
+  ngOnDestroy() {
+    this.subs.forEach(sub => sub.unsubscribe());
+  }
+
+  /**
+   * Open modal for details visualization
+   * @param message the message to be displayed
+   */
+  openDetailModal(message: AdminNotifyMessage) {
+    const modalRef = this.modalService.open(AdminNotifyDetailModalComponent);
+    const messageToOpen = {...message};
+    // we delete not necessary or not readable keys
+    if (this.isInbound) {
+      delete messageToOpen.target;
+      delete messageToOpen.object;
+    } else {
+      delete messageToOpen.context;
+      delete messageToOpen.origin;
+    }
+    delete messageToOpen._links;
+    delete messageToOpen.metadata;
+    delete messageToOpen.thumbnail;
+    delete messageToOpen.item;
+    delete messageToOpen.accessStatus;
+    delete messageToOpen.queueStatus;
+
+    const messageKeys = Object.keys(messageToOpen);
+    modalRef.componentInstance.notifyMessage = messageToOpen;
+    modalRef.componentInstance.notifyMessageKeys = messageKeys;
+  }
+
+  /**
+   * Reprocess message in status QUEUE_STATUS_QUEUED_FOR_RETRY and update results
+   * @param message the message to be reprocessed
+   */
+  reprocessMessage(message: AdminNotifyMessage) {
+    this.subs.push(
+      this.adminNotifyMessagesService.reprocessMessage(message, this.messagesSubject$)
+        .subscribe(response => {
+          this.messagesSubject$.next(response)
+        }
+      )
+    )
+  }
+
+
+  /**
+   * Map readable results to messages
+   * @private
+   */
+  private mapDetailsToMessages() {
+    this.subs.push(this.adminNotifyMessagesService.getDetailedMessages(this.objects?.page.map(pageResult => pageResult.indexableObject))
+      .subscribe(response => {
+        this.messagesSubject$.next(response)
+    }))
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.html
deleted file mode 100644
index 06aa551a44..0000000000
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
-<div class="table-responsive mt-2">
-    <table class="table table-striped table-hover">
-      <thead>
-        <tr>
-          <th scope="col">Timestamp</th>
-          <th scope="col">LDN Service</th>
-          <th scope="col">Repository Item</th>
-          <th scope="col">Type</th>
-          <th scope="col">Status</th>
-          <th scope="col">Action</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr *ngFor="let message of (notifyMessages$ | async)">
-          <td>
-            <div>{{message.queueTimeout}}</div>
-          </td>
-          <td>
-            <div>{{message.origin}}</div>
-          </td>
-          <td>
-            <div>{{message.context}}</div>
-          </td>
-          <td>
-            <div>{{message.coarNotifyType}}</div>
-          </td>
-          <td>
-            <div>{{message.queueStatusLabel}}</div>
-          </td>
-          <td>
-            <div class="d-flex flex-column">
-              <button class="btn mb-2 btn-dark" (click)="openDetailModal(message)">Detail</button>
-              <button *ngIf="message.queueStatusLabel === reprocessStatus" (click)="reprocessMessage(message)" class="btn btn-warning">Reprocess</button>
-            </div>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.spec.ts
deleted file mode 100644
index 2db8920d7f..0000000000
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.spec.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AdminNotifyIncomingSearchResultComponent } from './admin-notify-incoming-search-result.component';
-
-describe('AdminNotifySearchResultComponent', () => {
-  let component: AdminNotifyIncomingSearchResultComponent;
-  let fixture: ComponentFixture<AdminNotifyIncomingSearchResultComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ AdminNotifyIncomingSearchResultComponent ]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(AdminNotifyIncomingSearchResultComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.ts
deleted file mode 100644
index 11e94c05c5..0000000000
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/incoming/admin-notify-incoming-search-result.component.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { AdminNotifySearchResult } from '../../models/admin-notify-message-search-result.model';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { Context } from '../../../../core/shared/context.model';
-import { AdminNotifyMessage, QueueStatusMap } from '../../models/admin-notify-message.model';
-import {
-  tabulatableObjectsComponent
-} from '../../../../shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator';
-import {
-  TabulatableResultListElementsComponent
-} from '../../../../shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
-import { PaginatedList } from '../../../../core/data/paginated-list.model';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { AdminNotifyDetailModalComponent } from '../../admin-notify-detail-modal/admin-notify-detail-modal.component';
-import { LdnServicesService } from "../../../admin-ldn-services/ldn-services-data/ldn-services-data.service";
-import { BehaviorSubject, concatMap, from, Observable, of, scan, switchMap } from "rxjs";
-import { RemoteData } from "../../../../core/data/remote-data";
-import { LdnService } from "../../../admin-ldn-services/ldn-services-model/ldn-services.model";
-import { filter, map, mergeMap, take, tap, toArray } from "rxjs/operators";
-import { getAllSucceededRemoteDataPayload } from "../../../../core/shared/operators";
-import { ItemDataService } from "../../../../core/data/item-data.service";
-import { AdminNotifyMessagesService } from "../../services/admin-notify-messages.service";
-
-@tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotifyIncoming)
-@Component({
-  selector: 'ds-admin-notify-search-result',
-  templateUrl: './admin-notify-incoming-search-result.component.html',
-  styleUrls: ['./admin-notify-incoming-search-result.component.scss']
-})
-export class AdminNotifyIncomingSearchResultComponent extends TabulatableResultListElementsComponent<PaginatedList<AdminNotifySearchResult>, AdminNotifySearchResult> implements OnInit{
-  public notifyMessages: AdminNotifyMessage[];
-  public notifyMessages$: Observable<AdminNotifyMessage[]>;
-  public reprocessStatus = QueueStatusMap.QUEUE_STATUS_QUEUED_FOR_RETRY;
-
-
-
-  constructor(private modalService: NgbModal,
-              private ldnServicesService: LdnServicesService,
-              private itemDataService: ItemDataService,
-              private adminNotifyMessagesService: AdminNotifyMessagesService) {
-      super();
-    }
-
-  /**
-   * Map messages on init for readable representation
-   */
-  ngOnInit() {
-    this.notifyMessages = this.objects?.page.map(object => {
-      const indexableObject = object.indexableObject;
-      indexableObject.coarNotifyType = indexableObject.coarNotifyType.split(':')[1];
-      indexableObject.queueStatusLabel = QueueStatusMap[indexableObject.queueStatusLabel];
-      return indexableObject;
-    });
-
-    this.notifyMessages$ = from(this.notifyMessages).pipe(
-      mergeMap(message => of(message)),
-      mergeMap(message =>
-        message.origin ? this.ldnServicesService.findById(message.origin.toString()).pipe(
-          getAllSucceededRemoteDataPayload(),
-          map(detail => ({...message, origin: detail.name}))
-        ) : of(message),
-      ),
-      mergeMap(message =>
-        message.context ? this.itemDataService.findById(message.context.toString()).pipe(
-          getAllSucceededRemoteDataPayload(),
-          map(detail => ({...message, context: detail.name}))
-        ) : of(message),
-      ),
-      scan((acc: any, value: any) => [...acc, value], []),
-    )
-  }
-
-    /**
-   * Open modal for details visualization
-   * @param message the message to be displayed
-   */
-  openDetailModal(message: AdminNotifyMessage) {
-    const modalRef = this.modalService.open(AdminNotifyDetailModalComponent);
-    const messageKeys = Object.keys(message);
-    const keysToRead = [];
-    messageKeys.forEach((key) => {
-      if (typeof message[key] !== 'object') {
-        keysToRead.push(key);
-      }
-    });
-    modalRef.componentInstance.notifyMessage = message;
-    modalRef.componentInstance.notifyMessageKeys = keysToRead;
-  }
-
-  /**
-   * Reprocess message in status QUEUE_STATUS_QUEUED_FOR_RETRY and update results
-   * @param message
-   */
-  reprocessMessage(message: AdminNotifyMessage) {
-   // TODO implement reprocess
-  }
-}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.html
deleted file mode 100644
index 639d66a1f3..0000000000
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.html
+++ /dev/null
@@ -1,39 +0,0 @@
-  <div class="table-responsive mt-2">
-    <table class="table table-striped table-hover">
-      <thead>
-        <tr>
-          <th scope="col">Timestamp</th>
-          <th scope="col">Repository Item</th>
-          <th scope="col">LDN Service</th>
-          <th scope="col">Type</th>
-          <th scope="col">Status</th>
-          <th scope="col">Action</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr *ngFor="let message of (notifyMessages$ | async)">
-          <td>
-            <div>{{message.queueTimeout}}</div>
-          </td>
-          <td>
-            <div>{{message.object}}</div>
-          </td>
-          <td>
-            <div>{{message.target}}</div>
-          </td>
-          <td>
-            <div>{{message.coarNotifyType}}</div>
-          </td>
-          <td>
-            <div>{{message.queueStatusLabel}}</div>
-          </td>
-          <td>
-            <div class="d-flex flex-column">
-              <button class="btn mb-2 btn-dark" (click)="openDetailModal(message)">Detail</button>
-              <button *ngIf="message.queueStatusLabel === reprocessStatus" (click)="reprocessMessage(message)" class="btn btn-warning">Reprocess</button>
-            </div>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.scss b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.spec.ts
deleted file mode 100644
index 110feb2e0c..0000000000
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.spec.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AdminNotifyOutgoingSearchResultComponent } from './admin-notify-outgoing-search-result.component';
-
-describe('AdminNotifySearchResultComponent', () => {
-  let component: AdminNotifyOutgoingSearchResultComponent;
-  let fixture: ComponentFixture<AdminNotifyOutgoingSearchResultComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ AdminNotifyOutgoingSearchResultComponent ]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(AdminNotifyOutgoingSearchResultComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.ts
deleted file mode 100644
index b5b49a8a71..0000000000
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/outgoing/admin-notify-outgoing-search-result.component.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { AdminNotifySearchResult } from '../../models/admin-notify-message-search-result.model';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { Context } from '../../../../core/shared/context.model';
-import { AdminNotifyMessage, QueueStatusMap } from '../../models/admin-notify-message.model';
-import {
-  tabulatableObjectsComponent
-} from '../../../../shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator';
-import {
-  TabulatableResultListElementsComponent
-} from '../../../../shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
-import { PaginatedList } from '../../../../core/data/paginated-list.model';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { AdminNotifyDetailModalComponent } from '../../admin-notify-detail-modal/admin-notify-detail-modal.component';
-import { LdnServicesService } from "../../../admin-ldn-services/ldn-services-data/ldn-services-data.service";
-import { from, Observable, of, scan, switchMap } from "rxjs";
-import { combineLatest, filter, map, mergeMap } from "rxjs/operators";
-import { getAllSucceededRemoteDataPayload } from "../../../../core/shared/operators";
-import { ItemDataService } from "../../../../core/data/item-data.service";
-import { AdminNotifyMessagesService } from "../../services/admin-notify-messages.service";
-
-@tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotifyOutgoing)
-@Component({
-  selector: 'ds-admin-notify-search-result',
-  templateUrl: './admin-notify-outgoing-search-result.component.html',
-  styleUrls: ['./admin-notify-outgoing-search-result.component.scss']
-})
-export class AdminNotifyOutgoingSearchResultComponent extends TabulatableResultListElementsComponent<PaginatedList<AdminNotifySearchResult>, AdminNotifySearchResult> implements OnInit{
-  public notifyMessages: AdminNotifyMessage[];
-  public notifyMessages$: Observable<AdminNotifyMessage[]>;
-  public reprocessStatus = QueueStatusMap.QUEUE_STATUS_QUEUED_FOR_RETRY;
-
-    constructor(private modalService: NgbModal,
-                private ldnServicesService: LdnServicesService,
-                private itemDataService: ItemDataService,
-                private adminNotifyMessagesService: AdminNotifyMessagesService) {
-      super();
-    }
-
-  /**
-   * Map messages on init for readable representation
-   */
-  ngOnInit() {
-    this.mapDetailsToMessages()
-  }
-
-    /**
-   * Open modal for details visualization
-   * @param message the message to be displayed
-   */
-  openDetailModal(message: AdminNotifyMessage) {
-    const modalRef = this.modalService.open(AdminNotifyDetailModalComponent);
-    const messageKeys = Object.keys(message);
-    modalRef.componentInstance.notifyMessage = message;
-    modalRef.componentInstance.notifyMessageKeys = messageKeys;
-  }
-
-  /**
-   * Reprocess message in status QUEUE_STATUS_QUEUED_FOR_RETRY and update results
-   * @param message
-   */
-  reprocessMessage(message: AdminNotifyMessage) {
-    this.adminNotifyMessagesService.findById(message.id).pipe(getAllSucceededRemoteDataPayload()).subscribe(response => {
-      console.log(response);
-    })
-  }
-
-
-  /**
-   * Map readable results to messages
-   * @private
-   */
-  private mapDetailsToMessages() {
-    this.notifyMessages = this.objects?.page.map(object => {
-      const indexableObject = object.indexableObject;
-      indexableObject.coarNotifyType = indexableObject.coarNotifyType.split(':')[1];
-      indexableObject.queueStatusLabel = QueueStatusMap[indexableObject.queueStatusLabel];
-      return indexableObject;
-    });
-
-    this.notifyMessages$ = from(this.notifyMessages).pipe(
-      mergeMap(message => of(message)),
-      mergeMap(message =>
-        message.target ? this.ldnServicesService.findById(message.target.toString()).pipe(
-          getAllSucceededRemoteDataPayload(),
-          map(detail => ({...message, target: detail.name}))
-        ) : of(message),
-      ),
-      mergeMap(message =>
-        message.object ? this.itemDataService.findById(message.object.toString()).pipe(
-          getAllSucceededRemoteDataPayload(),
-          map(detail => ({...message, object: detail.name}))
-        ) : of(message),
-      ),
-      scan((acc: any, value: any) => [...acc, value], []),
-    )
-  }
-}
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
index 1fda25d1ef..4c36e01eaf 100644
--- a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
@@ -1,10 +1,11 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import { autoserialize, autoserializeAs, deserialize, inheritSerialization } from 'cerialize';
 import { typedObject } from '../../../core/cache/builders/build-decorators';
 import { ADMIN_NOTIFY_MESSAGE } from './admin-notify-message.resource-type';
 import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { GenericConstructor } from '../../../core/shared/generic-constructor';
 import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
+import { Observable } from "rxjs";
 
 export enum QueueStatusMap {
   QUEUE_STATUS_PROCESSED = 'Processed',
@@ -107,6 +108,25 @@ export class AdminNotifyMessage extends DSpaceObject {
   @autoserialize
   queueStatus: number;
 
+  /**
+   * Thumbnail link used when browsing items with showThumbs config enabled.
+   */
+  @autoserialize
+  thumbnail: string;
+
+  /**
+   * The observable pointing to the item itself
+   */
+  @autoserialize
+  item: Observable<AdminNotifyMessage>;
+
+  /**
+   * The observable pointing to the access status of the item
+   */
+  @autoserialize
+  accessStatus: Observable<AdminNotifyMessage>;
+
+
 
   @deserialize
   _links: {
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 8f710d987d..d61c6f7712 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
@@ -10,7 +10,7 @@ import {HALEndpointService} from '../../../core/shared/hal-endpoint.service';
 import {NotificationsService} from '../../../shared/notifications/notifications.service';
 import {FindListOptions} from '../../../core/data/find-list-options.model';
 import {FollowLinkConfig} from '../../../shared/utils/follow-link-config.model';
-import {Observable} from 'rxjs';
+import { BehaviorSubject, from, Observable, of, scan } from 'rxjs';
 import {RemoteData} from '../../../core/data/remote-data';
 import {PaginatedList} from '../../../core/data/paginated-list.model';
 import {NoContent} from '../../../core/shared/NoContent.model';
@@ -21,7 +21,13 @@ import {RestRequestMethod} from '../../../core/data/rest-request-method';
 import {CreateData, CreateDataImpl} from '../../../core/data/base/create-data';
 import {SearchDataImpl} from '../../../core/data/base/search-data';
 import { ADMIN_NOTIFY_MESSAGE } from "../models/admin-notify-message.resource-type";
-import { AdminNotifyMessage } from "../models/admin-notify-message.model";
+import { AdminNotifyMessage, QueueStatusMap } from "../models/admin-notify-message.model";
+import { SearchResult } from "../../../shared/search/models/search-result.model";
+import { map, mergeMap } from "rxjs/operators";
+import { getAllSucceededRemoteDataPayload } from "../../../core/shared/operators";
+import { AdminNotifySearchResult } from "../models/admin-notify-message-search-result.model";
+import { LdnServicesService } from "../../admin-ldn-services/ldn-services-data/ldn-services-data.service";
+import { ItemDataService } from "../../../core/data/item-data.service";
 
 /**
  * Injectable service responsible for fetching/sending data from/to the REST API on the messages endpoint.
@@ -39,7 +45,77 @@ export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNot
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
+    private ldnServicesService: LdnServicesService,
+    private itemDataService: ItemDataService,
   ) {
     super('messages', requestService, rdbService, objectCache, halService);
   }
+
+  /**
+   * Map labels to readable info for user
+   * @param message the message to which map the labels
+   */
+  public formatMessageLabels(message: AdminNotifyMessage) : AdminNotifyMessage {
+    message.coarNotifyType = message.coarNotifyType?.split(':')[1];
+    message.queueStatusLabel = QueueStatusMap[message.queueStatusLabel];
+    return message;
+  }
+
+  /**
+   * Add detailed information to each message
+   * @param messages the messages to which add detailded info
+   */
+  public getDetailedMessages(messages: AdminNotifyMessage[]) : Observable<AdminNotifyMessage[]> {
+    return from(messages.map(message => this.formatMessageLabels(message))).pipe(
+      mergeMap(message =>
+        message.target ? this.ldnServicesService.findById(message.target.toString()).pipe(
+          getAllSucceededRemoteDataPayload(),
+          map(detail => ({...message, target: detail.name}))
+        ) : of(message),
+      ),
+      mergeMap(message =>
+        message.object ? this.itemDataService.findById(message.object.toString()).pipe(
+          getAllSucceededRemoteDataPayload(),
+          map(detail => ({...message, object: detail.name}))
+        ) : of(message),
+      ),
+      mergeMap(message =>
+        message.origin ? this.ldnServicesService.findById(message.origin.toString()).pipe(
+          getAllSucceededRemoteDataPayload(),
+          map(detail => ({...message, origin: detail.name}))
+        ) : of(message),
+      ),
+      mergeMap(message =>
+        message.context ? this.itemDataService.findById(message.context.toString()).pipe(
+          getAllSucceededRemoteDataPayload(),
+          map(detail => ({...message, context: detail.name}))
+        ) : of(message),
+      ),
+      scan((acc: any, value: any) => [...acc, value], []),
+    )
+  }
+
+  /**
+   * Reprocess message in status QUEUE_STATUS_QUEUED_FOR_RETRY and update results
+   * @param message the message to reprocess
+   * @param messageSubject the current visualised messages source
+   */
+  public reprocessMessage(message: AdminNotifyMessage, messageSubject: BehaviorSubject<AdminNotifyMessage[]>) : Observable<AdminNotifyMessage[]> {
+    return this.findById(message.id).pipe(
+      getAllSucceededRemoteDataPayload(),
+      map(reprocessedMessage => this.formatMessageLabels(reprocessedMessage)),
+      mergeMap((newMessage) =>  messageSubject.pipe(
+        map(messages => {
+          const messageToUpdate = messages.find(currentMessage => currentMessage.id === message.id);
+          const indexOfMessageToUpdate = messages.indexOf(messageToUpdate);
+          newMessage.target = messageToUpdate.target;
+          newMessage.object = messageToUpdate.object;
+          newMessage.origin = messageToUpdate.origin;
+          newMessage.context = messageToUpdate.context;
+          messages[indexOfMessageToUpdate] = newMessage;
+          return messages
+        })
+      )),
+    )
+  }
 }
diff --git a/src/app/core/shared/context.model.ts b/src/app/core/shared/context.model.ts
index 1526be1033..dcebf5794c 100644
--- a/src/app/core/shared/context.model.ts
+++ b/src/app/core/shared/context.model.ts
@@ -40,6 +40,5 @@ export enum Context {
 
   Bitstream = 'bitstream',
 
-  CoarNotifyIncoming = 'coarNotifyIncoming',
-  CoarNotifyOutgoing = 'coarNotifyOutgoing',
+  CoarNotify = 'coarNotify',
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 60134d54e3..b93abdf993 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3529,7 +3529,51 @@
 
   "sorting.queue_attempts.ASC": "Queue attempted Ascending",
 
-  "orgunit.listelement.badge": "Organizational Unit",
+  "type.notify-detail-modal": "Type",
+
+  "id.notify-detail-modal": "Id",
+
+  "coarNotifyType.notify-detail-modal": "Coar Notify type",
+
+  "activityStreamType.notify-detail-modal": "Activity stream type",
+
+  "inReplyTo.notify-detail-modal": "In reply to",
+
+  "object.notify-detail-modal": "Repository Item",
+
+  "context.notify-detail-modal": "Repository Item",
+
+  "queueAttempts.notify-detail-modal": "Queue attempts",
+
+  "queueLastStartTime.notify-detail-modal": "Queue last started",
+
+  "origin.notify-detail-modal": "LDN Service",
+
+  "target.notify-detail-modal": "LDN Service",
+
+  "queueStatusLabel.notify-detail-modal": "Queue status",
+
+  "queueTimeout.notify-detail-modal": "Queue timeout",
+
+  "notify-message-modal.title": "Message Detail",
+
+  "notify-message-result.timestamp": "Timestamp",
+
+  "notify-message-result.repositoryItem": "Repository Item",
+
+  "notify-message-result.ldnService": "LDN Service",
+
+  "notify-message-result.type": "Type",
+
+  "notify-message-result.status": "Status",
+
+  "notify-message-result.action": "Action",
+
+  "notify-message-result.detail": "Detail",
+
+  "notify-message-result.reprocess": "Reprocess",
+
+  "orgunit.listelement.badge": "Repository Item",
 
   "orgunit.listelement.no-title": "Untitled",
 

From c20d79850214244b20074b6f0cda8c3b8cbc5734 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 8 Jan 2024 18:04:49 +0100
Subject: [PATCH 29/45] clean up, fix tests, add missing translations

---
 .../admin-notify-dashboard-routing.module.ts  |  4 +-
 .../admin-notify-dashboard.component.ts       |  4 +-
 .../admin-notify-dashboard.module.ts          |  4 +-
 .../admin-notify-detail-modal.component.html  |  2 +-
 ...dmin-notify-detail-modal.component.spec.ts |  4 +-
 .../admin-notify-incoming.component.spec.ts   | 23 ++++----
 .../admin-notify-incoming.component.ts        |  2 +-
 .../admin-notify-outgoing.component.spec.ts   | 23 ++++----
 .../admin-notify-outgoing.component.ts        |  2 +-
 .../admin-notify-search-result.component.html | 14 ++---
 ...min-notify-search-result.component.spec.ts | 57 ++++++++++++++++++-
 .../admin-notify-search-result.component.ts   | 24 ++++----
 .../models/admin-notify-message.model.ts      | 20 +++----
 .../services/admin-notify-messages.service.ts | 39 ++++---------
 .../search-navbar/search-navbar.component.ts  |  1 -
 ...-object-component-loader.component.spec.ts |  2 +-
 ...bulatable-objects-loader.component.spec.ts | 31 ++++------
 .../search-facet-option.component.ts          |  2 +-
 .../search-facet-range-option.component.ts    |  2 +-
 .../search-facet-selected-option.component.ts |  2 +-
 src/assets/i18n/en.json5                      | 14 +++++
 21 files changed, 159 insertions(+), 117 deletions(-)

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 7f74c023ff..94f0347f49 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
@@ -8,10 +8,10 @@ import {
 } from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
 import {
   AdminNotifyIncomingComponent
-} from "./admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component";
+} from './admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component';
 import {
   AdminNotifyOutgoingComponent
-} from "./admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component";
+} from './admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component';
 
 @NgModule({
   imports: [
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index 3d4f35a54c..3156a4ce45 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -1,4 +1,4 @@
-import { Component, InjectionToken, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { SearchService } from '../../core/shared/search/search.service';
 import { environment } from '../../../environments/environment';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
@@ -12,7 +12,7 @@ import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
 import { ViewMode } from '../../core/shared/view-mode.model';
 import { Router } from '@angular/router';
-import { SearchConfigurationService } from "../../core/shared/search/search-configuration.service";
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 
 
 @Component({
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
index 1383b14443..2b6e1a8880 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
@@ -14,8 +14,8 @@ import {
 import { AdminNotifyDetailModalComponent } from './admin-notify-detail-modal/admin-notify-detail-modal.component';
 import {
   AdminNotifySearchResultComponent
-} from "./admin-notify-search-result/admin-notify-search-result.component";
-import { AdminNotifyMessagesService } from "./services/admin-notify-messages.service";
+} from './admin-notify-search-result/admin-notify-search-result.component';
+import { AdminNotifyMessagesService } from './services/admin-notify-messages.service';
 
 
 @NgModule({
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
index bbbfc22ed4..29f4e12f4c 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
@@ -8,7 +8,7 @@
     <div *ngFor="let key of notifyMessageKeys">
       <div class="row mb-4">
         <div class="font-weight-bold col-sm">{{ key + '.notify-detail-modal' | translate}}</div>
-        <div class="text-nowrap col-sm text-right">{{ notifyMessage[key] }}</div>
+        <div class="text-nowrap col-sm text-right">{{ notifyMessage[key] | translate }}</div>
       </div>
     </div>
 </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts
index 77a878429c..e4c701ea9d 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts
@@ -1,7 +1,8 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AdminNotifyDetailModalComponent } from './admin-notify-detail-modal.component';
-import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
 
 describe('AdminNotifyDetailModalComponent', () => {
   let component: AdminNotifyDetailModalComponent;
@@ -9,6 +10,7 @@ describe('AdminNotifyDetailModalComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
       declarations: [ AdminNotifyDetailModalComponent ],
       providers: [NgbActiveModal]
     })
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
index 14d6c6a1eb..f7388c5210 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
@@ -2,18 +2,17 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AdminNotifyIncomingComponent } from './admin-notify-incoming.component';
 import { TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute } from "@angular/router";
-import { MockActivatedRoute } from "../../../../shared/mocks/active-router.mock";
-import { provideMockStore } from "@ngrx/store/testing";
-import { HALEndpointService } from "../../../../core/shared/hal-endpoint.service";
-import { SEARCH_CONFIG_SERVICE } from "../../../../my-dspace-page/my-dspace-page.component";
-import { FILTER_CONFIG, SearchFilterService } from "../../../../core/shared/search/search-filter.service";
-import { RouteService } from "../../../../core/services/route.service";
-import { routeServiceStub } from "../../../../shared/testing/route-service.stub";
-import { RequestService } from "../../../../core/data/request.service";
-import { RemoteDataBuildService } from "../../../../core/cache/builders/remote-data-build.service";
-import { getMockRemoteDataBuildService } from "../../../../shared/mocks/remote-data-build.service.mock";
-import { SearchConfigurationService } from "../../../../core/shared/search/search-configuration.service";
+import { ActivatedRoute } from '@angular/router';
+import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock';
+import { provideMockStore } from '@ngrx/store/testing';
+import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { RouteService } from '../../../../core/services/route.service';
+import { routeServiceStub } from '../../../../shared/testing/route-service.stub';
+import { RequestService } from '../../../../core/data/request.service';
+import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
+import { getMockRemoteDataBuildService } from '../../../../shared/mocks/remote-data-build.service.mock';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 
 describe('AdminNotifyIncomingComponent', () => {
   let component: AdminNotifyIncomingComponent;
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
index d895e35ede..799d959107 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
@@ -1,7 +1,7 @@
 import { Component, Inject } from '@angular/core';
 import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
 import { Context } from '../../../../core/shared/context.model';
-import { SearchConfigurationService } from "../../../../core/shared/search/search-configuration.service";
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 
 
 @Component({
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
index 9d3ab2fe46..a8af9a7fd6 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
@@ -2,18 +2,17 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AdminNotifyOutgoingComponent } from './admin-notify-outgoing.component';
 import { TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute } from "@angular/router";
-import { MockActivatedRoute } from "../../../../shared/mocks/active-router.mock";
-import { provideMockStore } from "@ngrx/store/testing";
-import { HALEndpointService } from "../../../../core/shared/hal-endpoint.service";
-import { SEARCH_CONFIG_SERVICE } from "../../../../my-dspace-page/my-dspace-page.component";
-import { FILTER_CONFIG } from "../../../../core/shared/search/search-filter.service";
-import { RouteService } from "../../../../core/services/route.service";
-import { routeServiceStub } from "../../../../shared/testing/route-service.stub";
-import { RequestService } from "../../../../core/data/request.service";
-import { getMockRemoteDataBuildService } from "../../../../shared/mocks/remote-data-build.service.mock";
-import { RemoteDataBuildService } from "../../../../core/cache/builders/remote-data-build.service";
-import { SearchConfigurationService } from "../../../../core/shared/search/search-configuration.service";
+import { ActivatedRoute } from '@angular/router';
+import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock';
+import { provideMockStore } from '@ngrx/store/testing';
+import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { RouteService } from '../../../../core/services/route.service';
+import { routeServiceStub } from '../../../../shared/testing/route-service.stub';
+import { RequestService } from '../../../../core/data/request.service';
+import { getMockRemoteDataBuildService } from '../../../../shared/mocks/remote-data-build.service.mock';
+import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 
 describe('AdminNotifyOutgoingComponent', () => {
   let component: AdminNotifyOutgoingComponent;
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
index d85ec2daae..1ef71be719 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
@@ -1,7 +1,7 @@
 import { Component, Inject } from '@angular/core';
 import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
 import { Context } from '../../../../core/shared/context.model';
-import { SearchConfigurationService } from "../../../../core/shared/search/search-configuration.service";
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 
 
 @Component({
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
index 310a04c1ed..c4fd93d2e0 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -13,21 +13,21 @@
       <tbody>
         <tr *ngFor="let message of (messagesSubject$ | async)">
           <td>
-            <div>{{message.queueTimeout}}</div>
+            <div>{{ message.queueTimeout }}</div>
           </td>
           <td>
-            <div *ngIf="isInbound">{{message.context}}</div>
-            <div *ngIf="!isInbound">{{message.object}}</div>
+            <div *ngIf="isInbound">{{ message.context }}</div>
+            <div *ngIf="!isInbound">{{ message.object }}</div>
           </td>
           <td>
-            <div *ngIf="isInbound">{{message.origin}}</div>
-            <div *ngIf="!isInbound">{{message.target}}</div>
+            <div *ngIf="isInbound">{{ message.origin }}</div>
+            <div *ngIf="!isInbound">{{ message.target }}</div>
           </td>
           <td>
-            <div>{{message.coarNotifyType}}</div>
+            <div>{{ message.coarNotifyType }}</div>
           </td>
           <td>
-            <div>{{message.queueStatusLabel}}</div>
+            <div>{{ message.queueStatusLabel | translate}}</div>
           </td>
           <td>
             <div class="d-flex flex-column">
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
index b17a03274f..0c1eee81c3 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
@@ -1,13 +1,68 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AdminNotifySearchResultComponent } from './admin-notify-search-result.component';
+import { AdminNotifyMessagesService } from '../services/admin-notify-messages.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RequestService } from '../../../core/data/request.service';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { cold } from 'jasmine-marbles';
+import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+import { RouteService } from '../../../core/services/route.service';
+import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { ActivatedRoute } from '@angular/router';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { TranslateModule } from '@ngx-translate/core';
+import { EMPTY } from 'rxjs';
 
 describe('AdminNotifySearchResultComponent', () => {
   let component: AdminNotifySearchResultComponent;
   let fixture: ComponentFixture<AdminNotifySearchResultComponent>;
+  let objectCache: ObjectCacheService;
+  let requestService: RequestService;
+  let halService: HALEndpointService;
+  let rdbService: RemoteDataBuildService;
+  let adminNotifyMessageService: AdminNotifyMessagesService;
+  const requestUUID = '34cfed7c-f597-49ef-9cbe-ea351f0023c2';
+  const testObject = {
+    uuid: 'test-property',
+    name: 'test-property',
+    values: ['value-1', 'value-2']
+  } as ConfigurationProperty;
+
 
   beforeEach(async () => {
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: cold('a', { a: '' })
+    });
+    adminNotifyMessageService = jasmine.createSpyObj('adminNotifyMessageService', {
+      getDetailedMessages: EMPTY
+    });
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true
+    });
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: cold('a', {
+        a: {
+          payload: testObject
+        }
+      })
+    });
+    objectCache = {} as ObjectCacheService;
+
+
     await TestBed.configureTestingModule({
-      declarations: [ AdminNotifySearchResultComponent ]
+      imports: [TranslateModule.forRoot()],
+      declarations: [ AdminNotifySearchResultComponent ],
+      providers: [
+        {provide: AdminNotifyMessagesService, useValue: adminNotifyMessageService},
+        { provide: RouteService, useValue: routeServiceStub },
+        { provide: ActivatedRoute, useValue: new RouterStub() },
+        { provide: HALEndpointService, useValue: halService },
+        { provide: ObjectCacheService, useValue: objectCache },
+        { provide: RequestService, useValue: requestService },
+        { provide: RemoteDataBuildService, useValue: rdbService },
+      ]
     })
     .compileComponents();
 
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 f75eab3366..dd4a159bf9 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
@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component, Inject, OnDestroy, OnInit } from '@angular/core';
+import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
 import { AdminNotifySearchResult } from '../models/admin-notify-message-search-result.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { Context } from '../../../core/shared/context.model';
@@ -12,14 +12,10 @@ import {
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
-import { LdnServicesService } from "../../admin-ldn-services/ldn-services-data/ldn-services-data.service";
-import { BehaviorSubject, from, Observable, of, scan, Subscription, switchMap } from "rxjs";
-import { combineLatest, filter, map, mergeMap, tap } from "rxjs/operators";
-import { getAllSucceededRemoteDataPayload } from "../../../core/shared/operators";
-import { ItemDataService } from "../../../core/data/item-data.service";
-import { AdminNotifyMessagesService } from "../services/admin-notify-messages.service";
-import { SearchConfigurationService } from "../../../core/shared/search/search-configuration.service";
-import { SEARCH_CONFIG_SERVICE } from "../../../my-dspace-page/my-dspace-page.component";
+import { BehaviorSubject, Subscription } from 'rxjs';
+import { AdminNotifyMessagesService } from '../services/admin-notify-messages.service';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 
 @tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotify)
 @Component({
@@ -55,7 +51,7 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme
    * Map messages on init for readable representation
    */
   ngOnInit() {
-    this.mapDetailsToMessages()
+    this.mapDetailsToMessages();
     this.subs.push(this.searchConfigService.getCurrentConfiguration('')
       .subscribe(configuration => {
         this.isInbound = configuration === 'NOTIFY.incoming';
@@ -102,10 +98,10 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme
     this.subs.push(
       this.adminNotifyMessagesService.reprocessMessage(message, this.messagesSubject$)
         .subscribe(response => {
-          this.messagesSubject$.next(response)
+          this.messagesSubject$.next(response);
         }
       )
-    )
+    );
   }
 
 
@@ -116,7 +112,7 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme
   private mapDetailsToMessages() {
     this.subs.push(this.adminNotifyMessagesService.getDetailedMessages(this.objects?.page.map(pageResult => pageResult.indexableObject))
       .subscribe(response => {
-        this.messagesSubject$.next(response)
-    }))
+        this.messagesSubject$.next(response);
+    }));
   }
 }
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
index 4c36e01eaf..872b699228 100644
--- a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
@@ -1,21 +1,21 @@
-import { autoserialize, autoserializeAs, deserialize, inheritSerialization } from 'cerialize';
+import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
 import { typedObject } from '../../../core/cache/builders/build-decorators';
 import { ADMIN_NOTIFY_MESSAGE } from './admin-notify-message.resource-type';
 import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { GenericConstructor } from '../../../core/shared/generic-constructor';
 import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
-import { Observable } from "rxjs";
+import { Observable } from 'rxjs';
 
 export enum QueueStatusMap {
-  QUEUE_STATUS_PROCESSED = 'Processed',
-  QUEUE_STATUS_FAILED = 'Failed',
-  QUEUE_STATUS_UNMAPPED_ACTION = 'Unmapped action',
-  QUEUE_STATUS_QUEUED_FOR_RETRY = 'Queued for retry',
-  QUEUE_STATUS_PROCESSING = 'Processing',
-  QUEUE_STATUS_QUEUED = 'Queued',
-  QUEUE_STATUS_UNTRUSTED = 'Untrusted',
-};
+  QUEUE_STATUS_PROCESSED = 'notify-queue-status.processed',
+  QUEUE_STATUS_FAILED = 'notify-queue-status.processed',
+  QUEUE_STATUS_UNMAPPED_ACTION = 'notify-queue-status.unmapped_action',
+  QUEUE_STATUS_QUEUED_FOR_RETRY = 'notify-queue-status.queue_retry',
+  QUEUE_STATUS_PROCESSING = 'notify-queue-status.processing',
+  QUEUE_STATUS_QUEUED = 'notify-queue-status.queued',
+  QUEUE_STATUS_UNTRUSTED = 'notify-queue-status.untrusted',
+}
 /**
  * A message that includes admin notify info
  */
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 d61c6f7712..5820f3b7d6 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
@@ -1,33 +1,18 @@
 import {Injectable} from '@angular/core';
 import {dataService} from '../../../core/data/base/data-service.decorator';
 import {IdentifiableDataService} from '../../../core/data/base/identifiable-data.service';
-import {FindAllData, FindAllDataImpl} from '../../../core/data/base/find-all-data';
-import {DeleteData, DeleteDataImpl} from '../../../core/data/base/delete-data';
 import {RequestService} from '../../../core/data/request.service';
 import {RemoteDataBuildService} from '../../../core/cache/builders/remote-data-build.service';
 import {ObjectCacheService} from '../../../core/cache/object-cache.service';
 import {HALEndpointService} from '../../../core/shared/hal-endpoint.service';
 import {NotificationsService} from '../../../shared/notifications/notifications.service';
-import {FindListOptions} from '../../../core/data/find-list-options.model';
-import {FollowLinkConfig} from '../../../shared/utils/follow-link-config.model';
 import { BehaviorSubject, from, Observable, of, scan } from 'rxjs';
-import {RemoteData} from '../../../core/data/remote-data';
-import {PaginatedList} from '../../../core/data/paginated-list.model';
-import {NoContent} from '../../../core/shared/NoContent.model';
-import {PatchData, PatchDataImpl} from '../../../core/data/base/patch-data';
-import {ChangeAnalyzer} from '../../../core/data/change-analyzer';
-import {Operation} from 'fast-json-patch';
-import {RestRequestMethod} from '../../../core/data/rest-request-method';
-import {CreateData, CreateDataImpl} from '../../../core/data/base/create-data';
-import {SearchDataImpl} from '../../../core/data/base/search-data';
-import { ADMIN_NOTIFY_MESSAGE } from "../models/admin-notify-message.resource-type";
-import { AdminNotifyMessage, QueueStatusMap } from "../models/admin-notify-message.model";
-import { SearchResult } from "../../../shared/search/models/search-result.model";
-import { map, mergeMap } from "rxjs/operators";
-import { getAllSucceededRemoteDataPayload } from "../../../core/shared/operators";
-import { AdminNotifySearchResult } from "../models/admin-notify-message-search-result.model";
-import { LdnServicesService } from "../../admin-ldn-services/ldn-services-data/ldn-services-data.service";
-import { ItemDataService } from "../../../core/data/item-data.service";
+import { ADMIN_NOTIFY_MESSAGE } from '../models/admin-notify-message.resource-type';
+import { AdminNotifyMessage, QueueStatusMap } from '../models/admin-notify-message.model';
+import { map, mergeMap } from 'rxjs/operators';
+import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { LdnServicesService } from '../../admin-ldn-services/ldn-services-data/ldn-services-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
 
 /**
  * Injectable service responsible for fetching/sending data from/to the REST API on the messages endpoint.
@@ -55,7 +40,7 @@ export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNot
    * Map labels to readable info for user
    * @param message the message to which map the labels
    */
-  public formatMessageLabels(message: AdminNotifyMessage) : AdminNotifyMessage {
+  public formatMessageLabels(message: AdminNotifyMessage): AdminNotifyMessage {
     message.coarNotifyType = message.coarNotifyType?.split(':')[1];
     message.queueStatusLabel = QueueStatusMap[message.queueStatusLabel];
     return message;
@@ -65,7 +50,7 @@ export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNot
    * Add detailed information to each message
    * @param messages the messages to which add detailded info
    */
-  public getDetailedMessages(messages: AdminNotifyMessage[]) : Observable<AdminNotifyMessage[]> {
+  public getDetailedMessages(messages: AdminNotifyMessage[]): Observable<AdminNotifyMessage[]> {
     return from(messages.map(message => this.formatMessageLabels(message))).pipe(
       mergeMap(message =>
         message.target ? this.ldnServicesService.findById(message.target.toString()).pipe(
@@ -92,7 +77,7 @@ export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNot
         ) : of(message),
       ),
       scan((acc: any, value: any) => [...acc, value], []),
-    )
+    );
   }
 
   /**
@@ -100,7 +85,7 @@ export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNot
    * @param message the message to reprocess
    * @param messageSubject the current visualised messages source
    */
-  public reprocessMessage(message: AdminNotifyMessage, messageSubject: BehaviorSubject<AdminNotifyMessage[]>) : Observable<AdminNotifyMessage[]> {
+  public reprocessMessage(message: AdminNotifyMessage, messageSubject: BehaviorSubject<AdminNotifyMessage[]>): Observable<AdminNotifyMessage[]> {
     return this.findById(message.id).pipe(
       getAllSucceededRemoteDataPayload(),
       map(reprocessedMessage => this.formatMessageLabels(reprocessedMessage)),
@@ -113,9 +98,9 @@ export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNot
           newMessage.origin = messageToUpdate.origin;
           newMessage.context = messageToUpdate.context;
           messages[indexOfMessageToUpdate] = newMessage;
-          return messages
+          return messages;
         })
       )),
-    )
+    );
   }
 }
diff --git a/src/app/search-navbar/search-navbar.component.ts b/src/app/search-navbar/search-navbar.component.ts
index 98e64f6e10..09bca42a06 100644
--- a/src/app/search-navbar/search-navbar.component.ts
+++ b/src/app/search-navbar/search-navbar.component.ts
@@ -64,7 +64,6 @@ export class SearchNavbarComponent {
     const queryParams = Object.assign({}, data);
     const linkToNavigateTo = [this.searchService.getSearchLink().replace('/', '')];
     this.searchForm.reset();
-
     this.router.navigate(linkToNavigateTo, {
       queryParams: queryParams,
       queryParamsHandling: 'merge'
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
index e893fe807b..40422d3fce 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
@@ -18,7 +18,7 @@ const testType = 'TestType';
 const testContext = Context.Search;
 const testViewMode = ViewMode.StandalonePage;
 
-class TestType extends ListableObject {
+export class TestType extends ListableObject {
   getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
     return [testType];
   }
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts
index 21fd2b94b2..a887482fa7 100644
--- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts
@@ -1,31 +1,24 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TabulatableObjectsLoaderComponent } from './tabulatable-objects-loader.component';
-import { ThemeService } from "../../../theme-support/theme.service";
-import { provideMockStore } from "@ngrx/store/testing";
-import { ListableObject } from "../listable-object.model";
-import { PaginatedList } from "../../../../core/data/paginated-list.model";
-import { Context } from "../../../../core/shared/context.model";
-import { GenericConstructor } from "../../../../core/shared/generic-constructor";
-import { TabulatableObjectsDirective } from "./tabulatable-objects.directive";
-import { ListableObjectComponentLoaderComponent } from "../listable-object/listable-object-component-loader.component";
-import { ChangeDetectionStrategy } from "@angular/core";
-import {
-  ItemListElementComponent
-} from "../../../object-list/item-list-element/item-types/item/item-list-element.component";
+import { ThemeService } from '../../../theme-support/theme.service';
+import { provideMockStore } from '@ngrx/store/testing';
+import { ListableObject } from '../listable-object.model';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { Context } from '../../../../core/shared/context.model';
+import { TabulatableObjectsDirective } from './tabulatable-objects.directive';
+import { ChangeDetectionStrategy } from '@angular/core';
+
+
 import {
   TabulatableResultListElementsComponent
-} from "../../../object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component";
+} from '../../../object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
+import { TestType } from '../listable-object/listable-object-component-loader.component.spec';
 
 const testType = 'TestType';
-class TestType extends ListableObject {
-  getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
-    return [testType];
-  }
-}
 
 class TestTypes extends PaginatedList<ListableObject> {
-  page: TestType[] = [new TestType()]
+  page: TestType[] = [new TestType()];
 }
 
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
index b14d3187d7..cdbab61a30 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
@@ -1,6 +1,6 @@
 import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Component, Inject, Input, OnDestroy, OnInit } from '@angular/core';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { FacetValue } from '../../../../models/facet-value.model';
 import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
index 6afe994f2f..b08a54e42b 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
@@ -1,6 +1,6 @@
 import { Observable, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Component, Inject, Input, OnDestroy, OnInit } from '@angular/core';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { FacetValue } from '../../../../models/facet-value.model';
 import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
index 8479417c57..4566b882eb 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
@@ -1,5 +1,5 @@
 import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { Component, Inject, Input, OnDestroy, OnInit } from '@angular/core';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
 import { SearchService } from '../../../../../../core/shared/search/search.service';
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index b93abdf993..da0d1a3f82 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3573,6 +3573,20 @@
 
   "notify-message-result.reprocess": "Reprocess",
 
+  "notify-queue-status.processed": "Processed",
+
+  "notify-queue-status.failed": "Failed",
+
+  "notify-queue-status.queue_retry": "Queued for retry",
+
+  "notify-queue-status.unmapped_action": "Unmapped action",
+
+  "notify-queue-status.processing": "Processing",
+
+  "notify-queue-status.queued": "Queued",
+
+  "notify-queue-status.untrusted": "Untrusted",
+
   "orgunit.listelement.badge": "Repository Item",
 
   "orgunit.listelement.no-title": "Untitled",

From 937abc0d50ec0c4e95d854ee82cabe87a365bdbf Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 8 Jan 2024 18:14:16 +0100
Subject: [PATCH 30/45] clean up

---
 src/app/admin/admin-routing-paths.ts          |  1 +
 src/app/admin/admin.module.ts                 |  2 +-
 .../search/search-configuration.service.ts    | 23 ++++---------------
 .../shared/search/search-filter.service.ts    |  4 ++--
 src/app/core/shared/search/search.service.ts  |  9 ++++----
 .../search-navbar/search-navbar.component.ts  |  1 +
 ...table-object-component-loader.component.ts |  1 +
 .../search-filters.component.ts               |  2 +-
 8 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/src/app/admin/admin-routing-paths.ts b/src/app/admin/admin-routing-paths.ts
index c08139bd87..df8a3eb855 100644
--- a/src/app/admin/admin-routing-paths.ts
+++ b/src/app/admin/admin-routing-paths.ts
@@ -15,6 +15,7 @@ export function getRegistriesModuleRoute() {
 export function getNotificationsModuleRoute() {
   return new URLCombiner(getAdminModuleRoute(), NOTIFICATIONS_MODULE_PATH).toString();
 }
+
 export function getLdnServicesModuleRoute() {
   return new URLCombiner(getAdminModuleRoute(), LDN_PATH).toString();
 }
diff --git a/src/app/admin/admin.module.ts b/src/app/admin/admin.module.ts
index d77c3213b3..3dc0036854 100644
--- a/src/app/admin/admin.module.ts
+++ b/src/app/admin/admin.module.ts
@@ -34,7 +34,7 @@ const ENTRY_COMPONENTS = [
   declarations: [
     AdminCurationTasksComponent,
     MetadataImportPageComponent,
-    BatchImportPageComponent,
+    BatchImportPageComponent
   ]
 })
 export class AdminModule {
diff --git a/src/app/core/shared/search/search-configuration.service.ts b/src/app/core/shared/search/search-configuration.service.ts
index 36202ae11c..9d93eced8e 100644
--- a/src/app/core/shared/search/search-configuration.service.ts
+++ b/src/app/core/shared/search/search-configuration.service.ts
@@ -28,7 +28,6 @@ import { FacetConfigResponseParsingService } from '../../data/facet-config-respo
 import { ViewMode } from '../view-mode.model';
 import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
 import { FacetConfigResponse } from '../../../shared/search/models/facet-config-response.model';
-import { DspaceRestResponseParsingService } from '../../data/dspace-rest-response-parsing.service';
 
 /**
  * Service that performs all actions that have to do with the current search configuration
@@ -44,7 +43,7 @@ export class SearchConfigurationService implements OnDestroy {
   /**
    * Endpoint link path for retrieving facet config incl values
    */
-  protected facetLinkPathPrefix = 'discover/facets/';
+  private facetLinkPathPrefix = 'discover/facets/';
 
   /**
    * Default pagination id
@@ -61,11 +60,6 @@ export class SearchConfigurationService implements OnDestroy {
    */
   public paginatedSearchOptions: BehaviorSubject<PaginatedSearchOptions>;
 
-  /**
-   * The name of the param to enhance and store the route config
-   */
-  public routeConfigurationName: string;
-
   /**
    * Default pagination settings
    */
@@ -137,7 +131,7 @@ export class SearchConfigurationService implements OnDestroy {
   getCurrentConfiguration(defaultConfiguration: string) {
     return observableCombineLatest([
       this.routeService.getQueryParameterValue('configuration').pipe(startWith(undefined)),
-      this.routeService.getRouteParameterValue(this.routeConfigurationName ?? 'configuration').pipe(startWith(undefined))
+      this.routeService.getRouteParameterValue('configuration').pipe(startWith(undefined))
     ]).pipe(
       map(([queryConfig, routeConfig]) => {
         return queryConfig || routeConfig || defaultConfiguration;
@@ -463,7 +457,7 @@ export class SearchConfigurationService implements OnDestroy {
     return this.rdb.buildFromHref(href$);
   }
 
-  protected getConfigUrl(url: string, scope?: string, configurationName?: string) {
+  private getConfigUrl(url: string, scope?: string, configurationName?: string) {
     const args: string[] = [];
 
     if (isNotEmpty(scope)) {
@@ -489,7 +483,7 @@ export class SearchConfigurationService implements OnDestroy {
    * @param {string} configurationName the name of the configuration
    * @returns {Observable<RemoteData<SearchFilterConfig[]>>} The found filter configuration
    */
-  getConfig(scope?: string, configurationName?: string, facetParser?: DspaceRestResponseParsingService): Observable<RemoteData<SearchFilterConfig[]>> {
+  getConfig(scope?: string, configurationName?: string): Observable<RemoteData<SearchFilterConfig[]>> {
     const href$ = this.halService.getEndpoint(this.facetLinkPathPrefix).pipe(
       map((url: string) => this.getConfigUrl(url, scope, configurationName)),
     );
@@ -540,13 +534,4 @@ export class SearchConfigurationService implements OnDestroy {
       return { view };
     }));
   }
-
-  /**
-   * Set param to use for multiple configurations on same page and reload search subscriptions
-   */
-  setRouteConfigurationParamName(configName: string): void {
-    this.routeConfigurationName = configName;
-    this.unsubscribeFromSearchOptions(this.paginationID);
-    this.setSearchSubscription(this.paginationID, this.paginatedSearchOptions.value);
-  }
 }
diff --git a/src/app/core/shared/search/search-filter.service.ts b/src/app/core/shared/search/search-filter.service.ts
index 4b4d7a80d7..80ba200d38 100644
--- a/src/app/core/shared/search/search-filter.service.ts
+++ b/src/app/core/shared/search/search-filter.service.ts
@@ -34,8 +34,8 @@ export const REFRESH_FILTER: InjectionToken<BehaviorSubject<any>> = new Injectio
 @Injectable()
 export class SearchFilterService {
 
-  constructor(protected store: Store<SearchFiltersState>,
-              protected routeService: RouteService) {
+  constructor(private store: Store<SearchFiltersState>,
+              private routeService: RouteService) {
   }
 
   /**
diff --git a/src/app/core/shared/search/search.service.ts b/src/app/core/shared/search/search.service.ts
index 986352f29f..a88a8b0d16 100644
--- a/src/app/core/shared/search/search.service.ts
+++ b/src/app/core/shared/search/search.service.ts
@@ -162,6 +162,7 @@ export class SearchService implements OnDestroy {
         getResponseParser: getResponseParserFn,
         searchOptions: searchOptions
       });
+
       this.requestService.send(request, useCachedVersionIfAvailable);
     });
 
@@ -188,11 +189,11 @@ export class SearchService implements OnDestroy {
   }
 
   /**
-   * Method to directly attach the notifyMessages to search results, instead of using RemoteData.
+   * Method to directly attach the indexableObjects to search results, instead of using RemoteData.
    * For compatibility with the way the search was written originally
    *
    * @param sqr$:                       a SearchObjects RemotaData Observable without its
-   *                                    notifyMessages attached
+   *                                    indexableObjects attached
    * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
    *                                    no valid cached version. Defaults to true
    * @param reRequestOnStale            Whether or not the request should automatically be re-
@@ -205,7 +206,7 @@ export class SearchService implements OnDestroy {
     return sqr$.pipe(
       switchMap((resultsRd: RemoteData<SearchObjects<T>>) => {
         if (hasValue(resultsRd.payload) && isNotEmpty(resultsRd.payload.page)) {
-          // retrieve the notifyMessages for all search results on the page
+          // retrieve the indexableObjects for all search results on the page
           const searchResult$Array: Observable<SearchResult<T>>[] = resultsRd.payload.page.map((result: SearchResult<T>) =>
             this.dspaceObjectService.findByHref(result._links.indexableObject.href, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow as any).pipe(
               getFirstCompletedRemoteData(),
@@ -227,7 +228,7 @@ export class SearchService implements OnDestroy {
           );
 
           // Swap the original page in the remoteData with the new one, now that the results have the
-          // correct types, and all notifyMessages are directly attached.
+          // correct types, and all indexableObjects are directly attached.
           return observableCombineLatest(searchResult$Array).pipe(
             map((page: SearchResult<T>[]) => {
 
diff --git a/src/app/search-navbar/search-navbar.component.ts b/src/app/search-navbar/search-navbar.component.ts
index 09bca42a06..98e64f6e10 100644
--- a/src/app/search-navbar/search-navbar.component.ts
+++ b/src/app/search-navbar/search-navbar.component.ts
@@ -64,6 +64,7 @@ export class SearchNavbarComponent {
     const queryParams = Object.assign({}, data);
     const linkToNavigateTo = [this.searchService.getSearchLink().replace('/', '')];
     this.searchForm.reset();
+
     this.router.navigate(linkToNavigateTo, {
       queryParams: queryParams,
       queryParamsHandling: 'merge'
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
index 3110283ddd..7a3cc42bf5 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
@@ -154,6 +154,7 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges
   }
 
   private instantiateComponent(object: ListableObject, changes?: SimpleChanges): void {
+
     const component = this.getComponent(object.getRenderTypes(), this.viewMode, this.context);
 
     const viewContainerRef = this.listableObjectDirective.viewContainerRef;
diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
index 63235b3e57..766939226d 100644
--- a/src/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -71,7 +71,7 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
    */
   constructor(
     private searchService: SearchService,
-    protected filterService: SearchFilterService,
+    private filterService: SearchFilterService,
     private router: Router,
     @Inject(SEARCH_CONFIG_SERVICE) private searchConfigService: SearchConfigurationService) {
   }

From 7ce0bd0ce63bc3d1658547842beb3c2d67e25d14 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 8 Jan 2024 18:27:43 +0100
Subject: [PATCH 31/45] remove unused method

---
 .../admin-notify-dashboard.component.ts             | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index 3156a4ce45..2d9ab79eea 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -10,8 +10,6 @@ import { SearchObjects } from '../../shared/search/models/search-objects.model';
 import { AdminNotifyMetricsBox, AdminNotifyMetricsRow } from './admin-notify-metrics/admin-notify-metrics.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
-import { ViewMode } from '../../core/shared/view-mode.model';
-import { Router } from '@angular/router';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 
 
@@ -35,8 +33,8 @@ export class AdminNotifyDashboardComponent implements OnInit{
     id: 'single-result-options',
     pageSize: 1
   });
-  constructor(private searchService: SearchService,
-              private router: Router) {}
+  constructor(private searchService: SearchService) {
+  }
 
   ngOnInit() {
     const mertricsRowsConfigurations = this.metricsConfig
@@ -91,13 +89,6 @@ export class AdminNotifyDashboardComponent implements OnInit{
     });
   }
 
-  /**
-   * Activate Table view mode for search result rendering
-   */
-  activateTableMode() {
-    this.searchService.setViewMode(ViewMode.Table, this.getSearchLinkParts());
-  }
-
   /**
    * @returns {string} The base path to the search page, or the current page when inPlaceSearch is true
    */

From 728911899a0927995c040366b44551082abae696 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 9 Jan 2024 09:36:50 +0100
Subject: [PATCH 32/45] clean up

---
 .../admin-notify-dashboard.component.scss     |  0
 .../admin-notify-dashboard.component.ts       | 21 ++-----------------
 .../admin-notify-detail-modal.component.html  |  4 ++--
 .../admin-notify-detail-modal.component.scss  |  0
 .../admin-notify-detail-modal.component.ts    |  1 -
 .../admin-notify-incoming.component.scss      |  0
 .../admin-notify-incoming.component.ts        |  1 -
 .../admin-notify-outgoing.component.scss      |  0
 .../admin-notify-outgoing.component.ts        |  1 -
 .../admin-notify-metrics.component.scss       |  0
 .../admin-notify-metrics.component.ts         |  1 -
 .../admin-notify-search-result.component.scss |  0
 .../admin-notify-search-result.component.ts   |  1 -
 .../services/admin-notify-messages.service.ts |  2 +-
 .../tabulatable-objects-loader.component.scss |  3 ---
 .../tabulatable-objects-loader.component.ts   |  1 -
 src/app/shared/search/search.component.html   |  2 +-
 17 files changed, 6 insertions(+), 32 deletions(-)
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.scss
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.scss
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.scss
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.scss
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.scss
 delete mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.scss
 delete mode 100644 src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.scss

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.scss b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index 2d9ab79eea..d2a20334c7 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -16,7 +16,6 @@ import { SearchConfigurationService } from '../../core/shared/search/search-conf
 @Component({
   selector: 'ds-admin-notify-dashboard',
   templateUrl: './admin-notify-dashboard.component.html',
-  styleUrls: ['./admin-notify-dashboard.component.scss'],
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
@@ -33,6 +32,7 @@ export class AdminNotifyDashboardComponent implements OnInit{
     id: 'single-result-options',
     pageSize: 1
   });
+
   constructor(private searchService: SearchService) {
   }
 
@@ -84,25 +84,8 @@ export class AdminNotifyDashboardComponent implements OnInit{
     return this.metricsConfig.map(row => {
         return {
           ...row,
-          boxes: row.boxes.map(rowBox =>boxesWithCount.find(boxWithCount => boxWithCount.config === rowBox.config))
+          boxes: row.boxes.map(rowBox => boxesWithCount.find(boxWithCount => boxWithCount.config === rowBox.config))
         };
     });
   }
-
-  /**
-   * @returns {string} The base path to the search page, or the current page when inPlaceSearch is true
-   */
-  public getSearchLink(): string {
-    return this.searchService.getSearchLink();
-  }
-
-  /**
-   * @returns {string[]} The base path to the search page, or the current page when inPlaceSearch is true, split in separate pieces
-   */
-  public getSearchLinkParts(): string[] {
-    if (this.searchService) {
-      return [];
-    }
-    return this.getSearchLink().split('/');
-  }
 }
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
index 29f4e12f4c..1b7265774d 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
@@ -4,11 +4,11 @@
     <span aria-hidden="true">&times;</span>
   </button>
 </div>
-<div class="container p-4">
+<div class="modal-body p-4">
     <div *ngFor="let key of notifyMessageKeys">
       <div class="row mb-4">
         <div class="font-weight-bold col-sm">{{ key + '.notify-detail-modal' | translate}}</div>
-        <div class="text-nowrap col-sm text-right">{{ notifyMessage[key] | translate }}</div>
+        <div class="text-truncate col-sm text-right">{{ notifyMessage[key] | translate }}</div>
       </div>
     </div>
 </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.scss b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
index 3227e52420..fc9420b593 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
@@ -5,7 +5,6 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 @Component({
   selector: 'ds-admin-notify-detail-modal',
   templateUrl: './admin-notify-detail-modal.component.html',
-  styleUrls: ['./admin-notify-detail-modal.component.scss']
 })
 export class AdminNotifyDetailModalComponent {
   @Input() notifyMessage: AdminNotifyMessage;
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.scss b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
index 799d959107..7375a98abe 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
@@ -7,7 +7,6 @@ import { SearchConfigurationService } from '../../../../core/shared/search/searc
 @Component({
   selector: 'ds-admin-notify-incoming',
   templateUrl: './admin-notify-incoming.component.html',
-  styleUrls: ['./admin-notify-incoming.component.scss'],
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.scss b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
index 1ef71be719..290c8ace76 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
@@ -7,7 +7,6 @@ import { SearchConfigurationService } from '../../../../core/shared/search/searc
 @Component({
   selector: 'ds-admin-notify-outgoing',
   templateUrl: './admin-notify-outgoing.component.html',
-  styleUrls: ['./admin-notify-outgoing.component.scss'],
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.scss b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
index 57f834f872..ca5dd0115a 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
@@ -4,7 +4,6 @@ import { AdminNotifyMetricsRow } from './admin-notify-metrics.model';
 @Component({
   selector: 'ds-admin-notify-metrics',
   templateUrl: './admin-notify-metrics.component.html',
-  styleUrls: ['./admin-notify-metrics.component.scss']
 })
 export class AdminNotifyMetricsComponent {
 
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.scss b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
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 dd4a159bf9..1414d3de88 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
@@ -21,7 +21,6 @@ import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.co
 @Component({
   selector: 'ds-admin-notify-search-result',
   templateUrl: './admin-notify-search-result.component.html',
-  styleUrls: ['./admin-notify-search-result.component.scss'],
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
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 5820f3b7d6..3b3fd63ee4 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
@@ -71,7 +71,7 @@ export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNot
         ) : of(message),
       ),
       mergeMap(message =>
-        message.context ? this.itemDataService.findById(message.context.toString()).pipe(
+        message.context ? this.itemDataService.findById(message.context).pipe(
           getAllSucceededRemoteDataPayload(),
           map(detail => ({...message, context: detail.name}))
         ) : of(message),
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.scss b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.scss
deleted file mode 100644
index b9bc65ea45..0000000000
--- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-:host {
-  width: 100%;
-}
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
index 0ba9e1cdd4..b013af9891 100644
--- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
@@ -27,7 +27,6 @@ import { getTabulatableObjectsComponent } from './tabulatable-objects.decorator'
 @Component({
   selector: 'ds-tabulatable-objects-loader',
   templateUrl: './tabulatable-objects-loader.component.html',
-  styleUrls: ['./tabulatable-objects-loader.component.scss']
 })
 /**
  * Component for determining what component to use depending on the item's entity type (dspace.entity.type)
diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html
index d43f506866..b9525f1318 100644
--- a/src/app/shared/search/search.component.html
+++ b/src/app/shared/search/search.component.html
@@ -22,7 +22,7 @@
         </div>
         <div id="search-content" class="col-12">
             <div class="d-block d-md-none search-controls clearfix">
-                <ds-view-mode-switch [viewModeList]="viewModeList" [inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
+                <ds-view-mode-switch *ngIf="showViewModes" [viewModeList]="viewModeList" [inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
                 <button (click)="openSidebar()" aria-controls="#search-body"
                         class="btn btn-outline-primary float-right open-sidebar"><i
                         class="fas fa-sliders"></i> {{"search.sidebar.open"

From e04c3e6df5f1c1f04781e46c892814da67a55938 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 9 Jan 2024 10:01:57 +0100
Subject: [PATCH 33/45] add check on device width for columns rendering

---
 .../admin-notify-search-result.component.html          | 10 +++++-----
 .../admin-notify-search-result.component.spec.ts       |  3 +++
 .../admin-notify-search-result.component.ts            |  9 +++++++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
index c4fd93d2e0..23db0a0094 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -2,18 +2,18 @@
     <table class="table table-striped table-hover">
       <thead>
         <tr class="text-nowrap">
-          <th scope="col">{{ 'notify-message-result.timestamp' | translate}}</th>
+          <th *ngIf="!(isXsOrSm$ | async)" scope="col">{{ 'notify-message-result.timestamp' | translate}}</th>
           <th scope="col">{{'notify-message-result.repositoryItem' | translate}}</th>
           <th scope="col">{{ 'notify-message-result.ldnService' | translate}}</th>
-          <th scope="col">{{ 'notify-message-result.type' | translate }}</th>
+          <th *ngIf="!(isXsOrSm$ | async)" scope="col">{{ 'notify-message-result.type' | translate }}</th>
           <th scope="col">{{ 'notify-message-result.status' | translate  }}</th>
           <th scope="col">{{ 'notify-message-result.action' | translate }}</th>
         </tr>
       </thead>
       <tbody>
         <tr *ngFor="let message of (messagesSubject$ | async)">
-          <td>
-            <div>{{ message.queueTimeout }}</div>
+          <td  *ngIf="!(isXsOrSm$ | async)">
+            <div>{{ message.queueLastStartTime }}</div>
           </td>
           <td>
             <div *ngIf="isInbound">{{ message.context }}</div>
@@ -23,7 +23,7 @@
             <div *ngIf="isInbound">{{ message.origin }}</div>
             <div *ngIf="!isInbound">{{ message.target }}</div>
           </td>
-          <td>
+          <td  *ngIf="!(isXsOrSm$ | async)">
             <div>{{ message.coarNotifyType }}</div>
           </td>
           <td>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
index 0c1eee81c3..ad5f94476b 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
@@ -13,6 +13,8 @@ import { ActivatedRoute } from '@angular/router';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { TranslateModule } from '@ngx-translate/core';
 import { EMPTY } from 'rxjs';
+import { HostWindowService } from "../../../shared/host-window.service";
+import { HostWindowServiceStub } from "../../../shared/testing/host-window-service.stub";
 
 describe('AdminNotifySearchResultComponent', () => {
   let component: AdminNotifySearchResultComponent;
@@ -62,6 +64,7 @@ describe('AdminNotifySearchResultComponent', () => {
         { provide: ObjectCacheService, useValue: objectCache },
         { provide: RequestService, useValue: requestService },
         { provide: RemoteDataBuildService, useValue: rdbService },
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(1080) },
       ]
     })
     .compileComponents();
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 1414d3de88..5ad9f7d602 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
@@ -12,10 +12,11 @@ import {
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
-import { BehaviorSubject, Subscription } from 'rxjs';
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
 import { AdminNotifyMessagesService } from '../services/admin-notify-messages.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { HostWindowService } from "../../../shared/host-window.service";
 
 @tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotify)
 @Component({
@@ -33,6 +34,8 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme
   public reprocessStatus = QueueStatusMap.QUEUE_STATUS_QUEUED_FOR_RETRY;
   //we check on one type of config to render specific table headers
   public isInbound: boolean;
+  public isXsOrSm$: Observable<boolean>;
+
 
   /**
    * Array to track all subscriptions and unsubscribe them onDestroy
@@ -42,7 +45,8 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme
 
     constructor(private modalService: NgbModal,
                 private adminNotifyMessagesService: AdminNotifyMessagesService,
-                @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
+                @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
+                private windowService: HostWindowService) {
       super();
     }
 
@@ -56,6 +60,7 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme
         this.isInbound = configuration === 'NOTIFY.incoming';
       })
     );
+    this.isXsOrSm$ = this.windowService.isXsOrSm();
   }
 
   ngOnDestroy() {

From f9474d458657f6c85bb1f5212823acfa52d2a847 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 9 Jan 2024 11:30:44 +0100
Subject: [PATCH 34/45] remove mobile adaption, adapt reprocess

---
 .../admin-notify-search-result.component.html |  8 ++++----
 ...min-notify-search-result.component.spec.ts |  3 ---
 .../admin-notify-search-result.component.ts   |  8 ++------
 .../services/admin-notify-messages.service.ts | 20 ++++++++++++++++---
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
index 23db0a0094..3ff254649b 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -2,17 +2,17 @@
     <table class="table table-striped table-hover">
       <thead>
         <tr class="text-nowrap">
-          <th *ngIf="!(isXsOrSm$ | async)" scope="col">{{ 'notify-message-result.timestamp' | translate}}</th>
+          <th scope="col">{{ 'notify-message-result.timestamp' | translate}}</th>
           <th scope="col">{{'notify-message-result.repositoryItem' | translate}}</th>
           <th scope="col">{{ 'notify-message-result.ldnService' | translate}}</th>
-          <th *ngIf="!(isXsOrSm$ | async)" scope="col">{{ 'notify-message-result.type' | translate }}</th>
+          <th scope="col">{{ 'notify-message-result.type' | translate }}</th>
           <th scope="col">{{ 'notify-message-result.status' | translate  }}</th>
           <th scope="col">{{ 'notify-message-result.action' | translate }}</th>
         </tr>
       </thead>
       <tbody>
         <tr *ngFor="let message of (messagesSubject$ | async)">
-          <td  *ngIf="!(isXsOrSm$ | async)">
+          <td>
             <div>{{ message.queueLastStartTime }}</div>
           </td>
           <td>
@@ -23,7 +23,7 @@
             <div *ngIf="isInbound">{{ message.origin }}</div>
             <div *ngIf="!isInbound">{{ message.target }}</div>
           </td>
-          <td  *ngIf="!(isXsOrSm$ | async)">
+          <td>
             <div>{{ message.coarNotifyType }}</div>
           </td>
           <td>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
index ad5f94476b..0c1eee81c3 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
@@ -13,8 +13,6 @@ import { ActivatedRoute } from '@angular/router';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { TranslateModule } from '@ngx-translate/core';
 import { EMPTY } from 'rxjs';
-import { HostWindowService } from "../../../shared/host-window.service";
-import { HostWindowServiceStub } from "../../../shared/testing/host-window-service.stub";
 
 describe('AdminNotifySearchResultComponent', () => {
   let component: AdminNotifySearchResultComponent;
@@ -64,7 +62,6 @@ describe('AdminNotifySearchResultComponent', () => {
         { provide: ObjectCacheService, useValue: objectCache },
         { provide: RequestService, useValue: requestService },
         { provide: RemoteDataBuildService, useValue: rdbService },
-        { provide: HostWindowService, useValue: new HostWindowServiceStub(1080) },
       ]
     })
     .compileComponents();
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 5ad9f7d602..9bd3b4046b 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
@@ -12,11 +12,10 @@ import {
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import { BehaviorSubject, Subscription } from 'rxjs';
 import { AdminNotifyMessagesService } from '../services/admin-notify-messages.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
-import { HostWindowService } from "../../../shared/host-window.service";
 
 @tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotify)
 @Component({
@@ -34,7 +33,6 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme
   public reprocessStatus = QueueStatusMap.QUEUE_STATUS_QUEUED_FOR_RETRY;
   //we check on one type of config to render specific table headers
   public isInbound: boolean;
-  public isXsOrSm$: Observable<boolean>;
 
 
   /**
@@ -45,8 +43,7 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme
 
     constructor(private modalService: NgbModal,
                 private adminNotifyMessagesService: AdminNotifyMessagesService,
-                @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
-                private windowService: HostWindowService) {
+                @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
       super();
     }
 
@@ -60,7 +57,6 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme
         this.isInbound = configuration === 'NOTIFY.incoming';
       })
     );
-    this.isXsOrSm$ = this.windowService.isXsOrSm();
   }
 
   ngOnDestroy() {
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 3b3fd63ee4..37c7d143fa 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
@@ -9,10 +9,12 @@ import {NotificationsService} from '../../../shared/notifications/notifications.
 import { BehaviorSubject, from, Observable, of, scan } from 'rxjs';
 import { ADMIN_NOTIFY_MESSAGE } from '../models/admin-notify-message.resource-type';
 import { AdminNotifyMessage, QueueStatusMap } from '../models/admin-notify-message.model';
-import { map, mergeMap } from 'rxjs/operators';
-import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { map, mergeMap, switchMap, tap } from 'rxjs/operators';
+import { getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { LdnServicesService } from '../../admin-ldn-services/ldn-services-data/ldn-services-data.service';
 import { ItemDataService } from '../../../core/data/item-data.service';
+import { GetRequest } from '../../../core/data/request.models';
+import { RestRequest } from '../../../core/data/rest-request.model';
 
 /**
  * Injectable service responsible for fetching/sending data from/to the REST API on the messages endpoint.
@@ -24,6 +26,9 @@ import { ItemDataService } from '../../../core/data/item-data.service';
 @Injectable()
 @dataService(ADMIN_NOTIFY_MESSAGE)
 export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNotifyMessage> {
+
+  protected reprocessEndpoint = 'enqueueretry';
+
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
@@ -86,8 +91,17 @@ export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNot
    * @param messageSubject the current visualised messages source
    */
   public reprocessMessage(message: AdminNotifyMessage, messageSubject: BehaviorSubject<AdminNotifyMessage[]>): Observable<AdminNotifyMessage[]> {
-    return this.findById(message.id).pipe(
+    const requestId = this.requestService.generateRequestId();
+
+
+    return this.halService.getEndpoint(this.reprocessEndpoint).pipe(
+      map(endpoint => endpoint.replace('{id}', message.id)),
+      map((endpointURL: string) => new GetRequest(requestId, endpointURL)),
+      tap(request => this.requestService.send(request)),
+      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID<AdminNotifyMessage>(request.uuid)),
+      getFirstCompletedRemoteData(),
       getAllSucceededRemoteDataPayload(),
+    ).pipe(
       map(reprocessedMessage => this.formatMessageLabels(reprocessedMessage)),
       mergeMap((newMessage) =>  messageSubject.pipe(
         map(messages => {

From b6245d3c2d918cc491590cdda0e1897e4a196f78 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 9 Jan 2024 12:11:53 +0100
Subject: [PATCH 35/45] improve responsivness

---
 .../admin-notify-search-result.component.scss                | 5 +++++
 .../admin-notify-search-result.component.ts                  | 1 +
 .../tabulatable-objects-loader.component.ts                  | 2 +-
 src/app/shared/object-table/object-table.component.html      | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.scss

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.scss b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.scss
new file mode 100644
index 0000000000..290f66fa6f
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.scss
@@ -0,0 +1,5 @@
+.table-responsive {
+  th, td {
+    padding: 0.5rem !important;
+  }
+}
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 9bd3b4046b..07f5a89dfb 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
@@ -21,6 +21,7 @@ import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.co
 @Component({
   selector: 'ds-admin-notify-search-result',
   templateUrl: './admin-notify-search-result.component.html',
+  styleUrls: ['./admin-notify-search-result.component.scss'],
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
index b013af9891..fa57c1200d 100644
--- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
@@ -26,7 +26,7 @@ import { getTabulatableObjectsComponent } from './tabulatable-objects.decorator'
 
 @Component({
   selector: 'ds-tabulatable-objects-loader',
-  templateUrl: './tabulatable-objects-loader.component.html',
+  templateUrl: './tabulatable-objects-loader.component.html'
 })
 /**
  * Component for determining what component to use depending on the item's entity type (dspace.entity.type)
diff --git a/src/app/shared/object-table/object-table.component.html b/src/app/shared/object-table/object-table.component.html
index 8212b5a796..39743a5922 100644
--- a/src/app/shared/object-table/object-table.component.html
+++ b/src/app/shared/object-table/object-table.component.html
@@ -17,7 +17,7 @@
   (next)="goNext()"
   [retainScrollPosition]="true"
 >
-  <div class="row" *ngIf="objects?.hasSucceeded">
+  <div *ngIf="objects?.hasSucceeded">
     <div @fadeIn>
       <ds-tabulatable-objects-loader [objects]="objects.payload"
                                      [context]="context"

From 77196262560c53ef37e1870128bd1f66a4909cbc Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 9 Jan 2024 12:33:49 +0100
Subject: [PATCH 36/45] add link, rename tabs, small refactor

---
 .../admin-notify-dashboard.component.html     |  4 ++--
 .../admin-notify-incoming.component.html      |  4 ++--
 .../admin-notify-outgoing.component.html      |  4 ++--
 .../admin-notify-search-result.component.html |  6 ++----
 .../models/admin-notify-message.model.ts      | 12 +++++++++++
 .../services/admin-notify-messages.service.ts | 21 ++++---------------
 src/assets/i18n/en.json5                      |  4 +++-
 7 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
index 17d9bf884d..45872ae9c1 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
@@ -8,10 +8,10 @@
             <a class="nav-link active">{{'admin-notify-dashboard.metrics' | translate}}</a>
           </li>
           <li class="nav-item">
-            <a class="nav-link" [routerLink]="'inbound'" [queryParams]="{view: 'table'}">{{'admin.notify.dashboard.inbound' | translate}}</a>
+            <a class="nav-link" [routerLink]="'inbound'" [queryParams]="{view: 'table'}">{{'admin.notify.dashboard.inbound-logs' | translate}}</a>
           </li>
           <li class="nav-item">
-            <a class="nav-link" [routerLink]="'outbound'" [queryParams]="{view: 'table'}">{{'admin.notify.dashboard.outbound' | translate}}</a>
+            <a class="nav-link" [routerLink]="'outbound'" [queryParams]="{view: 'table'}">{{'admin.notify.dashboard.outbound-logs' | translate}}</a>
         </ul>
         <div class="mt-2">
           <ds-admin-notify-metrics *ngIf="(notifyMetricsRows$ | async)?.length" [boxesConfig]="notifyMetricsRows$ | async"></ds-admin-notify-metrics>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html
index 9fd21e21a1..cec35283ed 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html
@@ -9,10 +9,10 @@
               <a class="nav-link" [routerLink]="'../'">{{'admin-notify-dashboard.metrics' | translate}}</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link active">{{'admin.notify.dashboard.inbound' | translate}}</a>
+              <a class="nav-link active">{{'admin.notify.dashboard.inbound-logs' | translate}}</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" [routerLink]="'../outbound'" [queryParams]="{view: 'table'}">{{'admin.notify.dashboard.outbound' | translate}}</a>
+              <a class="nav-link" [routerLink]="'../outbound'" [queryParams]="{view: 'table'}">{{'admin.notify.dashboard.outbound-logs' | translate}}</a>
           </ul>
 
           <div class="col-12 text-left h4 my-4">{{'admin.notify.dashboard.inbound' | translate}}</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html
index 8b9c031776..9aae2db294 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html
@@ -9,10 +9,10 @@
               <a class="nav-link" [routerLink]="'../'">{{'admin-notify-dashboard.metrics' | translate}}</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" [routerLink]="'../inbound'" [queryParams]="{view: 'table'}">{{'admin.notify.dashboard.inbound' | translate}}</a>
+              <a class="nav-link" [routerLink]="'../inbound'" [queryParams]="{view: 'table'}">{{'admin.notify.dashboard.inbound-logs' | translate}}</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link active">{{'admin.notify.dashboard.outbound' | translate}}</a>
+              <a class="nav-link active">{{'admin.notify.dashboard.outbound-logs' | translate}}</a>
           </ul>
 
           <div class="col-12 text-left h4 my-4">{{'admin.notify.dashboard.outbound' | translate}}</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
index 3ff254649b..741e5575e2 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -16,12 +16,10 @@
             <div>{{ message.queueLastStartTime }}</div>
           </td>
           <td>
-            <div *ngIf="isInbound">{{ message.context }}</div>
-            <div *ngIf="!isInbound">{{ message.object }}</div>
+            <a [routerLink]="'/items/' + (isInbound ? message.context : message.object)">{{ message.relatedItem }}</a>
           </td>
           <td>
-            <div *ngIf="isInbound">{{ message.origin }}</div>
-            <div *ngIf="!isInbound">{{ message.target }}</div>
+            <div>{{ message.ldnService }}</div>
           </td>
           <td>
             <div>{{ message.coarNotifyType }}</div>
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
index 872b699228..f107d31261 100644
--- a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
@@ -60,6 +60,18 @@ export class AdminNotifyMessage extends DSpaceObject {
   @autoserialize
   object: string;
 
+  /**
+   * The name of the related item
+   */
+  @autoserialize
+  relatedItem: string;
+
+  /**
+   * The name of the related ldn service
+   */
+  @autoserialize
+  ldnService: string;
+
   /**
    * The context of the message
    */
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 37c7d143fa..18ba0f17c2 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
@@ -58,27 +58,15 @@ export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNot
   public getDetailedMessages(messages: AdminNotifyMessage[]): Observable<AdminNotifyMessage[]> {
     return from(messages.map(message => this.formatMessageLabels(message))).pipe(
       mergeMap(message =>
-        message.target ? this.ldnServicesService.findById(message.target.toString()).pipe(
+        message.target || message.origin ? this.ldnServicesService.findById((message.target || message.origin).toString()).pipe(
           getAllSucceededRemoteDataPayload(),
-          map(detail => ({...message, target: detail.name}))
+          map(detail => ({...message, ldnService: detail.name}))
         ) : of(message),
       ),
       mergeMap(message =>
-        message.object ? this.itemDataService.findById(message.object.toString()).pipe(
+        message.object || message.context  ? this.itemDataService.findById(message.object || message.context).pipe(
           getAllSucceededRemoteDataPayload(),
-          map(detail => ({...message, object: detail.name}))
-        ) : of(message),
-      ),
-      mergeMap(message =>
-        message.origin ? this.ldnServicesService.findById(message.origin.toString()).pipe(
-          getAllSucceededRemoteDataPayload(),
-          map(detail => ({...message, origin: detail.name}))
-        ) : of(message),
-      ),
-      mergeMap(message =>
-        message.context ? this.itemDataService.findById(message.context).pipe(
-          getAllSucceededRemoteDataPayload(),
-          map(detail => ({...message, context: detail.name}))
+          map(detail => ({...message, relatedItem: detail.name}))
         ) : of(message),
       ),
       scan((acc: any, value: any) => [...acc, value], []),
@@ -93,7 +81,6 @@ export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNot
   public reprocessMessage(message: AdminNotifyMessage, messageSubject: BehaviorSubject<AdminNotifyMessage[]>): Observable<AdminNotifyMessage[]> {
     const requestId = this.requestService.generateRequestId();
 
-
     return this.halService.getEndpoint(this.reprocessEndpoint).pipe(
       map(endpoint => endpoint.replace('{id}', message.id)),
       map((endpointURL: string) => new GetRequest(requestId, endpointURL)),
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index da0d1a3f82..ccb1bc40c5 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3473,9 +3473,11 @@
 
   "admin.notify.dashboard.inbound": "Inbound messages",
 
+  "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+
   "admin.notify.dashboard.outbound": "Outbound messages",
 
-  "admin.notify.dashboard.breadcrumbs": "Dashboard",
+  "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
 
   "NOTIFY.incoming.search.results.head": "Incoming",
 

From eb8a8207d7c9c16f26df238a3034213317d5a232 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 9 Jan 2024 12:45:56 +0100
Subject: [PATCH 37/45] rename tab metrics

---
 src/assets/i18n/en.json5 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index ccb1bc40c5..cf7a25a3f0 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3445,9 +3445,7 @@
 
   "admin-notify-dashboard.title": "Notify Dashboard",
 
-  "admin-notify-dashboard.metrics": "Notify metrics",
-
-  "admin-notify-dashboard.logs": "Notify logs",
+  "admin-notify-dashboard.metrics": "Metrics",
 
   "admin-notify-dashboard.received-ldn": "Number of received LDN",
 

From 9332a33262a3b0ebbaee7c222fa80db30f4d207c Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 10 Jan 2024 16:58:16 +0100
Subject: [PATCH 38/45] add tests

---
 .../admin-notify-dashboard.component.spec.ts  |  11 +-
 ...dmin-notify-detail-modal.component.spec.ts |  11 +-
 ...min-notify-search-result.component.spec.ts | 116 +++++++++++++++-
 .../admin-notify-messages.service.spec.ts     | 125 ++++++++++++++++++
 4 files changed, 256 insertions(+), 7 deletions(-)
 create mode 100644 src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
index 51486024a9..74007055b4 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
@@ -21,6 +21,11 @@ describe('AdminNotifyDashboardComponent', () => {
   let searchResult3;
   let results;
 
+  const mockBoxes = [
+    { title: 'admin-notify-dashboard.received-ldn', boxes: [ undefined, undefined, undefined, undefined, undefined ] },
+    { title: 'admin-notify-dashboard.generated-ldn', boxes: [ undefined, undefined, undefined, undefined, undefined ] }
+  ];
+
   beforeEach(async () => {
     item1 = Object.assign(new AdminNotifyMessage(), { uuid: 'e1c51c69-896d-42dc-8221-1d5f2ad5516e' });
     item2 = Object.assign(new AdminNotifyMessage(), { uuid: 'c8279647-1acc-41ae-b036-951d5f65649b' });
@@ -42,7 +47,11 @@ describe('AdminNotifyDashboardComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should create', () => {
+  it('should create', (done) => {
+    component.notifyMetricsRows$.subscribe(boxes => {
+      expect(boxes).toEqual(mockBoxes);
+      done();
+    });
     expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts
index e4c701ea9d..0ddf449e5c 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts
@@ -7,12 +7,14 @@ import { TranslateModule } from '@ngx-translate/core';
 describe('AdminNotifyDetailModalComponent', () => {
   let component: AdminNotifyDetailModalComponent;
   let fixture: ComponentFixture<AdminNotifyDetailModalComponent>;
+  const modalStub = jasmine.createSpyObj('modalStub', ['close']);
+
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [ AdminNotifyDetailModalComponent ],
-      providers: [NgbActiveModal]
+      providers: [{ provide: NgbActiveModal, useValue: modalStub }]
     })
     .compileComponents();
 
@@ -24,4 +26,11 @@ describe('AdminNotifyDetailModalComponent', () => {
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  it('should close', () => {
+    spyOn(component.response, 'emit');
+    component.closeModal();
+    expect(modalStub.close).toHaveBeenCalled();
+    expect(component.response.emit).toHaveBeenCalledWith(true);
+  });
 });
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
index 0c1eee81c3..0aa35dcb5e 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
@@ -12,8 +12,76 @@ import { routeServiceStub } from '../../../shared/testing/route-service.stub';
 import { ActivatedRoute } from '@angular/router';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { TranslateModule } from '@ngx-translate/core';
-import { EMPTY } from 'rxjs';
+import { of as observableOf, of } from 'rxjs';
+import { AdminNotifyMessage, QueueStatusMap } from '../models/admin-notify-message.model';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 
+
+export const mockAdminNotifyMessages = [
+  {
+    'type': 'message',
+    'id': 'urn:uuid:5fb3af44-d4f8-4226-9475-2d09c2d8d9e0',
+    'coarNotifyType': 'ReviewAction',
+    'activityStreamType': 'TentativeReject',
+    'inReplyTo': 'urn:uuid:f7289ad5-0955-4c86-834c-fb54a736778b',
+    'object': null,
+    'context': '24d50450-9ff0-485f-82d4-fba1be42f3f9',
+    'queueAttempts': 1,
+    'queueLastStartTime': '2023-11-24T14:44:00.064+00:00',
+    'origin': 12,
+    'target': null,
+    'queueStatusLabel': 'notify-queue-status.processed',
+    'queueTimeout': '2023-11-24T15:44:00.064+00:00',
+    'queueStatus': 3,
+    '_links': {
+      'self': {
+        'href': 'http://localhost:8080/server/api/ldn/messages/urn:uuid:5fb3af44-d4f8-4226-9475-2d09c2d8d9e0'
+      }
+    },
+    'thumbnail': 'test',
+    'item': {},
+    'accessStatus': {},
+    'ldnService': 'NOTIFY inbox - Automatic service',
+    'relatedItem': 'test coar 2 demo'
+  },
+  {
+    'type': 'message',
+    'id': 'urn:uuid:544c8777-e826-4810-a625-3e394cc3660d',
+    'coarNotifyType': 'IngestAction',
+    'activityStreamType': 'Announce',
+    'inReplyTo': 'urn:uuid:b2ad72d6-6ea9-464f-b385-29a78417f6b8',
+    'object': null,
+    'context': 'e657437a-0ee2-437d-916a-bba8c57bf40b',
+    'queueAttempts': 1,
+    'queueLastStartTime': null,
+    'origin': 12,
+    'target': null,
+    'queueStatusLabel': 'notify-queue-status.unmapped_action',
+    'queueTimeout': '2023-11-24T14:15:34.945+00:00',
+    'queueStatus': 6,
+    '_links': {
+      'self': {
+        'href': 'http://localhost:8080/server/api/ldn/messages/urn:uuid:544c8777-e826-4810-a625-3e394cc3660d'
+      }
+    },
+    'thumbnail': {},
+    'item': {},
+    'accessStatus': {},
+    'ldnService': 'NOTIFY inbox - Automatic service',
+    'relatedItem': 'test coar demo'
+  }
+] as unknown as AdminNotifyMessage[];
+
+export const mockUnformattedAdminNotifyMessages = mockAdminNotifyMessages.map(
+  message => ({
+    ...message,
+    coarNotifyType: 'coar:' + message.coarNotifyType,
+    queueStatusLabel:  Object.keys(QueueStatusMap)[Object.values(QueueStatusMap).indexOf(message.queueStatusLabel as unknown as QueueStatusMap)]
+  })
+) as unknown as AdminNotifyMessage[];
 describe('AdminNotifySearchResultComponent', () => {
   let component: AdminNotifySearchResultComponent;
   let fixture: ComponentFixture<AdminNotifySearchResultComponent>;
@@ -22,6 +90,8 @@ describe('AdminNotifySearchResultComponent', () => {
   let halService: HALEndpointService;
   let rdbService: RemoteDataBuildService;
   let adminNotifyMessageService: AdminNotifyMessagesService;
+  let searchConfigService: SearchConfigurationService;
+  let modalService: NgbModal;
   const requestUUID = '34cfed7c-f597-49ef-9cbe-ea351f0023c2';
   const testObject = {
     uuid: 'test-property',
@@ -29,13 +99,13 @@ describe('AdminNotifySearchResultComponent', () => {
     values: ['value-1', 'value-2']
   } as ConfigurationProperty;
 
-
   beforeEach(async () => {
     halService = jasmine.createSpyObj('halService', {
       getEndpoint: cold('a', { a: '' })
     });
     adminNotifyMessageService = jasmine.createSpyObj('adminNotifyMessageService', {
-      getDetailedMessages: EMPTY
+      getDetailedMessages: of(mockAdminNotifyMessages),
+      reprocessMessage: of(mockAdminNotifyMessages),
     });
     requestService = jasmine.createSpyObj('requestService', {
       generateRequestId: requestUUID,
@@ -48,30 +118,66 @@ describe('AdminNotifySearchResultComponent', () => {
         }
       })
     });
+
+    searchConfigService = jasmine.createSpyObj('searchConfigService', {
+      getCurrentConfiguration: of('NOTIFY.outgoing')
+    });
     objectCache = {} as ObjectCacheService;
 
 
     await TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [ AdminNotifySearchResultComponent ],
+      declarations: [ AdminNotifySearchResultComponent, AdminNotifyDetailModalComponent ],
       providers: [
-        {provide: AdminNotifyMessagesService, useValue: adminNotifyMessageService},
+        { provide: AdminNotifyMessagesService, useValue: adminNotifyMessageService },
         { provide: RouteService, useValue: routeServiceStub },
         { provide: ActivatedRoute, useValue: new RouterStub() },
         { provide: HALEndpointService, useValue: halService },
         { provide: ObjectCacheService, useValue: objectCache },
         { provide: RequestService, useValue: requestService },
         { provide: RemoteDataBuildService, useValue: rdbService },
+        { provide: SEARCH_CONFIG_SERVICE, useValue: searchConfigService },
       ]
     })
     .compileComponents();
 
     fixture = TestBed.createComponent(AdminNotifySearchResultComponent);
     component = fixture.componentInstance;
+    modalService = (component as any).modalService;
+    spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ response: observableOf(true) }) }));
     fixture.detectChanges();
   });
 
   it('should create', () => {
     expect(component).toBeTruthy();
+    expect(component.isInbound).toBeFalsy();
+  });
+
+  it('should open modal', () => {
+    component.openDetailModal(mockAdminNotifyMessages[0]);
+    expect(modalService.open).toHaveBeenCalledWith(AdminNotifyDetailModalComponent);
+  });
+
+  it('should map messages', (done) => {
+    component.messagesSubject$.subscribe((messages) => {
+      expect(messages).toEqual(mockAdminNotifyMessages);
+      done();
+    });
+  });
+
+  it('should reprocess message', (done) => {
+    component.reprocessMessage(mockAdminNotifyMessages[0]);
+    component.messagesSubject$.subscribe((messages) => {
+      expect(messages).toEqual(mockAdminNotifyMessages);
+      done();
+    });
+  });
+
+  it('should unsubscribe on destroy', () => {
+    (component as any).subs = [of(null).subscribe()];
+
+    spyOn((component as any).subs[0], 'unsubscribe');
+    component.ngOnDestroy();
+    expect((component as any).subs[0].unsubscribe).toHaveBeenCalled();
   });
 });
diff --git a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts
new file mode 100644
index 0000000000..1bda61be49
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts
@@ -0,0 +1,125 @@
+import { TestScheduler } from 'rxjs/testing';
+import { cold, getTestScheduler } from 'jasmine-marbles';
+import { AdminNotifyMessagesService } from './admin-notify-messages.service';
+import { RequestService } from '../../../core/data/request.service';
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { LdnServicesService } from '../../admin-ldn-services/ldn-services-data/ldn-services-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { RequestEntry } from '../../../core/data/request-entry.model';
+import { RestResponse } from '../../../core/cache/response.models';
+import { BehaviorSubject, of } from 'rxjs';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestEntryState } from '../../../core/data/request-entry-state.model';
+import {
+  mockAdminNotifyMessages,
+  mockUnformattedAdminNotifyMessages
+} from '../admin-notify-search-result/admin-notify-search-result.component.spec';
+import { take } from 'rxjs/operators';
+import { deepClone } from 'fast-json-patch';
+
+describe('AdminNotifyMessagesService test', () => {
+  let scheduler: TestScheduler;
+  let service: AdminNotifyMessagesService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let ldnServicesService: LdnServicesService;
+  let itemDataService: ItemDataService;
+  let responseCacheEntry: RequestEntry;
+
+  const endpointURL = `https://rest.api/rest/api/messages`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+  const remoteDataMocks = {
+    Success: new RemoteData(null, null, null, RequestEntryState.Success, null, null, 200),
+  };
+  const testLdnServiceName = 'testLdnService';
+  const testRelatedItemName = 'testRelatedItem';
+
+  function initTestService() {
+    return new AdminNotifyMessagesService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      notificationsService,
+      ldnServicesService,
+      itemDataService
+    );
+  }
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    objectCache = {} as ObjectCacheService;
+    notificationsService = {} as NotificationsService;
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: endpointURL } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: of(responseCacheEntry),
+      getByUUID: of(responseCacheEntry),
+    });
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: of(endpointURL)
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$({}, 500),
+      buildList: cold('a', { a: remoteDataMocks.Success }),
+      buildFromRequestUUID: createSuccessfulRemoteDataObject$(deepClone(mockUnformattedAdminNotifyMessages))
+    });
+
+    ldnServicesService = jasmine.createSpyObj('ldnServicesService', {
+      findById: createSuccessfulRemoteDataObject$({name: testLdnServiceName}),
+    });
+
+    itemDataService = jasmine.createSpyObj('itemDataService', {
+      findById: createSuccessfulRemoteDataObject$({name: testRelatedItemName}),
+    });
+
+
+    service = initTestService();
+
+  });
+
+  describe('Admin Notify service', () => {
+    it('should be defined', () => {
+      expect(service).toBeDefined();
+    });
+
+    it('should format message labels', () => {
+      const formattedMessage = service.formatMessageLabels(deepClone(mockUnformattedAdminNotifyMessages[0]));
+      expect(formattedMessage).toEqual(mockAdminNotifyMessages[0]);
+    });
+
+    it('should get details for messages', (done) => {
+      service.getDetailedMessages(deepClone(mockUnformattedAdminNotifyMessages)).pipe(take(1)).subscribe((detailedMessages) => {
+        expect(detailedMessages[0].ldnService).toEqual(testLdnServiceName);
+        expect(detailedMessages[0].relatedItem).toEqual(testRelatedItemName);
+        done();
+      });
+    });
+
+    it('should reprocess message', (done) => {
+      const messages = deepClone(mockUnformattedAdminNotifyMessages);
+      const behaviorSubject = new BehaviorSubject(messages);
+      service.reprocessMessage(messages[0], behaviorSubject).pipe(take(1)).subscribe((reprocessedMessages) => {
+        expect(reprocessedMessages.length).toEqual(2);
+        expect(reprocessedMessages).toEqual(messages);
+        done();
+      });
+    });
+  });
+});

From 34cecedfeb95be3b152d12eee43ea24a39646424 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 11 Jan 2024 09:20:22 +0100
Subject: [PATCH 39/45] refactor test, change type in table

---
 .../admin-notify-search-result.component.html |  2 +-
 ...min-notify-search-result.component.spec.ts |  5 ++--
 .../admin-notify-messages.service.spec.ts     | 26 ++++++++-----------
 .../services/admin-notify-messages.service.ts |  1 -
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
index 741e5575e2..8f1c9a774d 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -22,7 +22,7 @@
             <div>{{ message.ldnService }}</div>
           </td>
           <td>
-            <div>{{ message.coarNotifyType }}</div>
+            <div>{{ message.activityStreamType }}</div>
           </td>
           <td>
             <div>{{ message.queueStatusLabel | translate}}</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
index 0aa35dcb5e..e2070b9af4 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
@@ -24,7 +24,7 @@ export const mockAdminNotifyMessages = [
   {
     'type': 'message',
     'id': 'urn:uuid:5fb3af44-d4f8-4226-9475-2d09c2d8d9e0',
-    'coarNotifyType': 'ReviewAction',
+    'coarNotifyType': 'coar-notify:ReviewAction',
     'activityStreamType': 'TentativeReject',
     'inReplyTo': 'urn:uuid:f7289ad5-0955-4c86-834c-fb54a736778b',
     'object': null,
@@ -50,7 +50,7 @@ export const mockAdminNotifyMessages = [
   {
     'type': 'message',
     'id': 'urn:uuid:544c8777-e826-4810-a625-3e394cc3660d',
-    'coarNotifyType': 'IngestAction',
+    'coarNotifyType': 'coar-notify:IngestAction',
     'activityStreamType': 'Announce',
     'inReplyTo': 'urn:uuid:b2ad72d6-6ea9-464f-b385-29a78417f6b8',
     'object': null,
@@ -78,7 +78,6 @@ export const mockAdminNotifyMessages = [
 export const mockUnformattedAdminNotifyMessages = mockAdminNotifyMessages.map(
   message => ({
     ...message,
-    coarNotifyType: 'coar:' + message.coarNotifyType,
     queueStatusLabel:  Object.keys(QueueStatusMap)[Object.values(QueueStatusMap).indexOf(message.queueStatusLabel as unknown as QueueStatusMap)]
   })
 ) as unknown as AdminNotifyMessage[];
diff --git a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts
index 1bda61be49..1ee632b836 100644
--- a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts
@@ -1,5 +1,4 @@
-import { TestScheduler } from 'rxjs/testing';
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import { cold } from 'jasmine-marbles';
 import { AdminNotifyMessagesService } from './admin-notify-messages.service';
 import { RequestService } from '../../../core/data/request.service';
 import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
@@ -20,9 +19,9 @@ import {
 } from '../admin-notify-search-result/admin-notify-search-result.component.spec';
 import { take } from 'rxjs/operators';
 import { deepClone } from 'fast-json-patch';
+import { AdminNotifyMessage } from "../models/admin-notify-message.model";
 
 describe('AdminNotifyMessagesService test', () => {
-  let scheduler: TestScheduler;
   let service: AdminNotifyMessagesService;
   let requestService: RequestService;
   let rdbService: RemoteDataBuildService;
@@ -32,8 +31,9 @@ describe('AdminNotifyMessagesService test', () => {
   let ldnServicesService: LdnServicesService;
   let itemDataService: ItemDataService;
   let responseCacheEntry: RequestEntry;
+  let mockMessages : AdminNotifyMessage[];
 
-  const endpointURL = `https://rest.api/rest/api/messages`;
+  const endpointURL = `https://rest.api/rest/api/ldn/messages`;
   const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
   const remoteDataMocks = {
     Success: new RemoteData(null, null, null, RequestEntryState.Success, null, null, 200),
@@ -54,8 +54,7 @@ describe('AdminNotifyMessagesService test', () => {
   }
 
   beforeEach(() => {
-    scheduler = getTestScheduler();
-
+    mockMessages = deepClone(mockUnformattedAdminNotifyMessages)
     objectCache = {} as ObjectCacheService;
     notificationsService = {} as NotificationsService;
     responseCacheEntry = new RequestEntry();
@@ -78,7 +77,7 @@ describe('AdminNotifyMessagesService test', () => {
     rdbService = jasmine.createSpyObj('rdbService', {
       buildSingle: createSuccessfulRemoteDataObject$({}, 500),
       buildList: cold('a', { a: remoteDataMocks.Success }),
-      buildFromRequestUUID: createSuccessfulRemoteDataObject$(deepClone(mockUnformattedAdminNotifyMessages))
+      buildFromRequestUUID: createSuccessfulRemoteDataObject$(mockMessages)
     });
 
     ldnServicesService = jasmine.createSpyObj('ldnServicesService', {
@@ -89,9 +88,7 @@ describe('AdminNotifyMessagesService test', () => {
       findById: createSuccessfulRemoteDataObject$({name: testRelatedItemName}),
     });
 
-
     service = initTestService();
-
   });
 
   describe('Admin Notify service', () => {
@@ -100,12 +97,12 @@ describe('AdminNotifyMessagesService test', () => {
     });
 
     it('should format message labels', () => {
-      const formattedMessage = service.formatMessageLabels(deepClone(mockUnformattedAdminNotifyMessages[0]));
+      const formattedMessage = service.formatMessageLabels(mockMessages[0]);
       expect(formattedMessage).toEqual(mockAdminNotifyMessages[0]);
     });
 
     it('should get details for messages', (done) => {
-      service.getDetailedMessages(deepClone(mockUnformattedAdminNotifyMessages)).pipe(take(1)).subscribe((detailedMessages) => {
+      service.getDetailedMessages(mockMessages).pipe(take(1)).subscribe((detailedMessages) => {
         expect(detailedMessages[0].ldnService).toEqual(testLdnServiceName);
         expect(detailedMessages[0].relatedItem).toEqual(testRelatedItemName);
         done();
@@ -113,11 +110,10 @@ describe('AdminNotifyMessagesService test', () => {
     });
 
     it('should reprocess message', (done) => {
-      const messages = deepClone(mockUnformattedAdminNotifyMessages);
-      const behaviorSubject = new BehaviorSubject(messages);
-      service.reprocessMessage(messages[0], behaviorSubject).pipe(take(1)).subscribe((reprocessedMessages) => {
+      const behaviorSubject = new BehaviorSubject(mockMessages);
+      service.reprocessMessage(mockMessages[0], behaviorSubject).pipe(take(1)).subscribe((reprocessedMessages) => {
         expect(reprocessedMessages.length).toEqual(2);
-        expect(reprocessedMessages).toEqual(messages);
+        expect(reprocessedMessages).toEqual(mockMessages);
         done();
       });
     });
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 18ba0f17c2..92b011d0c5 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
@@ -46,7 +46,6 @@ export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNot
    * @param message the message to which map the labels
    */
   public formatMessageLabels(message: AdminNotifyMessage): AdminNotifyMessage {
-    message.coarNotifyType = message.coarNotifyType?.split(':')[1];
     message.queueStatusLabel = QueueStatusMap[message.queueStatusLabel];
     return message;
   }

From 441170d8a3c74c0491977beb3088771ecf89158f Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 11 Jan 2024 10:29:22 +0100
Subject: [PATCH 40/45] refactor, add date formatting

---
 .../admin-notify-dashboard.module.ts          |  5 +--
 .../admin-notify-detail-modal.component.html  |  4 +--
 .../admin-notify-search-result.component.html |  4 +--
 ...min-notify-search-result.component.spec.ts |  2 ++
 .../admin-notify-search-result.component.ts   | 32 +++++++++++++++----
 src/assets/i18n/en.json5                      |  4 +++
 6 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
index 2b6e1a8880..9c4daf981b 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
+import { CommonModule, DatePipe } from '@angular/common';
 import { RouterModule } from '@angular/router';
 import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
 import { AdminNotifyDashboardRoutingModule } from './admin-notify-dashboard-routing.module';
@@ -28,7 +28,8 @@ import { AdminNotifyMessagesService } from './services/admin-notify-messages.ser
     SearchPageModule,
   ],
   providers: [
-    AdminNotifyMessagesService
+    AdminNotifyMessagesService,
+    DatePipe
   ],
   declarations: [
     AdminNotifyDashboardComponent,
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
index 1b7265774d..87981d6873 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
@@ -7,8 +7,8 @@
 <div class="modal-body p-4">
     <div *ngFor="let key of notifyMessageKeys">
       <div class="row mb-4">
-        <div class="font-weight-bold col-sm">{{ key + '.notify-detail-modal' | translate}}</div>
-        <div class="text-truncate col-sm text-right">{{ notifyMessage[key] | translate }}</div>
+        <div class="font-weight-bold col">{{ key + '.notify-detail-modal' | translate}}</div>
+        <div class="col text-right">{{ notifyMessage[key] | translate }}</div>
       </div>
     </div>
 </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
index 8f1c9a774d..8a3bc9ea58 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -12,8 +12,8 @@
       </thead>
       <tbody>
         <tr *ngFor="let message of (messagesSubject$ | async)">
-          <td>
-            <div>{{ message.queueLastStartTime }}</div>
+          <td class="text-nowrap">
+            <div>{{ message.queueLastStartTime | date:"YYYY/MM/d hh:mm:ss" }}</div>
           </td>
           <td>
             <a [routerLink]="'/items/' + (isInbound ? message.context : message.object)">{{ message.relatedItem }}</a>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
index e2070b9af4..5994048876 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
@@ -18,6 +18,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { DatePipe } from "@angular/common";
 
 
 export const mockAdminNotifyMessages = [
@@ -136,6 +137,7 @@ describe('AdminNotifySearchResultComponent', () => {
         { provide: RequestService, useValue: requestService },
         { provide: RemoteDataBuildService, useValue: rdbService },
         { provide: SEARCH_CONFIG_SERVICE, useValue: searchConfigService },
+        DatePipe
       ]
     })
     .compileComponents();
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 07f5a89dfb..34995056cb 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
@@ -16,6 +16,7 @@ import { BehaviorSubject, Subscription } from 'rxjs';
 import { AdminNotifyMessagesService } from '../services/admin-notify-messages.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { DatePipe } from "@angular/common";
 
 @tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotify)
 @Component({
@@ -42,8 +43,22 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme
    */
   private subs: Subscription[] = [];
 
+  /**
+   * Keys to be formatted as date
+   * @private
+   */
+
+  private dateTypeKeys: string[] = ['queueLastStartTime', 'queueTimeout']
+
+  /**
+   * The format for the date values
+   * @private
+   */
+  private dateFormat: string = 'YYYY/MM/d hh:mm:ss'
+
     constructor(private modalService: NgbModal,
                 private adminNotifyMessagesService: AdminNotifyMessagesService,
+                private datePipe: DatePipe,
                 @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
       super();
     }
@@ -72,13 +87,10 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme
     const modalRef = this.modalService.open(AdminNotifyDetailModalComponent);
     const messageToOpen = {...message};
     // we delete not necessary or not readable keys
-    if (this.isInbound) {
-      delete messageToOpen.target;
-      delete messageToOpen.object;
-    } else {
-      delete messageToOpen.context;
-      delete messageToOpen.origin;
-    }
+    delete messageToOpen.target;
+    delete messageToOpen.object;
+    delete messageToOpen.context;
+    delete messageToOpen.origin;
     delete messageToOpen._links;
     delete messageToOpen.metadata;
     delete messageToOpen.thumbnail;
@@ -87,6 +99,12 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme
     delete messageToOpen.queueStatus;
 
     const messageKeys = Object.keys(messageToOpen);
+    messageKeys.forEach(key => {
+      if(this.dateTypeKeys.includes(key)) {
+        messageToOpen[key] = this.datePipe.transform(messageToOpen[key], this.dateFormat);
+      }
+    })
+
     modalRef.componentInstance.notifyMessage = messageToOpen;
     modalRef.componentInstance.notifyMessageKeys = messageKeys;
   }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index cf7a25a3f0..c4d599fdf6 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3587,6 +3587,10 @@
 
   "notify-queue-status.untrusted": "Untrusted",
 
+  "ldnService.notify-detail-modal": "LDN Service",
+
+  "relatedItem.notify-detail-modal": "Related Item",
+
   "orgunit.listelement.badge": "Repository Item",
 
   "orgunit.listelement.no-title": "Untitled",

From a370b147638f0bed75f0ce8867de6879a636c858 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 11 Jan 2024 10:41:47 +0100
Subject: [PATCH 41/45] fix lint

---
 .../admin-notify-search-result.component.spec.ts       |  2 +-
 .../admin-notify-search-result.component.ts            | 10 +++++-----
 .../services/admin-notify-messages.service.spec.ts     |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
index 5994048876..69c4eab15d 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
@@ -18,7 +18,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
-import { DatePipe } from "@angular/common";
+import { DatePipe } from '@angular/common';
 
 
 export const mockAdminNotifyMessages = [
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 34995056cb..70250a235b 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
@@ -16,7 +16,7 @@ import { BehaviorSubject, Subscription } from 'rxjs';
 import { AdminNotifyMessagesService } from '../services/admin-notify-messages.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
-import { DatePipe } from "@angular/common";
+import { DatePipe } from '@angular/common';
 
 @tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotify)
 @Component({
@@ -48,13 +48,13 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme
    * @private
    */
 
-  private dateTypeKeys: string[] = ['queueLastStartTime', 'queueTimeout']
+  private dateTypeKeys: string[] = ['queueLastStartTime', 'queueTimeout'];
 
   /**
    * The format for the date values
    * @private
    */
-  private dateFormat: string = 'YYYY/MM/d hh:mm:ss'
+  private dateFormat = 'YYYY/MM/d hh:mm:ss';
 
     constructor(private modalService: NgbModal,
                 private adminNotifyMessagesService: AdminNotifyMessagesService,
@@ -100,10 +100,10 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme
 
     const messageKeys = Object.keys(messageToOpen);
     messageKeys.forEach(key => {
-      if(this.dateTypeKeys.includes(key)) {
+      if (this.dateTypeKeys.includes(key)) {
         messageToOpen[key] = this.datePipe.transform(messageToOpen[key], this.dateFormat);
       }
-    })
+    });
 
     modalRef.componentInstance.notifyMessage = messageToOpen;
     modalRef.componentInstance.notifyMessageKeys = messageKeys;
diff --git a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts
index 1ee632b836..4cb38ce360 100644
--- a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts
@@ -19,7 +19,7 @@ import {
 } from '../admin-notify-search-result/admin-notify-search-result.component.spec';
 import { take } from 'rxjs/operators';
 import { deepClone } from 'fast-json-patch';
-import { AdminNotifyMessage } from "../models/admin-notify-message.model";
+import { AdminNotifyMessage } from '../models/admin-notify-message.model';
 
 describe('AdminNotifyMessagesService test', () => {
   let service: AdminNotifyMessagesService;
@@ -31,7 +31,7 @@ describe('AdminNotifyMessagesService test', () => {
   let ldnServicesService: LdnServicesService;
   let itemDataService: ItemDataService;
   let responseCacheEntry: RequestEntry;
-  let mockMessages : AdminNotifyMessage[];
+  let mockMessages: AdminNotifyMessage[];
 
   const endpointURL = `https://rest.api/rest/api/ldn/messages`;
   const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
@@ -54,7 +54,7 @@ describe('AdminNotifyMessagesService test', () => {
   }
 
   beforeEach(() => {
-    mockMessages = deepClone(mockUnformattedAdminNotifyMessages)
+    mockMessages = deepClone(mockUnformattedAdminNotifyMessages);
     objectCache = {} as ObjectCacheService;
     notificationsService = {} as NotificationsService;
     responseCacheEntry = new RequestEntry();

From 75fb52731a2c5ff5725a0febe1b9ab3736398cc8 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 11 Jan 2024 11:23:53 +0100
Subject: [PATCH 42/45] refactor translations mapping

---
 .../admin-notify-detail-modal.component.html  |  5 +-
 .../admin-notify-search-result.component.html |  2 +-
 ...min-notify-search-result.component.spec.ts |  9 +---
 .../admin-notify-search-result.component.ts   |  4 +-
 .../models/admin-notify-message.model.ts      | 10 ----
 .../admin-notify-messages.service.spec.ts     | 11 +----
 .../services/admin-notify-messages.service.ts | 13 +-----
 src/assets/i18n/en.json5                      | 46 ++++++++++++++++++-
 8 files changed, 57 insertions(+), 43 deletions(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
index 87981d6873..97cffcdece 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
@@ -8,7 +8,10 @@
     <div *ngFor="let key of notifyMessageKeys">
       <div class="row mb-4">
         <div class="font-weight-bold col">{{ key + '.notify-detail-modal' | translate}}</div>
-        <div class="col text-right">{{ notifyMessage[key] | translate }}</div>
+        <div class="col text-right">{{
+          ('notify-detail-modal.' + notifyMessage[key] | translate) !==  ('notify-detail-modal.' + notifyMessage[key]) ?
+          ('notify-detail-modal.' + notifyMessage[key] | translate) :
+          notifyMessage[key]}}</div>
       </div>
     </div>
 </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
index 8a3bc9ea58..3f1fb24298 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -25,7 +25,7 @@
             <div>{{ message.activityStreamType }}</div>
           </td>
           <td>
-            <div>{{ message.queueStatusLabel | translate}}</div>
+            <div>{{ 'notify-detail-modal.' + message.queueStatusLabel | translate }}</div>
           </td>
           <td>
             <div class="d-flex flex-column">
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
index 69c4eab15d..9279fd2423 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
@@ -13,7 +13,7 @@ import { ActivatedRoute } from '@angular/router';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf, of } from 'rxjs';
-import { AdminNotifyMessage, QueueStatusMap } from '../models/admin-notify-message.model';
+import { AdminNotifyMessage } from '../models/admin-notify-message.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
@@ -75,13 +75,6 @@ export const mockAdminNotifyMessages = [
     'relatedItem': 'test coar demo'
   }
 ] as unknown as AdminNotifyMessage[];
-
-export const mockUnformattedAdminNotifyMessages = mockAdminNotifyMessages.map(
-  message => ({
-    ...message,
-    queueStatusLabel:  Object.keys(QueueStatusMap)[Object.values(QueueStatusMap).indexOf(message.queueStatusLabel as unknown as QueueStatusMap)]
-  })
-) as unknown as AdminNotifyMessage[];
 describe('AdminNotifySearchResultComponent', () => {
   let component: AdminNotifySearchResultComponent;
   let fixture: ComponentFixture<AdminNotifySearchResultComponent>;
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 70250a235b..ece1419603 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
@@ -2,7 +2,7 @@ import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
 import { AdminNotifySearchResult } from '../models/admin-notify-message-search-result.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { Context } from '../../../core/shared/context.model';
-import { AdminNotifyMessage, QueueStatusMap } from '../models/admin-notify-message.model';
+import { AdminNotifyMessage } from '../models/admin-notify-message.model';
 import {
   tabulatableObjectsComponent
 } from '../../../shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator';
@@ -32,7 +32,7 @@ import { DatePipe } from '@angular/common';
 })
 export class AdminNotifySearchResultComponent extends TabulatableResultListElementsComponent<PaginatedList<AdminNotifySearchResult>, AdminNotifySearchResult> implements OnInit, OnDestroy{
   public messagesSubject$: BehaviorSubject<AdminNotifyMessage[]> = new BehaviorSubject([]);
-  public reprocessStatus = QueueStatusMap.QUEUE_STATUS_QUEUED_FOR_RETRY;
+  public reprocessStatus = 'QUEUE_STATUS_QUEUED_FOR_RETRY';
   //we check on one type of config to render specific table headers
   public isInbound: boolean;
 
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
index f107d31261..72fe58eacb 100644
--- a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
@@ -6,16 +6,6 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { GenericConstructor } from '../../../core/shared/generic-constructor';
 import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
 import { Observable } from 'rxjs';
-
-export enum QueueStatusMap {
-  QUEUE_STATUS_PROCESSED = 'notify-queue-status.processed',
-  QUEUE_STATUS_FAILED = 'notify-queue-status.processed',
-  QUEUE_STATUS_UNMAPPED_ACTION = 'notify-queue-status.unmapped_action',
-  QUEUE_STATUS_QUEUED_FOR_RETRY = 'notify-queue-status.queue_retry',
-  QUEUE_STATUS_PROCESSING = 'notify-queue-status.processing',
-  QUEUE_STATUS_QUEUED = 'notify-queue-status.queued',
-  QUEUE_STATUS_UNTRUSTED = 'notify-queue-status.untrusted',
-}
 /**
  * A message that includes admin notify info
  */
diff --git a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts
index 4cb38ce360..975950a33d 100644
--- a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts
@@ -14,9 +14,7 @@ import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.u
 import { RemoteData } from '../../../core/data/remote-data';
 import { RequestEntryState } from '../../../core/data/request-entry-state.model';
 import {
-  mockAdminNotifyMessages,
-  mockUnformattedAdminNotifyMessages
-} from '../admin-notify-search-result/admin-notify-search-result.component.spec';
+  mockAdminNotifyMessages} from '../admin-notify-search-result/admin-notify-search-result.component.spec';
 import { take } from 'rxjs/operators';
 import { deepClone } from 'fast-json-patch';
 import { AdminNotifyMessage } from '../models/admin-notify-message.model';
@@ -54,7 +52,7 @@ describe('AdminNotifyMessagesService test', () => {
   }
 
   beforeEach(() => {
-    mockMessages = deepClone(mockUnformattedAdminNotifyMessages);
+    mockMessages = deepClone(mockAdminNotifyMessages);
     objectCache = {} as ObjectCacheService;
     notificationsService = {} as NotificationsService;
     responseCacheEntry = new RequestEntry();
@@ -96,11 +94,6 @@ describe('AdminNotifyMessagesService test', () => {
       expect(service).toBeDefined();
     });
 
-    it('should format message labels', () => {
-      const formattedMessage = service.formatMessageLabels(mockMessages[0]);
-      expect(formattedMessage).toEqual(mockAdminNotifyMessages[0]);
-    });
-
     it('should get details for messages', (done) => {
       service.getDetailedMessages(mockMessages).pipe(take(1)).subscribe((detailedMessages) => {
         expect(detailedMessages[0].ldnService).toEqual(testLdnServiceName);
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 92b011d0c5..ef3f33a97d 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
@@ -8,7 +8,7 @@ import {HALEndpointService} from '../../../core/shared/hal-endpoint.service';
 import {NotificationsService} from '../../../shared/notifications/notifications.service';
 import { BehaviorSubject, from, Observable, of, scan } from 'rxjs';
 import { ADMIN_NOTIFY_MESSAGE } from '../models/admin-notify-message.resource-type';
-import { AdminNotifyMessage, QueueStatusMap } from '../models/admin-notify-message.model';
+import { AdminNotifyMessage } from '../models/admin-notify-message.model';
 import { map, mergeMap, switchMap, tap } from 'rxjs/operators';
 import { getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { LdnServicesService } from '../../admin-ldn-services/ldn-services-data/ldn-services-data.service';
@@ -41,21 +41,13 @@ export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNot
     super('messages', requestService, rdbService, objectCache, halService);
   }
 
-  /**
-   * Map labels to readable info for user
-   * @param message the message to which map the labels
-   */
-  public formatMessageLabels(message: AdminNotifyMessage): AdminNotifyMessage {
-    message.queueStatusLabel = QueueStatusMap[message.queueStatusLabel];
-    return message;
-  }
 
   /**
    * Add detailed information to each message
    * @param messages the messages to which add detailded info
    */
   public getDetailedMessages(messages: AdminNotifyMessage[]): Observable<AdminNotifyMessage[]> {
-    return from(messages.map(message => this.formatMessageLabels(message))).pipe(
+    return from(messages).pipe(
       mergeMap(message =>
         message.target || message.origin ? this.ldnServicesService.findById((message.target || message.origin).toString()).pipe(
           getAllSucceededRemoteDataPayload(),
@@ -88,7 +80,6 @@ export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNot
       getFirstCompletedRemoteData(),
       getAllSucceededRemoteDataPayload(),
     ).pipe(
-      map(reprocessedMessage => this.formatMessageLabels(reprocessedMessage)),
       mergeMap((newMessage) =>  messageSubject.pipe(
         map(messages => {
           const messageToUpdate = messages.find(currentMessage => currentMessage.id === message.id);
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index c4d599fdf6..c49024798d 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3519,7 +3519,51 @@
 
   "search.filters.filter.coar_notify_type.placeholder": "COAR notify type",
 
-  "search.filters.filter.notification_type.placeholder": "Notification type",
+  "search.filters.filter.notification_type.placeholder": "Notification",
+
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+
+  "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+
+  "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+
+  "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+
+  "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
 
   "sorting.queue_last_start_time.DESC": "Last started queue Descending",
 

From 6079e58d15f5d1f5d5b95af2a491c9c3db9d3bc4 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 11 Jan 2024 14:00:18 +0100
Subject: [PATCH 43/45] add missing translations handler

---
 .../admin-notify-detail-modal.component.html                | 5 +----
 .../admin-notify-detail-modal.component.ts                  | 6 +++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
index 97cffcdece..a43ac1526c 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
@@ -8,10 +8,7 @@
     <div *ngFor="let key of notifyMessageKeys">
       <div class="row mb-4">
         <div class="font-weight-bold col">{{ key + '.notify-detail-modal' | translate}}</div>
-        <div class="col text-right">{{
-          ('notify-detail-modal.' + notifyMessage[key] | translate) !==  ('notify-detail-modal.' + notifyMessage[key]) ?
-          ('notify-detail-modal.' + notifyMessage[key] | translate) :
-          notifyMessage[key]}}</div>
+        <div class="col text-right">{{'notify-detail-modal.' + notifyMessage[key] | translate: {default: notifyMessage[key]} }}</div>
       </div>
     </div>
 </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
index fc9420b593..36f984b01b 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
@@ -1,6 +1,8 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { AdminNotifyMessage } from '../models/admin-notify-message.model';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from "@ngx-translate/core";
+import { MissingTranslationHelper } from "../../../shared/translate/missing-translation.helper";
 
 @Component({
   selector: 'ds-admin-notify-detail-modal',
@@ -17,7 +19,9 @@ export class AdminNotifyDetailModalComponent {
   response = new EventEmitter<boolean>();
 
 
-  constructor(protected activeModal: NgbActiveModal) {
+  constructor(protected activeModal: NgbActiveModal,
+              public translationsService: TranslateService) {
+    this.translationsService.missingTranslationHandler = new MissingTranslationHelper();
   }
 
 

From 52027578a06ed3eb410f25033fe03be26f19413d Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 11 Jan 2024 15:55:21 +0100
Subject: [PATCH 44/45] update translations

---
 src/assets/i18n/en.json5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index c49024798d..175e2b8e13 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3489,7 +3489,7 @@
 
   "search.filters.filter.activity_stream_type.head": "Activity stream type",
 
-  "search.filters.filter.coar_notify_type.head": "Coar notify type",
+  "search.filters.filter.coar_notify_type.head": "COAR notify type",
 
   "search.filters.filter.notification_type.head": "Notification type",
 
@@ -3577,7 +3577,7 @@
 
   "id.notify-detail-modal": "Id",
 
-  "coarNotifyType.notify-detail-modal": "Coar Notify type",
+  "coarNotifyType.notify-detail-modal": "COAR Notify type",
 
   "activityStreamType.notify-detail-modal": "Activity stream type",
 

From 7640dac90ad7515c62ad0630b954834a6bc045ae Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 11 Jan 2024 15:57:26 +0100
Subject: [PATCH 45/45] update translations

---
 src/assets/i18n/en.json5 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 175e2b8e13..b52fb5f935 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3489,7 +3489,7 @@
 
   "search.filters.filter.activity_stream_type.head": "Activity stream type",
 
-  "search.filters.filter.coar_notify_type.head": "COAR notify type",
+  "search.filters.filter.coar_notify_type.head": "COAR Notify type",
 
   "search.filters.filter.notification_type.head": "Notification type",
 
@@ -3501,7 +3501,7 @@
 
   "search.filters.filter.activity_stream_type.label": "Search activity stream type",
 
-  "search.filters.filter.coar_notify_type.label": "Search COAR notify type",
+  "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
 
   "search.filters.filter.notification_type.label": "Search notification type",
 
@@ -3517,7 +3517,7 @@
 
   "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
 
-  "search.filters.filter.coar_notify_type.placeholder": "COAR notify type",
+  "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
 
   "search.filters.filter.notification_type.placeholder": "Notification",