Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: project files not removed when deleteing from the ui
Kyle Mendell65c93c6f91f9
diff --git a/backend/internal/api/environment_handler.go b/backend/internal/api/environment_handler.goindex f2033d48e..3ae1640e8 100644--- a/backend/internal/api/environment_handler.go+++ b/backend/internal/api/environment_handler.go@@ -469,9 +469,6 @@ func (h *EnvironmentHandler) handleStackEndpoints(c *gin.Context, endpoint strincase strings.HasPrefix(endpoint, "/stacks/") && c.Request.Method == http.MethodPut:stackHandler.UpdateStack(c)return true- case strings.HasPrefix(endpoint, "/stacks/") && c.Request.Method == http.MethodDelete:- stackHandler.DeleteStack(c)- return true}return false}diff --git a/backend/internal/api/stack_handler.go b/backend/internal/api/stack_handler.goindex 53bc3c781..6d9ddaeb2 100644--- a/backend/internal/api/stack_handler.go+++ b/backend/internal/api/stack_handler.go@@ -31,7 +31,6 @@ func NewStackHandler(group *gin.RouterGroup, stackService *services.StackServiceapiGroup.POST("", handler.CreateStack)apiGroup.GET("/:id", handler.GetStack)apiGroup.PUT("/:id", handler.UpdateStack)- apiGroup.DELETE("/:id", handler.DeleteStack)apiGroup.POST("/:id/deploy", handler.DeployStack)apiGroup.POST("/:id/stop", handler.StopStack)apiGroup.POST("/:id/restart", handler.RestartStack)@@ -289,32 +288,6 @@ func (h *StackHandler) UpdateStack(c *gin.Context) {})}-func (h *StackHandler) DeleteStack(c *gin.Context) {- stackID := c.Param("stackId")- if stackID == "" {- stackID = c.Param("id")- }-- currentUser, exists := middleware.GetCurrentUser(c)- if !exists || currentUser == nil {- c.JSON(http.StatusUnauthorized, gin.H{"success": false, "error": "User not authenticated"})- return- }- err := h.stackService.DeleteStack(c.Request.Context(), stackID, *currentUser)- if err != nil {- c.JSON(http.StatusInternalServerError, gin.H{- "success": false,- "error": "Failed to delete stack",- })- return- }-- c.JSON(http.StatusOK, gin.H{- "success": true,- "data": gin.H{"message": "Stack deleted successfully"},- })-}-func (h *StackHandler) StartStack(c *gin.Context) {stackID := c.Param("stackId")if stackID == "" {diff --git a/backend/internal/services/stack_service.go b/backend/internal/services/stack_service.goindex 38251d8ad..dee7af854 100644--- a/backend/internal/services/stack_service.go+++ b/backend/internal/services/stack_service.go@@ -778,40 +778,6 @@ func (s *StackService) GetStackContent(ctx context.Context, stackID string) (comreturn composeContent, envContent, nil}-func (s *StackService) DeleteStack(ctx context.Context, stackID string, user models.User) error {- stack, err := s.GetStackByID(ctx, stackID)- if err != nil {- return err- }-- if stack.Status == models.StackStatusRunning {- if err := s.DownStack(ctx, stackID, systemUser); err != nil {- fmt.Printf("Warning: failed to stop stack before deletion: %v\n", err)- }- }-- if err := s.db.WithContext(ctx).Delete(stack).Error; err != nil {- return fmt.Errorf("failed to delete stack from database: %w", err)- }-- if err := os.RemoveAll(stack.Path); err != nil {- fmt.Printf("Warning: failed to remove stack directory %s: %v\n", stack.Path, err)- }-- // Log stack deletion event- metadata := models.JSON{- "action": "delete",- "stackId": stackID,- "stackName": stack.Name,- "path": stack.Path,- }- if logErr := s.eventService.LogStackEvent(ctx, models.EventTypeStackDelete, stackID, stack.Name, user.ID, user.Username, "0", metadata); logErr != nil {- fmt.Printf("Could not log stack deletion action: %s\n", logErr)- }-- return nil-}-func (s *StackService) DestroyStack(ctx context.Context, stackID string, removeFiles, removeVolumes bool, user models.User) error {stack, err := s.GetStackByID(ctx, stackID)if err != nil {@@ -834,16 +800,16 @@ func (s *StackService) DestroyStack(ctx context.Context, stackID string, removeF}}- if err := s.db.WithContext(ctx).Delete(stack).Error; err != nil {- return fmt.Errorf("failed to delete stack from database: %w", err)- }-if removeFiles {if err := os.RemoveAll(stack.Path); err != nil {return fmt.Errorf("failed to remove stack files: %w", err)}}+ if err := s.db.WithContext(ctx).Delete(stack).Error; err != nil {+ return fmt.Errorf("failed to delete stack from database: %w", err)+ }+// Log stack destroy eventmetadata := models.JSON{"action": "destroy",diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex 2f4f0fa60..5d9804f5c 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -1045,5 +1045,6 @@"max_retry_placeholder": "5","max_retry_description": "Maximum number of restart attempts","containers_labels_description": "Enter metadata labels as key=value pairs, one per line",- "containers_creating": "Creating..."+ "containers_creating": "Creating...",+ "containers_remove_files_label": "Remove project files from storage"}diff --git a/frontend/src/lib/components/confirm-dialog/confirm-dialog.svelte b/frontend/src/lib/components/confirm-dialog/confirm-dialog.svelteindex 95d10e1e5..055220c1a 100644--- a/frontend/src/lib/components/confirm-dialog/confirm-dialog.svelte+++ b/frontend/src/lib/components/confirm-dialog/confirm-dialog.svelte@@ -29,7 +29,7 @@<Dialog.Root bind:open={$confirmDialogStore.open}><Dialog.Content class="w-full max-w-md sm:max-w-lg"><Dialog.Header class="space-y-3">- <Dialog.Title class="flex items-start gap-3 text-lg leading-tight font-semibold">+ <Dialog.Title class="flex items-start gap-3 text-lg font-semibold leading-tight"><TriangleAlert class="text-destructive mt-0.5 size-5 shrink-0" /><span class="min-w-0 break-words">{$confirmDialogStore.title}@@ -37,7 +37,7 @@</Dialog.Title></Dialog.Header>- <div class="text-muted-foreground mt-4 min-w-0 text-sm leading-relaxed break-words whitespace-pre-wrap">+ <div class="text-muted-foreground mt-4 min-w-0 whitespace-pre-wrap break-words text-sm leading-relaxed">{$confirmDialogStore.message}</div>@@ -61,13 +61,20 @@class="mt-0.5"/>{/if}- <Label- id={`${checkbox.id}-label`}- for={checkbox.id}- class="min-w-0 text-sm leading-relaxed font-medium break-words peer-disabled:cursor-not-allowed peer-disabled:opacity-70"- >- {checkbox.label}- </Label>++ <div class="min-w-0">+ <Label+ id={`${checkbox.id}-label`}+ for={checkbox.id}+ class="min-w-0 break-words text-sm font-medium leading-relaxed peer-disabled:cursor-not-allowed peer-disabled:opacity-70"+ >+ {checkbox.label}+ </Label>++ {#if checkbox.id === 'files' && checkboxStates[checkbox.id]}+ <div class="text-destructive mt-1 text-xs leading-snug">This will remove the project's files from disk.</div>+ {/if}+ </div></div>{/each}</div>diff --git a/frontend/src/lib/services/api/environment-api-service.ts b/frontend/src/lib/services/api/environment-api-service.tsindex 2c615a1a9..2ef47a655 100644--- a/frontend/src/lib/services/api/environment-api-service.ts+++ b/frontend/src/lib/services/api/environment-api-service.ts@@ -255,11 +255,6 @@ export class EnvironmentAPIService extends BaseAPIService {return this.handleResponse(this.api.put(`/environments/${envId}/stacks/${projectName}`, payload));}- async deleteProject(projectName: string): Promise<void> {- const envId = await this.getCurrentEnvironmentId();- await this.handleResponse(this.api.delete(`/environments/${envId}/stacks/${projectName}`));- }-async startProject(projectId: string): Promise<Project> {const envId = await this.getCurrentEnvironmentId();return this.handleResponse(this.api.post(`/environments/${envId}/stacks/${projectId}/start`));diff --git a/frontend/src/routes/compose/compose-table.svelte b/frontend/src/routes/compose/compose-table.svelteindex 986ce8757..0a4af6127 100644--- a/frontend/src/routes/compose/compose-table.svelte+++ b/frontend/src/routes/compose/compose-table.svelte@@ -95,12 +95,27 @@openConfirmDialog({title: m.compose_confirm_removal_title(),message: m.compose_confirm_removal_message(),+ checkboxes: [+ {+ id: 'volumes',+ label: m.confirm_remove_volumes_warning(),+ initialState: false+ },+ {+ id: 'files',+ label: m.confirm_remove_project_files(),+ initialState: false+ }+ ],confirm: {- label: m.common_remove(),+ label: m.compose_destroy(),destructive: true,- action: async () => {+ action: async (result: any) => {+ const removeVolumes = !!(result?.checkboxes?.volumes ?? result?.volumes);+ const removeFiles = !!(result?.checkboxes?.files ?? result?.files);+handleApiResultWithCallbacks({- result: await tryCatch(environmentAPI.destroyProject(id)),+ result: await tryCatch(environmentAPI.destroyProject(id, removeVolumes, removeFiles)),message: m.compose_destroy_failed(),setLoadingState: (value) => (isLoading.destroy = value),onSuccess: async () => {