From 7be11bc9d9522d733e92cf5acaea573a57b3ead7 Mon Sep 17 00:00:00 2001 From: viown <48097677+viown@users.noreply.github.com> Date: Sun, 2 Nov 2025 21:59:39 -0500 Subject: [PATCH] Backport pull request #7269 from jellyfin-web/release-10.11.z Fix JSON in log viewer Original-merge: 6e2c62525a40d06c8f2360a5ac45da2f231c13f0 Merged-by: thornbill Backported-by: Joshua M. Boniface --- src/apps/dashboard/features/logs/api/useServerLog.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/apps/dashboard/features/logs/api/useServerLog.ts b/src/apps/dashboard/features/logs/api/useServerLog.ts index 21b2d10057..8adc37b501 100644 --- a/src/apps/dashboard/features/logs/api/useServerLog.ts +++ b/src/apps/dashboard/features/logs/api/useServerLog.ts @@ -12,7 +12,13 @@ const fetchServerLog = async ( const response = await getSystemApi(api).getLogFile({ name }, options); // FIXME: TypeScript SDK thinks it is returning a File but in reality it is a string - return response.data as never as string; + const data = response.data as never as string | object; + + if (typeof data === 'object') { + return JSON.stringify(data, null, 2); + } else { + return data; + } }; export const useServerLog = (name: string) => { const { api } = useApi();