From 5121eb49afab65d278ef454689448cca46d5ea9d Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Wed, 26 Oct 2022 18:47:09 +0200 Subject: [PATCH] [web] don't crash when server has disappeared, fix #5677 (#5683) --- web/src/js/components/FlowView/Messages.tsx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/web/src/js/components/FlowView/Messages.tsx b/web/src/js/components/FlowView/Messages.tsx index 4e74e05f7..89ae95cda 100644 --- a/web/src/js/components/FlowView/Messages.tsx +++ b/web/src/js/components/FlowView/Messages.tsx @@ -24,7 +24,16 @@ export default function Messages({flow, messages_meta}: MessagesPropTypes) { MessageUtils.getContentURL(flow, "messages", contentView, maxLines + 1), flow.id + messages_meta.count ); - const messages = useMemo(() => content && JSON.parse(content), [content]) || []; + const messages = useMemo(() => { + if (content) { + try { + return JSON.parse(content) + } catch (e) { + const err: ContentViewData = {"description": "Network Error", lines: [[["error", `${content}`]]]}; + return err; + } + } + }, [content]) || []; return (