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
a57310ef
Unverified
Commit
a57310ef
authored
Mar 05, 2019
by
Torkel Ödegaard
Committed by
GitHub
Mar 05, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #15796 from grafana/move-unitpicker-to-grafana-uo
Move unitpicker to grafana/ui
parents
d4c71809
ee4df155
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
packages/grafana-ui/src/components/UnitPicker/UnitPicker.tsx
+5
-3
packages/grafana-ui/src/components/index.ts
+1
-0
public/app/plugins/panel/gauge/SingleStatValueEditor.tsx
+1
-2
No files found.
p
ublic/app/core/components/Select
/UnitPicker.tsx
→
p
ackages/grafana-ui/src/components/UnitPicker
/UnitPicker.tsx
View file @
a57310ef
import
React
,
{
PureComponent
}
from
'react'
;
import
React
,
{
PureComponent
}
from
'react'
;
import
{
getValueFormats
}
from
'@grafana/ui'
;
import
{
Select
}
from
'@grafana/ui'
;
import
{
Select
}
from
'..'
;
import
{
getValueFormats
}
from
'../../utils'
;
interface
Props
{
interface
Props
{
onChange
:
(
item
:
any
)
=>
void
;
onChange
:
(
item
:
any
)
=>
void
;
...
@@ -8,7 +10,7 @@ interface Props {
...
@@ -8,7 +10,7 @@ interface Props {
width
?:
number
;
width
?:
number
;
}
}
export
default
class
UnitPicker
extends
PureComponent
<
Props
>
{
export
class
UnitPicker
extends
PureComponent
<
Props
>
{
static
defaultProps
=
{
static
defaultProps
=
{
width
:
12
,
width
:
12
,
};
};
...
...
packages/grafana-ui/src/components/index.ts
View file @
a57310ef
...
@@ -26,3 +26,4 @@ export { ValueMappingsEditor } from './ValueMappingsEditor/ValueMappingsEditor';
...
@@ -26,3 +26,4 @@ export { ValueMappingsEditor } from './ValueMappingsEditor/ValueMappingsEditor';
export
{
Gauge
}
from
'./Gauge/Gauge'
;
export
{
Gauge
}
from
'./Gauge/Gauge'
;
export
{
Switch
}
from
'./Switch/Switch'
;
export
{
Switch
}
from
'./Switch/Switch'
;
export
{
EmptySearchResult
}
from
'./EmptySearchResult/EmptySearchResult'
;
export
{
EmptySearchResult
}
from
'./EmptySearchResult/EmptySearchResult'
;
export
{
UnitPicker
}
from
'./UnitPicker/UnitPicker'
;
public/app/plugins/panel/gauge/SingleStatValueEditor.tsx
View file @
a57310ef
...
@@ -2,8 +2,7 @@
...
@@ -2,8 +2,7 @@
import
React
,
{
PureComponent
}
from
'react'
;
import
React
,
{
PureComponent
}
from
'react'
;
// Components
// Components
import
UnitPicker
from
'app/core/components/Select/UnitPicker'
;
import
{
FormField
,
FormLabel
,
PanelOptionsGroup
,
Select
,
UnitPicker
}
from
'@grafana/ui'
;
import
{
FormField
,
FormLabel
,
PanelOptionsGroup
,
Select
}
from
'@grafana/ui'
;
// Types
// Types
import
{
SingleStatValueOptions
}
from
'./types'
;
import
{
SingleStatValueOptions
}
from
'./types'
;
...
...
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