From 7766ec3dfdb72b581f94a83a2abdd95123347bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20W=C3=B3jcik?= Date: Fri, 26 Oct 2018 11:51:11 +0200 Subject: [PATCH 1/4] Adding information about which tab should be open to URL --- .../monitoring/js/endpoint_details.controller.js | 10 +++++++++- .../app/modules/monitoring/views/endpoint_details.html | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js b/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js index ef585e7678..f4e91b0f66 100644 --- a/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js +++ b/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js @@ -18,8 +18,8 @@ $scope.endpointName = $routeParams.endpointName; $scope.sourceIndex = $routeParams.sourceIndex; + $scope.showInstancesBreakdown = $routeParams.tab === 'instancesBreakdown'; $scope.loading = true; - $scope.showInstancesBreakdown = false; $scope.largeGraphsMinimumYAxis = largeGraphsMinimumYAxis; $scope.smallGraphsMinimumYAxis = smallGraphsMinimumYAxis; @@ -42,6 +42,14 @@ } } + $scope.buildUrl = function (selectedPeriodValue, showInstancesBreakdownTab) { + return `#/endpoint_details/${$scope.endpointName}/${$scope.sourceIndex}?historyPeriod=${selectedPeriodValue}&tab=${$scope.showInstancesBreakdown ? 'instancesBreakdown' : 'messageTypeBreakdown'}`; + } + + $scope.showInstancesBreakdownTab = function(isVisible) { + $scope.showInstancesBreakdown = isVisible; + } + function updateUI() { if (subscription) { subscription.dispose(); diff --git a/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html b/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html index 2f9cd892b1..39755f5957 100644 --- a/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html +++ b/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html @@ -27,7 +27,7 @@

@@ -202,10 +202,10 @@

- Message Types + Message Types
- Instances + Instances
From 08893d320435f0f55ca57b5b0912494678b37226 Mon Sep 17 00:00:00 2001 From: WilliamBZA Date: Fri, 26 Oct 2018 14:43:17 +0200 Subject: [PATCH 2/4] Update src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js Co-Authored-By: WojcikMike --- .../app/modules/monitoring/js/endpoint_details.controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js b/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js index f4e91b0f66..f2a9ce93c7 100644 --- a/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js +++ b/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js @@ -44,7 +44,7 @@ $scope.buildUrl = function (selectedPeriodValue, showInstancesBreakdownTab) { return `#/endpoint_details/${$scope.endpointName}/${$scope.sourceIndex}?historyPeriod=${selectedPeriodValue}&tab=${$scope.showInstancesBreakdown ? 'instancesBreakdown' : 'messageTypeBreakdown'}`; - } + }; $scope.showInstancesBreakdownTab = function(isVisible) { $scope.showInstancesBreakdown = isVisible; @@ -150,4 +150,4 @@ angular.module('endpoint_details') .controller('endpointDetailsCtrl', controller); -}(window, window.angular)); \ No newline at end of file +}(window, window.angular)); From 84a84ce0153c64e55ede918ca10312c18695069c Mon Sep 17 00:00:00 2001 From: WilliamBZA Date: Fri, 26 Oct 2018 14:43:25 +0200 Subject: [PATCH 3/4] Update src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js Co-Authored-By: WojcikMike --- .../app/modules/monitoring/js/endpoint_details.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js b/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js index f2a9ce93c7..b099aa51a3 100644 --- a/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js +++ b/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js @@ -48,7 +48,7 @@ $scope.showInstancesBreakdownTab = function(isVisible) { $scope.showInstancesBreakdown = isVisible; - } + }; function updateUI() { if (subscription) { From 872c2f601ea26f149a84f79016413be949a24ec9 Mon Sep 17 00:00:00 2001 From: WilliamBZA Date: Fri, 26 Oct 2018 14:43:34 +0200 Subject: [PATCH 4/4] Update src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html Co-Authored-By: WojcikMike --- .../app/modules/monitoring/views/endpoint_details.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html b/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html index 39755f5957..d01b260558 100644 --- a/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html +++ b/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html @@ -27,7 +27,7 @@