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

Jump to bottom

Command Palette: fix incorrect path and snackbar message when template part is deleted #52034

Merged
merged 3 commits into from
Jun 30, 2023
Merged

Command Palette: fix incorrect path and snackbar message when template part is deleted #52034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e78cc31
Command Center: Fix incorrect navigation when deleting template part
t-hamano Jun 28, 2023
4d99fb4
Merge branch 'trunk' into fix/command-palette-delete-template-nav
t-hamano Jun 29, 2023
5b30f82
removeTemplate: consider title type
t-hamano Jun 29, 2023
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
6 changes: 5 additions & 1 deletion packages/edit-site/src/hooks/commands/use-edit-mode-commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ function useManipulateDocumentCommands() {
template.type === 'wp_template'
? __( 'Delete template' )
: __( 'Delete template part' );
const path =
template.type === 'wp_template'
? '/wp_template'
: '/wp_template_part/all';
commands.push( {
name: 'core/remove-template',
label,
Expand All @@ -119,7 +123,7 @@ function useManipulateDocumentCommands() {
removeTemplate( template );
// Navigate to the template list
history.push( {
path: '/' + template.type,
path,
} );
close();
},
Expand Down
9 changes: 8 additions & 1 deletion packages/edit-site/src/store/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,18 @@ export const removeTemplate =
throw lastError;
}

// Depending on how the entity was retrieved it's title might be
// an object or simple string.
const templateTitle =
typeof template.title === 'string'
? template.title
: template.title?.rendered;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I put ? just in case. This implementation is also done in the following locations:

gutenberg/packages/editor/src/store/selectors.js

Line 1611 in 3fd16c0

const templateTitle = typeof title === 'string' ? title : title?.rendered;


registry.dispatch( noticesStore ).createSuccessNotice(
sprintf(
/* translators: The template/part's name. */
__( '"%s" deleted.' ),
decodeEntities( template.title.rendered )
decodeEntities( templateTitle )
),
{ type: 'snackbar', id: 'site-editor-template-deleted-success' }
);
Expand Down
Loading