diff options
author | Sarah Yasonik <syasonik@gitlab.com> | 2019-07-05 08:49:33 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-07-05 08:49:33 +0000 |
commit | 7fd7406d56f93db751d7ec3c69e3a30c1e6df14c (patch) | |
tree | e910c180fe4f9025a1a50c311e45083c0faff491 /app/assets/javascripts/monitoring | |
parent | 80886b6b72b5372ba33d65b9af56259f9aaadd4b (diff) | |
download | gitlab-ce-7fd7406d56f93db751d7ec3c69e3a30c1e6df14c.tar.gz |
Fix alert creation dropdown menu
Diffstat (limited to 'app/assets/javascripts/monitoring')
-rw-r--r-- | app/assets/javascripts/monitoring/stores/utils.js | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/app/assets/javascripts/monitoring/stores/utils.js b/app/assets/javascripts/monitoring/stores/utils.js index 84e1f1c4c20..721942f9d3b 100644 --- a/app/assets/javascripts/monitoring/stores/utils.js +++ b/app/assets/javascripts/monitoring/stores/utils.js @@ -36,15 +36,26 @@ function removeTimeSeriesNoData(queries) { // { metricId: 2, ...query2Attrs }] }, // { title: 'new title', y_label: 'MB', queries: [{ metricId: 3, ...query3Attrs }]} // ] -function groupQueriesByChartInfo(metrics) { +export function groupQueriesByChartInfo(metrics) { const metricsByChart = metrics.reduce((accumulator, metric) => { const { queries, ...chart } = metric; - const metricId = chart.id ? chart.id.toString() : null; const chartKey = `${chart.title}|${chart.y_label}`; accumulator[chartKey] = accumulator[chartKey] || { ...chart, queries: [] }; - queries.forEach(queryAttrs => accumulator[chartKey].queries.push({ metricId, ...queryAttrs })); + queries.forEach(queryAttrs => { + let metricId; + + if (chart.id) { + metricId = chart.id.toString(); + } else if (queryAttrs.metric_id) { + metricId = queryAttrs.metric_id.toString(); + } else { + metricId = null; + } + + accumulator[chartKey].queries.push({ metricId, ...queryAttrs }); + }); return accumulator; }, {}); |