tabshift/payload
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: restore as draft function was passing a published status (#13599)

Browse Source 
### What  
When using the `Restore as draft` action from the version view, the
restored document incorrectly appears as `published` in the API. This
issue was reported by a client.

### Why  
In the `restoreVersion` operation, the document is updated via
`db.updateOne` (line 265). The update passes along the status stored in
the version being restored but does not respect the `draft` query
parameter.

### How  
Ensures that the result status is explicitly set to `draft` when the
`draft` argument is `true`.
This commit is contained in:
Jessica Rynkar
2025-08-27 19:09:26 +01:00
committed by GitHub
parent ded8ec4117
commit a67043854e
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/payload/src/collections/operations/restoreVersion.ts
View File

@@ -260,6 +260,8 @@ export const restoreVersionOperation = async <TData extends TypeWithID = any>(
// Ensure updatedAt date is always updated
result.updatedAt = new Date().toISOString()
// Ensure status respects restoreAsDraft arg
result._status = draftArg ? 'draft' : result._status
result = await req.payload.db.updateOne({
id: parentDocID,
collection: collectionConfig.slug,

32
test/versions/e2e.spec.ts
View File

@@ -243,6 +243,38 @@ describe('Versions', () => {
await expect(page.locator('#field-title')).toHaveValue('v1')
})
test('should restore version as draft', async () => {
await page.goto(url.create)
await page.locator('#field-title').fill('v1')
await saveDocAndAssert(page, '#action-save-draft')
await page.locator('#field-title').fill('v2')
await page.locator('#field-description').fill('restore me as draft')
await saveDocAndAssert(page)
await page.locator('#field-title').fill('v3')
await page.locator('#field-description').fill('published')
await saveDocAndAssert(page)
const savedDocURL = page.url()
await page.goto(`${savedDocURL}/versions`)
const row2 = page.locator('tbody .row-2')
const versionID = await row2.locator('.cell-id').textContent()
await page.goto(`${savedDocURL}/versions/${versionID}`)
await expect(page.locator('.render-field-diffs')).toBeVisible()
await page.locator('.restore-version .popup__trigger-wrap button').click()
await page.getByRole('button', { name: 'Restore as draft' }).click()
await page.locator('button:has-text("Confirm")').click()
await page.waitForURL(savedDocURL)
await expect(page.locator('#field-title')).toHaveValue('v2')
await page.goto(`${savedDocURL}/api`)
const values = page.locator('.query-inspector__value')
const count = await values.count()
for (let i = 0; i < count; i++) {
await expect(values.nth(i)).not.toHaveText(/published/i)
}
})
test('should show currently published version status in versions view', async () => {
const publishedDoc = await payload.create({
collection: draftCollectionSlug,