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

Fix console warning by improving error handling in Nav block classic menu conversion #52591

Merged
merged 3 commits into from
Jul 13, 2023
Merged

Fix console warning by improving error handling in Nav block classic menu conversion #52591

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61abb3b
use the same create hook for classic import
draganescu Jul 12, 2023
1139a90
Remove redundant arg to hook
getdave Jul 13, 2023
fb724d2
Add option to throw on error rather than default to doing so
getdave Jul 13, 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
29 changes: 17 additions & 12 deletions packages/block-library/src/navigation/edit/use-convert-classic-menu-to-block-menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ export const CLASSIC_MENU_CONVERSION_IDLE = 'idle';
// do not import the same classic menu twice.
let classicMenuBeingConvertedId = null;

function useConvertClassicToBlockMenu( createNavigationMenu ) {
function useConvertClassicToBlockMenu(
createNavigationMenu,
{ throwOnError = false } = {}
) {
const registry = useRegistry();
const { editEntityRecord } = useDispatch( coreStore );

Expand Down Expand Up @@ -149,19 +152,21 @@ function useConvertClassicToBlockMenu( createNavigationMenu ) {
classicMenuBeingConvertedId = null;

// Rethrow error for debugging.
throw new Error(
sprintf(
// translators: %s: the name of a menu (e.g. Header navigation).
__( `Unable to create Navigation Menu "%s".` ),
menuName
),
{
cause: err,
}
);
if ( throwOnError ) {
throw new Error(
sprintf(
// translators: %s: the name of a menu (e.g. Header navigation).
__( `Unable to create Navigation Menu "%s".` ),
menuName
),
{
cause: err,
}
);
}
} );
},
[ convertClassicMenuToBlockMenu ]
[ convertClassicMenuToBlockMenu, throwOnError ]
);

return {
Expand Down