diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-07 17:16:31 -0500 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-07 17:16:31 -0500 |
| commit | 7f5ae2e8b2a3e29ad128e28798b82c8b19d55100 (patch) | |
| tree | 53845beb23909fe0517fdf327a00cc6c10a93873 | |
| parent | 851ada82158fccce112665c420b60d1905317dba (diff) | |
| download | gitlab-ce-7f5ae2e8b2a3e29ad128e28798b82c8b19d55100.tar.gz | |
Changed how the backend response is handled for when instead of series
4 files changed, 6 insertions, 7 deletions
diff --git a/app/assets/javascripts/monitoring/utils/multiple_time_series.js b/app/assets/javascripts/monitoring/utils/multiple_time_series.js index 955b963b451..4e6a64fc47c 100644 --- a/app/assets/javascripts/monitoring/utils/multiple_time_series.js +++ b/app/assets/javascripts/monitoring/utils/multiple_time_series.js @@ -68,8 +68,8 @@ export default function createTimeSeries(queryData, graphWidth, graphHeight, gra .y1(d => timeSeriesScaleY(d.value)); const timeSeriesMetricLabel = timeSeries.metric[Object.keys(timeSeries.metric)[0]]; - const seriesCustomizationData = queryData.series != null && - _.findWhere(queryData.series[0].series, + const seriesCustomizationData = queryData.when != null && + _.findWhere(queryData.when[0].series, { value: timeSeriesMetricLabel }); if (seriesCustomizationData != null) { metricTag = seriesCustomizationData.value || timeSeriesMetricLabel; @@ -90,4 +90,3 @@ export default function createTimeSeries(queryData, graphWidth, graphHeight, gra }; }); } - diff --git a/spec/javascripts/monitoring/graph/legend_spec.js b/spec/javascripts/monitoring/graph/legend_spec.js index 969b5bad730..2571b7ef869 100644 --- a/spec/javascripts/monitoring/graph/legend_spec.js +++ b/spec/javascripts/monitoring/graph/legend_spec.js @@ -93,7 +93,7 @@ describe('GraphLegend', () => { const component = createComponent(defaultValuesComponent); const titles = component.$el.querySelectorAll('.legend-metric-title'); - expect(titles[0].textContent.indexOf('hundred(s)')).not.toEqual(-1); + expect(titles[0].textContent.indexOf('1xx')).not.toEqual(-1); expect(titles[1].textContent.indexOf('2xx')).not.toEqual(-1); expect(getTextFromNode(component, '.y-label-text')).toEqual(component.yAxisLabel); }); diff --git a/spec/javascripts/monitoring/graph_path_spec.js b/spec/javascripts/monitoring/graph_path_spec.js index e7348b03ba1..a4844636d09 100644 --- a/spec/javascripts/monitoring/graph_path_spec.js +++ b/spec/javascripts/monitoring/graph_path_spec.js @@ -27,9 +27,9 @@ describe('Monitoring Paths', () => { const metricArea = component.$el.querySelector('.metric-area'); const metricLine = component.$el.querySelector('.metric-line'); - expect(metricArea.getAttribute('fill')).toBe('#8dd5aa'); + expect(metricArea.getAttribute('fill')).toBe('#8fbce8'); expect(metricArea.getAttribute('d')).toBe(firstTimeSeries.areaPath); - expect(metricLine.getAttribute('stroke')).toBe('#1aaa55'); + expect(metricLine.getAttribute('stroke')).toBe('#1f78d1'); expect(metricLine.getAttribute('d')).toBe(firstTimeSeries.linePath); }); }); diff --git a/spec/javascripts/monitoring/mock_data.js b/spec/javascripts/monitoring/mock_data.js index 4d0d565cf26..7ceab657464 100644 --- a/spec/javascripts/monitoring/mock_data.js +++ b/spec/javascripts/monitoring/mock_data.js @@ -6347,7 +6347,7 @@ export const singleRowMetricsMultipleSeries = [ ] }, ], - 'series': [ + 'when': [ { 'value': 'hundred(s)', 'color': 'green', |