Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: prevent overlapping columns in virtualized tables (#4220)
Kyle Mendell79dfcb145993
diff --git a/frontend/src/lib/components/arcane-table/arcane-table-desktop-view.svelte b/frontend/src/lib/components/arcane-table/arcane-table-desktop-view.svelteindex 0dc458ca7..7fdc56f13 100644--- a/frontend/src/lib/components/arcane-table/arcane-table-desktop-view.svelte+++ b/frontend/src/lib/components/arcane-table/arcane-table-desktop-view.svelte@@ -105,6 +105,15 @@const shouldVirtualize = $derived(!isGrouped && !hasExpand && !wrapText && !!scrollElement && flatRows.length > VIRTUALIZE_THRESHOLD);+ // Natural column widths (% of the table) measured from an auto-layout pass, then locked for table-fixed.+ let lockedColumns = $state<{ key: string; widths: number[] } | null>(null);+ const columnKey = $derived(+ table+ .getVisibleLeafColumns()+ .map((column) => column.id)+ .join('|')+ );+ const columnWidths = $derived(shouldVirtualize && lockedColumns?.key === columnKey ? lockedColumns.widths : null);const getItemKey = $derived.by(() => {const rows = flatRows;return (index: number) => rows[index]?.id ?? index;@@ -144,11 +153,24 @@remeasure();}};+ const measureColumns = () => {+ if (columnWidths || !body.querySelector('tr[data-index]')) return;+ const cells = tableNode.tHead?.rows[0]?.cells;+ const tableWidth = tableNode.getBoundingClientRect().width;+ if (!cells || !tableWidth) return;+ lockedColumns = {+ key: columnKey,+ widths: Array.from(cells, (cell) => (cell.getBoundingClientRect().width / tableWidth) * 100)+ };+ };const fontsChanged = () => {remeasure();updateLayout();};- const observer = new ResizeObserver(updateLayout);+ const observer = new ResizeObserver(() => {+ measureColumns();+ updateLayout();+ });observer.observe(tableNode);if (tableNode.tHead) observer.observe(tableNode.tHead);document.fonts.addEventListener('loadingdone', fontsChanged);@@ -228,23 +250,25 @@{#each row.getVisibleCells() as cell, cellIndex (cell.id)}{@const isFirstDataCell = !selectionDisabled ? cellIndex === 1 : cellIndex === 0}{@const meta = cell.column.columnDef.meta}+ {@const clip =+ !wrapText && (meta?.truncate || (!!columnWidths && cell.column.id !== 'select' && cell.column.id !== 'actions'))}<Table.Cellpinned={cell.column.id === 'actions'}variant={cell.column.id === 'select' ? 'checkbox' : 'default'}indent={isGroupedRow && isFirstDataCell && cell.column.id !== 'select'}style={typeof meta?.width === 'number' ? `--col-width: ${meta.width}px` : undefined}class={cn(- cell.column.id === 'actions' && (shouldVirtualize ? 'w-24' : 'w-0'),+ cell.column.id === 'actions' && 'w-0',meta?.width === 'min' && 'w-0',meta?.width === 'max' && 'w-full',meta?.align === 'center' && 'text-center',meta?.align === 'right' && 'text-right',- meta?.truncate && !wrapText && 'max-w-0',+ clip && 'max-w-0',wrapText && cell.column.id !== 'select' && cell.column.id !== 'actions' && 'break-words whitespace-normal',typeof meta?.width === 'number' && 'w-(--col-width)')}>- {#if meta?.truncate && !wrapText}+ {#if clip}<span class="block min-w-0 truncate">{@render cellContent(cell)}</span>{:else}{@render cellContent(cell)}@@ -293,18 +317,20 @@{#if hasExpand}<Table.Head variant="expander"></Table.Head>{/if}- {#each headerGroup.headers as header (header.id)}+ {#each headerGroup.headers as header, i (header.id)}{@const meta = header.column.columnDef.meta}+ {@const pxWidth = typeof meta?.width === 'number' ? `${meta.width}px` : undefined}+ {@const colWidth = columnWidths ? `${columnWidths[i]}%` : pxWidth}<Table.Headcolspan={header.colSpan}pinned={header.column.id === 'actions'}variant={header.column.id === 'select' ? 'checkbox' : 'default'}- style={typeof meta?.width === 'number' ? `--col-width: ${meta.width}px` : undefined}+ style={colWidth ? `--col-width: ${colWidth}` : undefined}class={cn(meta?.width === 'min' && 'w-0',meta?.width === 'max' && 'w-full',- header.column.id === 'actions' && (shouldVirtualize ? 'w-24' : 'w-0'),- typeof meta?.width === 'number' && 'w-(--col-width)'+ header.column.id === 'actions' && 'w-0',+ colWidth && 'w-(--col-width)')}>{#if !header.isPlaceholder}@@ -394,7 +420,7 @@{#if !unstyled}<div aria-hidden="true" class="sticky top-0 z-(--arcane-z-sticky) -mb-10 h-10 backdrop-blur-sm"></div>{/if}- <Table.Root bind:ref={tableElement} class={shouldVirtualize ? 'table-fixed' : undefined}>+ <Table.Root bind:ref={tableElement} class={columnWidths ? 'table-fixed' : undefined}>{@render tableHeader()}<Table.Body bind:ref={bodyElement}>{#if isGrouped && groupedRows}diff --git a/frontend/src/lib/components/badges/port-badge.svelte b/frontend/src/lib/components/badges/port-badge.svelteindex 0e871be74..3dd4e077b 100644--- a/frontend/src/lib/components/badges/port-badge.svelte+++ b/frontend/src/lib/components/badges/port-badge.svelte@@ -33,7 +33,7 @@hostPort: string | null;containerPort: string;proto?: string;- ip?: string | null;+ ips: string[];isPublished: boolean;};@@ -56,21 +56,32 @@function normalize(p: PortBadgePort): NormalizedPort {const hostPort = getPublicPort(p);+ // An unspecified host IP binds all interfaces.+ const ip = (isContainerPort(p) ? p.ip : p.host_ip)?.trim() || '0.0.0.0';return {hostPort,containerPort: getPrivatePort(p),proto: getProto(p),- ip: (isContainerPort(p) ? p.ip : p.host_ip)?.trim() || null,+ ips: [ip],isPublished: hostPort !== null};}+ function portKey(p: NormalizedPort): string {+ return `${p.hostPort ?? ''}:${p.containerPort}/${p.proto ?? ''}`;+ }++ // Bindings that differ only by host IP (e.g. 0.0.0.0 and ::) share one badge.function uniquePorts(list: PortBadgePort[]): NormalizedPort[] {const map = new Map<string, NormalizedPort>();for (const p of list) {const n = normalize(p);- const key = `${n.ip ?? ''}:${n.hostPort ?? ''}:${n.containerPort}/${n.proto ?? ''}`;- if (!map.has(key)) map.set(key, n);+ const existing = map.get(portKey(n));+ if (!existing) {+ map.set(portKey(n), n);+ continue;+ }+ for (const ip of n.ips) if (!existing.ips.includes(ip)) existing.ips.push(ip);}return Array.from(map.values()).sort((a, b) => {// Published ports first@@ -98,7 +109,7 @@<span class="text-xs text-muted-foreground">{m.containers_no_ports()}</span>{:else}<div class="flex gap-1.5 {wrap ? 'flex-wrap' : 'flex-nowrap'}">- {#each published as p (`${p.ip ?? ''}:${p.hostPort ?? ''}:${p.containerPort}/${p.proto ?? ''}`)}+ {#each published as p (portKey(p))}<ArcaneTooltip.Root interactive><ArcaneTooltip.Trigger>{#snippet child({ props })}@@ -120,13 +131,15 @@{/snippet}</ArcaneTooltip.Trigger><ArcaneTooltip.Content>- <p class="text-xs">- {m.published()}: {p.ip ?? '0.0.0.0'}:{p.hostPort} → {p.containerPort}{p.proto ? `/${p.proto}` : ''}- </p>+ {#each p.ips as ip (ip)}+ <p class="text-xs">+ {m.published()}: {ip.includes(':') ? `[${ip}]` : ip}:{p.hostPort} → {p.containerPort}{p.proto ? `/${p.proto}` : ''}+ </p>+ {/each}</ArcaneTooltip.Content></ArcaneTooltip.Root>{/each}- {#each exposedOnly as p (`${p.ip ?? ''}:${p.hostPort ?? ''}:${p.containerPort}/${p.proto ?? ''}`)}+ {#each exposedOnly as p (portKey(p))}<ArcaneTooltip.Root><ArcaneTooltip.Trigger><span class={badgeVariants({ variant: 'gray', size: 'sm' })}>diff --git a/frontend/src/routes/(app)/containers/container-table.svelte b/frontend/src/routes/(app)/containers/container-table.svelteindex d260c28a2..611604449 100644--- a/frontend/src/routes/(app)/containers/container-table.svelte+++ b/frontend/src/routes/(app)/containers/container-table.svelte@@ -282,6 +282,12 @@const canStopContainers = $derived(hasPermission('containers:stop', currentEnvId));const canRestartContainers = $derived(hasPermission('containers:restart', currentEnvId));const canDeleteContainers = $derived(hasPermission('containers:delete', currentEnvId));+ // Reserve room for per-row state buttons so every State cell fits the width measured from the first rows.+ const stateActionsMinWidth = $derived.by(() => {+ if (canUpdateContainers) return 'min-w-15';+ if (canStartContainers || canStopContainers) return 'min-w-7';+ return '';+ });const canKillContainers = $derived(hasPermission('containers:kill', currentEnvId));const canConvertToCompose = $derived(hasPermission('projects:create', currentEnvId) && settingsStore.current?.experimentalFeaturesEnabled === true@@ -647,8 +653,8 @@{@const iconUrl = getThemedIconUrl(item, mode.current)}{@const projectLabel = item.labels?.[COMPOSE_PROJECT_LABEL]}<div class="flex items-center gap-2">- <IconImage src={iconUrl} alt={displayName} fallback={BoxIcon} class="size-6" containerClass="size-8" />- <a class="font-medium hover:underline" href="/containers/{item.id}">{displayName}</a>+ <IconImage src={iconUrl} alt={displayName} fallback={BoxIcon} class="size-6" containerClass="size-8 shrink-0" />+ <a class="min-w-0 truncate font-medium hover:underline" href="/containers/{item.id}">{displayName}</a>{#if item.hidden}<Badge variant="gray" size="sm">{m.hidden()}</Badge>{/if}@@ -679,7 +685,7 @@{:else}<Badge variant={getStateBadgeVariant(item.state)} minWidth="20">{getContainerStatusLabel(item.state)}</Badge>{/if}- <div class="flex items-center gap-1">+ <div class="flex items-center gap-1 {stateActionsMinWidth}">{#if !status && item.state !== 'running' && canStartContainers}<ArcaneButtonaction="base"