Erik Sundell 7 лет назад
Родитель
Сommit
e21ca3f545
2 измененных файлов с 2 добавлено и 16 удалено
  1. 0 2
      public/app/features/explore/Explore.tsx
  2. 2 14
      public/app/features/explore/Logs.tsx

+ 0 - 2
public/app/features/explore/Explore.tsx

@@ -836,7 +836,6 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
     const graphLoading = queryTransactions.some(qt => qt.resultType === 'Graph' && !qt.done);
     const tableLoading = queryTransactions.some(qt => qt.resultType === 'Table' && !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);
 
     return (
@@ -970,7 +969,6 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
                           range={range}
                           scanning={scanning}
                           scanRange={scanRange}
-                          logExpressionExists={logExpressionExists}
                         />
                       </Panel>
                     )}

+ 2 - 14
public/app/features/explore/Logs.tsx

@@ -140,7 +140,6 @@ interface LogsProps {
   range?: RawTimeRange;
   scanning?: boolean;
   scanRange?: RawTimeRange;
-  logExpressionExists?: 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,
-      logExpressionExists,
-    } = 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;
@@ -368,8 +357,7 @@ export default class Logs extends PureComponent<LogsProps, LogsState> {
             ))}
           {hasData && deferLogs && <span>Rendering {dedupedData.rows.length} rows...</span>}
         </div>
-        {logExpressionExists &&
-          !loading &&
+        {!loading &&
           !hasData &&
           !scanning && (
             <div className="logs-nodata">