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
65c1a167
Unverified
Commit
65c1a167
authored
May 05, 2020
by
kay delaney
Committed by
GitHub
May 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Explore: No longer changes run button red with "cancel" text when live tailing (#24106)
Closes #24079
parent
97c02855
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
public/app/features/explore/ExploreToolbar.tsx
+1
-0
public/app/features/explore/RunButton.tsx
+5
-4
No files found.
public/app/features/explore/ExploreToolbar.tsx
View file @
65c1a167
...
...
@@ -324,6 +324,7 @@ export class UnConnectedExploreToolbar extends PureComponent<Props> {
refreshInterval=
{
refreshInterval
}
onChangeRefreshInterval=
{
this
.
onChangeRefreshInterval
}
splitted=
{
splitted
}
isLive=
{
isLive
}
loading=
{
loading
||
(
isLive
&&
!
isPaused
)
}
onRun=
{
this
.
onRunQuery
}
showDropdown=
{
!
isLive
}
...
...
public/app/features/explore/RunButton.tsx
View file @
65c1a167
...
...
@@ -21,6 +21,7 @@ const getStyles = memoizeOne(() => {
type
Props
=
{
splitted
:
boolean
;
loading
:
boolean
;
isLive
:
boolean
;
onRun
:
(
loading
:
boolean
)
=>
void
;
refreshInterval
?:
string
;
onChangeRefreshInterval
:
(
interval
:
string
)
=>
void
;
...
...
@@ -28,17 +29,17 @@ type Props = {
};
export
function
RunButton
(
props
:
Props
)
{
const
{
splitted
,
loading
,
onRun
,
onChangeRefreshInterval
,
refreshInterval
,
showDropdown
}
=
props
;
const
{
splitted
,
loading
,
onRun
,
onChangeRefreshInterval
,
refreshInterval
,
showDropdown
,
isLive
}
=
props
;
const
styles
=
getStyles
();
const
runButton
=
(
<
ResponsiveButton
splitted=
{
splitted
}
title=
{
loading
?
'Cancel'
:
'Run Query'
}
title=
{
loading
&&
!
isLive
?
'Cancel'
:
'Run Query'
}
onClick=
{
()
=>
onRun
(
loading
)
}
buttonClassName=
{
classNames
({
'navbar-button--primary'
:
!
loading
,
'navbar-button--danger'
:
loading
,
'navbar-button--primary'
:
isLive
||
!
loading
,
'navbar-button--danger'
:
loading
&&
!
isLive
,
'btn--radius-right-0'
:
showDropdown
,
})
}
icon=
{
loading
?
'fa fa-spinner'
:
'sync'
}
...
...
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