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

Set query empty condition in render function. Also clear query transactions when no valid query is present

Browse Source
This commit is contained in:
Erik Sundell 2018-12-04 13:26:26 +01:00
parent 2af78aca8e
commit 4e591653bd
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/explore/Explore.tsx
View File

@ -771,6 +771,9 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
async runQueries(resultType: ResultType, queryOptions: any, resultGetter?: any) {
const queries = [...this.modifiedQueries];
if (!hasNonEmptyQuery(queries)) {
this.setState({
queryTransactions: [],
});
return;
}
const { datasource } = this.state;
@ -837,6 +840,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
const tableLoading = queryTransactions.some(qt => qt.resultType === 'Table' && !qt.done);
const logsLoading = queryTransactions.some(qt => qt.resultType === 'Logs' && !qt.done);
const loading = queryTransactions.some(qt => !qt.done);
const queryEmpty = queryTransactions.some(qt => qt.resultType === 'Logs' && qt.done && qt.result.length === 0);
return (
<div className={exploreClass} ref={this.getRef}>
@ -969,6 +973,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
range={range}
scanning={scanning}
scanRange={scanRange}
queryEmpty={queryEmpty}
/>
</Panel>
)}

15
public/app/features/explore/Logs.tsx
View File

@ -140,6 +140,7 @@ interface LogsProps {
range?: RawTimeRange;
scanning?: boolean;
scanRange?: RawTimeRange;
queryEmpty: boolean;
onChangeTime?: (range: RawTimeRange) => void;
onClickLabel?: (label: string, value: string) => void;
onStartScanning?: () => void;
@ -239,7 +240,17 @@ export default class Logs extends PureComponent<LogsProps, LogsState> {
};
render() {
const { className = '', data, loading = false, onClickLabel, position, range, scanning, scanRange } = this.props;
const {
className = '',
data,
loading = false,
onClickLabel,
position,
range,
scanning,
scanRange,
queryEmpty,
} = this.props;
const { dedup, deferLogs, hiddenLogLevels, renderAll, showLocalTime, showUtc } = this.state;
let { showLabels } = this.state;
const hasData = data && data.rows && data.rows.length > 0;
@ -358,7 +369,7 @@ export default class Logs extends PureComponent<LogsProps, LogsState> {
{hasData && deferLogs && <span>Rendering {dedupedData.rows.length} rows...</span>}
</div>
{!loading &&
data.queryEmpty &&
queryEmpty &&
!scanning && (
<div className="logs-nodata">
No logs found.