diff --git a/backend/windmill-api/src/drafts.rs b/backend/windmill-api/src/drafts.rs index 22d9c2ba74..b59b8035cd 100644 --- a/backend/windmill-api/src/drafts.rs +++ b/backend/windmill-api/src/drafts.rs @@ -862,7 +862,8 @@ async fn move_draft( // both, so this is the other item's path, not a teammate's copy of this one. format!( "'{new_path}' holds another user's {occupant} draft, and an app and a raw \ - app cannot share a path." + app cannot share a path. Pick another path, or ask them to move or \ + discard theirs." ) } } else { diff --git a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte index 132463b4a1..89db46f3be 100644 --- a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte +++ b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte @@ -872,6 +872,7 @@ {setPublishState} appPath={$appPath} {onLatest} + {headUnknown} {savedApp} bind:summary={$summary} bind:customPath diff --git a/frontend/src/lib/components/apps/editor/AppEditorHeaderDeploy.svelte b/frontend/src/lib/components/apps/editor/AppEditorHeaderDeploy.svelte index 836af68db6..108e21e042 100644 --- a/frontend/src/lib/components/apps/editor/AppEditorHeaderDeploy.svelte +++ b/frontend/src/lib/components/apps/editor/AppEditorHeaderDeploy.svelte @@ -35,6 +35,7 @@ appPath, customPath = $bindable(), onLatest, + headUnknown = false, savedApp, summary = $bindable(), deploymentMsg = $bindable(), @@ -54,6 +55,9 @@ appPath: string customPath: string | undefined onLatest: boolean + /** The comparison behind `onLatest` could not read the deployed head, so the warning + * is caution rather than an observed newer version. */ + headUnknown?: boolean savedApp: any summary: string deploymentMsg: string | undefined @@ -239,8 +243,15 @@ {#if !onLatest} - - By deploying, you may overwrite changes made by other users. Press 'Deploy' to see diff. + + {headUnknown + ? "Deploying may overwrite changes made by other users. Press 'Deploy' to see diff." + : "By deploying, you may overwrite changes made by other users. Press 'Deploy' to see diff."}
{/if} diff --git a/frontend/src/lib/components/raw_apps/RawAppEditorHeader.svelte b/frontend/src/lib/components/raw_apps/RawAppEditorHeader.svelte index a52c9bd53f..baaaa8ee65 100644 --- a/frontend/src/lib/components/raw_apps/RawAppEditorHeader.svelte +++ b/frontend/src/lib/components/raw_apps/RawAppEditorHeader.svelte @@ -791,6 +791,7 @@ {setPublishState} {appPath} {onLatest} + {headUnknown} {savedApp} rawApp operatingWorkspace={opWorkspace}