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

QueryOptions: Open QueryEditors: run queries after changing group options #29864

Browse Source
This commit is contained in:
Ryan McKinley 2020-12-15 22:24:56 -08:00 committed by GitHub
parent 75761bf67b
commit d54e62197a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/features/query/components/QueryGroup.tsx
View File

@ -167,8 +167,13 @@ export class QueryGroup extends PureComponent<Props, State> {
this.setState({ scrollTop: 1000 }); this.setState({ scrollTop: 1000 });
}; };
onUpdateAndRun = (options: QueryGroupOptions) => {
this.props.onOptionsChange(options);
this.props.onRunQueries();
};
renderTopSection(styles: QueriesTabStyls) { renderTopSection(styles: QueriesTabStyls) {
const { onOpenQueryInspector, options, onOptionsChange } = this.props; const { onOpenQueryInspector, options } = this.props;
const { dataSource, data } = this.state; const { dataSource, data } = this.state;
return ( return (
@ -199,7 +204,7 @@ export class QueryGroup extends PureComponent<Props, State> {
options={options} options={options}
dataSource={dataSource} dataSource={dataSource}
data={data} data={data}
onChange={onOptionsChange} onChange={this.onUpdateAndRun}
/> />
</div> </div>
{onOpenQueryInspector && ( {onOpenQueryInspector && (

22
public/app/features/query/components/QueryGroupOptions.tsx
View File

@ -144,19 +144,23 @@ export class QueryGroupOptionsEditor extends PureComponent<Props, State> {
maxDataPoints = null; maxDataPoints = null;
} }
onChange({ if (maxDataPoints !== options.maxDataPoints) {
...options, onChange({
maxDataPoints: maxDataPoints, ...options,
}); maxDataPoints,
});
}
}; };
onMinIntervalBlur = (event: ChangeEvent<HTMLInputElement>) => { onMinIntervalBlur = (event: ChangeEvent<HTMLInputElement>) => {
const { options, onChange } = this.props; const { options, onChange } = this.props;
const minInterval = emptyToNull(event.target.value);
onChange({ if (minInterval !== options.minInterval) {
...options, onChange({
minInterval: emptyToNull(event.target.value), ...options,
}); minInterval,
});
}
}; };
renderCacheTimeoutOption() { renderCacheTimeoutOption() {