From c2a29924ffb4ccb9d3539d682386f9f402aee786 Mon Sep 17 00:00:00 2001 From: FrancescoMolinaro Date: Mon, 5 Feb 2024 15:04:00 +0100 Subject: [PATCH 1/2] CST-13526 update status mapping --- .../admin-notify-search-result.component.html | 2 +- .../admin-notify-search-result.component.ts | 1 + src/assets/i18n/en.json5 | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) 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 b6f29e90bd..af540b094e 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 @@ -32,7 +32,7 @@
{{ message.activityStreamType }}
-
{{ 'notify-detail-modal.' + message.queueStatusLabel | translate }}
+
{{ '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 83edbbf86b..959d93a373 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 @@ -40,6 +40,7 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme */ public validStatusesForReprocess = [ 'QUEUE_STATUS_UNTRUSTED', + 'QUEUE_STATUS_UNTRUSTED_IP', 'QUEUE_STATUS_FAILED', 'QUEUE_STATUS_UNMAPPED_ACTION' ]; diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 729af2f239..690fbebd7e 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -3690,8 +3690,12 @@ "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted", + "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip", + "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted", + "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip", + "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action", "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action", From 47c3d3cf664b158e3a0d9453b849ec4d5c0e9abb Mon Sep 17 00:00:00 2001 From: FrancescoMolinaro Date: Mon, 5 Feb 2024 15:10:51 +0100 Subject: [PATCH 2/2] CST-13526 update filter label --- src/assets/i18n/en.json5 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 7300d8b68a..aec987bfa8 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -3556,15 +3556,15 @@ "search.filters.applied.f.notifyRelation": "Notify Relation", - "search.filters.filter.queue_last_start_time.head" : "Last processing time ", + "search.filters.filter.queue_last_start_time.head": "Last processing time ", - "search.filters.filter.queue_last_start_time.min.label" : "Min range", + "search.filters.filter.queue_last_start_time.min.label": "Min range", - "search.filters.filter.queue_last_start_time.max.label" : "Max range", + "search.filters.filter.queue_last_start_time.max.label": "Max range", - "search.filters.applied.f.queue_last_start_time.min" : "Min range", + "search.filters.applied.f.queue_last_start_time.min": "Min range", - "search.filters.applied.f.queue_last_start_time.max" : "Max range", + "search.filters.applied.f.queue_last_start_time.max": "Max range", "admin.notify.dashboard.outbound": "Outbound messages", @@ -3598,6 +3598,8 @@ "search.filters.applied.f.queue_status": "Queue Status", + "search.filters.queue_status.0,authority": "Untrusted Ip", + "search.filters.queue_status.1,authority": "Queued", "search.filters.queue_status.2,authority": "Processing",