feat(homepage-posts): support deduplication toggling

includes/class-newspack-blocks.php

@@ -585,6 +585,23 @@ public static function add_image_sizes() {
 		add_image_size( 'newspack-article-block-uncropped', 1200, 9999, false );
 	}
 
+	/**
+	 * Whether the block should be included in the deduplication logic.
+	 *
+	 * @param array $attributes Block attributes.
+	 *
+	 * @return bool
+	 */
+	public static function should_deduplicate_block( $attributes ) {
+		/**
+		 * Filters whether to use deduplication while rendering the given block.
+		 *
+		 * @param bool   $deduplicate Whether to deduplicate.
+		 * @param array  $attributes  The block attributes.
+		 */
+		return apply_filters( 'newspack_blocks_should_deduplicate', $attributes['deduplicate'] ?? true, $attributes );
+	}
+
 	/**
 	 * Get all "specificPosts" ids from given blocks.
 	 *
@@ -605,6 +622,7 @@ private static function get_specific_posts_from_blocks( $blocks, $block_name ) {
 			}
 			if (
 				$block_name === $block['blockName'] &&
+				self::should_deduplicate_block( $block['attrs'] ) &&
 				! empty( $block['attrs']['specificMode'] ) &&
 				! empty( $block['attrs']['specificPosts'] )
 			) {
@@ -670,9 +688,7 @@ public static function build_articles_query( $attributes, $block_name ) {
 			$args['orderby']  = 'post__in';
 		} else {
 			$args['posts_per_page'] = $posts_to_show;
-
-			$show_rendered_posts = apply_filters( 'newspack_blocks_homepage_shown_rendered_posts', false );
-			if ( $show_rendered_posts ) {
+			if ( ! self::should_deduplicate_block( $attributes ) ) {
 				$args['post__not_in'] = [ get_the_ID() ];
 			} else {
 				if ( count( $newspack_blocks_all_specific_posts_ids ) ) {

src/blocks/homepage-articles/block.json

@@ -191,6 +191,10 @@
 			"type": "array",
 			"default": [ "publish" ],
 			"items": { "type": "string" }
+		},
+		"deduplicate": {
+			"type": "boolean",
+			"default": true
 		}
 	}
 }

src/blocks/homepage-articles/edit.js

@@ -435,6 +435,16 @@ class Edit extends Component {
 							/>
 						)
 					) }
+					<ToggleControl
+						label={ __( 'Use deduplication logic', 'newspack-blocks' ) }
+						help={ __(
+							'If unchecked, this block will be excluded from the deduplication logic and may show duplicate posts.',
+							'newspack-blocks'
+						) }
+						checked={ attributes.deduplicate }
+						onChange={ () => setAttributes( { deduplicate: ! attributes.deduplicate } ) }
+						className="newspack-blocks-deduplication-toggle"
+					/>
 				</PanelBody>
 				<PanelBody title={ __( 'Featured Image Settings', 'newspack-blocks' ) }>
 					<PanelRow>

src/blocks/homepage-articles/store.js

@@ -110,6 +110,19 @@ function* getPostsForBlock( block ) {
 	return postsIds;
 }
 
+/**
+ * Whether a block uses deduplication.
+ *
+ * @param {string} clientId
+ *
+ * @return {boolean} whether the block uses deduplication
+ */
+function shouldDeduplicate( clientId ) {
+	const { getBlock } = select( 'core/block-editor' );
+	const block = getBlock( clientId );
+	return block?.attributes?.deduplicate;
+}
+
 const createFetchPostsSaga = blockNames => {
 	/**
 	 * "worker" Saga: will be fired on REFLOW actions
@@ -138,8 +151,8 @@ const createFetchPostsSaga = blockNames => {
 		const blockQueries = getBlockQueries( blocks, blockNames );
 
 		// Use requested specific posts ids as the starting state of exclusion list.
-		const specificPostsId = blockQueries.reduce( ( acc, { postsQuery } ) => {
-			if ( postsQuery.include ) {
+		const specificPostsId = blockQueries.reduce( ( acc, { clientId, postsQuery } ) => {
+			if ( shouldDeduplicate( clientId ) && postsQuery.include ) {
 				acc = [ ...acc, ...postsQuery.include ];
 			}
 			return acc;
@@ -148,14 +161,19 @@ const createFetchPostsSaga = blockNames => {
 		let exclude = sanitizePostList( [ ...specificPostsId, getCurrentPostId() ] );
 		while ( blockQueries.length ) {
 			const nextBlock = blockQueries.shift();
-			nextBlock.postsQuery.exclude = exclude;
+			const deduplicate = shouldDeduplicate( nextBlock.clientId );
+			if ( deduplicate ) {
+				nextBlock.postsQuery.exclude = exclude;
+			}
 			let fetchedPostIds = [];
 			try {
 				fetchedPostIds = yield call( getPostsForBlock, nextBlock );
 			} catch ( e ) {
 				yield put( { type: 'UPDATE_BLOCK_ERROR', clientId: nextBlock.clientId, error: e.message } );
 			}
-			exclude = [ ...exclude, ...fetchedPostIds ];
+			if ( deduplicate ) {
+				exclude = [ ...exclude, ...fetchedPostIds ];
+			}
 		}
 
 		yield put( { type: 'ENABLE_UI' } );

src/blocks/homepage-articles/templates/articles-loop.php

@@ -18,10 +18,9 @@ function( $data ) {
 
 		Newspack_Blocks::filter_excerpt( $attributes );
 
-		$enable_post_duplication = apply_filters( 'newspack_blocks_homepage_enable_duplication', false );
 		while ( $article_query->have_posts() ) {
 			$article_query->the_post();
-			if ( ! $enable_post_duplication ) {
+			if ( Newspack_Blocks::should_deduplicate_block( $attributes ) ) {
 				$newspack_blocks_post_id[ get_the_ID() ] = true;
 			}
 			echo Newspack_Blocks::template_inc( __DIR__ . '/article.php', array( 'attributes' => $attributes ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped

src/blocks/homepage-articles/utils.ts

@@ -38,6 +38,7 @@ const POST_QUERY_ATTRIBUTES = [
 	'categoryExclusions',
 	'postType',
 	'includedPostStatuses',
+	'deduplicate',
 ];
 
 type HomepageArticlesAttributes = {