Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
feat: add stream label toggle for STDOUT/STDERR (#3976)
Kyle Mendell4f10dee49f7a
diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex 7c540324b..0ef1a0815 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -242,6 +242,8 @@"log_auto_scroll_tooltip": "Keeps the view pinned to the newest log lines while new entries arrive.","log_auto_start_tooltip": "Starts streaming logs automatically when you open this panel.","log_parsed_mode_tooltip": "Shows structured logs in parsed form when available. Turn it off to see the original raw line text.",+ "log_stream_labels": "Stream labels",+ "log_stream_labels_tooltip": "Shows STDOUT and STDERR as text on each line. Turn it off to show a green dot for STDOUT and a red square for STDERR instead.","log_download_tooltip": "Downloads every log line Docker still keeps for this container, ignoring the search, tail, and parsed settings.","common_logout": "Logout","common_redeploy": "Redeploy",diff --git a/frontend/src/lib/components/logs/log-controls.svelte b/frontend/src/lib/components/logs/log-controls.svelteindex d9e44db04..9d7187f99 100644--- a/frontend/src/lib/components/logs/log-controls.svelte+++ b/frontend/src/lib/components/logs/log-controls.svelte@@ -160,6 +160,17 @@<span class="text-xs text-muted-foreground">{m.log_parsed_mode_tooltip()}</span></div></DropdownMenu.CheckboxItem>+ <DropdownMenu.CheckboxItem+ checked={preferences.showStreamLabels}+ onCheckedChange={(checked) => {+ preferences.showStreamLabels = checked === true;+ }}+ >+ <div class="flex flex-col gap-0.5">+ <span class="font-medium">{m.log_stream_labels()}</span>+ <span class="text-xs text-muted-foreground">{m.log_stream_labels_tooltip()}</span>+ </div>+ </DropdownMenu.CheckboxItem></DropdownMenu.Content></DropdownMenu.Root>{/snippet}@@ -185,8 +196,8 @@{/if}{#if showDesktop}- <div class="hidden flex-col gap-3 lg:flex lg:flex-row lg:items-center lg:justify-end">- <div class="flex flex-wrap items-center gap-4">+ <div class="hidden flex-wrap items-center justify-end gap-x-4 gap-y-2 lg:flex">+ <div class="flex shrink-0 items-center gap-4"><ArcaneTooltip.Root><ArcaneTooltip.Trigger>{#snippet child({ props })}@@ -243,27 +254,46 @@{m.log_parsed_mode_tooltip()}</ArcaneTooltip.Content></ArcaneTooltip.Root>++ <ArcaneTooltip.Root>+ <ArcaneTooltip.Trigger>+ {#snippet child({ props })}+ <SwitchWithLabel+ triggerProps={props}+ id="stream-labels-toggle"+ checked={preferences.showStreamLabels}+ label={m.log_stream_labels()}+ onCheckedChange={(checked) => {+ preferences.showStreamLabels = checked;+ }}+ />+ {/snippet}+ </ArcaneTooltip.Trigger>+ <ArcaneTooltip.Content side="bottom" class="max-w-xs">+ {m.log_stream_labels_tooltip()}+ </ArcaneTooltip.Content>+ </ArcaneTooltip.Root></div>- <Input type="search" placeholder={m.common_search()} bind:value={searchTerm} class="h-9 w-44 text-xs" />+ <div class="flex shrink-0 items-center gap-3">+ <Input type="search" placeholder={m.common_search()} bind:value={searchTerm} class="h-9 w-44 text-xs" />- <Select.Root- type="single"- value={preferences.selectedTail.current}- disabled={isStreaming}- onValueChange={(v: string) => (preferences.selectedTail.current = v)}- >- <Select.Trigger class="h-9 w-32 text-xs">- <span>{selectedLabel}</span>- </Select.Trigger>- <Select.Content>- {#each tailOptions as option (option.value)}- <Select.Item value={option.value}>{option.label}</Select.Item>- {/each}- </Select.Content>- </Select.Root>+ <Select.Root+ type="single"+ value={preferences.selectedTail.current}+ disabled={isStreaming}+ onValueChange={(v: string) => (preferences.selectedTail.current = v)}+ >+ <Select.Trigger class="h-9 w-32 text-xs">+ <span>{selectedLabel}</span>+ </Select.Trigger>+ <Select.Content>+ {#each tailOptions as option (option.value)}+ <Select.Item value={option.value}>{option.label}</Select.Item>+ {/each}+ </Select.Content>+ </Select.Root>- <div class="flex items-center gap-3">{#if isStreaming}<ArcaneButton action="stop" tone="outline" size="sm" class="text-xs font-medium" onclick={onStop} />{:else}diff --git a/frontend/src/lib/components/logs/log-viewer.svelte b/frontend/src/lib/components/logs/log-viewer.svelteindex ccceebdc7..cab43479a 100644--- a/frontend/src/lib/components/logs/log-viewer.svelte+++ b/frontend/src/lib/components/logs/log-viewer.svelte@@ -35,6 +35,7 @@onStart?: () => void;onStop?: () => void;showParsedJson?: boolean;+ showStreamLabels?: boolean;groupAdjacentLines?: boolean;searchTerm?: string;}@@ -54,6 +55,7 @@onStart,onStop,showParsedJson = $bindable(false),+ showStreamLabels = true,groupAdjacentLines = false,searchTerm = ''}: Props = $props();@@ -494,6 +496,24 @@</div>{/snippet}+{#snippet renderLevelLabel(level: LogViewerEntry['level'], labelClass: string)}+ {#if showStreamLabels || (level !== 'stdout' && level !== 'stderr')}+ <span class={cn('shrink-0', labelClass, getLevelClass(level))}>+ {level.toUpperCase()}+ </span>+ {:else}+ <span+ class={cn('inline-flex h-4 shrink-0 items-center', labelClass, getLevelClass(level))}+ role="img"+ aria-label={level.toUpperCase()}+ title={level.toUpperCase()}+ data-stream={level}+ >+ <span class={cn('size-2 bg-current', level === 'stdout' ? 'rounded-full' : 'rounded-[2px]')}></span>+ </span>+ {/if}+{/snippet}+{#snippet renderGroupedSummary(displayEntry: LogViewerDisplayEntry, contentClass: string)}<div class="flex min-w-0 items-start gap-2"><Collapsible.Trigger@@ -575,9 +595,7 @@{getDisplayEntryService(displayLog)}</span>{/if}- <span class="shrink-0 {getLevelClass(getDisplayEntryLevel(displayLog))}">- {getDisplayEntryLevel(displayLog).toUpperCase()}- </span>+ {@render renderLevelLabel(getDisplayEntryLevel(displayLog), '')}</div>{#if displayLog.grouped}<Collapsible.Root@@ -627,9 +645,7 @@{getDisplayEntryService(displayLog)}</span>{/if}- <span class="mr-2 min-w-fit shrink-0 pt-1 text-xs {getLevelClass(getDisplayEntryLevel(displayLog))}">- {getDisplayEntryLevel(displayLog).toUpperCase()}- </span>+ {@render renderLevelLabel(getDisplayEntryLevel(displayLog), 'mr-2 min-w-fit pt-1 text-xs')}<div class="min-w-0 flex-1">{#if displayLog.grouped}<Collapsible.Rootdiff --git a/frontend/src/lib/hooks/use-log-preferences.svelte.ts b/frontend/src/lib/hooks/use-log-preferences.svelte.tsindex 6552f0668..389dcc5e3 100644--- a/frontend/src/lib/hooks/use-log-preferences.svelte.ts+++ b/frontend/src/lib/hooks/use-log-preferences.svelte.ts@@ -4,6 +4,7 @@ export class UseLogPreferences {selectedTail = new PersistedState('arcane_log_tail_lines', '100');autoStart = new PersistedState('arcane_log_auto_start', 'false');parsedJson = new PersistedState('arcane_log_json_parsing_v3', 'false');+ streamLabels = new PersistedState('arcane_log_show_stream_labels', 'true');get tailLines() {const selectedTail = this.selectedTail.current || '100';@@ -19,6 +20,14 @@ export class UseLogPreferences {this.autoStart.current = String(enabled);}+ get showStreamLabels() {+ return this.streamLabels.current === 'true';+ }++ set showStreamLabels(enabled: boolean) {+ this.streamLabels.current = String(enabled);+ }+// The viewer may enable parsed mode for this session without persisting it.showParsedJson = $derived(this.parsedJson.current === 'true');diff --git a/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte b/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelteindex f3d2220c2..5a06fce45 100644--- a/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte+++ b/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte@@ -214,6 +214,7 @@type="container"{containerId}bind:showParsedJson={preferences.showParsedJson}+ showStreamLabels={preferences.showStreamLabels}tailLines={preferences.tailLines}maxLines={500}showTimestamps={true}diff --git a/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelte b/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelteindex 2e7ebfd4c..cdb28419f 100644--- a/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelte+++ b/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelte@@ -96,6 +96,7 @@{projectId}tailLines={preferences.tailLines}bind:showParsedJson={preferences.showParsedJson}+ showStreamLabels={preferences.showStreamLabels}type="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 6a9959b7a..109cb1b62 100644--- a/frontend/src/routes/(app)/swarm/services/components/ServiceLogsPanel.svelte+++ b/frontend/src/routes/(app)/swarm/services/components/ServiceLogsPanel.svelte@@ -75,6 +75,7 @@type="service"{serviceId}bind:showParsedJson={preferences.showParsedJson}+ showStreamLabels={preferences.showStreamLabels}tailLines={preferences.tailLines}maxLines={500}showTimestamps={true}