Skip to content

Modern Docker Management, Designed for Everyone

fix: cleanup log controls on mobile

Kyle Mendellc86fbe014888
diff --git a/frontend/src/lib/components/logs/log-controls.svelte b/frontend/src/lib/components/logs/log-controls.svelte
index f325f3ade..297019679 100644
--- a/frontend/src/lib/components/logs/log-controls.svelte
+++ b/frontend/src/lib/components/logs/log-controls.svelte
@@ -2,6 +2,8 @@
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';
+ import { EllipsisIcon } from '$lib/icons';
+ import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import * as Select from '$lib/components/ui/select';
import { m } from '$lib/paraglide/messages';
import { PersistedState } from 'runed';
@@ -11,6 +13,8 @@
tailLines = $bindable(100),
autoStartLogs = $bindable(false),
showParsedJson = $bindable(false),
+ mobileLayout = 'full',
+ showDesktop = true,
isStreaming = false,
disabled = false,
onStart,
@@ -21,6 +25,8 @@
tailLines?: number;
autoStartLogs?: boolean;
showParsedJson?: boolean;
+ mobileLayout?: 'full' | 'menu-only' | 'actions-only' | 'none';
+ showDesktop?: boolean;
isStreaming?: boolean;
disabled?: boolean;
onStart?: () => void;
@@ -71,82 +77,288 @@
const selectedLabel = $derived(tailOptions.find((o) => o.value === selectedTail)?.label ?? m.log_tail_100_lines());
</script>
-<div class="flex flex-col gap-3 lg:flex-row lg:items-center lg:justify-end">
- <div class="flex flex-wrap items-center gap-4">
- <ArcaneTooltip.Root>
- <ArcaneTooltip.Trigger>
- <SwitchWithLabel
- id="auto-scroll-toggle"
- checked={autoScroll}
- label={m.common_autoscroll()}
- onCheckedChange={(checked) => {
- autoScroll = checked;
- }}
+{#if mobileLayout !== 'none'}
+ <div class="lg:hidden">
+ {#if mobileLayout === 'full'}
+ <div class="flex items-center justify-end gap-1">
+ {#if isStreaming}
+ <ArcaneButton
+ action="stop"
+ tone="ghost"
+ size="icon"
+ class="text-muted-foreground hover:text-foreground size-8 shrink-0"
+ onclick={onStop}
+ aria-label={m.common_stop()}
+ title={m.common_stop()}
+ />
+ {:else}
+ <ArcaneButton
+ action="start"
+ tone="ghost"
+ size="icon"
+ class="text-muted-foreground hover:text-foreground size-8 shrink-0"
+ onclick={onStart}
+ aria-label={m.common_start()}
+ title={m.common_start()}
+ {disabled}
+ />
+ {/if}
+ <ArcaneButton
+ action="refresh"
+ tone="ghost"
+ size="icon"
+ class="text-muted-foreground hover:text-foreground size-8 shrink-0"
+ onclick={onRefresh}
+ aria-label={m.log_refresh_aria_label()}
+ title={m.common_refresh()}
/>
- </ArcaneTooltip.Trigger>
- <ArcaneTooltip.Content side="bottom" class="max-w-xs">
- {m.log_auto_scroll_tooltip()}
- </ArcaneTooltip.Content>
- </ArcaneTooltip.Root>
-
- <ArcaneTooltip.Root>
- <ArcaneTooltip.Trigger>
- <SwitchWithLabel
- id="auto-start-logs-toggle"
- checked={autoStartLogs}
- label={m.auto_start()}
- onCheckedChange={(checked) => {
- autoStartLogs = checked;
- }}
- />
- </ArcaneTooltip.Trigger>
- <ArcaneTooltip.Content side="bottom" class="max-w-xs">
- {m.log_auto_start_tooltip()}
- </ArcaneTooltip.Content>
- </ArcaneTooltip.Root>
-
- <ArcaneTooltip.Root>
- <ArcaneTooltip.Trigger>
- <SwitchWithLabel
- id="parsed-log-mode-toggle"
- checked={showParsedJson}
- label={showParsedJson ? m.common_parsed() : m.common_raw()}
- onCheckedChange={(checked) => {
- showParsedJson = checked;
- }}
+
+ <DropdownMenu.Root>
+ <DropdownMenu.Trigger>
+ {#snippet child({ props })}
+ <ArcaneButton
+ {...props}
+ action="base"
+ tone="ghost"
+ size="icon"
+ class="text-muted-foreground hover:text-foreground size-8 shrink-0"
+ aria-label={m.common_open_menu()}
+ title={m.common_open_menu()}
+ >
+ <span class="sr-only">{m.common_open_menu()}</span>
+ <EllipsisIcon class="size-4" />
+ </ArcaneButton>
+ {/snippet}
+ </DropdownMenu.Trigger>
+
+ <DropdownMenu.Content align="end" class="w-72">
+ <DropdownMenu.Label>{selectedLabel}</DropdownMenu.Label>
+ <DropdownMenu.RadioGroup value={selectedTail} onValueChange={(value) => (selectedTail = value)}>
+ {#each tailOptions as option (option.value)}
+ <DropdownMenu.RadioItem value={option.value} disabled={isStreaming}>{option.label}</DropdownMenu.RadioItem>
+ {/each}
+ </DropdownMenu.RadioGroup>
+
+ <DropdownMenu.Separator />
+
+ <DropdownMenu.CheckboxItem
+ checked={autoScroll}
+ onCheckedChange={(checked) => {
+ autoScroll = checked === true;
+ }}
+ >
+ <div class="flex flex-col gap-0.5">
+ <span class="font-medium">{m.common_autoscroll()}</span>
+ <span class="text-muted-foreground text-xs">{m.log_auto_scroll_tooltip()}</span>
+ </div>
+ </DropdownMenu.CheckboxItem>
+ <DropdownMenu.CheckboxItem
+ checked={autoStartLogs}
+ onCheckedChange={(checked) => {
+ autoStartLogs = checked === true;
+ }}
+ >
+ <div class="flex flex-col gap-0.5">
+ <span class="font-medium">{m.auto_start()}</span>
+ <span class="text-muted-foreground text-xs">{m.log_auto_start_tooltip()}</span>
+ </div>
+ </DropdownMenu.CheckboxItem>
+ <DropdownMenu.CheckboxItem
+ checked={showParsedJson}
+ onCheckedChange={(checked) => {
+ showParsedJson = checked === true;
+ }}
+ >
+ <div class="flex flex-col gap-0.5">
+ <span class="font-medium">{showParsedJson ? m.common_parsed() : m.common_raw()}</span>
+ <span class="text-muted-foreground text-xs">{m.log_parsed_mode_tooltip()}</span>
+ </div>
+ </DropdownMenu.CheckboxItem>
+ </DropdownMenu.Content>
+ </DropdownMenu.Root>
+ </div>
+ {:else if mobileLayout === 'actions-only'}
+ <div class="flex items-center justify-end gap-1">
+ {#if isStreaming}
+ <ArcaneButton
+ action="stop"
+ tone="ghost"
+ size="icon"
+ class="text-muted-foreground hover:text-foreground size-8 shrink-0"
+ onclick={onStop}
+ aria-label={m.common_stop()}
+ title={m.common_stop()}
+ />
+ {:else}
+ <ArcaneButton
+ action="start"
+ tone="ghost"
+ size="icon"
+ class="text-muted-foreground hover:text-foreground size-8 shrink-0"
+ onclick={onStart}
+ aria-label={m.common_start()}
+ title={m.common_start()}
+ {disabled}
+ />
+ {/if}
+ <ArcaneButton
+ action="refresh"
+ tone="ghost"
+ size="icon"
+ class="text-muted-foreground hover:text-foreground size-8 shrink-0"
+ onclick={onRefresh}
+ aria-label={m.log_refresh_aria_label()}
+ title={m.common_refresh()}
/>
- </ArcaneTooltip.Trigger>
- <ArcaneTooltip.Content side="bottom" class="max-w-xs">
- {m.log_parsed_mode_tooltip()}
- </ArcaneTooltip.Content>
- </ArcaneTooltip.Root>
- </div>
+ </div>
+ {:else if mobileLayout === 'menu-only'}
+ <div class="flex items-center justify-end">
+ <DropdownMenu.Root>
+ <DropdownMenu.Trigger>
+ {#snippet child({ props })}
+ <ArcaneButton
+ {...props}
+ action="base"
+ tone="ghost"
+ size="icon"
+ class="text-muted-foreground hover:text-foreground size-8 shrink-0"
+ aria-label={m.common_open_menu()}
+ title={m.common_open_menu()}
+ >
+ <span class="sr-only">{m.common_open_menu()}</span>
+ <EllipsisIcon class="size-4" />
+ </ArcaneButton>
+ {/snippet}
+ </DropdownMenu.Trigger>
+
+ <DropdownMenu.Content align="end" class="w-72">
+ <DropdownMenu.Label>{selectedLabel}</DropdownMenu.Label>
+ <DropdownMenu.RadioGroup value={selectedTail} onValueChange={(value) => (selectedTail = value)}>
+ {#each tailOptions as option (option.value)}
+ <DropdownMenu.RadioItem value={option.value} disabled={isStreaming}>{option.label}</DropdownMenu.RadioItem>
+ {/each}
+ </DropdownMenu.RadioGroup>
- <Select.Root type="single" bind:value={selectedTail} disabled={isStreaming} onValueChange={(v: string) => (selectedTail = 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}
- <ArcaneButton action="start" tone="outline" size="sm" class="text-xs font-medium" onclick={onStart} {disabled} />
+ <DropdownMenu.Separator />
+
+ <DropdownMenu.CheckboxItem
+ checked={autoScroll}
+ onCheckedChange={(checked) => {
+ autoScroll = checked === true;
+ }}
+ >
+ <div class="flex flex-col gap-0.5">
+ <span class="font-medium">{m.common_autoscroll()}</span>
+ <span class="text-muted-foreground text-xs">{m.log_auto_scroll_tooltip()}</span>
+ </div>
+ </DropdownMenu.CheckboxItem>
+ <DropdownMenu.CheckboxItem
+ checked={autoStartLogs}
+ onCheckedChange={(checked) => {
+ autoStartLogs = checked === true;
+ }}
+ >
+ <div class="flex flex-col gap-0.5">
+ <span class="font-medium">{m.auto_start()}</span>
+ <span class="text-muted-foreground text-xs">{m.log_auto_start_tooltip()}</span>
+ </div>
+ </DropdownMenu.CheckboxItem>
+ <DropdownMenu.CheckboxItem
+ checked={showParsedJson}
+ onCheckedChange={(checked) => {
+ showParsedJson = checked === true;
+ }}
+ >
+ <div class="flex flex-col gap-0.5">
+ <span class="font-medium">{showParsedJson ? m.common_parsed() : m.common_raw()}</span>
+ <span class="text-muted-foreground text-xs">{m.log_parsed_mode_tooltip()}</span>
+ </div>
+ </DropdownMenu.CheckboxItem>
+ </DropdownMenu.Content>
+ </DropdownMenu.Root>
+ </div>
{/if}
- <ArcaneButton
- action="refresh"
- tone="outline"
- size="sm"
- class="text-xs font-medium"
- onclick={onRefresh}
- aria-label={m.log_refresh_aria_label()}
- title={m.common_refresh()}
- />
</div>
-</div>
+{/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">
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <SwitchWithLabel
+ id="auto-scroll-toggle"
+ checked={autoScroll}
+ label={m.common_autoscroll()}
+ onCheckedChange={(checked) => {
+ autoScroll = checked;
+ }}
+ />
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="bottom" class="max-w-xs">
+ {m.log_auto_scroll_tooltip()}
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <SwitchWithLabel
+ id="auto-start-logs-toggle"
+ checked={autoStartLogs}
+ label={m.auto_start()}
+ onCheckedChange={(checked) => {
+ autoStartLogs = checked;
+ }}
+ />
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="bottom" class="max-w-xs">
+ {m.log_auto_start_tooltip()}
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <SwitchWithLabel
+ id="parsed-log-mode-toggle"
+ checked={showParsedJson}
+ label={showParsedJson ? m.common_parsed() : m.common_raw()}
+ onCheckedChange={(checked) => {
+ showParsedJson = checked;
+ }}
+ />
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="bottom" class="max-w-xs">
+ {m.log_parsed_mode_tooltip()}
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+ </div>
+
+ <Select.Root type="single" bind:value={selectedTail} disabled={isStreaming} onValueChange={(v: string) => (selectedTail = 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}
+ <ArcaneButton action="start" tone="outline" size="sm" class="text-xs font-medium" onclick={onStart} {disabled} />
+ {/if}
+ <ArcaneButton
+ action="refresh"
+ tone="outline"
+ size="sm"
+ class="text-xs font-medium"
+ onclick={onRefresh}
+ aria-label={m.log_refresh_aria_label()}
+ title={m.common_refresh()}
+ />
+ </div>
+ </div>
+{/if}
diff --git a/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte b/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte
index 199ed353e..7bb7adc67 100644
--- a/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte
+++ b/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte
@@ -196,18 +196,32 @@
<Card.Header icon={FileTextIcon}>
<div class="flex flex-1 flex-col gap-4 lg:flex-row lg:items-start lg:justify-between">
<div class="flex flex-col gap-1.5">
- <div class="flex items-center gap-2">
- <Card.Title>
- <h2>
- {m.containers_logs_title()}
- </h2>
- </Card.Title>
- {#if isStreaming}
- <div class="flex items-center gap-2">
- <div class="size-2 animate-pulse rounded-full bg-green-500"></div>
- <span class="text-xs font-semibold text-green-600 sm:text-sm">{m.common_live()}</span>
- </div>
- {/if}
+ <div class="flex items-start justify-between gap-3 lg:block">
+ <div class="flex items-center gap-2">
+ <Card.Title>
+ <h2>
+ {m.containers_logs_title()}
+ </h2>
+ </Card.Title>
+ {#if isStreaming}
+ <div class="flex items-center gap-2">
+ <div class="size-2 animate-pulse rounded-full bg-green-500"></div>
+ <span class="text-xs font-semibold text-green-600 sm:text-sm">{m.common_live()}</span>
+ </div>
+ {/if}
+ </div>
+ <LogControls
+ bind:autoScroll
+ bind:autoStartLogs
+ bind:showParsedJson
+ mobileLayout="full"
+ showDesktop={false}
+ {isStreaming}
+ disabled={!containerId}
+ onStart={handleStart}
+ onStop={handleStop}
+ onRefresh={handleRefresh}
+ />
</div>
<Card.Description>{m.containers_logs_description()}</Card.Description>
</div>
@@ -215,6 +229,7 @@
bind:autoScroll
bind:autoStartLogs
bind:showParsedJson
+ mobileLayout="none"
{isStreaming}
disabled={!containerId}
onStart={handleStart}
diff --git a/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelte b/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelte
index 93646ecf6..fdb0fd69e 100644
--- a/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelte
+++ b/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelte
@@ -52,16 +52,31 @@
<Card.Header icon={TerminalIcon}>
<div class="flex flex-1 flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
<div class="flex flex-col gap-1.5">
- <div class="flex items-center gap-2">
- <Card.Title>
- <h2>{m.compose_logs_title()}</h2>
- </Card.Title>
- {#if isStreaming}
- <div class="flex items-center gap-2">
- <div class="size-2 animate-pulse rounded-full bg-green-500"></div>
- <span class="text-xs font-semibold text-green-600 sm:text-sm">{m.common_live()}</span>
- </div>
- {/if}
+ <div class="flex items-start justify-between gap-3 lg:block">
+ <div class="flex items-center gap-2">
+ <Card.Title>
+ <h2>{m.compose_logs_title()}</h2>
+ </Card.Title>
+ {#if isStreaming}
+ <div class="flex items-center gap-2">
+ <div class="size-2 animate-pulse rounded-full bg-green-500"></div>
+ <span class="text-xs font-semibold text-green-600 sm:text-sm">{m.common_live()}</span>
+ </div>
+ {/if}
+ </div>
+ <LogControls
+ bind:autoScroll
+ bind:tailLines
+ bind:autoStartLogs
+ bind:showParsedJson
+ mobileLayout="full"
+ showDesktop={false}
+ {isStreaming}
+ disabled={!projectId}
+ onStart={handleStart}
+ onStop={handleStop}
+ onRefresh={handleRefresh}
+ />
</div>
<Card.Description>Real-time project logs</Card.Description>
</div>
@@ -70,6 +85,7 @@
bind:tailLines
bind:autoStartLogs
bind:showParsedJson
+ mobileLayout="none"
{isStreaming}
disabled={!projectId}
onStart={handleStart}