Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
feat: sort containers connected to a network (#1095)
Kyle Mendell3b6487f1cc8d
diff --git a/backend/internal/huma/handlers/networks.go b/backend/internal/huma/handlers/networks.goindex efae2a3a4..2e96b2288 100644--- a/backend/internal/huma/handlers/networks.go+++ b/backend/internal/huma/handlers/networks.go@@ -1,8 +1,12 @@package handlersimport (+ "bytes""context"+ "net""net/http"+ "sort"+ "strings""github.com/danielgtaylor/huma/v2"dockernetwork "github.com/docker/docker/api/types/network"@@ -76,6 +80,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"`}type GetNetworkOutput struct {@@ -268,6 +274,62 @@ func (h *NetworkHandler) GetNetwork(ctx context.Context, input *GetNetworkInput)return nil, huma.Error500InternalServerError((&common.NetworkMappingError{Err: err}).Error())}+ // Populate ContainersList+ out.ContainersList = make([]networktypes.ContainerEndpoint, 0, len(out.Containers))+ for id, container := range out.Containers {+ out.ContainersList = append(out.ContainersList, networktypes.ContainerEndpoint{+ ID: id,+ Name: container.Name,+ EndpointID: container.EndpointID,+ IPv4Address: container.IPv4Address,+ IPv6Address: container.IPv6Address,+ MacAddress: container.MacAddress,+ })+ }++ // Sort ContainersList+ sort.Slice(out.ContainersList, func(i, j int) bool {+ a, b := out.ContainersList[i], out.ContainersList[j]++ if input.SortCol == "ip" {+ valA := a.IPv4Address+ if valA == "" {+ valA = a.IPv6Address+ }+ valB := b.IPv4Address+ if valB == "" {+ valB = b.IPv6Address+ }++ // Parse IPs for proper numeric comparison+ ipA, _, _ := strings.Cut(valA, "/")+ ipB, _, _ := strings.Cut(valB, "/")++ parsedA := net.ParseIP(ipA)+ parsedB := net.ParseIP(ipB)++ if parsedA == nil || parsedB == nil {+ // Fallback to string comparison if parsing fails+ if input.SortDir == "desc" {+ return valA > valB+ }+ return valA < valB+ }++ cmp := bytes.Compare(parsedA, parsedB)+ if input.SortDir == "desc" {+ return cmp > 0+ }+ return cmp < 0+ }++ // Default to Name+ if input.SortDir == "desc" {+ return strings.ToLower(a.Name) > strings.ToLower(b.Name)+ }+ return strings.ToLower(a.Name) < strings.ToLower(b.Name)+ })+return &GetNetworkOutput{Body: NetworkInspectApiResponse{Success: true,diff --git a/frontend/src/lib/services/network-service.ts b/frontend/src/lib/services/network-service.tsindex eabd691bd..1fa4ba1d5 100644--- a/frontend/src/lib/services/network-service.ts+++ b/frontend/src/lib/services/network-service.ts@@ -20,9 +20,12 @@ export class NetworkService extends BaseAPIService {return res.data.data;}- async getNetwork(networkId: string): Promise<any> {+ async getNetwork(networkId: string, sort?: string, order?: string): Promise<any> {const envId = await environmentStore.getCurrentEnvironmentId();- return this.handleResponse(this.api.get(`/environments/${envId}/networks/${networkId}`));+ const params: Record<string, string> = {};+ if (sort) params['sort[column]'] = sort;+ if (order) params['sort[direction]'] = order;+ return this.handleResponse(this.api.get(`/environments/${envId}/networks/${networkId}`, { params }));}async createNetwork(name: string, options: NetworkCreateOptions): Promise<any> {diff --git a/frontend/src/lib/types/network.type.ts b/frontend/src/lib/types/network.type.tsindex 2b7223c84..784327a96 100644--- a/frontend/src/lib/types/network.type.ts+++ b/frontend/src/lib/types/network.type.ts@@ -36,6 +36,7 @@ export interface NetworkUsageCounts {}export interface ContainerEndpointDto {+ id?: string;name: string;endpointId: string;macAddress: string;@@ -77,6 +78,7 @@ export interface NetworkInspectDto {options?: Record<string, string> | null;labels?: Record<string, string> | null;containers?: Record<string, ContainerEndpointDto> | null;+ containersList?: ContainerEndpointDto[];ipam?: IPAMDto;internal: boolean;attachable: boolean;diff --git a/frontend/src/routes/(app)/networks/[networkId]/+page.svelte b/frontend/src/routes/(app)/networks/[networkId]/+page.svelteindex 26700b370..9544f5db4 100644--- a/frontend/src/routes/(app)/networks/[networkId]/+page.svelte+++ b/frontend/src/routes/(app)/networks/[networkId]/+page.svelte@@ -13,6 +13,8 @@import ListTreeIcon from '@lucide/svelte/icons/list-tree';import ContainerIcon from '@lucide/svelte/icons/container';import InfoIcon from '@lucide/svelte/icons/info';+ import ArrowUpIcon from '@lucide/svelte/icons/arrow-up';+ import ArrowDownIcon from '@lucide/svelte/icons/arrow-down';import * as Breadcrumb from '$lib/components/ui/breadcrumb';import * as Alert from '$lib/components/ui/alert';import StatusBadge from '$lib/components/badges/status-badge.svelte';@@ -28,19 +30,39 @@import { networkService } from '$lib/services/network-service';let { data }: { data: PageData } = $props();- let { network }: { network: NetworkInspectDto | null | undefined } = $derived(data);let errorMessage = $state('');let isRemoving = $state(false);+ let sortCol = $state('name');+ let sortDir = $state<'asc' | 'desc'>('asc');+ let network = $derived(data.network);const shortId = $derived(network?.id?.substring(0, 12) ?? m.common_unknown());const createdDate = $derived(network?.created ? format(new Date(network.created), 'PP p') : m.common_unknown());+const connectedContainers = $derived(- network?.containers ? Object.entries(network.containers).map(([id, info]) => ({ id, ...(info as any) })) : []+ network?.containersList ??+ (network?.containers ? Object.entries(network.containers).map(([id, info]) => ({ id, ...(info as any) })) : []));+const inUse = $derived(connectedContainers.length > 0);const isPredefined = $derived(network?.name === 'bridge' || network?.name === 'host' || network?.name === 'none');+ async function handleSort(column: string) {+ const newSortDir: 'asc' | 'desc' = sortCol === column && sortDir === 'asc' ? 'desc' : 'asc';+ sortCol = column;+ sortDir = newSortDir;++ if (data.network?.id) {+ try {+ network = await networkService.getNetwork(data.network.id, sortCol, sortDir);+ } catch (err) {+ console.error('Failed to sort network containers:', err);+ toast.error(m.common_action_failed());+ }+ }+ }+function triggerRemove() {if (isPredefined) {toast.error(m.networks_cannot_delete_default({ name: network?.name ?? m.common_unknown() }));@@ -374,25 +396,66 @@</Card.Header><Card.Content class="p-4"><Card.Root variant="outlined">- <Card.Content class="divide-y p-0">- {#each connectedContainers as container (container.id)}- <div class="flex flex-col p-3 sm:flex-row sm:items-center">- <div class="mb-2 w-full font-medium break-all sm:mb-0 sm:w-1/3">- <a href="/containers/{container.id}" class="text-primary flex items-center hover:underline">- <ContainerIcon class="text-muted-foreground mr-1.5 size-3.5" />- {container.Name}- </a>- </div>- <div class="w-full pl-0 sm:w-2/3 sm:pl-4">- <code- class="bg-muted text-muted-foreground cursor-pointer rounded px-1.5 py-0.5 font-mono text-xs break-all select-all sm:text-sm"- title="Click to select"- >- {container.IPv4Address || container.IPv6Address || m.common_unknown()}- </code>- </div>+ <Card.Content class="p-0">+ <div class="bg-muted/30 flex flex-col border-b p-3 sm:flex-row sm:items-center">+ <div+ class="text-muted-foreground hover:text-foreground flex w-full cursor-pointer items-center text-sm font-medium sm:w-1/3"+ onclick={() => handleSort('name')}+ role="button"+ tabindex="0"+ onkeydown={(e) => e.key === 'Enter' && handleSort('name')}+ >+ {m.common_name()}+ {#if sortCol === 'name'}+ {#if sortDir === 'asc'}+ <ArrowUpIcon class="ml-1 size-3" />+ {:else}+ <ArrowDownIcon class="ml-1 size-3" />+ {/if}+ {/if}+ </div>+ <div+ class="text-muted-foreground hover:text-foreground flex w-full cursor-pointer items-center pl-0 text-sm font-medium sm:w-2/3 sm:pl-4"+ onclick={() => handleSort('ip')}+ role="button"+ tabindex="0"+ onkeydown={(e) => e.key === 'Enter' && handleSort('ip')}+ >+ {m.containers_ip_address()}+ {#if sortCol === 'ip'}+ {#if sortDir === 'asc'}+ <ArrowUpIcon class="ml-1 size-3" />+ {:else}+ <ArrowDownIcon class="ml-1 size-3" />+ {/if}+ {/if}</div>- {/each}+ </div>++ <div class="divide-y">+ {#each connectedContainers as container (container.id)}+ <div class="flex flex-col p-3 sm:flex-row sm:items-center">+ <div class="mb-2 w-full font-medium break-all sm:mb-0 sm:w-1/3">+ <a href="/containers/{container.id}" class="text-primary flex items-center hover:underline">+ <ContainerIcon class="text-muted-foreground mr-1.5 size-3.5" />+ {container.name ?? container.Name}+ </a>+ </div>+ <div class="w-full pl-0 sm:w-2/3 sm:pl-4">+ <code+ class="bg-muted text-muted-foreground cursor-pointer rounded px-1.5 py-0.5 font-mono text-xs break-all select-all sm:text-sm"+ title="Click to select"+ >+ {container.ipv4Address ??+ container.IPv4Address ??+ container.ipv6Address ??+ container.IPv6Address ??+ m.common_unknown()}+ </code>+ </div>+ </div>+ {/each}+ </div></Card.Content></Card.Root></Card.Content>diff --git a/types/network/network.go b/types/network/network.goindex 46297ff2b..da15f71ca 100644--- a/types/network/network.go+++ b/types/network/network.go@@ -53,6 +53,38 @@ type Summary struct {IsDefault bool `json:"isDefault"`}+type ContainerEndpoint struct {+ // ID is the unique identifier of the container.+ //+ // Required: true+ ID string `json:"id"`++ // Name of the container.+ //+ // Required: true+ Name string `json:"name"`++ // EndpointID is the unique identifier of the endpoint.+ //+ // Required: true+ EndpointID string `json:"endpointId"`++ // IPv4Address is the IPv4 address of the container.+ //+ // Required: true+ IPv4Address string `json:"ipv4Address"`++ // IPv6Address is the IPv6 address of the container.+ //+ // Required: true+ IPv6Address string `json:"ipv6Address"`++ // MacAddress is the MAC address of the container.+ //+ // Required: true+ MacAddress string `json:"macAddress"`+}+type UsageCounts struct {// Inuse is the number of networks currently in use.//@@ -111,6 +143,11 @@ type Inspect struct {// Required: trueContainers map[string]network.EndpointResource `json:"containers"`+ // ContainersList is a sorted list of containers connected to this network.+ //+ // Required: true+ ContainersList []ContainerEndpoint `json:"containersList"`+// IPAM contains IP address management configuration.//// Required: true