diff --git a/projects/packages/jetpack-mu-wpcom/changelog/agents-manager-ciab-wp-admin-variant b/projects/packages/jetpack-mu-wpcom/changelog/agents-manager-ciab-wp-admin-variant new file mode 100644 index 00000000000..64a8e51d529 --- /dev/null +++ b/projects/packages/jetpack-mu-wpcom/changelog/agents-manager-ciab-wp-admin-variant @@ -0,0 +1,4 @@ +Significance: patch +Type: fixed + +Agents Manager: Return wp-admin variant for connected CIAB environments instead of not loading. diff --git a/projects/packages/jetpack-mu-wpcom/src/features/agents-manager/class-agents-manager.php b/projects/packages/jetpack-mu-wpcom/src/features/agents-manager/class-agents-manager.php index da079b10a22..10777b0f532 100644 --- a/projects/packages/jetpack-mu-wpcom/src/features/agents-manager/class-agents-manager.php +++ b/projects/packages/jetpack-mu-wpcom/src/features/agents-manager/class-agents-manager.php @@ -271,12 +271,12 @@ function ( $wp_admin_bar ) use ( $use_disconnected ) { * @return string|null The variant name, or null if scripts should not be loaded. */ private function get_variant() { - // CIAB/Next Admin: only load when disconnected (connected CIAB is handled by Help Center). + // CIAB/Next Admin: use ciab-disconnected when disconnected, wp-admin when connected. if ( $this->is_ciab_environment() ) { - if ( $this->is_enabled() && $this->is_jetpack_disconnected() ) { - return 'ciab-disconnected'; + if ( ! $this->is_enabled() ) { + return null; } - return null; + return $this->is_jetpack_disconnected() ? 'ciab-disconnected' : 'wp-admin'; } // Frontend: load disconnected variant for eligible logged-in editors. diff --git a/projects/packages/jetpack-mu-wpcom/tests/php/features/agents-manager/Agents_Manager_Test.php b/projects/packages/jetpack-mu-wpcom/tests/php/features/agents-manager/Agents_Manager_Test.php index b7920ed435f..006dedb2884 100644 --- a/projects/packages/jetpack-mu-wpcom/tests/php/features/agents-manager/Agents_Manager_Test.php +++ b/projects/packages/jetpack-mu-wpcom/tests/php/features/agents-manager/Agents_Manager_Test.php @@ -1952,11 +1952,11 @@ public function test_scripts_not_enqueued_on_p2_frontend() { } /** - * Tests that should_enqueue_script returns false in CIAB environment when Jetpack is connected. + * Tests that get_variant returns wp-admin in CIAB environment when Jetpack is connected. * - * Connected CIAB is handled by Help Center; Agents Manager should not load. + * Since there is no dedicated ciab variant, connected CIAB should use wp-admin. */ - public function test_should_enqueue_script_returns_false_in_ciab_when_connected() { + public function test_get_variant_returns_wp_admin_in_ciab_when_connected() { $this->set_admin_context(); // Save and simulate CIAB environment. @@ -1968,7 +1968,7 @@ public function test_should_enqueue_script_returns_false_in_ciab_when_connected( // is_jetpack_disconnected() returns false for non-Jetpack sites. add_filter( 'agents_manager_use_unified_experience', '__return_true', 20 ); - $result = $this->call_should_enqueue_script(); + $result = $this->call_get_variant(); remove_filter( 'agents_manager_use_unified_experience', '__return_true', 20 ); @@ -1979,7 +1979,7 @@ public function test_should_enqueue_script_returns_false_in_ciab_when_connected( $wp_actions['next_admin_init'] = $original_action_count; } - $this->assertFalse( $result ); + $this->assertSame( 'wp-admin', $result ); } /**