Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
refactor: redesign environment settings page layout and tabs (#3377)
Kyle Mendella4f2c54e08c9
diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.goindex 39ec6c0a8..f52d21b7e 100644--- a/backend/internal/models/settings.go+++ b/backend/internal/models/settings.go@@ -76,7 +76,7 @@ type Settings struct {EnableGravatar SettingVariable `key:"enableGravatar,authrequired" meta:"label=Enable Gravatar;type=boolean;keywords=gravatar,avatar,profile,picture,image,user,photo;category=general;description=Enable Gravatar profile pictures for users"`AvatarMaxUploadSizeMb SettingVariable `key:"avatarMaxUploadSizeMb,authrequired,local" meta:"label=Avatar Max Upload Size (MB);type=number;keywords=avatar,profile,picture,upload,size,limit,maximum,image,user,photo,mb;category=general;description=Maximum size in MB for profile picture uploads (default: 2)"`DefaultShell SettingVariable `key:"defaultShell" meta:"label=Default Shell;type=text;keywords=shell,default,shellpath,path,login;category=general;description=Default shell to use for commands"`- EnvironmentHealthInterval SettingVariable `key:"environmentHealthInterval" meta:"label=Environment Health Check Interval;type=cron;keywords=environment,health,check,interval,frequency,heartbeat,status,monitoring,uptime,jobs,schedule;description=How often to check environment connectivity (cron expression)" catmeta:"id=jobschedule;title=Job Schedule;icon=jobs;url=/settings/jobs;description=Configure how often Arcane background jobs run"`+ EnvironmentHealthInterval SettingVariable `key:"environmentHealthInterval" meta:"label=Environment Health Check Interval;type=cron;keywords=environment,health,check,interval,frequency,heartbeat,status,monitoring,uptime,jobs,schedule;description=How often to check environment connectivity (cron expression)" catmeta:"id=jobschedule;title=Automations;icon=jobs;url=/settings/jobs;description=Configure how often Arcane background jobs run"`ApplicationTheme SettingVariable `key:"applicationTheme,public,local" meta:"label=Application Theme;type=select;keywords=theme,appearance,style,visual,palette,background,interface,ui;category=appearance;description=Choose the overall visual theme for the application"`IconCatalog SettingVariable `key:"iconCatalog,public,local" meta:"label=Icon Catalog;type=select;keywords=icon,catalog,selfhst,dashboard-icons,appearance,container,project;category=appearance;description=Choose the catalog used to resolve project and container icon slugs"`AccentColor SettingVariable `key:"accentColor,public,local" meta:"label=Accent Color;type=text;keywords=color,accent,theme,css,appearance,ui;category=general;description=Primary accent color for UI"`diff --git a/backend/pkg/authz/access_policy.go b/backend/pkg/authz/access_policy.goindex 21aab5f53..a6a15b609 100644--- a/backend/pkg/authz/access_policy.go+++ b/backend/pkg/authz/access_policy.go@@ -98,7 +98,7 @@ var accessSurfacesInternal = []AccessSurface{settingsCategorySurfaceInternal("appearance", "/settings/appearance", "Appearance", AccessScopeModeGlobalOnly, []string{PermSettingsRead}),settingsCategorySurfaceInternal("authentication", "/settings/authentication", "Authentication", AccessScopeModeGlobalOnly, []string{PermSettingsRead}),settingsCategorySurfaceInternal("build", "/settings/builds", "Builds", AccessScopeModeGlobalOnly, []string{PermSettingsRead}),- settingsCategorySurfaceInternal("jobschedule", "", "Job Schedule", AccessScopeModeSelectedEnvPlusGlobal, []string{PermJobsManage}),+ settingsCategorySurfaceInternal("jobschedule", "", "Automations", AccessScopeModeSelectedEnvPlusGlobal, []string{PermJobsManage}),settingsCategorySurfaceInternal("notifications", "/settings/notifications", "Notifications", AccessScopeModeSelectedEnvPlusGlobal, []string{PermNotificationsManage}),settingsCategorySurfaceInternal("roles", "/settings/roles", "Roles", AccessScopeModeGlobalOnly, []string{PermRolesList, PermRolesRead}),routeSurfaceInternal("route.settings.roles.new", "/settings/roles/new", "Create role", AccessScopeModeGlobalOnly, []string{PermRolesList, PermRolesRead}, 0),diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex 96954cfe1..dfa12bffb 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -517,6 +517,13 @@"containers_group_by_project": "Group by Project","containers_nav_metrics": "Metrics","storage": "Storage",+ "connection_edge": "Connection & Edge",+ "connection_edge_description": "Live edge agent connection status and security for this environment.",+ "storage_limits": "Storage & Limits",+ "directories_storage_paths": "Directories & Storage Paths",+ "directories_storage_paths_description": "Filesystem locations this environment uses for projects, templates, and disk usage metrics.",+ "sync_upload_limits": "Sync & Upload Limits",+ "sync_upload_limits_description": "Image upload size and Git sync caps for this environment.","containers_nav_healthcheck": "Healthcheck","health_status_description": "Current healthcheck state reported by Docker","health_configuration": "Healthcheck Configuration",@@ -1164,7 +1171,6 @@"project": "Project","environments_title": "Environments","environments_subtitle": "Manage and monitor your Arcane environments",- "environments_page_subtitle": "Environment details and management","environments_remove_selected_title": "Remove {count} Environment(s)","environments_remove_selected_message": "Are you sure you want to remove the selected environment(s)? This action cannot be undone.","environments_test_connection_failed": "Failed to test connection",@@ -1414,7 +1420,7 @@"vuln_unignore_failed": "Failed to unignore vulnerability","vuln_ignored_title": "Ignored Vulnerabilities","vuln_ignored_empty": "No ignored vulnerabilities",- "jobs_title": "Job Schedules",+ "automations": "Automations","jobs_monitoring_heading": "Monitoring","jobs_telemetry_heading": "Telemetry","jobs_environment_scope_description": "These schedules and controls apply only to the currently selected environment.",@@ -2915,6 +2921,7 @@"file_browser_backup_restore_desc": "Select a backup to restore the chosen file.","editor_commands_desc": "Run editor commands","environments_swarm_stack_source_label": "Swarm Stack Sources Directory",+ "environments_swarm_stack_source_help": "Directory where original compose/env sources for Swarm stack deploys are stored. Supports the same container:host bind-mount format as Projects Directory.","carousel_next_slide": "Next slide","carousel_previous_slide": "Previous slide","common_edit_name": "Edit name",diff --git a/frontend/src/lib/components/arcane-button/variants.ts b/frontend/src/lib/components/arcane-button/variants.tsindex 7674b77c9..f26108914 100644--- a/frontend/src/lib/components/arcane-button/variants.ts+++ b/frontend/src/lib/components/arcane-button/variants.ts@@ -28,7 +28,9 @@ import {ZapIcon,TagIcon,ScanIcon,- ImagesIcon+ ImagesIcon,+ TestIcon,+ BoxIcon} from '#lib/icons';export const arcaneButtonVariants = tv({@@ -81,6 +83,10 @@ export const arcaneButtonVariants = tv({'bg-violet-500/5 text-foreground! border-violet-500/20 hover:bg-violet-500/10 hover:border-violet-500/40 ' +'dark:bg-violet-500/10 dark:text-violet-300 dark:border-violet-500/30 dark:hover:bg-violet-500/20 ' +'shadow-sm hover:shadow-md',+ 'outline-archive':+ 'bg-slate-500/5 text-foreground! border-slate-500/20 hover:bg-slate-500/10 hover:border-slate-500/40 ' ++ 'dark:bg-slate-500/10 dark:text-slate-300 dark:border-slate-500/30 dark:hover:bg-slate-500/20 ' ++ 'shadow-sm hover:shadow-md',outline: 'bg-background border-input hover:bg-accent hover:text-accent-foreground shadow-sm',@@ -212,6 +218,18 @@ export const actionConfigs = {tone: 'outline-scan',loadingLabel: m.common_processing()},+ test: {+ defaultLabel: m.test_connection(),+ IconComponent: TestIcon,+ tone: 'outline-info',+ loadingLabel: m.environments_testing_connection()+ },+ archive: {+ defaultLabel: m.projects_archive(),+ IconComponent: BoxIcon,+ tone: 'outline-archive',+ loadingLabel: m.common_processing()+ },commit: {defaultLabel: m.commit(),IconComponent: ImagesIcon,diff --git a/frontend/src/lib/components/arcane-table/arcane-table.types.svelte.ts b/frontend/src/lib/components/arcane-table/arcane-table.types.svelte.tsindex ca3bfb823..a7adc58f4 100644--- a/frontend/src/lib/components/arcane-table/arcane-table.types.svelte.ts+++ b/frontend/src/lib/components/arcane-table/arcane-table.types.svelte.ts@@ -145,7 +145,7 @@ export function buildMobileVisibility(fields: FieldSpec[], persisted?: string[])export type BulkAction = {id: string;label: string;- action: 'base' | 'start' | 'stop' | 'restart' | 'remove' | 'deploy' | 'redeploy' | 'up' | 'down' | 'prune';+ action: 'base' | 'start' | 'stop' | 'restart' | 'remove' | 'deploy' | 'redeploy' | 'up' | 'down' | 'prune' | 'archive';onClick: (ids: string[]) => void;disabled?: boolean;disabledReason?: string;diff --git a/frontend/src/routes/(app)/environments/[id]/+page.svelte b/frontend/src/routes/(app)/environments/[id]/+page.svelteindex e2ddb862c..336e7ee05 100644--- a/frontend/src/routes/(app)/environments/[id]/+page.svelte+++ b/frontend/src/routes/(app)/environments/[id]/+page.svelte@@ -7,6 +7,7 @@import * as AlertDialog from '#lib/components/ui/alert-dialog';import * as ArcaneTooltip from '#lib/components/arcane-tooltip';import { Switch } from '#lib/components/ui/switch/index.js';+ import { Input } from '#lib/components/ui/input/index.js';import { CopyButton } from '#lib/components/ui/copy-button';import { cn } from '#lib/utils';import { goto, refreshAll } from '$app/navigation';@@ -23,7 +24,9 @@import { createSettingsForm } from '#lib/utils/settings-form';import { useUrlTab } from '#lib/hooks/use-url-tab.svelte';import EnvironmentStatusSummary from './components/EnvironmentStatusSummary.svelte';- import GeneralTab from './components/GeneralTab.svelte';+ import EditableName from '../../projects/components/EditableName.svelte';+ import ConnectionEdgeTab from './components/ConnectionEdgeTab.svelte';+ import StorageTab from './components/StorageTab.svelte';import DockerTab from './components/DockerTab.svelte';import JobsTab from './components/JobsTab.svelte';import { environmentFormSchema, type EnvironmentFormValues } from './components/environment-form-schema';@@ -34,15 +37,14 @@import {ArrowLeftIcon,AlertIcon,- DownloadIcon,RefreshIcon,DockerBrandIcon,SecurityIcon,- SettingsIcon,GitBranchIcon,JobsIcon,ResetIcon,- ConnectionIcon+ ConnectionIcon,+ VolumesIcon} from '#lib/icons';let { data } = $props();@@ -64,6 +66,8 @@let showRegenerateDialog = $state(false);let regeneratedApiKey = $state<string | null>(null);let easyJoinDialogOpen = $state(false);+ let nameInputRef = $state<HTMLInputElement | null>(null);+ let isEditingApiUrl = $state(false);const easyJoinCandidates = useEasyJoinCandidates();// Version state@@ -84,9 +88,6 @@runtimeEnvironment.isEdge &&(runtimeEnvironment.edgeSecurityMode === 'mtls' || hasMTLSAssets));- let mtlsBundleDownloadHref = $derived(`/api/environments/${runtimeEnvironment.id}/deployment/mtls/bundle`);- let mtlsCertificateDownloadHref = $derived(`/api/environments/${runtimeEnvironment.id}/deployment/mtls/agent.crt`);- let mtlsKeyDownloadHref = $derived(`/api/environments/${runtimeEnvironment.id}/deployment/mtls/agent.key`);let canEasyJoin = $derived(runtimeEnvironment.id !== '0' &&runtimeEnvironment.enabled &&@@ -116,56 +117,43 @@icon: RefreshIcon});- if (showMTLSDownloads) {+ // Edge environments manage mTLS downloads and API key regeneration in the Connection & Edge tab.+ if (!runtimeEnvironment.isEdge) {actions.push({- id: 'mtls-downloads',+ id: 'regenerate-api-key',action: 'base',- label: m.environments_agent_mtls_download_bundle(),- href: mtlsBundleDownloadHref,- rel: 'external',- icon: DownloadIcon,- menuItems: [- {- id: 'mtls-certificate',- label: m.environments_agent_mtls_download_certificate(),- href: mtlsCertificateDownloadHref- },- {- id: 'mtls-key',- label: m.environments_agent_mtls_download_key(),- href: mtlsKeyDownloadHref- }- ]+ label: m.environments_regenerate_api_key(),+ onclick: () => {+ showRegenerateDialog = true;+ },+ disabled: isRegeneratingKey,+ loading: isRegeneratingKey,+ icon: ResetIcon});}-- actions.push({- id: 'regenerate-api-key',- action: 'base',- label: m.environments_regenerate_api_key(),- onclick: () => {- showRegenerateDialog = true;- },- disabled: isRegeneratingKey,- loading: isRegeneratingKey,- icon: ResetIcon- });}return actions;});const tabItems = $derived.by((): TabItem[] => {- const items: TabItem[] = [- {- value: 'general',- label: m.general_title(),- icon: SettingsIcon- }- ];+ const items: TabItem[] = [];++ if (runtimeEnvironment.isEdge) {+ items.push({+ value: 'connection',+ label: m.connection_edge(),+ icon: ConnectionIcon+ });+ }if (showSettingsTabs) {items.push(+ {+ value: 'storage',+ label: m.storage_limits(),+ icon: VolumesIcon+ },{value: 'docker',label: m.environments_docker_settings_title(),@@ -178,7 +166,7 @@},{value: 'jobs',- label: m.jobs_title(),+ label: m.automations(),icon: JobsIcon});@@ -195,7 +183,7 @@const urlTab = useUrlTab({validTabs: () => tabItems.map((tab) => tab.value),- defaultTab: () => 'general'+ defaultTab: () => tabItems.find((tab) => tab.value !== 'gitops')?.value ?? 'gitops'});const activeTab = $derived(urlTab.value);const securityTabItems = $derived.by((): TabItem[] => [@@ -212,7 +200,10 @@]);$effect(() => {- if (activeTab === 'gitops') void goto(`/environments/${environment.id}/gitops`);+ // Don't bounce away when gitops is the only tab (offline/disabled environment) — the+ // header still needs to be reachable to fix the connection.+ if (activeTab === 'gitops' && tabItems.some((tab) => tab.value !== 'gitops'))+ void goto(`/environments/${environment.id}/gitops`);});function handleTabChange(value: string) {@@ -525,8 +516,62 @@<div class="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between"><div class="flex flex-1 items-start gap-4"><div class="min-w-0 flex-1">- <h1 class="text-xl font-semibold wrap-break-word sm:text-2xl">{environment.name}</h1>- <p class="mt-1.5 text-sm wrap-break-word text-muted-foreground sm:text-base">{m.environments_page_subtitle()}</p>+ <div class="flex min-h-9 min-w-0 flex-wrap items-center gap-x-2 gap-y-1">+ <EditableName+ bind:value={$formInputs.name.value}+ bind:ref={nameInputRef}+ variant="inline"+ error={$formInputs.name.error ?? undefined}+ originalValue={environment.name}+ placeholder={m.environments_name_placeholder()}+ class="max-w-[14rem] min-w-0 sm:max-w-[20rem] md:max-w-[26rem]"+ />+ </div>+ <div class="mt-1 flex min-w-0 items-center gap-1">+ {#if isEditingApiUrl}+ <Input+ id="api-url"+ type="url"+ bind:value={$formInputs.apiUrl.value}+ class="h-7 w-full max-w-md font-mono text-xs {$formInputs.apiUrl.error ? 'border-destructive' : ''}"+ placeholder={m.environments_api_url_placeholder()}+ autofocus+ onkeydown={(e) => {+ if (e.key === 'Enter') {+ e.preventDefault();+ isEditingApiUrl = false;+ }+ if (e.key === 'Escape') {+ $formInputs.apiUrl.value = environment.apiUrl;+ isEditingApiUrl = false;+ }+ }}+ onblur={() => (isEditingApiUrl = false)}+ />+ {:else if environment.id === '0'}+ <ArcaneTooltip.Root>+ <ArcaneTooltip.Trigger class="min-w-0">+ <span class="block truncate px-1 font-mono text-xs text-muted-foreground">{$formInputs.apiUrl.value}</span>+ </ArcaneTooltip.Trigger>+ <ArcaneTooltip.Content>+ <p>{m.environments_local_setting_disabled()}</p>+ </ArcaneTooltip.Content>+ </ArcaneTooltip.Root>+ {:else}+ <button+ type="button"+ class="min-w-0 truncate rounded px-1 py-0.5 text-left font-mono text-xs text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"+ title={m.environments_api_url()}+ onclick={() => (isEditingApiUrl = true)}+ >+ {$formInputs.apiUrl.value || m.environments_api_url_placeholder()}+ </button>+ {/if}+ <CopyButton text={$formInputs.apiUrl.value} size="icon" class="size-6 shrink-0" />+ </div>+ {#if $formInputs.apiUrl.error}+ <p class="mt-1 text-xs text-destructive">{$formInputs.apiUrl.error}</p>+ {/if}</div><!-- Enable/Disable indicator -->@@ -584,6 +629,8 @@loadingLabel={m.common_saving()}/>+ <ArcaneButton action="test" onclick={testConnection} disabled={isTestingConnection} loading={isTestingConnection} />+<ArcaneButton action="refresh" onclick={refreshEnvironment} disabled={isRefreshing} loading={isRefreshing} /></div></div>@@ -664,18 +711,23 @@<TabBar items={tabItems} value={activeTab} onValueChange={handleTabChange} /></div>- <Tabs.Content value="general">- <GeneralTab- {formInputs}- environment={runtimeEnvironment}- {currentStatus}- {isTestingConnection}- {testConnection}- settingsAvailable={showSettingsTabs}- />- </Tabs.Content>+ {#if runtimeEnvironment.isEdge}+ <Tabs.Content value="connection">+ <ConnectionEdgeTab+ environment={runtimeEnvironment}+ {currentStatus}+ {showMTLSDownloads}+ {isRegeneratingKey}+ onRegenerateApiKey={() => (showRegenerateDialog = true)}+ />+ </Tabs.Content>+ {/if}{#if showSettingsTabs}+ <Tabs.Content value="storage">+ <StorageTab {formInputs} />+ </Tabs.Content>+<Tabs.Content value="docker"><DockerTab {formInputs} {shellSelectValue} {handleShellSelectChange} {shellOptions} /></Tabs.Content>diff --git a/frontend/src/routes/(app)/environments/[id]/components/ConnectionEdgeTab.svelte b/frontend/src/routes/(app)/environments/[id]/components/ConnectionEdgeTab.sveltenew file mode 100644index 000000000..536b9a290--- /dev/null+++ b/frontend/src/routes/(app)/environments/[id]/components/ConnectionEdgeTab.svelte@@ -0,0 +1,166 @@+<script lang="ts">+ import * as Card from '#lib/components/ui/card/index.js';+ import { Badge, type BadgeVariant } from '#lib/components/ui/badge';+ import { ArcaneButton } from '#lib/components/arcane-button/index.js';+ import EnvironmentConnectionDetails from './EnvironmentConnectionDetails.svelte';+ import { m } from '#lib/paraglide/messages';+ import { ConnectionIcon, DownloadIcon, ResetIcon, SecurityIcon } from '#lib/icons';+ import { formatDateTimeShort } from '#lib/utils/formatting';+ import type { ConnectionEdgeTabProps } from './tab-props';++ let { environment, currentStatus, showMTLSDownloads, isRegeneratingKey, onRegenerateApiKey }: ConnectionEdgeTabProps = $props();++ let mtlsBundleDownloadHref = $derived(`/api/environments/${environment.id}/deployment/mtls/bundle`);+ let mtlsCertificateDownloadHref = $derived(`/api/environments/${environment.id}/deployment/mtls/agent.crt`);+ let mtlsKeyDownloadHref = $derived(`/api/environments/${environment.id}/deployment/mtls/agent.key`);+ let showAgentSecurity = $derived(environment.id !== '0');++ 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.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 formatDateTimeShort(date);+ }+</script>++{#snippet badgeTile(label: string, text: string, variant: BadgeVariant)}+ <div class="flex flex-col gap-1.5 rounded-lg border border-border/50 bg-card/30 p-3">+ <div class="text-xs font-semibold tracking-wide text-muted-foreground uppercase">{label}</div>+ <div><Badge {variant} minWidth="20">{text}</Badge></div>+ </div>+{/snippet}++{#snippet tile(label: string, value: string, opts?: { mono?: boolean; subtext?: string })}+ <div class="flex flex-col gap-1 rounded-lg border border-border/50 bg-card/30 p-3">+ <div class="text-xs font-semibold tracking-wide text-muted-foreground uppercase">{label}</div>+ <div class="text-sm font-medium text-foreground {opts?.mono ? 'font-mono break-all select-all' : ''}">+ {value}+ </div>+ {#if opts?.subtext}+ <div class="text-xs text-muted-foreground">{opts.subtext}</div>+ {/if}+ </div>+{/snippet}++<div class="space-y-6">+ <Card.Root class="flex flex-col">+ <Card.Header icon={ConnectionIcon}>+ <div class="flex flex-col space-y-1.5">+ <Card.Title>+ <h2>{m.connection_edge()}</h2>+ </Card.Title>+ <Card.Description>{m.connection_edge_description()}</Card.Description>+ </div>+ </Card.Header>+ <Card.Content class="p-4">+ <EnvironmentConnectionDetails {environment} {currentStatus} />+ </Card.Content>+ </Card.Root>++ {#if showAgentSecurity}+ <Card.Root class="flex flex-col">+ <Card.Header icon={SecurityIcon}>+ <div class="flex flex-col space-y-1.5">+ <Card.Title>+ <h2>{m.environments_agent_mtls_section_title()}</h2>+ </Card.Title>+ <Card.Description>{m.environments_agent_mtls_description()}</Card.Description>+ </div>+ </Card.Header>+ <Card.Content class="space-y-6 p-4">+ {#if mtlsCertificateBadge && environment.edgeMTLSCertificate}+ <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>+ {/if}++ {#if showMTLSDownloads}+ <div class="flex flex-wrap items-center gap-2">+ <ArcaneButton+ action="base"+ tone="outline"+ href={mtlsBundleDownloadHref}+ rel="external"+ icon={DownloadIcon}+ customLabel={m.environments_agent_mtls_download_bundle()}+ />+ <ArcaneButton+ action="base"+ tone="outline"+ href={mtlsCertificateDownloadHref}+ rel="external"+ icon={DownloadIcon}+ customLabel={m.environments_agent_mtls_download_certificate()}+ />+ <ArcaneButton+ action="base"+ tone="outline"+ href={mtlsKeyDownloadHref}+ rel="external"+ icon={DownloadIcon}+ customLabel={m.environments_agent_mtls_download_key()}+ />+ </div>+ {/if}++ <div class={showMTLSDownloads || mtlsCertificateBadge ? 'border-t pt-6' : ''}>+ <div class="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">+ <div class="space-y-0.5">+ <h3 class="text-sm font-medium">{m.environments_regenerate_api_key()}</h3>+ <p class="text-xs text-muted-foreground">{m.environments_regenerate_dialog_message()}</p>+ </div>+ <ArcaneButton+ action="base"+ tone="outline"+ onclick={onRegenerateApiKey}+ disabled={isRegeneratingKey}+ loading={isRegeneratingKey}+ icon={ResetIcon}+ customLabel={m.environments_regenerate_api_key()}+ class="shrink-0"+ />+ </div>+ </div>+ </Card.Content>+ </Card.Root>+ {/if}+</div>diff --git a/frontend/src/routes/(app)/environments/[id]/components/DockerTab.svelte b/frontend/src/routes/(app)/environments/[id]/components/DockerTab.svelteindex d409204ce..c70415cf8 100644--- a/frontend/src/routes/(app)/environments/[id]/components/DockerTab.svelte+++ b/frontend/src/routes/(app)/environments/[id]/components/DockerTab.svelte@@ -94,6 +94,14 @@onValueChange={(v) => ($formInputs.defaultDeployPullPolicy.value = v as 'missing' | 'always' | 'never')}/></div>++ <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><div class="border-t pt-6">@@ -108,7 +116,7 @@<p class="text-xs text-muted-foreground">{m.prune_options_description()}</p></div>- <div class="grid gap-2 sm:grid-cols-2">+ <div class="grid gap-4 sm:grid-cols-2"><PruneModeCardtitle={m.containers()}description={m.scheduled_prune_containers_description()}diff --git a/frontend/src/routes/(app)/environments/[id]/components/EnvironmentConnectionDetails.svelte b/frontend/src/routes/(app)/environments/[id]/components/EnvironmentConnectionDetails.svelteindex d303cf5bc..e12ea3611 100644--- a/frontend/src/routes/(app)/environments/[id]/components/EnvironmentConnectionDetails.svelte+++ b/frontend/src/routes/(app)/environments/[id]/components/EnvironmentConnectionDetails.svelte@@ -1,5 +1,4 @@<script lang="ts">- import * as Card from '#lib/components/ui/card/index.js';import { Badge, type BadgeVariant } from '#lib/components/ui/badge';import { cn } from '#lib/utils';import { m } from '#lib/paraglide/messages';@@ -59,18 +58,6 @@return { text: m.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.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();@@ -84,75 +71,35 @@</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-xs font-semibold tracking-wide text-muted-foreground uppercase">{label}</div>- <div><Badge {variant} minWidth="20">{text}</Badge></div>- </Card.Content>- </Card.Root>+ <div class="flex flex-col gap-1.5 rounded-lg border border-border/50 bg-card/30 p-3">+ <div class="text-xs font-semibold tracking-wide text-muted-foreground uppercase">{label}</div>+ <div><Badge {variant} minWidth="20">{text}</Badge></div>+ </div>{/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-xs font-semibold tracking-wide text-muted-foreground uppercase">{label}</div>- <div class={cn('text-sm font-medium text-foreground', opts?.mono && 'font-mono break-all select-all')}>- {value}- </div>- {#if opts?.subtext}- <div class="text-xs text-muted-foreground">{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))}+ <div class="flex flex-col gap-1 rounded-lg border border-border/50 bg-card/30 p-3">+ <div class="text-xs font-semibold tracking-wide text-muted-foreground uppercase">{label}</div>+ <div class={cn('text-sm font-medium text-foreground', opts?.mono && 'font-mono break-all select-all')}>+ {value}+ </div>+ {#if opts?.subtext}+ <div class="text-xs text-muted-foreground">{opts.subtext}</div>{/if}</div>+{/snippet}- {#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-xs text-muted-foreground">{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>+<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>diff --git a/frontend/src/routes/(app)/environments/[id]/components/GeneralTab.svelte b/frontend/src/routes/(app)/environments/[id]/components/GeneralTab.sveltedeleted file mode 100644index 4481fb6e6..000000000--- a/frontend/src/routes/(app)/environments/[id]/components/GeneralTab.svelte+++ /dev/null@@ -1,191 +0,0 @@-<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, TestIcon } from '#lib/icons';- import type { GeneralTabProps } from './tab-props';-- let { formInputs, environment, currentStatus, isTestingConnection, testConnection, settingsAvailable }: GeneralTabProps =- $props();-</script>--<Card.Root class="flex flex-col">- <Card.Header icon={SettingsIcon}>- <div class="flex flex-col space-y-1.5">- <Card.Title>- <h2>{m.general_title()}</h2>- </Card.Title>- <Card.Description>{m.environments_config_description()}</Card.Description>- </div>- </Card.Header>- <Card.Content class="space-y-6 p-4">- <!-- 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="mt-1 text-[0.8rem] font-medium text-destructive">{$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.test_connection()}- loadingLabel={m.environments_testing_connection()}- class="shrink-0"- />- </div>- <p class="mt-1.5 text-xs text-muted-foreground">{m.environments_api_url_help()}</p>- </div>- </div>-- <!-- Edge connection status (read-only) -->- {#if environment.isEdge}- <div class="border-t pt-6">- <EnvironmentConnectionDetails {environment} {currentStatus} />- </div>- {/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="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="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={m.environments_swarm_stack_source_label()}- 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="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>-- <div class="space-y-4 border-t pt-6">- <div class="space-y-0.5">- <h3 class="text-sm font-medium">{m.git_sync_file_limits_title()}</h3>- <div class="text-xs text-muted-foreground">{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>- </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>- {/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.svelteindex 03145de77..8ede6d7e9 100644--- a/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte+++ b/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte@@ -89,7 +89,7 @@switch (prereq.settingKey) {case 'pollingEnabled':case 'autoUpdate':- return `${envBase}?tab=docker`;+ return `${envBase}?tab=jobs`;case 'scheduledPruneEnabled':return `${envBase}?tab=jobs`;case 'vulnerabilityScanEnabled':@@ -131,10 +131,10 @@}const categories = [+ { id: 'updates', label: m.updates() },{ id: 'monitoring', label: m.jobs_monitoring_heading() },{ id: 'maintenance', label: m.maintenance() },{ id: 'security', label: m.security() },- { id: 'updates', label: m.updates() },{ id: 'sync', label: m.resource_sync_cap() },{ id: 'telemetry', label: m.jobs_telemetry_heading() }];@@ -263,7 +263,7 @@<Card.Header icon={JobsIcon}><div class="flex flex-col space-y-1.5"><Card.Title>- <h2>{m.jobs_title()}</h2>+ <h2>{m.automations()}</h2></Card.Title><Card.Description>{m.jobs_environment_scope_description()}</Card.Description></div>diff --git a/frontend/src/routes/(app)/environments/[id]/components/StorageTab.svelte b/frontend/src/routes/(app)/environments/[id]/components/StorageTab.sveltenew file mode 100644index 000000000..0bc35e864--- /dev/null+++ b/frontend/src/routes/(app)/environments/[id]/components/StorageTab.svelte@@ -0,0 +1,122 @@+<script lang="ts">+ import * as Card from '#lib/components/ui/card/index.js';+ import { Switch } from '#lib/components/ui/switch/index.js';+ import TextInputWithLabel from '#lib/components/form/text-input-with-label.svelte';+ import SettingsRow from '#lib/components/settings/settings-row.svelte';+ import { m } from '#lib/paraglide/messages';+ import { FolderOpenIcon, UploadIcon } from '#lib/icons';+ import type { StorageTabProps } from './tab-props';++ let { formInputs }: StorageTabProps = $props();+</script>++<div class="space-y-6">+ <Card.Root class="flex flex-col">+ <Card.Header icon={FolderOpenIcon}>+ <div class="flex flex-col space-y-1.5">+ <Card.Title>+ <h2>{m.directories_storage_paths()}</h2>+ </Card.Title>+ <Card.Description>{m.directories_storage_paths_description()}</Card.Description>+ </div>+ </Card.Header>+ <Card.Content class="p-4">+ <div class="grid gap-6 sm:grid-cols-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()}+ />+ <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()}+ />+ <TextInputWithLabel+ id="swarm-stack-sources-directory"+ label={m.environments_swarm_stack_source_label()}+ bind:value={$formInputs.swarmStackSourcesDirectory.value}+ error={$formInputs.swarmStackSourcesDirectory.error}+ helpText={m.environments_swarm_stack_source_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()}+ />+ </div>++ <div class="mt-6 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>+ </Card.Content>+ </Card.Root>++ <Card.Root class="flex flex-col">+ <Card.Header icon={UploadIcon}>+ <div class="flex flex-col space-y-1.5">+ <Card.Title>+ <h2>{m.sync_upload_limits()}</h2>+ </Card.Title>+ <Card.Description>{m.sync_upload_limits_description()}</Card.Description>+ </div>+ </Card.Header>+ <Card.Content class="space-y-6 p-4">+ <div class="grid gap-6 sm:grid-cols-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>++ <div class="space-y-4 border-t pt-6">+ <div class="space-y-0.5">+ <h3 class="text-sm font-medium">{m.git_sync_file_limits_title()}</h3>+ <div class="text-xs text-muted-foreground">{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>+ </div>+ </Card.Content>+ </Card.Root>+</div>diff --git a/frontend/src/routes/(app)/environments/[id]/components/tab-props.ts b/frontend/src/routes/(app)/environments/[id]/components/tab-props.tsindex 2127b4113..176f9ca39 100644--- a/frontend/src/routes/(app)/environments/[id]/components/tab-props.ts+++ b/frontend/src/routes/(app)/environments/[id]/components/tab-props.ts@@ -5,13 +5,16 @@ import type { EnvironmentFormValues } from './environment-form-schema';export type EnvironmentFormInputs = Writable<FormInputs<EnvironmentFormValues>>;-export interface GeneralTabProps {- formInputs: EnvironmentFormInputs;+export interface ConnectionEdgeTabProps {environment: Environment;currentStatus: EnvironmentStatus;- isTestingConnection: boolean;- testConnection: () => void | Promise<void>;- settingsAvailable: boolean;+ showMTLSDownloads: boolean;+ isRegeneratingKey: boolean;+ onRegenerateApiKey: () => void;+}++export interface StorageTabProps {+ formInputs: EnvironmentFormInputs;}export interface DockerTabProps {diff --git a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte b/frontend/src/routes/(app)/projects/[projectId]/+page.svelteindex 1ab2cea5c..b4d203ced 100644--- a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte+++ b/frontend/src/routes/(app)/projects/[projectId]/+page.svelte@@ -10,7 +10,6 @@ArrowRightIcon,CreateFileIcon,TrashIcon,- BoxIcon,ProjectsIcon,LayersIcon,SettingsIcon,@@ -1300,8 +1299,7 @@{#if project}{#snippet archiveButton(compact: boolean)}<ArcaneButton- action="base"- icon={BoxIcon}+ action="archive"size={compact ? 'icon' : undefined}showLabel={!compact}loading={isLoading.archiving}diff --git a/frontend/src/routes/(app)/projects/projects-table.svelte b/frontend/src/routes/(app)/projects/projects-table.svelteindex 0242c7ed8..185cc38de 100644--- a/frontend/src/routes/(app)/projects/projects-table.svelte+++ b/frontend/src/routes/(app)/projects/projects-table.svelte@@ -213,7 +213,7 @@{id: 'archive',label: m.projects_bulk_archive({ count: selectedIds?.length ?? 0 }),- action: 'base',+ action: 'archive',onClick: handleBulkArchive,loading: isBulkLoading.archive,disabled: !canArchiveProject || isAnyLoading || hasArchivedSelection || hasRunningSelection,@@ -221,8 +221,7 @@? m.projects_archive_requires_stopped(): hasArchivedSelection? m.projects_archived_badge()- : undefined,- icon: BoxIcon+ : undefined}]);</script>diff --git a/frontend/src/routes/(app)/settings/+layout.svelte b/frontend/src/routes/(app)/settings/+layout.svelteindex e26fbc2c0..7d6b12768 100644--- a/frontend/src/routes/(app)/settings/+layout.svelte+++ b/frontend/src/routes/(app)/settings/+layout.svelte@@ -20,7 +20,7 @@let pageTitle = $derived.by(() => {switch (currentPageName) {case 'jobs':- return m.jobs_title();+ return m.automations();case 'docker':return m.docker_title();case 'authentication':diff --git a/tests/spec/edge-agent.spec.ts b/tests/spec/edge-agent.spec.tsindex aea997a66..840c9fac8 100644--- a/tests/spec/edge-agent.spec.ts+++ b/tests/spec/edge-agent.spec.ts@@ -135,7 +135,7 @@ test.describe('Edge Agent Environment', () => {await expect(page).toHaveURL(new RegExp(`/environments/${createdEnvironmentId}`));}- await expect(page.locator('#api-url')).toHaveValue(/edge:\/\/edge-agent-/);+ await expect(page.getByTitle('API URL', { exact: true })).toHaveText(/edge:\/\/edge-agent-/);await expect(page.getByText('Edge', { exact: true }).first()).toBeVisible();await expect(page.getByText('Live Tunnel', { exact: true })).toBeVisible();} finally {diff --git a/tests/spec/environment-settings.spec.ts b/tests/spec/environment-settings.spec.tsindex 9179d228f..01c4b216d 100644--- a/tests/spec/environment-settings.spec.ts+++ b/tests/spec/environment-settings.spec.ts@@ -1,14 +1,28 @@import { test, expect, type Locator, type Page } from '@playwright/test';const LOCAL_ENV_ID = '0';+const NAME_PLACEHOLDER = 'My Lab Server';async function openEnvironment(page: Page, environmentId: string) {await page.goto(`/environments/${environmentId}`);await page.waitForLoadState('load');- await expect(page.getByLabel('Name', { exact: true })).toBeVisible();+ await expect(environmentTitleButton(page)).toBeVisible();await expect(page.getByRole('button', { name: 'Save', exact: true }).first()).toBeVisible();}+function environmentTitleButton(page: Page) {+ return page.locator('h1 button').first();+}++async function renameEnvironmentInHeader(page: Page, newName: string) {+ await environmentTitleButton(page).click();+ const nameInput = page.getByPlaceholder(NAME_PLACEHOLDER);+ await expect(nameInput).toBeVisible();+ await nameInput.fill(newName);+ await nameInput.press('Enter');+ await expect(environmentTitleButton(page)).toHaveText(newName);+}+async function createDirectEnvironmentViaUI(page: Page, environmentName: string) {await page.goto('/environments');await page.waitForLoadState('load');@@ -83,23 +97,20 @@ test.describe('Environment Settings UI', () => {await page.goto('/settings');await page.waitForLoadState('load');- const jobScheduleCategory = page- .getByRole('button')- .filter({ hasText: 'Job Schedule' })- .first();+ const jobScheduleCategory = page.getByRole('button').filter({ hasText: 'Automations' }).first();await expect(jobScheduleCategory).toBeVisible();await jobScheduleCategory.click();await expect.poll(() => new URL(page.url()).searchParams.get('tab')).toBe('jobs');- await expect(page.getByRole('tab', { name: 'Job Schedules', exact: true })).toHaveAttribute(+ await expect(page.getByRole('tab', { name: 'Automations', exact: true })).toHaveAttribute('data-state','active');- const generalTab = page.getByRole('tab', { name: 'General', exact: true });- await generalTab.click();- await expect.poll(() => new URL(page.url()).searchParams.get('tab')).toBe('general');- await expect(generalTab).toHaveAttribute('data-state', 'active');+ const storageTab = page.getByRole('tab', { name: 'Storage & Limits', exact: true });+ await storageTab.click();+ await expect.poll(() => new URL(page.url()).searchParams.get('tab')).toBe('storage');+ await expect(storageTab).toHaveAttribute('data-state', 'active');const dockerTab = page.getByRole('tab', { name: 'Docker Settings', exact: true });await dockerTab.click();@@ -111,11 +122,11 @@ test.describe('Environment Settings UI', () => {await expect(page).toHaveURL(/\/settings$/);await page.goto(`/environments/${LOCAL_ENV_ID}?source=e2e&tab=invalid#tab-state`);- await expect.poll(() => new URL(page.url()).searchParams.get('tab')).toBe('general');+ await expect.poll(() => new URL(page.url()).searchParams.get('tab')).toBe('storage');const canonicalUrl = new URL(page.url());expect(canonicalUrl.searchParams.get('source')).toBe('e2e');expect(canonicalUrl.hash).toBe('#tab-state');- await expect(page.getByRole('tab', { name: 'General', exact: true })).toHaveAttribute(+ await expect(page.getByRole('tab', { name: 'Storage & Limits', exact: true })).toHaveAttribute('data-state','active');@@ -129,24 +140,23 @@ test.describe('Environment Settings UI', () => {try {await createDirectEnvironmentViaUI(page, envName);await page.getByRole('button', { name: envName, exact: true }).click();- await expect(page).toHaveURL(/\/environments\/[^/?]+\?tab=general$/);+ await expect(page).toHaveURL(/\/environments\/[^/?]+\?tab=[a-z]+$/);const environmentId = new URL(page.url()).pathname.split('/').pop()!;- const nameInput = page.locator('#env-name');- await nameInput.fill(updatedName);+ await renameEnvironmentInHeader(page, updatedName);await saveAndWaitForPut(page, `/api/environments/${environmentId}`);await page.reload();- await expect(page.locator('#env-name')).toHaveValue(updatedName);+ await expect(environmentTitleButton(page)).toHaveText(updatedName);} finally {await deleteEnvironmentViaUI(page, updatedName);await deleteEnvironmentViaUI(page, envName);}});- test('should update and save general environment settings', async ({ page }) => {+ test('should update and save the base server URL in Docker settings', async ({ page }) => {await openLocalEnvironment(page);- await page.getByRole('tab', { name: 'General', exact: true }).click();+ await page.getByRole('tab', { name: 'Docker Settings', exact: true }).click();const baseServerUrlInput = page.locator('#base-server-url');await expect(baseServerUrlInput).toBeVisible();@@ -162,13 +172,13 @@ test.describe('Environment Settings UI', () => {await saveAndWaitForPut(page, `/api/environments/${LOCAL_ENV_ID}/settings`);await page.reload();- await page.getByRole('tab', { name: 'General', exact: true }).click();+ await page.getByRole('tab', { name: 'Docker Settings', exact: true }).click();await expect(page.locator('#base-server-url')).toHaveValue(updatedBaseServerUrl, {timeout: 15000});} finally {if (!page.isClosed()) {- await page.getByRole('tab', { name: 'General', exact: true }).click();+ await page.getByRole('tab', { name: 'Docker Settings', exact: true }).click();const currentValue = await page.locator('#base-server-url').inputValue();if (currentValue !== originalBaseServerUrl) {await page.locator('#base-server-url').fill(originalBaseServerUrl);@@ -178,11 +188,11 @@ test.describe('Environment Settings UI', () => {}});- test('should update and save the follow project symlinks setting from General', async ({+ test('should update and save the follow project symlinks setting from Storage & Limits', async ({page}) => {await openLocalEnvironment(page);- await page.getByRole('tab', { name: 'General', exact: true }).click();+ await page.getByRole('tab', { name: 'Storage & Limits', exact: true }).click();const followProjectSymlinksSwitch = page.locator('#follow-project-symlinks');await expect(followProjectSymlinksSwitch).toBeVisible();@@ -213,14 +223,14 @@ test.describe('Environment Settings UI', () => {expect(response.ok()).toBeTruthy();await page.reload();- await page.getByRole('tab', { name: 'General', exact: true }).click();+ await page.getByRole('tab', { name: 'Storage & Limits', exact: true }).click();await expect(page.locator('#follow-project-symlinks')).toHaveAttribute('aria-checked',String(updatedChecked));} finally {if (!page.isClosed()) {- await page.getByRole('tab', { name: 'General', exact: true }).click();+ await page.getByRole('tab', { name: 'Storage & Limits', exact: true }).click();const currentChecked =(await page.locator('#follow-project-symlinks').getAttribute('aria-checked')) === 'true';if (currentChecked !== originalChecked) {@@ -234,9 +244,9 @@ test.describe('Environment Settings UI', () => {test('should reset unsaved environment detail changes', async ({ page }) => {await openLocalEnvironment(page);- const nameInput = page.locator('#env-name');- const originalName = await nameInput.inputValue();- await nameInput.fill(`${originalName}-pending`);+ const titleButton = environmentTitleButton(page);+ const originalName = (await titleButton.textContent())!.trim();+ await renameEnvironmentInHeader(page, `${originalName}-pending`);const saveButton = page.getByRole('button', { name: 'Save', exact: true }).first();const resetButton = page.getByRole('button', { name: 'Reset', exact: true }).first();@@ -245,7 +255,7 @@ test.describe('Environment Settings UI', () => {await expect(resetButton).toBeVisible();await resetButton.click();- await expect(nameInput).toHaveValue(originalName);+ await expect(titleButton).toHaveText(originalName);await expect(saveButton).toBeDisabled();});diff --git a/tests/spec/project.spec.ts b/tests/spec/project.spec.tsindex 728b23f26..d049cf418 100644--- a/tests/spec/project.spec.ts+++ b/tests/spec/project.spec.ts@@ -710,8 +710,17 @@ test.describe('New Compose Project Page', () => {// The activity record is committed before the streamed response reaches EOF in// the browser, so polling the API can beat the detail page's local state update.// Reload from the completed server state before asserting the rendered action.- await page.reload();- await expect(page).toHaveURL(new RegExp(`/projects/${projectId}`));+ // A transient 500 from any request in the reload's load chain lands on the app+ // error page (rendered as the generic "Unable to connect to Docker daemon"+ // message), which never recovers on its own — retry the reload instead of+ // failing the test on a one-off backend blip under CI load.+ await expect(async () => {+ await page.reload();+ await expect(page).toHaveURL(new RegExp(`/projects/${projectId}`));+ await expect(page.getByRole('button', { name: projectName, exact: true })).toBeVisible({+ timeout: 10000+ });+ }).toPass({ timeout: 60000 });await expect.poll(async () => (await fetchProjectDetail(page, projectId))?.status, {message: 'Expected project to still be running after reload',