From 65d52bc6adbf25c1a62b38220fc2080132e18527 Mon Sep 17 00:00:00 2001 From: Matias Chomicki Date: Mon, 9 Dec 2024 18:23:22 +0000 Subject: [PATCH] feat(LogsPanelScene): combine wrapLogMesasage with prettifyLogMessage (#944) --- src/Components/ServiceScene/LogOptionsScene.tsx | 1 + src/Components/ServiceScene/LogsPanelScene.tsx | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Components/ServiceScene/LogOptionsScene.tsx b/src/Components/ServiceScene/LogOptionsScene.tsx index 7ec3967fb..861d12c1a 100644 --- a/src/Components/ServiceScene/LogOptionsScene.tsx +++ b/src/Components/ServiceScene/LogOptionsScene.tsx @@ -33,6 +33,7 @@ export class LogOptionsScene extends SceneObjectBase { this.setState({ wrapLogMessage: type }); setLogOption('wrapLogMessage', type); this.getParentScene().setLogsVizOption({ wrapLogMessage: type }); + this.getParentScene().setLogsVizOption({ prettifyLogMessage: type }); }; onChangeLogsSortOrder = (sortOrder: LogsSortOrder) => { diff --git a/src/Components/ServiceScene/LogsPanelScene.tsx b/src/Components/ServiceScene/LogsPanelScene.tsx index 9cc92c8df..998b5021d 100644 --- a/src/Components/ServiceScene/LogsPanelScene.tsx +++ b/src/Components/ServiceScene/LogsPanelScene.tsx @@ -118,6 +118,7 @@ export class LogsPanelScene extends SceneObjectBase { .setOption('displayedFields', parentModel.state.displayedFields) .setOption('sortOrder', getLogsPanelSortOrder()) .setOption('wrapLogMessage', Boolean(getLogOption('wrapLogMessage', false))) + .setOption('prettifyLogMessage', Boolean(getLogOption('wrapLogMessage', false))) .setOption('showLogContextToggle', true) // @ts-expect-error Requires Grafana 11.4 .setOption('enableInfiniteScrolling', true)