Skip to content

Modern Docker Management, Designed for Everyone

refactor: cleanup environments pages (#3001)

Kyle Mendell78a7de3ef35f
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 0275766e8..d93dc1e44 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -1261,7 +1261,6 @@
"environments_created_success": "Environment created successfully",
"environments_delete_message": "Are you sure you want to delete environment {name}?",
"environments_delete_failed": "Failed to delete environment {name}",
- "environments_overview_title": "Environment Overview",
"environments_environment_id_label": "Environment ID",
"environments_name_placeholder": "My Lab Server",
"environments_name_too_long": "Name too long (max 25 characters)",
@@ -1271,7 +1270,6 @@
"environments_create_failed": "Failed to create environment",
"environments_unsaved_changes": "Unsaved changes",
"environments_all_changes_saved": "All changes saved",
- "environments_basic_info_description": "Basic environment information and settings",
"environments_enable_disable_description": "Enable or disable this environment",
"environments_local_badge": "Local",
"environments_edge_http_label": "HTTP",
diff --git a/frontend/src/routes/(app)/environments/[id]/+page.svelte b/frontend/src/routes/(app)/environments/[id]/+page.svelte
index 75d06cc9e..cf0b83290 100644
--- a/frontend/src/routes/(app)/environments/[id]/+page.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/+page.svelte
@@ -22,7 +22,7 @@
import { isEnvironmentOnline, resolveEnvironmentStatus } from '$lib/utils/docker';
import MobileFloatingFormActions from '$lib/components/form/mobile-floating-form-actions.svelte';
import { createSettingsForm } from '$lib/utils/settings-form';
- import DetailsTab from './components/DetailsTab.svelte';
+ import EnvironmentStatusSummary from './components/EnvironmentStatusSummary.svelte';
import GeneralTab from './components/GeneralTab.svelte';
import DockerTab from './components/DockerTab.svelte';
import JobsTab from './components/JobsTab.svelte';
@@ -30,7 +30,6 @@
import TrivySecuritySettings from '$lib/components/settings/trivy-security-settings.svelte';
import {
ArrowLeftIcon,
- EnvironmentsIcon,
AlertIcon,
DownloadIcon,
RefreshIcon,
@@ -52,7 +51,7 @@
let currentEnvironment = $derived(environmentStore.selected);
- let activeTab = $state('details');
+ let activeTab = $state('general');
let isRefreshing = $state(false);
let isTestingConnection = $state(false);
@@ -138,19 +137,14 @@
const tabItems = $derived.by((): TabItem[] => {
const items: TabItem[] = [
{
- value: 'details',
- label: m.environments_overview_title(),
- icon: EnvironmentsIcon
+ value: 'general',
+ label: m.general_title(),
+ icon: SettingsIcon
}
];
if (showSettingsTabs) {
items.push(
- {
- value: 'general',
- label: m.general_title(),
- icon: SettingsIcon
- },
{
value: 'docker',
label: m.environments_docker_settings_title(),
@@ -182,7 +176,7 @@
$effect(() => {
if (!tabValues.has(activeTab)) {
- activeTab = 'details';
+ activeTab = 'general';
}
});
@@ -566,6 +560,14 @@
</div>
</div>
+ <EnvironmentStatusSummary
+ environment={runtimeEnvironment}
+ {currentStatus}
+ {isLoadingVersion}
+ {remoteVersion}
+ {versionInformation}
+ />
+
{#if headerActions.length > 0}
<ActionButtonGroup buttons={headerActions} class="justify-end" />
{/if}
@@ -633,24 +635,18 @@
<TabBar items={tabItems} value={activeTab} onValueChange={handleTabChange} />
</div>
- <Tabs.Content value="details">
- <DetailsTab
- environment={runtimeEnvironment}
+ <Tabs.Content value="general">
+ <GeneralTab
{formInputs}
+ environment={runtimeEnvironment}
{currentStatus}
- {isLoadingVersion}
- {remoteVersion}
- {versionInformation}
{isTestingConnection}
{testConnection}
+ settingsAvailable={showSettingsTabs}
/>
</Tabs.Content>
{#if showSettingsTabs}
- <Tabs.Content value="general">
- <GeneralTab {formInputs} />
- </Tabs.Content>
-
<Tabs.Content value="docker">
<DockerTab {formInputs} {shellSelectValue} {handleShellSelectChange} {shellOptions} />
</Tabs.Content>
diff --git a/frontend/src/routes/(app)/environments/[id]/components/DetailsTab.svelte b/frontend/src/routes/(app)/environments/[id]/components/DetailsTab.svelte
deleted file mode 100644
index 11af5cfca..000000000
--- a/frontend/src/routes/(app)/environments/[id]/components/DetailsTab.svelte
+++ /dev/null
@@ -1,345 +0,0 @@
-<script lang="ts">
- import { format } from 'date-fns';
- import * as Card from '$lib/components/ui/card/index.js';
- import Label from '$lib/components/ui/label/label.svelte';
- import { Input } from '$lib/components/ui/input/index.js';
- import { Badge } from '$lib/components/ui/badge/index.js';
- import { ArcaneButton } from '$lib/components/arcane-button/index.js';
- import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
- import { Spinner } from '$lib/components/ui/spinner/index.js';
- import { m } from '$lib/paraglide/messages';
- import { EnvironmentsIcon, TestIcon } from '$lib/icons';
- import type { DetailsTabProps } from './tab-props';
-
- let {
- environment,
- formInputs,
- currentStatus,
- isLoadingVersion,
- remoteVersion,
- versionInformation,
- isTestingConnection,
- testConnection
- }: DetailsTabProps = $props();
-
- let transportBadge = $derived.by((): { text: string; variant: 'blue' | 'purple' | 'gray' } => {
- if (!environment.isEdge) {
- return { text: 'HTTP', variant: 'gray' };
- }
-
- // Prefer the live tunnel transport; fall back to the last one used so
- // disconnected or poll-only agents still show what they connect with.
- const transport = (environment.connected ? environment.edgeTransport : undefined) ?? environment.lastEdgeTransport;
- if (!transport) {
- return { text: 'Edge', variant: 'gray' };
- }
-
- if (transport === 'websocket') {
- return { text: 'WebSocket', variant: 'purple' };
- }
-
- return { text: 'gRPC', variant: 'blue' };
- });
-
- let controlPlaneBadge = $derived.by((): { text: string; variant: 'blue' | 'green' | 'gray' } | null => {
- if (!environment.isEdge || !environment.lastPollAt) {
- return null;
- }
-
- if (environment.connected) {
- return { text: m.environments_edge_polling_active(), variant: 'green' };
- }
-
- if (currentStatus === 'standby') {
- return { text: m.environments_edge_polling_standby(), variant: 'blue' };
- }
-
- return { text: m.environments_edge_polling_inactive(), variant: 'gray' };
- });
-
- let localDisplayVersion = $derived(
- versionInformation?.displayVersion || versionInformation?.currentTag || versionInformation?.currentVersion || 'Unknown'
- );
-
- let remoteDisplayVersion = $derived(
- remoteVersion?.displayVersion || remoteVersion?.currentTag || remoteVersion?.currentVersion || ''
- );
-
- let statusBadge = $derived.by((): { text: string; variant: 'green' | 'blue' | 'amber' | 'red' } => {
- switch (currentStatus) {
- case 'online':
- return { text: m.common_online(), variant: 'green' };
- case 'standby':
- return { text: m.common_standby(), variant: 'blue' };
- case 'pending':
- return { text: m.common_pending(), variant: 'amber' };
- case 'error':
- return { text: m.common_error(), variant: 'red' };
- default:
- return { text: m.common_offline(), variant: 'red' };
- }
- });
-
- let mtlsCertificateBadge = $derived.by((): { text: string; variant: 'green' | 'amber' | 'red' } | null => {
- const cert = environment.edgeMTLSCertificate;
- if (!cert) return null;
- if (cert.expired) {
- return { text: m.environments_edge_mtls_certificate_status_expired(), variant: 'red' };
- }
- if (cert.expiringSoon) {
- return { text: m.environments_edge_mtls_certificate_status_expiring_soon(), variant: 'amber' };
- }
- return { text: m.environments_edge_mtls_certificate_status_valid(), variant: 'green' };
- });
-
- let tunnelBadge = $derived.by((): { text: string; variant: 'green' | 'blue' | 'gray' | 'amber' | 'red' } => {
- if (!environment.isEdge) {
- return statusBadge;
- }
- if (environment.connected) {
- return { text: m.environments_edge_tunnel_transmitting(), variant: 'green' };
- }
- if (currentStatus === 'standby') {
- return { text: m.environments_edge_tunnel_dormant(), variant: 'gray' };
- }
- if (currentStatus === 'pending') {
- return { text: m.environments_edge_tunnel_negotiating(), variant: 'amber' };
- }
- return { text: m.environments_edge_tunnel_disconnected(), variant: 'red' };
- });
-
- let tunnelTypeBadge = $derived.by((): { text: string; variant: 'blue' | 'purple' | 'gray' } | null => {
- if (!environment.isEdge || !environment.lastPollAt) {
- return null;
- }
-
- if (environment.edgeTransport === 'websocket') {
- return { text: 'WebSocket', variant: 'purple' };
- }
-
- if (environment.edgeTransport === 'grpc') {
- return { text: 'gRPC', variant: 'blue' };
- }
-
- return { text: m.environments_edge_tunnel_type_inactive(), variant: 'gray' };
- });
-
- function formatDateTime(value?: string): string {
- if (!value) return m.common_never();
-
- const date = new Date(value);
- if (Number.isNaN(date.getTime())) {
- return m.common_unknown();
- }
-
- return format(date, 'PP p');
- }
-</script>
-
-<Card.Root class="flex flex-col">
- <Card.Header icon={EnvironmentsIcon}>
- <div class="flex flex-col space-y-1.5">
- <Card.Title>
- <h2>{m.environments_overview_title()}</h2>
- </Card.Title>
- <Card.Description>{m.environments_basic_info_description()}</Card.Description>
- </div>
- </Card.Header>
- <Card.Content class="space-y-4 p-4">
- <div>
- <Label for="env-name" class="text-sm font-medium">{m.common_name()}</Label>
- <Input
- id="env-name"
- type="text"
- bind:value={$formInputs.name.value}
- class="mt-1.5 w-full {$formInputs.name.error ? 'border-destructive' : ''}"
- placeholder={m.environments_name_placeholder()}
- />
- {#if $formInputs.name.error}
- <p class="text-destructive mt-1 text-[0.8rem] font-medium">{$formInputs.name.error}</p>
- {/if}
- </div>
-
- <div>
- <Label for="api-url" class="text-sm font-medium">{m.environments_api_url()}</Label>
- <div class="mt-1.5 flex items-center gap-2">
- {#if environment.id === '0'}
- <ArcaneTooltip.Root>
- <ArcaneTooltip.Trigger class="w-full">
- <Input
- id="api-url"
- type="url"
- bind:value={$formInputs.apiUrl.value}
- class="w-full font-mono"
- placeholder={m.environments_api_url_placeholder()}
- disabled={true}
- required
- />
- </ArcaneTooltip.Trigger>
- <ArcaneTooltip.Content>
- <p>{m.environments_local_setting_disabled()}</p>
- </ArcaneTooltip.Content>
- </ArcaneTooltip.Root>
- {:else}
- <Input
- id="api-url"
- type="url"
- bind:value={$formInputs.apiUrl.value}
- class="w-full font-mono"
- placeholder={m.environments_api_url_placeholder()}
- required
- />
- {/if}
- <ArcaneButton
- action="base"
- onclick={testConnection}
- disabled={isTestingConnection}
- loading={isTestingConnection}
- icon={TestIcon}
- customLabel={m.environments_test_connection()}
- loadingLabel={m.environments_testing_connection()}
- class="shrink-0"
- />
- </div>
- <p class="text-muted-foreground mt-1.5 text-xs">{m.environments_api_url_help()}</p>
- </div>
-
- <div class="grid grid-cols-2 gap-4 rounded-lg border p-4">
- <div>
- <Label class="text-muted-foreground text-xs font-medium">{m.environments_environment_id_label()}</Label>
- <div class="mt-1 font-mono text-sm">{environment.id}</div>
- </div>
- <div>
- <Label class="text-muted-foreground text-xs font-medium">{m.common_status()}</Label>
- <div class="mt-1">
- <StatusBadge text={statusBadge.text} variant={statusBadge.variant} />
- </div>
- </div>
- <div>
- <Label class="text-muted-foreground text-xs font-medium">{m.common_type()}</Label>
- <div class="mt-1">
- <StatusBadge text={transportBadge.text} variant={transportBadge.variant} />
- </div>
- </div>
- {#if environment.isEdge}
- {#if controlPlaneBadge}
- <div>
- <Label class="text-muted-foreground text-xs font-medium">{m.environments_edge_control_plane_label()}</Label>
- <div class="mt-1">
- <StatusBadge text={controlPlaneBadge.text} variant={controlPlaneBadge.variant} />
- </div>
- </div>
- <div>
- <Label class="text-muted-foreground text-xs font-medium">{m.environments_edge_last_poll_label()}</Label>
- <div class="mt-1 font-mono text-sm">{formatDateTime(environment.lastPollAt)}</div>
- </div>
- {/if}
- <div>
- <Label class="text-muted-foreground text-xs font-medium">{m.environments_edge_live_tunnel_label()}</Label>
- <div class="mt-1">
- <StatusBadge text={tunnelBadge.text} variant={tunnelBadge.variant} />
- </div>
- </div>
- {#if tunnelTypeBadge}
- <div>
- <Label class="text-muted-foreground text-xs font-medium">{m.environments_edge_tunnel_type_label()}</Label>
- <div class="mt-1">
- <StatusBadge text={tunnelTypeBadge.text} variant={tunnelTypeBadge.variant} />
- </div>
- </div>
- {/if}
- <div>
- <Label class="text-muted-foreground text-xs font-medium">{m.environments_edge_connected_since_label()}</Label>
- <div class="mt-1 font-mono text-sm">{formatDateTime(environment.connectedAt)}</div>
- </div>
- <div>
- <Label class="text-muted-foreground text-xs font-medium">{m.environments_edge_last_heartbeat_label()}</Label>
- <div class="mt-1 font-mono text-sm">{formatDateTime(environment.lastHeartbeat)}</div>
- </div>
- {/if}
- <div class="col-span-2 border-t pt-4">
- <Label class="text-muted-foreground text-xs font-medium">{m.version_info_version()}</Label>
- <div class="mt-1 flex items-center gap-2">
- {#if environment.id === '0'}
- <span class="font-mono text-sm">{localDisplayVersion}</span>
- {#if versionInformation?.updateAvailable}
- <Badge variant="secondary" class="bg-amber-500/10 text-amber-600 hover:bg-amber-500/20 dark:text-amber-400">
- {m.sidebar_update_available()}: {versionInformation.newestVersion}
- </Badge>
- {/if}
- {:else if isLoadingVersion}
- <Spinner />
- <span class="text-muted-foreground text-sm">{m.common_action_checking()}</span>
- {:else if remoteVersion}
- <span class="font-mono text-sm">{remoteDisplayVersion}</span>
- {#if remoteVersion.updateAvailable}
- <Badge variant="secondary" class="bg-amber-500/10 text-amber-600 hover:bg-amber-500/20 dark:text-amber-400">
- {m.sidebar_update_available()}: {remoteVersion.newestVersion}
- </Badge>
- {#if remoteVersion.releaseUrl}
- <a
- href={remoteVersion.releaseUrl}
- target="_blank"
- rel="noopener noreferrer"
- class="text-xs text-blue-500 hover:underline"
- >
- {m.version_info_view_release()}
- </a>
- {/if}
- {/if}
- {:else if currentStatus === 'online' || currentStatus === 'standby'}
- <span class="text-muted-foreground text-sm">{m.environments_version_unavailable()}</span>
- {:else}
- <span class="text-muted-foreground text-sm">{m.common_offline()}</span>
- {/if}
- </div>
- </div>
- </div>
-
- {#if mtlsCertificateBadge && environment.edgeMTLSCertificate}
- <div class="space-y-3 rounded-lg border p-4">
- <div class="space-y-1">
- <h3 class="text-sm font-medium">{m.environments_agent_mtls_section_title()}</h3>
- <p class="text-muted-foreground text-xs">{m.environments_agent_mtls_description()}</p>
- </div>
-
- <div class="grid grid-cols-1 gap-4 sm:grid-cols-2">
- <div>
- <Label class="text-muted-foreground text-xs font-medium">
- {m.environments_edge_mtls_certificate_status_label()}
- </Label>
- <div class="mt-1">
- <StatusBadge text={mtlsCertificateBadge.text} variant={mtlsCertificateBadge.variant} />
- </div>
- </div>
- <div>
- <Label class="text-muted-foreground text-xs font-medium">
- {m.environments_edge_mtls_certificate_expires_label()}
- </Label>
- <div class="mt-1 space-y-1">
- <div class="font-mono text-sm">
- {environment.edgeMTLSCertificate.expiresAt ? formatDateTime(environment.edgeMTLSCertificate.expiresAt) : '—'}
- </div>
- {#if environment.edgeMTLSCertificate.daysRemaining !== undefined}
- <div class="text-muted-foreground text-xs">
- {m.environments_edge_mtls_certificate_days_remaining({
- count: environment.edgeMTLSCertificate.daysRemaining
- })}
- </div>
- {/if}
- </div>
- </div>
- {#if environment.edgeMTLSCertificate.commonName}
- <div class="sm:col-span-2">
- <Label class="text-muted-foreground text-xs font-medium">
- {m.environments_edge_mtls_certificate_common_name_label()}
- </Label>
- <div class="mt-1 font-mono text-sm">{environment.edgeMTLSCertificate.commonName}</div>
- </div>
- {/if}
- </div>
- </div>
- {/if}
- </Card.Content>
-</Card.Root>
diff --git a/frontend/src/routes/(app)/environments/[id]/components/DockerTab.svelte b/frontend/src/routes/(app)/environments/[id]/components/DockerTab.svelte
index bbb553691..7ea313e13 100644
--- a/frontend/src/routes/(app)/environments/[id]/components/DockerTab.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/components/DockerTab.svelte
@@ -1,9 +1,9 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card/index.js';
- import Label from '$lib/components/ui/label/label.svelte';
import { Switch } from '$lib/components/ui/switch/index.js';
import SelectWithLabel from '$lib/components/form/select-with-label.svelte';
import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';
+ import SettingsRow from '$lib/components/settings/settings-row.svelte';
import PruneModeCard from '$lib/components/prune/prune-mode-card.svelte';
import { m } from '$lib/paraglide/messages';
import { DockerBrandIcon } from '$lib/icons';
@@ -94,19 +94,15 @@
onValueChange={(v) => ($formInputs.defaultDeployPullPolicy.value = v as 'missing' | 'always' | 'never')}
/>
</div>
+ </div>
- <div class="space-y-4 rounded-lg border p-4">
- <div class="flex items-center justify-between">
- <div class="space-y-0.5">
- <Label for="auto-inject-env" class="text-sm font-medium">{m.docker_auto_inject_env_label()}</Label>
- <div class="text-muted-foreground text-xs">{m.docker_auto_inject_env_description()}</div>
- </div>
- <Switch id="auto-inject-env" bind:checked={$formInputs.autoInjectEnv.value} />
- </div>
- </div>
+ <div class="border-t pt-6">
+ <SettingsRow layout="inline" label={m.docker_auto_inject_env_label()} description={m.docker_auto_inject_env_description()}>
+ <Switch id="auto-inject-env" bind:checked={$formInputs.autoInjectEnv.value} />
+ </SettingsRow>
</div>
- <div class="space-y-4 rounded-lg border p-4">
+ <div class="space-y-4 border-t pt-6">
<div class="space-y-0.5">
<h3 class="text-sm font-medium">{m.prune_options_title()}</h3>
<p class="text-muted-foreground text-xs">{m.prune_options_description()}</p>
diff --git a/frontend/src/routes/(app)/environments/[id]/components/EnvironmentConnectionDetails.svelte b/frontend/src/routes/(app)/environments/[id]/components/EnvironmentConnectionDetails.svelte
new file mode 100644
index 000000000..0aca53923
--- /dev/null
+++ b/frontend/src/routes/(app)/environments/[id]/components/EnvironmentConnectionDetails.svelte
@@ -0,0 +1,161 @@
+<script lang="ts">
+ import type { ComponentProps } from 'svelte';
+ import { format } from 'date-fns';
+ import * as Card from '$lib/components/ui/card/index.js';
+ import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { cn } from '$lib/utils';
+ import { m } from '$lib/paraglide/messages';
+ import type { Environment, EnvironmentStatus } from '$lib/types/environment';
+
+ type BadgeVariant = ComponentProps<typeof StatusBadge>['variant'];
+
+ let {
+ environment,
+ currentStatus
+ }: {
+ environment: Environment;
+ currentStatus: EnvironmentStatus;
+ } = $props();
+
+ let controlPlaneBadge = $derived.by((): { text: string; variant: 'blue' | 'green' | 'gray' } | null => {
+ if (!environment.isEdge || !environment.lastPollAt) {
+ return null;
+ }
+
+ if (environment.connected) {
+ return { text: m.environments_edge_polling_active(), variant: 'green' };
+ }
+
+ if (currentStatus === 'standby') {
+ return { text: m.environments_edge_polling_standby(), variant: 'blue' };
+ }
+
+ return { text: m.environments_edge_polling_inactive(), variant: 'gray' };
+ });
+
+ let tunnelBadge = $derived.by((): { text: string; variant: 'green' | 'blue' | 'gray' | 'amber' | 'red' } => {
+ if (environment.connected) {
+ return { text: m.environments_edge_tunnel_transmitting(), variant: 'green' };
+ }
+ if (currentStatus === 'standby') {
+ return { text: m.environments_edge_tunnel_dormant(), variant: 'gray' };
+ }
+ if (currentStatus === 'pending') {
+ return { text: m.environments_edge_tunnel_negotiating(), variant: 'amber' };
+ }
+ return { text: m.environments_edge_tunnel_disconnected(), variant: 'red' };
+ });
+
+ let tunnelTypeBadge = $derived.by((): { text: string; variant: 'blue' | 'purple' | 'gray' } | null => {
+ if (!environment.lastPollAt) {
+ return null;
+ }
+
+ if (environment.edgeTransport === 'websocket') {
+ return { text: 'WebSocket', variant: 'purple' };
+ }
+
+ if (environment.edgeTransport === 'grpc') {
+ return { text: 'gRPC', variant: 'blue' };
+ }
+
+ return { text: m.environments_edge_tunnel_type_inactive(), variant: 'gray' };
+ });
+
+ let mtlsCertificateBadge = $derived.by((): { text: string; variant: 'green' | 'amber' | 'red' } | null => {
+ const cert = environment.edgeMTLSCertificate;
+ if (!cert) return null;
+ if (cert.expired) {
+ return { text: m.environments_edge_mtls_certificate_status_expired(), variant: 'red' };
+ }
+ if (cert.expiringSoon) {
+ return { text: m.environments_edge_mtls_certificate_status_expiring_soon(), variant: 'amber' };
+ }
+ return { text: m.environments_edge_mtls_certificate_status_valid(), variant: 'green' };
+ });
+
+ function formatDateTime(value?: string): string {
+ if (!value) return m.common_never();
+
+ const date = new Date(value);
+ if (Number.isNaN(date.getTime())) {
+ return m.common_unknown();
+ }
+
+ return format(date, 'PP p');
+ }
+</script>
+
+{#snippet badgeTile(label: string, text: string, variant: BadgeVariant)}
+ <Card.Root variant="subtle">
+ <Card.Content class="flex flex-col gap-1.5 p-4">
+ <div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">{label}</div>
+ <div><StatusBadge {text} {variant} /></div>
+ </Card.Content>
+ </Card.Root>
+{/snippet}
+
+{#snippet tile(label: string, value: string, opts?: { mono?: boolean; subtext?: string })}
+ <Card.Root variant="subtle">
+ <Card.Content class="flex flex-col gap-1 p-4">
+ <div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">{label}</div>
+ <div class={cn('text-foreground text-sm font-medium', opts?.mono && 'font-mono break-all select-all')}>
+ {value}
+ </div>
+ {#if opts?.subtext}
+ <div class="text-muted-foreground text-xs">{opts.subtext}</div>
+ {/if}
+ </Card.Content>
+ </Card.Root>
+{/snippet}
+
+<div class="space-y-3">
+ <div class="grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-3">
+ {#if controlPlaneBadge}
+ {@render badgeTile(m.environments_edge_control_plane_label(), controlPlaneBadge.text, controlPlaneBadge.variant)}
+ {/if}
+ {@render badgeTile(m.environments_edge_live_tunnel_label(), tunnelBadge.text, tunnelBadge.variant)}
+ {#if tunnelTypeBadge}
+ {@render badgeTile(m.environments_edge_tunnel_type_label(), tunnelTypeBadge.text, tunnelTypeBadge.variant)}
+ {/if}
+ {@render tile(m.environments_edge_connected_since_label(), formatDateTime(environment.connectedAt))}
+ {@render tile(m.environments_edge_last_heartbeat_label(), formatDateTime(environment.lastHeartbeat))}
+ {#if controlPlaneBadge}
+ {@render tile(m.environments_edge_last_poll_label(), formatDateTime(environment.lastPollAt))}
+ {/if}
+ </div>
+
+ {#if mtlsCertificateBadge && environment.edgeMTLSCertificate}
+ <div class="space-y-4 border-t pt-6">
+ <div class="space-y-1">
+ <h3 class="text-sm font-medium">{m.environments_agent_mtls_section_title()}</h3>
+ <p class="text-muted-foreground text-xs">{m.environments_agent_mtls_description()}</p>
+ </div>
+
+ <div class="grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-3">
+ {@render badgeTile(
+ m.environments_edge_mtls_certificate_status_label(),
+ mtlsCertificateBadge.text,
+ mtlsCertificateBadge.variant
+ )}
+ {@render tile(
+ m.environments_edge_mtls_certificate_expires_label(),
+ environment.edgeMTLSCertificate.expiresAt ? formatDateTime(environment.edgeMTLSCertificate.expiresAt) : '—',
+ {
+ subtext:
+ environment.edgeMTLSCertificate.daysRemaining !== undefined
+ ? m.environments_edge_mtls_certificate_days_remaining({
+ count: environment.edgeMTLSCertificate.daysRemaining
+ })
+ : undefined
+ }
+ )}
+ {#if environment.edgeMTLSCertificate.commonName}
+ {@render tile(m.environments_edge_mtls_certificate_common_name_label(), environment.edgeMTLSCertificate.commonName, {
+ mono: true
+ })}
+ {/if}
+ </div>
+ </div>
+ {/if}
+</div>
diff --git a/frontend/src/routes/(app)/environments/[id]/components/EnvironmentStatusSummary.svelte b/frontend/src/routes/(app)/environments/[id]/components/EnvironmentStatusSummary.svelte
new file mode 100644
index 000000000..6c0821537
--- /dev/null
+++ b/frontend/src/routes/(app)/environments/[id]/components/EnvironmentStatusSummary.svelte
@@ -0,0 +1,157 @@
+<script lang="ts">
+ import { formatDistance } from 'date-fns';
+ import { Badge } from '$lib/components/ui/badge/index.js';
+ import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Spinner } from '$lib/components/ui/spinner/index.js';
+ import { cn } from '$lib/utils';
+ import { m } from '$lib/paraglide/messages';
+ import { HashIcon, HealthIcon, TagIcon } from '$lib/icons';
+ import type { Environment, EnvironmentStatus } from '$lib/types/environment';
+ import type { AppVersionInformation } from '$lib/types/settings';
+
+ let {
+ environment,
+ currentStatus,
+ isLoadingVersion,
+ remoteVersion,
+ versionInformation
+ }: {
+ environment: Environment;
+ currentStatus: EnvironmentStatus;
+ isLoadingVersion: boolean;
+ remoteVersion: AppVersionInformation | null;
+ versionInformation: AppVersionInformation | null | undefined;
+ } = $props();
+
+ let transportBadge = $derived.by((): { text: string; variant: 'blue' | 'purple' | 'gray' } => {
+ if (!environment.isEdge) {
+ return { text: 'HTTP', variant: 'gray' };
+ }
+
+ // Prefer the live tunnel transport; fall back to the last one used so
+ // disconnected or poll-only agents still show what they connect with.
+ const transport = (environment.connected ? environment.edgeTransport : undefined) ?? environment.lastEdgeTransport;
+ if (!transport) {
+ return { text: 'Edge', variant: 'gray' };
+ }
+
+ if (transport === 'websocket') {
+ return { text: 'WebSocket', variant: 'purple' };
+ }
+
+ return { text: 'gRPC', variant: 'blue' };
+ });
+
+ let statusBadge = $derived.by((): { text: string; variant: 'green' | 'blue' | 'amber' | 'red' } => {
+ switch (currentStatus) {
+ case 'online':
+ return { text: m.common_online(), variant: 'green' };
+ case 'standby':
+ return { text: m.common_standby(), variant: 'blue' };
+ case 'pending':
+ return { text: m.common_pending(), variant: 'amber' };
+ case 'error':
+ return { text: m.common_error(), variant: 'red' };
+ default:
+ return { text: m.common_offline(), variant: 'red' };
+ }
+ });
+
+ let statusDotClass = $derived.by((): string => {
+ switch (statusBadge.variant) {
+ case 'green':
+ return 'bg-emerald-500 shadow-[0_0_8px_var(--color-emerald-500)]';
+ case 'blue':
+ return 'bg-blue-500';
+ case 'amber':
+ return 'bg-amber-500';
+ default:
+ return 'bg-red-500';
+ }
+ });
+
+ let localDisplayVersion = $derived(
+ versionInformation?.displayVersion || versionInformation?.currentTag || versionInformation?.currentVersion || 'Unknown'
+ );
+
+ let remoteDisplayVersion = $derived(
+ remoteVersion?.displayVersion || remoteVersion?.currentTag || remoteVersion?.currentVersion || ''
+ );
+
+ function formatRelative(value: string | undefined, base: number): string {
+ if (!value) return m.common_never();
+
+ const date = new Date(value);
+ if (Number.isNaN(date.getTime())) {
+ return m.common_unknown();
+ }
+
+ return formatDistance(date, base, { addSuffix: true });
+ }
+
+ // The relative heartbeat ("2 minutes ago") must keep ticking even when
+ // lastHeartbeat stops changing (e.g. a silent agent); otherwise it would
+ // freeze at the value from the last fetch. Recompute against a ticking base.
+ let nowTick = $state(Date.now());
+
+ $effect(() => {
+ if (!environment.isEdge) return;
+ const interval = setInterval(() => (nowTick = Date.now()), 30_000);
+ return () => clearInterval(interval);
+ });
+
+ let heartbeatRelative = $derived(formatRelative(environment.lastHeartbeat, nowTick));
+</script>
+
+<div class="bg-muted/40 flex flex-wrap items-center gap-x-4 gap-y-2 rounded-lg px-4 py-3">
+ <div class="flex items-center gap-2">
+ <span class={cn('size-2.5 rounded-full transition-colors', statusDotClass)}></span>
+ <span class="text-sm font-semibold">{statusBadge.text}</span>
+ </div>
+ <StatusBadge text={transportBadge.text} variant={transportBadge.variant} />
+ <div class="text-muted-foreground flex items-center gap-1.5 text-sm">
+ <TagIcon class="size-4 shrink-0" />
+ {#if environment.id === '0'}
+ <span class="font-mono">{localDisplayVersion}</span>
+ {#if versionInformation?.updateAvailable}
+ <Badge variant="secondary" class="bg-amber-500/10 text-amber-600 hover:bg-amber-500/20 dark:text-amber-400">
+ {m.sidebar_update_available()}: {versionInformation.newestVersion}
+ </Badge>
+ {/if}
+ {:else if isLoadingVersion}
+ <Spinner class="size-4" />
+ <span>{m.common_action_checking()}</span>
+ {:else if remoteVersion}
+ <span class="font-mono">{remoteDisplayVersion}</span>
+ {#if remoteVersion.updateAvailable}
+ <Badge variant="secondary" class="bg-amber-500/10 text-amber-600 hover:bg-amber-500/20 dark:text-amber-400">
+ {m.sidebar_update_available()}: {remoteVersion.newestVersion}
+ </Badge>
+ {#if remoteVersion.releaseUrl}
+ <a
+ href={remoteVersion.releaseUrl}
+ target="_blank"
+ rel="noopener noreferrer"
+ class="text-xs text-blue-500 hover:underline"
+ >
+ {m.version_info_view_release()}
+ </a>
+ {/if}
+ {/if}
+ {:else if currentStatus === 'online' || currentStatus === 'standby'}
+ <span>{m.environments_version_unavailable()}</span>
+ {:else}
+ <span>{m.common_offline()}</span>
+ {/if}
+ </div>
+ {#if environment.isEdge && environment.lastHeartbeat}
+ <div class="text-muted-foreground flex items-center gap-1.5 text-sm">
+ <HealthIcon class="size-4 shrink-0" />
+ <span>{heartbeatRelative}</span>
+ </div>
+ {/if}
+ <div class="text-muted-foreground flex items-center gap-1.5 text-sm sm:ml-auto">
+ <HashIcon class="size-4 shrink-0" />
+ <span class="font-mono">{environment.id}</span>
+ </div>
+</div>
diff --git a/frontend/src/routes/(app)/environments/[id]/components/GeneralTab.svelte b/frontend/src/routes/(app)/environments/[id]/components/GeneralTab.svelte
index edb24c419..fe55a0c9f 100644
--- a/frontend/src/routes/(app)/environments/[id]/components/GeneralTab.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/components/GeneralTab.svelte
@@ -1,13 +1,19 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card/index.js';
import Label from '$lib/components/ui/label/label.svelte';
+ import { Input } from '$lib/components/ui/input/index.js';
import { Switch } from '$lib/components/ui/switch/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
+ import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';
+ import SettingsRow from '$lib/components/settings/settings-row.svelte';
+ import EnvironmentConnectionDetails from './EnvironmentConnectionDetails.svelte';
import { m } from '$lib/paraglide/messages';
- import { SettingsIcon } from '$lib/icons';
+ import { SettingsIcon, TestIcon } from '$lib/icons';
import type { GeneralTabProps } from './tab-props';
- let { formInputs }: GeneralTabProps = $props();
+ let { formInputs, environment, currentStatus, isTestingConnection, testConnection, settingsAvailable }: GeneralTabProps =
+ $props();
</script>
<Card.Root class="flex flex-col">
@@ -20,105 +26,166 @@
</div>
</Card.Header>
<Card.Content class="space-y-6 p-4">
- <div class="grid gap-6 sm:grid-cols-2">
- <div class="space-y-2">
- <TextInputWithLabel
- id="projects-directory"
- label={m.general_projects_directory_label()}
- bind:value={$formInputs.projectsDirectory.value}
- error={$formInputs.projectsDirectory.error}
- helpText={m.general_projects_directory_help()}
+ <!-- Identity / editable fields -->
+ <div class="space-y-4">
+ <div>
+ <Label for="env-name" class="text-sm font-medium">{m.common_name()}</Label>
+ <Input
+ id="env-name"
+ type="text"
+ bind:value={$formInputs.name.value}
+ class="mt-1.5 w-full {$formInputs.name.error ? 'border-destructive' : ''}"
+ placeholder={m.environments_name_placeholder()}
/>
+ {#if $formInputs.name.error}
+ <p class="text-destructive mt-1 text-[0.8rem] font-medium">{$formInputs.name.error}</p>
+ {/if}
</div>
- <div class="space-y-2">
- <TextInputWithLabel
- id="templates-directory"
- label={m.general_templates_directory_label()}
- bind:value={$formInputs.templatesDirectory.value}
- error={$formInputs.templatesDirectory.error}
- helpText={m.general_templates_directory_help()}
- />
- </div>
- <div class="space-y-2">
- <TextInputWithLabel
- id="disk-usage-path"
- label={m.disk_usage_settings()}
- bind:value={$formInputs.diskUsagePath.value}
- error={$formInputs.diskUsagePath.error}
- helpText={m.disk_usage_settings_description()}
- />
- </div>
- <div class="space-y-2">
- <TextInputWithLabel
- id="swarm-stack-sources-directory"
- label="Swarm Stack Sources Directory"
- bind:value={$formInputs.swarmStackSourcesDirectory.value}
- error={$formInputs.swarmStackSourcesDirectory.error}
- helpText="Directory where original compose/env sources for Swarm stack deploys are stored. Supports the same container:host bind-mount format as Projects Directory."
- />
- </div>
- <div class="space-y-2">
- <TextInputWithLabel
- id="base-server-url"
- label={m.general_base_url_label()}
- bind:value={$formInputs.baseServerUrl.value}
- error={$formInputs.baseServerUrl.error}
- helpText={m.general_base_url_help()}
- />
+
+ <div>
+ <Label for="api-url" class="text-sm font-medium">{m.environments_api_url()}</Label>
+ <div class="mt-1.5 flex items-center gap-2">
+ {#if environment.id === '0'}
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger class="w-full">
+ <Input
+ id="api-url"
+ type="url"
+ bind:value={$formInputs.apiUrl.value}
+ class="w-full font-mono"
+ placeholder={m.environments_api_url_placeholder()}
+ disabled={true}
+ required
+ />
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content>
+ <p>{m.environments_local_setting_disabled()}</p>
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+ {:else}
+ <Input
+ id="api-url"
+ type="url"
+ bind:value={$formInputs.apiUrl.value}
+ class="w-full font-mono"
+ placeholder={m.environments_api_url_placeholder()}
+ required
+ />
+ {/if}
+ <ArcaneButton
+ action="base"
+ onclick={testConnection}
+ disabled={isTestingConnection}
+ loading={isTestingConnection}
+ icon={TestIcon}
+ customLabel={m.environments_test_connection()}
+ loadingLabel={m.environments_testing_connection()}
+ class="shrink-0"
+ />
+ </div>
+ <p class="text-muted-foreground mt-1.5 text-xs">{m.environments_api_url_help()}</p>
</div>
- <div class="space-y-2">
- <TextInputWithLabel
- id="max-upload-size"
- type="number"
- label={m.docker_max_upload_size_label()}
- bind:value={$formInputs.maxImageUploadSize.value}
- error={$formInputs.maxImageUploadSize.error}
- helpText={m.docker_max_upload_size_description()}
- />
+ </div>
+
+ <!-- Edge connection status (read-only) -->
+ {#if environment.isEdge}
+ <div class="border-t pt-6">
+ <EnvironmentConnectionDetails {environment} {currentStatus} />
</div>
- <div class="space-y-4 rounded-lg border p-4 sm:col-span-2">
- <div class="space-y-0.5">
- <h3 class="text-sm font-medium">{m.git_sync_file_limits_title()}</h3>
- <div class="text-muted-foreground text-xs">{m.git_sync_file_limits_description()}</div>
- </div>
- <div class="grid gap-4 sm:grid-cols-3">
+ {/if}
+
+ <!-- Advanced settings -->
+ {#if settingsAvailable}
+ <div class="space-y-6 border-t pt-6">
+ <div class="grid gap-6 sm:grid-cols-2">
<TextInputWithLabel
- id="git-sync-max-files"
- type="number"
- label={m.git_sync_max_files_label()}
- bind:value={$formInputs.gitSyncMaxFiles.value}
- error={$formInputs.gitSyncMaxFiles.error}
- helpText={m.git_sync_max_files_help()}
+ id="projects-directory"
+ label={m.general_projects_directory_label()}
+ bind:value={$formInputs.projectsDirectory.value}
+ error={$formInputs.projectsDirectory.error}
+ helpText={m.general_projects_directory_help()}
/>
<TextInputWithLabel
- id="git-sync-max-total-size"
- type="number"
- label={m.git_sync_max_total_size_label()}
- bind:value={$formInputs.gitSyncMaxTotalSizeMb.value}
- error={$formInputs.gitSyncMaxTotalSizeMb.error}
- helpText={m.git_sync_max_total_size_help()}
+ id="templates-directory"
+ label={m.general_templates_directory_label()}
+ bind:value={$formInputs.templatesDirectory.value}
+ error={$formInputs.templatesDirectory.error}
+ helpText={m.general_templates_directory_help()}
+ />
+ <TextInputWithLabel
+ id="disk-usage-path"
+ label={m.disk_usage_settings()}
+ bind:value={$formInputs.diskUsagePath.value}
+ error={$formInputs.diskUsagePath.error}
+ helpText={m.disk_usage_settings_description()}
+ />
+ <TextInputWithLabel
+ id="swarm-stack-sources-directory"
+ label="Swarm Stack Sources Directory"
+ bind:value={$formInputs.swarmStackSourcesDirectory.value}
+ error={$formInputs.swarmStackSourcesDirectory.error}
+ helpText="Directory where original compose/env sources for Swarm stack deploys are stored. Supports the same container:host bind-mount format as Projects Directory."
+ />
+ <TextInputWithLabel
+ id="base-server-url"
+ label={m.general_base_url_label()}
+ bind:value={$formInputs.baseServerUrl.value}
+ error={$formInputs.baseServerUrl.error}
+ helpText={m.general_base_url_help()}
/>
<TextInputWithLabel
- id="git-sync-max-binary-size"
+ id="max-upload-size"
type="number"
- label={m.git_sync_max_binary_size_label()}
- bind:value={$formInputs.gitSyncMaxBinarySizeMb.value}
- error={$formInputs.gitSyncMaxBinarySizeMb.error}
- helpText={m.git_sync_max_binary_size_help()}
+ label={m.docker_max_upload_size_label()}
+ bind:value={$formInputs.maxImageUploadSize.value}
+ error={$formInputs.maxImageUploadSize.error}
+ helpText={m.docker_max_upload_size_description()}
/>
</div>
- </div>
- <div class="space-y-4 rounded-lg border p-4 sm:col-span-2">
- <div class="flex items-center justify-between gap-4">
+
+ <div class="space-y-4 border-t pt-6">
<div class="space-y-0.5">
- <Label for="follow-project-symlinks" class="text-sm font-medium">
- {m.general_follow_project_symlinks_label()}
- </Label>
- <div class="text-muted-foreground text-xs">{m.general_follow_project_symlinks_help()}</div>
+ <h3 class="text-sm font-medium">{m.git_sync_file_limits_title()}</h3>
+ <div class="text-muted-foreground text-xs">{m.git_sync_file_limits_description()}</div>
+ </div>
+ <div class="grid gap-4 sm:grid-cols-3">
+ <TextInputWithLabel
+ id="git-sync-max-files"
+ type="number"
+ label={m.git_sync_max_files_label()}
+ bind:value={$formInputs.gitSyncMaxFiles.value}
+ error={$formInputs.gitSyncMaxFiles.error}
+ helpText={m.git_sync_max_files_help()}
+ />
+ <TextInputWithLabel
+ id="git-sync-max-total-size"
+ type="number"
+ label={m.git_sync_max_total_size_label()}
+ bind:value={$formInputs.gitSyncMaxTotalSizeMb.value}
+ error={$formInputs.gitSyncMaxTotalSizeMb.error}
+ helpText={m.git_sync_max_total_size_help()}
+ />
+ <TextInputWithLabel
+ id="git-sync-max-binary-size"
+ type="number"
+ label={m.git_sync_max_binary_size_label()}
+ bind:value={$formInputs.gitSyncMaxBinarySizeMb.value}
+ error={$formInputs.gitSyncMaxBinarySizeMb.error}
+ helpText={m.git_sync_max_binary_size_help()}
+ />
</div>
- <Switch id="follow-project-symlinks" bind:checked={$formInputs.followProjectSymlinks.value} />
+ </div>
+
+ <div class="border-t pt-6">
+ <SettingsRow
+ layout="inline"
+ label={m.general_follow_project_symlinks_label()}
+ description={m.general_follow_project_symlinks_help()}
+ >
+ <Switch id="follow-project-symlinks" bind:checked={$formInputs.followProjectSymlinks.value} />
+ </SettingsRow>
</div>
</div>
- </div>
+ {/if}
</Card.Content>
</Card.Root>
diff --git a/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte b/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte
index b5c87f44b..8f4cb4113 100644
--- a/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte
@@ -262,8 +262,8 @@
<p class="text-muted-foreground text-xs">{m.auto_update_exclude_description()}</p>
</div>
- <div class="rounded-md border p-2">
- <Input type="search" placeholder="Search containers..." class="mb-2 h-8" bind:value={searchTerm} />
+ <div class="space-y-2">
+ <Input type="search" placeholder="Search containers..." class="h-8" bind:value={searchTerm} />
<ScrollArea.Root class="h-64 w-full rounded-md border p-2">
<div class="space-y-2">
{#await containersPromise}
@@ -355,11 +355,11 @@
<p class="text-muted-foreground text-xs">{m.auto_heal_exclude_description()}</p>
</div>
- <div class="rounded-md border p-2">
+ <div class="space-y-2">
<Input
type="search"
placeholder="Search containers..."
- class="mb-2 h-8"
+ class="h-8"
bind:value={autoHealSearchTerm}
/>
<ScrollArea.Root class="h-64 w-full rounded-md border p-2">
diff --git a/frontend/src/routes/(app)/environments/[id]/components/tab-props.ts b/frontend/src/routes/(app)/environments/[id]/components/tab-props.ts
index 050495878..0661c17dd 100644
--- a/frontend/src/routes/(app)/environments/[id]/components/tab-props.ts
+++ b/frontend/src/routes/(app)/environments/[id]/components/tab-props.ts
@@ -1,24 +1,17 @@
import type { Writable } from 'svelte/store';
import type { FormInputs } from '$lib/utils/settings';
import type { Environment, EnvironmentStatus } from '$lib/types/environment';
-import type { AppVersionInformation } from '$lib/types/settings';
import type { EnvironmentFormValues } from './environment-form-schema';
export type EnvironmentFormInputs = Writable<FormInputs<EnvironmentFormValues>>;
-export interface DetailsTabProps {
- environment: Environment;
+export interface GeneralTabProps {
formInputs: EnvironmentFormInputs;
+ environment: Environment;
currentStatus: EnvironmentStatus;
- isLoadingVersion: boolean;
- remoteVersion: AppVersionInformation | null;
- versionInformation: AppVersionInformation | null | undefined;
isTestingConnection: boolean;
testConnection: () => void | Promise<void>;
-}
-
-export interface GeneralTabProps {
- formInputs: EnvironmentFormInputs;
+ settingsAvailable: boolean;
}
export interface DockerTabProps {