From f88de97352a9c80816d5e6a6c527022864f2def2 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Fri, 24 Apr 2026 17:13:45 +0800
Subject: [PATCH 1/3] Refresh Resource: Member Content: Include Forms

---
 ...ass-convertkit-admin-refresh-resources.php | 10 +++++++++
 resources/backend/js/refresh-resources.js     | 21 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/admin/class-convertkit-admin-refresh-resources.php b/admin/class-convertkit-admin-refresh-resources.php
index 9c9418a8d..9cae3a61f 100644
--- a/admin/class-convertkit-admin-refresh-resources.php
+++ b/admin/class-convertkit-admin-refresh-resources.php
@@ -105,6 +105,15 @@ public function refresh_resources( $request ) {
 				break;
 
 			case 'restrict_content':
+				// Fetch Forms.
+				$forms         = new ConvertKit_Resource_Forms( 'user_refresh_resource' );
+				$results_forms = $forms->refresh();
+
+				// Bail if an error occured.
+				if ( is_wp_error( $results_forms ) ) {
+					return rest_ensure_response( $results_forms );
+				}
+
 				// Fetch Tags.
 				$tags         = new ConvertKit_Resource_Tags( 'user_refresh_resource' );
 				$results_tags = $tags->refresh();
@@ -126,6 +135,7 @@ public function refresh_resources( $request ) {
 				// Return resources.
 				return rest_ensure_response(
 					array(
+						'forms'    => array_values( $results_forms ),
 						'tags'     => array_values( $results_tags ),
 						'products' => array_values( $results_products ),
 					)
diff --git a/resources/backend/js/refresh-resources.js b/resources/backend/js/refresh-resources.js
index fca71e8d4..0d457bdd1 100644
--- a/resources/backend/js/refresh-resources.js
+++ b/resources/backend/js/refresh-resources.js
@@ -96,7 +96,26 @@ function convertKitRefreshResources(button) {
 			// Depending on the resource we're refreshing, populate the <select> options.
 			switch (resource) {
 				case 'restrict_content':
-					// Populate select `optgroup`` from response data, which comprises of Tags and Products.
+					// Populate select `optgroup` from response data, which comprises of Forms, Tags and Products.
+					// Forms.
+					response.forms.forEach(function (item) {
+						document
+							.querySelector(
+								field + ' optgroup[data-resource=forms]'
+							)
+							.appendChild(
+								new Option(
+									item.name +
+										' [' +
+										(item.format ? item.format : 'inline') +
+										']',
+									'form_' + item.id,
+									false,
+									selectedOption === 'form_' + item.id
+								)
+							);
+					});
+
 					// Tags.
 					response.tags.forEach(function (item) {
 						document

From 56b27b69c0efe6f89e94ce8e0bc8613ae59bdf0f Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Fri, 24 Apr 2026 17:13:52 +0800
Subject: [PATCH 2/3] Updated Tests to check Forms are included

---
 .../general/other/RefreshResourcesButtonCest.php     | 12 ++++++++++++
 tests/Integration/RESTAPITest.php                    |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/tests/EndToEnd/general/other/RefreshResourcesButtonCest.php b/tests/EndToEnd/general/other/RefreshResourcesButtonCest.php
index 3aaa2274a..c548eea21 100644
--- a/tests/EndToEnd/general/other/RefreshResourcesButtonCest.php
+++ b/tests/EndToEnd/general/other/RefreshResourcesButtonCest.php
@@ -122,6 +122,14 @@ public function testRefreshResourcesInClassicEditor(EndToEndTester $I)
 		// Wait for button to change its state from disabled.
 		$I->waitForElementVisible('button.wp-convertkit-refresh-resources[data-resource="restrict_content"]:not(:disabled)');
 
+		// Confirm that the expected Form is within the Forms option group and selectable.
+		$I->seeElementInDOM('select#wp-convertkit-restrict_content optgroup[data-resource="forms"] option[value="form_' . $_ENV['CONVERTKIT_API_FORM_ID'] . '"]');
+		$I->fillSelect2Field(
+			$I,
+			container: '#select2-wp-convertkit-restrict_content-container',
+			value: $_ENV['CONVERTKIT_API_FORM_NAME']
+		);
+
 		// Confirm that the expected Tag is within the Tags option group and selectable.
 		$I->seeElementInDOM('select#wp-convertkit-restrict_content optgroup[data-resource="tags"] option[value="tag_' . $_ENV['CONVERTKIT_API_TAG_ID'] . '"]');
 		$I->fillSelect2Field(
@@ -196,6 +204,10 @@ public function testRefreshResourcesInGutenbergEditor(EndToEndTester $I)
 		// Wait for button to change its state from disabled.
 		$I->waitForElementVisible('button.wp-convertkit-refresh-resources[data-resource="restrict_content"]:not(:disabled)');
 
+		// Confirm that the expected Form is within the Forms option group and selectable.
+		$I->seeElementInDOM('#convertkit_plugin_sidebar_restrict_content optgroup[label="Forms"] option[value="form_' . $_ENV['CONVERTKIT_API_FORM_ID'] . '"]');
+		$I->selectOption('#convertkit_plugin_sidebar_restrict_content', $_ENV['CONVERTKIT_API_FORM_NAME']);
+
 		// Confirm that the expected Tag is within the Tags option group and selectable.
 		$I->seeElementInDOM('#convertkit_plugin_sidebar_restrict_content optgroup[label="Tags"] option[value="tag_' . $_ENV['CONVERTKIT_API_TAG_ID'] . '"]');
 		$I->selectOption('#convertkit_plugin_sidebar_restrict_content', $_ENV['CONVERTKIT_API_TAG_NAME']);
diff --git a/tests/Integration/RESTAPITest.php b/tests/Integration/RESTAPITest.php
index ff085d920..22388667d 100644
--- a/tests/Integration/RESTAPITest.php
+++ b/tests/Integration/RESTAPITest.php
@@ -295,6 +295,11 @@ public function testRefreshResourcesRestrictContent()
 		$data = $response->get_data();
 		$this->assertIsArray( $data );
 
+		// Assert forms response data has the expected keys.
+		$this->assertArrayHasKey( 'forms', $data );
+		$this->assertIsArray( $data['forms'] );
+		$this->assertArrayHasKeys( $data['forms'][0], [ 'id', 'name', 'created_at' ] );
+
 		// Assert tags response data has the expected keys.
 		$this->assertArrayHasKey( 'tags', $data );
 		$this->assertIsArray( $data['tags'] );

From 7b3e17411e077cef67feecf8678f72add67132df Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Fri, 24 Apr 2026 17:16:06 +0800
Subject: [PATCH 3/3] Tests: Assert Form exists in Member Content across Bulk +
 Quick Edit

---
 .../EndToEnd/general/other/RefreshResourcesButtonCest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/EndToEnd/general/other/RefreshResourcesButtonCest.php b/tests/EndToEnd/general/other/RefreshResourcesButtonCest.php
index c548eea21..64b25a51c 100644
--- a/tests/EndToEnd/general/other/RefreshResourcesButtonCest.php
+++ b/tests/EndToEnd/general/other/RefreshResourcesButtonCest.php
@@ -288,6 +288,10 @@ public function testRefreshResourcesOnQuickEdit(EndToEndTester $I)
 		// Wait for button to change its state from disabled.
 		$I->waitForElementVisible('button.wp-convertkit-refresh-resources[data-resource="restrict_content"]:not(:disabled)');
 
+		// Confirm that the expected Form is within the Forms option group and selectable.
+		$I->seeElementInDOM('#wp-convertkit-quick-edit-restrict_content optgroup[data-resource="forms"] option[value="form_' . $_ENV['CONVERTKIT_API_FORM_ID'] . '"]');
+		$I->selectOption('#wp-convertkit-quick-edit-restrict_content', $_ENV['CONVERTKIT_API_FORM_NAME']);
+
 		// Confirm that the expected Tag is within the Tags option group and selectable.
 		$I->seeElementInDOM('#wp-convertkit-quick-edit-restrict_content optgroup[data-resource="tags"] option[value="tag_' . $_ENV['CONVERTKIT_API_TAG_ID'] . '"]');
 		$I->selectOption('#wp-convertkit-quick-edit-restrict_content', $_ENV['CONVERTKIT_API_TAG_NAME']);
@@ -375,6 +379,10 @@ public function testRefreshResourcesOnBulkEdit(EndToEndTester $I)
 		// Wait for button to change its state from disabled.
 		$I->waitForElementVisible('button.wp-convertkit-refresh-resources[data-resource="restrict_content"]:not(:disabled)');
 
+		// Confirm that the expected Form is within the Forms option group and selectable.
+		$I->seeElementInDOM('#wp-convertkit-bulk-edit-restrict_content optgroup[data-resource="forms"] option[value="form_' . $_ENV['CONVERTKIT_API_FORM_ID'] . '"]');
+		$I->selectOption('#wp-convertkit-bulk-edit-restrict_content', $_ENV['CONVERTKIT_API_FORM_NAME']);
+
 		// Confirm that the expected Tag is within the Tags option group and selectable.
 		$I->seeElementInDOM('#wp-convertkit-bulk-edit-restrict_content optgroup[data-resource="tags"] option[value="tag_' . $_ENV['CONVERTKIT_API_TAG_ID'] . '"]');
 		$I->selectOption('#wp-convertkit-bulk-edit-restrict_content', $_ENV['CONVERTKIT_API_TAG_NAME']);