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

Site Editor: Browsing sidebar templates menu restructure #28291

Merged
merged 13 commits into from
Mar 8, 2021
Merged

Site Editor: Browsing sidebar templates menu restructure #28291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6e6910f
Remove general templates from posts
david-szabo97 Jan 18, 2021
09e4d38
Remove general templates from pages
david-szabo97 Jan 18, 2021
2bbd570
First try
david-szabo97 Feb 8, 2021
d9e466d
Fix secondary templates not showing up on top level
david-szabo97 Feb 10, 2021
046d32b
Add front-page
david-szabo97 Feb 10, 2021
6200c6e
Add home to unused templates if appropriate
david-szabo97 Feb 10, 2021
66ea2e1
Simplify isTemplateSuperseded
david-szabo97 Feb 17, 2021
2779c31
Refactor
david-szabo97 Feb 17, 2021
db59d91
Update e2e test
david-szabo97 Feb 17, 2021
1b63d8e
Add dash
david-szabo97 Feb 23, 2021
b869864
Move page-home to general
david-szabo97 Feb 23, 2021
a850392
Determine whether home and index is superseded correctly
david-szabo97 Mar 4, 2021
e463015
Use constants
david-szabo97 Mar 4, 2021
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
7 changes: 5 additions & 2 deletions packages/e2e-tests/specs/experiments/multi-entity-editing.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,11 @@ describe( 'Multi-entity editor states', () => {
'.wp-block-template-part .block-editor-block-list__layout'
);

// Our custom template shows up in the " templates > all" menu; let's use it.
await clickTemplateItem( [ 'Templates', 'All' ], templateName );
// Our custom template shows up in the "Templates > General" menu; let's use it.
await clickTemplateItem(
[ 'Templates', 'General templates' ],
templateName
);
await page.waitForXPath(
`//h1[contains(@class, "edit-site-document-actions__title") and contains(text(), '${ templateName }')]`
);
Expand Down
42 changes: 35 additions & 7 deletions packages/edit-site/src/components/navigation-sidebar/navigation-panel/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,43 @@
*/
import { __ } from '@wordpress/i18n';

export const TEMPLATES_GENERAL = [
'front-page',
'archive',
'singular',
export const TEMPLATES_PRIMARY = [
'index',
'search',
'singular',
'archive',
'single',
'page',
'home',
'404',
'search',
];

export const TEMPLATES_SECONDARY = [
'author',
'category',
'taxonomy',
'date',
'tag',
'attachment',
'single-post',
'front-page',
];

export const TEMPLATES_TOP_LEVEL = [
...TEMPLATES_PRIMARY,
...TEMPLATES_SECONDARY,
];

export const TEMPLATES_GENERAL = [ 'page-home' ];

export const TEMPLATES_POSTS_PREFIXES = [
'post-',
'author-',
'single-post-',
'tag-',
];

export const TEMPLATES_POSTS = [ 'home', 'single', 'single-post' ];
export const TEMPLATES_PAGES_PREFIXES = [ 'page-' ];

export const TEMPLATES_NEW_OPTIONS = [
'front-page',
Expand All @@ -30,9 +57,10 @@ export const MENU_CONTENT_PAGES = 'content-pages';
export const MENU_CONTENT_POSTS = 'content-posts';
export const MENU_TEMPLATE_PARTS = 'template-parts';
export const MENU_TEMPLATES = 'templates';
export const MENU_TEMPLATES_ALL = 'templates-all';
export const MENU_TEMPLATES_GENERAL = 'templates-general';
export const MENU_TEMPLATES_PAGES = 'templates-pages';
export const MENU_TEMPLATES_POSTS = 'templates-posts';
export const MENU_TEMPLATES_UNUSED = 'templates-unused';

export const SEARCH_DEBOUNCE_IN_MS = 75;

Expand Down
49 changes: 0 additions & 49 deletions ...ges/edit-site/src/components/navigation-sidebar/navigation-panel/menus/templates-pages.js
View file
Open in desktop

This file was deleted.

60 changes: 0 additions & 60 deletions ...ges/edit-site/src/components/navigation-sidebar/navigation-panel/menus/templates-posts.js
View file
Open in desktop

This file was deleted.

21 changes: 15 additions & 6 deletions ...r/navigation-panel/menus/templates-all.js → ...r/navigation-panel/menus/templates-sub.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,31 @@ import { map } from 'lodash';
* WordPress dependencies
*/
import { __experimentalNavigationMenu as NavigationMenu } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { useMemo } from '@wordpress/element';

/**
* Internal dependencies
*/
import TemplateNavigationItem from '../template-navigation-item';
import { MENU_TEMPLATES, MENU_TEMPLATES_ALL } from '../constants';
import { MENU_TEMPLATES } from '../constants';

export default function TemplatesSubMenu( { menu, title, templates } ) {
const templatesFiltered = useMemo(
() =>
templates
?.filter( ( { location } ) => location === menu )
?.map( ( { template } ) => template ) ?? [],
[ menu, templates ]
);

export default function TemplatesAllMenu( { templates } ) {
return (
<NavigationMenu
menu={ MENU_TEMPLATES_ALL }
title={ __( 'All Templates' ) }
menu={ menu }
title={ title }
parentMenu={ MENU_TEMPLATES }
isEmpty={ templatesFiltered.length === 0 }
>
{ map( templates, ( template ) => (
{ map( templatesFiltered, ( template ) => (
<TemplateNavigationItem
item={ template }
key={ `wp_template-${ template.id }` }
Expand Down
Loading