yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: prevent duplicate history versions on publish (#20415)

Browse Source 
* fix: prevent duplicate history versions on publish

* fix: build failing

* chore: fix e2e tests
This commit is contained in:
Rémi de Juvigny 2024-06-04 14:28:29 +02:00 committed by GitHub
parent 36ab26cd2e
commit dd3311938a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/core/content-manager/server/src/history/services/lifecycles.ts
View File

@ -50,6 +50,19 @@ const createLifecyclesService = ({ strapi }: { strapi: Core.Strapi }) => {
return next();
}
/**
* When a document is published, the draft version of the document is also updated.
* It creates confusion for users because they see two history versions each publish action.
* To avoid this, we silence the update action during a publish request,
* so that they only see the published version of the document in the history.
*/
if (
context.action === 'update' &&
strapi.requestContext.get()?.request.url.endsWith('/actions/publish')
) {
return next();
}
const contentTypeUid = context.contentType.uid;
// Ignore content types not created by the user
if (!contentTypeUid.startsWith('api::')) {

22
tests/e2e/tests/content-manager/history.spec.ts
View File

@ -148,15 +148,12 @@ describeOnCondition(edition === 'EE')('History', () => {
// Go to the history page
await goToHistoryPage(page);
await page.waitForURL(ARTICLE_HISTORY_URL);
// Publish also creates a new draft so we expect the count to increase by 2
await expect(versionCards).toHaveCount(4);
await expect(versionCards).toHaveCount(3);
// Assert the current version is the most recent published version
await expect(titleInput).toHaveValue('Being from Kansas City');
// The current version is the most recent draft
await expect(currentVersion.getByText('Draft')).toBeVisible();
await expect(currentVersion.getByText('Published')).toBeVisible();
await expect(titleInput).toHaveValue('Being from Kansas City');
// The second in the list is the published version
await expect(previousVersion.getByText('Published')).toBeVisible();
previousVersion.click();
await expect(titleInput).toHaveValue('Being from Kansas City');
@ -172,7 +169,7 @@ describeOnCondition(edition === 'EE')('History', () => {
// Go to the history page
await goToHistoryPage(page);
await page.waitForURL(ARTICLE_HISTORY_URL);
await expect(versionCards).toHaveCount(5);
await expect(versionCards).toHaveCount(4);
// Assert the current version is the modified version
await expect(currentVersion.getByText('Modified')).toBeVisible();
await expect(titleInput).toHaveValue('Being from Kansas City, Missouri');
@ -364,14 +361,13 @@ describeOnCondition(edition === 'EE')('History', () => {
// Go to the history page
await goToHistoryPage(page);
await page.waitForURL('**/content-manager/single-types/api::homepage.homepage/history**');
// Publish also creates a new draft so we expect the count to increase by 2
await expect(versionCards).toHaveCount(4);
// The current version is the most recent draft
await expect(currentVersion.getByText('Draft')).toBeVisible();
await expect(versionCards).toHaveCount(3);
// The current version is the most recent published
await expect(currentVersion.getByText('Published')).toBeVisible();
await expect(titleInput).toHaveValue('Welcome to AFC Richmond');
// The second in the list is the published version
// The second in the list is the draft version
await previousVersion.click();
await expect(previousVersion.getByText('Published')).toBeVisible();
await expect(previousVersion.getByText('Draft')).toBeVisible();
await expect(titleInput).toHaveValue('Welcome to AFC Richmond');
// Go back to the entry
@ -385,7 +381,7 @@ describeOnCondition(edition === 'EE')('History', () => {
// Go to the history page
await goToHistoryPage(page);
await page.waitForURL(HISTORY_URL);
await expect(versionCards).toHaveCount(5);
await expect(versionCards).toHaveCount(4);
// Assert the current version is the most recent published version
await expect(titleInput).toHaveValue('Welcome to AFC Richmond!');
await expect(currentVersion.getByText('Modified')).toBeVisible();