Skip to content

Modern Docker Management, Designed for Everyone

fix: use correct json body for system prune

Kyle Mendell13e35fdcb754
diff --git a/backend/internal/api/environment_handler.go b/backend/internal/api/environment_handler.go
index a1aeb7d9b..027a4faad 100644
--- a/backend/internal/api/environment_handler.go
+++ b/backend/internal/api/environment_handler.go
@@ -145,9 +145,7 @@ func NewEnvironmentHandler(
apiGroup.GET("/:id/updater/history", h.UpdaterHistory)
apiGroup.POST("/:id/agent/pair", h.PairAgent)
-
apiGroup.GET("/:id/stats/ws", h.GetStatsWS)
-
apiGroup.GET("/:id/docker/info", h.GetDockerInfo)
}
}
diff --git a/backend/internal/api/image_handler.go b/backend/internal/api/image_handler.go
index 0c9bb4b3d..280948f2f 100644
--- a/backend/internal/api/image_handler.go
+++ b/backend/internal/api/image_handler.go
@@ -159,6 +159,8 @@ func (h *ImageHandler) Prune(c *gin.Context) {
}
}
+ slog.DebugContext(c.Request.Context(), "Image prune request", slog.Bool("dangling_only", dangling))
+
report, err := h.imageService.PruneImages(c.Request.Context(), dangling)
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{
diff --git a/backend/internal/services/system_service.go b/backend/internal/services/system_service.go
index 11e7ca296..2dac96ef4 100644
--- a/backend/internal/services/system_service.go
+++ b/backend/internal/services/system_service.go
@@ -64,9 +64,11 @@ func (s *SystemService) PruneAll(ctx context.Context, req dto.PruneSystemDto) (*
}
}
- danglingOnly, err := s.getDanglingModeFromSettings(ctx)
- if err != nil {
- danglingOnly = req.Dangling
+ danglingOnly := req.Dangling
+ if settingsDangling, _ := s.getDanglingModeFromSettings(ctx); settingsDangling != danglingOnly {
+ slog.DebugContext(ctx, "Prune request overriding stored image prune mode",
+ slog.Bool("settings_dangling_only", settingsDangling),
+ slog.Bool("request_dangling_only", danglingOnly))
}
slog.DebugContext(ctx, "Resolved image prune mode", slog.Bool("dangling_only", danglingOnly))
diff --git a/frontend/src/lib/components/sidebar/sidebar-env-switcher.svelte b/frontend/src/lib/components/sidebar/sidebar-env-switcher.svelte
index 3a1f711e9..a4cbec165 100644
--- a/frontend/src/lib/components/sidebar/sidebar-env-switcher.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar-env-switcher.svelte
@@ -64,10 +64,12 @@
</script>
<Sidebar.Menu>
- <Label class={cn(
- "text-sidebar-foreground/60 mb-2 px-2 text-xs font-medium transition-opacity duration-200",
- (sidebar.open || sidebar.isHovered) ? "opacity-100" : "opacity-0"
- )}>{m.sidebar_environment_label()}</Label>
+ <Label
+ class={cn(
+ 'text-sidebar-foreground/60 mb-2 px-2 text-xs font-medium transition-opacity duration-200',
+ sidebar.open || sidebar.isHovered ? 'opacity-100' : 'opacity-0'
+ )}>{m.sidebar_environment_label()}</Label
+ >
<Sidebar.MenuItem>
<DropdownMenu.Root bind:open={dropdownOpen}>
<DropdownMenu.Trigger>
@@ -117,6 +119,7 @@
sideOffset={4}
>
<div
+ role="group"
onmouseenter={() => {
// Keep sidebar hovered when mouse is over dropdown
if (sidebar.state === 'collapsed') {
@@ -129,43 +132,43 @@
}}
>
<DropdownMenu.Label class="text-muted-foreground text-xs">{m.sidebar_select_environment()}</DropdownMenu.Label>
- {#if availableEnvironments.length === 0}
- <DropdownMenu.Item disabled class="gap-2 p-2">
- <div class="flex size-6 items-center justify-center rounded-md border">
- <ServerIcon class="size-3.5 shrink-0" />
- </div>
- <span>{m.sidebar_no_environments()}</span>
- </DropdownMenu.Item>
- {:else}
- {#each availableEnvironments as env (env.id)}
- <DropdownMenu.Item onSelect={() => handleSelect(env)} class="gap-2 p-2">
+ {#if availableEnvironments.length === 0}
+ <DropdownMenu.Item disabled class="gap-2 p-2">
<div class="flex size-6 items-center justify-center rounded-md border">
- {#if env.isLocal}
- <ServerIcon class="size-3.5 shrink-0" />
- {:else}
- <GlobeIcon class="size-3.5 shrink-0" />
- {/if}
+ <ServerIcon class="size-3.5 shrink-0" />
</div>
- <div class="flex flex-col">
- <span>{getEnvLabel(env)}</span>
- {#if env.isLocal}
- <span class="text-muted-foreground text-xs">{m.sidebar_local_docker_socket()}</span>
- {:else}
- <span class="text-muted-foreground max-w-32 truncate text-xs">{env.apiUrl}</span>
- {/if}
+ <span>{m.sidebar_no_environments()}</span>
+ </DropdownMenu.Item>
+ {:else}
+ {#each availableEnvironments as env (env.id)}
+ <DropdownMenu.Item onSelect={() => handleSelect(env)} class="gap-2 p-2">
+ <div class="flex size-6 items-center justify-center rounded-md border">
+ {#if env.isLocal}
+ <ServerIcon class="size-3.5 shrink-0" />
+ {:else}
+ <GlobeIcon class="size-3.5 shrink-0" />
+ {/if}
+ </div>
+ <div class="flex flex-col">
+ <span>{getEnvLabel(env)}</span>
+ {#if env.isLocal}
+ <span class="text-muted-foreground text-xs">{m.sidebar_local_docker_socket()}</span>
+ {:else}
+ <span class="text-muted-foreground max-w-32 truncate text-xs">{env.apiUrl}</span>
+ {/if}
+ </div>
+ </DropdownMenu.Item>
+ {/each}
+ {/if}
+ {#if isAdmin}
+ <DropdownMenu.Separator />
+ <DropdownMenu.Item class="gap-2 p-2" onSelect={() => goto('/environments')}>
+ <div class="flex size-6 items-center justify-center rounded-md border bg-transparent">
+ <PlusIcon class="size-4" />
</div>
+ <div class="text-muted-foreground font-medium">{m.sidebar_manage_environments()}</div>
</DropdownMenu.Item>
- {/each}
- {/if}
- {#if isAdmin}
- <DropdownMenu.Separator />
- <DropdownMenu.Item class="gap-2 p-2" onSelect={() => goto('/environments')}>
- <div class="flex size-6 items-center justify-center rounded-md border bg-transparent">
- <PlusIcon class="size-4" />
- </div>
- <div class="text-muted-foreground font-medium">{m.sidebar_manage_environments()}</div>
- </DropdownMenu.Item>
- {/if}
+ {/if}
</div>
</DropdownMenu.Content>
</DropdownMenu.Root>