Commit e5e1a990 authored by Clement Ho's avatar Clement Ho

Merge branch 'psi-indy-embed-zooms' into 'master'

Independence for embed timewindow scroll

See merge request gitlab-org/gitlab!18109
parents 8a713738 0e9693f6
......@@ -63,6 +63,11 @@ export default {
required: false,
default: s__('Metrics|Max'),
},
groupId: {
type: String,
required: false,
default: '',
},
},
data() {
return {
......@@ -290,6 +295,7 @@ export default {
:is="glChartComponent"
ref="chart"
v-bind="$attrs"
:group-id="groupId"
:data="chartData"
:option="chartOptions"
:format-tooltip-text="formatTooltipText"
......
......@@ -98,7 +98,7 @@ export default {
class="w-100"
:graph-data="graphData"
:container-width="elWidth"
group-id="monitor-area-chart"
:group-id="dashboardUrl"
:project-path="null"
:show-border="true"
:single-embed="isSingleChart"
......
---
title: Embed metrics time window scroll no longer affects other embeds
merge_request: 18109
author:
type: fixed
......@@ -74,5 +74,9 @@ describe('Embed', () => {
expect(wrapper.find(MonitorTimeSeriesChart).exists()).toBe(true);
expect(wrapper.findAll(MonitorTimeSeriesChart).length).toBe(2);
});
it('includes groupId with dashboardUrl', () => {
expect(wrapper.find(MonitorTimeSeriesChart).props('groupId')).toBe(TEST_HOST);
});
});
});
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment