Fixed count when filters are applied.

Author: colinmurphy

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

@@ -73,7 +73,9 @@ public function prepare_items(): void {
 
 		$per_page     = $this->get_items_per_page( 'logs_per_page', self::DEFAULT_PER_PAGE );
 		$current_page = $this->get_pagenum();
-		$total_items  = $this->repository->get_log_count();
+				/** @psalm-suppress InvalidArgument */
+		$where        = $this->process_where( $_REQUEST );
+		$total_items  = $this->repository->get_log_count( $where );
 
 		$this->set_pagination_args(
 			[
@@ -94,9 +96,9 @@ public function prepare_items(): void {
 		if ( array_key_exists( 'order', $_REQUEST ) ) {
 			$args['order'] = sanitize_text_field( wp_unslash( (string) $_REQUEST['order'] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 		}
-		/** @psalm-suppress InvalidArgument */
-		$args['where'] = $this->process_where( $_REQUEST );
-		$this->items   = $this->repository->get_logs( apply_filters( 'wpgraphql_logging_logs_table_query_args', $args ) );
+		$args['where'] = $where;
+
+		$this->items = $this->repository->get_logs( apply_filters( 'wpgraphql_logging_logs_table_query_args', $args ) );
 	}
 
 	/**

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

@@ -27,7 +27,7 @@
 	$wpgraphql_logging_current_end_date   = '';
 
 	// Verify nonce before processing form data.
-	if ( ! empty( $request['wpgraphql_logging_nonce'] ) && false === wp_verify_nonce( $request['wpgraphql_logging_nonce'], 'wpgraphql_logging_filter' ) ) {
+	if ( isset( $_REQUEST['wpgraphql_logging_nonce'] ) && (bool) wp_verify_nonce( sanitize_text_field( wp_unslash( $_REQUEST['wpgraphql_logging_nonce'] ) ), 'wpgraphql_logging_filter' ) ) {
 		$wpgraphql_logging_current_level      = isset( $_REQUEST['level_filter'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['level_filter'] ) ) : '';
 		$wpgraphql_logging_current_start_date = isset( $_REQUEST['start_date'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['start_date'] ) ) : '';
 		$wpgraphql_logging_current_end_date   = isset( $_REQUEST['end_date'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['end_date'] ) ) : '';
@@ -52,5 +52,7 @@
 			</option>
 		<?php endforeach; ?>
 	</select>
-	<?php submit_button( __( 'Filter', 'wpgraphql-logging' ), 'secondary', 'filter_action', false ); ?>
+
+	<?php submit_button( __( 'Filter', 'wpgraphql-logging' ), 'secondary', '', false ); ?>
+
 </div>

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

@@ -53,25 +53,32 @@ public function get_logs(array $args = []): array {
 	/**
 	 * Get the total number of log entries.
 	 *
+	 * @param array<string> $where_clauses Array of where clauses to filter the count.
+	 *
+	 * @phpcs:disable WordPress.DB.DirectDatabaseQuery.NoCaching
+	 *
 	 * @return int The total number of log entries.
 	 */
-	public function get_log_count(): int {
-		$cache_key = 'wpgraphql_logs_count';
-		$count     = wp_cache_get( $cache_key );
+	public function get_log_count(array $where_clauses): int {
+		global $wpdb;
+		$table_name = DatabaseEntity::get_table_name();
 
-		if ( is_int( $count ) ) {
-			return $count;
+		if (empty($where_clauses)) {
+			return (int) $wpdb->get_var( $wpdb->prepare( // @phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery
+				'SELECT COUNT(*) FROM %i',
+				$table_name
+			) );
 		}
 
-		global $wpdb;
-		$table_name = DatabaseEntity::get_table_name();
-		$count      = $wpdb->get_var( $wpdb->prepare( // @phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery
-			'SELECT COUNT(*) FROM %i',
-			$table_name
-		) );
-		wp_cache_set( $cache_key, $count, '', 300 );
+		$where = '';
+		foreach ( $where_clauses as $clause ) {
+			if ( '' !== $where ) {
+				$where .= ' AND ';
+			}
+			$where .= (string) $clause;
+		}
 
-		return (int) $count;
+		return (int) $wpdb->get_var( "SELECT COUNT(*) FROM {$table_name} WHERE {$where}" ); // @phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 	}
 
 	/**