Skip to content

Make Conditional Logic Schema rule properties required #1576

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

Merged
jakejackson1 merged 1 commit into from
Jun 5, 2026
Merged

Make Conditional Logic Schema rule properties required #1576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions src/Helper/Helper_Options_Fields.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,14 +380,17 @@ public function get_registered_fields() {
'additionalProperties' => false,
'properties' => [
'fieldId' => [
'type' => 'string',
'type' => 'string',
'required' => true,
],
'operator' => [
'type' => 'string',
'enum' => [ 'is', 'isnot', '<>', 'not in', 'in', '>', '<', 'contains', 'starts_with', 'ends_with', 'like', '>=', '<=' ],
'type' => 'string',
'enum' => [ 'is', 'isnot', '<>', 'not in', 'in', '>', '<', 'contains', 'starts_with', 'ends_with', 'like', '>=', '<=' ],
'required' => true,
],
'value' => [
'type' => 'string',
'type' => 'string',
'required' => true,
],
],
],
Expand Down
35 changes: 35 additions & 0 deletions tests/phpunit/integration/Rest/Test_Rest_Form_Settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,6 +811,12 @@ public function test_get_item_schema() {
$this->assertArrayHasKey( 'logicType', $args['conditionalLogic']['properties'] );
$this->assertArrayHasKey( 'rules', $args['conditionalLogic']['properties'] );

/* Each conditional logic rule property should be flagged as required in the schema */
$rule_properties = $args['conditionalLogic']['properties']['rules']['items']['properties'];
$this->assertTrue( $rule_properties['fieldId']['required'] );
$this->assertTrue( $rule_properties['operator']['required'] );
$this->assertTrue( $rule_properties['value']['required'] );

$this->assertContains( 'A4', $args['pdf_size']['enum'] );
$this->assertContains( 'CUSTOM', $args['pdf_size']['enum'] );

Expand Down Expand Up @@ -945,6 +951,35 @@ public function test_input_validation_update() {
$this->assertSame( 'rest_invalid_hex_color', $data['data']['details']['font_colour']['code'] );
}

/**
* Check the REST API rejects conditional logic rules that are missing a required property
*/
public function test_input_validation_conditional_logic_rule_required() {
wp_set_current_user( self::$admin_id );

$request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/' . $this->form_id );
$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );

/* The single rule omits the required "value" property */
$request->set_body_params( [
'name' => 'Label',
'template' => 'rubix',
'conditionalLogic' => [
'actionType' => 'show',
'logicType' => 'any',
'rules' => [
[ 'fieldId' => '7', 'operator' => 'is' ],
],
],
] );

$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();

$this->assertSame( 400, $response->get_status() );
$this->assertSame( 'rest_property_required', $data['data']['details']['conditionalLogic']['code'] );
}

/**
* Check the REST API auto-validates inputs on the DELETE endpoint
*/
Expand Down
Loading