Skip to content

Template activation: don't set site option on edit #71811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Sep 30, 2025
Merged

Template activation: don't set site option on edit #71811

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5a34391
Template activation: don't set site option on edit
ellatrix Sep 22, 2025
19518d8
don't use promise
ellatrix Sep 22, 2025
84845a9
Switch to post-publish panel
ellatrix Sep 22, 2025
25a0b81
fix e2e tests
ellatrix Sep 22, 2025
4701aa8
Move to an earlier filter
ellatrix Sep 24, 2025
79c6b20
lint
ellatrix Sep 24, 2025
4808eea
backport
ellatrix Sep 24, 2025
54629bb
Fix static template query
ellatrix Sep 29, 2025
3f17878
Fix in_array
ellatrix Sep 29, 2025
dc08dcc
Fix gutenberg_get_registered_block_templates
ellatrix Sep 29, 2025
b7dcd94
Remove activate panel for focused entities
ellatrix Sep 29, 2025
74143cd
Refactor postpublish
ellatrix Sep 29, 2025
c4d9474
Add notice
ellatrix Sep 30, 2025
54424ed
Revert publish panel
ellatrix Sep 30, 2025
93a638c
Fix e2e tests
ellatrix Sep 30, 2025
ec76aa1
Move notice creation to savePost action
ellatrix Sep 30, 2025
09238c8
Tweak notice text
ellatrix Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix e2e tests
  • Loading branch information
@ellatrix
ellatrix committed Sep 30, 2025
commit 25a0b81137abac2443c1cbfcf7b36decf06a1707
5 changes: 5 additions & 0 deletions test/e2e/specs/site-editor/multi-entity-saving.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ test.describe( 'Site Editor - Multi-entity save flow', () => {
isOnlyCurrentEntityDirty: true,
} );

await page
.getByRole( 'region', { name: 'Editor publish' } )
.getByRole( 'button', { name: 'Activate' } )
.click();

// Change font size again.
await fontSizePicker.getByRole( 'radio', { name: 'Medium' } ).click();

Expand Down
4 changes: 3 additions & 1 deletion test/e2e/specs/site-editor/pages.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,9 @@ test.describe( 'Pages', () => {
await page
.locator( '.block-editor-block-patterns-list__list-item' )
.click();
await editor.saveSiteEditorEntities();
await editor.saveSiteEditorEntities( {
isOnlyCurrentEntityDirty: true,
} );
await admin.visitSiteEditor();

// Create new page that has the default template so as to swap it.
Expand Down
30 changes: 27 additions & 3 deletions test/e2e/specs/site-editor/template-registration.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,18 @@ test.describe( 'Block template registration', () => {
name: 'core/paragraph',
attributes: { content: 'User-edited template' },
} );
await editor.saveSiteEditorEntities();
await editor.saveSiteEditorEntities( {
isOnlyCurrentEntityDirty: true,
} );
await page
.getByRole( 'region', { name: 'Editor publish' } )
.getByRole( 'button', { name: 'Activate' } )
.click();
await expect(
page
.getByRole( 'region', { name: 'Editor publish' } )
.getByRole( 'button', { name: 'Activating…' } )
).toBeHidden();
await page.goto( '/?cat=1' );
await expect( page.getByText( 'User-edited template' ) ).toBeVisible();

Expand Down Expand Up @@ -190,7 +201,9 @@ test.describe( 'Block template registration', () => {
name: 'core/paragraph',
attributes: { content: 'User-customized template' },
} );
await editor.saveSiteEditorEntities();
await editor.saveSiteEditorEntities( {
isOnlyCurrentEntityDirty: true,
} );

// Deactivate plugin.
await requestUtils.deactivatePlugin(
Expand Down Expand Up @@ -285,7 +298,18 @@ test.describe( 'Block template registration', () => {
name: 'core/paragraph',
attributes: { content: 'Author template customized by the user.' },
} );
await editor.saveSiteEditorEntities();
await editor.saveSiteEditorEntities( {
isOnlyCurrentEntityDirty: true,
} );
await page
.getByRole( 'region', { name: 'Editor publish' } )
.getByRole( 'button', { name: 'Activate' } )
.click();
await expect(
page
.getByRole( 'region', { name: 'Editor publish' } )
.getByRole( 'button', { name: 'Activating…' } )
).toBeHidden();

await requestUtils.activatePlugin(
'gutenberg-test-block-template-registration'
Expand Down