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

[Core Commands]: Handle navigation commands based on access of site editor #52987

Merged
merged 2 commits into from
Jul 27, 2023
Merged

[Core Commands]: Handle navigation commands based on access of site editor #52987

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
df307a2
[Core Commands]: Pass options to `useCommands`
ntsekouras Jul 26, 2023
ea4c8fd
add block editor dep
ntsekouras Jul 27, 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
1 change: 1 addition & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/core-commands/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"sideEffects": false,
"dependencies": {
"@babel/runtime": "^7.16.0",
"@wordpress/block-editor": "file:../block-editor",
"@wordpress/commands": "file:../commands",
"@wordpress/core-data": "file:../core-data",
"@wordpress/data": "file:../data",
Expand Down
26 changes: 4 additions & 22 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 @@ -4,34 +4,20 @@
import { useCommand } from '@wordpress/commands';
import { __ } from '@wordpress/i18n';
import { external, plus, symbol } from '@wordpress/icons';
import { useSelect } from '@wordpress/data';
import { store as coreStore } from '@wordpress/core-data';
import { addQueryArgs, getPath } from '@wordpress/url';
import { privateApis as routerPrivateApis } from '@wordpress/router';

/**
* Internal dependencies
*/
import { useIsSiteEditorAccessible } from './hooks';
import { unlock } from './lock-unlock';

const { useHistory } = unlock( routerPrivateApis );

export function useAdminNavigationCommands() {
const history = useHistory();

const { isBlockTheme, canAccessSiteEditor } = useSelect( ( select ) => {
return {
isBlockTheme:
// To avoid making core-commands dependent on block-editor using store string literal name.
// eslint-disable-next-line @wordpress/data-no-store-string-literals
select( 'core/block-editor' )?.getSettings()
.__unstableIsBlockBasedTheme,
canAccessSiteEditor: select( coreStore ).canUser(
'read',
'templates'
),
};
}, [] );
const isSiteEditorAccessible = useIsSiteEditorAccessible();

const isSiteEditor = getPath( window.location.href )?.includes(
'site-editor.php'
Expand All @@ -57,20 +43,16 @@ export function useAdminNavigationCommands() {
name: 'core/manage-reusable-blocks',
label: __( 'Open patterns' ),
callback: ( { close } ) => {
if (
( ! isSiteEditor && ! isBlockTheme ) ||
! canAccessSiteEditor
) {
if ( ! isSiteEditorAccessible ) {
document.location.href = 'edit.php?post_type=wp_block';
} else {
const args = {
path: '/patterns',
};
const targetUrl = addQueryArgs( 'site-editor.php', args );
if ( isSiteEditor ) {
history.push( args );
} else {
document.location = targetUrl;
document.location = addQueryArgs( 'site-editor.php', args );
}
close();
}
Expand Down
16 changes: 16 additions & 0 deletions packages/core-commands/src/hooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/**
* WordPress dependencies
*/
import { store as blockEditorStore } from '@wordpress/block-editor';
import { store as coreStore } from '@wordpress/core-data';
import { useSelect } from '@wordpress/data';

export function useIsSiteEditorAccessible() {
return useSelect(
( select ) =>
select( blockEditorStore ).getSettings()
.__unstableIsBlockBasedTheme &&
select( coreStore ).canUser( 'read', 'templates' ),
[]
);
}
8 changes: 7 additions & 1 deletion packages/core-commands/src/site-editor-navigation-commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { getQueryArg, addQueryArgs, getPath } from '@wordpress/url';
/**
* Internal dependencies
*/
import { useIsSiteEditorAccessible } from './hooks';
import { unlock } from './lock-unlock';

const { useHistory } = unlock( routerPrivateApis );
Expand Down Expand Up @@ -123,8 +124,13 @@ function useSiteEditorBasicNavigationCommands() {
const isSiteEditor = getPath( window.location.href )?.includes(
'site-editor.php'
);
const isSiteEditorAccessible = useIsSiteEditorAccessible();
const commands = useMemo( () => {
const result = [];

if ( ! isSiteEditorAccessible ) {
return result;
}
result.push( {
name: 'core/edit-site/open-navigation',
label: __( 'Open navigation' ),
Expand Down Expand Up @@ -198,7 +204,7 @@ function useSiteEditorBasicNavigationCommands() {
} );

return result;
}, [ history, isSiteEditor ] );
}, [ history, isSiteEditor, isSiteEditorAccessible ] );

return {
commands,
Expand Down
Loading