Change default behavior of Homepage Posts and Carousel blocks to include posts in subcategories #1482

DennisNDean · 2023-06-26T16:29:02Z

All Submissions:

Have you followed the Newspack Contributing guideline?
Does your code follow the WordPress' coding standards and VIP Go coding standards?
Have you checked to ensure there aren't other open Pull Requests for the same update/change?

Changes proposed in this Pull Request:

Change the default behavior of the Homepage Posts and Carousel blocks to include posts in subcategories of the selected categories. Added a toggle under the category picker to switch this behavior off.

Generally speaking, this is more in line with how Wordpress treats parent/child categories, where a query for the parent category is inclusive of posts in the child categories, and seems more intuitive.

Closes #207

How to test the changes in this Pull Request:

Create a category with one or more child categories (i.e. Food > Tacos)
Categorize some posts into the parent category (i.e. Food)
Categorize some posts into the child category, but do not explicitly categorize them into the parent category (i.e. Tacos, but not Food)
Create a new page and add a Homepage Posts block
Under Display Settings, filter by the parent category (i.e. Food)
Observe that posts from the child category are also included
Toggle "Include subcategories" off, observe that now only posts from the parent category are displayed
Do the same with the Carousel block

Other information:

Have you added an explanation of what your changes do and why you'd like us to include them?
Have you written new tests for your changes, as applicable?
Have you successfully ran tests with your changes locally?

… include subcategories of the selected categories. Added a toggle below the categories picker to turn this on and off.

dkoo · 2023-06-26T22:02:39Z

@DennisNDean thanks for your contribution! We'll put this in our queue to test, and will get back to you shortly.

miguelpeixe

Thank you for your contribution, @DennisNDean!

It's working as described and the code looks good. A few minor changes are required before we are able to merge. They are commented inline, please let me know if you have any questions.

miguelpeixe · 2023-06-28T19:16:39Z

includes/class-newspack-blocks.php

