IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Explore: No longer changes run button red with "cancel" text when live tailing (#24106)

Browse Source 
Closes #24079
This commit is contained in:
kay delaney 2020-05-05 09:40:47 +01:00 committed by GitHub
parent 97c0285543
commit 65c1a16786
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/features/explore/ExploreToolbar.tsx
View File

@ -324,6 +324,7 @@ export class UnConnectedExploreToolbar extends PureComponent<Props> {
refreshInterval={refreshInterval} refreshInterval={refreshInterval}
onChangeRefreshInterval={this.onChangeRefreshInterval} onChangeRefreshInterval={this.onChangeRefreshInterval}
splitted={splitted} splitted={splitted}
isLive={isLive}
loading={loading || (isLive && !isPaused)} loading={loading || (isLive && !isPaused)}
onRun={this.onRunQuery} onRun={this.onRunQuery}
showDropdown={!isLive} showDropdown={!isLive}

9
public/app/features/explore/RunButton.tsx
View File

@ -21,6 +21,7 @@ const getStyles = memoizeOne(() => {
type Props = { type Props = {
splitted: boolean; splitted: boolean;
loading: boolean; loading: boolean;
isLive: boolean;
onRun: (loading: boolean) => void; onRun: (loading: boolean) => void;
refreshInterval?: string; refreshInterval?: string;
onChangeRefreshInterval: (interval: string) => void; onChangeRefreshInterval: (interval: string) => void;
@ -28,17 +29,17 @@ type Props = {
}; };
export function RunButton(props: 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 styles = getStyles();
const runButton = ( const runButton = (
<ResponsiveButton <ResponsiveButton
splitted={splitted} splitted={splitted}
title={loading ? 'Cancel' : 'Run Query'} title={loading && !isLive ? 'Cancel' : 'Run Query'}
onClick={() => onRun(loading)} onClick={() => onRun(loading)}
buttonClassName={classNames({ buttonClassName={classNames({
'navbar-button--primary': !loading, 'navbar-button--primary': isLive || !loading,
'navbar-button--danger': loading, 'navbar-button--danger': loading && !isLive,
'btn--radius-right-0': showDropdown, 'btn--radius-right-0': showDropdown,
})} })}
icon={loading ? 'fa fa-spinner' : 'sync'} icon={loading ? 'fa fa-spinner' : 'sync'}