Commit e21ca3f5 by Erik Sundell

Revert commit

parent d9d84f45
...@@ -836,7 +836,6 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> { ...@@ -836,7 +836,6 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
const graphLoading = queryTransactions.some(qt => qt.resultType === 'Graph' && !qt.done); const graphLoading = queryTransactions.some(qt => qt.resultType === 'Graph' && !qt.done);
const tableLoading = queryTransactions.some(qt => qt.resultType === 'Table' && !qt.done); const tableLoading = queryTransactions.some(qt => qt.resultType === 'Table' && !qt.done);
const logsLoading = queryTransactions.some(qt => qt.resultType === 'Logs' && !qt.done); const logsLoading = queryTransactions.some(qt => qt.resultType === 'Logs' && !qt.done);
const logExpressionExists = queryTransactions.some(qt => qt.resultType === 'Logs' && qt.query.expr && !qt.error);
const loading = queryTransactions.some(qt => !qt.done); const loading = queryTransactions.some(qt => !qt.done);
return ( return (
...@@ -970,7 +969,6 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> { ...@@ -970,7 +969,6 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
range={range} range={range}
scanning={scanning} scanning={scanning}
scanRange={scanRange} scanRange={scanRange}
logExpressionExists={logExpressionExists}
/> />
</Panel> </Panel>
)} )}
......
...@@ -140,7 +140,6 @@ interface LogsProps { ...@@ -140,7 +140,6 @@ interface LogsProps {
range?: RawTimeRange; range?: RawTimeRange;
scanning?: boolean; scanning?: boolean;
scanRange?: RawTimeRange; scanRange?: RawTimeRange;
logExpressionExists?: boolean;
onChangeTime?: (range: RawTimeRange) => void; onChangeTime?: (range: RawTimeRange) => void;
onClickLabel?: (label: string, value: string) => void; onClickLabel?: (label: string, value: string) => void;
onStartScanning?: () => void; onStartScanning?: () => void;
...@@ -240,17 +239,7 @@ export default class Logs extends PureComponent<LogsProps, LogsState> { ...@@ -240,17 +239,7 @@ export default class Logs extends PureComponent<LogsProps, LogsState> {
}; };
render() { render() {
const { const { className = '', data, loading = false, onClickLabel, position, range, scanning, scanRange } = this.props;
className = '',
data,
loading = false,
onClickLabel,
position,
range,
scanning,
scanRange,
logExpressionExists,
} = this.props;
const { dedup, deferLogs, hiddenLogLevels, renderAll, showLocalTime, showUtc } = this.state; const { dedup, deferLogs, hiddenLogLevels, renderAll, showLocalTime, showUtc } = this.state;
let { showLabels } = this.state; let { showLabels } = this.state;
const hasData = data && data.rows && data.rows.length > 0; const hasData = data && data.rows && data.rows.length > 0;
...@@ -368,8 +357,7 @@ export default class Logs extends PureComponent<LogsProps, LogsState> { ...@@ -368,8 +357,7 @@ export default class Logs extends PureComponent<LogsProps, LogsState> {
))} ))}
{hasData && deferLogs && <span>Rendering {dedupedData.rows.length} rows...</span>} {hasData && deferLogs && <span>Rendering {dedupedData.rows.length} rows...</span>}
</div> </div>
{logExpressionExists && {!loading &&
!loading &&
!hasData && !hasData &&
!scanning && ( !scanning && (
<div className="logs-nodata"> <div className="logs-nodata">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment