Router: load proper sidebar for /wp_template
#60850
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message. To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
oandregal
added
[Type] Bug
jorgefilipecosta
approved these changes
Apr 18, 2024
|
Size Change: -7 B (0%) Total Size: 1.75 MB
ℹ️ View Unchanged
|
oandregal
commented
Apr 18, 2024
| @@ -108,9 +108,7 @@ export default function useLayoutAreas() { | |||
| return { | |||
| key: 'templates-list', | |||
| areas: { | |||
| sidebar: postId ? ( | |||
There was a problem hiding this comment.
There's only one screen that uses the /wp_template path, as far as I'm aware: in that screen, whether we have a postId or not, we want to show the SidebarNavigationScreenTemplatesBrowse. Unless I'm missing something else?
There was a problem hiding this comment.
I've looked at the Sidebar before the router refactoring: https://github.com/WordPress/gutenberg/pull/60466/files#diff-0cf5246119f61f0f26cb94918697d2cb3a0f40051045d24dd01c98241e79bde7L79 and I see how that logic could have been confusing when we ported the logic to the router.
There was two places that used the /wp_template:
<SidebarScreenWrapper path="/:postType(wp_template)">
<SidebarNavigationScreenTemplatesBrowse />
</SidebarScreenWrapper>
<SidebarScreenWrapper path="/:postType(wp_template)/:postId">
<SidebarNavigationScreenTemplate />
</SidebarScreenWrapper>I haven't checked how the navigator worked and how it matched URL parameters, but it sounds like the second path would be never reached? I don't think we had a /wp_template/postId path.
There was a problem hiding this comment.
The second path would be reached when you were on a site-editor.php?postType=wp_template&postId=x page. Then, in the useSyncPathWithURL hook, there was a getPathFromURL that transformed these URL params into a Navigator path /wp_template/x. And that matched the SidebarScreenWrapper that shows SidebarNavigationScreenTemplate.
To get the /:postType(wp_template) path, you URL had to be site-editor.php?path=/wp_template. Then the Navigator displays SidebarNavigationScreenTemplatesBrowse, which is the "index".
So, yes, your fix is correct. When the URL is site-editor.php?path=/wp_template&postId=x, we're not on the editor page for template x, but we're on the template index page with x selected/highlighted.
There was a problem hiding this comment.
The second path would be reached when you were on a site-editor.php?postType=wp_template&postId=x page
Nice, thanks for the confirmation. This is the "details page" and we have that already covered in the router, so we're good. 👍
jsnajdr
approved these changes
Apr 18, 2024
There was a problem hiding this comment.
Looks good 👍
I accidentally introduced the same bug on the /page list when working on #60466, but there I noticed it soon enough and fixed it in this commit (note how it also removes the postId condition):
d004005cd8#diff-c924d1b796a6245ad6188bcd902a7aa5894fea2275bc3818b729c1ab57f08657L49-L51
But I missed the same bug in /wp_template. Thanks!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #60466 (comment)
What
Loads the proper sidebar for the
/wp_templatepath when coming back from the editor.How
637b898 Removes the
postIdconditional.Test