diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue | |
parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue')
-rw-r--r-- | app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue b/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue index 3b5e764b712..92ae8128285 100644 --- a/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue +++ b/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue @@ -1,8 +1,8 @@ <script> import { GlAlert, GlDropdown, GlDropdownItem, GlSprintf } from '@gitlab/ui'; import { GlAreaChart } from '@gitlab/ui/dist/charts'; -import dateFormat from 'dateformat'; import { get } from 'lodash'; +import { formatDate } from '~/lib/utils/datetime_utility'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; @@ -38,7 +38,10 @@ export default { }, xAxis: { name: '', - type: 'category', + type: 'time', + axisLabel: { + formatter: (value) => formatDate(value, 'mmm dd'), + }, }, }, }; @@ -74,7 +77,7 @@ export default { ); }, formattedData() { - return this.sortedData.map((value) => [dateFormat(value.date, 'mmm dd'), value.coverage]); + return this.sortedData.map((value) => [value.date, value.coverage]); }, chartData() { return [ @@ -106,7 +109,7 @@ export default { this.selectedCoverageIndex = index; }, formatTooltipText(params) { - this.tooltipTitle = params.value; + this.tooltipTitle = formatDate(params.value, 'mmm dd'); this.coveragePercentage = get(params, 'seriesData[0].data[1]', ''); }, }, |