From 087c69a81532fa20a81a3c5b914197edf6ee4436 Mon Sep 17 00:00:00 2001
From: Adriel Santiago <adriel@gitlab.com>
Date: Tue, 16 Apr 2019 08:16:20 -0400
Subject: Resolve cluster metrics regression

Fixes a regression causing cluster metrics not to display
---
 .../monitoring/stores/monitoring_store.js          |  7 +++----
 .../monitoring/monitoring_store_spec.js            | 24 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/monitoring/stores/monitoring_store.js b/app/assets/javascripts/monitoring/stores/monitoring_store.js
index 9761fe168be..013fb0d4540 100644
--- a/app/assets/javascripts/monitoring/stores/monitoring_store.js
+++ b/app/assets/javascripts/monitoring/stores/monitoring_store.js
@@ -45,14 +45,13 @@ function removeTimeSeriesNoData(queries) {
 //          ]
 function groupQueriesByChartInfo(metrics) {
   const metricsByChart = metrics.reduce((accumulator, metric) => {
-    const { id, queries, ...chart } = 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: id.toString(), ...queryAttrs }),
-    );
+    queries.forEach(queryAttrs => accumulator[chartKey].queries.push({ metricId, ...queryAttrs }));
 
     return accumulator;
   }, {});
diff --git a/spec/javascripts/monitoring/monitoring_store_spec.js b/spec/javascripts/monitoring/monitoring_store_spec.js
index d8a980c874d..5bf6937c92e 100644
--- a/spec/javascripts/monitoring/monitoring_store_spec.js
+++ b/spec/javascripts/monitoring/monitoring_store_spec.js
@@ -32,4 +32,28 @@ describe('MonitoringStore', () => {
   it('removes the data if all the values from a query are not defined', () => {
     expect(store.groups[1].metrics[0].queries[0].result.length).toEqual(0);
   });
+
+  it('assigns queries a metric id', () => {
+    expect(store.groups[1].metrics[0].queries[0].metricId).toEqual('100');
+  });
+
+  it('assigns metric id of null if metric has no id', () => {
+    const noId = MonitoringMock.data.map(group => ({
+      ...group,
+      ...{
+        metrics: group.metrics.map(metric => {
+          const { id, ...metricWithoutId } = metric;
+
+          return metricWithoutId;
+        }),
+      },
+    }));
+    store.storeMetrics(noId);
+
+    store.groups.forEach(group => {
+      group.metrics.forEach(metric => {
+        expect(metric.queries.every(query => query.metricId === null)).toBe(true);
+      });
+    });
+  });
 });
-- 
cgit v1.2.1