Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
feat: restart dependent services on project-level service restart (#3103)
Panos Koutsovasilis0a138b303414
diff --git a/backend/api/handlers/projects.go b/backend/api/handlers/projects.goindex d2304d2fc..b5bf61189 100644--- a/backend/api/handlers/projects.go+++ b/backend/api/handlers/projects.go@@ -153,8 +153,9 @@ type UpdateProjectIncludeOutput struct {}type RestartProjectInput struct {- EnvironmentID string `path:"id" doc:"Environment ID"`- ProjectID string `path:"projectId" doc:"Project ID"`+ EnvironmentID string `path:"id" doc:"Environment ID"`+ ProjectID string `path:"projectId" doc:"Project ID"`+ Services []string `query:"services" doc:"Service names to restart; empty restarts all services"`}type RestartProjectOutput struct {@@ -1049,9 +1050,10 @@ func (h *ProjectHandler) UpdateProjectInclude(ctx context.Context, input *Update}, nil}-// RestartProject restarts all containers in a project.+// RestartProject restarts the given services in a project (all services when none+// are specified).func (h *ProjectHandler) RestartProject(ctx context.Context, input *RestartProjectInput) (*RestartProjectOutput, error) {- response, err := h.runProjectActivityActionResponseInternal(ctx, input.EnvironmentID, input.ProjectID, h.restartProjectActivityConfigInternal())+ response, err := h.runProjectActivityActionResponseInternal(ctx, input.EnvironmentID, input.ProjectID, h.restartProjectActivityConfigInternal(input.Services))if err != nil {return nil, err}@@ -1126,7 +1128,7 @@ func (h *ProjectHandler) updateProjectServicesActivityConfigInternal(services []}}-func (h *ProjectHandler) restartProjectActivityConfigInternal() projectActivityActionConfigInternal {+func (h *ProjectHandler) restartProjectActivityConfigInternal(services []string) projectActivityActionConfigInternal {return projectActivityActionConfigInternal{ActivityType: models.ActivityTypeProjectRestart,Step: "Restarting project",@@ -1136,7 +1138,7 @@ func (h *ProjectHandler) restartProjectActivityConfigInternal() projectActivityASuccessComplete: "Project restarted",SuccessMessage: "Project restarted successfully",Action: func(runtimeCtx context.Context, projectID string, user models.User) error {- return h.projectService.RestartProject(runtimeCtx, projectID, user)+ return h.projectService.RestartProject(runtimeCtx, projectID, services, user)},Error: projectArchivedActionErrorInternal(func(err error) error {return huma.Error400BadRequest((&common.ProjectRestartError{Err: err}).Error())diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.goindex dfe60700a..ab53c1418 100644--- a/backend/internal/services/project_service.go+++ b/backend/internal/services/project_service.go@@ -2809,7 +2809,7 @@ func (s *ProjectService) buildProjectServicesInternal(ctx context.Context, projereturn nil}-func (s *ProjectService) RestartProject(ctx context.Context, projectID string, user models.User) error {+func (s *ProjectService) RestartProject(ctx context.Context, projectID string, services []string, user models.User) error {proj, err := s.getMutableProjectInternal(ctx, projectID)if err != nil {return err@@ -2832,7 +2832,7 @@ func (s *ProjectService) RestartProject(ctx context.Context, projectID string, u}writeProjectProgressInternal(ctx, "Restarting project services", 55, "restart")- if err := projects.ComposeRestart(ctx, compProj, nil); err != nil {+ if err := projects.ComposeRestart(ctx, compProj, services); err != nil {_ = s.updateProjectStatusInternal(ctx, projectID, models.ProjectStatusRunning)return fmt.Errorf("failed to restart project: %w", err)}@@ -2842,6 +2842,9 @@ func (s *ProjectService) RestartProject(ctx context.Context, projectID string, u"projectID": projectID,"projectName": proj.Name,}+ if len(services) > 0 {+ metadata["services"] = append([]string(nil), services...)+ }s.logProjectEventInternal(ctx, models.EventTypeProjectStart, projectID, proj.Name, user, metadata, "could not log project restart action")writeProjectProgressInternal(ctx, "Refreshing project status", 90, "status")diff --git a/backend/internal/services/webhook_service.go b/backend/internal/services/webhook_service.goindex 8a066f0c2..25311004c 100644--- a/backend/internal/services/webhook_service.go+++ b/backend/internal/services/webhook_service.go@@ -673,7 +673,7 @@ func (s *WebhookService) executeProjectWebhookActionInternal(ctx context.Context}return nil, nilcase models.WebhookActionTypeRestart:- if err := s.projectService.RestartProject(ctx, wh.TargetID, systemUser); err != nil {+ if err := s.projectService.RestartProject(ctx, wh.TargetID, nil, systemUser); err != nil {return nil, s.wrapWebhookActionErrorInternal(ctx, wh, "project", actionType, err)}return nil, nildiff --git a/backend/pkg/projects/cmds.go b/backend/pkg/projects/cmds.goindex d451e26d8..07f534dfe 100644--- a/backend/pkg/projects/cmds.go+++ b/backend/pkg/projects/cmds.go@@ -67,7 +67,7 @@ func ComposeRestart(ctx context.Context, proj *types.Project, services []string)progressWriter, _ := ctx.Value(ProgressWriterKey{}).(io.Writer)return runWithContainerPolling(restartCtx, c.svc, proj.Name, progressWriter, func() error {- return c.svc.Restart(restartCtx, proj.Name, api.RestartOptions{Services: services})+ return c.svc.Restart(restartCtx, proj.Name, api.RestartOptions{Project: proj, Services: services})})}diff --git a/frontend/src/lib/services/project-service.ts b/frontend/src/lib/services/project-service.tsindex 17fdf9909..111856bb0 100644--- a/frontend/src/lib/services/project-service.ts+++ b/frontend/src/lib/services/project-service.ts@@ -199,9 +199,16 @@ class ProjectService extends BaseAPIService {return this.handleResponse(this.api.put(`/environments/${envId}/projects/${projectId}/includes`, payload));}- async restartProject(projectId: string): Promise<void> {+ async restartProject(projectId: string, services?: string[]): Promise<unknown> {const envId = await environmentStore.getCurrentEnvironmentId();- await this.handleResponse(this.api.post(`/environments/${envId}/projects/${projectId}/restart`));+ let params: URLSearchParams | undefined;+ if (services && services.length > 0) {+ params = new URLSearchParams();+ for (const service of services) {+ params.append('services', service);+ }+ }+ return this.handleResponse(this.api.post(`/environments/${envId}/projects/${projectId}/restart`, undefined, { params }));}async archiveProject(projectId: string): Promise<void> {diff --git a/frontend/src/routes/(app)/projects/components/ProjectContainersTable.svelte b/frontend/src/routes/(app)/projects/components/ProjectContainersTable.svelteindex 156e84176..758d79fc1 100644--- a/frontend/src/routes/(app)/projects/components/ProjectContainersTable.svelte+++ b/frontend/src/routes/(app)/projects/components/ProjectContainersTable.svelte@@ -16,11 +16,15 @@import { m } from '$lib/paraglide/messages';import { goto } from '$app/navigation';import { containerService } from '$lib/services/container-service';+ import { projectService } from '$lib/services/project-service';import { environmentStore } from '$lib/stores/environment.store.svelte';import { hasPermission } from '$lib/utils/auth';import * as ArcaneTooltip from '$lib/components/arcane-tooltip';import IconImage from '$lib/components/icon-image.svelte';import { mode } from 'mode-watcher';+ import { toast } from 'svelte-sonner';+ import { handleApiResultWithCallbacks, tryCatch } from '$lib/utils/api';+ import { activityToastOptions, extractActivityId } from '$lib/utils/activity-toast';import { bulkConfirmAndRun, hasAnyLoadingState } from '$lib/utils/bulk-actions';import { confirmAndRemoveContainer, runContainerLifecycleAction } from '$lib/utils/container-actions';import {@@ -47,6 +51,7 @@const canStartContainer = $derived(hasPermission('containers:start', currentEnvId));const canStopContainer = $derived(hasPermission('containers:stop', currentEnvId));const canRestartContainer = $derived(hasPermission('containers:restart', currentEnvId));+ const canRestartProject = $derived(hasPermission('projects:restart', currentEnvId));const canDeleteContainer = $derived(hasPermission('containers:delete', currentEnvId));// Convert RuntimeService to a format compatible with ArcaneTable@@ -115,6 +120,34 @@});}+ async function performServiceRestart(item: ServiceWithId) {+ if (!projectId || !item.name) {+ toast.error(m.containers_restart_failed());+ return;+ }++ const id = item.id;+ actionStatus[id] = 'restarting';++ try {+ handleApiResultWithCallbacks({+ result: await tryCatch(projectService.restartProject(projectId, [item.name])),+ message: m.containers_restart_failed(),+ setLoadingState: (value) => {+ actionStatus[id] = value ? 'restarting' : '';+ },+ async onSuccess(data) {+ toast.success(m.containers_restart_success(), activityToastOptions(extractActivityId(data)));+ await onRefresh?.();+ }+ });+ } catch (error) {+ console.error('Service restart failed:', error);+ toast.error(m.containers_action_error());+ actionStatus[id] = '';+ }+ }+async function handleRemoveContainer(id: string, name: string) {confirmAndRemoveContainer({containerId: id,@@ -451,11 +484,11 @@/>{/if}- {#if canRestartContainer}+ {#if canRestartProject}<ContainerActionMenuItemicon={RefreshIcon}label={m.common_restart()}- onclick={() => performContainerAction('restart', item.containerId!)}+ onclick={() => performServiceRestart(item)}loading={status === 'restarting'}disabled={status === 'restarting' || isAnyLoading}/>