+
-
-
\ No newline at end of file
diff --git a/src/ServicePulse.Host/app/js/views/event_log_items/eventLogItems.tpl.html b/src/ServicePulse.Host/app/js/views/event_log_items/eventLogItems.tpl.html
index 6e16612d46..b3dfe56bc7 100644
--- a/src/ServicePulse.Host/app/js/views/event_log_items/eventLogItems.tpl.html
+++ b/src/ServicePulse.Host/app/js/views/event_log_items/eventLogItems.tpl.html
@@ -4,7 +4,7 @@
-
+
+
-
-
-
-
-
-
-
+
-
+
{{message.message_type || 'Message Type Unknown - missing metadata EnclosedMessageTypes'}}
-+
-
-
-
-
-
-
-
+ + + + + + + +
- - - - - - - -{{ message.exception.message }}
- {{ message.exception.stack_trace }}
- | {{header.key}} | -
- {{header.value}}
- |
-
{{message.headersUnavailable}}
- {{message.messageBody}}
- {{message.bodyUnavailable}}
+ {{ message.exception.message }}
+
+ Last 10 events
-
+
diff --git a/src/ServicePulse.Host/app/js/views/failed_groups/view.html b/src/ServicePulse.Host/app/js/views/failed_groups/view.html
index 12544303b4..e5017ce3e2 100644
--- a/src/ServicePulse.Host/app/js/views/failed_groups/view.html
+++ b/src/ServicePulse.Host/app/js/views/failed_groups/view.html
@@ -1,11 +1,4 @@
@@ -85,13 +78,13 @@
-
-
-
-
-
- Failed Messages
-Failed message groups
-
+
-
@@ -30,9 +25,11 @@
-
{{group.title}}
+{{group.title}}
Failed message groups
-
-
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 77cedc60f3..c17b33c829 100644
--- a/src/ServicePulse.Host/app/js/views/failed_messages/controller.js
+++ b/src/ServicePulse.Host/app/js/views/failed_messages/controller.js
@@ -94,9 +94,11 @@
};
vm.toggleRowSelect = function (row) {
-
row.selected = !row.selected;
+ vm.updateSelectedIdsWithMessage(row);
+ };
+ vm.updateSelectedIdsWithMessage = function(row) {
if (row.selected) {
vm.selectedIds.push(row.id);
} else {
@@ -105,23 +107,27 @@
};
vm.retrySelected = function () {
- serviceControlService.retryFailedMessages(vm.selectedIds);
toastService.showInfo("Retrying " + vm.selectedIds.length + " messages...");
- vm.selectedIds = [];
+ serviceControlService.retryFailedMessages(vm.selectedIds)
+ .then(() => {
+ vm.selectedIds = [];
- vm.failedMessages = vm.failedMessages.filter(function(item) {
- return !item.selected;
- });
+ vm.failedMessages = vm.failedMessages.filter(function(item) {
+ return !item.selected;
+ });
+ });
};
vm.archiveSelected = function () {
- serviceControlService.archiveFailedMessages(vm.selectedIds);
toastService.showInfo("Archiving " + vm.selectedIds.length + " messages...");
- vm.selectedIds = [];
+ serviceControlService.archiveFailedMessages(vm.selectedIds)
+ .then(() => {
+ vm.selectedIds = [];
- vm.failedMessages = vm.failedMessages.filter(function (item) {
- return !item.selected;
- });
+ vm.failedMessages = vm.failedMessages.filter(function(item) {
+ return !item.selected;
+ });
+ });
};
vm.archiveExceptionGroup = function (group) {
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 98b21cf262..b0ae0273c2 100644
--- a/src/ServicePulse.Host/app/js/views/failed_messages/view.html
+++ b/src/ServicePulse.Host/app/js/views/failed_messages/view.html
@@ -1,10 +1,5 @@
-
-
- Failed Messages
-Failed Messages
All failed messages ({{vm.failedMessages.length}} / {{vm.selectedExceptionGroup.count}} | number)
- {{vm.selectedExceptionGroup.title}}
-
+ {{vm.selectedExceptionGroup.title}}
+{{vm.selectedExceptionGroup.count | number}} messages in group
Failed Messages
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
diff --git a/src/ServicePulse.Host/app/js/views/message/controller.js b/src/ServicePulse.Host/app/js/views/message/controller.js
new file mode 100644
index 0000000000..f4b4fc876e
--- /dev/null
+++ b/src/ServicePulse.Host/app/js/views/message/controller.js
@@ -0,0 +1,148 @@
+;
+(function(window, angular, undefined) {
+ "use strict";
+
+ function controller(
+ $scope,
+ $routeParams,
+ $moment,
+ scConfig,
+ toastService,
+ serviceControlService,
+ archivedMessageService,
+ notifyService,
+ sharedDataService) {
+
+ var vm = this;
+ var notifier = notifyService();
+
+ vm.message = {};
+
+ var init = function () {
+ var configuration = sharedDataService.getConfiguration();
+ vm.error_retention_period = $moment.duration(configuration.data_retention.error_retention_period).asHours();
+ var messageId = $routeParams.messageId;
+ vm.loadMessage(messageId).then(function () { vm.togglePanel(vm.message, 1); });
+ };
+
+ notifier.subscribe($scope, function (event, messageFailureResolved) {
+ if (messageFailureResolved.failed_message_id === vm.message.id) {
+ toastService.showInfo('Message was successfully retried.');
+ vm.message.retried = false;
+ vm.message.resolved = true;
+ }
+ }, "MessageFailureResolvedByRetry");
+
+ notifier.subscribe($scope, function (event, messageFailureResolved) {
+ if (messageFailureResolved.failed_message_id === vm.message.id) {
+ toastService.showInfo('Message failed.');
+ vm.message.retried = false;
+ }
+ }, "MessageFailed");
+
+ vm.clipComplete = function(messageId) {
+ toastService.showInfo(messageId + ' copied to clipboard');
+ };
+
+ vm.togglePanel = function (message, panelnum) {
+ if (!message)
+ return false;
+
+ if (!angular.isDefined(message.messageBody)) {
+ serviceControlService.getMessageBody(message.message_id).then(function (msg) {
+ message.messageBody = msg.data;
+ }, function () {
+ message.bodyUnavailable = "message body unavailable";
+ });
+ }
+
+ if (!angular.isDefined(message.messageHeaders)) {
+ serviceControlService.getMessageHeaders(message.message_id).then(function (msg) {
+ message.messageHeaders = msg.data[0].headers;
+ }, function () {
+ message.headersUnavailable = "message headers unavailable";
+ });
+ }
+ message.panel = panelnum;
+ return false;
+ };
+
+ vm.retryMessage = function () {
+ toastService.showInfo("Retrying the message " + vm.message.message_id + " ...");
+ serviceControlService.retryFailedMessages([vm.message.id])
+ .then(function() {
+ vm.message.retried = true;
+ }
+ );
+ };
+
+ vm.archiveMessage = function () {
+ toastService.showInfo("Archiving the message " + vm.message.message_id + " ...");
+ serviceControlService.archiveFailedMessages([vm.message.id])
+ .then(function() {
+ // below line is a way to not fetch for the whole message from SC. We update date to now and calculate delete fields
+ vm.message.last_modified = $moment().format();
+ updateMessageDeleteDate(vm.message, vm.error_retention_period);
+ vm.message.archived = true;
+ });
+ };
+
+ function updateMessageDeleteDate(message, errorRetentionPeriod) {
+ var countdown = $moment(message.last_modified).add(errorRetentionPeriod, 'hours');
+ message.delete_soon = countdown < $moment();
+ message.deleted_in = countdown.format();
+ }
+
+ vm.unarchiveMessage = function () {
+ archivedMessageService.restoreMessageFromArchive(vm.message.id, 'Restore From Archive Request Accepted', 'Restore From Archive Request Rejected')
+ .then(function () {
+ vm.message.archived = false;
+ });
+ };
+
+ vm.debugInServiceInsight = function () {
+ var messageId = vm.message.message_id;
+ var dnsName = scConfig.service_control_url.toLowerCase();
+
+ if (dnsName.indexOf("https") === 0) {
+ dnsName = dnsName.replace("https://", "");
+ } else {
+ dnsName = dnsName.replace("http://", "");
+ }
+
+ $window.open("si://" + dnsName + "?search=" + messageId);
+ };
+
+ vm.loadMessage = function (messageId) {
+ return serviceControlService.getFailedMessageById(messageId).then(function (response) {
+ var message = response.data;
+ message.archived = message.status === 'archived';
+ message.resolved = message.status === 'resolved';
+ message.retried = message.status === 'retryIssued';
+ updateMessageDeleteDate(message, vm.error_retention_period);
+ vm.message = message;
+ },
+ function() {
+ vm.message = null;
+ });
+ };
+
+ init();
+ }
+
+ controller.$inject = [
+ "$scope",
+ "$routeParams",
+ "$moment",
+ "scConfig",
+ "toastService",
+ "serviceControlService",
+ "archivedMessageService",
+ "notifyService",
+ "sharedDataService"
+ ];
+
+ angular.module("sc")
+ .controller("messagesController", controller);
+
+})(window, window.angular);
\ No newline at end of file
diff --git a/src/ServicePulse.Host/app/js/views/message/messages-view.html b/src/ServicePulse.Host/app/js/views/message/messages-view.html
new file mode 100644
index 0000000000..8550cb570d
--- /dev/null
+++ b/src/ServicePulse.Host/app/js/views/message/messages-view.html
@@ -0,0 +1,82 @@
+
-
-
-
-
-
+
-
-
- {{message.message_type || 'Message Type Unknown - missing metadata EnclosedMessageTypes'}}
- +
+
+
-
+
+
+
{{message.message_type || 'Message Type Unknown - missing metadata EnclosedMessageTypes'}}
+ + +{{ message.exception.message }}
+
+
-
-
-
-
-
-
-
-
+
-
-
-
-
- - - - - - - - - - -
-{{ message.exception.message }}
- {{ message.exception.stack_trace }}
- | {{header.key}} | -
- {{header.value}}
- |
-
{{message.headersUnavailable}}
- {{message.messageBody}}
- {{message.bodyUnavailable}}
-
+
+
+
\ No newline at end of file
diff --git a/src/ServicePulse.Host/app/js/views/message/route.js b/src/ServicePulse.Host/app/js/views/message/route.js
new file mode 100644
index 0000000000..a59764146e
--- /dev/null
+++ b/src/ServicePulse.Host/app/js/views/message/route.js
@@ -0,0 +1,22 @@
+; (function (window, angular, undefined) {
+ 'use strict';
+
+ function routeProvider($routeProvider) {
+ $routeProvider.when('/message/:messageId', {
+ data: {
+ pageTitle: 'Message'
+ },
+ templateUrl: 'js/views/message/messages-view.html',
+ controller: 'messagesController',
+ controllerAs: 'vm'
+ });
+ };
+
+ routeProvider.$inject = [
+ '$routeProvider'
+ ];
+
+ angular.module('sc')
+ .config(routeProvider);
+
+}(window, window.angular));
\ No newline at end of file
diff --git a/src/ServicePulse.Host/app/js/views/pending_retries/controller.js b/src/ServicePulse.Host/app/js/views/pending_retries/controller.js
index b2eb93484d..92f74cee0b 100644
--- a/src/ServicePulse.Host/app/js/views/pending_retries/controller.js
+++ b/src/ServicePulse.Host/app/js/views/pending_retries/controller.js
@@ -173,6 +173,10 @@
row.selected = !row.selected;
+ vm.updateSelectedIdsWithMessage(row);
+ };
+
+ vm.updateSelectedIdsWithMessage = function (row) {
if (row.selected) {
vm.selectedIds.push(row.id);
} else {
diff --git a/src/ServicePulse.Host/app/js/views/pending_retries/view.html b/src/ServicePulse.Host/app/js/views/pending_retries/view.html
index 4ef83bb3c7..f91eea5d93 100644
--- a/src/ServicePulse.Host/app/js/views/pending_retries/view.html
+++ b/src/ServicePulse.Host/app/js/views/pending_retries/view.html
@@ -1,10 +1,5 @@
+
+
+
+
+
+
+ ◀ BACK
+ {{vm.message.message_type}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ vm.message.exception.message }}
+ {{ vm.message.exception.stack_trace }}
+ | {{header.key}} | +
+ {{header.value}}
+ |
+
{{vm.message.headersUnavailable}}
+ {{vm.message.messageBody}}
+ {{vm.message.bodyUnavailable}}
+
-
-
- Failed Messages
-Failed Messages
-
+
-
+
-
+
+
+
@@ -111,86 +110,59 @@
Failed Messages
+
+
+
-
- 
+ 
-
\ No newline at end of file
diff --git a/src/ServicePulse.Host/app/layout/navbar.html b/src/ServicePulse.Host/app/layout/navbar.html
index c5726d612c..a37e51debc 100644
--- a/src/ServicePulse.Host/app/layout/navbar.html
+++ b/src/ServicePulse.Host/app/layout/navbar.html
@@ -12,7 +12,7 @@
position: absolute;">!
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
-
{{message.message_type || 'Message Type Unknown - missing metadata EnclosedMessageTypes'}}
- +
+
+
+
-
+
+
+
+
+
-
+
-
-
-
-
- - - - - - - - - - -
-{{ message.exception.message }}
- {{ message.exception.stack_trace }}
- | {{header.key}} | -
- {{header.value}}
- |
-
{{message.headersUnavailable}}
- {{message.messageBody}}
- {{message.bodyUnavailable}}
-
+