Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
chore: minor dashboard ui cleanup
Kyle Mendell0ee06de7380e
diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex e7ddc090f..20ca2186e 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -500,10 +500,8 @@"dashboard_meter_gpu_devices": "devices","dashboard_meter_usage": "Usage","dashboard_meter_capacity": "Capacity",- "dashboard_all_transport_http": "HTTP",- "dashboard_all_transport_edge": "Edge",- "dashboard_all_transport_websocket": "WebSocket",- "dashboard_all_transport_grpc": "gRPC",+ "dashboard_all_role_manager": "Manager",+ "dashboard_all_role_agent": "Agent","dashboard_all_last_seen": "Last seen","dashboard_all_activity": "Activity","dashboard_all_no_visible_environments": "No visible environments",diff --git a/frontend/src/lib/components/ui/badge/badge.svelte b/frontend/src/lib/components/ui/badge/badge.svelteindex 75110309d..df6f3862c 100644--- a/frontend/src/lib/components/ui/badge/badge.svelte+++ b/frontend/src/lib/components/ui/badge/badge.svelte@@ -11,6 +11,7 @@'bg-destructive [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/70 border-transparent text-white',outline:'backdrop-blur-sm bg-card/60 text-foreground [a&]:hover:backdrop-blur-sm [a&]:hover:bg-card/90 [a&]:hover:text-accent-foreground',+ primary: 'text-primary bg-primary/10 border-primary/20',red: 'text-red-600 bg-red-500/10 border-red-500/20 dark:text-red-400 dark:bg-red-500/10 dark:border-red-500/30',orange:'text-orange-600 bg-orange-500/10 border-orange-500/20 dark:text-orange-400 dark:bg-orange-500/10 dark:border-orange-500/30',diff --git a/frontend/src/routes/(app)/dashboard/dash-metric-tile.svelte b/frontend/src/routes/(app)/dashboard/dash-metric-tile.svelteindex d95f7c158..a49f08da6 100644--- a/frontend/src/routes/(app)/dashboard/dash-metric-tile.svelte+++ b/frontend/src/routes/(app)/dashboard/dash-metric-tile.svelte@@ -14,11 +14,15 @@let { title, value, label, icon: Icon, meterValue = null, labelClass }: Props = $props();+ const HIGH_USAGE_THRESHOLD = 90;+const meterPercent = $derived.by(() => {if (meterValue === null) return 0;return Math.max(0, Math.min(100, meterValue));});+ const meterIsHigh = $derived(meterPercent >= HIGH_USAGE_THRESHOLD);+const meterWidth = $derived.by(() => {return `width: ${meterPercent}%`;});@@ -47,12 +51,18 @@{/each}</div><div- class="absolute inset-y-0 left-0 rounded-full bg-gradient-to-r from-primary/65 via-primary to-violet-500/85 transition-[width] duration-700 ease-out motion-reduce:transition-none"+ class={cn(+ 'absolute inset-y-0 left-0 rounded-full bg-gradient-to-r transition-[width] duration-700 ease-out motion-reduce:transition-none',+ meterIsHigh ? 'from-primary/65 via-primary to-red-500' : 'from-primary/65 to-primary'+ )}style={meterWidth}></div>{#if meterPercent > 0}<div- class="absolute top-1/2 size-2 -translate-y-1/2 rounded-full bg-primary shadow-[0_0_0_2px_hsl(var(--background))] transition-[left] duration-700 ease-out motion-reduce:transition-none"+ class={cn(+ 'absolute top-1/2 size-2 -translate-y-1/2 rounded-full shadow-[0_0_0_2px_hsl(var(--background))] transition-[left] duration-700 ease-out motion-reduce:transition-none',+ meterIsHigh ? 'bg-red-500' : 'bg-primary'+ )}style={meterDotStyle}></div>{/if}diff --git a/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte b/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelteindex b9dc8bd83..b8e82daf2 100644--- a/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte+++ b/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte@@ -17,7 +17,7 @@import { systemService } from '$lib/services/system-service';import { activityStore } from '$lib/stores/activity.store.svelte';import { dashboardStore } from '$lib/stores/dashboard.store.svelte';- import { environmentStore } from '$lib/stores/environment.store.svelte';+ import { environmentStore, LOCAL_DOCKER_ENVIRONMENT_ID } from '$lib/stores/environment.store.svelte';import userStore from '$lib/stores/user-store';import { hasAnyPermission, hasPermission } from '$lib/utils/auth';import { formatDateTime } from '$lib/utils/formatting';@@ -34,9 +34,8 @@import type { PruneType, SystemPruneRequest } from '$lib/types/automation';import type { Settings } from '$lib/types/settings';import { extractApiErrorMessage, handleApiResultWithCallbacks } from '$lib/utils/api';- import { capitalizeFirstLetter } from '$lib/utils/formatting';import { tryCatch } from '$lib/utils/api';- import { getEnvironmentStatusVariant, isEnvironmentOnline, resolveEnvironmentStatus } from '$lib/utils/docker';+ import { isEnvironmentOnline, resolveEnvironmentStatus } from '$lib/utils/docker';import { activityToastOptions, extractActivityId } from '$lib/utils/activity-toast';import { createStatsWebSocket, type ReconnectingWebSocket } from '$lib/utils/ws';import { bytes } from '$lib/utils/formatting';@@ -427,21 +426,10 @@}}- function getTransportBadge(environment: Environment): { text: string; variant: 'blue' | 'purple' | 'gray' } {- if (!environment.isEdge) {- return { text: m.dashboard_all_transport_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: m.dashboard_all_transport_edge(), variant: 'gray' };- }-- return transport === 'websocket'- ? { text: m.dashboard_all_transport_websocket(), variant: 'purple' }- : { text: m.dashboard_all_transport_grpc(), variant: 'blue' };+ function getRoleBadge(environment: Environment): { text: string; variant: 'primary' | 'gray' } {+ return environment.id === LOCAL_DOCKER_ENVIRONMENT_ID+ ? { text: m.dashboard_all_role_manager(), variant: 'primary' }+ : { text: m.dashboard_all_role_agent(), variant: 'gray' };}function getResolvedStatusLabel(environment: Environment): string {@@ -855,9 +843,7 @@{#each environmentCards as item (item.environment.id)}{@const baseItem = createBaseEnvironmentOverview(item.environment)}{@const environment = baseItem.environment}- {@const resolvedStatus = resolveEnvironmentStatus(environment)}- {@const statusVariant = getEnvironmentStatusVariant(resolvedStatus)}- {@const transportBadge = getTransportBadge(environment)}+ {@const roleBadge = getRoleBadge(environment)}{@const activity = getActivityMeta(environment)}{@const isCurrent = currentEnvironmentId === environment.id}{@const liveStatsState = getLiveStatsState(environment.id)}@@ -870,19 +856,14 @@<Card.Rootvariant="outlined"- class={`dashboard-environment-card [container-type:inline-size] overflow-hidden border transition-colors ${isCurrent ? 'border-blue-500/40 bg-blue-500/5' : 'border-border/60'}`}+ class={`dashboard-environment-card [container-type:inline-size] overflow-hidden border transition-colors ${isCurrent ? 'border-primary/40 bg-primary/5' : 'border-border/60'}`}><Card.Content class="space-y-5 p-5"><div class="flex flex-col gap-3 border-b border-border/60 pb-4 sm:flex-row sm:items-start sm:justify-between"><div class="min-w-0 space-y-2"><div class="flex min-w-0 flex-wrap items-center gap-2"><div class="max-w-full min-w-0 text-base font-semibold tracking-tight break-words">{environment.name}</div>- {#if isCurrent}- <Badge variant="blue" size="sm">{m.common_current()}</Badge>- {/if}- <Badge variant={statusVariant} size="sm">{capitalizeFirstLetter(getResolvedStatusLabel(environment))}</Badge- >- <Badge variant={transportBadge.variant} size="sm">{transportBadge.text}</Badge>+ <Badge variant={roleBadge.variant} size="sm">{roleBadge.text}</Badge>{#if boardState}{@const loadedItem = boardState.overviewById.get(environment.id) ?? baseItem}{@const vInfo =@@ -970,7 +951,7 @@class={cn('size-8',btn.action === 'prune' && 'text-destructive hover:bg-destructive/10 hover:text-destructive',- isActiveEnv && 'disabled:opacity-100 [&_svg]:text-blue-600! dark:[&_svg]:text-blue-500!'+ isActiveEnv && 'disabled:opacity-100 [&_svg]:text-primary!')}/>{/snippet}