Skip to content

Modern Docker Management, Designed for Everyone

fix: seperate prefefined networks from the rest in usage count

Kyle Mendell313bbbd46a1d
diff --git a/backend/internal/api/network_handler.go b/backend/internal/api/network_handler.go
index 13b3bfe82..52a827675 100644
--- a/backend/internal/api/network_handler.go
+++ b/backend/internal/api/network_handler.go
@@ -147,18 +147,18 @@ func (h *NetworkHandler) Remove(c *gin.Context) {
}
func (h *NetworkHandler) GetNetworkUsageCounts(c *gin.Context) {
- _, running, stopped, total, err := h.dockerService.GetAllNetworks(c.Request.Context())
+ _, inuse, unused, total, err := h.dockerService.GetAllNetworks(c.Request.Context())
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{
"success": false,
- "data": gin.H{"error": "Failed to get container counts: " + err.Error()},
+ "data": gin.H{"error": "Failed to get network counts: " + err.Error()},
})
return
}
out := dto.NetworkUsageCounts{
- Inuse: running,
- Unused: stopped,
+ Inuse: inuse,
+ Unused: unused,
Total: total,
}
diff --git a/backend/internal/dto/network_dto.go b/backend/internal/dto/network_dto.go
index 9889d3885..11aa25a99 100644
--- a/backend/internal/dto/network_dto.go
+++ b/backend/internal/dto/network_dto.go
@@ -15,6 +15,7 @@ type NetworkSummaryDto struct {
Options map[string]string `json:"options"`
Labels map[string]string `json:"labels"`
InUse bool `json:"inUse"`
+ IsDefault bool `json:"isDefault"`
}
type NetworkUsageCounts struct {
diff --git a/backend/internal/services/docker_client_service.go b/backend/internal/services/docker_client_service.go
index 55876cb60..d882e3e30 100644
--- a/backend/internal/services/docker_client_service.go
+++ b/backend/internal/services/docker_client_service.go
@@ -90,13 +90,31 @@ func (s *DockerClientService) GetAllImages(ctx context.Context) ([]image.Summary
return images, inuse, unused, total, nil
}
-func (s *DockerClientService) GetAllNetworks(ctx context.Context) ([]network.Summary, int, int, int, error) {
+func (s *DockerClientService) GetAllNetworks(ctx context.Context) (_ []network.Summary, totalNetworks int, inuseNetworks int, unusedNetworks int, error error) {
dockerClient, err := s.CreateConnection(ctx)
if err != nil {
return nil, 0, 0, 0, fmt.Errorf("failed to connect to Docker: %w", err)
}
defer dockerClient.Close()
+ containers, err := dockerClient.ContainerList(ctx, container.ListOptions{All: true})
+ if err != nil {
+ return nil, 0, 0, 0, fmt.Errorf("failed to list Docker containers: %w", err)
+ }
+ inUseByID := make(map[string]bool)
+ inUseByName := make(map[string]bool)
+ for _, c := range containers {
+ if c.NetworkSettings == nil || c.NetworkSettings.Networks == nil {
+ continue
+ }
+ for netName, es := range c.NetworkSettings.Networks {
+ if es.NetworkID != "" {
+ inUseByID[es.NetworkID] = true
+ }
+ inUseByName[netName] = true
+ }
+ }
+
networks, err := dockerClient.NetworkList(ctx, network.ListOptions{})
if err != nil {
return nil, 0, 0, 0, fmt.Errorf("failed to list Docker networks: %w", err)
@@ -104,9 +122,12 @@ func (s *DockerClientService) GetAllNetworks(ctx context.Context) ([]network.Sum
var inuse, unused, total int
for _, n := range networks {
- total++
+ total++ // total includes all networks (including defaults)
+
+ // Only count non-default networks towards in-use/unused breakdown
if !docker.IsDefaultNetwork(n.Name) {
- if len(n.Containers) > 0 {
+ used := inUseByID[n.ID] || inUseByName[n.Name]
+ if used {
inuse++
} else {
unused++
@@ -114,6 +135,7 @@ func (s *DockerClientService) GetAllNetworks(ctx context.Context) ([]network.Sum
}
}
+ // Return order: inuse, unused, total (matches handler expectations)
return networks, inuse, unused, total, nil
}
diff --git a/backend/internal/services/network_service.go b/backend/internal/services/network_service.go
index 00dbe4b57..ff509cefd 100644
--- a/backend/internal/services/network_service.go
+++ b/backend/internal/services/network_service.go
@@ -11,6 +11,7 @@ import (
"github.com/ofkm/arcane-backend/internal/database"
"github.com/ofkm/arcane-backend/internal/dto"
"github.com/ofkm/arcane-backend/internal/models"
+ dockerutil "github.com/ofkm/arcane-backend/internal/utils/docker"
"github.com/ofkm/arcane-backend/internal/utils/pagination"
)
@@ -161,6 +162,7 @@ func (s *NetworkService) ListNetworksPaginated(ctx context.Context, params pagin
for _, n := range rawNets {
netDto := dto.NewNetworkSummaryDto(n)
netDto.InUse = inUseByID[netDto.ID] || inUseByName[netDto.Name]
+ netDto.IsDefault = dockerutil.IsDefaultNetwork(netDto.Name)
items = append(items, netDto)
}
diff --git a/frontend/src/lib/types/network.type.ts b/frontend/src/lib/types/network.type.ts
index a67739a4e..96a3a67bc 100644
--- a/frontend/src/lib/types/network.type.ts
+++ b/frontend/src/lib/types/network.type.ts
@@ -120,6 +120,7 @@ export interface NetworkSummaryDto {
options?: Record<string, string> | null;
labels?: Record<string, string> | null;
inUse: boolean;
+ isDefault?: boolean;
}
export interface NetworkInspectDto {
diff --git a/frontend/src/routes/networks/network-table.svelte b/frontend/src/routes/networks/network-table.svelte
index 2634e41a9..97996a586 100644
--- a/frontend/src/routes/networks/network-table.svelte
+++ b/frontend/src/routes/networks/network-table.svelte
@@ -66,7 +66,7 @@
async function handleDeleteSelectedNetworks(ids: string[]) {
const selectedNetworkList = networks.data.filter((n) => ids.includes(n.id));
- const defaultNetworks = selectedNetworkList.filter((n) => DEFAULT_NETWORK_NAMES.has(n.name));
+ const defaultNetworks = selectedNetworkList.filter((n) => n.isDefault);
if (defaultNetworks.length > 0) {
const names = defaultNetworks.map((n) => n.name ?? m.common_unknown()).join(', ');
@@ -199,7 +199,9 @@
{/snippet}
{#snippet StatusCell({ item }: { item: NetworkSummaryDto })}
- {#if item.inUse}
+ {#if item.isDefault}
+ <StatusBadge text={m.networks_predefined()} variant="sky" />
+ {:else if item.inUse}
<StatusBadge text={m.common_in_use()} variant="green" />
{:else}
<StatusBadge text={m.common_unused()} variant="amber" />
@@ -226,9 +228,11 @@
badges={[
(item: NetworkSummaryDto) =>
(mobileFieldVisibility.status ?? true)
- ? item.inUse
- ? { variant: 'green', text: m.common_in_use() }
- : { variant: 'amber', text: m.common_unused() }
+ ? (item.isDefault ?? false) || DEFAULT_NETWORK_NAMES.has(item.name)
+ ? { variant: 'gray', text: m.networks_predefined() }
+ : item.inUse
+ ? { variant: 'green', text: m.common_in_use() }
+ : { variant: 'amber', text: m.common_unused() }
: null
]}
fields={[
@@ -276,7 +280,7 @@
<DropdownMenu.Item
variant="destructive"
onclick={() => handleDeleteNetwork(item.id, item.name)}
- disabled={isAnyLoading || DEFAULT_NETWORK_NAMES.has(item.name)}
+ disabled={isAnyLoading || item.isDefault || DEFAULT_NETWORK_NAMES.has(item.name)}
>
<Trash2Icon class="size-4" />
{m.common_delete()}