Skip to content

Modern Docker Management, Designed for Everyone

feat: redesigned events view to remove bulky dialog (#3301)

Kyle Mendell900a3e9d2a00
diff --git a/backend/api/handlers/events.go b/backend/api/handlers/events.go
index 71c7d69fd..229ca7f2f 100644
--- a/backend/api/handlers/events.go
+++ b/backend/api/handlers/events.go
@@ -42,13 +42,25 @@ type ListEventsInput struct {
Start int `query:"start" default:"0" doc:"Start index"`
Limit int `query:"limit" default:"20" doc:"Limit"`
Severity string `query:"severity" doc:"Filter by severity"`
- Type string `query:"type" doc:"Filter by event type"`
+ Type string `query:"type" doc:"Filter by event type (exact type or category prefix, comma-separated)"`
}
type ListEventsOutput struct {
Body EventPaginatedResponse
}
+type GetEventStatsInput struct{}
+
+// EventStatsResponse is a dedicated response type to avoid schema name collision.
+type EventStatsResponse struct {
+ Success bool `json:"success"`
+ Data services.EventSeverityCounts `json:"data"`
+}
+
+type GetEventStatsOutput struct {
+ Body EventStatsResponse
+}
+
type GetEventsByEnvironmentInput struct {
EnvironmentID string `path:"environmentId" doc:"Environment ID"`
Search string `query:"search" doc:"Search query"`
@@ -57,7 +69,7 @@ type GetEventsByEnvironmentInput struct {
Start int `query:"start" default:"0" doc:"Start index"`
Limit int `query:"limit" default:"20" doc:"Limit"`
Severity string `query:"severity" doc:"Filter by severity"`
- Type string `query:"type" doc:"Filter by event type"`
+ Type string `query:"type" doc:"Filter by event type (exact type or category prefix, comma-separated)"`
}
type GetEventsByEnvironmentOutput struct {
@@ -158,6 +170,20 @@ func RegisterEvents(api huma.API, eventService *services.EventService) {
Middlewares: humamw.RequirePermission(api, authz.PermEventsRead),
}, h.ListEvents)
+ huma.Register(api, huma.Operation{
+ OperationID: "getEventStats",
+ Method: "GET",
+ Path: "/events/stats",
+ Summary: "Event severity counts",
+ Description: "Get global event counts grouped by severity",
+ Tags: []string{"Events"},
+ Security: []map[string][]string{
+ {"BearerAuth": {}},
+ {"ApiKeyAuth": {}},
+ },
+ Middlewares: humamw.RequirePermission(api, authz.PermEventsRead),
+ }, h.GetEventStats)
+
huma.Register(api, huma.Operation{
OperationID: "deleteEvent",
Method: "DELETE",
@@ -220,6 +246,25 @@ func (h *EventHandler) ListEvents(ctx context.Context, input *ListEventsInput) (
}, nil
}
+// GetEventStats returns global event counts grouped by severity.
+func (h *EventHandler) GetEventStats(ctx context.Context, _ *GetEventStatsInput) (*GetEventStatsOutput, error) {
+ if h.eventService == nil {
+ return nil, huma.Error500InternalServerError("service not available")
+ }
+
+ counts, err := h.eventService.GetEventSeverityCounts(ctx)
+ if err != nil {
+ return nil, huma.Error500InternalServerError((&common.EventStatsError{Err: err}).Error())
+ }
+
+ return &GetEventStatsOutput{
+ Body: EventStatsResponse{
+ Success: true,
+ Data: counts,
+ },
+ }, nil
+}
+
// GetEventsByEnvironment returns events for a specific environment.
func (h *EventHandler) GetEventsByEnvironment(ctx context.Context, input *GetEventsByEnvironmentInput) (*GetEventsByEnvironmentOutput, error) {
if h.eventService == nil {
diff --git a/backend/internal/common/errors.go b/backend/internal/common/errors.go
index 1a3a46441..e25050a4c 100644
--- a/backend/internal/common/errors.go
+++ b/backend/internal/common/errors.go
@@ -515,6 +515,14 @@ func (e *EventListError) Error() string {
return fmt.Sprintf("Failed to list events: %v", e.Err)
}
+type EventStatsError struct {
+ Err error
+}
+
+func (e *EventStatsError) Error() string {
+ return fmt.Sprintf("Failed to load event statistics: %v", e.Err)
+}
+
type EnvironmentIDRequiredError struct{}
func (e *EnvironmentIDRequiredError) Error() string {
diff --git a/backend/internal/services/event_service.go b/backend/internal/services/event_service.go
index cbabbe183..160faf6c9 100644
--- a/backend/internal/services/event_service.go
+++ b/backend/internal/services/event_service.go
@@ -295,7 +295,7 @@ func (s *EventService) ListEventsPaginated(ctx context.Context, params paginatio
}
q = pagination.ApplyFilter(q, "severity", params.Filters["severity"])
- q = pagination.ApplyFilter(q, "type", params.Filters["type"])
+ q = applyEventTypeFilter(q, params.Filters["type"])
q = pagination.ApplyFilter(q, "resource_type", params.Filters["resourceType"])
q = pagination.ApplyFilter(q, "username", params.Filters["username"])
q = pagination.ApplyFilter(q, "environment_id", params.Filters["environmentId"])
@@ -326,7 +326,7 @@ func (s *EventService) GetEventsByEnvironmentPaginated(ctx context.Context, envi
}
q = pagination.ApplyFilter(q, "severity", params.Filters["severity"])
- q = pagination.ApplyFilter(q, "type", params.Filters["type"])
+ q = applyEventTypeFilter(q, params.Filters["type"])
q = pagination.ApplyFilter(q, "resource_type", params.Filters["resourceType"])
q = pagination.ApplyFilter(q, "username", params.Filters["username"])
@@ -343,6 +343,82 @@ func (s *EventService) GetEventsByEnvironmentPaginated(ctx context.Context, envi
return eventDtos, paginationResp, nil
}
+// applyEventTypeFilter filters by event type. Values containing a '.' are
+// exact types (e.g. "container.start"); values without one are category
+// prefixes (e.g. "container" matches "container.%"). Comma-separated values
+// are OR-ed together, mirroring pagination.ApplyFilter's multi-value handling.
+func applyEventTypeFilter(q *gorm.DB, value string) *gorm.DB {
+ if value == "" {
+ return q
+ }
+ var (
+ exact []string
+ conds []string
+ args []any
+ )
+ for part := range strings.SplitSeq(value, ",") {
+ part = strings.TrimSpace(part)
+ if part == "" {
+ continue
+ }
+ if strings.Contains(part, ".") {
+ exact = append(exact, part)
+ } else {
+ conds = append(conds, "type LIKE ?")
+ args = append(args, part+".%")
+ }
+ }
+ if len(exact) > 0 {
+ conds = append(conds, "type IN ?")
+ args = append(args, exact)
+ }
+ if len(conds) == 0 {
+ return q
+ }
+ return q.Where(strings.Join(conds, " OR "), args...)
+}
+
+// EventSeverityCounts holds global event counts per severity.
+type EventSeverityCounts struct {
+ Total int64 `json:"total"`
+ Info int64 `json:"info"`
+ Success int64 `json:"success"`
+ Warning int64 `json:"warning"`
+ Error int64 `json:"error"`
+}
+
+func (s *EventService) GetEventSeverityCounts(ctx context.Context) (EventSeverityCounts, error) {
+ var rows []struct {
+ Severity string
+ Count int64
+ }
+ if err := s.db.WithContext(ctx).Model(&models.Event{}).
+ Select("severity, COUNT(*) AS count").
+ Group("severity").
+ Scan(&rows).Error; err != nil {
+ return EventSeverityCounts{}, fmt.Errorf("failed to count events by severity: %w", err)
+ }
+
+ var counts EventSeverityCounts
+ for _, r := range rows {
+ switch models.EventSeverity(r.Severity) {
+ case models.EventSeveritySuccess:
+ counts.Success = r.Count
+ case models.EventSeverityWarning:
+ counts.Warning = r.Count
+ case models.EventSeverityError:
+ counts.Error = r.Count
+ case models.EventSeverityInfo:
+ counts.Info += r.Count
+ default:
+ // Unclassified severities fold into Info.
+ counts.Info += r.Count
+ }
+ counts.Total += r.Count
+ }
+ return counts, nil
+}
+
func (s *EventService) DeleteEvent(ctx context.Context, eventID string) error {
return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
result := tx.Delete(&models.Event{}, "id = ?", eventID)
diff --git a/backend/internal/services/event_service_test.go b/backend/internal/services/event_service_test.go
index a2c3a3891..426477a10 100644
--- a/backend/internal/services/event_service_test.go
+++ b/backend/internal/services/event_service_test.go
@@ -12,6 +12,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/models"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
sqlite "github.com/libtnb/sqlite"
"github.com/stretchr/testify/require"
@@ -277,3 +278,60 @@ func TestEventService_CreateEvent_NormalizesActor(t *testing.T) {
require.Equal(t, "kmendell", *evt.Username)
})
}
+
+func TestEventService_GetEventSeverityCounts(t *testing.T) {
+ ctx := context.Background()
+ db := setupEventServiceTestDB(t)
+ svc := NewEventService(db, nil, nil)
+
+ seed := []models.EventSeverity{
+ models.EventSeverityInfo,
+ models.EventSeverityInfo,
+ models.EventSeveritySuccess,
+ models.EventSeverityError,
+ }
+ for i, severity := range seed {
+ _, err := svc.CreateEvent(ctx, CreateEventRequest{
+ Type: models.EventTypeContainerStart,
+ Severity: severity,
+ Title: "event",
+ })
+ require.NoError(t, err, "seed event %d", i)
+ }
+
+ counts, err := svc.GetEventSeverityCounts(ctx)
+ require.NoError(t, err)
+ require.Equal(t, EventSeverityCounts{Total: 4, Info: 2, Success: 1, Warning: 0, Error: 1}, counts)
+}
+
+func TestEventService_ListEventsPaginated_TypeCategoryFilter(t *testing.T) {
+ ctx := context.Background()
+ db := setupEventServiceTestDB(t)
+ svc := NewEventService(db, nil, nil)
+
+ for _, eventType := range []models.EventType{
+ models.EventTypeContainerStart,
+ models.EventTypeContainerStop,
+ models.EventTypeImagePull,
+ } {
+ _, err := svc.CreateEvent(ctx, CreateEventRequest{Type: eventType, Title: "event"})
+ require.NoError(t, err)
+ }
+
+ listWithTypeFilter := func(value string) []string {
+ events, _, err := svc.ListEventsPaginated(ctx, pagination.QueryParams{
+ Params: pagination.Params{Limit: 10},
+ Filters: map[string]string{"type": value},
+ })
+ require.NoError(t, err)
+ types := make([]string, 0, len(events))
+ for _, e := range events {
+ types = append(types, string(e.Type))
+ }
+ return types
+ }
+
+ require.ElementsMatch(t, []string{"container.start", "container.stop"}, listWithTypeFilter("container"))
+ require.ElementsMatch(t, []string{"image.pull"}, listWithTypeFilter("image.pull"))
+ require.ElementsMatch(t, []string{"container.start", "container.stop", "image.pull"}, listWithTypeFilter("container,image.pull"))
+}
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 1e96685fd..1d45d5212 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -1544,24 +1544,27 @@
"events_subtitle": "Monitor events that have taken place in Arcane.",
"events_remove_selected": "Remove Selected",
"events_total": "Total Events",
- "events_total_subtitle": "All recorded events",
"events_info": "Info",
- "events_info_subtitle": "Information events",
"events_success": "Success",
- "events_success_subtitle": "Successful operations",
"events_warning": "Warning",
- "events_warning_subtitle": "Warning events",
"events_error": "Error",
- "events_error_subtitle": "Error events",
- "events_delete_item_failed": "Failed to delete event {id}",
"events_col_severity": "Severity",
"events_col_resource": "Resource",
"events_col_time": "Time",
- "events_details_title": "Event Details",
+ "events_category_webhook": "Webhook",
+ "events_category_notification": "Notification",
+ "events_action_restart": "Restarted",
+ "events_action_delete": "Deleted",
+ "events_action_deploy": "Deployed",
+ "events_action_pull": "Pulled",
+ "events_action_scan": "Scanned",
+ "events_action_login": "Login",
+ "events_action_send": "Sent",
+ "events_action_execute": "Executed",
+ "events_action_prune": "Prune",
"events_resource_id_label": "Resource ID",
"events_resource_name_label": "Resource Name",
"events_metadata_title": "Metadata",
- "events_raw_event_title": "Raw Event",
"events_no_metadata_provided": "No metadata provided.",
"events_copy_resource_id_title": "Copy resource id",
"events_copy_resource_name_title": "Copy resource name",
@@ -3442,7 +3445,6 @@
"container_select_restart_policy": "Select restart policy",
"docker_copy_commit_hash": "Copy full commit hash",
"common_clear_search": "Clear search",
- "event_copy_metadata": "Copy metadata JSON",
"common_documentation": "Documentation",
"common_github": "GitHub",
"file_browser_restore": "Restore file from backup",
diff --git a/frontend/src/lib/components/arcane-table/arcane-table-desktop-view.svelte b/frontend/src/lib/components/arcane-table/arcane-table-desktop-view.svelte
index c6d02f8cb..b5e235ee3 100644
--- a/frontend/src/lib/components/arcane-table/arcane-table-desktop-view.svelte
+++ b/frontend/src/lib/components/arcane-table/arcane-table-desktop-view.svelte
@@ -142,13 +142,20 @@
// Row actions are a real pinned column: sticky to the row's right edge with its own reserved
// width, so the floating button never overlaps data columns and survives horizontal scroll.
- // bg-inherit picks up the row's background (including hover/selected tints) to mask content
- // scrolling beneath the sticky cell. Under the virtualized table-fixed layout an auto-sized
- // (w-0 + nowrap) column would collapse, so it gets an explicit width there instead.
+ // The gutter must stay opaque to mask content scrolling beneath it, so it can't bg-inherit the
+ // row's translucent tints (they'd stack with the row's own paint into a darker block). Instead it
+ // mirrors the row states from ui/table table-row.svelte as pre-composited opaque colors. Under
+ // the virtualized table-fixed layout an auto-sized (w-0 + nowrap) column would collapse, so it
+ // gets an explicit width there instead.
const actionsCellClasses = $derived(
- shouldVirtualize
- ? 'sticky right-0 z-[var(--arcane-z-sticky)] w-24 bg-inherit p-0 whitespace-nowrap'
- : 'sticky right-0 z-[var(--arcane-z-sticky)] w-0 bg-inherit p-0 whitespace-nowrap'
+ cn(
+ 'sticky right-0 z-[var(--arcane-z-sticky)] p-0 whitespace-nowrap',
+ shouldVirtualize ? 'w-24' : 'w-0',
+ 'bg-background',
+ 'group-hover/row:bg-[color-mix(in_oklab,var(--color-primary)_10%,var(--color-background))]',
+ 'group-data-[state=selected]/row:bg-[color-mix(in_oklab,var(--color-primary)_20%,var(--color-background))]',
+ 'group-data-[expanded]/row:bg-[color-mix(in_oklab,var(--color-primary)_15%,var(--color-background))]'
+ )
);
// Runes can't be created conditionally, so the virtualizer always exists but is `enabled` only
@@ -185,6 +192,7 @@
<Table.Row
{@attach measureRow}
data-state={(selectedIds ?? []).includes(rowId) && 'selected'}
+ data-expanded={isExpanded ? true : undefined}
onclick={(event) => handleRowClick(event, rowId)}
class={cn(hasExpand && 'cursor-pointer', isExpanded && 'bg-primary/15')}
>
@@ -248,7 +256,7 @@
class={cn(
'h-full w-full',
unstyled &&
- '[&_tr]:border-border/40! [&_thead]:bg-transparent! [&_thead]:backdrop-blur-none [&_tr]:bg-transparent! [&_tr]:hover:bg-transparent! [&_tr:hover_td]:bg-transparent! [&_tr[data-state=selected]]:bg-transparent! [&_tr[data-state=selected]_td]:bg-transparent!'
+ '[&_tr]:border-border/40! [&_thead]:bg-transparent! [&_thead]:backdrop-blur-none [&_tr]:bg-transparent! [&_tr]:hover:bg-transparent! [&_td]:bg-transparent! [&_tr:hover_td]:bg-transparent! [&_tr[data-state=selected]]:bg-transparent! [&_tr[data-state=selected]_td]:bg-transparent!'
)}
>
<Table.Root class={shouldVirtualize ? 'table-fixed' : undefined}>
diff --git a/frontend/src/lib/components/arcane-table/arcane-table-toolbar.svelte b/frontend/src/lib/components/arcane-table/arcane-table-toolbar.svelte
index 5334f8d60..3721881d7 100644
--- a/frontend/src/lib/components/arcane-table/arcane-table-toolbar.svelte
+++ b/frontend/src/lib/components/arcane-table/arcane-table-toolbar.svelte
@@ -76,7 +76,7 @@
// Check if any filter columns exist
const hasFilterColumns = $derived(
!withoutFilters &&
- (!!(typeColumn && typeColumnFilterOptions.length > 0 && !severityColumn && !vulnSeverityColumn) ||
+ (!!(typeColumn && typeColumnFilterOptions.length > 0) ||
!!usageColumn ||
!!updatesColumn ||
!!severityColumn ||
@@ -88,7 +88,7 @@
</script>
{#snippet filterList()}
- {#if typeColumn && typeColumnFilterOptions.length > 0 && !severityColumn && !vulnSeverityColumn}
+ {#if typeColumn && typeColumnFilterOptions.length > 0}
<DataTableFacetedFilter column={typeColumn} title={m.common_type()} options={typeColumnFilterOptions} />
{/if}
{#if usageColumn}
diff --git a/frontend/src/lib/components/arcane-table/cells/relative-time-cell.svelte b/frontend/src/lib/components/arcane-table/cells/relative-time-cell.svelte
new file mode 100644
index 000000000..b11b23afe
--- /dev/null
+++ b/frontend/src/lib/components/arcane-table/cells/relative-time-cell.svelte
@@ -0,0 +1,26 @@
+<script lang="ts">
+ import { formatDistanceToNow } from 'date-fns';
+ import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
+ import { formatDateTime } from '$lib/utils/formatting';
+ import { m } from '$lib/paraglide/messages';
+
+ let { value }: { value: unknown } = $props();
+
+ const date = $derived(value ? new Date(String(value)) : null);
+ const valid = $derived(!!date && !Number.isNaN(date.getTime()));
+</script>
+
+{#if valid && date}
+ <ArcaneTooltip.Root>
+ <!-- The child snippet renders a plain span: the default trigger wrapper is
+ interactive and would swallow the table's row-expand click. -->
+ <ArcaneTooltip.Trigger>
+ {#snippet child({ props })}
+ <span {...props} class="text-sm whitespace-nowrap">{formatDistanceToNow(date, { addSuffix: true })}</span>
+ {/snippet}
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content>{formatDateTime(date, { includeSeconds: true })}</ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+{:else}
+ <span class="text-muted-foreground text-sm">{m.common_na()}</span>
+{/if}
diff --git a/frontend/src/lib/components/arcane-table/index.ts b/frontend/src/lib/components/arcane-table/index.ts
index d169e1145..972920217 100644
--- a/frontend/src/lib/components/arcane-table/index.ts
+++ b/frontend/src/lib/components/arcane-table/index.ts
@@ -1,7 +1,7 @@
export { default as DataTableToolbar } from './arcane-table-toolbar.svelte';
export { default as DataTableViewOptions } from './arcane-table-view-options.svelte';
export { default as DataTableFacetedFilter } from './arcane-table-filter.svelte';
-export type { ColumnSpec, FieldSpec, MobileFieldVisibility, BulkAction } from './arcane-table.types.svelte';
+export type { ColumnSpec, FieldSpec, FilterOption, MobileFieldVisibility, BulkAction } from './arcane-table.types.svelte';
export type {
ArcaneFeatures,
ArcaneColumnDef,
diff --git a/frontend/src/lib/components/dialogs/event-details-dialog.svelte b/frontend/src/lib/components/dialogs/event-details-dialog.svelte
deleted file mode 100644
index c97ba7393..000000000
--- a/frontend/src/lib/components/dialogs/event-details-dialog.svelte
+++ /dev/null
@@ -1,271 +0,0 @@
-<script lang="ts">
- import { ResponsiveDialog } from '$lib/components/ui/responsive-dialog/index.js';
- import { ArcaneButton } from '$lib/components/arcane-button/index.js';
- import { Badge } from '$lib/components/ui/badge';
- import { CopyButton } from '$lib/components/ui/copy-button';
- import type { Event } from '$lib/types/shared';
- import { m } from '$lib/paraglide/messages';
- import { environmentStore, LOCAL_DOCKER_ENVIRONMENT_ID } from '$lib/stores/environment.store.svelte';
- import { AlertIcon, InfoIcon, EnvironmentsIcon, UserIcon, ClockIcon } from '$lib/icons';
- import { formatDateTime } from '$lib/utils/formatting';
-
- type Severity = 'success' | 'warning' | 'error' | 'info';
-
- type MetadataEntry = {
- key: string;
- value: string;
- };
-
- interface Props {
- open: boolean;
- event: Event | null;
- }
-
- let { open = $bindable(), event }: Props = $props();
-
- let showRawEvent = $state(false);
-
- const eventJson = $derived.by(() => JSON.stringify(event ?? {}, null, 2));
- const metadataJson = $derived.by(() => JSON.stringify(event?.metadata ?? {}, null, 2));
- const formattedTimestamp = $derived(event?.timestamp ? formatDate(event.timestamp) : null);
- const severity = $derived((event?.severity ?? 'info') as Severity);
- const metadataEntries = $derived.by(() => flattenMetadata(event?.metadata ?? {}));
- const hasMetadata = $derived(metadataEntries.length > 0);
- const environmentName = $derived.by(() => {
- if (!event?.environmentId) {
- return null;
- }
- const matchedEnvironment = environmentStore.available.find((env) => env.id === event.environmentId);
- if (matchedEnvironment) {
- return matchedEnvironment.name;
- }
- if (event.environmentId === LOCAL_DOCKER_ENVIRONMENT_ID) {
- return m.environments_local_badge();
- }
- return event.environmentId;
- });
- const eventErrorMessage = $derived.by(() => {
- if (!event) {
- return null;
- }
- const metadataError = event.metadata?.['error'];
- if (typeof metadataError === 'string' && metadataError.trim() !== '') {
- return metadataError;
- }
- if (metadataError !== undefined && metadataError !== null) {
- return stringifyForDisplay(metadataError);
- }
- if (event.severity === 'error' && event.description) {
- return event.description;
- }
- return null;
- });
-
- function formatDate(timestamp: string): string {
- return formatDateTime(timestamp) || timestamp;
- }
-
- function stringifyForDisplay(value: unknown): string {
- if (value === null || value === undefined) {
- return '';
- }
- if (typeof value === 'string') {
- return value;
- }
- if (typeof value === 'number' || typeof value === 'boolean') {
- return String(value);
- }
- try {
- return JSON.stringify(value, null, 2);
- } catch {
- return String(value);
- }
- }
-
- function flattenMetadata(value: unknown, prefix = ''): MetadataEntry[] {
- if (Array.isArray(value)) {
- if (value.length === 0) {
- return prefix ? [{ key: prefix, value: '[]' }] : [];
- }
- return value.flatMap((item, index) => {
- const key = prefix ? `${prefix}[${index}]` : `[${index}]`;
- return flattenMetadata(item, key);
- });
- }
-
- if (value && typeof value === 'object') {
- const objectValue = value as Record<string, unknown>;
- const keys = Object.keys(objectValue).sort();
- if (keys.length === 0) {
- return prefix ? [{ key: prefix, value: '{}' }] : [];
- }
- return keys.flatMap((key) => {
- const nextPrefix = prefix ? `${prefix}.${key}` : key;
- return flattenMetadata(objectValue[key], nextPrefix);
- });
- }
-
- if (!prefix) {
- return [];
- }
- return [{ key: prefix, value: stringifyForDisplay(value) }];
- }
-
- function getSeverityIconClass(sev: Severity): string {
- const baseClasses: Record<Severity, string> = {
- success: 'text-emerald-600 dark:text-emerald-400',
- warning: 'text-amber-600 dark:text-amber-400',
- error: 'text-red-600 dark:text-red-400',
- info: 'text-blue-600 dark:text-blue-400'
- };
- return baseClasses[sev];
- }
-
- function handleClose() {
- open = false;
- }
-
- function toggleRawEvent() {
- showRawEvent = !showRawEvent;
- }
-</script>
-
-<ResponsiveDialog {open} onOpenChange={(nextOpen) => (open = nextOpen)} contentClass="sm:max-w-[980px]">
- {#snippet children()}
- <div class="space-y-4 pt-4">
- {@render headerContent()}
- {#if eventErrorMessage}
- {@render errorSection(eventErrorMessage)}
- {/if}
- {@render infoCards()}
- {@render metadataSection()}
- {@render rawEventSection()}
- </div>
- {/snippet}
-
- {#snippet footer()}
- <ArcaneButton action="base" tone="outline" customLabel={m.common_close()} onclick={handleClose} />
- {/snippet}
-</ResponsiveDialog>
-
-{#snippet headerContent()}
- <div class="flex items-start gap-3 border-b pb-4">
- <div class="mt-0.5">
- {#if severity === 'success'}
- <AlertIcon class={getSeverityIconClass(severity) + ' size-6'} />
- {:else if severity === 'warning'}
- <AlertIcon class={getSeverityIconClass(severity) + ' size-6'} />
- {:else if severity === 'error'}
- <AlertIcon class={getSeverityIconClass(severity) + ' size-6'} />
- {:else}
- <InfoIcon class={getSeverityIconClass(severity) + ' size-6'} />
- {/if}
- </div>
- <div class="min-w-0 flex-1">
- <h3 class="truncate text-xl font-semibold" title={event?.title}>
- {event?.title ?? m.events_details_title()}
- </h3>
- {#if event?.description}
- <p class="text-muted-foreground mt-1 text-sm">
- {event.description}
- </p>
- {/if}
- <div class="mt-3 flex flex-wrap items-center gap-2">
- <Badge variant="outline" class="gap-1">
- {event?.type ?? m.common_unknown()}
- </Badge>
- {#if event?.environmentId}
- <Badge variant="outline" class="gap-1">
- <EnvironmentsIcon class="size-3" />
- {m.events_environment_label()}: {environmentName ?? event.environmentId}
- </Badge>
- {/if}
- {#if formattedTimestamp}
- <span class="text-muted-foreground inline-flex items-center gap-1 text-xs">
- <ClockIcon class="size-3" />
- {formattedTimestamp}
- </span>
- {/if}
- </div>
- </div>
- </div>
-{/snippet}
-
-{#snippet errorSection(message: string)}
- <div class="rounded-lg border border-red-500/30 bg-red-500/10 p-3">
- <div class="text-xs font-semibold text-red-700 dark:text-red-300">{m.events_error()}</div>
- <p class="mt-1 text-sm break-words text-red-700 dark:text-red-200">{message}</p>
- </div>
-{/snippet}
-
-{#snippet infoCards()}
- <div class="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
- {@render infoCard(m.events_resource_id_label(), event?.resourceId, m.events_copy_resource_id_title())}
- {@render infoCard(m.events_resource_name_label(), event?.resourceName, m.events_copy_resource_name_title())}
-
- <div class="rounded-lg border p-3">
- <div class="text-muted-foreground text-xs">{m.common_user()}</div>
- <div class="mt-1 flex items-center gap-2 text-sm">
- <UserIcon class="text-muted-foreground size-4" />
- {event?.username ?? m.common_unknown()}
- </div>
- </div>
- </div>
-{/snippet}
-
-{#snippet infoCard(label: string, value: string | undefined, copyTitle: string)}
- <div class="rounded-lg border p-3">
- <div class="text-muted-foreground text-xs">{label}</div>
- <div class="mt-1 flex items-center justify-between gap-2">
- <div class="text-sm break-all">{value || '-'}</div>
- <CopyButton text={value ?? ''} size="icon" class="size-7" title={copyTitle} />
- </div>
- </div>
-{/snippet}
-
-{#snippet metadataSection()}
- <div class="rounded-lg border">
- <div class="flex items-center justify-between border-b px-3 py-2">
- <h3 class="text-sm font-medium">{m.events_metadata_title()}</h3>
- <CopyButton text={metadataJson} variant="outline" size="sm" title={m.event_copy_metadata()}>
- {m.common_copy_json()}
- </CopyButton>
- </div>
- {#if hasMetadata}
- <div class="max-h-[50vh] overflow-auto">
- {#each metadataEntries as entry (entry.key)}
- <div class="grid grid-cols-[minmax(0,260px)_1fr] items-start gap-3 border-b px-3 py-2 last:border-b-0">
- <div class="text-muted-foreground font-mono text-xs break-all">{entry.key}</div>
- <pre class="font-mono text-xs leading-relaxed break-all whitespace-pre-wrap">{entry.value}</pre>
- </div>
- {/each}
- </div>
- {:else}
- <div class="text-muted-foreground p-3 text-xs">{m.events_no_metadata_provided()}</div>
- {/if}
- </div>
-{/snippet}
-
-{#snippet rawEventSection()}
- <div class="rounded-lg border">
- <div class="flex items-center justify-between border-b px-3 py-2">
- <h3 class="text-sm font-medium">{m.events_raw_event_title()}</h3>
- <div class="flex items-center gap-2">
- <ArcaneButton
- action="base"
- tone="outline"
- size="sm"
- customLabel={`${showRawEvent ? m.common_hide() : m.common_show()} ${m.common_raw()}`}
- onclick={toggleRawEvent}
- />
- <CopyButton text={eventJson} variant="outline" size="sm" title={m.events_copy_full_event_json_title()}>
- {m.common_copy_json()}
- </CopyButton>
- </div>
- </div>
- {#if showRawEvent}
- <pre class="bg-muted/40 max-h-[60vh] overflow-auto p-3 text-xs leading-relaxed"><code class="font-mono">{eventJson}</code
- ></pre>
- {/if}
- </div>
-{/snippet}
diff --git a/frontend/src/lib/components/events/event-detail-panel.svelte b/frontend/src/lib/components/events/event-detail-panel.svelte
new file mode 100644
index 000000000..6d4e3505d
--- /dev/null
+++ b/frontend/src/lib/components/events/event-detail-panel.svelte
@@ -0,0 +1,162 @@
+<script lang="ts">
+ import { CopyButton } from '$lib/components/ui/copy-button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
+ import type { Event } from '$lib/types/shared';
+ import { m } from '$lib/paraglide/messages';
+ import { environmentStore, LOCAL_DOCKER_ENVIRONMENT_ID } from '$lib/stores/environment.store.svelte';
+ import { AlertIcon, InfoIcon } from '$lib/icons';
+ import { formatDateTime } from '$lib/utils/formatting';
+ import { eventSeverityIconVariant } from './events-labels';
+ import { flattenMetadata, stringifyForDisplay } from './event-metadata';
+
+ let { event }: { event: Event } = $props();
+
+ let showRawEvent = $state(false);
+
+ const eventJson = $derived(JSON.stringify(event, null, 2));
+ const metadataEntries = $derived(flattenMetadata(event.metadata ?? {}));
+ const hasMetadata = $derived(metadataEntries.length > 0);
+ const environmentName = $derived.by(() => {
+ if (!event.environmentId) {
+ return null;
+ }
+ const matchedEnvironment = environmentStore.available.find((env) => env.id === event.environmentId);
+ if (matchedEnvironment) {
+ return matchedEnvironment.name;
+ }
+ if (event.environmentId === LOCAL_DOCKER_ENVIRONMENT_ID) {
+ return m.environments_local_badge();
+ }
+ return event.environmentId;
+ });
+ const eventErrorMessage = $derived.by(() => {
+ const metadataError = event.metadata?.['error'];
+ if (typeof metadataError === 'string' && metadataError.trim() !== '') {
+ return metadataError;
+ }
+ if (metadataError !== undefined && metadataError !== null) {
+ return stringifyForDisplay(metadataError);
+ }
+ if (event.severity === 'error' && event.description) {
+ return event.description;
+ }
+ return null;
+ });
+
+ const severityIconClasses: Record<ReturnType<typeof eventSeverityIconVariant>, string> = {
+ emerald: 'bg-emerald-500/10 text-emerald-600 dark:text-emerald-400',
+ amber: 'bg-amber-500/10 text-amber-600 dark:text-amber-400',
+ red: 'bg-red-500/10 text-red-600 dark:text-red-400',
+ blue: 'bg-blue-500/10 text-blue-600 dark:text-blue-400'
+ };
+ const severityIconClass = $derived(severityIconClasses[eventSeverityIconVariant(event.severity)]);
+</script>
+
+<div class="border-border/60 bg-background overflow-hidden rounded-lg border shadow-sm">
+ <div class="space-y-4 px-5 py-4">
+ <div class="flex min-w-0 items-start justify-between gap-4">
+ <div class="flex min-w-0 items-start gap-3">
+ <div class={['flex size-9 shrink-0 items-center justify-center rounded-md', severityIconClass]}>
+ {#if event.severity === 'info'}
+ <InfoIcon class="size-4.5" aria-hidden="true" />
+ {:else}
+ <AlertIcon class="size-4.5" aria-hidden="true" />
+ {/if}
+ </div>
+ <div class="min-w-0">
+ <h3 class="truncate text-sm font-semibold" title={event.title}>{event.title}</h3>
+ {#if event.description}
+ <p class="text-muted-foreground mt-0.5 text-sm">{event.description}</p>
+ {/if}
+ </div>
+ </div>
+ <CopyButton
+ text={eventJson}
+ variant="ghost"
+ size="default"
+ class="h-8 shrink-0 px-2 text-xs"
+ title={m.events_copy_full_event_json_title()}
+ >
+ <span class="text-xs">{m.common_copy_json()}</span>
+ </CopyButton>
+ </div>
+
+ <div class="text-muted-foreground flex flex-wrap items-center gap-x-4 gap-y-1.5 text-xs">
+ <span class="text-foreground font-medium tabular-nums">{formatDateTime(event.timestamp, { includeSeconds: true })}</span>
+ {#if environmentName}
+ <span class="text-border">•</span>
+ <div class="flex items-center gap-1.5">
+ <span>{m.events_environment_label()}</span>
+ <span class="text-foreground font-medium">{environmentName}</span>
+ </div>
+ {/if}
+ <span class="text-border">•</span>
+ <div class="flex items-center gap-1.5">
+ <span>{m.common_user()}</span>
+ {#if (event.username ?? 'System') === 'System'}
+ <span class="italic">System</span>
+ {:else}
+ <span class="text-foreground font-medium">{event.username}</span>
+ {/if}
+ </div>
+ <span class="text-border">•</span>
+ <span class="font-mono">{event.type}</span>
+ </div>
+
+ {#if eventErrorMessage}
+ <div class="border-destructive/30 bg-destructive/10 text-destructive rounded-md border p-3 text-sm break-words">
+ {eventErrorMessage}
+ </div>
+ {/if}
+
+ {#if event.resourceId || event.resourceName}
+ <div class="grid gap-3 sm:grid-cols-2">
+ {#if event.resourceId}
+ {@render resourceCell(m.events_resource_id_label(), event.resourceId, m.events_copy_resource_id_title())}
+ {/if}
+ {#if event.resourceName}
+ {@render resourceCell(m.events_resource_name_label(), event.resourceName, m.events_copy_resource_name_title())}
+ {/if}
+ </div>
+ {/if}
+ </div>
+
+ <div class="border-border/60 border-t">
+ <div class="flex items-center justify-between px-5 py-2.5">
+ <span class="text-sm font-semibold">{m.events_metadata_title()}</span>
+ <ArcaneButton
+ action="base"
+ tone="ghost"
+ size="sm"
+ customLabel={`${showRawEvent ? m.common_hide() : m.common_show()} ${m.common_raw()}`}
+ onclick={() => (showRawEvent = !showRawEvent)}
+ />
+ </div>
+ {#if showRawEvent}
+ <pre class="bg-muted/40 border-border/50 max-h-80 overflow-auto border-t p-4 text-xs leading-relaxed"><code
+ class="font-mono">{eventJson}</code
+ ></pre>
+ {:else if hasMetadata}
+ <div class="border-border/50 max-h-80 overflow-auto border-t">
+ {#each metadataEntries as entry (entry.key)}
+ <div class="border-border/50 grid grid-cols-[minmax(0,260px)_1fr] items-start gap-3 border-b px-5 py-2 last:border-b-0">
+ <div class="text-muted-foreground font-mono text-xs break-all">{entry.key}</div>
+ <pre class="font-mono text-xs leading-relaxed break-all whitespace-pre-wrap">{entry.value}</pre>
+ </div>
+ {/each}
+ </div>
+ {:else}
+ <div class="text-muted-foreground border-border/50 border-t px-5 py-3 text-xs">{m.events_no_metadata_provided()}</div>
+ {/if}
+ </div>
+</div>
+
+{#snippet resourceCell(label: string, value: string, copyTitle: string)}
+ <div class="border-border/50 rounded-md border p-3">
+ <div class="text-muted-foreground text-xs">{label}</div>
+ <div class="mt-1 flex items-center justify-between gap-2">
+ <div class="min-w-0 font-mono text-sm break-all">{value}</div>
+ <CopyButton text={value} size="icon" class="size-7 shrink-0" title={copyTitle} />
+ </div>
+ </div>
+{/snippet}
diff --git a/frontend/src/lib/components/events/event-metadata.ts b/frontend/src/lib/components/events/event-metadata.ts
new file mode 100644
index 000000000..565a5cbfb
--- /dev/null
+++ b/frontend/src/lib/components/events/event-metadata.ts
@@ -0,0 +1,50 @@
+export type MetadataEntry = {
+ key: string;
+ value: string;
+};
+
+export function stringifyForDisplay(value: unknown): string {
+ if (value === null || value === undefined) {
+ return '';
+ }
+ if (typeof value === 'string') {
+ return value;
+ }
+ if (typeof value === 'number' || typeof value === 'boolean') {
+ return String(value);
+ }
+ try {
+ return JSON.stringify(value, null, 2);
+ } catch {
+ return String(value);
+ }
+}
+
+export function flattenMetadata(value: unknown, prefix = ''): MetadataEntry[] {
+ if (Array.isArray(value)) {
+ if (value.length === 0) {
+ return prefix ? [{ key: prefix, value: '[]' }] : [];
+ }
+ return value.flatMap((item, index) => {
+ const key = prefix ? `${prefix}[${index}]` : `[${index}]`;
+ return flattenMetadata(item, key);
+ });
+ }
+
+ if (value && typeof value === 'object') {
+ const objectValue = value as Record<string, unknown>;
+ const keys = Object.keys(objectValue).sort();
+ if (keys.length === 0) {
+ return prefix ? [{ key: prefix, value: '{}' }] : [];
+ }
+ return keys.flatMap((key) => {
+ const nextPrefix = prefix ? `${prefix}.${key}` : key;
+ return flattenMetadata(objectValue[key], nextPrefix);
+ });
+ }
+
+ if (!prefix) {
+ return [];
+ }
+ return [{ key: prefix, value: stringifyForDisplay(value) }];
+}
diff --git a/frontend/src/lib/components/events/events-labels.ts b/frontend/src/lib/components/events/events-labels.ts
new file mode 100644
index 000000000..87bd9148f
--- /dev/null
+++ b/frontend/src/lib/components/events/events-labels.ts
@@ -0,0 +1,143 @@
+import { m } from '$lib/paraglide/messages';
+import type { IconType } from '$lib/icons';
+import {
+ ClockIcon,
+ ContainersIcon,
+ EnvironmentsIcon,
+ EventsIcon,
+ GitBranchIcon,
+ GlobeIcon,
+ ImagesIcon,
+ NetworksIcon,
+ NotificationsIcon,
+ ProjectsIcon,
+ SettingsIcon,
+ UserIcon,
+ VolumesIcon
+} from '$lib/icons';
+import type { FilterOption } from '$lib/components/arcane-table';
+
+export type EventBadgeVariant = 'blue' | 'green' | 'amber' | 'red';
+
+export function eventSeverityVariant(severity: string): EventBadgeVariant {
+ switch (severity) {
+ case 'success':
+ return 'green';
+ case 'error':
+ return 'red';
+ case 'warning':
+ return 'amber';
+ case 'info':
+ default:
+ return 'blue';
+ }
+}
+
+export function eventSeverityLabel(severity: string): string {
+ switch (severity) {
+ case 'success':
+ return m.events_success();
+ case 'error':
+ return m.events_error();
+ case 'warning':
+ return m.events_warning();
+ case 'info':
+ default:
+ return m.events_info();
+ }
+}
+
+export function eventSeverityIconVariant(severity: string): 'emerald' | 'red' | 'amber' | 'blue' {
+ switch (eventSeverityVariant(severity)) {
+ case 'green':
+ return 'emerald';
+ case 'red':
+ return 'red';
+ case 'amber':
+ return 'amber';
+ default:
+ return 'blue';
+ }
+}
+
+export function eventTypeCategory(type: string): string {
+ return type.split('.')[0] ?? '';
+}
+
+const categoryLabels: Record<string, () => string> = {
+ container: m.resource_container_cap,
+ image: m.resource_image_cap,
+ project: m.project,
+ git: m.git_title,
+ volume: m.resource_volume_cap,
+ network: m.resource_network_cap,
+ environment: m.resource_environment_cap,
+ user: m.resource_user_cap,
+ system: m.sidebar_system_mode,
+ webhook: m.events_category_webhook,
+ notification: m.events_category_notification,
+ lifecycle: m.security_lifecycle_tab
+};
+
+export function eventTypeCategoryLabel(category: string): string {
+ return categoryLabels[category]?.() ?? humanize(category);
+}
+
+const categoryIcons: Record<string, IconType> = {
+ container: ContainersIcon,
+ image: ImagesIcon,
+ project: ProjectsIcon,
+ git: GitBranchIcon,
+ volume: VolumesIcon,
+ network: NetworksIcon,
+ environment: EnvironmentsIcon,
+ user: UserIcon,
+ system: SettingsIcon,
+ webhook: GlobeIcon,
+ notification: NotificationsIcon,
+ lifecycle: ClockIcon
+};
+
+export function eventTypeIcon(type: string): IconType {
+ return categoryIcons[eventTypeCategory(type)] ?? EventsIcon;
+}
+
+const actionLabels: Record<string, () => string> = {
+ start: m.common_started,
+ stop: m.common_stopped,
+ restart: m.events_action_restart,
+ create: m.common_created,
+ delete: m.events_action_delete,
+ update: m.common_updated,
+ deploy: m.events_action_deploy,
+ pull: m.events_action_pull,
+ scan: m.events_action_scan,
+ error: m.common_error,
+ login: m.events_action_login,
+ logout: m.common_logout,
+ send: m.events_action_send,
+ execute: m.events_action_execute,
+ run: m.webhook_action_type_run,
+ prune: m.events_action_prune
+};
+
+function humanize(value: string): string {
+ const words = value.replace(/[._]/g, ' ').trim();
+ return words ? words.charAt(0).toUpperCase() + words.slice(1) : value;
+}
+
+export function eventTypeLabel(type: string): string {
+ const [category, ...rest] = type.split('.');
+ const tail = rest.join('.');
+ if (!category || !tail) {
+ return humanize(type);
+ }
+ const action = actionLabels[tail]?.() ?? humanize(tail);
+ return `${eventTypeCategoryLabel(category)} · ${action}`;
+}
+
+export const eventTypeFilters: FilterOption[] = Object.keys(categoryLabels).map((category) => ({
+ value: category,
+ label: eventTypeCategoryLabel(category),
+ icon: categoryIcons[category]
+}));
diff --git a/frontend/src/lib/query/query-keys.ts b/frontend/src/lib/query/query-keys.ts
index b1e553a96..230bfb6b9 100644
--- a/frontend/src/lib/query/query-keys.ts
+++ b/frontend/src/lib/query/query-keys.ts
@@ -71,6 +71,7 @@ export const queryKeys = {
events: {
all: ['events'] as const,
listGlobal: (options: SearchPaginationSortRequest) => ['events', 'global', stableSerialize(options)] as const,
+ statsGlobal: () => ['events', 'stats', 'global'] as const,
deleteSelectedGlobal: () => ['events', 'delete-selected', 'global'] as const
},
system: {
diff --git a/frontend/src/lib/services/event-service.ts b/frontend/src/lib/services/event-service.ts
index 7df9b01fe..86e8d1564 100644
--- a/frontend/src/lib/services/event-service.ts
+++ b/frontend/src/lib/services/event-service.ts
@@ -1,6 +1,6 @@
import BaseAPIService from './api-service';
import type { SearchPaginationSortRequest, Paginated } from '$lib/types/shared';
-import type { Event } from '$lib/types/shared';
+import type { Event, EventSeverityCounts } from '$lib/types/shared';
import { transformPaginationParams } from '$lib/utils/tables';
class EventService extends BaseAPIService {
@@ -10,6 +10,11 @@ class EventService extends BaseAPIService {
return res.data;
}
+ async getEventStats(): Promise<EventSeverityCounts> {
+ const res = await this.api.get('/events/stats');
+ return res.data.data;
+ }
+
async delete(id: string): Promise<void> {
return this.handleResponse(this.api.delete(`/events/${id}`));
}
diff --git a/frontend/src/lib/types/shared.ts b/frontend/src/lib/types/shared.ts
index c708783e2..23e127955 100644
--- a/frontend/src/lib/types/shared.ts
+++ b/frontend/src/lib/types/shared.ts
@@ -55,6 +55,14 @@ export interface Event {
updatedAt?: string;
}
+export interface EventSeverityCounts {
+ total: number;
+ info: number;
+ success: number;
+ warning: number;
+ error: number;
+}
+
// --- Variables (key/value form helper) ---
export interface Variable {
diff --git a/frontend/src/routes/(app)/events/+page.svelte b/frontend/src/routes/(app)/events/+page.svelte
index 8ef9d9977..925e3fb00 100644
--- a/frontend/src/routes/(app)/events/+page.svelte
+++ b/frontend/src/routes/(app)/events/+page.svelte
@@ -1,6 +1,5 @@
<script lang="ts">
import { toast } from 'svelte-sonner';
- import type { Event } from '$lib/types/shared';
import EventTable from './event-table.svelte';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
import { m } from '$lib/paraglide/messages';
@@ -9,7 +8,7 @@
import { untrack } from 'svelte';
import { ResourcePageLayout, type ActionButton, type StatCardConfig } from '$lib/layouts/index.js';
import { createMutation, createQuery } from '@tanstack/svelte-query';
- import { EventsIcon } from '$lib/icons';
+ import { AlertIcon, CheckIcon, CloseIcon, EventsIcon, InfoIcon } from '$lib/icons';
import { hasPermission } from '$lib/utils/auth';
let { data } = $props();
@@ -24,6 +23,12 @@
initialData: data.events
}));
+ const statsQuery = createQuery(() => ({
+ queryKey: queryKeys.events.statsGlobal(),
+ queryFn: () => eventService.getEventStats(),
+ initialData: data.eventStats
+ }));
+
const deleteSelectedMutation = createMutation(() => ({
mutationKey: queryKeys.events.deleteSelectedGlobal(),
mutationFn: async (ids: string[]) => {
@@ -44,7 +49,7 @@
onSuccess: async ({ successCount, failureCount }) => {
if (successCount > 0) {
toast.success(m.common_bulk_delete_success({ count: successCount, resource: m.events_title() }));
- await eventsQuery.refetch();
+ await refresh();
}
if (failureCount > 0) {
toast.error(m.common_bulk_delete_failed({ count: failureCount, resource: m.events_title() }));
@@ -59,15 +64,36 @@
}
});
- const infoEvents = $derived(events?.data?.filter((e: Event) => e.severity === 'info').length || 0);
- const warningEvents = $derived(events?.data?.filter((e: Event) => e.severity === 'warning').length || 0);
- const errorEvents = $derived(events?.data?.filter((e: Event) => e.severity === 'error').length || 0);
- const successEvents = $derived(events?.data?.filter((e: Event) => e.severity === 'success').length || 0);
- const totalEvents = $derived(events?.pagination?.totalItems || 0);
+ const counts = $derived(statsQuery.data);
const isRefreshing = $derived(eventsQuery.isFetching && !eventsQuery.isPending);
async function refresh() {
- await eventsQuery.refetch();
+ await Promise.all([eventsQuery.refetch(), statsQuery.refetch()]);
+ }
+
+ const activeSeverities = $derived.by(() => {
+ const value = requestOptions.filters?.['severity'];
+ if (Array.isArray(value)) {
+ return value.map(String);
+ }
+ return value ? [String(value)] : [];
+ });
+
+ function toggleSeverityFilter(severity: string) {
+ const next = activeSeverities.includes(severity)
+ ? activeSeverities.filter((s) => s !== severity)
+ : [...activeSeverities, severity];
+ const filters = { ...requestOptions.filters };
+ if (next.length) {
+ filters['severity'] = next;
+ } else {
+ delete filters['severity'];
+ }
+ requestOptions = {
+ ...requestOptions,
+ filters: Object.keys(filters).length ? filters : undefined,
+ pagination: { page: 1, limit: requestOptions.pagination?.limit ?? 20 }
+ };
}
async function handleDeleteSelected() {
@@ -114,37 +140,40 @@
const statCards: StatCardConfig[] = $derived([
{
title: m.events_total(),
- value: totalEvents,
- subtitle: m.events_total_subtitle(),
+ value: counts?.total ?? 0,
icon: EventsIcon
},
{
title: m.events_info(),
- value: infoEvents,
- subtitle: m.events_info_subtitle(),
- icon: EventsIcon,
- iconColor: 'text-blue-500'
+ value: counts?.info ?? 0,
+ icon: InfoIcon,
+ iconColor: 'text-blue-500',
+ onclick: () => toggleSeverityFilter('info'),
+ active: activeSeverities.includes('info')
},
{
title: m.events_success(),
- value: successEvents,
- subtitle: m.events_success_subtitle(),
- icon: EventsIcon,
- iconColor: 'text-green-500'
+ value: counts?.success ?? 0,
+ icon: CheckIcon,
+ iconColor: 'text-green-500',
+ onclick: () => toggleSeverityFilter('success'),
+ active: activeSeverities.includes('success')
},
{
title: m.events_warning(),
- value: warningEvents,
- subtitle: m.events_warning_subtitle(),
- icon: EventsIcon,
- iconColor: 'text-yellow-500'
+ value: counts?.warning ?? 0,
+ icon: AlertIcon,
+ iconColor: 'text-yellow-500',
+ onclick: () => toggleSeverityFilter('warning'),
+ active: activeSeverities.includes('warning')
},
{
title: m.events_error(),
- value: errorEvents,
- subtitle: m.events_error_subtitle(),
- icon: EventsIcon,
- iconColor: 'text-red-500'
+ value: counts?.error ?? 0,
+ icon: CloseIcon,
+ iconColor: 'text-red-500',
+ onclick: () => toggleSeverityFilter('error'),
+ active: activeSeverities.includes('error')
}
]);
</script>
@@ -157,7 +186,7 @@
bind:requestOptions
onRefreshData={async (options) => {
requestOptions = options;
- await eventsQuery.refetch();
+ await refresh();
}}
/>
{/snippet}
diff --git a/frontend/src/routes/(app)/events/+page.ts b/frontend/src/routes/(app)/events/+page.ts
index 33e26f1f7..388d903d2 100644
--- a/frontend/src/routes/(app)/events/+page.ts
+++ b/frontend/src/routes/(app)/events/+page.ts
@@ -20,14 +20,21 @@ export const load: PageLoad = async ({ parent }) => {
} satisfies SearchPaginationSortRequest);
let events;
+ let eventStats;
try {
- events = await queryClient.fetchQuery({
- queryKey: queryKeys.events.listGlobal(eventRequestOptions),
- queryFn: () => eventService.getEvents(eventRequestOptions)
- });
+ [events, eventStats] = await Promise.all([
+ queryClient.fetchQuery({
+ queryKey: queryKeys.events.listGlobal(eventRequestOptions),
+ queryFn: () => eventService.getEvents(eventRequestOptions)
+ }),
+ queryClient.fetchQuery({
+ queryKey: queryKeys.events.statsGlobal(),
+ queryFn: () => eventService.getEventStats()
+ })
+ ]);
} catch (err) {
throwPageLoadError(err, 'Failed to load events');
}
- return { events, eventRequestOptions };
+ return { events, eventStats, eventRequestOptions };
};
diff --git a/frontend/src/routes/(app)/events/event-table.svelte b/frontend/src/routes/(app)/events/event-table.svelte
index 749a25dc1..42583609b 100644
--- a/frontend/src/routes/(app)/events/event-table.svelte
+++ b/frontend/src/routes/(app)/events/event-table.svelte
@@ -12,12 +12,21 @@
import type { Event } from '$lib/types/shared';
import type { ColumnSpec, MobileFieldVisibility } from '$lib/components/arcane-table';
import { UniversalMobileCard } from '$lib/components/arcane-table';
- import EventDetailsDialog from '$lib/components/dialogs/event-details-dialog.svelte';
+ import RelativeTimeCell from '$lib/components/arcane-table/cells/relative-time-cell.svelte';
+ import EventDetailPanel from '$lib/components/events/event-detail-panel.svelte';
+ import {
+ eventSeverityIconVariant,
+ eventSeverityLabel,
+ eventSeverityVariant,
+ eventTypeFilters,
+ eventTypeIcon,
+ eventTypeLabel
+ } from '$lib/components/events/events-labels';
import { m } from '$lib/paraglide/messages';
import { eventService } from '$lib/services/event-service';
import { environmentStore } from '$lib/stores/environment.store.svelte';
import IfPermitted from '$lib/components/if-permitted.svelte';
- import { TrashIcon, InfoIcon, NotificationsIcon, TagIcon, EnvironmentsIcon, UserIcon } from '$lib/icons';
+ import { TrashIcon, NotificationsIcon, TagIcon, EnvironmentsIcon, UserIcon } from '$lib/icons';
let {
events = $bindable(),
@@ -32,8 +41,6 @@
} = $props();
let isLoading = $state({ removing: false });
- let detailsOpen = $state(false);
- let detailsEvent = $state<Event | null>(null);
async function refreshEvents(options: SearchPaginationSortRequest = requestOptions) {
if (onRefreshData) {
@@ -43,33 +50,6 @@
events = await eventService.getEvents(options);
}
- function getSeverityBadgeVariant(severity: string) {
- switch (severity) {
- case 'success':
- return 'green';
- case 'error':
- return 'red';
- case 'warning':
- return 'amber';
- case 'info':
- default:
- return 'blue';
- }
- }
-
- function getIconVariant(severity: string): 'emerald' | 'red' | 'amber' | 'blue' {
- const variant = getSeverityBadgeVariant(severity);
- if (variant === 'green') return 'emerald';
- if (variant === 'red') return 'red';
- if (variant === 'amber') return 'amber';
- return 'blue';
- }
-
- function formatTimestamp(timestamp: string) {
- const date = new Date(timestamp);
- return formatDistanceToNow(date, { addSuffix: true });
- }
-
async function handleDeleteEvent(eventId: string, title: string) {
const safeTitle = title?.trim() || m.common_unknown();
openConfirmDialog({
@@ -94,9 +74,8 @@
});
}
- function openDetails(e: Event) {
- detailsEvent = e;
- detailsOpen = true;
+ function environmentName(environmentId: string): string {
+ return environmentStore.available.find((e) => e.id === environmentId)?.name || environmentId;
}
const columns = [
@@ -110,6 +89,7 @@
accessorKey: 'type',
title: m.common_type(),
sortable: true,
+ filterOptions: eventTypeFilters,
cell: TypeCell
},
{
@@ -149,46 +129,54 @@
</script>
{#snippet SeverityCell({ value }: { value: unknown })}
- <Badge variant={getSeverityBadgeVariant(String(value ?? 'info'))} minWidth="20">{String(value ?? '')}</Badge>
+ {@const severity = String(value ?? 'info')}
+ <Badge variant={eventSeverityVariant(severity)} minWidth="20">{eventSeverityLabel(severity)}</Badge>
{/snippet}
{#snippet TypeCell({ value }: { value: unknown })}
- <Badge variant="outline">{String(value ?? '-')}</Badge>
+ {@const type = String(value ?? '')}
+ {@const TypeIcon = eventTypeIcon(type)}
+ <div class="flex min-w-0 items-center gap-2">
+ <TypeIcon class="text-muted-foreground size-4 shrink-0" aria-hidden="true" />
+ <span class="truncate text-sm" title={type}>{eventTypeLabel(type)}</span>
+ </div>
{/snippet}
{#snippet ResourceCell({ item }: { item: Event })}
- {#if item.resourceType}
- <div class="space-y-1">
- <span class="text-sm">{item.resourceType}</span>
- {#if item.resourceName}
- <p class="text-muted-foreground text-xs">{item.resourceName}</p>
+ {#if item.resourceName || item.resourceType}
+ <div class="min-w-0">
+ <p class="truncate text-sm" title={item.resourceName}>{item.resourceName ?? '—'}</p>
+ {#if item.resourceType}
+ <p class="text-muted-foreground text-xs capitalize">{item.resourceType}</p>
{/if}
</div>
{:else}
- -
+ <span class="text-muted-foreground">—</span>
{/if}
{/snippet}
{#snippet EnvironmentCell({ item }: { item: Event })}
{#if item.environmentId}
- <Badge variant="outline"
- >{environmentStore.available.find((e) => e.id === item.environmentId)?.name || item.environmentId}</Badge
- >
+ <Badge variant="gray">{environmentName(item.environmentId)}</Badge>
{:else}
- -
+ <span class="text-muted-foreground">—</span>
{/if}
{/snippet}
{#snippet UserCell({ value }: { value: unknown })}
{#if String(value ?? '') === 'System'}
- <span class="text-red-500/50">{String(value ?? '-')}</span>
+ <span class="text-muted-foreground text-sm italic">System</span>
{:else}
- {String(value ?? '-')}
+ <span class="text-sm">{String(value ?? '—')}</span>
{/if}
{/snippet}
{#snippet TimeCell({ value }: { value: unknown })}
- <span class="text-sm">{formatTimestamp(String(value ?? new Date().toISOString()))}</span>
+ <RelativeTimeCell {value} />
+{/snippet}
+
+{#snippet ExpandedEvent({ item }: { item: Event })}
+ <EventDetailPanel event={item} />
{/snippet}
{#snippet EventMobileCardSnippet({ item, mobileFieldVisibility }: { item: Event; mobileFieldVisibility: MobileFieldVisibility })}
@@ -196,23 +184,24 @@
{item}
icon={(item: Event) => ({
component: NotificationsIcon,
- variant: getIconVariant(item.severity)
+ variant: eventSeverityIconVariant(item.severity)
})}
title={(item: Event) => item.title}
- subtitle={(item: Event) => ((mobileFieldVisibility['timestamp'] ?? true) ? formatTimestamp(item.timestamp) : null)}
+ subtitle={(item: Event) =>
+ (mobileFieldVisibility['timestamp'] ?? true) ? formatDistanceToNow(new Date(item.timestamp), { addSuffix: true }) : null}
badges={[
(item: Event) =>
(mobileFieldVisibility['severity'] ?? true)
? {
- variant: getSeverityBadgeVariant(item.severity),
- text: item.severity
+ variant: eventSeverityVariant(item.severity),
+ text: eventSeverityLabel(item.severity)
}
: null
]}
fields={[
{
label: m.common_type(),
- getValue: (item: Event) => item.type,
+ getValue: (item: Event) => eventTypeLabel(item.type),
icon: TagIcon,
iconVariant: 'gray' as const,
show: mobileFieldVisibility['type'] ?? true
@@ -221,9 +210,9 @@
label: m.events_col_resource(),
getValue: (item: Event) => {
if (!item.resourceType && !item.resourceName) return null;
- const parts = [item.resourceType || '-'];
- if (item.resourceName) parts.push(item.resourceName);
- return parts.join(' - ');
+ const parts = [item.resourceName || '—'];
+ if (item.resourceType) parts.push(item.resourceType);
+ return parts.join(' · ');
},
icon: EnvironmentsIcon,
iconVariant: 'gray' as const,
@@ -231,10 +220,7 @@
},
{
label: m.events_environment_label(),
- getValue: (item: Event) => {
- if (!item.environmentId) return null;
- return environmentStore.available.find((e) => e.id === item.environmentId)?.name || item.environmentId;
- },
+ getValue: (item: Event) => (item.environmentId ? environmentName(item.environmentId) : null),
icon: EnvironmentsIcon,
iconVariant: 'gray' as const,
show: (mobileFieldVisibility['environment'] ?? true) && !!item.environmentId
@@ -252,15 +238,8 @@
{/snippet}
{#snippet RowActions({ item }: { item: Event })}
- <RowActionsMenu>
- <DropdownMenu.Item onclick={() => openDetails(item)}>
- <InfoIcon class="size-4" />
- {m.common_view_details()}
- </DropdownMenu.Item>
-
- <IfPermitted perm="events:delete">
- <DropdownMenu.Separator />
-
+ <IfPermitted perm="events:delete">
+ <RowActionsMenu>
<DropdownMenu.Item
variant="destructive"
onclick={() => handleDeleteEvent(item.id, item.title)}
@@ -269,8 +248,8 @@
<TrashIcon class="size-4" />
{m.common_delete()}
</DropdownMenu.Item>
- </IfPermitted>
- </RowActionsMenu>
+ </RowActionsMenu>
+ </IfPermitted>
{/snippet}
<ArcaneTable
@@ -288,6 +267,5 @@
{mobileFields}
rowActions={RowActions}
mobileCard={EventMobileCardSnippet}
+ expandedRowContent={ExpandedEvent}
/>
-
-<EventDetailsDialog bind:open={detailsOpen} event={detailsEvent} />