Query Loop: Fix isControlAllowed and isTemplate combined logic #65984
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
mikachan
added
[Type] Bug
|
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. |
|
Size Change: -11 B (0%) Total Size: 1.77 MB
ℹ️ View Unchanged
|
mikachan
commented
Oct 9, 2024
| @@ -123,21 +123,18 @@ export default function QueryInspectorControls( props ) { | |||
| const showInheritControl = | |||
| isTemplate && isControlAllowed( allowedControls, 'inherit' ); | |||
| const showPostTypeControl = | |||
| ( ! inherit && isControlAllowed( allowedControls, 'postType' ) ) || | |||
| ! isTemplate; | |||
| ! inherit && isControlAllowed( allowedControls, 'postType' ); | |||
There was a problem hiding this comment.
inherit is already being set to false if on singular content in query-conent.js, so we can remove the isTemplate check from these lines.
The only isTemplate check we need here is the one on line 124, as this decides whether to show the inherit control or not, and the intended behaviour is for this control to only show when on non-singular content (and if the control is allowed).
t-hamano
reviewed
Oct 10, 2024
There was a problem hiding this comment.
Thanks for the PR!
I tried enabling only some controls as shown below, and it seems to work properly:
wp.blocks.registerBlockVariation(
'core/query',
{
name: 'testing-allowed-controls',
title: 'Testing Allowed Controls',
category: 'theme',
keywords: [],
scope: [ 'inserter' ],
attributes: {
namespace: 'testing-allowed-controls',
},
allowedControls: ['author', 'search'],
innerBlocks: [],
isActive: [ 'namespace' ],
}
);However, I'm not familiar with the recent changes to the Query Loop block. I'd be grateful if @fabiankaegy could help me 🙏
fabiankaegy
approved these changes
Oct 10, 2024
github-actions
bot
removed
the
Backport to WP 6.7 Beta/RC
gutenbergplugin
pushed a commit
that referenced
this pull request
Oct 12, 2024
* Fix isControlAllowed and isTemplate logic * Remove isTemplate check when inherit is already being checked Co-authored-by: mikachan <mikachan@git.wordpress.org> Co-authored-by: t-hamano <wildworks@git.wordpress.org> Co-authored-by: fabiankaegy <fabiankaegy@git.wordpress.org> Co-authored-by: ndiego <ndiego@git.wordpress.org> Co-authored-by: daviedR <daviedr@git.wordpress.org>
github-actions
bot
added
the
Backported to WP Core
|
I just cherry-picked this PR to the wp/6.7 branch to get it included in the next release: 541fe25 |
ciampo
pushed a commit
that referenced
this pull request
Oct 14, 2024
* Fix isControlAllowed and isTemplate logic * Remove isTemplate check when inherit is already being checked Co-authored-by: mikachan <mikachan@git.wordpress.org> Co-authored-by: t-hamano <wildworks@git.wordpress.org> Co-authored-by: fabiankaegy <fabiankaegy@git.wordpress.org> Co-authored-by: ndiego <ndiego@git.wordpress.org> Co-authored-by: daviedR <daviedr@git.wordpress.org>
karthick-murugan
pushed a commit
to karthick-murugan/gutenberg
that referenced
this pull request
Nov 13, 2024
…ress#65984) * Fix isControlAllowed and isTemplate logic * Remove isTemplate check when inherit is already being checked Co-authored-by: mikachan <mikachan@git.wordpress.org> Co-authored-by: t-hamano <wildworks@git.wordpress.org> Co-authored-by: fabiankaegy <fabiankaegy@git.wordpress.org> Co-authored-by: ndiego <ndiego@git.wordpress.org> Co-authored-by: daviedR <daviedr@git.wordpress.org>
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.
What?
This fixes the logic for showing the
allowedControlsfor the Query Loop block in combination with the newisTemplatecheck from #65067.Why?
Fixes #65902.
How?
Previously, the
isTemplatecheck was considered separately from theisControlAllowedcheck, and now with this PR, the logic is combined. This wasn't an intentional change to the logic, so this is a pure bug fix.Testing Instructions
These are taken from the testing instructions in #65902:
Create a new block variation using this snippet:
Go to 3 block editors:
Add the
Testing Allowed Controlsquery block variation into the block editor content via the inserter. Choose any inner blocks template.Check the available controls in the block options panel (right sidebar), and ensure that no controls are available on single posts or pages.
Screenshots or screencast