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

fix: don't show add to release bulk actions when draft and publish di… (#23578)

Browse Source 
* fix: don't show add to release bulk actions when draft and publish disabled

* fix: force skip guided tour
This commit is contained in:
Rémi de Juvigny 2025-05-26 14:14:20 +02:00 committed by GitHub
parent 26ef1c1726
commit c72b48da73
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/content-releases/admin/src/components/ReleaseAction.tsx
View File

@ -7,6 +7,7 @@ import {
useRBAC, useRBAC,
isFetchError, isFetchError,
} from '@strapi/admin/strapi-admin'; } from '@strapi/admin/strapi-admin';
import { unstable_useContentManagerContext as useContentManagerContext } from '@strapi/content-manager/strapi-admin';
import { import {
Box, Box,
Button, Button,
@ -63,6 +64,7 @@ const ReleaseAction: BulkActionComponent = ({ documents, model }) => {
const { const {
allowedActions: { canCreate }, allowedActions: { canCreate },
} = useRBAC(releasePermissions); } = useRBAC(releasePermissions);
const { hasDraftAndPublish } = useContentManagerContext();
// Get all the releases not published // Get all the releases not published
const response = useGetReleasesQuery(); const response = useGetReleasesQuery();
@ -139,7 +141,7 @@ const ReleaseAction: BulkActionComponent = ({ documents, model }) => {
} }
}; };
if (!canCreate || !canPublish) return null; if (!hasDraftAndPublish || !canCreate || !canPublish) return null;
return { return {
actionType: 'release', actionType: 'release',

44
tests/e2e/tests/content-releases/releases-page.spec.ts
View File

@ -1,17 +1,25 @@
import { test, expect } from '@playwright/test'; import { test, expect } from '@playwright/test';
import { clickAndWait, describeOnCondition } from '../../utils/shared'; import { clickAndWait, describeOnCondition, skipCtbTour } from '../../utils/shared';
import { resetDatabaseAndImportDataFromPath } from '../../utils/dts-import'; import { resetDatabaseAndImportDataFromPath } from '../../utils/dts-import';
import { login } from '../../utils/login'; import { login } from '../../utils/login';
import { waitForRestart } from '../../utils/restart';
import { resetFiles } from '../../utils/file-reset';
const edition = process.env.STRAPI_DISABLE_EE === 'true' ? 'CE' : 'EE'; const edition = process.env.STRAPI_DISABLE_EE === 'true' ? 'CE' : 'EE';
describeOnCondition(edition === 'EE')('Releases page', () => { describeOnCondition(edition === 'EE')('Releases page', () => {
test.beforeEach(async ({ page }) => { test.beforeEach(async ({ page }) => {
await resetDatabaseAndImportDataFromPath('with-admin.tar'); await resetDatabaseAndImportDataFromPath('with-admin.tar');
await resetFiles();
await page.goto('/admin'); await page.goto('/admin');
await page.evaluate(() => window.localStorage.setItem('GUIDED_TOUR_SKIPPED', 'true'));
await login({ page }); await login({ page });
}); });
test.afterAll(async () => {
await resetFiles();
});
test('A user should be able to create a release without scheduling it and view their pending and done releases', async ({ test('A user should be able to create a release without scheduling it and view their pending and done releases', async ({
page, page,
}) => { }) => {
@ -138,4 +146,38 @@ describeOnCondition(edition === 'EE')('Releases page', () => {
await expect(page.getByText('The Diamond Dogs')).toBeVisible(); await expect(page.getByText('The Diamond Dogs')).toBeVisible();
}); });
}); });
test('Should not show "add to release" bulk action for content types without draft & publish enabled', async ({
page,
}) => {
// Publish articles, otherwise they'll be deleted when we disable draft & publish
await clickAndWait(page, page.getByRole('link', { name: 'Content Manager' }));
await clickAndWait(page, page.getByRole('link', { name: 'Article' }));
await page.getByRole('checkbox', { name: 'Select all entries' }).check();
await clickAndWait(page, page.getByRole('button', { name: 'Publish' }));
await page.getByRole('button', { name: 'Publish' }).click();
const publishConfirmationDialog = page.getByRole('alertdialog', { name: 'Confirmation' });
await expect(publishConfirmationDialog).toBeVisible();
await publishConfirmationDialog.getByRole('button', { name: 'Publish' }).click();
// Disable draft & publish for the Article content type
await clickAndWait(page, page.getByRole('link', { name: 'Content-Type Builder' }));
await skipCtbTour(page);
await clickAndWait(page, page.getByRole('link', { name: 'Article' }));
await clickAndWait(page, page.getByRole('button', { name: 'Edit', exact: true }));
await clickAndWait(page, page.getByRole('tab', { name: /advanced settings/i }));
await page.getByLabel('Draft & publish').click();
const ctbConfirmationDialog = page.getByRole('alertdialog', { name: 'Confirmation' });
await expect(ctbConfirmationDialog).toBeVisible();
await ctbConfirmationDialog.getByRole('button', { name: /disable/i }).click();
await clickAndWait(page, page.getByRole('button', { name: 'Finish' }));
await waitForRestart(page);
// Go to the content manager and bulk select articlesto make sure the "add to release" does not show up
await clickAndWait(page, page.getByRole('link', { name: 'Content Manager' }));
await clickAndWait(page, page.getByRole('link', { name: 'Article' }));
await expect(page.getByRole('heading', { name: 'Article' })).toBeVisible();
await page.getByRole('checkbox', { name: 'Select all entries' }).check();
await expect(page.getByRole('button', { name: /add to release/i })).not.toBeVisible();
});
}); });