From 86bea3be755cc971833ba3be1af013331fe40f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20W=C3=B3jcik?= Date: Fri, 2 Nov 2018 13:00:53 +0100 Subject: [PATCH 1/4] Adding retry button on one message --- .../js/views/failed_messages/controller.js | 21 +++++++++ .../app/js/views/failed_messages/view.html | 44 +++++++++---------- 2 files changed, 43 insertions(+), 22 deletions(-) diff --git a/src/ServicePulse.Host/app/js/views/failed_messages/controller.js b/src/ServicePulse.Host/app/js/views/failed_messages/controller.js index 073f632633..0a264c0567 100644 --- a/src/ServicePulse.Host/app/js/views/failed_messages/controller.js +++ b/src/ServicePulse.Host/app/js/views/failed_messages/controller.js @@ -107,6 +107,27 @@ vm.loadMoreResults(vm.selectedExceptionGroup); }; + vm.viewMessage = function (message) { + $location.path(`/failed-messages/message/${message.id}`); + }; + + vm.retryMessage = function(message, $event) { + toastService.showInfo("Retrying the message " + message.id + " ..."); + serviceControlService.retryFailedMessages([message.id]) + .then(function() { + var indexOfMessage = vm.selectedIds.indexOf(message.id); + if (indexOfMessage) { + vm.selectedIds.splice(indexOfMessage, 1); + } + + vm.failedMessages = vm.failedMessages.filter(function(item) { + return item.id !== message.id; + }); + } + ); + $event.stopPropagation(); + }; + vm.clipComplete = function(messageId) { toastService.showInfo(messageId + ' copied to clipboard'); }; diff --git a/src/ServicePulse.Host/app/js/views/failed_messages/view.html b/src/ServicePulse.Host/app/js/views/failed_messages/view.html index 4ada52c03d..644fd27a11 100644 --- a/src/ServicePulse.Host/app/js/views/failed_messages/view.html +++ b/src/ServicePulse.Host/app/js/views/failed_messages/view.html @@ -67,32 +67,32 @@

{{vm.selectedExceptionGroup.c
- + +
+
+
+
+

{{message.message_type || 'Message Type Unknown - missing metadata EnclosedMessageTypes'}}

+

+ Retried + Archived + {{message.number_of_processing_attempts}} Retry Failures + + Failed: + Endpoint: {{message.receiving_endpoint.name}} + Machine: {{message.receiving_endpoint.host}} + Redirect: {{message.redirect}} + +

+ + 
{{ message.exception.message }}
-
- -
-
-
-

{{message.message_type || 'Message Type Unknown - missing metadata EnclosedMessageTypes'}}

-

- Retried - Archived - {{message.number_of_processing_attempts}} Retry Failures - - Failed: - Endpoint: {{message.receiving_endpoint.name}} - Machine: {{message.receiving_endpoint.host}} - Redirect: {{message.redirect}} -

- - 
{{ message.exception.message }}
- -
- +
From ee57c9ec828054232352087338a3600d50d38bfa Mon Sep 17 00:00:00 2001 From: Sergio Date: Fri, 2 Nov 2018 17:25:24 +0100 Subject: [PATCH 2/4] Position retry btn --- src/ServicePulse.Host/app/css/particular.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/ServicePulse.Host/app/css/particular.css b/src/ServicePulse.Host/app/css/particular.css index 7db3451921..e788152d66 100644 --- a/src/ServicePulse.Host/app/css/particular.css +++ b/src/ServicePulse.Host/app/css/particular.css @@ -596,12 +596,20 @@ p.metadata { margin-bottom: 6px; } + p.metadata button { + position: absolute; + right: -35px; + top: 26px; + } + span.metadata { display: inline-block; padding: 0px 20px 2px 0; color: #777f7f; } + + .metadata:first-child { padding-left: 0; } From c678856ff2c41726bb631af16b1b1197088691f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20W=C3=B3jcik?= Date: Mon, 5 Nov 2018 08:57:53 +0100 Subject: [PATCH 3/4] Showing the button only on hover --- src/ServicePulse.Host/app/js/views/failed_messages/view.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServicePulse.Host/app/js/views/failed_messages/view.html b/src/ServicePulse.Host/app/js/views/failed_messages/view.html index 644fd27a11..c946c8f7ae 100644 --- a/src/ServicePulse.Host/app/js/views/failed_messages/view.html +++ b/src/ServicePulse.Host/app/js/views/failed_messages/view.html @@ -82,7 +82,7 @@

{{vm.selectedExceptionGroup.c Endpoint: {{message.receiving_endpoint.name}} Machine: {{message.receiving_endpoint.host}} Redirect: {{message.redirect}} -

From 67c81af11fdb3e997fe28e68905dfc09bb71d13f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20W=C3=B3jcik?= Date: Mon, 5 Nov 2018 20:03:01 +0100 Subject: [PATCH 4/4] Changing the message to more generic --- .../app/js/views/failed_messages/controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServicePulse.Host/app/js/views/failed_messages/controller.js b/src/ServicePulse.Host/app/js/views/failed_messages/controller.js index 0a264c0567..3ace8a91e5 100644 --- a/src/ServicePulse.Host/app/js/views/failed_messages/controller.js +++ b/src/ServicePulse.Host/app/js/views/failed_messages/controller.js @@ -112,7 +112,7 @@ }; vm.retryMessage = function(message, $event) { - toastService.showInfo("Retrying the message " + message.id + " ..."); + toastService.showInfo("Message retry requested"); serviceControlService.retryFailedMessages([message.id]) .then(function() { var indexOfMessage = vm.selectedIds.indexOf(message.id);