From 59b06424c49bf4c33a1b6419551f76ff5de6e122 Mon Sep 17 00:00:00 2001 From: Lukas Siatka Date: Thu, 7 May 2020 01:26:12 +0200 Subject: [PATCH] Chore: updates LogRows styles to prevent it from rendering context provider inappropriately --- packages/grafana-ui/src/components/Logs/LogRows.tsx | 5 ++--- packages/grafana-ui/src/components/Logs/getLogRowStyles.ts | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/grafana-ui/src/components/Logs/LogRows.tsx b/packages/grafana-ui/src/components/Logs/LogRows.tsx index 991b08f1acd..29c6ac4cca1 100644 --- a/packages/grafana-ui/src/components/Logs/LogRows.tsx +++ b/packages/grafana-ui/src/components/Logs/LogRows.tsx @@ -91,14 +91,13 @@ class UnThemedLogRows extends PureComponent { getFieldLinks, } = this.props; const { renderAll } = this.state; - const { logsRowsTable, logsRowsHorizontalScroll } = getLogRowStyles(theme); + const { logsRowsTable } = getLogRowStyles(theme); const dedupedRows = deduplicatedRows ? deduplicatedRows : logRows; const hasData = logRows && logRows.length > 0; const dedupCount = dedupedRows ? dedupedRows.reduce((sum, row) => (row.duplicates ? sum + row.duplicates : sum), 0) : 0; const showDuplicates = dedupStrategy !== LogsDedupStrategy.none && dedupCount > 0; - const horizontalScrollWindow = wrapLogMessage ? '' : logsRowsHorizontalScroll; // Staged rendering const processedRows = dedupedRows ? dedupedRows : []; @@ -111,7 +110,7 @@ class UnThemedLogRows extends PureComponent { const getRowContext = this.props.getRowContext ? this.props.getRowContext : () => Promise.resolve([]); return ( -
+
{hasData && diff --git a/packages/grafana-ui/src/components/Logs/getLogRowStyles.ts b/packages/grafana-ui/src/components/Logs/getLogRowStyles.ts index 03d19297f9f..2ba9fff402e 100644 --- a/packages/grafana-ui/src/components/Logs/getLogRowStyles.ts +++ b/packages/grafana-ui/src/components/Logs/getLogRowStyles.ts @@ -59,10 +59,6 @@ export const getLogRowStyles = stylesFactory((theme: GrafanaTheme, logLevel?: Lo font-size: ${theme.typography.size.sm}; width: 100%; `, - logsRowsHorizontalScroll: css` - label: logs-rows__horizontal-scroll; - overflow: scroll; - `, context: context, logsRow: css` label: logs-row;