Refactored get_query and added this to the view and CSV download.

Author: colinmurphy

plugins/wpgraphql-logging/src/Admin/View/Download/Download_Log_Service.php

@@ -56,6 +56,7 @@ public function generate_csv( int $log_id ): void {
 			'Level Name',
 			'Message',
 			'Channel',
+			'Query',
 			'Context',
 			'Extra',
 		];
@@ -66,8 +67,9 @@ public function generate_csv( int $log_id ): void {
 			$log->get_level(),
 			$log->get_level_name(),
 			$log->get_message(),
-			wp_json_encode( $log->get_context() ),
 			$log->get_channel(),
+			$log->get_query(),
+			wp_json_encode( $log->get_context() ),
 			wp_json_encode( $log->get_extra() ),
 		];
 

plugins/wpgraphql-logging/src/Admin/View/List/List_Table.php

@@ -28,7 +28,7 @@ class List_Table extends WP_List_Table {
 	 *
 	 * @var int
 	 */
-	public const DEFAULT_PER_PAGE = 25;
+	public const DEFAULT_PER_PAGE = 20;
 
 	/**
 	 * Constructor.
@@ -73,7 +73,6 @@ public function prepare_items(): void {
 
 		$per_page     = $this->get_items_per_page( 'logs_per_page', self::DEFAULT_PER_PAGE );
 		$current_page = $this->get_pagenum();
-				/** @psalm-suppress InvalidArgument */
 		/** @psalm-suppress InvalidArgument */
 		$where       = $this->process_where( $_REQUEST );
 		$total_items = $this->repository->get_log_count( $where );
@@ -276,9 +275,8 @@ public function column_query( DatabaseEntity $item ): ?string {
 	 * @return string The query
 	 */
 	public function get_query(DatabaseEntity $item): string {
-		$extra = $item->get_extra();
-		$query = ! empty( $extra['wpgraphql_query'] ) ? esc_html( $extra['wpgraphql_query'] ) : '';
-		return '<pre style="overflow-x: auto; background: #f6f7f7; padding: 15px; border: 1px solid #ddd; border-radius: 4px; white-space: pre-wrap; word-break: break-word; max-width: 100%; max-height: 300px; overflow-y: auto; box-sizing: border-box;">' . esc_html( $query ) . '</pre>';
+		$query = $item->get_query();
+		return $this->format_code( $query );
 	}
 
 	/**
@@ -330,7 +328,14 @@ public function get_request_headers(DatabaseEntity $item): string {
 		if ( false === $formatted_request_headers ) {
 			return '';
 		}
-		return '<pre style="overflow-x: auto; background: #f4f4f4; padding: 15px; border: 1px solid #ddd; border-radius: 4px; max-height: 300px;">' . esc_html( $formatted_request_headers ) . '</pre>';
+		return $this->format_code( $formatted_request_headers );
+	}
+
+	protected function format_code(string $code): string {
+		if ( empty( $code ) ) {
+			return '';
+		}
+		return '<pre style="overflow-x: auto; background: #f4f4f4; padding: 15px; border: 1px solid #ddd; border-radius: 4px; max-height: 300px;">' . esc_html( $code	 ) . '</pre>';
 	}
 
 	/**

plugins/wpgraphql-logging/src/Admin/View/Templates/wpgraphql-logger-view.php

@@ -39,10 +39,6 @@
 				<th><?php esc_html_e( 'Datetime', 'wpgraphql-logging' ); ?></th>
 				<td><?php echo esc_html( (string) $log->get_datetime() ); ?></td>
 			</tr>
-			<tr>
-				<th><?php esc_html_e( 'Channel', 'wpgraphql-logging' ); ?></th>
-				<td><?php echo esc_html( (string) $log->get_channel() ); ?></td>
-			</tr>
 			<tr>
 				<th><?php esc_html_e( 'Level', 'wpgraphql-logging' ); ?></th>
 				<td><?php echo (int) $log->get_level(); ?></td>
@@ -55,6 +51,14 @@
 				<th><?php esc_html_e( 'Message', 'wpgraphql-logging' ); ?></th>
 				<td><?php echo esc_html( (string) $log->get_message() ); ?></td>
 			</tr>
+			<tr>
+				<th><?php esc_html_e( 'Channel', 'wpgraphql-logging' ); ?></th>
+				<td><?php echo esc_html( (string) $log->get_channel() ); ?></td>
+			</tr>
+			<tr>
+				<th><?php esc_html_e( 'Query', 'wpgraphql-logging' ); ?></th>
+				<td><pre style="overflow-x: auto; background: #f4f4f4; padding: 15px; border: 1px solid #ddd; border-radius: 4px;"><?php echo esc_html( (string) $log->get_query() ); ?></pre></td>
+			</tr>
 			<tr>
 				<th><?php esc_html_e( 'Context', 'wpgraphql-logging' ); ?></th>
 				<td><pre><?php echo esc_html( (string) wp_json_encode( $log->get_context(), JSON_PRETTY_PRINT ) ); ?></pre></td>

plugins/wpgraphql-logging/src/Logger/Database/DatabaseEntity.php

@@ -236,6 +236,32 @@ public function get_datetime(): string {
 		return $this->datetime;
 	}
 
+	public function get_query(): ?string {
+
+		$extra = $this->get_extra();
+		$context = $this->get_context();
+		if ( empty( $context ) || ! is_array( $context ) ) {
+			return null;
+		}
+
+		$query = $context['query'];
+
+		$request = $context['request'] ?? null;
+		if ( empty( $request ) || ! is_array( $request ) ) {
+			return $query;
+		}
+
+		$params = $request['params'] ?? null;
+		if ( empty( $params ) || ! is_array( $params ) ) {
+			return $query;
+		}
+		if ( isset( $params['query'] ) && is_string( $params['query'] ) ) {
+			return $params['query'];
+		}
+
+		return $query;
+	}
+
 	/**
 	 * Finds multiple log entries and returns them as an array.
 	 *