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 @@
- {{'admin.notify.dashboard.outbound' | translate}}
+ {{'admin.notify.dashboard.outbound-logs' | translate}}
{{'admin.notify.dashboard.outbound' | translate}}
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 @@
{{ message.queueLastStartTime }}
- {{ message.context }}
- {{ message.object }}
+ {{ message.relatedItem }}
|
- {{ message.origin }}
- {{ message.target }}
+ {{ message.ldnService }}
|
{{ message.coarNotifyType }}
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 {
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): Observable {
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",
|