Skip to content

Modern Docker Management, Designed for Everyone

fix: networks unable to be searched or filtered

Kyle Mendell9c1be901f1e5
diff --git a/backend/internal/huma/handlers/networks.go b/backend/internal/huma/handlers/networks.go
index f3f0b2aae..4462dbba1 100644
--- a/backend/internal/huma/handlers/networks.go
+++ b/backend/internal/huma/handlers/networks.go
@@ -33,10 +33,11 @@ type NetworkPaginatedResponse struct {
type ListNetworksInput struct {
EnvironmentID string `path:"id" doc:"Environment ID"`
- Page int `query:"pagination[page]" default:"1"`
- Limit int `query:"pagination[limit]" default:"20"`
- SortCol string `query:"sort[column]"`
- SortDir string `query:"sort[direction]" default:"asc"`
+ 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 (asc or desc)"`
+ Start int `query:"start" default:"0" doc:"Start index for pagination"`
+ Limit int `query:"limit" default:"20" doc:"Number of items per page"`
InUse string `query:"inUse" doc:"Filter by in-use status (true/false)"`
}
@@ -80,8 +81,8 @@ type NetworkInspectApiResponse struct {
type GetNetworkInput struct {
EnvironmentID string `path:"id" doc:"Environment ID"`
NetworkID string `path:"networkId" doc:"Network ID"`
- SortCol string `query:"sort[column]" default:"name"`
- SortDir string `query:"sort[direction]" default:"asc"`
+ Sort string `query:"sort" default:"name"`
+ Order string `query:"order" default:"asc"`
}
type GetNetworkOutput struct {
@@ -186,12 +187,15 @@ func (h *NetworkHandler) ListNetworks(ctx context.Context, input *ListNetworksIn
}
params := pagination.QueryParams{
+ SearchQuery: pagination.SearchQuery{
+ Search: strings.TrimSpace(input.Search),
+ },
SortParams: pagination.SortParams{
- Sort: input.SortCol,
- Order: pagination.SortOrder(input.SortDir),
+ Sort: strings.TrimSpace(input.Sort),
+ Order: pagination.SortOrder(input.Order),
},
PaginationParams: pagination.PaginationParams{
- Start: (input.Page - 1) * input.Limit,
+ Start: input.Start,
Limit: input.Limit,
},
Filters: filters,
@@ -296,7 +300,7 @@ func (h *NetworkHandler) GetNetwork(ctx context.Context, input *GetNetworkInput)
sort.Slice(out.ContainersList, func(i, j int) bool {
a, b := out.ContainersList[i], out.ContainersList[j]
- if input.SortCol == "ip" {
+ if input.Sort == "ip" {
valA := a.IPv4Address
if valA == "" {
valA = a.IPv6Address
@@ -315,21 +319,21 @@ func (h *NetworkHandler) GetNetwork(ctx context.Context, input *GetNetworkInput)
if parsedA == nil || parsedB == nil {
// Fallback to string comparison if parsing fails
- if input.SortDir == "desc" {
+ if input.Order == "desc" {
return valA > valB
}
return valA < valB
}
cmp := bytes.Compare(parsedA, parsedB)
- if input.SortDir == "desc" {
+ if input.Order == "desc" {
return cmp > 0
}
return cmp < 0
}
// Default to Name
- if input.SortDir == "desc" {
+ if input.Order == "desc" {
return strings.ToLower(a.Name) > strings.ToLower(b.Name)
}
return strings.ToLower(a.Name) < strings.ToLower(b.Name)
diff --git a/frontend/src/lib/services/network-service.ts b/frontend/src/lib/services/network-service.ts
index 7ad9c1191..122d3b7d3 100644
--- a/frontend/src/lib/services/network-service.ts
+++ b/frontend/src/lib/services/network-service.ts
@@ -26,11 +26,9 @@ export class NetworkService extends BaseAPIService {
return res.data.data;
}
- async getNetwork(networkId: string, sort?: string, order?: string): Promise<NetworkInspectDto> {
+ async getNetwork(networkId: string, options?: SearchPaginationSortRequest): Promise<NetworkInspectDto> {
const envId = await environmentStore.getCurrentEnvironmentId();
- const params: Record<string, string> = {};
- if (sort) params['sort[column]'] = sort;
- if (order) params['sort[direction]'] = order;
+ const params = transformPaginationParams(options);
return this.handleResponse(this.api.get(`/environments/${envId}/networks/${networkId}`, { params }));
}
diff --git a/frontend/src/routes/(app)/networks/[networkId]/+page.svelte b/frontend/src/routes/(app)/networks/[networkId]/+page.svelte
index 92e288b09..40a0100f6 100644
--- a/frontend/src/routes/(app)/networks/[networkId]/+page.svelte
+++ b/frontend/src/routes/(app)/networks/[networkId]/+page.svelte
@@ -55,7 +55,9 @@
if (data.network?.id) {
try {
- network = await networkService.getNetwork(data.network.id, sortCol, sortDir);
+ network = await networkService.getNetwork(data.network.id, {
+ sort: { column: sortCol, direction: sortDir }
+ });
} catch (err) {
console.error('Failed to sort network containers:', err);
toast.error(m.common_action_failed());