Skip to content

Modern Docker Management, Designed for Everyone

refactor: update some pages for better svelte reactivity (#2121)

Kyle Mendellbb24834e8719
diff --git a/frontend/package.json b/frontend/package.json
index 544e831a3..a3d6c6d61 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -59,6 +59,7 @@
"@tanstack/svelte-query-devtools": "^6.0.4",
"@types/js-yaml": "^4.0.9",
"@types/node": "^25.5.0",
+ "@typescript/native-preview": "7.0.0-dev.20260322.1",
"bits-ui": "^2.16.3",
"clsx": "^2.1.1",
"formsnap": "^2.0.1",
@@ -68,6 +69,7 @@
"paneforge": "^1.0.2",
"runed": "^0.37.1",
"svelte-check": "^4.4.5",
+ "svelte-check-rs": "^0.9.6",
"svelte-sonner": "^1.1.0",
"svelte-toolbelt": "^0.10.6",
"sveltekit-superforms": "^2.30.0",
diff --git a/frontend/src/lib/components/action-button-group/action-button-group.svelte b/frontend/src/lib/components/action-button-group/action-button-group.svelte
index be618e089..18b5a2ca8 100644
--- a/frontend/src/lib/components/action-button-group/action-button-group.svelte
+++ b/frontend/src/lib/components/action-button-group/action-button-group.svelte
@@ -1,22 +1,10 @@
<script lang="ts">
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
- import type { Action, ArcaneButtonSize } from '$lib/components/arcane-button/index.js';
- import { EllipsisIcon, type IconType } from '$lib/icons';
+ import type { ArcaneButtonSize } from '$lib/components/arcane-button/index.js';
+ import { EllipsisIcon } from '$lib/icons';
import { cn } from '$lib/utils';
-
- export interface ActionButton {
- id: string;
- action: Action;
- label: string;
- loadingLabel?: string;
- loading?: boolean;
- disabled?: boolean;
- onclick: () => void;
- showOnMobile?: boolean;
- badge?: string | number;
- icon?: IconType | null;
- }
+ import type { ActionButton } from './types.js';
interface Props {
buttons?: ActionButton[];
diff --git a/frontend/src/lib/components/action-button-group/index.ts b/frontend/src/lib/components/action-button-group/index.ts
index ddeae025c..a6d4e5ad3 100644
--- a/frontend/src/lib/components/action-button-group/index.ts
+++ b/frontend/src/lib/components/action-button-group/index.ts
@@ -1,2 +1,2 @@
export { default as ActionButtonGroup } from './action-button-group.svelte';
-export type { ActionButton } from './action-button-group.svelte';
+export type { ActionButton } from './types.js';
diff --git a/frontend/src/lib/components/action-button-group/types.ts b/frontend/src/lib/components/action-button-group/types.ts
new file mode 100644
index 000000000..1eaef1bd1
--- /dev/null
+++ b/frontend/src/lib/components/action-button-group/types.ts
@@ -0,0 +1,15 @@
+import type { Action } from '$lib/components/arcane-button/index.js';
+import type { IconType } from '$lib/icons';
+
+export interface ActionButton {
+ id: string;
+ action: Action;
+ label: string;
+ loadingLabel?: string;
+ loading?: boolean;
+ disabled?: boolean;
+ onclick: () => void;
+ showOnMobile?: boolean;
+ badge?: string | number;
+ icon?: IconType | null;
+}
diff --git a/frontend/src/lib/components/arcane-tooltip/index.ts b/frontend/src/lib/components/arcane-tooltip/index.ts
index a47880c55..4b0b520a1 100644
--- a/frontend/src/lib/components/arcane-tooltip/index.ts
+++ b/frontend/src/lib/components/arcane-tooltip/index.ts
@@ -2,8 +2,6 @@ import Root from './arcane-tooltip.svelte';
import Trigger from './arcane-tooltip-trigger.svelte';
import Content from './arcane-tooltip-content.svelte';
-export type { ArcaneTooltipContentProps } from './arcane-tooltip-content.svelte';
-
export {
Root,
Trigger,
diff --git a/frontend/src/lib/components/badges/port-badge.svelte b/frontend/src/lib/components/badges/port-badge.svelte
index c854a90e9..cb5a51bc4 100644
--- a/frontend/src/lib/components/badges/port-badge.svelte
+++ b/frontend/src/lib/components/badges/port-badge.svelte
@@ -72,9 +72,7 @@
const allPorts = $derived(uniquePorts(ports));
const visiblePorts = $derived(
- collapsible && !expanded && allPorts.length > maxVisible
- ? allPorts.slice(0, maxVisible)
- : allPorts
+ collapsible && !expanded && allPorts.length > maxVisible ? allPorts.slice(0, maxVisible) : allPorts
);
const published = $derived(visiblePorts.filter((p) => p.isPublished));
const exposedOnly = $derived(visiblePorts.filter((p) => !p.isPublished));
@@ -131,7 +129,7 @@
<ArcaneTooltip.Trigger>
<button
onclick={() => (expanded = !expanded)}
- class="bg-muted hover:bg-muted/80 text-muted-foreground inline-flex items-center rounded-lg border px-2 py-1 text-[11px] font-medium shadow-sm transition-colors cursor-pointer"
+ class="bg-muted hover:bg-muted/80 text-muted-foreground inline-flex cursor-pointer items-center rounded-lg border px-2 py-1 text-[11px] font-medium shadow-sm transition-colors"
>
{expanded ? '−' : `+${hiddenCount}`}
</button>
diff --git a/frontend/src/lib/components/file-browser/FileList.svelte b/frontend/src/lib/components/file-browser/FileList.svelte
index 4d5a8e05f..0f0074bcd 100644
--- a/frontend/src/lib/components/file-browser/FileList.svelte
+++ b/frontend/src/lib/components/file-browser/FileList.svelte
@@ -280,33 +280,50 @@
</div>
<style>
- @reference "../../../app.css";
-
:global(.file-browser-table--card thead tr) {
- @apply bg-muted/30 hover:bg-muted/30;
+ background-color: color-mix(in oklch, var(--muted) 30%, transparent);
}
:global(.file-browser-table--card tbody tr) {
- @apply hover:bg-muted/50 cursor-default border-none transition-colors;
+ cursor: default;
+ border: 0;
+ transition:
+ background-color 150ms ease,
+ border-color 150ms ease,
+ color 150ms ease;
+ }
+
+ :global(.file-browser-table--card tbody tr:hover) {
+ background-color: color-mix(in oklch, var(--muted) 50%, transparent);
}
:global(.file-browser-table--card td) {
- @apply py-2;
+ padding-top: 0.5rem;
+ padding-bottom: 0.5rem;
}
:global(.file-browser-table--minimal thead tr) {
- @apply bg-transparent;
+ background-color: transparent;
}
:global(.file-browser-table--minimal tbody tr) {
- @apply border-border/40 border-b hover:bg-transparent;
+ border-bottom: 1px solid color-mix(in oklch, var(--border) 40%, transparent);
+ }
+
+ :global(.file-browser-table--minimal tbody tr:hover) {
+ background-color: transparent;
}
:global(.file-browser-table--minimal th) {
- @apply text-muted-foreground/80 text-[11px] font-medium tracking-[0.08em] uppercase;
+ color: color-mix(in oklch, var(--muted-foreground) 80%, transparent);
+ font-size: 11px;
+ font-weight: 500;
+ letter-spacing: 0.08em;
+ text-transform: uppercase;
}
:global(.file-browser-table--minimal td) {
- @apply py-2.5;
+ padding-top: 0.625rem;
+ padding-bottom: 0.625rem;
}
</style>
diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-rail.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-rail.svelte
index 195edad30..d0eb0e9eb 100644
--- a/frontend/src/lib/components/ui/sidebar/sidebar-rail.svelte
+++ b/frontend/src/lib/components/ui/sidebar/sidebar-rail.svelte
@@ -18,7 +18,7 @@
data-sidebar="rail"
data-slot="sidebar-rail"
aria-label="Toggle Sidebar"
- tabIndex={sidebar.isTablet ? -1 : -1}
+ tabindex={sidebar.isTablet ? -1 : -1}
onclick={(e) => {
if (!sidebar.isTablet) {
sidebar.toggle();
diff --git a/frontend/src/lib/components/ui/tooltip/tooltip.svelte b/frontend/src/lib/components/ui/tooltip/tooltip.svelte
index 7c9d71254..c92b96b2f 100644
--- a/frontend/src/lib/components/ui/tooltip/tooltip.svelte
+++ b/frontend/src/lib/components/ui/tooltip/tooltip.svelte
@@ -1,7 +1,16 @@
<script lang="ts">
import { Tooltip as TooltipPrimitive } from 'bits-ui';
+ import type { Snippet } from 'svelte';
- let { open = $bindable(false), ...restProps }: TooltipPrimitive.RootProps = $props();
+ let {
+ open = $bindable(false),
+ children,
+ ...restProps
+ }: TooltipPrimitive.RootProps & {
+ children?: Snippet;
+ } = $props();
</script>
-<TooltipPrimitive.Root bind:open {...restProps} />
+<TooltipPrimitive.Root {open} onOpenChange={(next) => (open = next)} {...restProps}>
+ {@render children?.()}
+</TooltipPrimitive.Root>
diff --git a/frontend/src/lib/layouts/index.ts b/frontend/src/lib/layouts/index.ts
index 09fa61668..244ada5d1 100644
--- a/frontend/src/lib/layouts/index.ts
+++ b/frontend/src/lib/layouts/index.ts
@@ -1,9 +1,5 @@
export { default as ResourcePageLayout, type ActionButton, type StatCardConfig } from './resource-page-layout.svelte';
export { default as TabbedPageLayout } from './tabbed-page-layout.svelte';
-export {
- default as SettingsPageLayout,
- type SettingsActionButton,
- type SettingsStatCard,
- type SettingsPageType
-} from './settings-page-layout.svelte';
-export { default as ResourceDetailLayout, type DetailAction } from './resource-detail-layout.svelte';
+export { default as SettingsPageLayout } from './settings-page-layout.svelte';
+export type { SettingsActionButton, SettingsStatCard, SettingsPageType, DetailAction } from './types.js';
+export { default as ResourceDetailLayout } from './resource-detail-layout.svelte';
diff --git a/frontend/src/lib/layouts/resource-detail-layout.svelte b/frontend/src/lib/layouts/resource-detail-layout.svelte
index de6244f3b..6cd01ac00 100644
--- a/frontend/src/lib/layouts/resource-detail-layout.svelte
+++ b/frontend/src/lib/layouts/resource-detail-layout.svelte
@@ -4,17 +4,7 @@
import { cn } from '$lib/utils';
import { ArrowLeftIcon, EllipsisIcon } from '$lib/icons';
import type { Snippet } from 'svelte';
- import type { Action } from '$lib/components/arcane-button/index.js';
-
- export interface DetailAction {
- id: string;
- action: Action;
- label: string;
- loadingLabel?: string;
- loading?: boolean;
- disabled?: boolean;
- onclick: () => void;
- }
+ import type { DetailAction } from './types.js';
interface Props {
backUrl: string;
diff --git a/frontend/src/lib/layouts/settings-page-layout.svelte b/frontend/src/lib/layouts/settings-page-layout.svelte
index dee08b059..279180f77 100644
--- a/frontend/src/lib/layouts/settings-page-layout.svelte
+++ b/frontend/src/lib/layouts/settings-page-layout.svelte
@@ -5,34 +5,11 @@
import HeaderCard from '$lib/components/header-card.svelte';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
- import type { Action } from '$lib/components/arcane-button/index.js';
import { getContext } from 'svelte';
import { m } from '$lib/paraglide/messages';
import { EllipsisIcon, ResetIcon, type IconType } from '$lib/icons';
import { cn } from '$lib/utils';
-
- export interface SettingsActionButton {
- id: string;
- action: Action;
- label: string;
- loadingLabel?: string;
- loading?: boolean;
- disabled?: boolean;
- onclick: () => void;
- showOnMobile?: boolean;
- }
-
- export interface SettingsStatCard {
- title: string;
- value: string | number;
- subtitle?: string;
- icon: IconType;
- iconColor?: string;
- bgColor?: string;
- class?: string;
- }
-
- export type SettingsPageType = 'form' | 'management';
+ import type { SettingsActionButton, SettingsPageType, SettingsStatCard } from './types.js';
interface Props {
title: string;
diff --git a/frontend/src/lib/layouts/types.ts b/frontend/src/lib/layouts/types.ts
new file mode 100644
index 000000000..0dc6f1ce6
--- /dev/null
+++ b/frontend/src/lib/layouts/types.ts
@@ -0,0 +1,35 @@
+import type { Action } from '$lib/components/arcane-button/index.js';
+import type { IconType } from '$lib/icons';
+
+export interface SettingsActionButton {
+ id: string;
+ action: Action;
+ label: string;
+ loadingLabel?: string;
+ loading?: boolean;
+ disabled?: boolean;
+ onclick: () => void;
+ showOnMobile?: boolean;
+}
+
+export interface SettingsStatCard {
+ title: string;
+ value: string | number;
+ subtitle?: string;
+ icon: IconType;
+ iconColor?: string;
+ bgColor?: string;
+ class?: string;
+}
+
+export type SettingsPageType = 'form' | 'management';
+
+export interface DetailAction {
+ id: string;
+ action: Action;
+ label: string;
+ loadingLabel?: string;
+ loading?: boolean;
+ disabled?: boolean;
+ onclick: () => void;
+}
diff --git a/frontend/src/lib/stores/environment.store.svelte.ts b/frontend/src/lib/stores/environment.store.svelte.ts
index c0f4879a9..2ceff39b5 100644
--- a/frontend/src/lib/stores/environment.store.svelte.ts
+++ b/frontend/src/lib/stores/environment.store.svelte.ts
@@ -33,6 +33,7 @@ function createEnvironmentManagementStore() {
let _availableEnvironments = $state<Environment[]>([]);
let _initialized = false;
let _initializedWithData = false;
+ const _selectedSubscribers = new Set<(environment: Environment | null) => void>();
let _resolveReadyPromiseFunction: () => void;
const _readyPromise = new Promise<void>((resolve) => {
@@ -49,18 +50,29 @@ function createEnvironmentManagementStore() {
return sorted;
}
+ function _notifySelectedSubscribers() {
+ for (const subscriber of _selectedSubscribers) {
+ subscriber(_selectedEnvironment);
+ }
+ }
+
function _isAutoSelectableEnvironment(environment: Environment): boolean {
if (!environment.enabled) return false;
if (environment.id === LOCAL_DOCKER_ENVIRONMENT_ID) return true;
return isEnvironmentOnline(environment);
}
- function _setSelectedEnvironment(environment: Environment): Environment {
+ function _assignSelectedEnvironment(environment: Environment | null): Environment | null {
_selectedEnvironment = environment;
- selectedEnvironmentId.current = environment.id;
+ selectedEnvironmentId.current = environment?.id ?? null;
+ _notifySelectedSubscribers();
return environment;
}
+ function _setSelectedEnvironment(environment: Environment): Environment {
+ return _assignSelectedEnvironment(environment) as Environment;
+ }
+
function _selectInitialEnvironment(available: Environment[]): Environment | null {
const savedId = selectedEnvironmentId.current;
@@ -81,7 +93,7 @@ function createEnvironmentManagementStore() {
return _setSelectedEnvironment(firstReachable);
}
- _selectedEnvironment = null;
+ _assignSelectedEnvironment(null);
return null;
}
@@ -111,7 +123,7 @@ function createEnvironmentManagementStore() {
if (_selectedEnvironment) {
const updated = available.find((env) => env.id === _selectedEnvironment!.id);
if (updated) {
- _selectedEnvironment = updated;
+ _assignSelectedEnvironment(updated);
// If the current environment was disabled, switch to an enabled one
if (!updated.enabled) {
_selectInitialEnvironment(available);
@@ -128,8 +140,7 @@ function createEnvironmentManagementStore() {
setEnvironment: async (environment: Environment) => {
if (!environment.enabled) return;
if (_selectedEnvironment?.id !== environment.id) {
- _selectedEnvironment = environment;
- selectedEnvironmentId.current = environment.id;
+ _assignSelectedEnvironment(environment);
// Check if we're on a resource detail page (e.g., /containers/abc123)
// These pages show environment-specific resources that won't exist in the new environment
@@ -142,6 +153,12 @@ function createEnvironmentManagementStore() {
}
}
},
+ subscribeSelected: (subscriber: (environment: Environment | null) => void) => {
+ _selectedSubscribers.add(subscriber);
+ return () => {
+ _selectedSubscribers.delete(subscriber);
+ };
+ },
isInitialized: () => _initialized,
getLocalEnvironment: () => _availableEnvironments.find((env) => env.id === LOCAL_DOCKER_ENVIRONMENT_ID) || null,
ready: _readyPromise,
diff --git a/frontend/src/routes/(app)/containers/[containerId]/+page.svelte b/frontend/src/routes/(app)/containers/[containerId]/+page.svelte
index c4544b842..b1b74c40c 100644
--- a/frontend/src/routes/(app)/containers/[containerId]/+page.svelte
+++ b/frontend/src/routes/(app)/containers/[containerId]/+page.svelte
@@ -4,7 +4,7 @@
import ActionButtons from '$lib/components/action-buttons.svelte';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
import bytes from '$lib/utils/bytes';
- import { onDestroy, tick, untrack } from 'svelte';
+ import { tick } from 'svelte';
import { page } from '$app/state';
import type {
ContainerDetailsDto,
@@ -23,8 +23,7 @@
import ContainerLogsPanel from '../components/ContainerLogsPanel.svelte';
import ContainerShell from '../components/ContainerShell.svelte';
import ContainerComposePanel from '../components/ContainerComposePanel.svelte';
- import { createContainerStatsWebSocket, type ReconnectingWebSocket } from '$lib/utils/ws';
- import { environmentStore } from '$lib/stores/environment.store.svelte';
+ import ContainerDetailStatsSync from '../components/container-detail-stats-sync.svelte';
import IconImage from '$lib/components/icon-image.svelte';
import { getArcaneIconUrlFromLabels } from '$lib/utils/arcane-labels';
import { calculateMemoryUsage } from '$lib/utils/container-stats.utils';
@@ -46,20 +45,9 @@
let container = $derived(data?.container as ContainerDetailsDto);
let stats = $state(null as ContainerStatsType | null);
- let starting = $state(false);
- let stopping = $state(false);
- let restarting = $state(false);
- let removing = $state(false);
- let isRefreshing = $state(false);
-
let selectedTab = $state<string>('overview');
let autoScrollLogs = $state(true);
- let isStreaming = $state(false);
-
- let statsWebSocket: ReconnectingWebSocket<any> | null = $state(null);
- let isConnecting = $state(false);
let hasInitialStatsLoaded = $state(false);
- let statsStreamEnabled = $state(false);
const cleanContainerName = (name: string | undefined): string => {
if (!name) return m.common_not_found_title({ resource: m.containers_title() });
@@ -69,80 +57,6 @@
const containerDisplayName = $derived(cleanContainerName(container?.name));
const containerIconUrl = $derived(getArcaneIconUrlFromLabels(container?.labels));
- async function startStatsStream() {
- if (isConnecting || statsWebSocket || !container?.id || !container.state?.running) {
- return;
- }
-
- isConnecting = true;
- statsStreamEnabled = true;
- try {
- const envId = await environmentStore.getCurrentEnvironmentId();
-
- const ws = createContainerStatsWebSocket({
- getEnvId: () => envId,
- containerId: container.id,
- onMessage: (statsData) => {
- if (statsData.removed) {
- invalidateAll();
- return;
- }
- stats = statsData;
- hasInitialStatsLoaded = true;
- },
- onOpen: () => {
- isConnecting = false;
- },
- onError: (err) => {
- console.error('Stats WebSocket error:', err);
- isConnecting = false;
- },
- onClose: () => {
- isConnecting = false;
- },
- maxBackoff: 5000,
- shouldReconnect: () => {
- return statsStreamEnabled && container?.state?.running === true;
- }
- });
-
- ws.connect();
- statsWebSocket = ws;
- } catch (error) {
- console.error('Failed to connect to stats stream:', error);
- isConnecting = false;
- }
- }
-
- function closeStatsStream() {
- statsStreamEnabled = false;
- if (statsWebSocket) {
- statsWebSocket.close();
- statsWebSocket = null;
- }
- isConnecting = false;
- hasInitialStatsLoaded = false;
- }
-
- $effect(() => {
- const isStatsTab = selectedTab === 'stats';
-
- untrack(() => {
- const containerRunning = container?.state?.running;
- const hasWebSocket = !!statsWebSocket;
-
- if (isStatsTab && containerRunning && !hasWebSocket) {
- void startStatsStream();
- } else if (!isStatsTab && hasWebSocket) {
- closeStatsStream();
- }
- });
- });
-
- onDestroy(() => {
- closeStatsStream();
- });
-
const calculateCPUPercent = (statsData: ContainerStatsType | null): number => {
if (!statsData || !statsData.cpu_stats || !statsData.precpu_stats) {
return 0;
@@ -184,35 +98,14 @@
const primaryIpAddress = $derived(getPrimaryIpAddress(container?.networkSettings));
- $effect(() => {
- starting = false;
- stopping = false;
- restarting = false;
- removing = false;
- });
-
async function refreshData() {
- isRefreshing = true;
await invalidateAll();
- setTimeout(() => {
- isRefreshing = false;
- }, 500);
- }
-
- function handleLogStart() {
- isStreaming = true;
- }
-
- function handleLogStop() {
- isStreaming = false;
}
function handleLogClear() {
- invalidateAll();
+ void invalidateAll();
}
- function handleToggleAutoScroll() {}
-
const hasEnvVars = $derived(!!(container?.config?.env && container.config.env.length > 0));
const hasPorts = $derived(!!(container?.ports && container.ports.length > 0));
const hasLabels = $derived(!!(container?.labels && Object.keys(container.labels).length > 0));
@@ -279,10 +172,12 @@
...(showComposeTab ? [{ value: 'compose', label: m.tabs_compose(), icon: CodeIcon }] : [])
]);
- $effect(() => {
- if (!tabItems.some((t) => t.value === selectedTab)) {
- selectedTab = tabItems[0]?.value ?? 'overview';
+ const activeTab = $derived.by(() => {
+ if (tabItems.some((t) => t.value === selectedTab)) {
+ return selectedTab;
}
+
+ return tabItems[0]?.value ?? 'overview';
});
function onTabChange(value: string) {
@@ -300,26 +195,6 @@
});
}
- function parseDockerDate(input: string | Date | undefined | null): Date | null {
- if (!input) return null;
- if (input instanceof Date) return isNaN(input.getTime()) ? null : input;
-
- const s = String(input).trim();
- if (!s || s.startsWith('0001-01-01')) return null;
-
- const m = s.match(/^(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2})(\.\d+)?Z$/);
- let normalized = s;
- if (m) {
- const base = m[1];
- const frac = m[2] ? m[2].slice(1) : '';
- const ms = frac ? '.' + frac.slice(0, 3).padEnd(3, '0') : '';
- normalized = `${base}${ms}Z`;
- }
-
- const d = new Date(normalized);
- return isNaN(d.getTime()) ? null : d;
- }
-
const backUrl = $derived.by(() => {
const from = page.url.searchParams.get('from');
const projectId = page.url.searchParams.get('projectId');
@@ -333,7 +208,14 @@
</script>
{#if container}
- <TabbedPageLayout {backUrl} backLabel={m.common_back()} {tabItems} {selectedTab} {onTabChange}>
+ <ContainerDetailStatsSync
+ containerId={container.id}
+ enabled={activeTab === 'stats' && !!container.state?.running}
+ bind:stats
+ bind:hasInitialStatsLoaded
+ />
+
+ <TabbedPageLayout {backUrl} backLabel={m.common_back()} {tabItems} selectedTab={activeTab} {onTabChange}>
{#snippet headerInfo()}
<div class="flex items-center gap-2">
<IconImage
@@ -362,7 +244,6 @@
type="container"
itemState={container.state?.running ? 'running' : 'stopped'}
desktopVariant="adaptive"
- loading={{ start: starting, stop: stopping, restart: restarting, remove: removing }}
/>
{/snippet}
@@ -377,7 +258,7 @@
{#if showStats}
<Tabs.Content value="stats" class="h-full">
- {#if selectedTab === 'stats'}
+ {#if activeTab === 'stats'}
<ContainerStats
{container}
{stats}
@@ -393,21 +274,14 @@
{/if}
<Tabs.Content value="logs" class="h-full">
- {#if selectedTab === 'logs'}
- <ContainerLogsPanel
- containerId={container?.id}
- bind:autoScroll={autoScrollLogs}
- onStart={handleLogStart}
- onStop={handleLogStop}
- onClear={handleLogClear}
- onToggleAutoScroll={handleToggleAutoScroll}
- />
+ {#if activeTab === 'logs'}
+ <ContainerLogsPanel containerId={container?.id} bind:autoScroll={autoScrollLogs} onClear={handleLogClear} />
{/if}
</Tabs.Content>
{#if showShell}
<Tabs.Content value="shell" class="h-full">
- {#if selectedTab === 'shell'}
+ {#if activeTab === 'shell'}
<ContainerShell containerId={container?.id} />
{/if}
</Tabs.Content>
diff --git a/frontend/src/routes/(app)/containers/components/ContainerComposePanel.svelte b/frontend/src/routes/(app)/containers/components/ContainerComposePanel.svelte
index 2e3c364b4..bd0f00293 100644
--- a/frontend/src/routes/(app)/containers/components/ContainerComposePanel.svelte
+++ b/frontend/src/routes/(app)/containers/components/ContainerComposePanel.svelte
@@ -17,8 +17,9 @@
} = $props();
const sourceContent = $derived(includeFile ? includeFile.content : (project.composeContent ?? ''));
-
- let composeContent = $state(includeFile ? includeFile.content : (project.composeContent ?? ''));
+ // This component is keyed by compose source identity in the parent route, so capturing the initial source is intentional.
+ // svelte-ignore state_referenced_locally
+ let composeContent = $state(sourceContent);
const isDirty = $derived(composeContent !== sourceContent);
diff --git a/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte b/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte
index 072cbefd7..5a85d0cfa 100644
--- a/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte
+++ b/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte
@@ -10,15 +10,13 @@
autoScroll = $bindable(),
onStart,
onStop,
- onClear,
- onToggleAutoScroll
+ onClear
}: {
containerId: string | undefined;
autoScroll: boolean;
- onStart: () => void;
- onStop: () => void;
+ onStart?: () => void;
+ onStop?: () => void;
onClear: () => void;
- onToggleAutoScroll: () => void;
} = $props();
let isStreaming = $state(false);
@@ -47,12 +45,12 @@
// Sync isStreaming from viewer callbacks
function handleStreamStart() {
isStreaming = true;
- onStart();
+ onStart?.();
}
function handleStreamStop() {
isStreaming = false;
- onStop();
+ onStop?.();
}
$effect(() => {
diff --git a/frontend/src/routes/(app)/containers/components/container-detail-stats-sync.svelte b/frontend/src/routes/(app)/containers/components/container-detail-stats-sync.svelte
new file mode 100644
index 000000000..e150cd261
--- /dev/null
+++ b/frontend/src/routes/(app)/containers/components/container-detail-stats-sync.svelte
@@ -0,0 +1,88 @@
+<script lang="ts">
+ import { createContainerStatsWebSocket, type ReconnectingWebSocket } from '$lib/utils/ws';
+ import { environmentStore } from '$lib/stores/environment.store.svelte';
+ import type { ContainerStats as ContainerStatsType } from '$lib/types/container.type';
+ import { invalidateAll } from '$app/navigation';
+ import { onDestroy } from 'svelte';
+
+ let {
+ containerId,
+ enabled,
+ stats = $bindable<ContainerStatsType | null>(null),
+ hasInitialStatsLoaded = $bindable(false)
+ }: {
+ containerId?: string;
+ enabled: boolean;
+ stats?: ContainerStatsType | null;
+ hasInitialStatsLoaded?: boolean;
+ } = $props();
+
+ let statsWebSocket: ReconnectingWebSocket<ContainerStatsType> | null = null;
+ let isConnecting = false;
+
+ async function startStatsStream() {
+ if (!enabled || isConnecting || statsWebSocket || !containerId) {
+ return;
+ }
+
+ hasInitialStatsLoaded = false;
+ isConnecting = true;
+ try {
+ const envId = await environmentStore.getCurrentEnvironmentId();
+
+ const ws = createContainerStatsWebSocket({
+ getEnvId: () => envId,
+ containerId,
+ onMessage: (statsData) => {
+ if (statsData.removed) {
+ void invalidateAll();
+ return;
+ }
+
+ stats = statsData;
+ hasInitialStatsLoaded = true;
+ },
+ onOpen: () => {
+ isConnecting = false;
+ },
+ onError: (err) => {
+ console.error('Stats WebSocket error:', err);
+ isConnecting = false;
+ },
+ onClose: () => {
+ isConnecting = false;
+ },
+ maxBackoff: 5000,
+ shouldReconnect: () => enabled
+ });
+
+ ws.connect();
+ statsWebSocket = ws;
+ } catch (error) {
+ console.error('Failed to connect to stats stream:', error);
+ isConnecting = false;
+ }
+ }
+
+ function closeStatsStream() {
+ if (statsWebSocket) {
+ statsWebSocket.close();
+ statsWebSocket = null;
+ }
+
+ isConnecting = false;
+ }
+
+ $effect(() => {
+ if (enabled) {
+ void startStatsStream();
+ return;
+ }
+
+ closeStatsStream();
+ });
+
+ onDestroy(() => {
+ closeStatsStream();
+ });
+</script>
diff --git a/frontend/src/routes/(app)/customize/+page.svelte b/frontend/src/routes/(app)/customize/+page.svelte
index bef86114f..c18c547e1 100644
--- a/frontend/src/routes/(app)/customize/+page.svelte
+++ b/frontend/src/routes/(app)/customize/+page.svelte
@@ -156,7 +156,7 @@
<Icon class="size-5 sm:size-6" />
</div>
<div class="min-w-0 flex-1">
- <h3 class="text-sm leading-tight font-semibold sm:text-base">{category.title}</h3>
+ <h2 class="text-sm leading-tight font-semibold sm:text-base">{category.title}</h2>
<p class="text-muted-foreground mt-1 text-xs leading-relaxed sm:text-sm">{category.description}</p>
</div>
</div>
diff --git a/frontend/src/routes/(app)/dashboard/+page.svelte b/frontend/src/routes/(app)/dashboard/+page.svelte
index a2a46aca0..fffc692d6 100644
--- a/frontend/src/routes/(app)/dashboard/+page.svelte
+++ b/frontend/src/routes/(app)/dashboard/+page.svelte
@@ -59,7 +59,6 @@
).dashboardActionItems
);
let debugAllGood = $derived((data as { debugAllGood?: boolean }).debugAllGood ?? false);
- let initialUserFromData = $derived((data as { user?: User | null }).user ?? null);
let currentUser = $state<User | null>(null);
let systemStats = $state<SystemStats | null>(null);
@@ -210,6 +209,7 @@
const count = currentStats?.gpuCount ?? 0;
return count > 0 ? `${count} ${count === 1 ? m.dashboard_meter_gpu_device() : m.dashboard_meter_gpu_devices()}` : '--';
});
+ const dashboardUser = $derived.by(() => currentUser ?? (data as { user?: User | null }).user ?? null);
const greetingBase = $derived.by(() => {
const hour = new Date().getHours();
if (hour >= 5 && hour < 12) return m.dashboard_greeting_morning();
@@ -218,7 +218,7 @@
return m.dashboard_greeting_welcome_back();
});
const greetingUserName = $derived.by(() => {
- const name = currentUser?.displayName?.trim() || currentUser?.username?.trim() || '';
+ const name = dashboardUser?.displayName?.trim() || dashboardUser?.username?.trim() || '';
return name;
});
const dashboardHeroGreeting = $derived.by(() =>
@@ -227,12 +227,6 @@
: m.dashboard_greeting_without_name({ greeting: greetingBase })
);
- $effect(() => {
- if (!currentUser && initialUserFromData) {
- currentUser = initialUserFromData;
- }
- });
-
function formatPercent(value: number | null): string {
return value === null ? '--' : `${value.toFixed(1)}%`;
}
@@ -245,23 +239,36 @@
onMount(() => {
let mounted = true;
+ let currentEnvId: string | null = null;
const unsubscribeUser = userStore.subscribe((user) => {
- currentUser = user ?? initialUserFromData;
+ currentUser = user;
+ });
+ const unsubscribeEnvironment = environmentStore.subscribeSelected((environment) => {
+ const nextEnvId = environment?.id ?? '0';
+ if (!mounted || nextEnvId === currentEnvId) {
+ return;
+ }
+
+ currentEnvId = nextEnvId;
+ resetStats();
+ setupStatsWS(nextEnvId);
+ void refreshData();
});
(async () => {
await environmentStore.ready;
- if (mounted) {
- setupStatsWS();
+ if (mounted && currentEnvId === null) {
+ currentEnvId = environmentStore.selected?.id ?? '0';
+ setupStatsWS(currentEnvId);
}
})();
return () => {
mounted = false;
unsubscribeUser();
- statsWSClient?.close();
- statsWSClient = null;
+ unsubscribeEnvironment();
+ closeStatsWS();
};
});
@@ -270,19 +277,17 @@
hasInitialStatsLoaded = false;
}
- function setupStatsWS() {
+ function closeStatsWS() {
if (statsWSClient) {
statsWSClient.close();
statsWSClient = null;
}
+ }
- const getEnvId = () => {
- const env = environmentStore.selected;
- return env ? env.id : '0';
- };
-
+ function setupStatsWS(envId: string) {
+ closeStatsWS();
statsWSClient = createStatsWebSocket({
- getEnvId,
+ getEnvId: () => envId,
onOpen: () => {
if (!hasInitialStatsLoaded) {
isLoading.loadingStats = true;
@@ -300,24 +305,6 @@
statsWSClient.connect();
}
- let lastEnvId: string | null = null;
- $effect(() => {
- const env = environmentStore.selected;
- if (!env) return;
- if (lastEnvId === null) {
- lastEnvId = env.id;
- return;
- }
- if (env.id !== lastEnvId) {
- lastEnvId = env.id;
- statsWSClient?.close();
- statsWSClient = null;
- resetStats();
- setupStatsWS();
- refreshData();
- }
- });
-
async function handleStartAll() {
if (isLoading.starting || !dockerInfo || stoppedContainers === 0) return;
isLoading.starting = true;
diff --git a/frontend/src/routes/(app)/dashboard/dash-container-table.svelte b/frontend/src/routes/(app)/dashboard/dash-container-table.svelte
index 4ecd143fe..533f336c2 100644
--- a/frontend/src/routes/(app)/dashboard/dash-container-table.svelte
+++ b/frontend/src/routes/(app)/dashboard/dash-container-table.svelte
@@ -12,7 +12,6 @@
import { m } from '$lib/paraglide/messages';
import { containerService } from '$lib/services/container-service';
import { goto } from '$app/navigation';
- import { untrack } from 'svelte';
import { IsMobile } from '$lib/hooks';
import { ContainersIcon, ArrowRightIcon } from '$lib/icons';
import IconImage from '$lib/components/icon-image.svelte';
@@ -28,8 +27,10 @@
const isMobile = new IsMobile();
let selectedIds = $state<string[]>([]);
- let contentHeight = $state(0);
- let lastFetchedLimit = $state(5);
+ let displayLimit = $state(containers.pagination?.itemsPerPage ?? 5);
+ let lastFetchedLimit = $state(containers.pagination?.itemsPerPage ?? 5);
+ let resizeDebounceTimer: ReturnType<typeof setTimeout> | null = null;
+ let lastMeasuredHeight = $state(0);
// Estimate row height: ~57px per row (including borders/padding), plus ~145px for header
const ROW_HEIGHT = 57;
@@ -43,48 +44,72 @@
sort: { column: 'created', direction: 'desc' }
});
- const shouldReserveFooter = $derived.by(() => {
- const limit = requestOptions.pagination?.limit ?? containers.pagination?.itemsPerPage ?? MIN_ROWS;
- const dataLength = containers.data?.length ?? 0;
+ function shouldReserveFooter(limit: number) {
const totalItems = containers.pagination?.totalItems ?? 0;
- return dataLength >= limit && totalItems > limit;
- });
+ return totalItems > limit;
+ }
- const calculatedLimit = $derived.by(() => {
+ function calculateLimitForHeight(height: number) {
if (isMobile.current) return 10;
- if (contentHeight <= 0) return 5;
- let availableHeight = contentHeight - HEADER_HEIGHT;
- if (shouldReserveFooter) {
+ if (height <= 0) return 5;
+
+ let availableHeight = height - HEADER_HEIGHT;
+ const initialRows = Math.floor(Math.max(0, availableHeight) / ROW_HEIGHT);
+ const footerLimit = Math.max(MIN_ROWS, Math.min(MAX_ROWS, initialRows));
+ if (shouldReserveFooter(footerLimit)) {
availableHeight -= FOOTER_HEIGHT;
}
+
const rows = Math.floor(Math.max(0, availableHeight) / ROW_HEIGHT);
return Math.max(MIN_ROWS, Math.min(MAX_ROWS, rows));
- });
+ }
+
+ async function syncLimit(limit: number) {
+ displayLimit = limit;
- $effect(() => {
- const limit = calculatedLimit;
+ const pagination = requestOptions.pagination;
const currentLimit = containers.pagination?.itemsPerPage;
+ if (!pagination || (limit === lastFetchedLimit && (currentLimit === undefined || currentLimit === limit))) {
+ return;
+ }
+
+ if (resizeDebounceTimer) {
+ clearTimeout(resizeDebounceTimer);
+ }
- const tid = untrack(() => {
- if (requestOptions.pagination && (limit !== lastFetchedLimit || (currentLimit !== undefined && currentLimit !== limit))) {
- return setTimeout(() => {
- untrack(() => {
- lastFetchedLimit = limit;
- if (requestOptions.pagination) {
- requestOptions.pagination.limit = limit;
- containerService.getContainers(requestOptions).then((result) => {
- untrack(() => {
- containers = result;
- });
- });
- }
- });
- }, 300);
+ resizeDebounceTimer = setTimeout(async () => {
+ try {
+ lastFetchedLimit = limit;
+ requestOptions = {
+ ...requestOptions,
+ pagination: {
+ page: pagination.page ?? 1,
+ limit
+ }
+ };
+ containers = await containerService.getContainers(requestOptions);
+ void handleLayoutChange(lastMeasuredHeight);
+ } catch (error) {
+ console.error('Failed to sync container limit:', error);
+ } finally {
+ resizeDebounceTimer = null;
}
- });
+ }, 300);
+ }
- if (tid) return () => clearTimeout(tid);
- });
+ async function handleLayoutChange(height: number) {
+ lastMeasuredHeight = height;
+ const nextLimit = calculateLimitForHeight(height);
+ await syncLimit(nextLimit);
+ }
+
+ async function refreshContainers(options: SearchPaginationSortRequest) {
+ requestOptions = options;
+ const result = await containerService.getContainers(options);
+ containers = result;
+ await handleLayoutChange(lastMeasuredHeight);
+ return result;
+ }
const columns = [
{ accessorKey: 'names', title: m.common_name(), cell: NameCell },
@@ -149,7 +174,7 @@
/>
{/snippet}
-<div class="flex h-full min-h-0 flex-col" bind:clientHeight={contentHeight}>
+<div class="flex h-full min-h-0 flex-col" bind:clientHeight={() => lastMeasuredHeight, (value) => void handleLayoutChange(value)}>
<Card.Root class="flex h-full min-h-0 flex-col">
<Card.Header icon={ContainersIcon} class="shrink-0">
<div class="flex flex-1 items-center justify-between">
@@ -167,10 +192,10 @@
</Card.Header>
<Card.Content class="flex min-h-0 flex-1 flex-col px-0">
<ArcaneTable
- items={{ ...containers, data: containers.data.slice(0, calculatedLimit) }}
+ items={{ ...containers, data: containers.data.slice(0, displayLimit) }}
bind:requestOptions
bind:selectedIds
- onRefresh={async (options) => (containers = await containerService.getContainers(options))}
+ onRefresh={refreshContainers}
{columns}
mobileCard={DashContainerMobileCard}
withoutSearch
@@ -179,10 +204,10 @@
unstyled
/>
</Card.Content>
- {#if containers.data.length >= calculatedLimit && containers.pagination.totalItems > calculatedLimit}
+ {#if containers.data.length >= displayLimit && containers.pagination.totalItems > displayLimit}
<Card.Footer class="border-t px-6 py-3">
<span class="text-muted-foreground text-xs">
- {m.containers_showing_of_total({ shown: calculatedLimit, total: containers.pagination.totalItems })}
+ {m.containers_showing_of_total({ shown: displayLimit, total: containers.pagination.totalItems })}
</span>
</Card.Footer>
{/if}
diff --git a/frontend/src/routes/(app)/dashboard/dash-image-table.svelte b/frontend/src/routes/(app)/dashboard/dash-image-table.svelte
index 523fc0016..2d9aa6ca0 100644
--- a/frontend/src/routes/(app)/dashboard/dash-image-table.svelte
+++ b/frontend/src/routes/(app)/dashboard/dash-image-table.svelte
@@ -11,7 +11,6 @@
import { m } from '$lib/paraglide/messages';
import { imageService } from '$lib/services/image-service';
import { goto } from '$app/navigation';
- import { untrack } from 'svelte';
import { IsMobile } from '$lib/hooks';
import { ImagesIcon, ArrowRightIcon } from '$lib/icons';
@@ -24,7 +23,9 @@
} = $props();
const isMobile = new IsMobile();
- let contentHeight = $state(0);
+ let displayLimit = $state(images.pagination?.itemsPerPage ?? 5);
+ let resizeDebounceTimer: ReturnType<typeof setTimeout> | null = null;
+ let lastMeasuredHeight = $state(0);
// Estimate row height: ~57px per row (including borders/padding), plus ~145px for header
const ROW_HEIGHT = 57;
@@ -38,51 +39,75 @@
sort: { column: 'size', direction: 'desc' }
});
- const shouldReserveFooter = $derived.by(() => {
- const limit = requestOptions.pagination?.limit ?? images.pagination?.itemsPerPage ?? MIN_ROWS;
- const dataLength = images.data?.length ?? 0;
+ function shouldReserveFooter(limit: number) {
const totalItems = images.pagination?.totalItems ?? 0;
- return dataLength >= limit && totalItems > limit;
- });
+ return totalItems > limit;
+ }
- const calculatedLimit = $derived.by(() => {
+ function calculateLimitForHeight(height: number) {
if (isMobile.current) return 10;
- if (contentHeight <= 0) return 5;
- let availableHeight = contentHeight - HEADER_HEIGHT;
- if (shouldReserveFooter) {
+ if (height <= 0) return 5;
+
+ let availableHeight = height - HEADER_HEIGHT;
+ const initialRows = Math.floor(Math.max(0, availableHeight) / ROW_HEIGHT);
+ const footerLimit = Math.max(MIN_ROWS, Math.min(MAX_ROWS, initialRows));
+ if (shouldReserveFooter(footerLimit)) {
availableHeight -= FOOTER_HEIGHT;
}
+
const rows = Math.floor(Math.max(0, availableHeight) / ROW_HEIGHT);
return Math.max(MIN_ROWS, Math.min(MAX_ROWS, rows));
- });
+ }
let selectedIds = $state<string[]>([]);
- let lastFetchedLimit = $state(5);
+ let lastFetchedLimit = $state(images.pagination?.itemsPerPage ?? 5);
+
+ async function syncLimit(limit: number) {
+ displayLimit = limit;
- $effect(() => {
- const limit = calculatedLimit;
+ const pagination = requestOptions.pagination;
const currentLimit = images.pagination?.itemsPerPage;
+ if (!pagination || (limit === lastFetchedLimit && (currentLimit === undefined || currentLimit === limit))) {
+ return;
+ }
- const tid = untrack(() => {
- if (requestOptions.pagination && (limit !== lastFetchedLimit || (currentLimit !== undefined && currentLimit !== limit))) {
- return setTimeout(() => {
- untrack(() => {
- lastFetchedLimit = limit;
- if (requestOptions.pagination) {
- requestOptions.pagination.limit = limit;
- imageService.getImages(requestOptions).then((result) => {
- untrack(() => {
- images = result;
- });
- });
- }
- });
- }, 300);
- }
- });
+ if (resizeDebounceTimer) {
+ clearTimeout(resizeDebounceTimer);
+ }
- if (tid) return () => clearTimeout(tid);
- });
+ resizeDebounceTimer = setTimeout(async () => {
+ try {
+ lastFetchedLimit = limit;
+ requestOptions = {
+ ...requestOptions,
+ pagination: {
+ page: pagination.page ?? 1,
+ limit
+ }
+ };
+ images = await imageService.getImages(requestOptions);
+ void handleLayoutChange(lastMeasuredHeight);
+ } catch (error) {
+ console.error('Failed to sync image limit:', error);
+ } finally {
+ resizeDebounceTimer = null;
+ }
+ }, 300);
+ }
+
+ async function handleLayoutChange(height: number) {
+ lastMeasuredHeight = height;
+ const nextLimit = calculateLimitForHeight(height);
+ await syncLimit(nextLimit);
+ }
+
+ async function refreshImages(options: SearchPaginationSortRequest) {
+ requestOptions = options;
+ const result = await imageService.getImages(options);
+ images = result;
+ await handleLayoutChange(lastMeasuredHeight);
+ return result;
+ }
const columns = [
{ accessorKey: 'repoTags', title: m.images_repository(), cell: NameCell },
@@ -154,7 +179,7 @@
/>
{/snippet}
-<div class="flex h-full min-h-0 flex-col" bind:clientHeight={contentHeight}>
+<div class="flex h-full min-h-0 flex-col" bind:clientHeight={() => lastMeasuredHeight, (value) => void handleLayoutChange(value)}>
<Card.Root class="flex h-full min-h-0 flex-col">
<Card.Header icon={ImagesIcon} class="shrink-0">
<div class="flex flex-1 items-center justify-between">
@@ -172,10 +197,10 @@
</Card.Header>
<Card.Content class="flex min-h-0 flex-1 flex-col px-0">
<ArcaneTable
- items={{ ...images, data: images.data.slice(0, calculatedLimit) }}
+ items={{ ...images, data: images.data.slice(0, displayLimit) }}
bind:requestOptions
bind:selectedIds
- onRefresh={async (options) => (images = await imageService.getImages(options))}
+ onRefresh={refreshImages}
{columns}
mobileCard={DashImageMobileCard}
withoutSearch
@@ -184,10 +209,10 @@
unstyled
/>
</Card.Content>
- {#if images.data.length >= calculatedLimit && images.pagination.totalItems > calculatedLimit}
+ {#if images.data.length >= displayLimit && images.pagination.totalItems > displayLimit}
<Card.Footer class="border-t px-6 py-3">
<span class="text-muted-foreground text-xs">
- {m.images_showing_of_total({ shown: calculatedLimit, total: images.pagination.totalItems })}
+ {m.images_showing_of_total({ shown: displayLimit, total: images.pagination.totalItems })}
</span>
</Card.Footer>
{/if}
diff --git a/frontend/src/routes/(app)/dashboard/dash-metric-tile.svelte b/frontend/src/routes/(app)/dashboard/dash-metric-tile.svelte
index 6d5f88005..90a78f913 100644
--- a/frontend/src/routes/(app)/dashboard/dash-metric-tile.svelte
+++ b/frontend/src/routes/(app)/dashboard/dash-metric-tile.svelte
@@ -42,7 +42,7 @@
<div class="mt-2.5">
<div class="bg-muted/45 relative h-1.5 overflow-hidden rounded-full">
<div class="pointer-events-none absolute inset-0">
- {#each [25, 50, 75] as tick}
+ {#each [25, 50, 75] as tick (tick)}
<span class="bg-foreground/15 absolute top-0 h-full w-px opacity-60" style={`left: ${tick}%`}></span>
{/each}
</div>
diff --git a/frontend/src/routes/(app)/projects/new/+page.svelte b/frontend/src/routes/(app)/projects/new/+page.svelte
index 8ac20e59d..93335a71a 100644
--- a/frontend/src/routes/(app)/projects/new/+page.svelte
+++ b/frontend/src/routes/(app)/projects/new/+page.svelte
@@ -44,17 +44,15 @@
envContent: z.string().optional().default('')
});
- const initialName = $derived(
- data.selectedTemplate ? data.selectedTemplate.name.toLowerCase().replace(/[^a-z0-9-_]/g, '-') : ''
- );
-
- let formData = $derived({
- name: initialName,
+ // Initial form values intentionally come from the page load data once.
+ // svelte-ignore state_referenced_locally
+ const formData = {
+ name: data.selectedTemplate ? data.selectedTemplate.name.toLowerCase().replace(/[^a-z0-9-_]/g, '-') : '',
composeContent: data.defaultTemplate || '',
envContent: data.envTemplate || ''
- });
+ };
- let { inputs, ...form } = $derived(createForm<typeof formSchema>(formSchema, formData));
+ const { inputs, ...form } = createForm<typeof formSchema>(formSchema, formData);
let dockerRunCommand = $state('');
let composeOpen = $state(true);
@@ -393,7 +391,7 @@
<div class="space-y-2">
<Label class="text-muted-foreground text-xs">{m.compose_example_commands_label()}</Label>
<div class="space-y-1">
- {#each exampleCommands as command}
+ {#each exampleCommands as command (command)}
<ArcaneButton
action="base"
tone="ghost"
diff --git a/frontend/src/routes/(app)/settings/+page.svelte b/frontend/src/routes/(app)/settings/+page.svelte
index c5f4fcb2b..5c8f0ceea 100644
--- a/frontend/src/routes/(app)/settings/+page.svelte
+++ b/frontend/src/routes/(app)/settings/+page.svelte
@@ -193,7 +193,7 @@
<Icon class="size-5 sm:size-6" />
</div>
<div class="min-w-0 flex-1">
- <h3 class="text-sm leading-tight font-semibold sm:text-base">{category.title}</h3>
+ <h2 class="text-sm leading-tight font-semibold sm:text-base">{category.title}</h2>
<p class="text-muted-foreground mt-1 text-xs leading-relaxed sm:text-sm">{category.description}</p>
</div>
</div>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 79885437a..1b92e41b4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -183,6 +183,9 @@ importers:
'@types/node':
specifier: ^25.5.0
version: 25.5.0
+ '@typescript/native-preview':
+ specifier: 7.0.0-dev.20260322.1
+ version: 7.0.0-dev.20260322.1
bits-ui:
specifier: ^2.16.3
@@ -210,6 +213,9 @@ importers:
svelte-check:
specifier: ^4.4.5
+ svelte-check-rs:
+ specifier: ^0.9.6
+ version: 0.9.6(@typescript/[email protected])
svelte-sonner:
specifier: ^1.1.0
version: 1.1.0([email protected])
@@ -2168,6 +2174,31 @@ packages:
'@standard-schema/[email protected]':
resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
+ '@svelte-check-rs/[email protected]':
+ resolution: {integrity: sha512-4AVLixWDx7fHNjW3uiWQYzeQQeQRko5nkfhbSLc2bppUTdaYv++THgDvjQ4iNJpAgQ/vafQlWTeolw/QPrSWKA==}
+ cpu: [arm64]
+ os: [darwin]
+
+ '@svelte-check-rs/[email protected]':
+ resolution: {integrity: sha512-7qBWdwpN6DE2fP97O+z8OngPT4sHlDT+nBBtQPWQBzX8SgY6adw5mWDBVOShoWbYJBnr9JVCrKKwMHVzAAe4VA==}
+ cpu: [x64]
+ os: [darwin]
+
+ '@svelte-check-rs/[email protected]':
+ resolution: {integrity: sha512-EfLihcufyCrv0Ed0obHGw0xdi+AJEeT8/HZiZmfsCx6FfR0plgWRGwZZ6L2q/MUgS9nONNGx5k0OWvDmYAbyLA==}
+ cpu: [arm64]
+ os: [linux]
+
+ '@svelte-check-rs/[email protected]':
+ resolution: {integrity: sha512-gALw08cKgRBDWlf78SlzmSa7P+HGCyJfm12RFJOJzUrR3ufsex6lVQ+8Z9HE4yeCz73k+8ndO3DZnTIkLnwTGg==}
+ cpu: [x64]
+ os: [linux]
+
+ '@svelte-check-rs/[email protected]':
+ resolution: {integrity: sha512-yQWPx5rtUlgIliQzlCPBCtBFxI5DXzI0TVXw4ap5la3vDPS8vjMNaBRnuFbABaZQkulg7s7Ey/I5taLwqeb6mg==}
+ cpu: [x64]
+ os: [win32]
+
'@sveltejs/[email protected]':
resolution: {integrity: sha512-lVJX6qEgs/4DOcRTpo56tmKzVPtoWAaVbL4hfO7t7NVwl9AAXzQR6cihesW1BmNMPl+bK6dreu2sOKBP2Q9CIA==}
peerDependencies:
@@ -2432,6 +2463,45 @@ packages:
resolution: {integrity: sha512-zm6xx8UT/Xy2oSr2ZXD0pZo7Jx2XsCoID2IUh9YSTFRu7z+WdwYTRk6LhUftm1crwqbuoF6I8zAFeCMw0YjwDg==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ '@typescript/[email protected]':
+ resolution: {integrity: sha512-5wSilxwLGX5fMKJgsUkCBwOfW9GMG3WF5j77CVBOdFI7miFaR3JQaPzTA+uyHDMNIIeSDo1KtV77GT48Y/d0Xg==}
+ cpu: [arm64]
+ os: [darwin]
+
+ '@typescript/[email protected]':
+ resolution: {integrity: sha512-G806SrfxkYNAgZ9Xk53+OvbmIg9iD5hjaiD2QhDQL2aZjzy10D4MhcdaZEOoMfw0OI/PoJPYOiPD+9/x2kw3Lg==}
+ cpu: [x64]
+ os: [darwin]
+
+ '@typescript/[email protected]':
+ resolution: {integrity: sha512-+FyomEEt3K8TBO//n3Ijr61SDM2F7cxZCVqGt+Wk3rLcOCQ2i+8+p64gdsZCmImy3CyP0hBnxPydEbyNkZLtvg==}
+ cpu: [arm64]
+ os: [linux]
+
+ '@typescript/[email protected]':
+ resolution: {integrity: sha512-0a12pp19ELiNHMqTglfQQQNMsxvtzpjAa4qf12oMJoGyy+UnguKEmaaaCHdp75KvBXGDzlssfDAdiy+NirN19A==}
+ cpu: [arm]
+ os: [linux]
+
+ '@typescript/[email protected]':
+ resolution: {integrity: sha512-MviQe5x4WqQGv/Vhu4hcv2A0qTW/BTaZPbOLYCtvhuovNFO6D++ZmJAbHvA0h/bJEaNTgxKZdZPHMpCfSEKfjA==}
+ cpu: [x64]
+ os: [linux]
+
+ '@typescript/[email protected]':
+ resolution: {integrity: sha512-ibnMaXDJPSgMXKC61NHiFlww/xjAEINgc1mcn2ntTfuGHwduU4P9Bi038TxXg95Wmu3v6xIPIorXXsBOdE+p3Q==}
+ cpu: [arm64]
+ os: [win32]
+
+ '@typescript/[email protected]':
+ resolution: {integrity: sha512-O+r1RToWBbGkK7NXC7DpraLObSWyxvSqRiSfr/BlZ351Cdq1q3121zCGzVtqERGeRtVoEMRrzS5ITOd6On/pCw==}
+ cpu: [x64]
+ os: [win32]
+
+ '@typescript/[email protected]':
+ resolution: {integrity: sha512-CmzQTKvesYHmz3g92G+XPDis25ocvHqa/gK8m98w+bML99KJLEWQKVlvkLrYA85JiJEK+XBIiz+6lCgUqRkWXA==}
+ hasBin: true
+
resolution: {integrity: sha512-U6ZSO9A+nsN8zvNddtwhxxpi33J9okb4Li9HdhAItApKjYM22IgC8XSpGfs+ABGfsp1u6NhDSfBR9vAh3oTWXg==}
peerDependencies:
@@ -3980,6 +4050,12 @@ packages:
resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
engines: {node: '>=8'}
+ resolution: {integrity: sha512-P7/o0XxgWEeLh5LjiN2rp5+DPolO/2NeRT/O4nx51bm/UdPUrB1LkvnTuL0YyT5OkYYZrCJnUvFQ0HXpu7q6fw==}
+ hasBin: true
+ peerDependencies:
+ '@typescript/native-preview': '>=7.0.0-dev.0'
+
resolution: {integrity: sha512-1bSwIRCvvmSHrlK52fOlZmVtUZgil43jNL/2H18pRpa+eQjzGt6e3zayxhp1S7GajPFKNM/2PMCG+DZFHlG9fw==}
engines: {node: '>= 18.0.0'}
@@ -5685,6 +5761,21 @@ snapshots:
'@standard-schema/[email protected]': {}
+ '@svelte-check-rs/[email protected]':
+ optional: true
+
+ '@svelte-check-rs/[email protected]':
+ optional: true
+
+ '@svelte-check-rs/[email protected]':
+ optional: true
+
+ '@svelte-check-rs/[email protected]':
+ optional: true
+
+ '@svelte-check-rs/[email protected]':
+ optional: true
+
dependencies:
acorn: 8.16.0
@@ -5937,6 +6028,37 @@ snapshots:
'@typescript-eslint/types': 8.57.0
eslint-visitor-keys: 5.0.1
+ '@typescript/[email protected]':
+ optional: true
+
+ '@typescript/[email protected]':
+ optional: true
+
+ '@typescript/[email protected]':
+ optional: true
+
+ '@typescript/[email protected]':
+ optional: true
+
+ '@typescript/[email protected]':
+ optional: true
+
+ '@typescript/[email protected]':
+ optional: true
+
+ '@typescript/[email protected]':
+ optional: true
+
+ '@typescript/[email protected]':
+ optionalDependencies:
+ '@typescript/native-preview-darwin-arm64': 7.0.0-dev.20260322.1
+ '@typescript/native-preview-darwin-x64': 7.0.0-dev.20260322.1
+ '@typescript/native-preview-linux-arm': 7.0.0-dev.20260322.1
+ '@typescript/native-preview-linux-arm64': 7.0.0-dev.20260322.1
+ '@typescript/native-preview-linux-x64': 7.0.0-dev.20260322.1
+ '@typescript/native-preview-win32-arm64': 7.0.0-dev.20260322.1
+ '@typescript/native-preview-win32-x64': 7.0.0-dev.20260322.1
+
'@uiw/[email protected](@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])':
dependencies:
'@codemirror/language': 6.12.2
@@ -7650,6 +7772,16 @@ snapshots:
dependencies:
has-flag: 4.0.0
+ dependencies:
+ '@typescript/native-preview': 7.0.0-dev.20260322.1
+ optionalDependencies:
+ '@svelte-check-rs/darwin-arm64': 0.9.6
+ '@svelte-check-rs/darwin-x64': 0.9.6
+ '@svelte-check-rs/linux-arm64': 0.9.6
+ '@svelte-check-rs/linux-x64': 0.9.6
+ '@svelte-check-rs/win32-x64': 0.9.6
+
dependencies:
'@jridgewell/trace-mapping': 0.3.31