From df9036836c00999214e118b7d70ac2956fe4203f Mon Sep 17 00:00:00 2001 From: Mike Minutillo Date: Thu, 26 Sep 2019 14:00:59 +0800 Subject: [PATCH 1/3] Fixes incorrect headers issues Issue #663 --- .../app/js/services/services.service-control.js | 5 +++-- src/ServicePulse.Host/app/js/views/archive/controller.js | 4 ++-- src/ServicePulse.Host/app/js/views/message/controller.js | 4 ++-- .../js/views/message/editor/messageEditorModal.controller.js | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/ServicePulse.Host/app/js/services/services.service-control.js b/src/ServicePulse.Host/app/js/services/services.service-control.js index cecfa7121f..42bf4acea2 100644 --- a/src/ServicePulse.Host/app/js/services/services.service-control.js +++ b/src/ServicePulse.Host/app/js/services/services.service-control.js @@ -144,9 +144,10 @@ function getMessageHeaders(messageId) { var url = uri.join(scu, 'messages', 'search', messageId); return $http.get(url).then(function(response) { + var matchingMessage = response.data.find(function(m) { return m.message_id === messageId }); return { - data: response.data - }; + headers: matchingMessage.headers + } }); } diff --git a/src/ServicePulse.Host/app/js/views/archive/controller.js b/src/ServicePulse.Host/app/js/views/archive/controller.js index bfa947b244..0debba3a72 100644 --- a/src/ServicePulse.Host/app/js/views/archive/controller.js +++ b/src/ServicePulse.Host/app/js/views/archive/controller.js @@ -136,8 +136,8 @@ } if (message.messageHeaders === undefined) { - serviceControlService.getMessageHeaders(message.message_id).then(function (msg) { - message.messageHeaders = msg.data[0].headers; + serviceControlService.getMessageHeaders(message.message_id).then(function (response) { + message.messageHeaders = response.headers; }, function () { message.headersUnavailable = "message headers unavailable"; }); diff --git a/src/ServicePulse.Host/app/js/views/message/controller.js b/src/ServicePulse.Host/app/js/views/message/controller.js index 697a49d5b4..2bd707ed79 100644 --- a/src/ServicePulse.Host/app/js/views/message/controller.js +++ b/src/ServicePulse.Host/app/js/views/message/controller.js @@ -56,8 +56,8 @@ return false; if (!angular.isDefined(message.messageHeaders)) { - serviceControlService.getMessageHeaders(message.message_id).then(function (msg) { - message.messageHeaders = msg.data[0].headers; + serviceControlService.getMessageHeaders(message.message_id).then(function (response) { + message.messageHeaders = response.headers; }, function () { message.headersUnavailable = "message headers unavailable"; }); diff --git a/src/ServicePulse.Host/app/js/views/message/editor/messageEditorModal.controller.js b/src/ServicePulse.Host/app/js/views/message/editor/messageEditorModal.controller.js index 4214cd03e2..b792e26510 100644 --- a/src/ServicePulse.Host/app/js/views/message/editor/messageEditorModal.controller.js +++ b/src/ServicePulse.Host/app/js/views/message/editor/messageEditorModal.controller.js @@ -69,7 +69,7 @@ return serviceControlService.getMessageHeaders($scope.message.message_id) .then(function (response) { - $scope.message.messageHeaders = response.data[0].headers; + $scope.message.messageHeaders = response.headers; var intentHeader = findHeaderByKey($scope.message.messageHeaders, 'NServiceBus.MessageIntent'); if (intentHeader) { $scope.isEvent = intentHeader.value === 'Publish'; From 515eff1c3525a2de8849e25707a6a44407544048 Mon Sep 17 00:00:00 2001 From: WilliamBZA Date: Thu, 26 Sep 2019 08:39:03 +0200 Subject: [PATCH 2/3] Add missing semicolon --- .../app/js/services/services.service-control.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServicePulse.Host/app/js/services/services.service-control.js b/src/ServicePulse.Host/app/js/services/services.service-control.js index 42bf4acea2..11b0686f6f 100644 --- a/src/ServicePulse.Host/app/js/services/services.service-control.js +++ b/src/ServicePulse.Host/app/js/services/services.service-control.js @@ -144,7 +144,7 @@ function getMessageHeaders(messageId) { var url = uri.join(scu, 'messages', 'search', messageId); return $http.get(url).then(function(response) { - var matchingMessage = response.data.find(function(m) { return m.message_id === messageId }); + var matchingMessage = response.data.find(function(m) { return m.message_id === messageId; }); return { headers: matchingMessage.headers } From 6aedda889624a38e425a53caa69ff3b978979e36 Mon Sep 17 00:00:00 2001 From: WilliamBZA Date: Thu, 26 Sep 2019 08:39:45 +0200 Subject: [PATCH 3/3] Add missing semicolon --- .../app/js/services/services.service-control.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServicePulse.Host/app/js/services/services.service-control.js b/src/ServicePulse.Host/app/js/services/services.service-control.js index 11b0686f6f..4ed8c0f8eb 100644 --- a/src/ServicePulse.Host/app/js/services/services.service-control.js +++ b/src/ServicePulse.Host/app/js/services/services.service-control.js @@ -147,7 +147,7 @@ var matchingMessage = response.data.find(function(m) { return m.message_id === messageId; }); return { headers: matchingMessage.headers - } + }; }); }