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

Command Palette: Proper handling of page/post links in all themes #53718

Merged
merged 2 commits into from
Aug 21, 2023
Merged

Command Palette: Proper handling of page/post links in all themes #53718

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a51f111
Command Palette: Proper handling of page/post links in all themes
t-hamano Aug 16, 2023
9295a46
Make common args a variable
t-hamano Aug 21, 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
145 changes: 114 additions & 31 deletions 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 @@ -37,28 +37,22 @@ const icons = {
const getNavigationCommandLoaderPerPostType = ( postType ) =>
function useNavigationCommandLoader( { search } ) {
const history = useHistory();
const supportsSearch = ! [ 'wp_template', 'wp_template_part' ].includes(
postType
);
const isBlockBasedTheme = useIsBlockBasedTheme();
const { records, isLoading } = useSelect(
( select ) => {
const { getEntityRecords } = select( coreStore );
const query = supportsSearch
? {
search: !! search ? search : undefined,
per_page: 10,
orderby: search ? 'relevance' : 'date',
status: [
'publish',
'future',
'draft',
'pending',
'private',
],
}
: {
per_page: -1,
};
const query = {
search: !! search ? search : undefined,
per_page: 10,
orderby: search ? 'relevance' : 'date',
status: [
'publish',
'future',
'draft',
'pending',
'private',
],
};
return {
records: getEntityRecords( 'postType', postType, query ),
isLoading: ! select( coreStore ).hasFinishedResolution(
Expand All @@ -67,40 +61,129 @@ const getNavigationCommandLoaderPerPostType = ( postType ) =>
),
};
},
[ supportsSearch, search ]
[ search ]
);

const commands = useMemo( () => {
return ( records ?? [] ).map( ( record ) => {
const command = {
name: postType + '-' + record.id,
searchLabel: record.title?.rendered + ' ' + record.id,
label: record.title?.rendered
? record.title?.rendered
: __( '(no title)' ),
icon: icons[ postType ],
};

if (
postType === 'post' ||
( postType === 'page' && ! isBlockBasedTheme )
) {
return {
ntsekouras marked this conversation as resolved.
Show resolved Hide resolved
...command,
callback: ( { close } ) => {
const args = {
post: record.id,
action: 'edit',
};
const targetUrl = addQueryArgs( 'post.php', args );
document.location = targetUrl;
close();
},
};
}

const isSiteEditor = getPath( window.location.href )?.includes(
'site-editor.php'
);
const extraArgs = isSiteEditor
? {
canvas: getQueryArg(
window.location.href,
'canvas'
),
}
: {};

return {
...command,
callback: ( { close } ) => {
const args = {
postType,
postId: record.id,
...extraArgs,
};
const targetUrl = addQueryArgs(
'site-editor.php',
args
);
if ( isSiteEditor ) {
history.push( args );
} else {
document.location = targetUrl;
}
close();
},
};
} );
}, [ records, isBlockBasedTheme, history ] );

return {
commands,
isLoading,
};
};

const getNavigationCommandLoaderPerTemplate = ( templateType ) =>
function useNavigationCommandLoader( { search } ) {
const history = useHistory();
const isBlockBasedTheme = useIsBlockBasedTheme();
const { records, isLoading } = useSelect( ( select ) => {
const { getEntityRecords } = select( coreStore );
const query = { per_page: -1 };
return {
records: getEntityRecords( 'postType', templateType, query ),
isLoading: ! select( coreStore ).hasFinishedResolution(
'getEntityRecords',
[ 'postType', templateType, query ]
),
};
}, [] );

/*
* wp_template and wp_template_part endpoints do not support per_page or orderby parameters.
* We need to sort the results based on the search query to avoid removing relevant
* records below using .slice().
*/
const orderedRecords = useMemo( () => {
if ( supportsSearch ) {
return records ?? [];
}

return orderEntityRecordsBySearch( records, search ).slice( 0, 10 );
}, [ supportsSearch, records, search ] );
}, [ records, search ] );

const commands = useMemo( () => {
if (
! isBlockBasedTheme &&
! templateType === 'wp_template_part'
) {
return [];
}
return orderedRecords.map( ( record ) => {
const isSiteEditor = getPath( window.location.href )?.includes(
'site-editor.php'
);
const extraArgs = isSiteEditor
? { canvas: getQueryArg( window.location.href, 'canvas' ) }
: {};

return {
name: postType + '-' + record.id,
name: templateType + '-' + record.id,
searchLabel: record.title?.rendered + ' ' + record.id,
label: record.title?.rendered
? record.title?.rendered
: __( '(no title)' ),
icon: icons[ postType ],
icon: icons[ templateType ],
callback: ( { close } ) => {
const args = {
postType,
postType: templateType,
postId: record.id,
...extraArgs,
};
Expand All @@ -117,7 +200,7 @@ const getNavigationCommandLoaderPerPostType = ( postType ) =>
},
};
} );
}, [ orderedRecords, history ] );
}, [ isBlockBasedTheme, orderedRecords, history ] );

return {
commands,
Expand All @@ -130,9 +213,9 @@ const usePageNavigationCommandLoader =
const usePostNavigationCommandLoader =
getNavigationCommandLoaderPerPostType( 'post' );
const useTemplateNavigationCommandLoader =
getNavigationCommandLoaderPerPostType( 'wp_template' );
getNavigationCommandLoaderPerTemplate( 'wp_template' );
const useTemplatePartNavigationCommandLoader =
getNavigationCommandLoaderPerPostType( 'wp_template_part' );
getNavigationCommandLoaderPerTemplate( 'wp_template_part' );

function useSiteEditorBasicNavigationCommands() {
const history = useHistory();
Expand Down