Skip to content

Command Palette: Fix "Add new page" command for hybrid theme #65534

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
ramonjd merged 1 commit into from
Sep 20, 2024
Merged

Command Palette: Fix "Add new page" command for hybrid theme #65534

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
79 changes: 44 additions & 35 deletions packages/core-commands/src/admin-navigation-commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { __ } from '@wordpress/i18n';
import { plus } from '@wordpress/icons';
import { getPath } from '@wordpress/url';
import { store as coreStore } from '@wordpress/core-data';
import { useDispatch } from '@wordpress/data';
import { useMemo } from '@wordpress/element';
import { useSelect, useDispatch } from '@wordpress/data';
import { useCallback, useMemo } from '@wordpress/element';
import { store as noticesStore } from '@wordpress/notices';
import { privateApis as routerPrivateApis } from '@wordpress/router';

Expand All @@ -23,46 +23,55 @@ function useAddNewPageCommand() {
'site-editor.php'
);
const history = useHistory();
const isBlockBasedTheme = useSelect( ( select ) => {
return select( coreStore ).getCurrentTheme()?.is_block_theme;
}, [] );
const { saveEntityRecord } = useDispatch( coreStore );
const { createErrorNotice } = useDispatch( noticesStore );

const createPageEntity = async ( { close } ) => {
try {
const page = await saveEntityRecord(
'postType',
'page',
{
status: 'draft',
},
{
throwOnError: true,
const createPageEntity = useCallback(
async ( { close } ) => {
try {
const page = await saveEntityRecord(
'postType',
'page',
{
status: 'draft',
},
{
throwOnError: true,
}
);
if ( page?.id ) {
history.push( {
postId: page.id,
postType: 'page',
canvas: 'edit',
} );
}
);
if ( page?.id ) {
history.push( {
postId: page.id,
postType: 'page',
canvas: 'edit',
} catch ( error ) {
const errorMessage =
error.message && error.code !== 'unknown_error'
? error.message
: __( 'An error occurred while creating the item.' );

createErrorNotice( errorMessage, {
type: 'snackbar',
} );
} finally {
close();
}
} catch ( error ) {
const errorMessage =
error.message && error.code !== 'unknown_error'
? error.message
: __( 'An error occurred while creating the item.' );

createErrorNotice( errorMessage, {
type: 'snackbar',
} );
} finally {
close();
}
};
},
[ createErrorNotice, history, saveEntityRecord ]
);

const commands = useMemo( () => {
const addNewPage = isSiteEditor
? createPageEntity
: () => ( document.location.href = 'post-new.php?post_type=page' );
const addNewPage =
isSiteEditor && isBlockBasedTheme
? createPageEntity
: () =>
( document.location.href =
'post-new.php?post_type=page' );
return [
{
name: 'core/add-new-page',
Expand All @@ -71,7 +80,7 @@ function useAddNewPageCommand() {
callback: addNewPage,
},
];
}, [ createPageEntity, isSiteEditor ] );
}, [ createPageEntity, isSiteEditor, isBlockBasedTheme ] );

return {
isLoading: false,
Expand Down