diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-08-23 10:12:19 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-08-23 10:12:19 +0000 |
| commit | 0bd9166d14a95fb674ac0ec304a532f0553d2a09 (patch) | |
| tree | 7d6ee9685c82cfb45308ddc6ab6cae94e03db4fa | |
| parent | ff9060e0619684d560947b3fe7a5278df2e3a1d5 (diff) | |
| parent | 3e5946335d430c50726a2bfddaf50e0fc43192e2 (diff) | |
| download | gitlab-ce-0bd9166d14a95fb674ac0ec304a532f0553d2a09.tar.gz | |
Merge branch '64385-charts-scroll-handle-icon-has-disappeared' into 'master'
fix charts scroll handle icon
See merge request gitlab-org/gitlab-ce!31825
3 files changed, 14 insertions, 1 deletions
diff --git a/app/assets/javascripts/monitoring/components/charts/area.vue b/app/assets/javascripts/monitoring/components/charts/area.vue index 78d97a3c122..cac10474d06 100644 --- a/app/assets/javascripts/monitoring/components/charts/area.vue +++ b/app/assets/javascripts/monitoring/components/charts/area.vue @@ -126,7 +126,7 @@ export default { }, }, series: this.scatterSeries, - dataZoom: this.dataZoomConfig, + dataZoom: [this.dataZoomConfig], }; }, dataZoomConfig() { diff --git a/changelogs/unreleased/64385-charts-scroll-handle-icon-has-disappeared.yml b/changelogs/unreleased/64385-charts-scroll-handle-icon-has-disappeared.yml new file mode 100644 index 00000000000..93ed2ff4619 --- /dev/null +++ b/changelogs/unreleased/64385-charts-scroll-handle-icon-has-disappeared.yml @@ -0,0 +1,5 @@ +--- +title: fix charts scroll handle icon to use gitlab svg +merge_request: 31825 +author: +type: fixed diff --git a/spec/javascripts/monitoring/charts/area_spec.js b/spec/javascripts/monitoring/charts/area_spec.js index 57f99a09002..1e49a955815 100644 --- a/spec/javascripts/monitoring/charts/area_spec.js +++ b/spec/javascripts/monitoring/charts/area_spec.js @@ -225,6 +225,14 @@ describe('Area component', () => { }); describe('chartOptions', () => { + describe('dataZoom', () => { + it('contains an svg object within an array to properly render icon', () => { + const dataZoomObject = [{}]; + + expect(areaChart.vm.chartOptions.dataZoom).toEqual(dataZoomObject); + }); + }); + describe('yAxis formatter', () => { let format; |