Skip to content

Modern Docker Management, Designed for Everyone

fix: keep project Save action mounted so toolbar layout stays stable (#4157)

Kyle Mendelldd37ce953c0e
diff --git a/frontend/src/lib/components/action-buttons.svelte b/frontend/src/lib/components/action-buttons.svelte
index b6647da30..62f199aae 100644
--- a/frontend/src/lib/components/action-buttons.svelte
+++ b/frontend/src/lib/components/action-buttons.svelte
@@ -228,6 +228,9 @@
const canRemove = $derived(
type === 'container' ? hasPermission('containers:delete', currentEnvId) : hasPermission('projects:delete', currentEnvId)
);
+ // Whether the start/stop/restart block above the deploy options renders anything,
+ // so its leading separator never lands next to a caller-provided one.
+ const hasLifecycleMenuItems = $derived((!isRunning && canStart) || (isRunning && (canStop || canRestart)));
const canPull = $derived(type === 'project' && hasPermission('projects:deploy', currentEnvId));
const canBuild = $derived(type === 'project' && hasPermission('projects:deploy', currentEnvId));
const deployButtonLabel = $derived(projectHasBuildDirective ? m.compose_build_and_deploy() : m.common_up());
@@ -791,7 +794,9 @@
{/if}
{#if type === 'project' && (canStart || canRedeploy)}
- <DropdownMenu.Separator />
+ {#if hasLifecycleMenuItems}
+ <DropdownMenu.Separator />
+ {/if}
<DeployOptionsMenuItems />
<DropdownMenu.Separator />
{/if}
diff --git a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte b/frontend/src/routes/(app)/projects/[projectId]/+page.svelte
index 54a624102..52407e7e1 100644
--- a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte
+++ b/frontend/src/routes/(app)/projects/[projectId]/+page.svelte
@@ -2215,7 +2215,7 @@
onRefresh={() => refreshProjectDetails()}
>
{#snippet leadingActions(size, showLabel)}
- {#if hasChanges && canUpdateProject}
+ {#if canUpdateProject}
<ArcaneButton
action="save"
{size}
@@ -2242,7 +2242,7 @@
{/snippet}
{#snippet leadingMenuItems()}
- {#if hasChanges && canUpdateProject}
+ {#if canUpdateProject}
<DropdownMenu.Item onclick={handleSaveChanges} disabled={!canSave || isLoading.saving}>
{isLoading.saving ? m.common_saving() : m.common_save()}
</DropdownMenu.Item>
@@ -2256,7 +2256,7 @@
{project?.isArchived ? m.projects_unarchive() : m.projects_archive()}
</DropdownMenu.Item>
{/if}
- {#if (hasChanges && canUpdateProject) || canArchiveProject}
+ {#if canUpdateProject || canArchiveProject}
<DropdownMenu.Separator />
{/if}
{/snippet}
diff --git a/tests/spec/project.spec.ts b/tests/spec/project.spec.ts
index 2bb386d8b..eeb6684d3 100644
--- a/tests/spec/project.spec.ts
+++ b/tests/spec/project.spec.ts
@@ -1144,7 +1144,7 @@ test.describe('GitOps Managed Project', () => {
await expect(envContent).not.toHaveAttribute('aria-readonly', 'true');
await setCodeMirrorValue(page, envEditor, updatedEnv);
await expect(envEditor).toContainText(marker);
- await expect(page.getByRole('button', { name: 'Save', exact: true }).first()).toBeVisible();
+ await expect(page.getByRole('button', { name: 'Save', exact: true }).first()).toBeEnabled();
await expect(layoutSwitch).toBeVisible();
@@ -1564,7 +1564,7 @@ test.describe('Project Detail Page', () => {
await expect(saveButtons.first()).toBeEnabled();
await saveButtons.first().click();
- await expect(saveButtons).toHaveCount(0);
+ await expect(saveButtons.first()).toBeDisabled();
composeEditor = page.locator('.cm-editor').filter({ visible: true }).first();
await expect