-		$args                = array(
+		$authors                = isset( $attributes['authors'] ) ? $attributes['authors'] : array();
+		$categories             = isset( $attributes['categories'] ) ? $attributes['categories'] : array();
+		$include_subcategories  = isset( $attributes['includeSubcategories'] ) ? intval($attributes['includeSubcategories']) : false;


Lint: there should be a space before and after the arguments for intval():
intval( $attributes['includeSubcategories'] );

This is also the case for other instances in this file, see the spacing and indentation in the conditional statement, foreach loop, etc between lines 670 and 677.

You can find more information on WP coding standards here: https://github.com/WordPress/WordPress-Coding-Standards

src/blocks/carousel/edit.js

Co-authored-by: Miguel Peixe <miguel@peixe.co>

DennisNDean · 2023-06-28T19:41:26Z

Awesome, thank you — those changes have been made.

miguelpeixe · 2023-06-28T19:40:57Z

includes/class-newspack-blocks.php

+		$authors                = isset( $attributes['authors'] ) ? $attributes['authors'] : array();
+		$categories             = isset( $attributes['categories'] ) ? $attributes['categories'] : array();
+		$include_subcategories  = isset( $attributes['includeSubcategories'] ) ? intval( $attributes['includeSubcategories'] ) : false;
+		$tags                   = isset( $attributes['tags'] ) ? $attributes['tags'] : array();
+		$custom_taxonomies      = isset( $attributes['customTaxonomies'] ) ? $attributes['customTaxonomies'] : array();
+		$tag_exclusions         = isset( $attributes['tagExclusions'] ) ? $attributes['tagExclusions'] : array();
+		$category_exclusions    = isset( $attributes['categoryExclusions'] ) ? $attributes['categoryExclusions'] : array();
+		$specific_posts         = isset( $attributes['specificPosts'] ) ? $attributes['specificPosts'] : array();
+		$posts_to_show          = intval( $attributes['postsToShow'] );
+		$specific_mode          = isset( $attributes['specificMode'] ) ? intval( $attributes['specificMode'] ) : false;
+		$args                   = array(


Looks like there's a double-space on $include_subcategories =. Can you trim the extra space off from these lines?

Ah yes, that's fixed, thank you

miguelpeixe · 2023-06-28T19:41:15Z

includes/class-newspack-blocks.php

+					foreach  ( $categories as $parent ) {
+						$children[] = get_categories(array('child_of'=> $parent));
+						foreach ( $children[0] as $child ) {
+						$categories[] = $child->term_id;


Missing a tab here

includes/class-newspack-blocks.php

Co-authored-by: Miguel Peixe <miguel@peixe.co>

includes/class-newspack-blocks.php

Co-authored-by: Miguel Peixe <miguel@peixe.co>

miguelpeixe · 2023-06-28T20:25:46Z

Thank you for the revisions, @DennisNDean!

# [1.73.0-alpha.1](v1.72.0...v1.73.0-alpha.1) (2023-07-07) ### Features * add updated translation files ([#1486](#1486)) ([3a44410](3a44410)) * allow Homepage Posts and Carousel blocks to include subcategories ([#1482](#1482)) ([faa8734](faa8734)) * **modal-checkout:** render order details under different conditions ([#1485](#1485)) ([ae62734](ae62734))

matticbot · 2023-07-07T20:22:31Z

🎉 This PR is included in version 1.73.0-alpha.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

# [1.73.0](v1.72.2...v1.73.0) (2023-07-17) ### Features * add updated translation files ([#1486](#1486)) ([3a44410](3a44410)) * allow Homepage Posts and Carousel blocks to include subcategories ([#1482](#1482)) ([faa8734](faa8734)) * **modal-checkout:** render order details under different conditions ([#1485](#1485)) ([ae62734](ae62734))

matticbot · 2023-07-17T21:27:24Z

🎉 This PR is included in version 1.73.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Dennis Dean and others added 2 commits June 26, 2023 08:57

Change default behavior on homepage posts block and carousel block to…

1d5d7a6

… include subcategories of the selected categories. Added a toggle below the categories picker to turn this on and off.

Removed an extraneous line from testing

5ad33a5

DennisNDean requested a review from a team as a code owner June 26, 2023 16:29

miguelpeixe self-assigned this Jun 28, 2023

miguelpeixe added the [Status] Needs Review label Jun 28, 2023

miguelpeixe requested changes Jun 28, 2023

View reviewed changes

DennisNDean and others added 3 commits June 28, 2023 12:32

Update src/blocks/carousel/edit.js

b860c17

Co-authored-by: Miguel Peixe <miguel@peixe.co>

Spacing fixed

51b7fca

Merge branch 'master' of https://github.com/DennisNDean/newspack-blocks

96955d9

miguelpeixe requested changes Jun 28, 2023

View reviewed changes

DennisNDean and others added 3 commits June 28, 2023 12:44

Update includes/class-newspack-blocks.php

939a51c

Co-authored-by: Miguel Peixe <miguel@peixe.co>

Fixed spacing

93f5567

Merge branch 'master' of https://github.com/DennisNDean/newspack-blocks

0a4cdd4

miguelpeixe reviewed Jun 28, 2023

View reviewed changes

includes/class-newspack-blocks.php Outdated Show resolved Hide resolved

Update includes/class-newspack-blocks.php

bbe9c4e

Co-authored-by: Miguel Peixe <miguel@peixe.co>

miguelpeixe approved these changes Jun 28, 2023

View reviewed changes

miguelpeixe merged commit faa8734 into Automattic:master Jun 28, 2023

miguelpeixe mentioned this pull request Jun 28, 2023

chore: fix remaining lint from #1482 #1487

Merged

6 tasks

miguelpeixe added a commit that referenced this pull request Jun 28, 2023

chore: fix remaining lint from #1482 (#1487)

3102e99

matticbot added the released on @alpha label Jul 7, 2023

matticbot added the released label Jul 17, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change default behavior of Homepage Posts and Carousel blocks to include posts in subcategories #1482

Change default behavior of Homepage Posts and Carousel blocks to include posts in subcategories #1482

DennisNDean commented Jun 26, 2023 •

edited

Loading

dkoo commented Jun 26, 2023

miguelpeixe left a comment

miguelpeixe Jun 28, 2023

DennisNDean commented Jun 28, 2023

miguelpeixe Jun 28, 2023

DennisNDean Jun 28, 2023

miguelpeixe Jun 28, 2023

miguelpeixe commented Jun 28, 2023

matticbot commented Jul 7, 2023

matticbot commented Jul 17, 2023

Change default behavior of Homepage Posts and Carousel blocks to include posts in subcategories #1482

Change default behavior of Homepage Posts and Carousel blocks to include posts in subcategories #1482

Conversation

DennisNDean commented Jun 26, 2023 • edited Loading

All Submissions:

Changes proposed in this Pull Request:

How to test the changes in this Pull Request:

Other information:

dkoo commented Jun 26, 2023

miguelpeixe left a comment

Choose a reason for hiding this comment

miguelpeixe Jun 28, 2023

Choose a reason for hiding this comment

DennisNDean commented Jun 28, 2023

miguelpeixe Jun 28, 2023

Choose a reason for hiding this comment

DennisNDean Jun 28, 2023

Choose a reason for hiding this comment

miguelpeixe Jun 28, 2023

Choose a reason for hiding this comment

miguelpeixe commented Jun 28, 2023

matticbot commented Jul 7, 2023

matticbot commented Jul 17, 2023

DennisNDean commented Jun 26, 2023 •

edited

Loading