Skip to content

Modern Docker Management, Designed for Everyone

fix: volumes unable to be sorted by size

Kyle Mendell07f8baef275c
diff --git a/backend/internal/services/volume_service.go b/backend/internal/services/volume_service.go
index 240ac9ac2..ee4d5c662 100644
--- a/backend/internal/services/volume_service.go
+++ b/backend/internal/services/volume_service.go
@@ -426,8 +426,17 @@ func (s *VolumeService) ListVolumesPaginated(ctx context.Context, params paginat
volumeContainerMap = make(map[string][]string)
}
- // Skip usage data - it's fetched separately via GetVolumeSizes endpoint for lazy loading
- volumes := s.enrichVolumesWithUsageData(volResult.volumes, nil)
+ // Fetch usage data if sorting by size is requested
+ var usageVolumes []volume.Volume
+ if params.Sort == "size" {
+ if uv, err := docker.GetVolumeUsageData(ctx, dockerClient); err == nil {
+ usageVolumes = uv
+ } else {
+ slog.WarnContext(ctx, "failed to get volume usage data for sorting", "error", err.Error())
+ }
+ }
+
+ volumes := s.enrichVolumesWithUsageData(volResult.volumes, usageVolumes)
items := make([]volumetypes.Volume, 0, len(volumes))
for _, v := range volumes {
diff --git a/frontend/src/routes/(app)/volumes/volume-table.svelte b/frontend/src/routes/(app)/volumes/volume-table.svelte
index 34b2e17e0..1856506b3 100644
--- a/frontend/src/routes/(app)/volumes/volume-table.svelte
+++ b/frontend/src/routes/(app)/volumes/volume-table.svelte
@@ -156,19 +156,31 @@
{#snippet SizeCell({ item }: { item: VolumeSummaryDto })}
{#if volumeSizesPromise}
{#await volumeSizesPromise}
- <span class="text-muted-foreground flex items-center gap-1 text-sm">
- <Spinner class="size-4" />
- </span>
+ {#if item.size > 0}
+ <span class="text-sm tabular-nums">{bytes.format(item.size)}</span>
+ {:else}
+ <span class="text-muted-foreground flex items-center gap-1 text-sm">
+ <Spinner class="size-4" />
+ </span>
+ {/if}
{:then sizesMap}
{@const sizeInfo = sizesMap.get(item.name)}
{#if sizeInfo && sizeInfo.size >= 0}
<span class="text-sm tabular-nums">{bytes.format(sizeInfo.size)}</span>
+ {:else if item.size > 0}
+ <span class="text-sm tabular-nums">{bytes.format(item.size)}</span>
{:else}
<span class="text-muted-foreground text-sm">-</span>
{/if}
{:catch}
- <span class="text-muted-foreground text-sm">-</span>
+ {#if item.size > 0}
+ <span class="text-sm tabular-nums">{bytes.format(item.size)}</span>
+ {:else}
+ <span class="text-muted-foreground text-sm">-</span>
+ {/if}
{/await}
+ {:else if item.size > 0}
+ <span class="text-sm tabular-nums">{bytes.format(item.size)}</span>
{:else}
<span class="text-muted-foreground text-sm">-</span>
{/if}
diff --git a/types/volume/volume.go b/types/volume/volume.go
index 34155de9f..df1bf3d76 100644
--- a/types/volume/volume.go
+++ b/types/volume/volume.go
@@ -54,6 +54,11 @@ type Volume struct {
// Required: false
UsageData *volume.UsageData `json:"usageData,omitempty"`
+ // Size is the size of the volume in bytes.
+ //
+ // Required: false
+ Size int64 `json:"size"`
+
// Containers is a list of container IDs using this volume.
//
// Required: true
@@ -133,6 +138,8 @@ func NewSummary(v volume.Volume) Volume {
if v.UsageData != nil {
dto.InUse = v.UsageData.RefCount >= 1
+ dto.UsageData = v.UsageData
+ dto.Size = v.UsageData.Size
}
return dto