Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
2a83d8ab
Commit
2a83d8ab
authored
Feb 15, 2019
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added basic tests
parent
eaedcee8
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
107 additions
and
7 deletions
+107
-7
packages/grafana-ui/src/components/BarGauge/BarGauge.story.tsx
+3
-3
packages/grafana-ui/src/components/BarGauge/BarGauge.test.tsx
+62
-0
packages/grafana-ui/src/components/BarGauge/BarGauge.tsx
+2
-3
packages/grafana-ui/src/components/BarGauge/__snapshots__/BarGauge.test.tsx.snap
+35
-0
public/app/plugins/panel/bargauge/types.ts
+5
-1
No files found.
packages/grafana-ui/src/components/BarGauge/BarGauge.story.tsx
View file @
2a83d8ab
...
@@ -36,8 +36,8 @@ BarGaugeStories.add('Vertical, with basic thresholds', () => {
...
@@ -36,8 +36,8 @@ BarGaugeStories.add('Vertical, with basic thresholds', () => {
}
=
getKnobs
();
}
=
getKnobs
();
return
renderComponentWithTheme
(
BarGauge
,
{
return
renderComponentWithTheme
(
BarGauge
,
{
width
:
3
00
,
width
:
2
00
,
height
:
6
00
,
height
:
4
00
,
value
:
value
,
value
:
value
,
minValue
:
minValue
,
minValue
:
minValue
,
maxValue
:
maxValue
,
maxValue
:
maxValue
,
...
@@ -46,7 +46,7 @@ BarGaugeStories.add('Vertical, with basic thresholds', () => {
...
@@ -46,7 +46,7 @@ BarGaugeStories.add('Vertical, with basic thresholds', () => {
postfix
:
''
,
postfix
:
''
,
decimals
:
decimals
,
decimals
:
decimals
,
thresholds
:
[
thresholds
:
[
{
index
:
0
,
value
:
null
,
color
:
'green'
},
{
index
:
0
,
value
:
-
Infinity
,
color
:
'green'
},
{
index
:
1
,
value
:
threshold1Value
,
color
:
threshold1Color
},
{
index
:
1
,
value
:
threshold1Value
,
color
:
threshold1Color
},
{
index
:
1
,
value
:
threshold2Value
,
color
:
threshold2Color
},
{
index
:
1
,
value
:
threshold2Value
,
color
:
threshold2Color
},
],
],
...
...
packages/grafana-ui/src/components/BarGauge/BarGauge.test.tsx
0 → 100644
View file @
2a83d8ab
import
React
from
'react'
;
import
{
shallow
}
from
'enzyme'
;
import
{
BarGauge
,
Props
}
from
'./BarGauge'
;
import
{
getTheme
}
from
'../../themes'
;
jest
.
mock
(
'jquery'
,
()
=>
({
plot
:
jest
.
fn
(),
}));
const
setup
=
(
propOverrides
?:
object
)
=>
{
const
props
:
Props
=
{
maxValue
:
100
,
valueMappings
:
[],
minValue
:
0
,
prefix
:
''
,
suffix
:
''
,
thresholds
:
[{
index
:
0
,
value
:
-
Infinity
,
color
:
'#7EB26D'
}],
unit
:
'none'
,
height
:
300
,
width
:
300
,
value
:
25
,
decimals
:
0
,
theme
:
getTheme
(),
};
Object
.
assign
(
props
,
propOverrides
);
const
wrapper
=
shallow
(<
BarGauge
{
...
props
}
/>);
const
instance
=
wrapper
.
instance
()
as
BarGauge
;
return
{
instance
,
wrapper
,
};
};
describe
(
'Get font color'
,
()
=>
{
it
(
'should get first threshold color when only one threshold'
,
()
=>
{
const
{
instance
}
=
setup
({
thresholds
:
[{
index
:
0
,
value
:
-
Infinity
,
color
:
'#7EB26D'
}]
});
expect
(
instance
.
getColors
().
value
).
toEqual
(
'#7EB26D'
);
});
it
(
'should get the threshold color if value is same as a threshold'
,
()
=>
{
const
{
instance
}
=
setup
({
thresholds
:
[
{
index
:
2
,
value
:
75
,
color
:
'#6ED0E0'
},
{
index
:
1
,
value
:
10
,
color
:
'#EAB839'
},
{
index
:
0
,
value
:
-
Infinity
,
color
:
'#7EB26D'
},
],
});
expect
(
instance
.
getColors
().
value
).
toEqual
(
'#EAB839'
);
});
});
describe
(
'Render BarGauge with basic options'
,
()
=>
{
it
(
'should render'
,
()
=>
{
const
{
wrapper
}
=
setup
();
expect
(
wrapper
).
toMatchSnapshot
();
});
});
packages/grafana-ui/src/components/BarGauge/BarGauge.tsx
View file @
2a83d8ab
...
@@ -43,7 +43,6 @@ export class BarGauge extends PureComponent<Props> {
...
@@ -43,7 +43,6 @@ export class BarGauge extends PureComponent<Props> {
const
{
thresholds
,
theme
,
value
}
=
this
.
props
;
const
{
thresholds
,
theme
,
value
}
=
this
.
props
;
const
activeThreshold
=
getThresholdForValue
(
thresholds
,
value
);
const
activeThreshold
=
getThresholdForValue
(
thresholds
,
value
);
console
.
log
(
thresholds
,
value
);
if
(
activeThreshold
!==
null
)
{
if
(
activeThreshold
!==
null
)
{
const
color
=
getColorFromHexRgbOrName
(
activeThreshold
.
color
,
theme
.
type
);
const
color
=
getColorFromHexRgbOrName
(
activeThreshold
.
color
,
theme
.
type
);
...
@@ -68,7 +67,7 @@ export class BarGauge extends PureComponent<Props> {
...
@@ -68,7 +67,7 @@ export class BarGauge extends PureComponent<Props> {
const
{
width
}
=
this
.
props
;
const
{
width
}
=
this
.
props
;
const
guess
=
width
/
value
.
length
;
const
guess
=
width
/
value
.
length
;
const
fontSize
=
Math
.
m
ax
(
guess
,
14
);
const
fontSize
=
Math
.
m
in
(
Math
.
max
(
guess
,
14
),
40
);
return
{
return
{
color
:
color
,
color
:
color
,
...
@@ -82,7 +81,7 @@ export class BarGauge extends PureComponent<Props> {
...
@@ -82,7 +81,7 @@ export class BarGauge extends PureComponent<Props> {
const
numericValue
=
this
.
getNumericValue
();
const
numericValue
=
this
.
getNumericValue
();
const
barMaxHeight
=
height
*
0.8
;
// 20% for value & name
const
barMaxHeight
=
height
*
0.8
;
// 20% for value & name
const
valuePercent
=
numericValue
/
(
maxValue
-
minValue
);
const
valuePercent
=
numericValue
/
(
maxValue
-
minValue
);
const
barHeight
=
valuePercent
*
barMaxHeight
;
const
barHeight
=
Math
.
max
(
valuePercent
*
barMaxHeight
,
0
)
;
const
formatFunc
=
getValueFormat
(
unit
);
const
formatFunc
=
getValueFormat
(
unit
);
const
valueFormatted
=
formatFunc
(
numericValue
,
decimals
);
const
valueFormatted
=
formatFunc
(
numericValue
,
decimals
);
...
...
packages/grafana-ui/src/components/BarGauge/__snapshots__/BarGauge.test.tsx.snap
0 → 100644
View file @
2a83d8ab
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Render BarGauge with basic options should render 1`] = `
<div
className="bar-gauge"
style={
Object {
"height": "300px",
"width": "300px",
}
}
>
<div
className="bar-gauge__value"
style={
Object {
"color": "#7EB26D",
"fontSize": "40px",
}
}
>
25
</div>
<div
style={
Object {
"backgroundColor": "rgba(126, 178, 109, 0.3)",
"borderTop": "1px solid #7EB26D",
"height": "60px",
"width": "300px",
}
}
/>
</div>
`;
public/app/plugins/panel/bargauge/types.ts
View file @
2a83d8ab
...
@@ -18,6 +18,10 @@ export const PanelDefaults: BarGaugeOptions = {
...
@@ -18,6 +18,10 @@ export const PanelDefaults: BarGaugeOptions = {
suffix
:
''
,
suffix
:
''
,
stat
:
'avg'
,
stat
:
'avg'
,
unit
:
'none'
,
unit
:
'none'
,
thresholds
:
[],
thresholds
:
[
{
index
:
0
,
value
:
-
Infinity
,
color
:
'green'
},
{
index
:
1
,
value
:
50
,
color
:
'orange'
},
{
index
:
2
,
value
:
80
,
color
:
'red'
},
],
valueMappings
:
[],
valueMappings
:
[],
};
};
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