Skip to content

6.0 Backport to add support for custom taxonomies filtering for Query Loop (from Gutenberg) #2488

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

Closed
hellofromtonya wants to merge 16 commits into from
Closed

6.0 Backport to add support for custom taxonomies filtering for Query Loop (from Gutenberg) #2488

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d453c19
Backports from lib/compat/wordpress-6.0/block-patterns-update.php
hellofromtonya Mar 31, 2022
3163816
Backports from lib/compat/wordpress-6.0/blocks.php.
hellofromtonya Mar 31, 2022
e51fd0c
Backporting latest changes from https://github.com/WordPress/gutenber…
hellofromtonya Apr 4, 2022
b081331
Backport lib/compat/wordpress-6.0/block-patterns.php.
hellofromtonya Apr 6, 2022
cde5c14
Backports /lib/compat/wordpress-6.0/class-gutenberg-rest-pattern-dire…
hellofromtonya Apr 6, 2022
fef0000
Backport lib/compat/wordpress-6.0/class-wp-rest-block-patterns-contro…
hellofromtonya Apr 6, 2022
c658eb8
/lib/compat/wordpress-6.0/class-wp-rest-block-pattern-categories-cont…
hellofromtonya Apr 6, 2022
e22f662
Backports new test classes.
hellofromtonya Apr 6, 2022
ceedc0a
Load files, use stable namespace, register routes, girl scouting.
ironprogrammer Apr 7, 2022
a3d71fb
Fix instance property reflection error in tests.
hellofromtonya Apr 7, 2022
a7d1560
Fix phpcs whitespace at end of line.
hellofromtonya Apr 7, 2022
d7b77aa
Fixes expected query results of Tests_Blocks_wpBlock::test_build_quer…
hellofromtonya Apr 7, 2022
fec3207
Fix arrow alignment in test for phpcs.
hellofromtonya Apr 7, 2022
6fbf8e5
Adds new endpoints to schema setup test.
hellofromtonya Apr 7, 2022
0af2058
Backport new WP_Theme_JSON::get_patterns() method.
hellofromtonya Apr 7, 2022
a3e5009
Fixes Tests_REST_WpRestBlockPatternsController::test_get_items() test.
hellofromtonya Apr 7, 2022
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
Prev Previous commit
Next Next commit
Backports from lib/compat/wordpress-6.0/blocks.php.
  • Loading branch information
@hellofromtonya
hellofromtonya committed Mar 31, 2022
commit 3163816045f479aba3bd891488ef1f711c4d0015
40 changes: 32 additions & 8 deletions src/wp-includes/blocks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,15 +1126,39 @@ function build_query_vars_from_query_block( $block, $page ) {
$query['offset'] = ( $per_page * ( $page - 1 ) ) + $offset;
$query['posts_per_page'] = $per_page;
}
if ( ! empty( $block->context['query']['categoryIds'] ) ) {
$term_ids = array_map( 'intval', $block->context['query']['categoryIds'] );
$term_ids = array_filter( $term_ids );
$query['category__in'] = $term_ids;
// Migrate `categoryIds` and `tagIds` to `tax_query` for backwards compatibility.
if ( ! empty( $block->context['query']['categoryIds'] ) || ! empty( $block->context['query']['tagIds'] ) ) {
Copy link
Contributor

@peterwilsoncc peterwilsoncc Mar 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't see why this outer if is needed, the same checks are being done inside it.

Copy link

@ntsekouras ntsekouras Apr 1, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to 'encapsulate' (let's say) the 'migration' code. Also, both old attributes merge into a single one and without the extra if we would have more checks about new value and merge, etc..

I think there is no harm to leave this as is.

$tax_query = array();
if ( ! empty( $block->context['query']['categoryIds'] ) ) {
$tax_query[] = array(
'taxonomy' => 'category',
'terms' => $block->context['query']['categoryIds'],
'include_children' => false,
);
}
if ( ! empty( $block->context['query']['tagIds'] ) ) {
$tax_query[] = array(
'taxonomy' => 'post_tag',
'terms' => $block->context['query']['tagIds'],
'include_children' => false,
);
}
$query['tax_query'] = $tax_query;
}
if ( ! empty( $block->context['query']['tagIds'] ) ) {
$term_ids = array_map( 'intval', $block->context['query']['tagIds'] );
$term_ids = array_filter( $term_ids );
$query['tag__in'] = $term_ids;
if ( ! empty( $block->context['query']['taxQuery'] ) ) {
$query['tax_query'] = array();
Copy link
Contributor

@peterwilsoncc peterwilsoncc Mar 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like it will stomp on any categories and tags in the shim above if the query block has both a legacy value and taxQuery defined.

Copy link

@ntsekouras ntsekouras Apr 1, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if it will be possible to have the old and new attributes, as there is the client parsing that migrates the block. So in the case of deprecated blocks, we just fill the new attribute from the old ones.

Copy link
Contributor

@peterwilsoncc peterwilsoncc Apr 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if it will be possible to have the old and new attributes, as there is the client parsing that migrates the block.

Thanks, I gather that will come in as part of a package.

Copy link
Contributor

@adamziel adamziel Apr 7, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using an else if instead of an if would make this explicit for the future readers of this code. I'm thinking:

else if ( ! empty( $block->context['query']['taxQuery'] ) ) {

Not a blocker for the backport, though.

foreach ( $block->context['query']['taxQuery'] as $taxonomy => $terms ) {
if ( ! empty( $terms ) ) {
$term_ids = array_map( 'intval', $terms );
$term_ids = array_filter( $term_ids );

$query['tax_query'][] = array(
'taxonomy' => $taxonomy,
'terms' => $terms,
'include_children' => false,
);
}
}
}
if (
isset( $block->context['query']['order'] ) &&
Expand Down