Skip to content

Site Editor Pages: load the appropriate template if posts page set #52266

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 5 commits into from
Jul 10, 2023
Merged

Site Editor Pages: load the appropriate template if posts page set #52266

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4ee67d6
This commit:
ramonjd Jul 4, 2023
f719f4b
The Posts Page resolves to display the Home or Index template only. A…
ramonjd Jul 4, 2023
cfce633
Showing homepage settings for posts pages that are set as the post pa…
ramonjd Jul 6, 2023
47a2684
Post pages that have been set to display posts will redirect to first…
ramonjd Jul 7, 2023
b893a71
Reverted refactor of packages/edit-site/src/components/sidebar-naviga…
ramonjd Jul 7, 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
68 changes: 39 additions & 29 deletions packages/edit-site/src/components/sidebar-navigation-screen-pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,16 @@ export default function SidebarNavigationScreenPages() {
templates?.find( ( template ) => template.slug === 'home' ) ||
templates?.find( ( template ) => template.slug === 'index' );

const getPostsPageTemplate = () =>
templates?.find( ( template ) => template.slug === 'home' ) ||
templates?.find( ( template ) => template.slug === 'index' );

const pagesAndTemplates = pages?.concat( dynamicPageTemplates, [
homeTemplate,
] );

const { frontPage, postsPage } = useSelect( ( select ) => {
const { getEntityRecord } = select( coreStore );

const siteSettings = getEntityRecord( 'root', 'site' );
return {
frontPage: siteSettings?.page_on_front,
Expand Down Expand Up @@ -106,6 +109,27 @@ export default function SidebarNavigationScreenPages() {
setShowAddPage( false );
};

const getPageProps = ( id ) => {
let itemIcon = page;
const postsPageTemplateId =
postsPage && postsPage === id ? getPostsPageTemplate()?.id : null;

switch ( id ) {
case frontPage:
itemIcon = home;
break;
case postsPage:
itemIcon = verse;
break;
}

return {
icon: itemIcon,
postType: postsPageTemplateId ? 'wp_template' : 'page',
postId: postsPageTemplateId || id,
};
};

return (
<>
{ showAddPage && (
Expand Down Expand Up @@ -152,34 +176,20 @@ export default function SidebarNavigationScreenPages() {
</Truncate>
</PageItem>
) }
{ reorderedPages?.map( ( item ) => {
let itemIcon;
switch ( item.id ) {
case frontPage:
itemIcon = home;
break;
case postsPage:
itemIcon = verse;
break;
default:
itemIcon = page;
}
return (
<PageItem
postId={ item.id }
key={ item.id }
icon={ itemIcon }
withChevron
>
<Truncate numberOfLines={ 1 }>
{ decodeEntities(
item?.title?.rendered ||
__( '(no title)' )
) }
</Truncate>
</PageItem>
);
} ) }
{ reorderedPages?.map( ( { id, title } ) => (
<PageItem
{ ...getPageProps( id ) }
key={ id }
withChevron
>
<Truncate numberOfLines={ 1 }>
{ decodeEntities(
title?.rendered ||
__( '(no title)' )
) }
</Truncate>
</PageItem>
) ) }
</ItemGroup>
) }
</>
Expand Down