feat/support multiple connections

README.md

@@ -64,6 +64,26 @@ Add the template name as a comment at the top of this template file like this:
 
 Now, you will be able to select the template from the editor. The name of the template is displayed using the value in your docblock.
 
+### ACF Post Object Field
+
+It is possible to add a connection filter to the block settings that lets you filter the available posts based on connected posts. This only works for the ACF "Post Object" field.
+
+**Important: For this to work, the Post Object field setting "Select Multiple" must be disabled.**
+
+All you need to do is publish `config/yard-query-block.php` and register all connections in the `connections` array. For example:
+
+```php
+return [
+	'connections' => [
+		[
+			'from' => 'news',
+			'to' => 'project',
+			'meta_key' => 'news_related_project',
+		],
+	],
+];
+```
+
 ## Hooks
 
 ### JavaScript filters

assets/components/filters-controls/connection-control.js

@@ -67,12 +67,18 @@ const ConnectionControl = ( props ) => {
 				);
 			} );
 
-			if ( connectionPostTypes.length < 1 ) {
+			// Filter connections to only include unique post types (avoid duplicates if multiple connections to the same post type exist)
+			const uniqueConnectionPostTypes = connectionPostTypes.filter(
+				( value, index, self ) =>
+					index === self.findIndex( ( t ) => t.value === value.value )
+			);
+
+			if ( uniqueConnectionPostTypes.length < 1 ) {
 				setConnections( [] );
 				return;
 			}
 
-			setConnections( connectionPostTypes );
+			setConnections( uniqueConnectionPostTypes );
 		};
 
 		getConnections();
@@ -92,10 +98,12 @@ const ConnectionControl = ( props ) => {
 			const newConnectionPosts = {};
 
 			connections.forEach( ( connection ) => {
-				newConnectionPosts[ connection.value ] = {
-					value: currentPostId,
-					label: currentPostTitle,
-				};
+				newConnectionPosts[ connection.value ] = [
+					{
+						value: currentPostId,
+						label: currentPostTitle,
+					},
+				];
 			} );
 
 			setAttributes( {

assets/components/filters-controls/connection-select-control.js

@@ -32,7 +32,7 @@ const ConnectionSelectControl = ( props ) => {
 			enable={ true }
 			handleChange={ onChange }
 			isClearable={ true }
-			isMulti={ false }
+			isMulti={ true }
 			label={ connection.label }
 			value={ connectionPosts[ connection.value ] }
 		/>

assets/components/filters-controls/manual-selection-toggle-control.js

@@ -28,7 +28,7 @@ const ManualSelectionToggleControl = ( props ) => {
 				postParent: {},
 				enableTaxonomies: false,
 				taxonomyTerms: undefined,
-				enableConnections: false,
+				enableConnection: false,
 				connectionPosts: {},
 			} );
 		}

assets/components/settings-controls/post-type-select-control.js

@@ -64,8 +64,9 @@ const PostTypeSelectControl = ( props ) => {
 			postParent: {},
 			enableTaxonomies: false,
 			taxonomyTerms: undefined,
-			enableConnections: false,
+			enableConnection: false,
 			connectionPosts: {},
+			connectionOption: 'current-post-connections',
 		} );
 	};
 

assets/utils/helpers.js

@@ -1,3 +1,5 @@
+import { decodeEntities } from '@wordpress/html-entities';
+
 /**
  * Map posts array to an array to use for options in a select control
  *
@@ -6,7 +8,9 @@
 export const mapPostsToOptions = ( options = [] ) => {
 	return options.map( ( item ) => ( {
 		value: item.id,
-		label: item.title ? item.title : `#${ item.id }: geen titel`,
+		label: item.title
+			? decodeEntities( item.title )
+			: `#${ item.id }: geen titel`,
 	} ) );
 };
 
@@ -17,7 +21,7 @@ export const mapPostsToOptions = ( options = [] ) => {
  */
 export const mapPostTypesToOptions = ( postTypes = [] ) => {
 	return postTypes.map( ( item ) => ( {
-		label: item.name.replace( ''', "'" ),
+		label: decodeEntities( item.name ),
 		value: item.slug,
 	} ) );
 };
@@ -29,7 +33,7 @@ export const mapPostTypesToOptions = ( postTypes = [] ) => {
  */
 export const mapTermsToOptions = ( terms = [] ) => {
 	return terms.map( ( term ) => ( {
-		label: term.name.replace( ''', "'" ),
+		label: decodeEntities( term.name ),
 		value: term.slug,
 	} ) );
 };

