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
495c7fbe
Commit
495c7fbe
authored
Jul 04, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup minor UX issues in the performance dashboard
parent
d6836a3b
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
40 additions
and
23 deletions
+40
-23
app/assets/javascripts/monitoring/components/monitoring_column.vue
...s/javascripts/monitoring/components/monitoring_column.vue
+8
-4
app/assets/javascripts/monitoring/components/monitoring_flag.vue
...ets/javascripts/monitoring/components/monitoring_flag.vue
+3
-3
app/assets/javascripts/monitoring/components/monitoring_legends.vue
.../javascripts/monitoring/components/monitoring_legends.vue
+5
-5
app/assets/javascripts/monitoring/utils/measurements.js
app/assets/javascripts/monitoring/utils/measurements.js
+6
-5
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+14
-6
changelogs/unreleased/34653-minor-ux-cleanups-for-performance-dashboard.yml
...sed/34653-minor-ux-cleanups-for-performance-dashboard.yml
+4
-0
No files found.
app/assets/javascripts/monitoring/components/monitoring_column.vue
View file @
495c7fbe
...
@@ -159,12 +159,12 @@
...
@@ -159,12 +159,12 @@
const
xAxis
=
d3
.
svg
.
axis
()
const
xAxis
=
d3
.
svg
.
axis
()
.
scale
(
axisXScale
)
.
scale
(
axisXScale
)
.
ticks
(
measurements
.
t
icks
)
.
ticks
(
measurements
.
xT
icks
)
.
orient
(
'
bottom
'
);
.
orient
(
'
bottom
'
);
const
yAxis
=
d3
.
svg
.
axis
()
const
yAxis
=
d3
.
svg
.
axis
()
.
scale
(
this
.
yScale
)
.
scale
(
this
.
yScale
)
.
ticks
(
measurements
.
t
icks
)
.
ticks
(
measurements
.
yT
icks
)
.
orient
(
'
left
'
);
.
orient
(
'
left
'
);
d3
.
select
(
this
.
$refs
.
baseSvg
).
select
(
'
.x-axis
'
).
call
(
xAxis
);
d3
.
select
(
this
.
$refs
.
baseSvg
).
select
(
'
.x-axis
'
).
call
(
xAxis
);
...
@@ -172,8 +172,12 @@
...
@@ -172,8 +172,12 @@
const
width
=
this
.
graphWidth
;
const
width
=
this
.
graphWidth
;
d3
.
select
(
this
.
$refs
.
baseSvg
).
select
(
'
.y-axis
'
).
call
(
yAxis
)
d3
.
select
(
this
.
$refs
.
baseSvg
).
select
(
'
.y-axis
'
).
call
(
yAxis
)
.
selectAll
(
'
.tick
'
)
.
selectAll
(
'
.tick
'
)
.
each
(
function
createTickLines
()
{
.
each
(
function
createTickLines
(
d
,
i
)
{
d3
.
select
(
this
).
select
(
'
line
'
).
attr
(
'
x2
'
,
width
);
if
(
i
>
0
)
{
d3
.
select
(
this
).
select
(
'
line
'
)
.
attr
(
'
x2
'
,
width
)
.
attr
(
'
class
'
,
'
axis-tick
'
);
}
// Avoid adding the class to the first tick, to prevent coloring
});
// This will select all of the ticks once they're rendered
});
// This will select all of the ticks once they're rendered
this
.
xScale
=
d3
.
time
.
scale
()
this
.
xScale
=
d3
.
time
.
scale
()
...
...
app/assets/javascripts/monitoring/components/monitoring_flag.vue
View file @
495c7fbe
...
@@ -87,14 +87,14 @@
...
@@ -87,14 +87,14 @@
</rect>
</rect>
<text
<text
class=
"text-metric text-metric-bold"
class=
"text-metric text-metric-bold"
x=
"
8
"
x=
"
16
"
y=
"35"
y=
"35"
transform=
"translate(-5, 20)"
>
transform=
"translate(-5, 20)"
>
{{
formatTime
}}
{{
formatTime
}}
</text>
</text>
<text
<text
class=
"text-metric
-date
"
class=
"text-metric"
x=
"
8
"
x=
"
16
"
y=
"15"
y=
"15"
transform=
"translate(-5, 20)"
>
transform=
"translate(-5, 20)"
>
{{
formatDate
}}
{{
formatDate
}}
...
...
app/assets/javascripts/monitoring/components/monitoring_legends.vue
View file @
495c7fbe
...
@@ -109,13 +109,13 @@
...
@@ -109,13 +109,13 @@
</text>
</text>
<rect
<rect
class=
"rect-axis-text"
class=
"rect-axis-text"
:x=
"xPosition +
5
0"
:x=
"xPosition +
6
0"
:y=
"graphHeight - 80"
:y=
"graphHeight - 80"
width=
"
50
"
width=
"
35
"
height=
"50"
>
height=
"50"
>
</rect>
</rect>
<text
<text
class=
"label-axis-text"
class=
"label-axis-text
x-label-text
"
:x=
"xPosition + 60"
:x=
"xPosition + 60"
:y=
"yPosition"
:y=
"yPosition"
dy=
".35em"
>
dy=
".35em"
>
...
@@ -131,13 +131,13 @@
...
@@ -131,13 +131,13 @@
<text
<text
class=
"text-metric-title"
class=
"text-metric-title"
x=
"50"
x=
"50"
:y=
"graphHeight -
40
"
>
:y=
"graphHeight -
25
"
>
{{
legendTitle
}}
{{
legendTitle
}}
</text>
</text>
<text
<text
class=
"text-metric-usage"
class=
"text-metric-usage"
x=
"50"
x=
"50"
:y=
"graphHeight -
25
"
>
:y=
"graphHeight -
10
"
>
{{
metricUsage
}}
{{
metricUsage
}}
</text>
</text>
</g>
</g>
...
...
app/assets/javascripts/monitoring/utils/measurements.js
View file @
495c7fbe
...
@@ -8,14 +8,14 @@ export default {
...
@@ -8,14 +8,14 @@ export default {
},
},
legends
:
{
legends
:
{
width
:
15
,
width
:
15
,
height
:
30
,
height
:
25
,
},
},
backgroundLegend
:
{
backgroundLegend
:
{
width
:
30
,
width
:
30
,
height
:
50
,
height
:
50
,
},
},
axisLabelLineOffset
:
-
20
,
axisLabelLineOffset
:
-
20
,
legendOffset
:
52
,
legendOffset
:
35
,
},
},
large
:
{
// This covers both md and lg screen sizes
large
:
{
// This covers both md and lg screen sizes
margin
:
{
margin
:
{
...
@@ -26,14 +26,15 @@ export default {
...
@@ -26,14 +26,15 @@ export default {
},
},
legends
:
{
legends
:
{
width
:
20
,
width
:
20
,
height
:
3
5
,
height
:
3
0
,
},
},
backgroundLegend
:
{
backgroundLegend
:
{
width
:
30
,
width
:
30
,
height
:
150
,
height
:
150
,
},
},
axisLabelLineOffset
:
20
,
axisLabelLineOffset
:
20
,
legendOffset
:
55
,
legendOffset
:
38
,
},
},
ticks
:
3
,
xTicks
:
8
,
yTicks
:
3
,
};
};
app/assets/stylesheets/pages/environments.scss
View file @
495c7fbe
...
@@ -187,8 +187,7 @@
...
@@ -187,8 +187,7 @@
}
}
.text-metric
{
.text-metric
{
font-weight
:
600
;
font-size
:
12px
;
font-size
:
14px
;
}
}
.selected-metric-line
{
.selected-metric-line
{
...
@@ -232,10 +231,6 @@
...
@@ -232,10 +231,6 @@
width
:
100%
;
width
:
100%
;
padding
:
0
;
padding
:
0
;
padding-bottom
:
100%
;
padding-bottom
:
100%
;
.text-metric-bold
{
font-weight
:
600
;
}
}
}
.prometheus-svg-container
>
svg
{
.prometheus-svg-container
>
svg
{
...
@@ -250,6 +245,10 @@
...
@@ -250,6 +245,10 @@
stroke-width
:
0
;
stroke-width
:
0
;
}
}
.text-metric-bold
{
font-weight
:
600
;
}
.label-axis-text
,
.label-axis-text
,
.text-metric-usage
{
.text-metric-usage
{
fill
:
$black
;
fill
:
$black
;
...
@@ -269,6 +268,15 @@
...
@@ -269,6 +268,15 @@
font-size
:
12px
;
font-size
:
12px
;
}
}
.y-label-text
,
.x-label-text
{
fill
:
$gray-darkest
;
}
.axis-tick
{
stroke
:
$gray-darker
;
}
@media
(
max-width
:
$screen-sm-max
)
{
@media
(
max-width
:
$screen-sm-max
)
{
.label-axis-text
,
.label-axis-text
,
.text-metric-usage
,
.text-metric-usage
,
...
...
changelogs/unreleased/34653-minor-ux-cleanups-for-performance-dashboard.yml
0 → 100644
View file @
495c7fbe
---
title
:
Cleanup minor UX issues in the performance dashboard
merge_request
:
author
:
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