summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriel Santiago <adriel@gitlab.com>2019-03-18 20:14:37 -0400
committerAdriel Santiago <adriel@gitlab.com>2019-05-22 18:20:04 -0400
commit6d494dac5ffa6d8835bfd02e130e5834efb3a036 (patch)
treecdeffe8821d098eb7ec61e2539f68eda53994715
parent3a963cd9858905194e6a9a8b68a1dbb375a40460 (diff)
downloadgitlab-ce-adriel-metrics-deployment-tooltip.tar.gz
Fix deployment tooltip on metrics dashboardadriel-metrics-deployment-tooltip
-rw-r--r--app/assets/javascripts/monitoring/components/charts/area.vue4
-rw-r--r--changelogs/unreleased/adriel-metrics-deployment-tooltip.yml5
2 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/monitoring/components/charts/area.vue b/app/assets/javascripts/monitoring/components/charts/area.vue
index c43791f2426..99f3e5a7481 100644
--- a/app/assets/javascripts/monitoring/components/charts/area.vue
+++ b/app/assets/javascripts/monitoring/components/charts/area.vue
@@ -194,8 +194,8 @@ export default {
this.tooltip.title = dateFormat(params.value, 'dd mmm yyyy, h:MMTT');
this.tooltip.content = [];
params.seriesData.forEach(seriesData => {
- if (seriesData.componentSubType === graphTypes.deploymentData) {
- this.tooltip.isDeployment = true;
+ this.tooltip.isDeployment = seriesData.componentSubType === graphTypes.deploymentData;
+ if (this.tooltip.isDeployment) {
const [deploy] = this.recentDeployments.filter(
deployment => deployment.createdAt === seriesData.value[0],
);
diff --git a/changelogs/unreleased/adriel-metrics-deployment-tooltip.yml b/changelogs/unreleased/adriel-metrics-deployment-tooltip.yml
new file mode 100644
index 00000000000..60d6fcbd685
--- /dev/null
+++ b/changelogs/unreleased/adriel-metrics-deployment-tooltip.yml
@@ -0,0 +1,5 @@
+---
+title: Fix deployment tooltip on metrics dashboard
+merge_request: 26416
+author:
+type: fixed