config/yard-query-block.php

@@ -6,8 +6,8 @@
 	'connections' => [
 		//		[
 		//			'from' => 'news',
-		//			'meta_key' => 'news_connected_project',
 		//			'to' => 'project',
+		//			'meta_key' => 'news_related_project',
 		//		],
 	],
 ];

phpstan.neon.dist

@@ -7,5 +7,3 @@ parameters:
     paths:
         - src
     tmpDir: build/phpstan
-    ignoreErrors:
-        - message: '#Call to an undefined method Corcel\\Model\\Builder\\PostBuilder::hasMeta\(\)#'

public/index.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-server-side-render'), 'version' => '646477fe0cd8e94f969b');
+<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-server-side-render'), 'version' => '117be44835fd74eb02e7');

src/Block/BlockAttributes.php

@@ -4,6 +4,7 @@
 
 namespace Yard\QueryBlock\Block;
 
+use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Spatie\LaravelData\Attributes\WithCast;
 use Spatie\LaravelData\Data;
@@ -24,8 +25,8 @@ class BlockAttributes extends Data
 	 * @param LabelValueArray|array{} $stickyPost
 	 * @param LabelValueArray|array{} $excludePosts
 	 * @param LabelValueArray|array{} $postParent
-	 * @param array{string: list<LabelValueArray>}|array{} $taxonomyTerms
-	 * @param array{string: list<LabelValueArray>}|array{} $connectionPosts
+	 * @param array<string, list<LabelValueArray>>|array{} $taxonomyTerms
+	 * @param array<string, list<array{ label: string, value: int }>>|array{} $connectionPosts
 	 */
 	public function __construct(
 		public array $postTypes = [],
@@ -78,40 +79,57 @@ public function postTypes(): array
 
 	public function enableConnection(): bool
 	{
-		return $this->enableConnection;
+		return $this->enableConnection && ! empty($this->connectionPosts);
 	}
 
 	/**
-	 * @return array<string, int>}
+	 * @return list<array{
+	 *	 post_type: string,
+	 *	 meta_key: string,
+	 *	 meta_value: list<int>,
+	 *  }>
 	 */
-	public function connectedPost(): array
+	public function postConnections(): array
 	{
 		$connections = [];
 
-		foreach ($this->connectionPosts as $postType => $connection) {
-			$metaKey = $this->connectionMetaKey($postType);
+		$connectionsConfig = $this->connectionsConfig();
 
-			if (empty($metaKey)) {
+		foreach ($this->connectionPosts as $targetPostType => $connectionArray) {
+			$config = $connectionsConfig->where('to', $targetPostType);
+
+			if ($config->count() === 0) {
 				continue;
 			}
 
-			$connections[$metaKey] = (int)$connection['value'];
+			foreach ($config as $configItem) {
+				$result = [];
+				$result['post_type'] = $configItem['from'];
+				$result['meta_key'] = $configItem['meta_key'];
+				$result['meta_value'] = array_map('intval', array_column($connectionArray, 'value'));
+				$connections[] = $result;
+			}
 		}
 
 		return $connections;
 	}
 
-	private function connectionMetaKey(string $postType): string
+	/**
+	 * @return Collection<int, array{
+	 *	 from: string,
+	 *	 to: string,
+	 *	 meta_key: string,
+	 * }>
+	 */
+	private function connectionsConfig(): Collection
 	{
 		$config = config('yard-query-block.connections', []);
 
-		if (! is_array($config) || empty($config)) {
-			return '';
+		if (! is_array($config)) {
+			return collect();
 		}
 
-		$metaKey = collect($config)->firstWhere('to', $postType);
-
-		return $metaKey['meta_key'];
+		return collect($config);
 	}
 
 	/**

src/Query/PostQuery.php

@@ -69,7 +69,19 @@ public function get(): Collection
 		}
 
 		if ($this->attributes->enableConnection()) {
-			$query->hasMeta($this->attributes->connectedPost());
+			$query->where(function ($query) {
+				$connected = $this->attributes->postConnections();
+				foreach ($connected as $connection) {
+					$query->orWhere(function ($q) use ($connection) {
+						$q->where('post_type', $connection['post_type'])
+							->whereHas('meta', function ($metaQuery) use ($connection) {
+								$metaQuery
+									->where('meta_key', $connection['meta_key'])
+									->whereIn('meta_value', $connection['meta_value']);
+							});
+					});
+				}
+			});
 		}
 
 		$query = $this->order($query);

tests/Block/BlockAttributesTest.php

@@ -268,3 +268,96 @@
 	$attributes = BlockAttributes::from([]);
 	expect($attributes->align())->toBe('');
 });
+
+it('returns true for enableConnection when enabled and connectionPosts is not empty', function () {
+	$attributes = BlockAttributes::from([
+		'enableConnection' => true,
+		'connectionPosts' => ['page' => [['label' => 'My Page', 'value' => '42']]],
+	]);
+	expect($attributes->enableConnection())->toBeTrue();
+});
+
+it('returns false for enableConnection when enabled but connectionPosts is empty', function () {
+	$attributes = BlockAttributes::from([
+		'enableConnection' => true,
+		'connectionPosts' => [],
+	]);
+	expect($attributes->enableConnection())->toBeFalse();
+});
+
+it('returns false for enableConnection when disabled even if connectionPosts is not empty', function () {
+	$attributes = BlockAttributes::from([
+		'enableConnection' => false,
+		'connectionPosts' => ['page' => [['label' => 'My Page', 'value' => '42']]],
+	]);
+	expect($attributes->enableConnection())->toBeFalse();
+});
+
+it('returns an empty array for postConnections when no config is set', function () {
+	config(['yard-query-block.connections' => []]);
+	$attributes = BlockAttributes::from([
+		'enableConnection' => true,
+		'connectionPosts' => ['page' => [['label' => 'My Page', 'value' => '42']]],
+	]);
+	expect($attributes->postConnections())->toBe([]);
+});
+
+it('returns an empty array for postConnections when connectionPosts target has no matching config', function () {
+	config(['yard-query-block.connections' => [
+		['from' => 'post', 'to' => 'event', 'meta_key' => 'related_event'],
+	]]);
+	$attributes = BlockAttributes::from([
+		'enableConnection' => true,
+		'connectionPosts' => ['page' => [['label' => 'My Page', 'value' => '42']]],
+	]);
+	expect($attributes->postConnections())->toBe([]);
+});
+
+it('returns multiple connections when multiple config entries share the same to post type', function () {
+	config(['yard-query-block.connections' => [
+		['from' => 'post', 'to' => 'page', 'meta_key' => 'related_page'],
+		['from' => 'product', 'to' => 'page', 'meta_key' => 'featured_page'],
+	]]);
+	$attributes = BlockAttributes::from([
+		'enableConnection' => true,
+		'connectionPosts' => ['page' => [['label' => 'My Page', 'value' => '42']]],
+	]);
+	expect($attributes->postConnections())->toBe([
+		['post_type' => 'post', 'meta_key' => 'related_page', 'meta_value' => [42]],
+		['post_type' => 'product', 'meta_key' => 'featured_page', 'meta_value' => [42]],
+	]);
+});
+
+it('returns multiple connections when connectionPosts has multiple targets', function () {
+	config(['yard-query-block.connections' => [
+		['from' => 'post', 'to' => 'page', 'meta_key' => 'related_page'],
+		['from' => 'post', 'to' => 'category', 'meta_key' => 'related_category'],
+	]]);
+	$attributes = BlockAttributes::from([
+		'enableConnection' => true,
+		'connectionPosts' => [
+			'page' => [['label' => 'My Page', 'value' => '42']],
+			'category' => [['label' => 'My Category', 'value' => '10']],
+		],
+	]);
+	expect($attributes->postConnections())->toBe([
+		['post_type' => 'post', 'meta_key' => 'related_page', 'meta_value' => [42]],
+		['post_type' => 'post', 'meta_key' => 'related_category', 'meta_value' => [10]],
+	]);
+});
+
+it('skips connectionPosts entries with no matching config and returns only matched ones', function () {
+	config(['yard-query-block.connections' => [
+		['from' => 'post', 'to' => 'page', 'meta_key' => 'related_page'],
+	]]);
+	$attributes = BlockAttributes::from([
+		'enableConnection' => true,
+		'connectionPosts' => [
+			'page' => [['label' => 'My Page', 'value' => '42']],
+			'event' => [['label' => 'My Event', 'value' => '99']],
+		],
+	]);
+	expect($attributes->postConnections())->toBe([
+		['post_type' => 'post', 'meta_key' => 'related_page', 'meta_value' => [42]],
+	]);
+});