From e261bb5eb7e8c835d9912409be8eed80e808e15d Mon Sep 17 00:00:00 2001 From: Gabriel Hernandez Date: Mon, 19 Feb 2024 20:08:39 +0000 Subject: [PATCH] render the windows disk encryption error details message as a plain text (#16936) relates to #16417 renders the Windows host disk encryption error messages as standard text. These messages do not follow the expected format (e.g. `/foo/bar/baz: status 200`), so we will just render them as standard text. ![image](https://github.com/fleetdm/fleet/assets/1153709/7ed1ce39-56b0-4be2-885a-3e73af31fc9f) - [x] Manual QA for all new/changed functionality --- .../OSSettingsTable/OSSettingsTableConfig.tsx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/frontend/pages/hosts/details/OSSettingsModal/OSSettingsTable/OSSettingsTableConfig.tsx b/frontend/pages/hosts/details/OSSettingsModal/OSSettingsTable/OSSettingsTableConfig.tsx index 3b8b32d360..005a8e7e72 100644 --- a/frontend/pages/hosts/details/OSSettingsModal/OSSettingsTable/OSSettingsTableConfig.tsx +++ b/frontend/pages/hosts/details/OSSettingsModal/OSSettingsTable/OSSettingsTableConfig.tsx @@ -63,6 +63,15 @@ const generateFormattedTooltip = (detail: string) => { const keyValuePairs = detail.split(/, */); const formattedElements: JSX.Element[] = []; + // Special case to handle bitlocker error message. It does not follow the + // expected string format so we will just render the error message as is. + if ( + detail.includes("BitLocker") || + detail.includes("preparing volume for encryption") + ) { + return detail; + } + keyValuePairs.forEach((pair, i) => { const [key, value] = pair.split(/: */); if (key && value) {