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

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

Merged
merged 9 commits into from
Jun 28, 2023
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1d5d7a6
Change default behavior on homepage posts block and carousel block to…
Jun 26, 2023
5ad33a5
Removed an extraneous line from testing
DennisNDean Jun 26, 2023
b860c17
Update src/blocks/carousel/edit.js
DennisNDean Jun 28, 2023
51b7fca
Spacing fixed
DennisNDean Jun 28, 2023
96955d9
Merge branch 'master' of https://github.com/DennisNDean/newspack-blocks
DennisNDean Jun 28, 2023
939a51c
Update includes/class-newspack-blocks.php
DennisNDean Jun 28, 2023
93f5567
Fixed spacing
DennisNDean Jun 28, 2023
0a4cdd4
Merge branch 'master' of https://github.com/DennisNDean/newspack-blocks
DennisNDean Jun 28, 2023
bbe9c4e
Update includes/class-newspack-blocks.php
DennisNDean Jun 28, 2023
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
29 changes: 19 additions & 10 deletions includes/class-newspack-blocks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,16 +628,17 @@ function ( $acc, $block ) use ( $block_name ) {
if ( current_user_can( 'edit_others_posts' ) && isset( $attributes['includedPostStatuses'] ) ) {
$included_post_statuses = $attributes['includedPostStatuses'];
}
$authors = isset( $attributes['authors'] ) ? $attributes['authors'] : array();
$categories = isset( $attributes['categories'] ) ? $attributes['categories'] : array();
$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(
$authors = isset( $attributes['authors'] ) ? $attributes['authors'] : array();
$categories = isset( $attributes['categories'] ) ? $attributes['categories'] : array();
$include_subcategories = isset( $attributes['includeSubcategories'] ) ? intval($attributes['includeSubcategories']) : false;
Copy link
Member

Choose a reason for hiding this comment

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

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

$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(
'post_type' => $post_type,
'post_status' => $included_post_statuses,
'suppress_filters' => false,
Expand Down Expand Up @@ -666,6 +667,14 @@ function ( $acc, $block ) use ( $block_name ) {
);
}
if ( $categories && count( $categories ) ) {
if ($include_subcategories === 1){
foreach ($categories as $parent) {
$children[] = get_categories(array('child_of'=> $parent));
DennisNDean marked this conversation as resolved.
Show resolved Hide resolved
foreach ($children[0] as $child) {
$categories[] = $child->term_id;
Copy link
Member

Choose a reason for hiding this comment

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

Missing a tab here

}
}
}
$args['category__in'] = $categories;
}
if ( $tags && count( $tags ) ) {
Expand Down
3 changes: 3 additions & 0 deletions src/blocks/carousel/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ class Edit extends Component {
authors,
autoplay,
categories,
includeSubcategories,
customTaxonomies,
delay,
hideControls,
Expand Down Expand Up @@ -374,6 +375,8 @@ class Edit extends Component {
onAuthorsChange={ value => setAttributes( { authors: value } ) }
categories={ categories }
onCategoriesChange={ value => setAttributes( { categories: value } ) }
includeSubcategories={ includeSubcategories }
onIncludeSubcategoriesChange={ _includeSubcategories => setAttributes( { includeSubcategories: _includeSubcategories } ) }
DennisNDean marked this conversation as resolved.
Show resolved Hide resolved
tags={ tags }
onTagsChange={ value => setAttributes( { tags: value } ) }
onCustomTaxonomiesChange={ value => setAttributes( { customTaxonomies: value } ) }
Expand Down
4 changes: 4 additions & 0 deletions src/blocks/carousel/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ export const settings = {
categories: {
type: 'array',
},
includeSubcategories: {
type: 'boolean',
default: true
},
tags: {
type: 'array',
},
Expand Down
4 changes: 4 additions & 0 deletions src/blocks/homepage-articles/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@
"default": [],
"items": { "type": "integer" }
},
"includeSubcategories": {
"type": "boolean",
"default": true
},
"tags": {
"type": "array",
"default": [],
Expand Down
3 changes: 3 additions & 0 deletions src/blocks/homepage-articles/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@ class Edit extends Component {
specificPosts,
postsToShow,
categories,
includeSubcategories,
customTaxonomies,
columns,
colGap,
Expand Down Expand Up @@ -359,6 +360,8 @@ class Edit extends Component {
onAuthorsChange={ handleAttributeChange( 'authors' ) }
categories={ categories }
onCategoriesChange={ handleAttributeChange( 'categories' ) }
includeSubcategories={ includeSubcategories }
onIncludeSubcategoriesChange={ handleAttributeChange( 'includeSubcategories' ) }
tags={ tags }
onTagsChange={ handleAttributeChange( 'tags' ) }
onCustomTaxonomiesChange={ handleAttributeChange( 'customTaxonomies' ) }
Expand Down
4 changes: 4 additions & 0 deletions src/blocks/homepage-articles/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const POST_QUERY_ATTRIBUTES = [
'postsToShow',
'authors',
'categories',
'includeSubcategories',
'excerptLength',
'tags',
'customTaxonomies',
Expand All @@ -43,6 +44,7 @@ type HomepageArticlesAttributes = {
postsToShow: number;
authors: AuthorId[];
categories: CategoryId[];
includeSubcategories: boolean;
excerptLength: number;
postType: PostType[];
showExcerpt: boolean;
Expand Down Expand Up @@ -87,6 +89,7 @@ export const queryCriteriaFromAttributes = ( attributes: Block[ 'attributes' ] )
postsToShow,
authors,
categories,
includeSubcategories,
excerptLength,
postType,
showExcerpt,
Expand All @@ -111,6 +114,7 @@ export const queryCriteriaFromAttributes = ( attributes: Block[ 'attributes' ] )
: {
postsToShow,
categories,
includeSubcategories,
authors,
tags,
tagExclusions,
Expand Down
9 changes: 9 additions & 0 deletions src/components/query-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@ class QueryControls extends Component {
onAuthorsChange,
categories,
onCategoriesChange,
includeSubcategories,
onIncludeSubcategoriesChange,
tags,
onTagsChange,
customTaxonomies,
Expand Down Expand Up @@ -290,6 +292,13 @@ class QueryControls extends Component {
label={ __( 'Categories', 'newspack-blocks' ) }
/>
) }
{ onIncludeSubcategoriesChange && (
<ToggleControl
checked={ includeSubcategories }
onChange={ onIncludeSubcategoriesChange }
label={ __( 'Include subcategories ', 'newspack-blocks' ) }
/>
) }
{ onTagsChange && (
<AutocompleteTokenField
tokens={ tags || [] }
Expand Down