Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: synchronize structured log toggle state (#3418)
Greg8238d707e373
diff --git a/frontend/src/lib/components/logs/log-controls.svelte b/frontend/src/lib/components/logs/log-controls.svelteindex be0f605ce..fdcb4bcae 100644--- a/frontend/src/lib/components/logs/log-controls.svelte+++ b/frontend/src/lib/components/logs/log-controls.svelte@@ -70,9 +70,10 @@showParsedJson = persistedJsonParsing.current === 'true';});- $effect(() => {- persistedJsonParsing.current = showParsedJson ? 'true' : 'false';- });+ function handleParsedModeChange(checked: boolean): void {+ showParsedJson = checked;+ persistedJsonParsing.current = checked ? 'true' : 'false';+ }const selectedLabel = $derived(tailOptions.find((o) => o.value === selectedTail)?.label ?? m.log_tail_100_lines());</script>@@ -161,7 +162,7 @@<DropdownMenu.CheckboxItemchecked={showParsedJson}onCheckedChange={(checked) => {- showParsedJson = checked === true;+ handleParsedModeChange(checked === true);}}><div class="flex flex-col gap-0.5">@@ -243,7 +244,7 @@checked={showParsedJson}label={showParsedJson ? m.common_parsed() : m.common_raw()}onCheckedChange={(checked) => {- showParsedJson = checked;+ handleParsedModeChange(checked);}}/>{/snippet}diff --git a/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte b/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelteindex 94df9f271..13282ee17 100644--- a/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte+++ b/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte@@ -257,7 +257,7 @@bind:autoScrolltype="container"{containerId}- {showParsedJson}+ bind:showParsedJsonmaxLines={500}showTimestamps={true}groupAdjacentLines={true}diff --git a/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelte b/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelteindex 6b62f1684..0119f777d 100644--- a/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelte+++ b/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelte@@ -91,7 +91,7 @@bind:autoScroll{projectId}{tailLines}- {showParsedJson}+ bind:showParsedJsontype="project"maxLines={500}showTimestamps={true}diff --git a/frontend/src/routes/(app)/swarm/services/components/ServiceLogsPanel.svelte b/frontend/src/routes/(app)/swarm/services/components/ServiceLogsPanel.svelteindex 66669dd0a..a3c692479 100644--- a/frontend/src/routes/(app)/swarm/services/components/ServiceLogsPanel.svelte+++ b/frontend/src/routes/(app)/swarm/services/components/ServiceLogsPanel.svelte@@ -71,7 +71,7 @@bind:autoScrolltype="service"{serviceId}- {showParsedJson}+ bind:showParsedJsonmaxLines={500}showTimestamps={true}height="calc(100vh - 320px)"diff --git a/tests/spec/containers.spec.ts b/tests/spec/containers.spec.tsindex d6f41f989..41e517b1f 100644--- a/tests/spec/containers.spec.ts+++ b/tests/spec/containers.spec.ts@@ -5,6 +5,118 @@ import { openRowActionsMenu } from '../utils/table-actions.util';const CONTAINERS_ROUTE = '/containers';+const structuredContainerLog = {+ level: 'stdout',+ message: JSON.stringify({+ level: 'info',+ message: 'structured container log marker',+ request_id: 'request-3415'+ }),+ timestamp: '2026-07-27T23:08:37.000Z'+};++async function mockContainerLogsWebSocket(page: Page) {+ await page.addInitScript((logEntry) => {+ localStorage.setItem('arcane_log_json_parsing_v3', 'false');+ localStorage.setItem('arcane_log_auto_start', 'false');++ const browserWindow = globalThis as typeof globalThis & {+ WebSocket: any;+ EventTarget: any;+ Event: any;+ MessageEvent: any;+ CloseEvent: any;+ };++ const NativeWebSocket = browserWindow.WebSocket;+ const containerLogsPathPattern =+ /\/api\/environments\/[^/]+\/ws\/containers\/[^/]+\/logs(?:\?.*)?$/;++ class MockContainerLogsWebSocket extends browserWindow.EventTarget {+ static CONNECTING = 0;+ static OPEN = 1;+ static CLOSING = 2;+ static CLOSED = 3;++ url: string;+ readyState = MockContainerLogsWebSocket.CONNECTING;+ bufferedAmount = 0;+ extensions = '';+ protocol = '';+ binaryType = 'blob';+ onopen: ((event: unknown) => void) | null = null;+ onmessage: ((event: unknown) => void) | null = null;+ onerror: ((event: unknown) => void) | null = null;+ onclose: ((event: unknown) => void) | null = null;++ constructor(url: string | URL) {+ super();+ this.url = String(url);++ queueMicrotask(() => {+ if (this.readyState !== MockContainerLogsWebSocket.CONNECTING) return;++ this.readyState = MockContainerLogsWebSocket.OPEN;++ const openEvent = new browserWindow.Event('open');+ this.dispatchEvent(openEvent);+ this.onopen?.(openEvent);++ const messageEvent = new browserWindow.MessageEvent('message', {+ data: JSON.stringify(logEntry)+ });++ this.dispatchEvent(messageEvent);+ this.onmessage?.(messageEvent);+ });+ }++ send(_data?: string | ArrayBufferLike | Blob | ArrayBufferView) {}++ close(code = 1000, reason = '') {+ if (this.readyState === MockContainerLogsWebSocket.CLOSED) return;++ this.readyState = MockContainerLogsWebSocket.CLOSED;++ const closeEvent = new browserWindow.CloseEvent('close', {+ code,+ reason,+ wasClean: true+ });++ this.dispatchEvent(closeEvent);+ this.onclose?.(closeEvent);+ }+ }++ const PatchedWebSocket = function (+ this: unknown,+ url: string | URL,+ protocols?: string | string[]+ ) {+ const urlString = String(url);++ if (containerLogsPathPattern.test(urlString)) {+ return new MockContainerLogsWebSocket(urlString);+ }++ return protocols === undefined+ ? new NativeWebSocket(url)+ : new NativeWebSocket(url, protocols);+ } as unknown as typeof WebSocket;++ Object.defineProperties(PatchedWebSocket, {+ CONNECTING: { value: NativeWebSocket.CONNECTING },+ OPEN: { value: NativeWebSocket.OPEN },+ CLOSING: { value: NativeWebSocket.CLOSING },+ CLOSED: { value: NativeWebSocket.CLOSED }+ });++ PatchedWebSocket.prototype = NativeWebSocket.prototype;+ browserWindow.WebSocket = PatchedWebSocket;+ }, structuredContainerLog);+}+async function navigateToContainers(page: Page) {await page.goto(CONTAINERS_ROUTE);await page.waitForLoadState('load');@@ -79,6 +191,31 @@ test.describe('Containers Page', () => {await expect(page.getByTestId('container-log-memory-monitor')).not.toContainText('N/A');});+ test('keeps the parsed log toggle synchronized when structured logs are detected', async ({+ page+ }) => {+ const running = containersData.data.find((container) => container.state === 'running');+ test.skip(!running, 'No running container available');++ await mockContainerLogsWebSocket(page);+ await page.goto(`/containers/${running!.id}`);+ await page.waitForLoadState('load');+ await page.getByRole('tab', { name: 'Logs' }).click();++ const parsedModeToggle = page.locator('#parsed-log-mode-toggle:visible');+ await expect(parsedModeToggle).toHaveAttribute('aria-checked', 'false');++ await page.getByRole('button', { name: 'Start', exact: true }).first().click();++ await expect(+ page.getByText('structured container log marker', { exact: true }).filter({ visible: true })+ ).toBeVisible();+ await expect(parsedModeToggle).toHaveAttribute('aria-checked', 'true');+ await expect+ .poll(() => page.evaluate(() => localStorage.getItem('arcane_log_json_parsing_v3')))+ .toBe('false');+ });+test('should show non-live fallback monitors on the logs tab for stopped containers', async ({page}) => {