remove all query empty related code. root cause of the problem was to fix hasNonEmptyQuery

This commit is contained in:
Erik Sundell
2018-12-04 14:55:56 +01:00
parent 8b3bb95007
commit 9c8bd34787
2 changed files with 2 additions and 15 deletions

View File

@@ -840,7 +840,6 @@ 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}>
@@ -973,7 +972,6 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
range={range}
scanning={scanning}
scanRange={scanRange}
queryEmpty={queryEmpty}
/>
</Panel>
)}

View File

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