Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
refactor: cleanup docker info dialog
Kyle Mendell497d23433405
diff --git a/frontend/src/lib/components/dialogs/docker-info-dialog.svelte b/frontend/src/lib/components/dialogs/docker-info-dialog.svelteindex 4a455e2e6..fc9ab620b 100644--- a/frontend/src/lib/components/dialogs/docker-info-dialog.svelte+++ b/frontend/src/lib/components/dialogs/docker-info-dialog.svelte@@ -4,6 +4,7 @@import { Badge } from '#lib/components/ui/badge';import { CopyButton } from '#lib/components/ui/copy-button';import { Spinner } from '#lib/components/ui/spinner';+ import { CheckIcon, CloseIcon } from '#lib/icons';import type { DockerInfo } from '#lib/types/docker';import { m } from '#lib/paraglide/messages';import { bytes } from '#lib/utils/formatting';@@ -76,41 +77,40 @@</ResponsiveDialog>{#snippet dialogBody(info: DockerInfo)}- <div class="space-y-4 pt-2">+ <div class="space-y-3 pt-2">{#if info.Warnings && info.Warnings.length > 0}{@render warningsCard(info.Warnings)}{/if}- {@render statsSection(info)}- {@render resourcesSection(info)}+ {@render statStrip(info)}- <div class="columns-1 gap-3 sm:columns-2 lg:columns-3 [&>*]:mb-3 [&>*]:break-inside-avoid">+ <div class="columns-1 gap-6 sm:columns-2 lg:columns-3 [&>*]:mb-4 [&>*]:break-inside-avoid">{@render systemSection(info)}{@render versionSection(info)}{@render configurationSection(info)}- {@render capabilitiesSection(info)}- {#if info.DriverStatus && info.DriverStatus.length > 0}- {@render storageDetailsSection(info)}- {/if}- {@render securitySection(info)}+ {@render networkSection(info)}{@render pluginsSection(info)}+ {@render capabilitiesSection(info)}{#if swarmActive(info)}{@render swarmSection(info)}{/if}+ {@render securitySection(info)}+ {#if info.DriverStatus && info.DriverStatus.length > 0}+ {@render storageDetailsSection(info)}+ {/if}{#if info.Labels && info.Labels.length > 0}{@render labelsSection(info)}{/if}- {@render networkSection(info)}</div></div>{/snippet}{#snippet warningsCard(warnings: string[])}- <div class="space-y-1.5 rounded-lg border border-amber-500/30 bg-amber-500/5 p-3">- <h3 class="text-xs font-semibold tracking-wider text-amber-600 uppercase dark:text-amber-400">+ <div class="space-y-0.5 border-l-2 border-amber-500/50 pl-2.5">+ <h3 class="text-[10px] font-semibold tracking-wider text-amber-600 uppercase dark:text-amber-400">{m.docker_info_warnings_section()}</h3>- <ul class="space-y-1">+ <ul class="space-y-0.5">{#each warnings as warning, i (i)}<li class="text-xs [overflow-wrap:anywhere] text-amber-700 dark:text-amber-300">{warning}</li>{/each}@@ -118,55 +118,36 @@</div>{/snippet}-{#snippet statsSection(info: DockerInfo)}- <div>- <h3 class="mb-2 text-xs font-semibold tracking-wider text-muted-foreground uppercase">- {m.docker_info_stats_section()}- </h3>- <div class="grid gap-3 sm:grid-cols-4">- {@render statCard(m.common_running(), info.ContainersRunning ?? 0, 'emerald')}- {@render statCard(m.paused(), info.ContainersPaused ?? 0, 'amber')}- {@render statCard(m.common_stopped(), info.ContainersStopped ?? 0, 'red')}- {@render statCard(m.images(), info.Images ?? 0, 'blue')}- </div>+{#snippet statStrip(info: DockerInfo)}+ <div class="flex flex-wrap items-center gap-x-5 gap-y-1.5 border-b border-border/50 pb-2.5">+ {@render stat(m.common_running(), info.ContainersRunning ?? 0, 'bg-emerald-500')}+ {@render stat(m.paused(), info.ContainersPaused ?? 0, 'bg-amber-500')}+ {@render stat(m.common_stopped(), info.ContainersStopped ?? 0, 'bg-red-500')}+ {@render stat(m.images(), info.Images ?? 0, 'bg-blue-500')}+ <div class="hidden h-3 w-px bg-border/50 sm:block"></div>+ {@render stat(m.common_cpus(), info.NCPU ?? 0)}+ {@render stat(m.docker_info_memory_label(), (info.MemTotal ? bytes.format(info.MemTotal) : null) ?? '-')}+ {@render stat(m.goroutines(), info.NGoroutines ?? 0)}+ {@render stat(m.docker_info_file_descriptors(), info.NFd ?? 0)}</div>{/snippet}-{#snippet resourcesSection(info: DockerInfo)}- <div>- <h3 class="mb-2 text-xs font-semibold tracking-wider text-muted-foreground uppercase">- {m.resources()}- </h3>- <div class="grid gap-3 sm:grid-cols-4">- <div class="rounded-lg border p-3">- <div class="mb-1 text-[10px] tracking-tight text-muted-foreground uppercase">{m.common_cpus()}</div>- <div class="flex items-center gap-2">- <Badge variant="outline" class="text-sm font-semibold">{info.NCPU ?? 0}</Badge>- <span class="text-[10px] text-muted-foreground">cores</span>- </div>- </div>- <div class="rounded-lg border p-3">- <div class="mb-1 text-[10px] tracking-tight text-muted-foreground uppercase">{m.docker_info_memory_label()}</div>- <Badge variant="outline" class="text-sm font-semibold">{info.MemTotal ? bytes.format(info.MemTotal) : '-'}</Badge>- </div>- <div class="rounded-lg border p-3">- <div class="mb-1 text-[10px] tracking-tight text-muted-foreground uppercase">{m.goroutines()}</div>- <Badge variant="outline" class="text-sm font-semibold">{info.NGoroutines ?? 0}</Badge>- </div>- <div class="rounded-lg border p-3">- <div class="mb-1 text-[10px] tracking-tight text-muted-foreground uppercase">{m.docker_info_file_descriptors()}</div>- <Badge variant="outline" class="text-sm font-semibold">{info.NFd ?? 0}</Badge>- </div>- </div>+{#snippet stat(label: string, value: string | number, dot?: string)}+ <div class="flex items-baseline gap-1.5">+ {#if dot}+ <span class="size-1.5 shrink-0 self-center rounded-full {dot}"></span>+ {/if}+ <span class="text-sm font-semibold tabular-nums">{value}</span>+ <span class="text-[10px] tracking-tight whitespace-nowrap text-muted-foreground uppercase">{label}</span></div>{/snippet}{#snippet systemSection(info: DockerInfo)}- <div class="space-y-2">- <h3 class="text-xs font-semibold tracking-wider text-muted-foreground uppercase">+ <section class="space-y-1.5">+ <h3 class="border-b border-border/50 pb-1 text-[10px] font-semibold tracking-wider text-muted-foreground uppercase">{m.docker_info_system_section()}</h3>- <div class="space-y-1 rounded-lg border p-2.5">+ <div class="space-y-0.5">{@render infoRow(m.common_name(), info.Name)}{@render infoRow(m.common_id(), info.ID, true)}{@render infoRow(m.docker_info_os_label(), info.OperatingSystem)}@@ -178,24 +159,26 @@{@render infoRow(m.docker_info_root_dir(), info.DockerRootDir, true)}{@render infoRow(m.docker_info_index_server_label(), info.IndexServerAddress, true)}</div>- </div>+ </section>{/snippet}{#snippet versionSection(info: DockerInfo)}- <div class="space-y-2">- <h3 class="text-xs font-semibold tracking-wider text-muted-foreground uppercase">+ <section class="space-y-1.5">+ <h3 class="border-b border-border/50 pb-1 text-[10px] font-semibold tracking-wider text-muted-foreground uppercase">{m.docker_info_version_section()}</h3>- <div class="space-y-1 rounded-lg border p-2.5">+ <div class="space-y-0.5">{@render infoRow(m.docker_info_server_version_label(), info.ServerVersion)}{@render infoRow(m.docker_info_api_version_label(), info.apiVersion)}{@render infoRow(m.go_version(), info.goVersion)}- <div class="grid grid-cols-[minmax(112px,38%)_minmax(0,1fr)] items-start gap-x-4 gap-y-1">- <span class="text-[10px] tracking-tight text-muted-foreground uppercase">{m.docker_info_git_commit_label()}</span>- <div class="flex items-center justify-end gap-2">+ <div class="grid grid-cols-[minmax(104px,38%)_minmax(0,1fr)] items-baseline gap-x-3">+ <span class="text-[10px] leading-4 tracking-tight text-muted-foreground uppercase"+ >{m.docker_info_git_commit_label()}</span+ >+ <div class="flex items-center justify-end gap-1.5"><code class="rounded bg-muted px-1.5 py-0.5 text-xs">{info.gitCommit?.slice(0, 8) ?? '-'}</code>{#if info.gitCommit}- <CopyButton text={info.gitCommit} size="icon" class="size-6" title={m.docker_copy_commit_hash()} />+ <CopyButton text={info.gitCommit} size="icon" class="size-5" title={m.docker_copy_commit_hash()} />{/if}</div></div>@@ -208,15 +191,15 @@{@render infoRow(m.docker_info_product_license_label(), info.ProductLicense, false)}{/if}</div>- </div>+ </section>{/snippet}{#snippet configurationSection(info: DockerInfo)}- <div class="space-y-2">- <h3 class="text-xs font-semibold tracking-wider text-muted-foreground uppercase">+ <section class="space-y-1.5">+ <h3 class="border-b border-border/50 pb-1 text-[10px] font-semibold tracking-wider text-muted-foreground uppercase">{m.common_configuration()}</h3>- <div class="space-y-1 rounded-lg border p-2.5">+ <div class="space-y-0.5">{@render infoRow(m.docker_info_storage_driver_label(), info.Driver)}{@render infoRow(m.docker_info_logging_driver_label(), info.LoggingDriver)}{@render infoRow(m.docker_info_cgroup_driver_label(), info.CgroupDriver)}@@ -228,15 +211,15 @@{@render infoRow(m.docker_info_live_restore_label(), info.LiveRestoreEnabled ? m.common_yes() : m.common_no(), false)}{@render infoRow(m.docker_info_event_listeners_label(), info.NEventsListener ?? 0, false)}</div>- </div>+ </section>{/snippet}{#snippet capabilitiesSection(info: DockerInfo)}- <div class="space-y-2">- <h3 class="text-xs font-semibold tracking-wider text-muted-foreground uppercase">+ <section class="space-y-1.5">+ <h3 class="border-b border-border/50 pb-1 text-[10px] font-semibold tracking-wider text-muted-foreground uppercase">{m.docker_info_capabilities_section()}</h3>- <div class="space-y-1 rounded-lg border p-2.5">+ <div class="grid grid-cols-2 gap-x-4 gap-y-0.5">{@render capRow(m.docker_info_memory_limit_label(), info.MemoryLimit)}{@render capRow(m.docker_info_swap_limit_label(), info.SwapLimit)}{@render capRow(m.docker_info_kernel_memory_tcp_label(), info.KernelMemoryTCP)}@@ -247,70 +230,70 @@{@render capRow(m.docker_info_pids_limit_label(), info.PidsLimit)}{@render capRow(m.docker_info_oom_kill_disable_label(), info.OomKillDisable)}</div>- </div>+ </section>{/snippet}{#snippet storageDetailsSection(info: DockerInfo)}- <div class="space-y-2">- <h3 class="text-xs font-semibold tracking-wider text-muted-foreground uppercase">+ <section class="space-y-1.5">+ <h3 class="border-b border-border/50 pb-1 text-[10px] font-semibold tracking-wider text-muted-foreground uppercase">{m.docker_info_storage_details_section()}</h3>- <div class="space-y-1 rounded-lg border p-2.5">+ <div class="space-y-0.5">{#each info.DriverStatus ?? [] as entry, i (i)}{@render infoRow(entry[0] ?? '', entry[1], false)}{/each}</div>- </div>+ </section>{/snippet}{#snippet networkSection(info: DockerInfo)}- <div class="space-y-2">- <h3 class="text-xs font-semibold tracking-wider text-muted-foreground uppercase">+ <section class="space-y-1.5">+ <h3 class="border-b border-border/50 pb-1 text-[10px] font-semibold tracking-wider text-muted-foreground uppercase">{m.resource_networks_cap()} & {m.docker_info_proxy_label()}</h3>- <div class="space-y-1 rounded-lg border p-2.5">+ <div class="space-y-0.5">{@render infoRow(m.docker_info_ipv4_forwarding(), info.IPv4Forwarding ? m.common_enabled() : m.common_disabled(), false)}{@render infoRow(m.docker_info_http_proxy(), info.HttpProxy)}{@render infoRow(m.docker_info_https_proxy(), info.HttpsProxy)}- {@render infoRow(m.docker_info_no_proxy(), info.NoProxy)}+ {#if info.NoProxy}+ {@render blockRow(m.docker_info_no_proxy(), info.NoProxy)}+ {:else}+ {@render infoRow(m.docker_info_no_proxy(), info.NoProxy)}+ {/if}{#if info.DefaultAddressPools && info.DefaultAddressPools.length > 0}- <div>- <div class="mb-1 text-[10px] tracking-tight text-muted-foreground uppercase">{m.docker_info_address_pools_label()}</div>- <div class="flex flex-wrap gap-1">- {#each info.DefaultAddressPools as pool, i (i)}- <Badge variant="outline" size="sm" class="font-mono">{pool.Base}/{pool.Size}</Badge>- {/each}- </div>- </div>+ {@render blockRow(+ m.docker_info_address_pools_label(),+ info.DefaultAddressPools.map((pool) => `${pool.Base}/${pool.Size}`).join(' ')+ )}{/if}</div>- </div>+ </section>{/snippet}{#snippet securitySection(info: DockerInfo)}- <div class="space-y-2">- <h3 class="text-xs font-semibold tracking-wider text-muted-foreground uppercase">+ <section class="space-y-1.5">+ <h3 class="border-b border-border/50 pb-1 text-[10px] font-semibold tracking-wider text-muted-foreground uppercase">{m.security()} & {m.docker_info_runtimes()}</h3>- <div class="space-y-2 rounded-lg border p-2.5">+ <div class="space-y-1">{@render tagGroup(m.docker_info_security_options(), info.SecurityOptions)}{@render tagGroup(m.docker_info_runtimes(), Object.keys(info.Runtimes ?? {}))}</div>- </div>+ </section>{/snippet}{#snippet pluginsSection(info: DockerInfo)}- <div class="space-y-2">- <h3 class="text-xs font-semibold tracking-wider text-muted-foreground uppercase">+ <section class="space-y-1.5">+ <h3 class="border-b border-border/50 pb-1 text-[10px] font-semibold tracking-wider text-muted-foreground uppercase">{m.docker_info_plugins_section()}</h3>- <div class="space-y-2 rounded-lg border p-2.5">+ <div class="space-y-1">{@render tagGroup(m.resource_volumes_cap(), info.Plugins?.Volume)}{@render tagGroup(m.resource_networks_cap(), info.Plugins?.Network)}{@render tagGroup(m.common_logs(), info.Plugins?.Log)}{@render tagGroup(m.docker_info_authorization_plugin(), info.Plugins?.Authorization)}</div>- </div>+ </section>{/snippet}{#snippet swarmSection(info: DockerInfo)}@@ -321,70 +304,37 @@Managers?: number;Nodes?: number;}}- <div class="space-y-2">- <h3 class="text-xs font-semibold tracking-wider text-muted-foreground uppercase">+ <section class="space-y-1.5">+ <h3 class="border-b border-border/50 pb-1 text-[10px] font-semibold tracking-wider text-muted-foreground uppercase">{m.swarm()}</h3>- <div class="space-y-1 rounded-lg border p-2.5">+ <div class="space-y-0.5">{@render infoRow(m.docker_info_swarm_state_label(), swarm.LocalNodeState, false)}{@render infoRow(m.docker_info_swarm_manager_label(), swarm.ControlAvailable ? m.common_yes() : m.common_no(), false)}{@render infoRow(m.docker_info_swarm_node_id_label(), swarm.NodeID, true)}{@render infoRow(m.docker_info_swarm_managers_label(), swarm.Managers ?? 0, false)}{@render infoRow(m.nodes(), swarm.Nodes ?? 0, false)}</div>- </div>+ </section>{/snippet}{#snippet labelsSection(info: DockerInfo)}- <div class="space-y-2">- <h3 class="text-xs font-semibold tracking-wider text-muted-foreground uppercase">+ <section class="space-y-1.5">+ <h3 class="border-b border-border/50 pb-1 text-[10px] font-semibold tracking-wider text-muted-foreground uppercase">{m.docker_info_labels_section()}</h3>- <div class="rounded-lg border p-3">- <div class="flex flex-wrap gap-1">- {#each info.Labels ?? [] as label, i (i)}- <Badge variant="outline" size="sm" class="font-mono">{label}</Badge>- {/each}- </div>+ <div class="flex flex-wrap gap-1">+ {#each info.Labels ?? [] as label, i (i)}+ <Badge variant="outline" size="sm" class="font-mono">{label}</Badge>+ {/each}</div>- </div>-{/snippet}--{#snippet statCard(label: string, value: number, color: 'emerald' | 'amber' | 'red' | 'blue' | 'neutral')}- {@const colors = {- emerald: {- bg: 'bg-emerald-500/5',- badge: 'border-emerald-500/30 bg-emerald-500/15 text-emerald-600 dark:text-emerald-300'- },- amber: {- bg: 'bg-amber-500/5',- badge: 'border-amber-500/30 bg-amber-500/15 text-amber-700 dark:text-amber-300'- },- red: {- bg: 'bg-red-500/5',- badge: 'border-red-500/30 bg-red-500/15 text-red-600 dark:text-red-300'- },- blue: {- bg: 'bg-blue-500/5',- badge: 'border-blue-500/30 bg-blue-500/15 text-blue-600 dark:text-blue-300'- },- neutral: {- bg: '',- badge: ''- }- }}- <div class="rounded-lg border p-3 {colors[color].bg}">- <div class="mb-1 text-[10px] tracking-tight text-muted-foreground uppercase">{label}</div>- <Badge variant="outline" class="{colors[color].badge} text-base font-semibold tabular-nums">- {value}- </Badge>- </div>+ </section>{/snippet}{#snippet tagGroup(label: string, items: string[] | undefined)}- <div>- <div class="mb-1 text-[10px] tracking-tight text-muted-foreground uppercase">{label}</div>- <div class="flex flex-wrap gap-1">+ <div class="grid grid-cols-[minmax(96px,32%)_minmax(0,1fr)] items-baseline gap-x-3">+ <span class="text-[10px] leading-4 tracking-tight text-muted-foreground uppercase">{label}</span>+ <div class="flex flex-wrap justify-end gap-1">{#each items ?? [] as item, i (i)}<Badge variant="outline" size="sm">{item}</Badge>{:else}@@ -397,16 +347,31 @@{#snippet capRow(label: string, value: boolean | undefined)}<div class="flex items-center justify-between gap-2"><span class="text-[10px] tracking-tight [overflow-wrap:anywhere] text-muted-foreground uppercase">{label}</span>- <span class="text-[10px] font-medium {value ? 'text-emerald-600 dark:text-emerald-400' : 'text-muted-foreground'}">- {value ? m.common_yes() : m.common_no()}- </span>+ {#if value}+ <CheckIcon class="size-3 shrink-0 text-emerald-600 dark:text-emerald-400" />+ <span class="sr-only">{m.common_yes()}</span>+ {:else}+ <CloseIcon class="size-3 shrink-0 text-muted-foreground/50" />+ <span class="sr-only">{m.common_no()}</span>+ {/if}+ </div>+{/snippet}++{#snippet blockRow(label: string, value: string)}+ <div class="space-y-0.5 pt-0.5">+ <div class="text-[10px] tracking-tight text-muted-foreground uppercase">{label}</div>+ <div+ class="max-h-48 overflow-y-auto rounded-md bg-muted/30 px-2 py-1 font-mono text-[11px] leading-relaxed break-all text-foreground/80"+ >+ {value}+ </div></div>{/snippet}{#snippet infoRow(label: string, value: string | number | undefined | null, mono: boolean = true)}- <div class="grid grid-cols-[minmax(112px,38%)_minmax(0,1fr)] items-start gap-x-4 gap-y-1">- <span class="text-[10px] tracking-tight text-muted-foreground uppercase">{label}</span>- <span class="text-right text-xs [overflow-wrap:anywhere] {mono ? 'font-mono' : ''}">+ <div class="grid grid-cols-[minmax(104px,38%)_minmax(0,1fr)] items-baseline gap-x-3">+ <span class="text-[10px] leading-4 tracking-tight text-muted-foreground uppercase">{label}</span>+ <span class="text-right text-xs leading-4 [overflow-wrap:anywhere] {mono ? 'font-mono' : ''}">{value === undefined || value === null || value === '' ? '-' : value}</span></div>