Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: inconsistent sorting on db resources, casuing sorting issue in the frontend
Kyle Mendell3aa60e82fb6f
diff --git a/backend/internal/huma/handlers/container_registries.go b/backend/internal/huma/handlers/container_registries.goindex 9c09bfef6..d38db10e4 100644--- a/backend/internal/huma/handlers/container_registries.go+++ b/backend/internal/huma/handlers/container_registries.go@@ -32,10 +32,11 @@ type ContainerRegistryPaginatedResponse struct {}type ListContainerRegistriesInput struct {- Page int `query:"pagination[page]" default:"1" doc:"Page number"`- Limit int `query:"pagination[limit]" default:"20" doc:"Items per page"`- SortCol string `query:"sort[column]" doc:"Column to sort by"`- SortDir string `query:"sort[direction]" default:"asc" doc:"Sort direction"`+ Search string `query:"search" doc:"Search query"`+ Sort string `query:"sort" doc:"Column to sort by"`+ Order string `query:"order" default:"asc" doc:"Sort direction"`+ Start int `query:"start" default:"0" doc:"Start index"`+ Limit int `query:"limit" default:"20" doc:"Items per page"`}type ListContainerRegistriesOutput struct {@@ -201,7 +202,7 @@ func (h *ContainerRegistryHandler) ListRegistries(ctx context.Context, input *Lireturn nil, huma.Error500InternalServerError("service not available")}- params := buildPaginationParams(input.Page, input.Limit, input.SortCol, input.SortDir)+ params := buildPaginationParams(0, input.Start, input.Limit, input.Sort, input.Order, input.Search)registries, paginationResp, err := h.registryService.GetRegistriesPaginated(ctx, params)if err != nil {diff --git a/backend/internal/huma/handlers/events.go b/backend/internal/huma/handlers/events.goindex 6f59a3dfc..0ae5a415d 100644--- a/backend/internal/huma/handlers/events.go+++ b/backend/internal/huma/handlers/events.go@@ -27,10 +27,13 @@ type EventPaginatedResponse struct {}type ListEventsInput struct {- Page int `query:"pagination[page]" default:"1" doc:"Page number"`- Limit int `query:"pagination[limit]" default:"20" doc:"Items per page"`- SortCol string `query:"sort[column]" doc:"Column to sort by"`- SortDir string `query:"sort[direction]" default:"asc" doc:"Sort direction"`+ Search string `query:"search" doc:"Search query"`+ Sort string `query:"sort" doc:"Column to sort by"`+ Order string `query:"order" default:"asc" doc:"Sort direction"`+ 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 ListEventsOutput struct {@@ -39,10 +42,13 @@ type ListEventsOutput struct {type GetEventsByEnvironmentInput struct {EnvironmentID string `path:"environmentId" doc:"Environment ID"`- Page int `query:"pagination[page]" default:"1" doc:"Page number"`- Limit int `query:"pagination[limit]" default:"20" doc:"Items per page"`- SortCol string `query:"sort[column]" doc:"Column to sort by"`- SortDir string `query:"sort[direction]" default:"asc" doc:"Sort direction"`+ Search string `query:"search" doc:"Search query"`+ Sort string `query:"sort" doc:"Column to sort by"`+ Order string `query:"order" default:"asc" doc:"Sort direction"`+ 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 GetEventsByEnvironmentOutput struct {@@ -136,7 +142,14 @@ func (h *EventHandler) ListEvents(ctx context.Context, input *ListEventsInput) (return nil, huma.Error500InternalServerError("service not available")}- params := buildPaginationParams(input.Page, input.Limit, input.SortCol, input.SortDir)+ params := buildPaginationParams(0, input.Start, input.Limit, input.Sort, input.Order, input.Search)++ if input.Severity != "" {+ params.Filters["severity"] = input.Severity+ }+ if input.Type != "" {+ params.Filters["type"] = input.Type+ }events, paginationResp, err := h.eventService.ListEventsPaginated(ctx, params)if err != nil {@@ -168,7 +181,14 @@ func (h *EventHandler) GetEventsByEnvironment(ctx context.Context, input *GetEvereturn nil, huma.Error400BadRequest((&common.EnvironmentIDRequiredError{}).Error())}- params := buildPaginationParams(input.Page, input.Limit, input.SortCol, input.SortDir)+ params := buildPaginationParams(0, input.Start, input.Limit, input.Sort, input.Order, input.Search)++ if input.Severity != "" {+ params.Filters["severity"] = input.Severity+ }+ if input.Type != "" {+ params.Filters["type"] = input.Type+ }events, paginationResp, err := h.eventService.GetEventsByEnvironmentPaginated(ctx, input.EnvironmentID, params)if err != nil {diff --git a/backend/internal/huma/handlers/helpers.go b/backend/internal/huma/handlers/helpers.goindex 38b8b46ae..a99cb392c 100644--- a/backend/internal/huma/handlers/helpers.go+++ b/backend/internal/huma/handlers/helpers.go@@ -5,22 +5,28 @@ import ()// buildPaginationParams converts query parameters to pagination.QueryParams.-func buildPaginationParams(page, limit int, sortCol, sortDir string) pagination.QueryParams {- if page < 1 {- page = 1- }+// It supports both the legacy nested style (page/limit) and the standard style (start/limit).+func buildPaginationParams(page, start, limit int, sortCol, sortDir, search string) pagination.QueryParams {if limit < 1 {limit = 20}- // Convert page-based to offset-based- start := (page - 1) * limit++ finalStart := start+ if page > 1 && start == 0 {+ // Convert page-based to offset-based if page is provided and start is 0+ finalStart = (page - 1) * limit+ }+params := pagination.QueryParams{+ SearchQuery: pagination.SearchQuery{+ Search: search,+ },SortParams: pagination.SortParams{Sort: sortCol,Order: pagination.SortOrder(sortDir),},PaginationParams: pagination.PaginationParams{- Start: start,+ Start: finalStart,Limit: limit,},Filters: make(map[string]string),diff --git a/backend/internal/huma/handlers/templates.go b/backend/internal/huma/handlers/templates.goindex 322c81513..e95d98fbc 100644--- a/backend/internal/huma/handlers/templates.go+++ b/backend/internal/huma/handlers/templates.go@@ -31,10 +31,11 @@ type TemplatePaginatedResponse struct {}type ListTemplatesInput struct {- Page int `query:"pagination[page]" default:"1" doc:"Page number"`- Limit int `query:"pagination[limit]" default:"20" doc:"Items per page"`- SortCol string `query:"sort[column]" doc:"Column to sort by"`- SortDir string `query:"sort[direction]" default:"asc" doc:"Sort direction"`+ Search string `query:"search" doc:"Search query"`+ Sort string `query:"sort" doc:"Column to sort by"`+ Order string `query:"order" default:"asc" doc:"Sort direction"`+ Start int `query:"start" default:"0" doc:"Start index"`+ Limit int `query:"limit" default:"20" doc:"Items per page"`}type ListTemplatesOutput struct {@@ -385,7 +386,7 @@ func (h *TemplateHandler) ListTemplates(ctx context.Context, input *ListTemplatereturn nil, huma.Error500InternalServerError("service not available")}- params := buildPaginationParams(input.Page, input.Limit, input.SortCol, input.SortDir)+ params := buildPaginationParams(0, input.Start, input.Limit, input.Sort, input.Order, input.Search)if params.Limit == 0 {params.Limit = 20}diff --git a/backend/internal/huma/handlers/users.go b/backend/internal/huma/handlers/users.goindex bc2a7e51e..ef75fb885 100644--- a/backend/internal/huma/handlers/users.go+++ b/backend/internal/huma/handlers/users.go@@ -30,10 +30,11 @@ type UserPaginatedResponse struct {}type ListUsersInput struct {- Page int `query:"pagination[page]" default:"1" doc:"Page number"`- Limit int `query:"pagination[limit]" default:"20" doc:"Items per page"`- SortCol string `query:"sort[column]" doc:"Column to sort by"`- SortDir string `query:"sort[direction]" default:"asc" doc:"Sort direction"`+ Search string `query:"search" doc:"Search query"`+ Sort string `query:"sort" doc:"Column to sort by"`+ Order string `query:"order" default:"asc" doc:"Sort direction"`+ Start int `query:"start" default:"0" doc:"Start index"`+ Limit int `query:"limit" default:"20" doc:"Items per page"`}type ListUsersOutput struct {@@ -157,7 +158,7 @@ func (h *UserHandler) ListUsers(ctx context.Context, input *ListUsersInput) (*Lireturn nil, huma.Error500InternalServerError("service not available")}- params := buildPaginationParams(input.Page, input.Limit, input.SortCol, input.SortDir)+ params := buildPaginationParams(0, input.Start, input.Limit, input.Sort, input.Order, input.Search)users, paginationResp, err := h.userService.ListUsersPaginated(ctx, params)if err != nil {diff --git a/frontend/src/lib/components/arcane-table/arcane-table-filter.svelte b/frontend/src/lib/components/arcane-table/arcane-table-filter.svelteindex 8204797ab..41d367205 100644--- a/frontend/src/lib/components/arcane-table/arcane-table-filter.svelte+++ b/frontend/src/lib/components/arcane-table/arcane-table-filter.svelte@@ -6,7 +6,6 @@import { ArcaneButton } from '$lib/components/arcane-button/index.js';import { cn } from '$lib/utils.js';import { Separator } from '$lib/components/ui/separator/index.js';- import { Badge } from '$lib/components/ui/badge/index.js';import type { Component } from 'svelte';import { m } from '$lib/paraglide/messages';import { CheckIcon, FilterIcon } from '$lib/icons';@@ -40,24 +39,20 @@size="sm"icon={FilterIcon}customLabel={title}- class="border-input hover:bg-card/60 h-8 min-w-24 border border-dashed hover:text-inherit"+ class="border-input hover:bg-card/60 h-8 border border-dashed hover:text-inherit"data-testid={`facet-${title.toLowerCase()}-trigger`}>{#if selectedValues.size > 0}- <Separator orientation="vertical" class="mx-2 h-4" />- <Badge variant="secondary" class="rounded-sm px-1 font-normal lg:hidden">- {selectedValues.size}- </Badge>- <div class="hidden space-x-1 lg:flex">+ <Separator orientation="vertical" class="mx-1 h-4" />+ <div class="text-muted-foreground flex items-center gap-1 text-xs font-medium">{#if selectedValues.size > 2}- <Badge variant="secondary" class="rounded-sm px-1 font-normal">- {m.common_selected_count({ count: selectedValues.size })}- </Badge>+ <span>{selectedValues.size}</span>{:else}- {#each options.filter((opt) => selectedValues.has(opt.value)) as option (option)}- <Badge variant="secondary" class="rounded-sm px-1 font-normal">- {option.label}- </Badge>+ {#each options.filter((opt) => selectedValues.has(opt.value)) as option, i (option)}+ {#if i > 0}+ <span class="opacity-50">,</span>+ {/if}+ <span>{option.label}</span>{/each}{/if}</div>diff --git a/frontend/src/lib/components/arcane-table/arcane-table-toolbar.svelte b/frontend/src/lib/components/arcane-table/arcane-table-toolbar.svelteindex eba365dd7..d0cbba4b3 100644--- a/frontend/src/lib/components/arcane-table/arcane-table-toolbar.svelte+++ b/frontend/src/lib/components/arcane-table/arcane-table-toolbar.svelte@@ -69,7 +69,7 @@</div><div class="flex flex-wrap items-center gap-2 sm:gap-0 sm:space-x-2">- {#if typeColumn}+ {#if typeColumn && !severityColumn}<DataTableFacetedFilter column={typeColumn} title={m.common_type()} options={templateTypeFilters} />{/if}{#if usageColumn}diff --git a/frontend/src/lib/services/event-service.ts b/frontend/src/lib/services/event-service.tsindex bbe8ea99f..8877c0f96 100644--- a/frontend/src/lib/services/event-service.ts+++ b/frontend/src/lib/services/event-service.ts@@ -4,6 +4,12 @@ import type { Event } from '$lib/types/event.type';import { transformPaginationParams } from '$lib/utils/params.util';export default class EventService extends BaseAPIService {+ async getEventsForEnvironment(environmentId: string, options?: SearchPaginationSortRequest): Promise<Paginated<Event>> {+ const params = transformPaginationParams(options);+ const res = await this.api.get(`/environments/${environmentId}/events`, { params });+ return res.data;+ }+async getEvents(options?: SearchPaginationSortRequest): Promise<Paginated<Event>> {const params = transformPaginationParams(options);const res = await this.api.get('/events', { params });diff --git a/frontend/src/routes/(app)/events/+page.svelte b/frontend/src/routes/(app)/events/+page.svelteindex 81114baf9..4c8ca53d4 100644--- a/frontend/src/routes/(app)/events/+page.svelte+++ b/frontend/src/routes/(app)/events/+page.svelte@@ -136,16 +136,8 @@]);</script>-<ResourcePageLayout- title={m.events_title()}- subtitle={m.events_subtitle()}- {actionButtons}- {statCards}- containerClass="flex h-full flex-col space-y-6"->+<ResourcePageLayout title={m.events_title()} subtitle={m.events_subtitle()} {actionButtons} {statCards}>{#snippet mainContent()}- <div class="flex-1 overflow-hidden">- <EventTable bind:events bind:selectedIds bind:requestOptions />- </div>+ <EventTable bind:events bind:selectedIds bind:requestOptions />{/snippet}</ResourcePageLayout>