Skip to content
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

Template Mode: Don't display snackbar with the Welcome Guide #32076

Merged
merged 2 commits into from
May 28, 2021
Merged

Template Mode: Don't display snackbar with the Welcome Guide #32076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09c0e9e
Template Mode: Don't display snackbar with the Welcome Guide
Mamaduka May 21, 2021
3a00dc0
Fix e2e tests
Mamaduka May 22, 2021
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
8 changes: 4 additions & 4 deletions packages/e2e-tests/specs/experiments/post-editor-template-mode.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ const disableTemplateWelcomeGuide = async () => {
};

const switchToTemplateMode = async () => {
await disableTemplateWelcomeGuide();

// Switch to template mode.
await openDocumentSettingsSidebar();
await openSidebarPanelWithTitle( 'Template' );
Expand All @@ -52,11 +54,11 @@ const switchToTemplateMode = async () => {
( el ) => el.innerText
);
expect( title ).toContain( 'About\n' );

await disableTemplateWelcomeGuide();
};

const createNewTemplate = async ( templateName ) => {
await disableTemplateWelcomeGuide();

// Create a new custom template.
await openDocumentSettingsSidebar();
await openSidebarPanelWithTitle( 'Template' );
Expand All @@ -76,8 +78,6 @@ const createNewTemplate = async ( templateName ) => {
await page.waitForXPath(
'//*[contains(@class, "components-snackbar")]/*[text()="Custom template created. You\'re in template mode now."]'
);

await disableTemplateWelcomeGuide();
};

describe( 'Post Editor Template mode', () => {
Expand Down
24 changes: 16 additions & 8 deletions packages/edit-post/src/store/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,12 +488,20 @@ export function* __unstableSwitchToTemplateMode( template ) {

yield setIsEditingTemplate( true );

const message = !! template
? __( "Custom template created. You're in template mode now." )
: __(
'Editing template. Changes made here affect all posts and pages that use the template.'
);
yield controls.dispatch( noticesStore, 'createSuccessNotice', message, {
type: 'snackbar',
} );
const isWelcomeGuideActive = yield controls.select(
'core/edit-post',
'isFeatureActive',
'welcomeGuideTemplate'
);

if ( ! isWelcomeGuideActive ) {
const message = !! template
? __( "Custom template created. You're in template mode now." )
: __(
'Editing template. Changes made here affect all posts and pages that use the template.'
);
yield controls.dispatch( noticesStore, 'createSuccessNotice', message, {
type: 'snackbar',
} );
}
}