feat: support multiple connections of the same relation

Author: SimonvanWijhe

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

@@ -98,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 ] }
 		/>

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' => '88fe6e6ce5e533574a56');
+<?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' => '26d0e0eb85cb3ef18e38');

public/index.js

@@ -25,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, 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 = [],
@@ -86,7 +86,7 @@ public function enableConnection(): bool
 	 * @return list<array{
 	 *	 post_type: string,
 	 *	 meta_key: string,
-	 *	 meta_value: int,
+	 *	 meta_value: list<int>,
 	 *  }>
 	 */
 	public function postConnections(): array
@@ -95,7 +95,7 @@ public function postConnections(): array
 
 		$connectionsConfig = $this->connectionsConfig();
 
-		foreach ($this->connectionPosts as $targetPostType => $connection) {
+		foreach ($this->connectionPosts as $targetPostType => $connectionArray) {
 			$config = $connectionsConfig->where('to', $targetPostType);
 
 			if ($config->count() === 0) {
@@ -106,7 +106,7 @@ public function postConnections(): array
 				$result = [];
 				$result['post_type'] = $configItem['from'];
 				$result['meta_key'] = $configItem['meta_key'];
-				$result['meta_value'] = (int)$connection['value'];
+				$result['meta_value'] = array_map('intval', array_column($connectionArray, 'value'));
 				$connections[] = $result;
 			}
 		}

src/Block/BlockAttributes.php

@@ -76,7 +76,7 @@ public function get(): Collection
 						->whereHas('meta', function ($metaQuery) use ($connection) {
 							$metaQuery
 								->where('meta_key', $connection['meta_key'])
-								->where('meta_value', $connection['meta_value']);
+								->whereIn('meta_value', $connection['meta_value']);
 						});
 				}
 			});

src/Query/PostQuery.php

@@ -272,7 +272,7 @@
 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']],
+		'connectionPosts' => ['page' => [['label' => 'My Page', 'value' => '42']]],
 	]);
 	expect($attributes->enableConnection())->toBeTrue();
 });
@@ -288,7 +288,7 @@
 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']],
+		'connectionPosts' => ['page' => [['label' => 'My Page', 'value' => '42']]],
 	]);
 	expect($attributes->enableConnection())->toBeFalse();
 });
@@ -297,7 +297,7 @@
 	config(['yard-query-block.connections' => []]);
 	$attributes = BlockAttributes::from([
 		'enableConnection' => true,
-		'connectionPosts' => ['page' => ['label' => 'My Page', 'value' => '42']],
+		'connectionPosts' => ['page' => [['label' => 'My Page', 'value' => '42']]],
 	]);
 	expect($attributes->postConnections())->toBe([]);
 });
@@ -308,7 +308,7 @@
 	]]);
 	$attributes = BlockAttributes::from([
 		'enableConnection' => true,
-		'connectionPosts' => ['page' => ['label' => 'My Page', 'value' => '42']],
+		'connectionPosts' => ['page' => [['label' => 'My Page', 'value' => '42']]],
 	]);
 	expect($attributes->postConnections())->toBe([]);
 });
@@ -320,11 +320,11 @@
 	]]);
 	$attributes = BlockAttributes::from([
 		'enableConnection' => true,
-		'connectionPosts' => ['page' => ['label' => 'My Page', 'value' => '42']],
+		'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],
+		['post_type' => 'post', 'meta_key' => 'related_page', 'meta_value' => [42]],
+		['post_type' => 'product', 'meta_key' => 'featured_page', 'meta_value' => [42]],
 	]);
 });
 
@@ -336,13 +336,13 @@
 	$attributes = BlockAttributes::from([
 		'enableConnection' => true,
 		'connectionPosts' => [
-			'page' => ['label' => 'My Page', 'value' => '42'],
-			'category' => ['label' => 'My Category', 'value' => '10'],
+			'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],
+		['post_type' => 'post', 'meta_key' => 'related_page', 'meta_value' => [42]],
+		['post_type' => 'post', 'meta_key' => 'related_category', 'meta_value' => [10]],
 	]);
 });
 
@@ -353,11 +353,11 @@
 	$attributes = BlockAttributes::from([
 		'enableConnection' => true,
 		'connectionPosts' => [
-			'page' => ['label' => 'My Page', 'value' => '42'],
-			'event' => ['label' => 'My Event', 'value' => '99'],
+			'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],
+		['post_type' => 'post', 'meta_key' => 'related_page', 'meta_value' => [42]],
 	]);
 });