Forms: Enable Central Forms Management by default for all sites (#47826)

* Forms: Enable Central Forms Management by default for all sites

Flip the jetpack_forms_alpha filter default from false to true and
add the central-form-management editor feature flag from within the
Forms package. This makes CFM available to all sites including
self-hosted Jetpack installations, without requiring a feature flag.

The wpcom flags file is updated to explicitly disable CFM for
excluded sites (e2e test, disable sticker) rather than enabling
for included ones, preserving the opt-out mechanism.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Fix forms e2e test: use explicit inner blocks to avoid synced form creation

With CFM enabled by default, clicking the variation picker creates a
synced form whose title comes from the variation (not the block's
formTitle attribute). The test then fails looking for a form with the
original title.

Provide explicit innerBlocks when inserting the form block, matching
the pattern already used by the second test. This keeps the form
inline and preserves the formTitle attribute.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Add changelog for Jetpack plugin e2e test update

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Lets not introduce a new public method to enable the 'enable_central_form_management_flag' flag.

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Enej Bajgoric <enej.bajgoric@automattic.com>

Author: 3 people

projects/packages/forms/changelog/update-forms-cfm-enable-default

@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Enable Central Forms Management (wp-build dashboard and synced forms) by default for all sites, including self-hosted Jetpack installations.

projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php

@@ -102,6 +102,10 @@ public static function register_feature( $features ) {
 		$features['multistep-form'] = Current_Plan::supports( 'multistep-form' );
 		$features['form-webhooks']  = Current_Plan::supports( 'form-webhooks' );
 
+		if ( ! isset( $features['central-form-management'] ) ) {
+			$features['central-form-management'] = true;
+		}
+
 		return $features;
 	}
 

projects/packages/forms/src/contact-form/class-contact-form-plugin.php

@@ -413,7 +413,6 @@ public static function has_editor_feature_flag( $flag ) {
 		$feature_flags = apply_filters( 'jetpack_block_editor_feature_flags', array() );
 		return ! empty( $feature_flags[ $flag ] );
 	}
-
 	/**
 	 * Remove feedback post type from the allowed post types for related posts.
 	 *
@@ -1566,7 +1565,8 @@ public function unread_count() {
 
 				// Jetpack submenu entries
 				foreach ( $submenu['jetpack'] as $index => $menu_item ) {
-					$admin_slug = apply_filters( 'jetpack_forms_alpha', false ) ? Dashboard::FORMS_WPBUILD_ADMIN_SLUG : Dashboard::ADMIN_SLUG;
+					/** This filter is documented in class-dashboard.php::init */
+					$admin_slug = apply_filters( 'jetpack_forms_alpha', true ) ? Dashboard::FORMS_WPBUILD_ADMIN_SLUG : Dashboard::ADMIN_SLUG;
 					if ( $admin_slug === $menu_item[2] ) {
 						// phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 						$submenu['jetpack'][ $index ][0] .= $forms_unread_count_tag;

projects/packages/forms/src/dashboard/class-dashboard.php

@@ -170,8 +170,17 @@ public function init() {
 		add_action( 'admin_menu', array( $this, 'add_admin_submenu' ), self::MENU_PRIORITY );
 		add_action( 'admin_menu', array( __CLASS__, 'redirect_dashboard_url_cross_variant' ), 1 );
 
-		// Flag to enable the wp-build-based dashboard.
-		$is_wp_build_enabled = apply_filters( 'jetpack_forms_alpha', false );
+		/**
+		 * Filter to enable or disable the wp-build-based Forms dashboard.
+		 *
+		 * Enabled by default since Central Forms Management is now available for all sites.
+		 * Can be disabled by returning false from this filter.
+		 *
+		 * @since $$next-version$$
+		 *
+		 * @param bool $enabled Whether the wp-build dashboard is enabled. Default true.
+		 */
+		$is_wp_build_enabled = apply_filters( 'jetpack_forms_alpha', true );
 
 		if ( $is_wp_build_enabled ) {
 			self::load_wp_build();
@@ -200,7 +209,8 @@ public static function redirect_dashboard_url_cross_variant() {
 			return;
 		}
 
-		$is_wp_build_enabled = apply_filters( 'jetpack_forms_alpha', false );
+		/** This filter is documented in class-dashboard.php::init */
+		$is_wp_build_enabled = apply_filters( 'jetpack_forms_alpha', true );
 
 		// Legacy URL requested but wp-build is now active → redirect to wp-build.
 		if ( $page === self::ADMIN_SLUG && $is_wp_build_enabled ) {
@@ -368,7 +378,8 @@ public function load_admin_scripts() {
 	 */
 	public function add_admin_submenu() {
 
-		if ( apply_filters( 'jetpack_forms_alpha', false ) ) {
+		/** This filter is documented in class-dashboard.php::init */
+		if ( apply_filters( 'jetpack_forms_alpha', true ) ) {
 
 			// `jetpack_forms_jetpack_forms_responses_wp_admin_render_page` is the callback generated by WP build script.
 			$callback = function_exists( 'jetpack_forms_jetpack_forms_responses_wp_admin_render_page' )
@@ -553,7 +564,8 @@ public static function mark_classic_form_detected() {
 	 * @return string
 	 */
 	public static function get_forms_admin_url( $tab = null, $post_id = null ) {
-		$is_wp_build_enabled = apply_filters( 'jetpack_forms_alpha', false );
+		/** This filter is documented in class-dashboard.php::init */
+		$is_wp_build_enabled = apply_filters( 'jetpack_forms_alpha', true );
 		$url                 = admin_url( 'admin.php' );
 
 		$url .= $is_wp_build_enabled

projects/packages/forms/tests/php/dashboard/Dashboard_Test.php

@@ -29,17 +29,21 @@ public function tear_down() {
 	}
 
 	/**
-	 * Test get_forms_admin_url without tab parameter
+	 * Test get_forms_admin_url without tab parameter (legacy dashboard)
 	 */
 	public function test_get_forms_admin_url_without_tab() {
+		add_filter( 'jetpack_forms_alpha', '__return_false' );
 		$expected = get_admin_url() . 'admin.php?page=jetpack-forms-admin';
 		$this->assertEquals( $expected, Dashboard::get_forms_admin_url() );
+		remove_filter( 'jetpack_forms_alpha', '__return_false' );
 	}
 
 	/**
-	 * Test get_forms_admin_url with valid tab parameter
+	 * Test get_forms_admin_url with valid tab parameter (legacy dashboard)
 	 */
 	public function test_get_forms_admin_url_with_valid_tab() {
+		add_filter( 'jetpack_forms_alpha', '__return_false' );
+
 		$expected = get_admin_url() . 'admin.php?page=jetpack-forms-admin#/responses?status=inbox';
 		$this->assertEquals( $expected, Dashboard::get_forms_admin_url( 'inbox' ) );
 
@@ -48,29 +52,37 @@ public function test_get_forms_admin_url_with_valid_tab() {
 
 		$expected = get_admin_url() . 'admin.php?page=jetpack-forms-admin#/responses?status=trash';
 		$this->assertEquals( $expected, Dashboard::get_forms_admin_url( 'trash' ) );
+
+		remove_filter( 'jetpack_forms_alpha', '__return_false' );
 	}
 
 	/**
-	 * Test get_forms_admin_url with invalid tab parameter
+	 * Test get_forms_admin_url with invalid tab parameter (legacy dashboard)
 	 */
 	public function test_get_forms_admin_url_with_invalid_tab() {
+		add_filter( 'jetpack_forms_alpha', '__return_false' );
 		$expected = get_admin_url() . 'admin.php?page=jetpack-forms-admin';
 		$this->assertEquals( $expected, Dashboard::get_forms_admin_url( 'invalid' ) );
+		remove_filter( 'jetpack_forms_alpha', '__return_false' );
 	}
 
 	/**
-	 * Test get_forms_admin_url with forms tab parameter
+	 * Test get_forms_admin_url with forms tab parameter (legacy dashboard)
 	 */
 	public function test_get_forms_admin_url_with_forms_tab() {
+		add_filter( 'jetpack_forms_alpha', '__return_false' );
 		$expected = get_admin_url() . 'admin.php?page=jetpack-forms-admin#/forms';
 		$this->assertEquals( $expected, Dashboard::get_forms_admin_url( 'forms' ) );
+		remove_filter( 'jetpack_forms_alpha', '__return_false' );
 	}
 
 	/**
 	 * Test get_forms_admin_url with post_id parameter (legacy mode).
 	 * Verifies the r parameter is correctly appended in the hash fragment.
 	 */
 	public function test_get_forms_admin_url_with_post_id_legacy() {
+		add_filter( 'jetpack_forms_alpha', '__return_false' );
+
 		// Tab + post_id: appends r and status in hash fragment (client-side handles redirect).
 		$expected = get_admin_url() . 'admin.php?page=jetpack-forms-admin#/responses?status=inbox&r=123';
 		$this->assertEquals( $expected, Dashboard::get_forms_admin_url( 'inbox', 123 ) );
@@ -81,6 +93,8 @@ public function test_get_forms_admin_url_with_post_id_legacy() {
 		// post_id only (no tab): appends r and status=inbox in hash fragment.
 		$expected = get_admin_url() . 'admin.php?page=jetpack-forms-admin#/responses?status=inbox&r=789';
 		$this->assertEquals( $expected, Dashboard::get_forms_admin_url( null, 789 ) );
+
+		remove_filter( 'jetpack_forms_alpha', '__return_false' );
 	}
 
 	/**
@@ -242,9 +256,11 @@ public function test_is_notes_enabled_with_filter() {
 	}
 
 	/**
-	 * Test get_forms_admin_url with screen ID equivalents (edit-jetpack_form -> forms, edit-feedback -> base/inbox).
+	 * Test get_forms_admin_url with screen ID equivalents (legacy dashboard).
 	 */
 	public function test_get_forms_admin_url_with_screen_id_equivalents() {
+		add_filter( 'jetpack_forms_alpha', '__return_false' );
+
 		$url_form = Dashboard::get_forms_admin_url( 'forms' );
 		$this->assertStringContainsString( 'admin.php?page=' . Dashboard::ADMIN_SLUG, $url_form );
 		$this->assertStringContainsString( '#/forms', $url_form );
@@ -253,18 +269,24 @@ public function test_get_forms_admin_url_with_screen_id_equivalents() {
 		$url_feedback = Dashboard::get_forms_admin_url();
 		$expected     = get_admin_url() . 'admin.php?page=' . Dashboard::ADMIN_SLUG;
 		$this->assertEquals( $expected, $url_feedback );
+
+		remove_filter( 'jetpack_forms_alpha', '__return_false' );
 	}
 
 	/**
-	 * Test get_forms_admin_url with invalid tab returns base URL.
+	 * Test get_forms_admin_url with invalid tab returns base URL (legacy dashboard).
 	 */
 	public function test_get_forms_admin_url_with_invalid_tab_returns_base_url() {
+		add_filter( 'jetpack_forms_alpha', '__return_false' );
+
 		$url = Dashboard::get_forms_admin_url( 'invalid-screen' );
 		$this->assertStringContainsString( 'admin.php?page=' . Dashboard::ADMIN_SLUG, $url );
 		$this->assertStringNotContainsString( '#/', $url );
 
 		$url = Dashboard::get_forms_admin_url( '' );
 		$this->assertStringContainsString( 'admin.php?page=' . Dashboard::ADMIN_SLUG, $url );
+
+		remove_filter( 'jetpack_forms_alpha', '__return_false' );
 	}
 
 	/**

projects/packages/jetpack-mu-wpcom/changelog/update-forms-cfm-enable-default

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Adapt WordPress.com CFM flags to explicitly disable for excluded sites now that CFM is enabled by default in the Forms package.

projects/packages/jetpack-mu-wpcom/src/features/wpcom-contact-form-flags/wpcom-contact-form-flags.php

@@ -55,19 +55,23 @@ function wpcom_is_central_forms_management_enabled( $blog_id = null ) {
 }
 
 /**
- * Enable the Central Forms Management alpha features when the rollout
- * criteria are met. Called immediately on file load since this file is
- * required during plugins_loaded (priority 10) inside load_wpcom_sites_features(),
- * which is after the priority 1 that the wpcom mu-plugin uses.
+ * Disable Central Forms Management for excluded WordPress.com sites.
+ *
+ * CFM is now enabled by default in the Forms package. This function
+ * explicitly disables it for sites that should be excluded (e2e test
+ * sites, sites with the disable-central-forms-management sticker).
+ *
+ * Called immediately on file load since this file is required during
+ * plugins_loaded (priority 10) inside load_wpcom_sites_features().
  */
-function wpcom_maybe_enable_central_forms_management() {
-	if ( ! wpcom_is_central_forms_management_enabled() ) {
+function wpcom_maybe_disable_central_forms_management() {
+	if ( wpcom_is_central_forms_management_enabled() ) {
 		return;
 	}
 
-	add_filter( 'jetpack_forms_alpha', '__return_true', 999 );
+	add_filter( 'jetpack_forms_alpha', '__return_false', 999 );
 }
-wpcom_maybe_enable_central_forms_management();
+wpcom_maybe_disable_central_forms_management();
 
 /**
  * Set the 'central-form-management' block editor feature flag.

projects/plugins/jetpack/changelog/update-forms-cfm-enable-default

@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Update Forms e2e test to use explicit inner blocks for compatibility with Central Forms Management.

projects/plugins/jetpack/tests/e2e/specs/forms/submission.test.ts

@@ -54,9 +54,25 @@ test.describe( 'Forms: Submission', () => {
 			await editor.insertBlock( {
 				name: 'jetpack/contact-form',
 				attributes: { formTitle },
+				innerBlocks: [
+					{
+						name: 'jetpack/field-name',
+						attributes: { required: true },
+					},
+					{
+						name: 'jetpack/field-email',
+						attributes: { required: true },
+					},
+					{
+						name: 'jetpack/field-textarea',
+					},
+					{
+						name: 'jetpack/button',
+						attributes: { element: 'button', text: 'Contact Us' },
+					},
+				],
 			} );
 			const formBlock = editor.canvas.getByRole( 'document', { name: 'Block: Form' } );
-			await formBlock.getByRole( 'button', { name: 'Add a contact form to your page.' } ).click();
 
 			await expect( formBlock ).toBeVisible();
 		} );