diff options
| author | lauraMon <lmontemayor@gitlab.com> | 2019-09-10 15:37:48 -0400 |
|---|---|---|
| committer | lauraMon <lmontemayor@gitlab.com> | 2019-09-10 15:37:48 -0400 |
| commit | 18856c2046311fd534af6b6e9d0dea11851a821d (patch) | |
| tree | 2d108c3104c01421d6f534c1b9a4a90ea1a0c2d8 | |
| parent | 95d16dc007f3fe8831f2baa511bbb7bd708baff0 (diff) | |
| download | gitlab-ce-fix-scrollhandle-in-time-series.tar.gz | |
Fixes scrollbar in time seriesfix-scrollhandle-in-time-series
3 files changed, 14 insertions, 1 deletions
diff --git a/app/assets/javascripts/monitoring/components/charts/time_series.vue b/app/assets/javascripts/monitoring/components/charts/time_series.vue index 02e7a7ba0a6..cd8434d2df1 100644 --- a/app/assets/javascripts/monitoring/components/charts/time_series.vue +++ b/app/assets/javascripts/monitoring/components/charts/time_series.vue @@ -129,7 +129,7 @@ export default { }, }, series: this.scatterSeries, - dataZoom: this.dataZoomConfig, + dataZoom: [this.dataZoomConfig], }; }, dataZoomConfig() { diff --git a/ee/changelogs/unreleased/fix-scrollhandle-in-time-series.yml b/ee/changelogs/unreleased/fix-scrollhandle-in-time-series.yml new file mode 100644 index 00000000000..33c7a400050 --- /dev/null +++ b/ee/changelogs/unreleased/fix-scrollhandle-in-time-series.yml @@ -0,0 +1,5 @@ +--- +title: Fixes scroll handle icon in time series +merge_request: 16354 +author: +type: fixed diff --git a/spec/javascripts/monitoring/charts/time_series_spec.js b/spec/javascripts/monitoring/charts/time_series_spec.js index d145a64e8d0..ee469485e11 100644 --- a/spec/javascripts/monitoring/charts/time_series_spec.js +++ b/spec/javascripts/monitoring/charts/time_series_spec.js @@ -204,6 +204,14 @@ describe('Time series component', () => { }); describe('chartOptions', () => { + describe('dataZoom', () => { + it('contains an svg object within an array to properly render icon', () => { + const dataZoomObject = [{}]; + + expect(timeSeriesChart.vm.chartOptions.dataZoom).toEqual(dataZoomObject); + }); + }); + describe('yAxis formatter', () => { let format; |