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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
a2d10937
Commit
a2d10937
authored
Sep 07, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactored the pickColors method
parent
290217d5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
15 deletions
+18
-15
app/assets/javascripts/monitoring/utils/multiple_time_series.js
...sets/javascripts/monitoring/utils/multiple_time_series.js
+18
-15
No files found.
app/assets/javascripts/monitoring/utils/multiple_time_series.js
View file @
a2d10937
...
...
@@ -10,25 +10,27 @@ const defaultColorPalette = {
};
const
defaultColorOrder
=
[
'
blue
'
,
'
orange
'
,
'
red
'
,
'
green
'
,
'
purple
'
];
let
usedColors
=
[];
function
pickColor
(
name
)
{
let
pick
;
if
(
name
&&
defaultColorPalette
[
name
])
{
pick
=
name
;
}
else
{
const
unusedColors
=
_
.
difference
(
defaultColorOrder
,
usedColors
);
if
(
unusedColors
.
length
>
0
)
{
pick
=
unusedColors
[
0
];
export
default
function
createTimeSeries
(
queryData
,
graphWidth
,
graphHeight
,
graphHeightOffset
)
{
let
usedColors
=
[];
function
pickColor
(
name
)
{
let
pick
;
if
(
name
&&
defaultColorPalette
[
name
])
{
pick
=
name
;
}
else
{
usedColors
=
[];
pick
=
defaultColorOrder
[
0
];
const
unusedColors
=
_
.
difference
(
defaultColorOrder
,
usedColors
);
if
(
unusedColors
.
length
>
0
)
{
pick
=
unusedColors
[
0
];
}
else
{
usedColors
=
[];
pick
=
defaultColorOrder
[
0
];
}
}
usedColors
.
push
(
pick
);
return
defaultColorPalette
[
pick
];
}
usedColors
.
push
(
pick
);
return
defaultColorPalette
[
pick
];
}
export
default
function
createTimeSeries
(
queryData
,
graphWidth
,
graphHeight
,
graphHeightOffset
)
{
const
maxValues
=
queryData
.
result
.
map
((
timeSeries
,
index
)
=>
{
const
maxValue
=
d3
.
max
(
timeSeries
.
values
.
map
(
d
=>
d
.
value
));
return
{
...
...
@@ -45,6 +47,7 @@ export default function createTimeSeries(queryData, graphWidth, graphHeight, gra
let
metricTag
=
''
;
let
lineColor
=
'
#1f78d1
'
;
let
areaColor
=
'
#8fbce8
'
;
const
timeSeriesScaleX
=
d3
.
time
.
scale
()
.
range
([
0
,
graphWidth
-
70
]);
...
...
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