Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0e9693f6
Commit
0e9693f6
authored
Oct 04, 2019
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Independence for embed timewindow scroll
Adds groupId to time_series rather than depending on attrs
parent
cb800ef7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
1 deletion
+16
-1
app/assets/javascripts/monitoring/components/charts/time_series.vue
.../javascripts/monitoring/components/charts/time_series.vue
+6
-0
app/assets/javascripts/monitoring/components/embed.vue
app/assets/javascripts/monitoring/components/embed.vue
+1
-1
changelogs/unreleased/psi-indy-embed-zooms.yml
changelogs/unreleased/psi-indy-embed-zooms.yml
+5
-0
spec/frontend/monitoring/embed/embed_spec.js
spec/frontend/monitoring/embed/embed_spec.js
+4
-0
No files found.
app/assets/javascripts/monitoring/components/charts/time_series.vue
View file @
0e9693f6
...
...
@@ -62,6 +62,11 @@ export default {
required
:
false
,
default
:
s__
(
'
Metrics|Max
'
),
},
groupId
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
},
data
()
{
return
{
...
...
@@ -274,6 +279,7 @@ export default {
:is=
"glChartComponent"
ref=
"chart"
v-bind=
"$attrs"
:group-id=
"groupId"
:data=
"chartData"
:option=
"chartOptions"
:format-tooltip-text=
"formatTooltipText"
...
...
app/assets/javascripts/monitoring/components/embed.vue
View file @
0e9693f6
...
...
@@ -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"
...
...
changelogs/unreleased/psi-indy-embed-zooms.yml
0 → 100644
View file @
0e9693f6
---
title
:
Embed metrics time window scroll no longer affects other embeds
merge_request
:
18109
author
:
type
:
fixed
spec/frontend/monitoring/embed/embed_spec.js
View file @
0e9693f6
...
...
@@ -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
);
});
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment