fix: explain why a fork folder deploy can leave a lasting conflict (#12323)

This commit is contained in:
Ruben Fiszel
2026-11-10 16:23:14 +01:00
committed by GitHub
parent 80e2be56dd
commit 6a11d3033a
@@ -854,12 +854,41 @@
if (result.success) {
deploymentStatus[statusKey] = { status: 'deployed' }
if (kind === 'folder' && !removes) {
warnOnAddedFolderOwners(path, workspaceFrom, workspaceToDeployTo)
}
} else {
deploymentStatus[statusKey] = { status: 'failed', error: result.error }
sendUserToast(`Failed to deploy ${statusKey}: ${result.error}`, 'error')
}
}
// A non-admin can't drop their own ownership of a folder (the folder UPDATE policy
// rejects a row they don't own), so updateFolder keeps them as an owner. The folder then
// never matches its source, and the conflict comes back on every compare unless we say why.
async function warnOnAddedFolderOwners(path: string, workspaceFrom: string, workspaceTo: string) {
const name = path.replace(/^f\//, '')
try {
const [source, target, me] = await Promise.all([
FolderService.getFolder({ workspace: workspaceFrom, name }),
FolderService.getFolder({ workspace: workspaceTo, name }),
UserService.whoami({ workspace: workspaceTo })
])
const owner = `u/${me.username}`
if (!me.is_admin && target.owners.includes(owner) && !source.owners.includes(owner)) {
sendUserToast(
`${path} still differs in ${workspaceTo}: it kept ${owner} as owner, because a non-admin can't remove their own ownership of a folder. To clear it, make ${owner} owner of ${path} in ${workspaceFrom} too, or deploy as an admin of ${workspaceTo}.`,
'warning',
[],
undefined,
15000
)
}
} catch {
// The deploy itself succeeded; the next compare still shows the difference.
}
}
let deploymentErrorMessage = $state('')
// The override acknowledges the outdated items listed next to it, not the
// selection, so it holds while every outdated item is one the user ticked it