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 a43ac1526c..4f4e3d85c1 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 @@
{{ key + '.notify-detail-modal' | translate}}
-
{{'notify-detail-modal.' + notifyMessage[key] | translate: {default: notifyMessage[key]} }}
+
{{'notify-detail-modal.' + notifyMessage[key] | translate: {default: notifyMessage[key] ?? "n/a" } }}
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 36f984b01b..ae9ad34c8a 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,8 +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"; +import { TranslateService } from '@ngx-translate/core'; +import { MissingTranslationHelper } from '../../../shared/translate/missing-translation.helper'; @Component({ selector: 'ds-admin-notify-detail-modal', 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 cec35283ed..4b72854bc0 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 @@ -15,9 +15,16 @@ {{'admin.notify.dashboard.outbound-logs' | translate}} -
{{'admin.notify.dashboard.inbound' | translate}}
+
+
+
{{'admin.notify.dashboard.inbound' | translate}}
+
+ +
+
+
console.log(x)); + } + } 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 9aae2db294..a0f298371e 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 @@ -15,7 +15,16 @@ {{'admin.notify.dashboard.outbound-logs' | translate}} -
{{'admin.notify.dashboard.outbound' | translate}}
+
+
+
{{'admin.notify.dashboard.outbound' | translate}}
+
+ +
+
+
+ + {{ row.title | translate }}
- +
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 ca5dd0115a..a1f7cdbaf1 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 @@ -9,4 +9,8 @@ export class AdminNotifyMetricsComponent { @Input() boxesConfig: AdminNotifyMetricsRow[]; + + public navigateToSelectedSearchConfig($event: string) { + console.log($event); + } } 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 3f1fb24298..c6b7a9c005 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,41 +1,41 @@ -
- - - - - - - - - - - - - - - - - - - - - -
{{ 'notify-message-result.timestamp' | translate}}{{'notify-message-result.repositoryItem' | translate}}{{ 'notify-message-result.ldnService' | translate}}{{ 'notify-message-result.type' | translate }}{{ 'notify-message-result.status' | translate }}{{ 'notify-message-result.action' | translate }}
-
{{ message.queueLastStartTime | date:"YYYY/MM/d hh:mm:ss" }}
-
- {{ message.relatedItem }} - -
{{ message.ldnService }}
-
-
{{ message.activityStreamType }}
-
-
{{ 'notify-detail-modal.' + message.queueStatusLabel | translate }}
-
-
- - -
-
-
+
+ + + + + + + + + + + + + + + + + + + + + +
{{ 'notify-message-result.timestamp' | translate}}{{'notify-message-result.repositoryItem' | translate}}{{ 'notify-message-result.ldnService' | translate}}{{ 'notify-message-result.type' | translate }}{{ 'notify-message-result.status' | translate }}{{ 'notify-message-result.action' | translate }}
+
{{ message.queueLastStartTime | date:"YYYY/MM/d hh:mm:ss" }}
+
+ {{ message.relatedItem }} + +
{{ message.ldnService }}
+
+
{{ message.activityStreamType }}
+
+
{{ 'notify-detail-modal.' + message.queueStatusLabel | translate }}
+
+
+ + +
+
+
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 ece1419603..59fb4ca4e0 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 @@ -70,7 +70,7 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme this.mapDetailsToMessages(); this.subs.push(this.searchConfigService.getCurrentConfiguration('') .subscribe(configuration => { - this.isInbound = configuration === 'NOTIFY.incoming'; + this.isInbound = configuration.startsWith('NOTIFY.incoming'); }) ); } 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 ef3f33a97d..f47c6f6111 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 @@ -73,25 +73,28 @@ export class AdminNotifyMessagesService extends IdentifiableDataService endpoint.replace('{id}', message.id)), - map((endpointURL: string) => new GetRequest(requestId, endpointURL)), - tap(request => this.requestService.send(request)), - switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid)), - getFirstCompletedRemoteData(), - getAllSucceededRemoteDataPayload(), + 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(request.uuid)), + getFirstCompletedRemoteData(), + getAllSucceededRemoteDataPayload(), + mergeMap(reprocessedMessage => this.getDetailedMessages([reprocessedMessage])), ).pipe( - 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; - }) - )), + mergeMap((newMessages) => messageSubject.pipe( + map(messages => { + const detailedReprocessedMessage = newMessages[0]; + const messageToUpdate = messages.find(currentMessage => currentMessage.id === message.id); + const indexOfMessageToUpdate = messages.indexOf(messageToUpdate); + detailedReprocessedMessage.target = message.target; + detailedReprocessedMessage.object = message.object; + detailedReprocessedMessage.origin = message.origin; + detailedReprocessedMessage.context = message.context; + messages[indexOfMessageToUpdate] = detailedReprocessedMessage; + + return messages; + }) + )), ); } } diff --git a/src/app/shared/notification-box/notification-box.component.html b/src/app/shared/notification-box/notification-box.component.html index 924db37d9d..c5368137a7 100644 --- a/src/app/shared/notification-box/notification-box.component.html +++ b/src/app/shared/notification-box/notification-box.component.html @@ -1,4 +1,4 @@ -
+
{{ boxConfig.count ?? 0 }}
{{ boxConfig.title | translate }}
diff --git a/src/app/shared/notification-box/notification-box.component.ts b/src/app/shared/notification-box/notification-box.component.ts index 00082e938f..8d37c5aeef 100644 --- a/src/app/shared/notification-box/notification-box.component.ts +++ b/src/app/shared/notification-box/notification-box.component.ts @@ -1,4 +1,4 @@ -import { Component, Input } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { AdminNotifyMetricsBox } from '../../admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model'; @@ -16,4 +16,9 @@ import { ViewMode } from '../../core/shared/view-mode.model'; }) export class NotificationBoxComponent { @Input() boxConfig: AdminNotifyMetricsBox; + @Output() selectedBoxConfig: EventEmitter = new EventEmitter(); + + public onClick(boxConfig: AdminNotifyMetricsBox) { + this.selectedBoxConfig.emit(boxConfig.config); + } }