Automatic merge of gitlab-org/gitlab-ce master

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;
   }, {});

spec/frontend/pages/admin/abuse_reports/abuse_reports_spec.js

 import $ from 'jquery';
 import '~/lib/utils/text_utility';
 import AbuseReports from '~/pages/admin/abuse_reports/abuse_reports';
+import { setTestTimeout } from 'helpers/timeout';
+
+setTestTimeout(500);
 
 describe('Abuse Reports', () => {
   const FIXTURE = 'abuse_reports/abuse_reports_list.html';

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);
+      });
+    });
+  });
 });