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
6c34936a
Commit
6c34936a
authored
Aug 21, 2019
by
Dominik Prokop
Committed by
Ryan McKinley
Aug 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Packages: Fix path import from grafana/data (#18667)
parent
68f74135
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
packages/grafana-ui/src/components/TimePicker/TimePicker.tsx
+3
-3
No files found.
packages/grafana-ui/src/components/TimePicker/TimePicker.tsx
View file @
6c34936a
...
...
@@ -14,7 +14,7 @@ import { rawToTimeRange } from './time';
// Types
import
{
TimeRange
,
TimeOption
,
TimeZone
,
TIME_FORMAT
,
SelectableValue
}
from
'@grafana/data'
;
import
{
isMathString
}
from
'@grafana/data/src/utils/datemath
'
;
import
{
dateMath
}
from
'@grafana/data
'
;
export
interface
Props
{
value
:
TimeRange
;
...
...
@@ -129,8 +129,8 @@ export class TimePicker extends PureComponent<Props, State> {
const
adjustedTime
=
(
time
:
DateTime
)
=>
(
isUTC
?
time
.
utc
()
:
time
.
local
())
||
null
;
const
adjustedTimeRange
=
{
to
:
isMathString
(
value
.
raw
.
to
)
?
value
.
raw
.
to
:
adjustedTime
(
value
.
to
),
from
:
isMathString
(
value
.
raw
.
from
)
?
value
.
raw
.
from
:
adjustedTime
(
value
.
from
),
to
:
dateMath
.
isMathString
(
value
.
raw
.
to
)
?
value
.
raw
.
to
:
adjustedTime
(
value
.
to
),
from
:
dateMath
.
isMathString
(
value
.
raw
.
from
)
?
value
.
raw
.
from
:
adjustedTime
(
value
.
from
),
};
const
rangeString
=
rangeUtil
.
describeTimeRange
(
adjustedTimeRange
);
...
...
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