diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-10 12:09:39 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-10 12:09:39 +0300 |
commit | c52b81f45762cb7f05a950689dfc6d51b197ea73 (patch) | |
tree | c44830c2fc21d13b81814958c44b09fa8d11c805 /app/assets/javascripts | |
parent | 187ee320b39af22929d74c5a2d9b0650bf50a09b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/monitoring/components/charts/annotations.js | 12 | ||||
-rw-r--r-- | app/assets/javascripts/monitoring/components/charts/time_series.vue | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/app/assets/javascripts/monitoring/components/charts/annotations.js b/app/assets/javascripts/monitoring/components/charts/annotations.js index b0c89d5e374..de2b0c69a88 100644 --- a/app/assets/javascripts/monitoring/components/charts/annotations.js +++ b/app/assets/javascripts/monitoring/components/charts/annotations.js @@ -87,11 +87,17 @@ export const generateAnnotationsSeries = ({ deployments = [], annotations = [] } return { name: 'deployments', value: [deployment.createdAt, annotationsYAxisCoords.pos], + // style options symbol: deployment.icon, symbolSize: symbolSizes.default, itemStyle: { color: deployment.color, }, + // metadata that are accessible in `formatTooltipText` method + tooltipData: { + sha: deployment.sha.substring(0, 8), + commitUrl: deployment.commitUrl, + }, }; }); @@ -100,8 +106,12 @@ export const generateAnnotationsSeries = ({ deployments = [], annotations = [] } return { name: 'annotations', value: [annotation.from, annotationsYAxisCoords.pos], + // style options symbol: 'none', - description: annotation.description, + // metadata that are accessible in `formatTooltipText` method + tooltipData: { + description: annotation.description, + }, }; }); diff --git a/app/assets/javascripts/monitoring/components/charts/time_series.vue b/app/assets/javascripts/monitoring/components/charts/time_series.vue index f4cd6bbbb34..24aa8480ce4 100644 --- a/app/assets/javascripts/monitoring/components/charts/time_series.vue +++ b/app/assets/javascripts/monitoring/components/charts/time_series.vue @@ -262,19 +262,17 @@ export default { params.seriesData.forEach(dataPoint => { if (dataPoint.value) { - const [xVal, yVal] = dataPoint.value; + const [, yVal] = dataPoint.value; this.tooltip.type = dataPoint.name; if (this.isTooltipOfType(this.tooltip.type, this.$options.tooltipTypes.deployments)) { - const [deploy] = this.recentDeployments.filter( - deployment => deployment.createdAt === xVal, - ); - this.tooltip.sha = deploy.sha.substring(0, 8); - this.tooltip.commitUrl = deploy.commitUrl; + const { data = {} } = dataPoint; + this.tooltip.sha = data?.tooltipData?.sha; + this.tooltip.commitUrl = data?.tooltipData?.commitUrl; } else if ( this.isTooltipOfType(this.tooltip.type, this.$options.tooltipTypes.annotations) ) { const { data } = dataPoint; - this.tooltip.content.push(data?.description); + this.tooltip.content.push(data?.tooltipData?.description); } else { const { seriesName, color, dataIndex } = dataPoint; |