resolve bulk delete issue

Author: josephfusco

plugins/wp-graphql-headless-webhooks/src/Admin/WebhooksAdmin.php

@@ -45,8 +45,7 @@ public function __construct( WebhookRepositoryInterface $repository ) {
 		add_action( 'admin_menu', [ $this, 'add_admin_menu' ] );
 		add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_assets' ] );
 		add_action( 'admin_post_graphql_webhook_save', [ $this, 'handle_webhook_save' ] );
-		add_action( 'admin_post_graphql_webhook_delete', [ $this, 'handle_webhook_delete' ] );
-		add_action( 'admin_init', [ $this, 'handle_admin_actions' ] );
+		add_action( 'admin_init', [ $this, 'handle_delete_actions' ] );
 		add_action( 'wp_ajax_test_webhook', [ $this, 'ajax_test_webhook' ] );
 	}
 
@@ -132,20 +131,6 @@ private function get_header_row_template(): string {
 		return ob_get_clean();
 	}
 
-	/**
-	 * Handles admin actions from the webhooks page.
-	 *
-	 * @return void
-	 */
-	public function handle_actions(): void {
-		if ( ! isset( $_GET['page'] ) || self::ADMIN_PAGE_SLUG !== $_GET['page'] ) {
-			return;
-		}
-
-		if ( isset( $_POST['action'] ) && 'save_webhook' === $_POST['action'] ) {
-			$this->handle_webhook_save();
-		}
-	}
 
 	/**
 	 * Checks if the current user has permission to manage options.
@@ -219,68 +204,44 @@ public function handle_webhook_save() {
 	}
 
 	/**
-	 * Handles deleting a webhook.
+	 * Handles webhook delete actions (both single and bulk).
+	 * Consolidates delete logic in one place for easier maintenance.
 	 *
 	 * @return void
 	 */
-	public function handle_webhook_delete() {
-		// To be implemented: Individual deletes are handled through the list table's handle_row_actions.
-	}
-
-	/**
-	 * Handles bulk admin actions (such as bulk delete).
-	 *
-	 * @return void
-	 */
-	public function handle_admin_actions() {
-		// Handle single webhook delete
-		if ( isset( $_REQUEST['action'] ) && 'delete' === $_REQUEST['action'] && isset( $_GET['webhook'] ) ) {
-			if ( ! $this->verify_admin_permission() ) {
-				return;
-			}
-
-			$webhook_id = intval( $_GET['webhook'] );
-			$nonce = isset( $_GET['_wpnonce'] ) ? $_GET['_wpnonce'] : '';
-
-			if ( ! wp_verify_nonce( $nonce, 'delete-webhook-' . $webhook_id ) ) {
-				wp_die( __( 'Security check failed.', 'wp-graphql-headless-webhooks' ) );
-			}
-
-			if ( $this->repository->delete( $webhook_id ) ) {
-				wp_redirect( add_query_arg( [ 'deleted' => 1 ], remove_query_arg( [ 'action', 'webhook', '_wpnonce' ], $this->get_admin_url() ) ) );
-				exit;
-			}
+	public function handle_delete_actions() {
+		// Only process on our admin page
+		if ( ! isset( $_REQUEST['page'] ) || self::ADMIN_PAGE_SLUG !== $_REQUEST['page'] ) {
+			return;
 		}
 
-		// Handle bulk delete actions from WP_List_Table
-		if ( isset( $_POST['action'] ) && 'delete' === $_POST['action'] || 
-		     isset( $_POST['action2'] ) && 'delete' === $_POST['action2'] ) {
-			
-			if ( ! $this->verify_admin_permission() ) {
-				return;
-			}
-
-			// Check bulk action nonce
-			if ( ! isset( $_POST['_wpnonce'] ) || ! wp_verify_nonce( $_POST['_wpnonce'], 'bulk-webhooks' ) ) {
-				wp_die( __( 'Security check failed.', 'wp-graphql-headless-webhooks' ) );
-			}
-
-			$webhook_ids = isset( $_POST['webhook'] ) ? array_map( 'intval', (array) $_POST['webhook'] ) : [];
-			$deleted = 0;
+		// Check if this is a delete action
+		$is_single_delete = isset( $_GET['action'] ) && 'delete' === $_GET['action'] && isset( $_GET['webhook'] );
+		
+		if ( ! $is_single_delete ) {
+			return;
+		}
 
-			foreach ( $webhook_ids as $webhook_id ) {
-				if ( $this->repository->delete( $webhook_id ) ) {
-					$deleted++;
-				}
-			}
+		// Verify permissions once
+		if ( ! $this->verify_admin_permission() ) {
+			return;
+		}
 
-			if ( $deleted > 0 ) {
-				wp_redirect( add_query_arg( [ 'deleted' => $deleted ], remove_query_arg( [ 'action', 'action2', 'webhook', '_wpnonce' ], $this->get_admin_url() ) ) );
-				exit;
-			}
+		// Single delete
+		$webhook_id = intval( $_GET['webhook'] );
+		$nonce = isset( $_GET['_wpnonce'] ) ? $_GET['_wpnonce'] : '';
+		
+		if ( ! wp_verify_nonce( $nonce, 'delete-webhook-' . $webhook_id ) ) {
+			wp_die( __( 'Security check failed.', 'wp-graphql-headless-webhooks' ) );
 		}
+
+		// Delete and redirect
+		$deleted = $this->repository->delete( $webhook_id ) ? 1 : 0;
+		wp_redirect( add_query_arg( [ 'deleted' => $deleted ], remove_query_arg( [ 'action', 'webhook', '_wpnonce' ], $this->get_admin_url() ) ) );
+		exit;
 	}
 
+
 	/**
 	 * Renders the webhooks admin page.
 	 *

plugins/wp-graphql-headless-webhooks/src/Admin/WebhooksListTable.php

@@ -82,10 +82,53 @@ public function get_bulk_actions() {
 	}
 
 
+	/**
+	 * Process bulk actions
+	 */
+	public function process_bulk_action() {
+		// Only handle delete action
+		if ( 'delete' !== $this->current_action() ) {
+			return;
+		}
+
+		// Verify nonce
+		if ( ! isset( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'bulk-' . $this->_args['plural'] ) ) {
+			wp_die( __( 'Security check failed.', 'wp-graphql-webhooks' ) );
+		}
+
+		// Check permissions
+		if ( ! current_user_can( 'manage_options' ) ) {
+			wp_die( __( 'You do not have sufficient permissions to access this page.', 'wp-graphql-headless-webhooks' ) );
+		}
+
+		// Get selected webhooks
+		$webhook_ids = isset( $_REQUEST['webhook'] ) ? array_map( 'intval', (array) $_REQUEST['webhook'] ) : [];
+		if ( empty( $webhook_ids ) ) {
+			return;
+		}
+
+		// Delete webhooks
+		$deleted = 0;
+		foreach ( $webhook_ids as $webhook_id ) {
+			if ( $this->repository->delete( $webhook_id ) ) {
+				$deleted++;
+			}
+		}
+
+		// Redirect with success message
+		if ( $deleted > 0 ) {
+			wp_redirect( add_query_arg( [ 'deleted' => $deleted ], remove_query_arg( [ 'action', 'action2', 'webhook', '_wpnonce' ] ) ) );
+			exit;
+		}
+	}
+
 	/**
 	 * Prepare items for display
 	 */
-	public function prepare_items() {		
+	public function prepare_items() {
+		// Process bulk actions first
+		$this->process_bulk_action();
+		
 		$per_page = $this->get_items_per_page( 'webhooks_per_page', 20 );
 		$current_page = $this->get_pagenum();