Merge pull request #74 from ndiego/fix/relative-hierarcy-rule-mutli-s…

…elect

Fix multi-select bug in the Relative Hierarchy rule.

block-visibility.php

@@ -3,7 +3,7 @@
  * Plugin Name:         Block Visibility
  * Plugin URI:          https://www.blockvisibilitywp.com/
  * Description:         Provides visibility controls and scheduling functionality to all WordPress blocks.
- * Version:             3.0.3
+ * Version:             3.0.4
  * Requires at least:   6.0
  * Requires PHP:        5.6
  * Author:              Nick Diego

build/block-visibility-editor.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-a11y', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-date', 'wp-edit-post', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-primitives'), 'version' => 'cac7b5296df49b1e812c');
+<?php return array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-a11y', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-date', 'wp-edit-post', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-primitives'), 'version' => '98babb0bfe71941655a4');

includes/frontend/visibility-tests/location.php

@@ -644,7 +644,8 @@ function run_location_relative_hierarchy_test( $rule ) {
 	// Assume error and try to disprove.
 	$test_result = 'error';
 
-	$relative_id = $rule['value'];
+	// Account for a bug in v3 that allowed multiple values to be stored.
+	$relative_id = is_array( $rule['value'] ) ? $rule['value'][0] : $rule['value'];
 	$hierarchy   = $rule['operator'];
 
 	$post_id     = get_the_ID();

languages/block-visibility.pot

@@ -2,14 +2,14 @@
 # This file is distributed under the GPLv2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Block Visibility 3.0.3\n"
+"Project-Id-Version: Block Visibility 3.0.4\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/block-visibility\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2023-06-04T16:39:57+00:00\n"
+"POT-Creation-Date: 2023-07-14T11:42:12+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.7.1\n"
 "X-Domain: block-visibility\n"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "block-visibility",
-	"version": "3.0.3",
+	"version": "3.0.4",
 	"description": "Provides visibility controls and scheduling functionality to all WordPress blocks.",
 	"author": "Nick Diego",
 	"license": "GPL-2.0-or-later",

readme.txt

@@ -189,6 +189,12 @@ The **one exception** to this is the Screen Size block controls. Visibility by s
 
 == Changelog ===
 
+= 3.0.4 - 2023-07-14 =
+
+**Fixed**
+
+* [Location] Fixed bug that prevented the Relative Hierarchy rule from working. The value field was set to multi-select when it should be a single selection.
+
 = 3.0.3 - 2023-06-04 =
 
 **Changed**

src/components/rule-sets/async-rule-fields/posts-select.js

@@ -55,6 +55,8 @@ export default function PostsSelect( props ) {
 		postType,
 		triggerReset,
 		value,
+		valueType,
+		isMulti,
 	} = props;
 	const [ selectedValues, setSelectedValues ] = useState( false );
 	const [ searchValue, setSearchValue ] = useState( false );
@@ -106,7 +108,7 @@ export default function PostsSelect( props ) {
 		// selected values. Otherwise return an empty array.
 		if ( value.length !== 0 && ! selectedValues ) {
 			const selectedQuery = {
-				include: value.join( ',' ),
+				include: Array.isArray( value ) ? value.join( ',' ) : value,
 				per_page: -1,
 				status: 'publish,draft,private,pending',
 				_fields: 'id,title,status',
@@ -158,10 +160,14 @@ export default function PostsSelect( props ) {
 	}
 
 	const handleChange = ( values ) => {
+		// Need for value handling.
+		const valueHandling =
+			valueType === 'postSelect' ? 'select' : 'multiSelect';
+
 		setSelectedValues( values );
 		handleRuleChange(
 			values,
-			'multiSelect', // Need for value handling.
+			valueHandling,
 			fieldType,
 			fieldName,
 			triggerReset
@@ -205,7 +211,7 @@ export default function PostsSelect( props ) {
 			noOptionsMessage={ noOptionsMessage }
 			placeholder={ placeholder }
 			isLoading={ loadingAvailablePosts || loadingSavedPosts }
-			isMulti
+			isMulti={ isMulti }
 		/>
 	);
 }

src/components/rule-sets/rule-field.js

@@ -192,7 +192,7 @@ export default function RuleField( props ) {
 				{ ...props }
 			/>
 		);
-	} else if ( valueType === 'postsSelect' ) {
+	} else if ( valueType === 'postsSelect' || valueType === 'postSelect' ) {
 		let postType;
 
 		// A defined variant will take precedent.
@@ -208,6 +208,8 @@ export default function RuleField( props ) {
 				postType={ postType }
 				className={ className }
 				value={ value }
+				valueType={ valueType }
+				isMulti={ valueType === 'postsSelect' }
 				{ ...props }
 			/>
 		);

src/controls/location/fields.js

@@ -582,7 +582,7 @@ export function GetAllFields() {
 							dependencyType: 'subField',
 							dependencyValues: postTypesHierarchicalList,
 							valueTypes: [
-								{ value: 'default', valueType: 'postsSelect' },
+								{ value: 'default', valueType: 'postSelect' },
 							],
 						},
 					],