Utilize the Admin UI package for handling the Akismet menu (#32911)

Automattic · Sep 7, 2023 · ab2467a · ab2467a
1 parent c0d4059
commit ab2467a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/projects/plugins/jetpack/changelog/update-dedupe-antispam b/projects/plugins/jetpack/changelog/update-dedupe-antispam
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Utilize the Jetpack Admin UI package for handling the Akismet menu
diff --git a/projects/plugins/jetpack/class.jetpack-admin.php b/projects/plugins/jetpack/class.jetpack-admin.php
@@ -5,6 +5,7 @@
  * @package automattic/jetpack
  */
 
+use Automattic\Jetpack\Admin_UI\Admin_Menu;
 use Automattic\Jetpack\Current_Plan as Jetpack_Plan;
 use Automattic\Jetpack\Partner_Coupon as Jetpack_Partner_Coupon;
 use Automattic\Jetpack\Status;
@@ -91,13 +92,8 @@ function () {
 					4
 				);
 
-				// Add an Anti-spam menu item for Jetpack.
-				add_action(
-					'jetpack_admin_menu',
-					function () {
-						add_submenu_page( 'jetpack', __( 'Anti-Spam', 'jetpack' ), __( 'Anti-Spam', 'jetpack' ), 'manage_options', 'akismet-key-config', array( 'Akismet_Admin', 'display_page' ) );
-					}
-				);
+				// Add an Anti-spam menu item for Jetpack. This is handled automatically by the Admin_Menu as long as it has been initialized.
+				Admin_Menu::init();
 				add_action( 'admin_enqueue_scripts', array( $this, 'akismet_logo_replacement_styles' ) );
 			}
 		}

diff --git a/projects/plugins/jetpack/composer.json b/projects/plugins/jetpack/composer.json
@@ -14,6 +14,7 @@
 		"automattic/jetpack-a8c-mc-stats": "@dev",
 		"automattic/jetpack-abtest": "@dev",
 		"automattic/jetpack-action-bar": "@dev",
+		"automattic/jetpack-admin-ui": "@dev",
 		"automattic/jetpack-assets": "@dev",
 		"automattic/jetpack-autoloader": "@dev",
 		"automattic/jetpack-backup": "@dev",

diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock