Fix headers

Author: josephfusco

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

@@ -42,6 +42,9 @@ public function init(): void {
 		add_action( 'admin_menu', array( $this, 'add_admin_menu' ) );
 		add_action( 'admin_init', array( $this, 'handle_actions' ) );
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_assets' ) );
+		
+		// Register admin-post.php handlers
+		add_action( 'admin_post_graphql_webhook_save', array( $this, 'handle_webhook_save' ) );
 	}
 
 	/**
@@ -103,6 +106,7 @@ public function enqueue_assets( string $hook_suffix ): void {
 				'restUrl'        => rest_url( 'graphql-webhooks/v1/' ),
 				'nonce'          => wp_create_nonce( 'wp_rest' ),
 				'headerTemplate' => $this->get_header_row_template(),
+				'confirmDelete'  => __( 'Are you sure you want to delete this webhook?', 'wp-graphql-headless-webhooks' ),
 			)
 		);
 	}
@@ -126,12 +130,7 @@ public function handle_actions(): void {
 			return;
 		}
 
-		if ( isset( $_POST['action'] ) ) {
-			if ( 'save_webhook' === $_POST['action'] ) {
-				$this->handle_webhook_save();
-			}
-		}
-
+		// Only handle delete action here since save is handled by admin-post.php
 		if ( isset( $_GET['action'] ) && 'delete' === $_GET['action'] ) {
 			$this->handle_webhook_delete();
 		}
@@ -168,8 +167,8 @@ private function verify_nonce( string $action, string $nonce_field = '_wpnonce'
 	/**
 	 * Handle webhook save
 	 */
-	private function handle_webhook_save(): void {
-		if ( ! $this->verify_admin_permission() || ! $this->verify_nonce( 'webhook_save' ) ) {
+	public function handle_webhook_save(): void {
+		if ( ! $this->verify_admin_permission() || ! $this->verify_nonce( 'graphql_webhook_save', 'graphql_webhook_nonce' ) ) {
 			return;
 		}
 
@@ -272,13 +271,15 @@ public function render_admin_page(): void {
 
 			// Set default values for new webhook
 			if ( 'add' === $action ) {
+				$webhook_id = 0;
 				$name    = '';
 				$event   = '';
 				$url     = '';
 				$method  = 'POST';
 				$headers = array();
 			} else {
 				// Extract values from webhook entity
+				$webhook_id = $webhook->id;
 				$name    = $webhook->name;
 				$event   = $webhook->event;
 				$url     = $webhook->url;

plugins/wp-graphql-headless-webhooks/src/Admin/assets/admin.js

@@ -11,7 +11,7 @@
 			$( '#add-header' ).on(
 				'click',
 				function () {
-					var headerRow = $( graphqlWebhooksAdmin.headerRowTemplate );
+					var headerRow = $( wpGraphQLWebhooks.headerTemplate );
 					$( '#webhook-headers' ).append( headerRow );
 				}
 			);
@@ -37,7 +37,7 @@
 			$( '.delete-webhook' ).on(
 				'click',
 				function (e) {
-					if ( ! confirm( graphqlWebhooksAdmin.confirmDelete )) {
+					if ( ! confirm( wpGraphQLWebhooks.confirmDelete )) {
 						e.preventDefault();
 					}
 				}

plugins/wp-graphql-headless-webhooks/src/Admin/views/partials/webhook-header-row.php

@@ -17,7 +17,7 @@
 $value = isset( $value ) ? $value : '';
 ?>
 <div class="webhook-header-row">
-	<input type="text" name="webhook_header_key[]" value="<?php echo esc_attr( $key ); ?>" placeholder="<?php esc_attr_e( 'Header name', 'wp-graphql-headless-webhooks' ); ?>" class="regular-text">
-	<input type="text" name="webhook_header_value[]" value="<?php echo esc_attr( $value ); ?>" placeholder="<?php esc_attr_e( 'Header value', 'wp-graphql-headless-webhooks' ); ?>" class="regular-text">
+	<input type="text" name="webhook_headers[name][]" value="<?php echo esc_attr( $key ); ?>" placeholder="<?php esc_attr_e( 'Header name', 'wp-graphql-headless-webhooks' ); ?>" class="regular-text">
+	<input type="text" name="webhook_headers[value][]" value="<?php echo esc_attr( $value ); ?>" placeholder="<?php esc_attr_e( 'Header value', 'wp-graphql-headless-webhooks' ); ?>" class="regular-text">
 	<button type="button" class="button remove-header"><?php esc_html_e( 'Remove', 'wp-graphql-headless-webhooks' ); ?></button>
 </div>

plugins/wp-graphql-headless-webhooks/src/Admin/views/webhooks-list.php

@@ -20,7 +20,7 @@
 		<?php esc_html_e( 'Add New', 'wp-graphql-headless-webhooks' ); ?>
 	</a>
 	<hr class="wp-header-end">
-
+	<br>
 	<?php if ( empty( $webhooks ) ) : ?>
 		<div class="webhooks-empty-state">
 			<p><?php esc_html_e( 'No webhooks found. Create your first webhook to get started.', 'wp-graphql-headless-webhooks' ); ?></p>
@@ -36,6 +36,7 @@
 					<th><?php esc_html_e( 'Event', 'wp-graphql-headless-webhooks' ); ?></th>
 					<th><?php esc_html_e( 'URL', 'wp-graphql-headless-webhooks' ); ?></th>
 					<th><?php esc_html_e( 'Method', 'wp-graphql-headless-webhooks' ); ?></th>
+					<th><?php esc_html_e( 'Headers', 'wp-graphql-headless-webhooks' ); ?></th>
 					<th><?php esc_html_e( 'Actions', 'wp-graphql-headless-webhooks' ); ?></th>
 				</tr>
 			</thead>
@@ -51,6 +52,12 @@
 						</td>
 						<td><?php echo esc_html( $webhook->url ); ?></td>
 						<td><?php echo esc_html( $webhook->method ); ?></td>
+						<td>
+							<?php 
+							$header_count = is_array( $webhook->headers ) ? count( $webhook->headers ) : 0;
+							echo esc_html( $header_count );
+							?>
+						</td>
 						<td>
 							<a href="
 							<?php