Merge branch '59651-remove-unnecessary-decimal-places-on-chart-axes' into 'master'

Resolve "Remove unnecessary decimal places on chart axes"

Closes #59651

See merge request gitlab-org/gitlab-ce!29468
This commit is contained in:
Phil Hughes 2019-06-12 13:25:13 +00:00
commit 6766a88ade
3 changed files with 21 additions and 2 deletions

View File

@ -1,7 +1,7 @@
<script>
import { GlAreaChart, GlChartSeriesLabel } from '@gitlab/ui/dist/charts';
import dateFormat from 'dateformat';
import { debounceByAnimationFrame } from '~/lib/utils/common_utils';
import { debounceByAnimationFrame, roundOffFloat } from '~/lib/utils/common_utils';
import { getSvgIconPathContent } from '~/lib/utils/icon_utils';
import Icon from '~/vue_shared/components/icon.vue';
import { chartHeight, graphTypes, lineTypes } from '../../constants';
@ -111,7 +111,7 @@ export default {
yAxis: {
name: this.yAxisLabel,
axisLabel: {
formatter: value => value.toFixed(3),
formatter: num => roundOffFloat(num, 3).toString(),
},
},
series: this.scatterSeries,

View File

@ -0,0 +1,5 @@
---
title: Remove unnecessary decimals on Metrics chart axis
merge_request: 29468
author:
type: fixed

View File

@ -214,6 +214,20 @@ describe('Area component', () => {
});
});
describe('chartOptions', () => {
describe('yAxis formatter', () => {
let format;
beforeEach(() => {
format = areaChart.vm.chartOptions.yAxis.axisLabel.formatter;
});
it('rounds to 3 decimal places', () => {
expect(format(0.88888)).toBe('0.889');
});
});
});
describe('scatterSeries', () => {
it('utilizes deployment data', () => {
expect(areaChart.vm.scatterSeries.data).toEqual([