rearrange menu items under GraphQL

Author: ahuseyn

plugins/wpgraphql-logging/src/Admin/Settings/Menu/MenuPage.php

@@ -4,6 +4,8 @@
 
 namespace WPGraphQL\Logging\Admin\Settings\Menu;
 
+use WPGraphQL\Logging\Admin\ViewLogsPage;
+
 /**
  * Menu class for WordPress admin settings page.
  *
@@ -78,7 +80,7 @@ public function __construct(
 	 */
 	public function register_page(): void {
 		add_submenu_page(
-			'options-general.php',
+			ViewLogsPage::ADMIN_PAGE_SLUG,
 			$this->page_title,
 			$this->menu_title,
 			'manage_options',

plugins/wpgraphql-logging/src/Admin/Settings/Templates/admin.php

@@ -22,6 +22,7 @@
 
 <div class="wrap">
 	<h1><?php esc_html_e( 'WPGraphQL Logging Settings', 'wpgraphql-logging' ); ?></h1>
+	<?php settings_errors(); ?>
 	<form method="post" action="options.php">
 		<nav class="nav-tab-wrapper">
 			<?php

plugins/wpgraphql-logging/src/Admin/SettingsPage.php

@@ -68,7 +68,7 @@ public static function init(): ?SettingsPage {
 	 */
 	public function setup(): void {
 		add_action( 'init', [ $this, 'init_field_collection' ], 10, 0 );
-		add_action( 'admin_menu', [ $this, 'register_settings_page' ], 10, 0 );
+		add_action( 'admin_menu', [ $this, 'register_settings_page' ], 11, 0 );
 		add_action( 'admin_init', [ $this, 'register_settings_fields' ], 10, 0 );
 		add_action( 'admin_enqueue_scripts', [ $this, 'load_scripts_styles' ], 10, 1 );
 	}
@@ -109,7 +109,7 @@ public function register_settings_page(): void {
 
 		$page = new MenuPage(
 			__( 'WPGraphQL Logging Settings', 'wpgraphql-logging' ),
-			__( 'WPGraphQL Logging', 'wpgraphql-logging' ),
+			__( 'Settings', 'wpgraphql-logging' ),
 			self::PLUGIN_MENU_SLUG,
 			$this->get_admin_template(),
 			[

plugins/wpgraphql-logging/src/Admin/ViewLogsPage.php

@@ -82,15 +82,24 @@ public function setup(): void {
 	 */
 	public function register_settings_page(): void {
 
-		// Add submenu under GraphQL menu using the correct parent slug.
+		// Add top-level menu page.
 		$this->page_hook = add_menu_page(
 			esc_html__( 'GraphQL Logs', 'wpgraphql-logging' ),
 			esc_html__( 'GraphQL Logs', 'wpgraphql-logging' ),
 			'manage_options',
 			self::ADMIN_PAGE_SLUG,
 			[ $this, 'render_admin_page' ],
 			'dashicons-chart-line',
-			25
+		);
+
+		// Add "View All Logs" as the first submenu item (replaces the duplicate top-level menu item).
+		add_submenu_page(
+			self::ADMIN_PAGE_SLUG,
+			esc_html__( 'All Logs', 'wpgraphql-logging' ),
+			esc_html__( 'All Logs', 'wpgraphql-logging' ),
+			'manage_options',
+			self::ADMIN_PAGE_SLUG,
+			[ $this, 'render_admin_page' ]
 		);
 
 		// Updates the list table when filters are applied.

plugins/wpgraphql-logging/tests/e2e/plugins/reset-wpgraphql-logging-settings/reset-wpgraphql-logging-settings.php

@@ -5,7 +5,7 @@
  */
 
 add_action('init', function () {
-  if ($_SERVER['REQUEST_URI'] === '/wp-admin/options-general.php?page=wpgraphql-logging&reset=true') {
+  if ($_SERVER['REQUEST_URI'] === '/wp-admin/admin.php?page=wpgraphql-logging&reset=true') {
     global $wpdb;
 
     // Reset settings

plugins/wpgraphql-logging/tests/e2e/utils.js

@@ -3,15 +3,15 @@
  */
 export async function resetPluginSettings(admin) {
 	await admin.visitAdminPage(
-		"/options-general.php?page=wpgraphql-logging&reset=true"
+		"/admin.php?page=wpgraphql-logging&reset=true"
 	);
 }
 
 /**
  * Navigate to WPGraphQL Logging settings page
  */
 export async function goToLoggingSettingsPage(admin) {
-	await admin.visitAdminPage("/options-general.php?page=wpgraphql-logging");
+	await admin.visitAdminPage("/admin.php?page=wpgraphql-logging");
 }
 
 /**