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

Template parts: set backpath to patterns page #60667

Merged
merged 7 commits into from
Apr 11, 2024
Merged

Template parts: set backpath to patterns page #60667

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cd580e7
Go back to patterns when deleting a part from the editor sidebar
oandregal Apr 11, 2024
c66a62e
Details page for parts: always go back to patterns
oandregal Apr 11, 2024
9037626
Remove unnecessary backPath: it is managed by the details page
oandregal Apr 11, 2024
3084583
Remove logic for template part: it is never used
oandregal Apr 11, 2024
c09f5d2
On removing the template part from the command bar, go back to patterns
oandregal Apr 11, 2024
0054ab4
Fix backPath after removing template in the details view
oandregal Apr 11, 2024
5c1609e
Revert "Details page for parts: always go back to patterns"
oandregal Apr 11, 2024
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
6 changes: 0 additions & 6 deletions packages/edit-site/src/components/page-templates-template-parts/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import AddNewTemplate from '../add-new-template';
import { useAddedBy } from './hooks';
import {
TEMPLATE_POST_TYPE,
TEMPLATE_PART_POST_TYPE,
ENUMERATION_TYPE,
OPERATOR_IS_ANY,
LAYOUT_GRID,
Expand Down Expand Up @@ -102,11 +101,6 @@ function Title( { item, viewType } ) {
canvas: 'edit',
},
};
if ( item.type === TEMPLATE_PART_POST_TYPE ) {
linkProps.state = {
backPath: '/wp_template_part/all',
};
}
return (
<Link { ...linkProps }>
{ decodeEntities( item.title?.rendered ) || __( '(no title)' ) }
Expand Down
2 changes: 1 addition & 1 deletion packages/edit-site/src/components/sidebar-edit-mode/template-panel/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function TemplatesList( { availableTemplates, onSelect } ) {

const POST_TYPE_PATH = {
wp_template: '/wp_template',
wp_template_part: '/wp_template_part/all',
wp_template_part: '/patterns',
};

export default function TemplatePanel() {
Expand Down
12 changes: 1 addition & 11 deletions packages/edit-site/src/components/sidebar-navigation-screen-pattern/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { __experimentalUseNavigator as useNavigator } from '@wordpress/component
import { useDispatch } from '@wordpress/data';
import { __ } from '@wordpress/i18n';
import { pencil } from '@wordpress/icons';
import { getQueryArgs } from '@wordpress/url';

/**
* Internal dependencies
Expand All @@ -17,27 +16,18 @@ import usePatternDetails from './use-pattern-details';
import { store as editSiteStore } from '../../store';
import { unlock } from '../../lock-unlock';
import TemplateActions from '../template-actions';
import { TEMPLATE_PART_POST_TYPE } from '../../utils/constants';

export default function SidebarNavigationScreenPattern() {
const navigator = useNavigator();
const {
params: { postType, postId },
} = navigator;
const { categoryType } = getQueryArgs( window.location.href );
const { setCanvasMode } = unlock( useDispatch( editSiteStore ) );

useInitEditedEntityFromURL();

const patternDetails = usePatternDetails( postType, postId );

// The absence of a category type in the query params for template parts
// indicates the user has arrived at the template part via the "manage all"
// page and the back button should return them to that list page.
const backPath =
! categoryType && postType === TEMPLATE_PART_POST_TYPE
? '/wp_template_part/all'
: '/patterns';
const backPath = '/patterns';

return (
<SidebarNavigationScreen
Expand Down
7 changes: 1 addition & 6 deletions packages/edit-site/src/components/sidebar-navigation-screen-template/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,6 @@ function useTemplateDetails( postType, postId ) {
return { title, description, content, footer };
}

const POST_TYPE_PATH = {
wp_template: '/wp_template',
wp_template_part: '/wp_template_part/all',
};

export default function SidebarNavigationScreenTemplate() {
const navigator = useNavigator();
const {
Expand All @@ -119,7 +114,7 @@ export default function SidebarNavigationScreenTemplate() {
postId={ postId }
toggleProps={ { as: SidebarButton } }
onRemove={ () => {
navigator.goTo( POST_TYPE_PATH[ postType ] );
navigator.goTo( postType );
oandregal marked this conversation as resolved.
Show resolved Hide resolved
} }
/>
<SidebarButton
Expand Down
4 changes: 1 addition & 3 deletions packages/edit-site/src/hooks/commands/use-edit-mode-commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,7 @@ function useManipulateDocumentCommands() {
decodeEntities( template.title )
);
const path =
template.type === TEMPLATE_POST_TYPE
? '/wp_template'
: '/wp_template_part/all';
template.type === TEMPLATE_POST_TYPE ? '/wp_template' : '/patterns';
commands.push( {
name: 'core/remove-template',
label,
Expand Down
Loading