diff options
author | Phil Hughes <me@iamphill.com> | 2017-04-19 12:06:14 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-04-19 12:06:14 +0100 |
commit | 8d3b2581b8e1f3aff82fb8bf76203430fde064b3 (patch) | |
tree | c503ff30915bac9081d2e5729928ac369ca1550f /app/assets/javascripts/monitoring/prometheus_graph.js | |
parent | 5d8891fb85a4646557e2f478c6c08c997868c8fb (diff) | |
download | gitlab-ce-8d3b2581b8e1f3aff82fb8bf76203430fde064b3.tar.gz |
Style improvements
Fixed an issue where the line wouldnt move when hovering over deployment
Diffstat (limited to 'app/assets/javascripts/monitoring/prometheus_graph.js')
-rw-r--r-- | app/assets/javascripts/monitoring/prometheus_graph.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/monitoring/prometheus_graph.js b/app/assets/javascripts/monitoring/prometheus_graph.js index 03d47c052c8..212fbce91ba 100644 --- a/app/assets/javascripts/monitoring/prometheus_graph.js +++ b/app/assets/javascripts/monitoring/prometheus_graph.js @@ -214,17 +214,17 @@ class PrometheusGraph { const maxValueMetric = Math.floor( y(d3.max(valuesToPlot.map(metricValue => metricValue.value))), ); + const currentDeployXPos = this.deployments.mouseOverDeployInfo(mouse); const currentTimeCoordinate = Math.floor(x(currentData.time)); const graphSpecifics = this.graphSpecificProperties[key]; - const shouldHideTextMetric = this.deployments.mouseOverDeployInfo(mouse); // Remove the current selectors d3.selectAll(`${prometheusGraphContainer} .selected-metric-line`).remove(); d3.selectAll(`${prometheusGraphContainer} .circle-metric`).remove(); d3.selectAll(`${prometheusGraphContainer} .rect-text-metric:not(.deploy-info-rect)`).remove(); chart.append('line') - .attr('class', 'selected-metric-line') .attr({ + class: `${currentDeployXPos ? 'hidden' : ''} selected-metric-line`, x1: currentTimeCoordinate, y1: y(0), x2: currentTimeCoordinate, @@ -234,11 +234,11 @@ class PrometheusGraph { chart.append('circle') .attr('class', 'circle-metric') .attr('fill', graphSpecifics.line_color) - .attr('cx', currentTimeCoordinate) + .attr('cx', currentDeployXPos || currentTimeCoordinate) .attr('cy', y(currentData.value)) .attr('r', this.commonGraphProperties.circle_radius_metric); - if (shouldHideTextMetric) return; + if (currentDeployXPos) return; // The little box with text const rectTextMetric = chart.append('svg') |