Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: add missing options to project redeploy dropdown
Kyle Mendellf7cb88562131
diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex 30704ab2e..eb7f8bf1b 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -2834,6 +2834,7 @@"deploy_pull_policy_always": "Always pull latest","deploy_pull_policy_never": "Never pull","deploy_force_recreate": "Force recreate containers",+ "deploy_remove_orphans": "Remove orphan containers","deploy_recreate_volumes": "Recreate changed volumes (data loss)","settings_default_deploy_pull_policy": "Default Deploy Pull Policy","settings_default_deploy_pull_policy_description": "Default image pull policy when deploying projects. A pull_policy set per service in the compose file takes precedence, including refresh windows (daily, weekly, every_N).",diff --git a/frontend/src/lib/components/action-buttons.svelte b/frontend/src/lib/components/action-buttons.svelteindex e37e7bc9e..5e26814a0 100644--- a/frontend/src/lib/components/action-buttons.svelte+++ b/frontend/src/lib/components/action-buttons.svelte@@ -8,6 +8,7 @@import { handleApiResultWithCallbacks } from '#lib/utils/api';import { ArcaneButton, arcaneButtonVariants, type ArcaneButtonSize } from '#lib/components/arcane-button/index.js';import DeploySplitButton from '#lib/components/deploy-split-button/deploy-split-button.svelte';+ import DeployOptionsMenuItems from '#lib/components/deploy-split-button/deploy-options-menu-items.svelte';import * as ButtonGroup from '#lib/components/ui/button-group/index.js';import * as DropdownMenu from '#lib/components/ui/dropdown-menu/index.js';import { cn } from '#lib/utils';@@ -105,12 +106,6 @@if (key === 'refresh') refreshLoading = value;}- function handleDeployPullPolicyChange(value: string) {- if (value === 'missing' || value === 'always' || value === 'never') {- deployOptionsStore.setPullPolicy(value);- }- }-const uiLoading = $derived({start: !!(isLoading.start || loading?.start || startLoading),stop: !!(isLoading.stop || loading?.stop || stopLoading),@@ -162,12 +157,18 @@tryCatch((type === 'container'? containerService.redeployContainer(id)- : projectService.redeployProject(id, (frame) => {- redeployActivityId = activityIdFromStreamFrame(frame) ?? redeployActivityId;- if (watch) {- operationWatchStore.onLine(frame);- }- })) as Promise<ContainerDetailsDto | Project>+ : projectService.redeployProject(+ id,+ (frame) => {+ redeployActivityId = activityIdFromStreamFrame(frame) ?? redeployActivityId;+ if (watch) {+ operationWatchStore.onLine(frame);+ }+ },+ // Taken inside mutationFn so cancelling the confirm dialog doesn't+ // spend the single-shot recreateVolumes opt-in.+ deployOptionsStore.takeRequestOptions()+ )) as Promise<ContainerDetailsDto | Project>),onMutate: () => {redeployActivityId = undefined;@@ -505,7 +506,7 @@}</script>-{#snippet WatchDropdown(onWatch: () => void, disabled: boolean, size: 'default' | 'icon' = 'default')}+{#snippet WatchDropdown(onWatch: () => void, disabled: boolean, size: 'default' | 'icon' = 'default', withDeployOptions = false)}<DropdownMenu.Root><DropdownMenu.Triggerclass={cn(arcaneButtonVariants({ tone: 'outline-primary', size: 'icon' }), size === 'icon' && 'size-9 rounded-md')}@@ -516,7 +517,11 @@><ArrowDownIcon class="size-4" /></DropdownMenu.Trigger>- <DropdownMenu.Content align="end">+ <DropdownMenu.Content align="end" class={cn(withDeployOptions && 'w-72')}>+ {#if withDeployOptions}+ <DeployOptionsMenuItems />+ <DropdownMenu.Separator />+ {/if}<DropdownMenu.Item onclick={() => onWatch()}><TerminalIcon class="size-4" />{m.watch_output()}@@ -540,7 +545,7 @@onclick={() => confirmAction('redeploy')}loading={uiLoading.redeploy}/>- {@render WatchDropdown(() => confirmRedeploy(true), !!uiLoading.redeploy, size)}+ {@render WatchDropdown(() => confirmRedeploy(true), !!uiLoading.redeploy, size, true)}</ButtonGroup.Root>{:else}<ArcaneButton action="redeploy" {size} {showLabel} onclick={() => confirmAction('redeploy')} loading={uiLoading.redeploy} />@@ -654,32 +659,6 @@<DropdownMenu.Item onclick={() => handleDeploy()} disabled={uiLoading.start}>{deployButtonLabel}</DropdownMenu.Item>- {#if type === 'project'}- <DropdownMenu.Separator />- <DropdownMenu.Label>{m.settings_default_deploy_pull_policy()}</DropdownMenu.Label>- <DropdownMenu.RadioGroup value={deployOptionsStore.pullPolicy} onValueChange={handleDeployPullPolicyChange}>- <DropdownMenu.RadioItem value="missing">Missing</DropdownMenu.RadioItem>- <DropdownMenu.RadioItem value="always">- {m.common_always()}- </DropdownMenu.RadioItem>- <DropdownMenu.RadioItem value="never">- {m.common_never()}- </DropdownMenu.RadioItem>- </DropdownMenu.RadioGroup>- <DropdownMenu.Separator />- <DropdownMenu.CheckboxItem- checked={deployOptionsStore.forceRecreate}- onCheckedChange={(checked) => deployOptionsStore.setForceRecreate(checked === true)}- >- {m.deploy_force_recreate()}- </DropdownMenu.CheckboxItem>- <DropdownMenu.CheckboxItem- checked={deployOptionsStore.recreateVolumes}- onCheckedChange={(checked) => deployOptionsStore.setRecreateVolumes(checked === true)}- >- {m.deploy_recreate_volumes()}- </DropdownMenu.CheckboxItem>- {/if}{/if}{:else if isRunning}{#if canStop}@@ -694,6 +673,12 @@{/if}{/if}+ {#if type === 'project' && (canStart || canRedeploy)}+ <DropdownMenu.Separator />+ <DeployOptionsMenuItems />+ <DropdownMenu.Separator />+ {/if}+{#if type === 'container'}{@render RedeployMenuItem()}{@render beforeRemoveMenuItems?.(isLifecycleActionPending)}diff --git a/frontend/src/lib/components/deploy-split-button/deploy-options-menu-items.svelte b/frontend/src/lib/components/deploy-split-button/deploy-options-menu-items.sveltenew file mode 100644index 000000000..f2b16af85--- /dev/null+++ b/frontend/src/lib/components/deploy-split-button/deploy-options-menu-items.svelte@@ -0,0 +1,54 @@+<script lang="ts">+ import * as DropdownMenu from '#lib/components/ui/dropdown-menu/index.js';+ import { m } from '#lib/paraglide/messages';+ import { deployOptionsStore, type DeployPullPolicy } from '#lib/stores/deploy-options.store.svelte';++ function setPullPolicy(value: string) {+ deployOptionsStore.setPullPolicy(value as DeployPullPolicy);+ }+</script>++<DropdownMenu.Label>{m.settings_default_deploy_pull_policy()}</DropdownMenu.Label>+<DropdownMenu.RadioGroup value={deployOptionsStore.pullPolicy} onValueChange={setPullPolicy}>+ <DropdownMenu.RadioItem value="missing">+ <div class="flex flex-col gap-0.5">+ <span class="font-medium">Missing</span>+ <span class="text-xs text-muted-foreground">{m.deploy_pull_policy_missing()}</span>+ </div>+ </DropdownMenu.RadioItem>+ <DropdownMenu.RadioItem value="always">+ <div class="flex flex-col gap-0.5">+ <span class="font-medium">{m.common_always()}</span>+ <span class="text-xs text-muted-foreground">{m.deploy_pull_policy_always()}</span>+ </div>+ </DropdownMenu.RadioItem>+ <DropdownMenu.RadioItem value="never">+ <div class="flex flex-col gap-0.5">+ <span class="font-medium">{m.common_never()}</span>+ <span class="text-xs text-muted-foreground">{m.deploy_pull_policy_never()}</span>+ </div>+ </DropdownMenu.RadioItem>+</DropdownMenu.RadioGroup>++<DropdownMenu.Separator />++<DropdownMenu.CheckboxItem+ checked={deployOptionsStore.forceRecreate}+ onCheckedChange={(checked) => deployOptionsStore.setForceRecreate(checked === true)}+>+ {m.deploy_force_recreate()}+</DropdownMenu.CheckboxItem>++<DropdownMenu.CheckboxItem+ checked={deployOptionsStore.removeOrphans}+ onCheckedChange={(checked) => deployOptionsStore.setRemoveOrphans(checked === true)}+>+ {m.deploy_remove_orphans()}+</DropdownMenu.CheckboxItem>++<DropdownMenu.CheckboxItem+ checked={deployOptionsStore.recreateVolumes}+ onCheckedChange={(checked) => deployOptionsStore.setRecreateVolumes(checked === true)}+>+ {m.deploy_recreate_volumes()}+</DropdownMenu.CheckboxItem>diff --git a/frontend/src/lib/components/deploy-split-button/deploy-split-button.svelte b/frontend/src/lib/components/deploy-split-button/deploy-split-button.svelteindex 4cd8ae896..dcc2c3140 100644--- a/frontend/src/lib/components/deploy-split-button/deploy-split-button.svelte+++ b/frontend/src/lib/components/deploy-split-button/deploy-split-button.svelte@@ -4,8 +4,8 @@import * as DropdownMenu from '#lib/components/ui/dropdown-menu/index.js';import { ArrowDownIcon, TerminalIcon } from '#lib/icons';import { m } from '#lib/paraglide/messages';- import { deployOptionsStore, type DeployPullPolicy } from '#lib/stores/deploy-options.store.svelte';import { cn } from '#lib/utils';+ import DeployOptionsMenuItems from './deploy-options-menu-items.svelte';let {size = 'default',@@ -22,18 +22,6 @@onDeploy: () => void | Promise<void>;onDeployWatch?: () => void | Promise<void>;} = $props();-- function setPullPolicy(value: string) {- deployOptionsStore.setPullPolicy(value as DeployPullPolicy);- }-- function setForceRecreate(value: boolean) {- deployOptionsStore.setForceRecreate(value);- }-- function setRecreateVolumes(value: boolean) {- deployOptionsStore.setRecreateVolumes(value);- }</script><ButtonGroup.Root>@@ -55,43 +43,7 @@</DropdownMenu.Trigger><DropdownMenu.Content align="end" class="w-72">- <DropdownMenu.Label>{m.settings_default_deploy_pull_policy()}</DropdownMenu.Label>- <DropdownMenu.RadioGroup value={deployOptionsStore.pullPolicy} onValueChange={setPullPolicy}>- <DropdownMenu.RadioItem value="missing">- <div class="flex flex-col gap-0.5">- <span class="font-medium">Missing</span>- <span class="text-xs text-muted-foreground">{m.deploy_pull_policy_missing()}</span>- </div>- </DropdownMenu.RadioItem>- <DropdownMenu.RadioItem value="always">- <div class="flex flex-col gap-0.5">- <span class="font-medium">{m.common_always()}</span>- <span class="text-xs text-muted-foreground">{m.deploy_pull_policy_always()}</span>- </div>- </DropdownMenu.RadioItem>- <DropdownMenu.RadioItem value="never">- <div class="flex flex-col gap-0.5">- <span class="font-medium">{m.common_never()}</span>- <span class="text-xs text-muted-foreground">{m.deploy_pull_policy_never()}</span>- </div>- </DropdownMenu.RadioItem>- </DropdownMenu.RadioGroup>-- <DropdownMenu.Separator />-- <DropdownMenu.CheckboxItem- checked={deployOptionsStore.forceRecreate}- onCheckedChange={(checked) => setForceRecreate(checked === true)}- >- {m.deploy_force_recreate()}- </DropdownMenu.CheckboxItem>-- <DropdownMenu.CheckboxItem- checked={deployOptionsStore.recreateVolumes}- onCheckedChange={(checked) => setRecreateVolumes(checked === true)}- >- {m.deploy_recreate_volumes()}- </DropdownMenu.CheckboxItem>+ <DeployOptionsMenuItems />{#if onDeployWatch}<DropdownMenu.Separator />diff --git a/frontend/src/lib/services/project-service.ts b/frontend/src/lib/services/project-service.tsindex fc8878255..d2eb4ad14 100644--- a/frontend/src/lib/services/project-service.ts+++ b/frontend/src/lib/services/project-service.ts@@ -10,6 +10,7 @@ import BaseAPIService from './api-service';export type DeployProjectOptions = {pullPolicy?: 'missing' | 'always' | 'never';forceRecreate?: boolean;+ removeOrphans?: boolean;recreateVolumes?: boolean;};@@ -222,11 +223,20 @@ class ProjectService extends BaseAPIService {await this.handleResponse(this.api.post(`/environments/${envId}/projects/${projectId}/unarchive`));}- async redeployProject(projectId: string, onLine?: (data: any) => void): Promise<Project> {+ redeployProject(projectId: string, options?: DeployProjectOptions): Promise<Project>;+ redeployProject(projectId: string, onLine: (data: any) => void, options?: DeployProjectOptions): Promise<Project>;+ async redeployProject(+ projectId: string,+ onLineOrOptions?: ((data: any) => void) | DeployProjectOptions,+ maybeOptions?: DeployProjectOptions+ ): Promise<Project> {const envId = await environmentStore.getCurrentEnvironmentId();const url = `/api/environments/${envId}/projects/${projectId}/redeploy`;+ const onLine = typeof onLineOrOptions === 'function' ? onLineOrOptions : undefined;+ const options = typeof onLineOrOptions === 'function' ? maybeOptions : onLineOrOptions;- await this.postProjectStream(url, {}, onLine, {+ // Redeploy always pre-pulls server-side; pullPolicy only governs the up phase.+ await this.postProjectStream(url, options ?? {}, onLine, {startFailed: (status) => m.progress_deploy_failed_to_start({ status }),streamFailed: () => m.progress_deploy_failed()});diff --git a/frontend/src/lib/stores/deploy-options.store.svelte.ts b/frontend/src/lib/stores/deploy-options.store.svelte.tsindex f1fcf8d22..61e44e16f 100644--- a/frontend/src/lib/stores/deploy-options.store.svelte.ts+++ b/frontend/src/lib/stores/deploy-options.store.svelte.ts@@ -6,6 +6,7 @@ export type DeployPullPolicy = 'missing' | 'always' | 'never';export type DeployOptionsState = {pullPolicy: DeployPullPolicy;forceRecreate: boolean;+ removeOrphans: boolean;recreateVolumes: boolean;};@@ -17,12 +18,14 @@ type PersistedDeployOptions = Omit<DeployOptionsState, 'recreateVolumes'>;const defaultDeployOptions: DeployOptionsState = {pullPolicy: 'missing',forceRecreate: false,+ removeOrphans: false,recreateVolumes: false};const persistedOptions = new PersistedState<PersistedDeployOptions>('arcane-deploy-options', {pullPolicy: defaultDeployOptions.pullPolicy,- forceRecreate: defaultDeployOptions.forceRecreate+ forceRecreate: defaultDeployOptions.forceRecreate,+ removeOrphans: defaultDeployOptions.removeOrphans});const userOverrodePullPolicy = new PersistedState<boolean>('arcane-deploy-options-user-overrode-pull-policy', false);@@ -35,13 +38,15 @@ const persistedCurrent = persistedOptions.current;let state = $state<DeployOptionsState>({pullPolicy: isDeployPullPolicy(persistedCurrent?.pullPolicy) ? persistedCurrent.pullPolicy : defaultDeployOptions.pullPolicy,forceRecreate: persistedCurrent?.forceRecreate === true,+ removeOrphans: persistedCurrent?.removeOrphans === true,recreateVolumes: defaultDeployOptions.recreateVolumes});function persistState() {persistedOptions.current = {pullPolicy: state.pullPolicy,- forceRecreate: state.forceRecreate+ forceRecreate: state.forceRecreate,+ removeOrphans: state.removeOrphans};}@@ -66,6 +71,9 @@ export const deployOptionsStore = {get forceRecreate(): boolean {return state.forceRecreate;},+ get removeOrphans(): boolean {+ return state.removeOrphans;+ },get recreateVolumes(): boolean {return state.recreateVolumes;},@@ -82,6 +90,10 @@ export const deployOptionsStore = {state.forceRecreate = value;persistState();},+ setRemoveOrphans(value: boolean) {+ state.removeOrphans = value;+ persistState();+ },setRecreateVolumes(value: boolean) {state.recreateVolumes = value;},@@ -96,6 +108,7 @@ export const deployOptionsStore = {const options = {pullPolicy: state.pullPolicy,forceRecreate: state.forceRecreate,+ removeOrphans: state.removeOrphans,recreateVolumes: state.recreateVolumes};state.recreateVolumes = false;diff --git a/frontend/src/routes/(app)/projects/projects-table.actions.ts b/frontend/src/routes/(app)/projects/projects-table.actions.tsindex 5c47c7455..84ba9f182 100644--- a/frontend/src/routes/(app)/projects/projects-table.actions.ts+++ b/frontend/src/routes/(app)/projects/projects-table.actions.ts@@ -72,7 +72,7 @@ const projectActionConfigs: Record<ProjectActionKind, ProjectActionConfig> = {},redeploy: {status: 'redeploying',- run: (id) => projectService.redeployProject(id),+ run: (id) => projectService.redeployProject(id, deployOptionsStore.takeRequestOptions()),success: () => m.compose_pull_success(),failure: () => m.compose_pull_failed()},@@ -241,12 +241,14 @@ export function createProjectActions({}async function handleBulkRedeploy(ids: string[]): Promise<void> {+ // One lazy snapshot per batch, matching handleBulkUp.+ let deployOptions: ReturnType<typeof deployOptionsStore.takeRequestOptions> | undefined;await runBulkAction(ids, {title: (count) => m.projects_bulk_redeploy_confirm_title({ count }),message: (count) => m.projects_bulk_redeploy_confirm_message({ count }),label: m.compose_pull_redeploy(),loadingKey: 'redeploy',- run: (id) => projectService.redeployProject(id),+ run: (id) => projectService.redeployProject(id, (deployOptions ??= deployOptionsStore.takeRequestOptions())),success: (count) => m.projects_bulk_redeploy_success({ count }),partial: (success, total, failed) => m.projects_bulk_redeploy_partial({ success, total, failed }),failure: () => m.compose_pull_failed()