diff --git a/ee/app/assets/javascripts/metrics/details/metrics_heatmap.vue b/ee/app/assets/javascripts/metrics/details/metrics_heatmap.vue index 3e5e9c57cdd8bc3a42e5c667bbb5338a9719600c..c4d6a1ed927752ceaaaa92e5a19f011629322f6f 100644 --- a/ee/app/assets/javascripts/metrics/details/metrics_heatmap.vue +++ b/ee/app/assets/javascripts/metrics/details/metrics_heatmap.vue @@ -73,7 +73,7 @@ export default { yAxisLabels() { return this.heatmapData.buckets; }, - chartOptions() { + chartOption() { return { tooltip: { // show the default tooltip @@ -96,7 +96,7 @@ export default { :x-axis-labels="xAxisLabels" :y-axis-labels="yAxisLabels" :data-series="chartData" - :options="chartOptions" + :option="chartOption" :show-tooltip="false" responsive /> diff --git a/ee/spec/frontend/metrics/details/metrics_heatmap_spec.js b/ee/spec/frontend/metrics/details/metrics_heatmap_spec.js index 3052158f3a8a8fc99fee128e380fb858e259141e..11616b83e98af21983140d29e1ba8096a93f9629 100644 --- a/ee/spec/frontend/metrics/details/metrics_heatmap_spec.js +++ b/ee/spec/frontend/metrics/details/metrics_heatmap_spec.js @@ -81,8 +81,8 @@ describe('MetricsHeatmap', () => { expect(findHeatmap().props('yAxisLabels')).toEqual(['A', 'B', 'C']); }); - it('overrides options to enable the default tooltip', () => { - expect(findHeatmap().props('options')).toEqual({ + it('sets option prop to enable the default tooltip', () => { + expect(findHeatmap().props('option')).toEqual({ tooltip: {}, xAxis: { axisPointer: { show: false } }, }); diff --git a/package.json b/package.json index c93aa9e3f52333eea7f1f0379c7ee67fb10b9d7c..2139c9ce0950324341039fa7fc4b8f703267e6df 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "@gitlab/favicon-overlay": "2.0.0", "@gitlab/fonts": "^1.3.0", "@gitlab/svgs": "3.109.0", - "@gitlab/ui": "86.13.0", + "@gitlab/ui": "86.14.1", "@gitlab/web-ide": "^0.0.1-dev-20240613133550", "@mattiasbuelens/web-streams-adapter": "^0.1.0", "@rails/actioncable": "7.0.8-4", diff --git a/yarn.lock b/yarn.lock index 8935f87524bf7a4002be8ea666dc7f5740f6566a..40fdac29ef3158fad19e3a5350963129589a1c6c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1359,10 +1359,10 @@ resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.109.0.tgz#af953d8114768343034f1f02bc8e2d93eb613c65" integrity sha512-MmBTsco2LIh/l16iJQy6R98YDOlE3C++AE0Z1+KCpAX/3+fLAmULx2sWp+JnmM0ws8J0LaeLN6+vWiPaEWA16Q== -"@gitlab/ui@86.13.0": - version "86.13.0" - resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-86.13.0.tgz#c365418154119d3238ee0e90e1a3246da47f9ca8" - integrity sha512-vXGDXs6vIm4kp2jGs/3umGec+117Wi7IEeLUtcNCZfBrFxrEH5hu5qPGl7AjSwNhCkOnENfRkW43ud47rZ0BHQ== +"@gitlab/ui@86.14.1": + version "86.14.1" + resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-86.14.1.tgz#b97903e5b214cc19000ba56798137d8124fa3e3d" + integrity sha512-ZgZZ0R9vG/p5XlAj9narLEB8BPcPjCwKbQ2VZhPEDNeWrttQCPRgC/t4IMWwmyfoPTrGIiRcKfl83urSdumPaQ== dependencies: "@floating-ui/dom" "1.4.3" echarts "^5.3.2"