From 07b76595691ac623c63fab8f0dfa16762173c3cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 8 Jul 2023 00:16:39 +0000
Subject: [PATCH 01/22] Bump tough-cookie from 4.1.2 to 4.1.3

Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/salesforce/tough-cookie/releases)
- [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md)
- [Commits](https://github.com/salesforce/tough-cookie/compare/v4.1.2...v4.1.3)

---
updated-dependencies:
- dependency-name: tough-cookie
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 34b597e..a1020a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17093,9 +17093,9 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
-      "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
       "dev": true,
       "dependencies": {
         "psl": "^1.1.33",

From 0162237c7327148078f108ecae6d14f7b5f38859 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Jul 2023 01:39:20 +0000
Subject: [PATCH 02/22] Bump word-wrap from 1.2.3 to 1.2.4

Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 34b597e..44862c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18165,9 +18165,9 @@
       }
     },
     "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"

From 707f427756b0224f5a63f31ce3471d21867d54fa Mon Sep 17 00:00:00 2001
From: Burhan Nasir <burhan.nasir@10up.com>
Date: Mon, 21 Aug 2023 11:20:37 +0500
Subject: [PATCH 03/22] Add Addition Buttons (Explain queries & Query document
 from ES)

---
 classes/EP_Debug_Bar_ElasticPress.php |   1 +
 classes/QueryOutput.php               | 101 ++++++++++++++++++++++++++
 debug-bar-elasticpress.php            |  31 ++++++++
 3 files changed, 133 insertions(+)

diff --git a/classes/EP_Debug_Bar_ElasticPress.php b/classes/EP_Debug_Bar_ElasticPress.php
index 9b21cea..61d3e5c 100755
--- a/classes/EP_Debug_Bar_ElasticPress.php
+++ b/classes/EP_Debug_Bar_ElasticPress.php
@@ -94,6 +94,7 @@ public function render() {
 		<?php
 		$debug_bar_output = new \DebugBarElasticPress\QueryOutput( $queries );
 		$debug_bar_output->render_buttons();
+		$debug_bar_output->render_additional_buttons();
 		$debug_bar_output->render_queries();
 	}
 }
diff --git a/classes/QueryOutput.php b/classes/QueryOutput.php
index e1ca6a1..81b837c 100644
--- a/classes/QueryOutput.php
+++ b/classes/QueryOutput.php
@@ -298,4 +298,105 @@ protected function render_value( $value ) {
 
 		return (string) $value;
 	}
+
+	/**
+	 * Render the additional buttons.
+	 *
+	 * @since 3.1.0
+	 * @return void
+	 */
+	public function render_additional_buttons() {
+		$buttons = [
+			$this->get_explain_query_button(),
+			$this->get_retrieve_raw_document_button(),
+		];
+
+		/**
+		 * Filter the additional buttons.
+		 *
+		 * @since 3.1.0
+		 * @hook ep_debug_bar_additional_buttons
+		 * @param array $buttons Buttons.
+		 * @return array
+		 */
+		apply_filters( 'ep_debug_bar_additional_buttons', $buttons );
+
+		$buttons = array_filter( $buttons );
+
+		if ( empty( $buttons ) ) {
+			return;
+		}
+
+		?>
+		<div class="ep-queries-buttons-wrapper">
+			<?php
+			foreach ( $buttons as $button ) {
+				echo wp_kses_post( $button );
+			}
+			?>
+		</div>
+		<?php
+	}
+
+	/**
+	 * Get the explain query button
+	 *
+	 * @since 3.1.0
+	 * @return string
+	 */
+	public function get_explain_query_button() : string {
+		if ( empty( $this->queries ) ) {
+			return '';
+		}
+
+		$button_link = add_query_arg(
+			[
+				'explain' => '1',
+			],
+			isset( $_SERVER['REQUEST_URI'] ) ? sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ) : ''
+		);
+
+		return sprintf(
+			'<a href="%s" class="button button-primary" id="ep-explain-query">
+				%s
+			</a>',
+			esc_url( $button_link ),
+			esc_html__( 'Explain queries', 'debug-bar-elasticpress' )
+		);
+	}
+
+	/**
+	 * Get the retrieve raw document button.
+	 *
+	 * @since 3.1.0
+	 * @return string
+	 */
+	public function get_retrieve_raw_document_button() : string {
+		if ( ! is_singular() ) {
+			return '';
+		}
+
+		$post_type      = get_post_type();
+		$post_indexable = \ElasticPress\Indexables::factory()->get( 'post' );
+
+		$indexable_post_types = $post_indexable->get_indexable_post_types();
+		if ( ! in_array( $post_type, $indexable_post_types, true ) ) {
+			return '';
+		}
+
+		$button_link = add_query_arg(
+			[
+				'retrieve-raw-es-document' => '1',
+			],
+			isset( $_SERVER['REQUEST_URI'] ) ? sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ) : ''
+		);
+
+		return sprintf(
+			'<a href="%s" class="button button-primary" id="ep-retrieve-raw-es-document">
+				%s
+			</a>',
+			esc_url( $button_link ),
+			esc_html__( 'Reload and retrieve raw ES document', 'debug-bar-elasticpress' )
+		);
+	}
 }
diff --git a/debug-bar-elasticpress.php b/debug-bar-elasticpress.php
index bafb669..25e9ef4 100755
--- a/debug-bar-elasticpress.php
+++ b/debug-bar-elasticpress.php
@@ -67,6 +67,8 @@ function setup() {
 	add_filter( 'debug_bar_statuses', $n( 'add_debug_bar_stati' ) );
 	add_filter( 'ep_formatted_args', $n( 'add_explain_args' ), 10, 2 );
 
+	add_action( 'wp', $n( 'retrieve_raw_document_from_es' ) );
+
 	load_plugin_textdomain( 'debug-bar-elasticpress', false, basename( __DIR__ ) . '/lang' );
 
 	QueryLog::factory();
@@ -152,3 +154,32 @@ function admin_notice_min_ep_version() {
 	</div>
 	<?php
 }
+
+/**
+ * Get document from Elasticsearch.
+ *
+ * @since 3.1.0
+ *
+ * @return void
+ */
+function retrieve_raw_document_from_es() {
+	if ( empty( $_GET['retrieve-raw-es-document'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+		return;
+	}
+
+	if ( ! is_singular() ) {
+		return;
+	}
+
+	$id        = get_the_ID();
+	$post_type = get_post_type( $id );
+
+	$post_indexable       = \ElasticPress\Indexables::factory()->get( 'post' );
+	$indexable_post_types = $post_indexable->get_indexable_post_types();
+
+	if ( ! in_array( $post_type, $indexable_post_types, true ) ) {
+		return;
+	}
+
+	$post_indexable->get( $id );
+}

From c09c28c2d9b83f81c8a376109883ec75a1e55ef9 Mon Sep 17 00:00:00 2001
From: Felipe Elia <felipe.elia@get10up.com>
Date: Tue, 5 Sep 2023 14:16:00 -0300
Subject: [PATCH 04/22] Unify checks + Nonce verification + CSS

---
 assets/css/main.css        | 24 +++++++++++++-----------
 classes/QueryOutput.php    | 19 ++++++-------------
 debug-bar-elasticpress.php | 31 ++++++++++++++++++++-----------
 3 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/assets/css/main.css b/assets/css/main.css
index 51ebf0e..1d27389 100755
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -43,7 +43,10 @@
 }
 
 .ep-queries-buttons-wrapper {
+	align-items: center;
 	clear: both;
+	display: flex;
+	gap: 10px;
 	padding: 1em 0;
 }
 
@@ -76,12 +79,10 @@
  * override QM's important rules
  */
 #debug-menu-target-EP_Debug_Bar_ElasticPress .button,
-#debug-menu-target-EP_Debug_Bar_ElasticPress a.button,
-#debug-menu-target-EP_Debug_Bar_ElasticPress button.ep-copy-button.button.qm-button {
+#debug-menu-target-EP_Debug_Bar_ElasticPress a.button {
 	background: #f6f7f7 !important;
-	border-color: #2271b1 !important;
+	border: 1px solid #2271b1 !important;
 	border-radius: 3px !important;
-	border-width: 1px;
 	
 	/* Overriding some Debug Bar "important" rules */
 	color: #2271b1 !important;
@@ -95,16 +96,18 @@
 	text-shadow: none;
 }
 
-#debug-menu-target-EP_Debug_Bar_ElasticPress .button:hover {
+#debug-menu-target-EP_Debug_Bar_ElasticPress .button:hover,
+#query-monitor-main #qm-debug_bar_ep_debug_bar_elasticpress .button:hover {
 	background: #f0f0f1;
 	border-color: #0a4b78;
-	color: #0a4b78;
-	text-decoration: none;
+	color: #0a4b78 !important;
+	text-decoration: none !important;
 }
 
-#debug-menu-target-EP_Debug_Bar_ElasticPress .button:active {
-	background: #f6f7f7;
-	border-color: #8c8f94;
+#debug-menu-target-EP_Debug_Bar_ElasticPress .button:active,
+#query-monitor-main #qm-debug_bar_ep_debug_bar_elasticpress .button:hover {
+	background: #f6f7f7 !important;
+	border-color: #8c8f94 !important;
 	box-shadow: none;
 }
 
@@ -119,7 +122,6 @@
 	background: #007cba !important;
 	border: 1px solid #007cba !important;
 	color: #fff !important;
-	margin-right: 5px !important;
 }
 
 #debug-menu-target-EP_Debug_Bar_ElasticPress a.button-primary:hover,
diff --git a/classes/QueryOutput.php b/classes/QueryOutput.php
index 81b837c..fc5888d 100644
--- a/classes/QueryOutput.php
+++ b/classes/QueryOutput.php
@@ -52,7 +52,7 @@ public function render_buttons() {
 			<a download="debug-bar-elasticpress-report.txt" href="data:text/plain;charset=utf-8,<?php echo rawurlencode( $copy_paste_output ); ?>"  class="button button-primary" id="ep-download-requests-info">
 				<?php esc_html_e( 'Download Requests Info', 'debug-bar-elasticpress' ); ?>
 			</a>
-			<button class="ep-copy-button button qm-button" data-clipboard-text="<?php echo esc_attr( $copy_paste_output ); ?>">
+			<button class="ep-copy-button button bordered-button" data-clipboard-text="<?php echo esc_attr( $copy_paste_output ); ?>">
 				<?php esc_html_e( 'Copy Requests Info to Clipboard', 'debug-bar-elasticpress' ); ?>
 			</button>
 			<span class="ep-copy-button-wrapper__success" style="display: none;">
@@ -357,7 +357,7 @@ public function get_explain_query_button() : string {
 		);
 
 		return sprintf(
-			'<a href="%s" class="button button-primary" id="ep-explain-query">
+			'<a href="%s" class="ep-explain-query button bordered-button">
 				%s
 			</a>',
 			esc_url( $button_link ),
@@ -372,27 +372,20 @@ public function get_explain_query_button() : string {
 	 * @return string
 	 */
 	public function get_retrieve_raw_document_button() : string {
-		if ( ! is_singular() ) {
-			return '';
-		}
-
-		$post_type      = get_post_type();
-		$post_indexable = \ElasticPress\Indexables::factory()->get( 'post' );
-
-		$indexable_post_types = $post_indexable->get_indexable_post_types();
-		if ( ! in_array( $post_type, $indexable_post_types, true ) ) {
+		if ( ! is_indexable_singular() ) {
 			return '';
 		}
 
 		$button_link = add_query_arg(
 			[
-				'retrieve-raw-es-document' => '1',
+				'ep-retrieve-es-document' => '1',
+				'_wpnonce'                => wp_create_nonce( 'ep-retrieve-es-document' ),
 			],
 			isset( $_SERVER['REQUEST_URI'] ) ? sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ) : ''
 		);
 
 		return sprintf(
-			'<a href="%s" class="button button-primary" id="ep-retrieve-raw-es-document">
+			'<a href="%s" class="ep-retrieve-es-document button bordered-button">
 				%s
 			</a>',
 			esc_url( $button_link ),
diff --git a/debug-bar-elasticpress.php b/debug-bar-elasticpress.php
index 25e9ef4..f3ed1d0 100755
--- a/debug-bar-elasticpress.php
+++ b/debug-bar-elasticpress.php
@@ -156,19 +156,14 @@ function admin_notice_min_ep_version() {
 }
 
 /**
- * Get document from Elasticsearch.
+ * Check if the current page is an indexable singular of an ES document or not.
  *
  * @since 3.1.0
- *
- * @return void
+ * @return boolean
  */
-function retrieve_raw_document_from_es() {
-	if ( empty( $_GET['retrieve-raw-es-document'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-		return;
-	}
-
+function is_indexable_singular() {
 	if ( ! is_singular() ) {
-		return;
+		return false;
 	}
 
 	$id        = get_the_ID();
@@ -177,9 +172,23 @@ function retrieve_raw_document_from_es() {
 	$post_indexable       = \ElasticPress\Indexables::factory()->get( 'post' );
 	$indexable_post_types = $post_indexable->get_indexable_post_types();
 
-	if ( ! in_array( $post_type, $indexable_post_types, true ) ) {
+	return in_array( $post_type, $indexable_post_types, true );
+}
+
+/**
+ * Get document from Elasticsearch.
+ *
+ * @since 3.1.0
+ * @return void
+ */
+function retrieve_raw_document_from_es() {
+	if ( empty( $_GET['ep-retrieve-es-document'] ) || empty( $_GET['_wpnonce'] ) || ! wp_verify_nonce( $_GET['_wpnonce'], 'ep-retrieve-es-document' ) ) {
+		return;
+	}
+
+	if ( ! is_indexable_singular() ) {
 		return;
 	}
 
-	$post_indexable->get( $id );
+	\ElasticPress\Indexables::factory()->get( 'post' )->get( get_the_ID() );
 }

From eee87a6eb8997745a69059829405325e7cdf82a6 Mon Sep 17 00:00:00 2001
From: Felipe Elia <felipe.elia@get10up.com>
Date: Wed, 6 Sep 2023 14:31:04 -0300
Subject: [PATCH 05/22] Display the query type

---
 classes/QueryLog.php    | 114 +++++++++++++++++++++++++++++++++++++++-
 classes/QueryOutput.php |  23 ++++++--
 2 files changed, 130 insertions(+), 7 deletions(-)

diff --git a/classes/QueryLog.php b/classes/QueryLog.php
index 6cdeff4..7b78b0d 100644
--- a/classes/QueryLog.php
+++ b/classes/QueryLog.php
@@ -41,6 +41,10 @@ public function setup() {
 		add_filter( 'pre_update_option_ep_query_log', array( $this, 'json_encode_query_log' ) );
 		add_filter( 'option_ep_query_log', array( $this, 'json_decode_query_log' ) );
 		add_filter( 'site_option_ep_query_log', array( $this, 'json_decode_query_log' ) );
+
+		add_filter( 'ep_query_request_args', [ $this, 'maybe_add_request_query_type' ], 10, 7 );
+		add_filter( 'ep_pre_request_args', [ $this, 'maybe_add_request_type' ], 10, 4 );
+		add_filter( 'ep_pre_request_args', [ $this, 'maybe_add_request_context' ] );
 	}
 
 	/**
@@ -49,7 +53,6 @@ public function setup() {
 	 * @since 1.3
 	 */
 	public function action_admin_init() {
-
 		// Save options for multisite
 		if ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK && isset( $_POST['ep_enable_logging'] ) ) {
 			check_admin_referer( 'ep-debug-options' );
@@ -274,7 +277,7 @@ function( $query ) {
 
 			$debug_bar_output = new QueryOutput( $queries );
 			$debug_bar_output->render_buttons();
-			$debug_bar_output->render_queries();
+			$debug_bar_output->render_queries( [ 'display_context' => true ] );
 			?>
 		</div>
 		<?php
@@ -318,4 +321,111 @@ public function json_encode_query_log( $value ) {
 	public function json_decode_query_log( $value ) {
 		return ( is_string( $value ) ) ? json_decode( $value, true ) : $value;
 	}
+
+	/**
+	 * Conditionally add the request type to the request args
+	 *
+	 * @since 3.1.0
+	 * @param array       $args       Request args
+	 * @param string      $path       Site URL to retrieve
+	 * @param array       $query_args The query args originally passed to WP_Query.
+	 * @param string|null $type       Type of request, used for debugging.
+	 * @return array New request args
+	 */
+	public function maybe_add_request_type( array $args, string $path, array $query_args, $type ) : array {
+		if ( ! empty( $args['ep_query_type'] ) ) {
+			return $args;
+		}
+
+		if ( ! empty( $type ) ) {
+			$args['ep_query_type'] = $type;
+
+			if ( 'get' === $type ) {
+				$args['ep_query_type'] = esc_html__( 'Raw ES document', 'debug-bar-elasticpress' );
+			}
+		}
+
+		if ( '_nodes/plugins' === $path ) {
+			$args['ep_query_type'] = esc_html__( 'Elasticsearch check', 'debug-bar-elasticpress' );
+		}
+
+		return $args;
+	}
+
+	/**
+	 * Conditionally add the context of the query
+	 *
+	 * @param array $args Request args
+	 * @return array
+	 */
+	public function maybe_add_request_context( array $args ) : array {
+		$args['ep_context'] = 'public';
+
+		if ( is_admin() ) {
+			$args['ep_context'] = 'admin';
+		}
+
+		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+			$args['ep_context'] = 'ajax';
+		}
+
+		if ( defined( 'REST_REQUEST' ) && REST_REQUEST ) {
+			$args['ep_context'] = 'rest';
+		}
+
+		return $args;
+	}
+
+	/**
+	 * Conditionally add the request type to the request args (for query requests)
+	 *
+	 * @since 3.1.0
+	 * @param array  $request_args Request arguments
+	 * @param string $path         Request path
+	 * @param string $index        Index name
+	 * @param string $type         Index type
+	 * @param array  $query        Prepared Elasticsearch query
+	 * @param array  $query_args   Query arguments
+	 * @param mixed  $query_object Could be WP_Query, WP_User_Query, etc.
+	 * @return array New request arguments
+	 */
+	public function maybe_add_request_query_type( array $request_args, string $path, string $index, string $type, array $query, array $query_args, $query_object ) : array {
+		$request_args['ep_query_type'] = $this->determine_request_query_type( $request_args, $path, $index, $type, $query, $query_args, $query_object );
+		return $request_args;
+	}
+
+	/**
+	 * Conditionally add the request type to the request args (for query requests)
+	 *
+	 * @since 3.1.0
+	 * @param array  $request_args Request arguments
+	 * @param string $path         Request path
+	 * @param string $index        Index name
+	 * @param string $type         Index type
+	 * @param array  $query        Prepared Elasticsearch query
+	 * @param array  $query_args   Query arguments
+	 * @param mixed  $query_object Could be WP_Query, WP_User_Query, etc.
+	 * @return string Request type
+	 */
+	protected function determine_request_query_type( array $request_args, string $path, string $index, string $type, array $query, array $query_args, $query_object ) : string {
+		if ( $query_object instanceof \WP_Query && $query_object->is_main_query() ) {
+			return esc_html__( 'Main query', 'debug-bar-elasticpress' );
+		}
+
+		if ( empty( $query['query'] ) && ! empty( $query['aggs'] ) ) {
+			return esc_html__( 'Possible values for EP filter', 'debug-bar-elasticpress' );
+		}
+
+		$search_term = $query_args['s'] ?? '';
+		if ( '' !== $search_term ) {
+			$type = 'Search';
+			if ( apply_filters( 'ep_autosuggest_query_placeholder', 'ep_autosuggest_placeholder' ) === $search_term ) {
+				return esc_html__( 'Autosuggest template', 'debug-bar-elasticpress' );
+			}
+
+			return esc_html__( 'Search', 'debug-bar-elasticpress' );
+		}
+
+		return $type;
+	}
 }
diff --git a/classes/QueryOutput.php b/classes/QueryOutput.php
index fc5888d..103f242 100644
--- a/classes/QueryOutput.php
+++ b/classes/QueryOutput.php
@@ -66,9 +66,10 @@ public function render_buttons() {
 	 * Render the queries
 	 *
 	 * @since 3.0.0
+	 * @param array $args Arguments to adjust the queries list
 	 * @return void
 	 */
-	public function render_queries() {
+	public function render_queries( $args = [] ) {
 		?>
 		<div class="ep-queries-debug-container">
 			<ol class="wpd-queries ep-queries-debug">
@@ -79,7 +80,11 @@ public function render_queries() {
 					<?php
 				} else {
 					foreach ( $this->queries as $query ) {
-						$this->render_query( $query );
+						$type    = $query['args']['ep_query_type'] ?? '';
+						$context = ( ! empty( $args['display_context'] ) && ! empty( $query['args']['ep_context'] ) ) ?
+							$query['args']['ep_context'] :
+							'';
+						$this->render_query( $query, $type, $context );
 					}
 				}
 				?>
@@ -91,11 +96,12 @@ public function render_queries() {
 	/**
 	 * Render a query in a list.
 	 *
-	 * @param array  $query The query info.
-	 * @param string $type The type of the query.
+	 * @param array  $query   The query info.
+	 * @param string $type    The type of the query.
+	 * @param string $context Context of the query (public, admin, ajax, or rest).
 	 * @return void
 	 */
-	public function render_query( $query, $type = '' ) {
+	public function render_query( $query, $type = '', $context = '' ) {
 		$error         = '';
 		$query_time    = ( ! empty( $query['time_start'] ) && ! empty( $query['time_finish'] ) ) ? $query['time_finish'] - $query['time_start'] : false;
 		$result        = wp_remote_retrieve_body( $query['request'] );
@@ -162,6 +168,13 @@ public function render_query( $query, $type = '' ) {
 				</div>
 			<?php endif; ?>
 
+			<?php if ( $context ) : ?>
+				<div class="ep-query-type">
+					<strong><?php esc_html_e( 'Context:', 'debug-bar-elasticpress' ); ?></strong>
+					<?php echo esc_html( $context ); ?>
+				</div>
+			<?php endif; ?>
+
 			<div class="ep-query-host">
 				<strong><?php esc_html_e( 'Host:', 'debug-bar-elasticpress' ); ?></strong>
 				<?php echo esc_html( $query['host'] ); ?>

From 3e97580b3aed4f9be7e5779d3aafc5b2d0f069ef Mon Sep 17 00:00:00 2001
From: Felipe Elia <felipe.elia@get10up.com>
Date: Tue, 12 Sep 2023 16:46:25 -0300
Subject: [PATCH 06/22] Change class

Co-authored-by: Burhan Nasir <burhandodhy@users.noreply.github.com>
---
 classes/QueryOutput.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/QueryOutput.php b/classes/QueryOutput.php
index 103f242..20e7d92 100644
--- a/classes/QueryOutput.php
+++ b/classes/QueryOutput.php
@@ -169,7 +169,7 @@ public function render_query( $query, $type = '', $context = '' ) {
 			<?php endif; ?>
 
 			<?php if ( $context ) : ?>
-				<div class="ep-query-type">
+				<div class="ep-query-context">
 					<strong><?php esc_html_e( 'Context:', 'debug-bar-elasticpress' ); ?></strong>
 					<?php echo esc_html( $context ); ?>
 				</div>

From 0bb100a7d637ac51bcdc08f36a3fa154eeff9349 Mon Sep 17 00:00:00 2001
From: Felipe Elia <felipe.elia@get10up.com>
Date: Tue, 12 Sep 2023 17:47:52 -0300
Subject: [PATCH 07/22] Log by context and status

---
 classes/QueryLog.php | 218 +++++++++++++++++++++++++++++++++----------
 1 file changed, 171 insertions(+), 47 deletions(-)

diff --git a/classes/QueryLog.php b/classes/QueryLog.php
index 7b78b0d..f61e442 100644
--- a/classes/QueryLog.php
+++ b/classes/QueryLog.php
@@ -58,8 +58,36 @@ public function action_admin_init() {
 			check_admin_referer( 'ep-debug-options' );
 
 			update_site_option( 'ep_enable_logging', (int) $_POST['ep_enable_logging'] );
+			update_site_option( 'ep_query_log_by_status', sanitize_text_field( $_POST['ep_query_log_by_status'] ) );
+			if ( ! empty( $_POST['ep_query_log_by_context'] ) ) {
+				update_site_option( 'ep_query_log_by_context', array_map( 'sanitize_text_field', $_POST['ep_query_log_by_context'] ) );
+			} else {
+				update_site_option( 'ep_query_log_by_context', [] );
+			}
 		} else {
-			register_setting( 'ep-debug', 'ep_enable_logging', 'intval' );
+			register_setting(
+				'ep-debug',
+				'ep_enable_logging',
+				[ 'sanitize_callback' => 'intval' ]
+			);
+			register_setting(
+				'ep-debug',
+				'ep_query_log_by_status',
+				[
+					'type'              => 'string',
+					'sanitize_callback' => 'sanitize_text_field',
+				]
+			);
+			register_setting(
+				'ep-debug',
+				'ep_query_log_by_context',
+				[
+					'type'              => 'array',
+					'sanitize_callback' => function ( $value ) {
+						return ! empty( $value ) ? array_map( 'sanitize_text_field', $value ) : [];
+					},
+				]
+			);
 		}
 	}
 
@@ -147,48 +175,15 @@ public function is_bulk_index_error( $query ) {
 	 * @since 1.3
 	 */
 	public function log_query( $query, $type ) {
-		if ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK ) {
-			$enabled = get_site_option( 'ep_enable_logging' );
-		} else {
-			$enabled = get_option( 'ep_enable_logging' );
+		if ( ! $this->is_enabled() ) {
+			return;
 		}
 
-		if ( empty( $enabled ) ) {
+		if ( ! $this->should_log_by_context() ) {
 			return;
 		}
 
-		/**
-		 * This filter allows you to map query types to callables. If the callable returns true,
-		 * that query will be logged.
-		 *
-		 * @var   array
-		 * @since 1.3
-		 * @since 2.1.0 Added `bulk_index`
-		 */
-		$allowed_log_types = apply_filters(
-			'ep_debug_bar_allowed_log_types',
-			array(
-				'put_mapping'          => array( $this, 'is_query_error' ),
-				'delete_network_alias' => array( $this, 'is_query_error' ),
-				'create_network_alias' => array( $this, 'is_query_error' ),
-				'bulk_index'           => array( $this, 'is_bulk_index_error' ),
-				'bulk_index_posts'     => array( $this, 'is_query_error' ),
-				'delete_index'         => array( $this, 'maybe_log_delete_index' ),
-				'create_pipeline'      => array( $this, 'is_query_error' ),
-				'get_pipeline'         => array( $this, 'is_query_error' ),
-				'query'                => array( $this, 'is_query_error' ),
-			),
-			$query,
-			$type
-		);
-
-		if ( isset( $allowed_log_types[ $type ] ) ) {
-			$do_log = call_user_func( $allowed_log_types[ $type ], $query );
-
-			if ( ! $do_log ) {
-				return;
-			}
-		} else {
+		if ( ! $this->should_log_by_status( $query, $type ) ) {
 			return;
 		}
 
@@ -217,11 +212,15 @@ public function log_query( $query, $type ) {
 	 */
 	public function screen_options() {
 		if ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK ) {
-			$log     = get_site_option( 'ep_query_log', array() );
-			$enabled = get_site_option( 'ep_enable_logging' );
+			$log        = get_site_option( 'ep_query_log', array() );
+			$enabled    = get_site_option( 'ep_enable_logging' );
+			$by_status  = get_site_option( 'ep_query_log_by_status', 'failed' );
+			$by_context = get_site_option( 'ep_query_log_by_context', [] );
 		} else {
-			$log     = get_option( 'ep_query_log', array() );
-			$enabled = get_option( 'ep_enable_logging' );
+			$log        = get_option( 'ep_query_log', array() );
+			$enabled    = get_option( 'ep_enable_logging' );
+			$by_status  = get_option( 'ep_query_log_by_status', 'failed' );
+			$by_context = get_option( 'ep_query_log_by_context', [] );
 		}
 
 		if ( is_array( $log ) ) {
@@ -255,6 +254,36 @@ public function screen_options() {
 								<span class="description"><?php echo wp_kses_post( __( 'Note that query logging can have <strong>severe</strong> performance implications on your website. We generally recommend only enabling logging during dashboard indexing and disabling after.', 'debug-bar-elasticpress' ) ); ?></span>
 							</td>
 						</tr>
+						<tr>
+							<th scope="row"><label for="ep_query_log_by_status"><?php esc_html_e( 'Log by status:', 'debug-bar-elasticpress' ); ?></label></th>
+							<td>
+								<select name="ep_query_log_by_status" id="ep_query_log_by_status">
+									<option <?php selected( 'failed', $by_status ); ?> value="failed"><?php esc_html_e( 'Only failed queries', 'debug-bar-elasticpress' ); ?></option>
+									<option <?php selected( 'all', $by_status ); ?> value="all"><?php esc_html_e( 'All queries', 'debug-bar-elasticpress' ); ?></option>
+								</select>
+							</td>
+						</tr>
+						<tr>
+							<th scope="row"><?php esc_html_e( 'Log by context:', 'debug-bar-elasticpress' ); ?></th>
+							<td>
+								<label>
+									<input type="checkbox" name="ep_query_log_by_context[]" value="public" <?php checked( empty( $by_context ) || in_array( 'public', $by_context, true ) ); ?>>
+									<?php esc_html_e( 'Public', 'debug-bar-elasticpress' ); ?>
+								</label><br>
+								<label>
+									<input type="checkbox" name="ep_query_log_by_context[]" value="admin" <?php checked( empty( $by_context ) || in_array( 'admin', $by_context, true ) ); ?>>
+									<?php esc_html_e( 'Admin', 'debug-bar-elasticpress' ); ?>
+								</label><br>
+								<label>
+									<input type="checkbox" name="ep_query_log_by_context[]" value="ajax" <?php checked( empty( $by_context ) || in_array( 'ajax', $by_context, true ) ); ?>>
+									<?php esc_html_e( 'AJAX', 'debug-bar-elasticpress' ); ?>
+								</label><br>
+								<label>
+									<input type="checkbox" name="ep_query_log_by_context[]" value="rest" <?php checked( empty( $by_context ) || in_array( 'rest', $by_context, true ) ); ?>>
+									<?php esc_html_e( 'REST API', 'debug-bar-elasticpress' ); ?>
+								</label>
+							</td>
+						</tr>
 					</tbody>
 				</table>
 
@@ -359,21 +388,33 @@ public function maybe_add_request_type( array $args, string $path, array $query_
 	 * @return array
 	 */
 	public function maybe_add_request_context( array $args ) : array {
-		$args['ep_context'] = 'public';
+		$args['ep_context'] = $this->get_current_context();
+
+		return $args;
+	}
+
+	/**
+	 * Get the current context
+	 *
+	 * @since 3.1.0
+	 * @return string
+	 */
+	protected function get_current_context() : string {
+		$context = 'public';
 
 		if ( is_admin() ) {
-			$args['ep_context'] = 'admin';
+			$context = 'admin';
 		}
 
 		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-			$args['ep_context'] = 'ajax';
+			$context = 'ajax';
 		}
 
 		if ( defined( 'REST_REQUEST' ) && REST_REQUEST ) {
-			$args['ep_context'] = 'rest';
+			$context = 'rest';
 		}
 
-		return $args;
+		return $context;
 	}
 
 	/**
@@ -428,4 +469,87 @@ protected function determine_request_query_type( array $request_args, string $pa
 
 		return $type;
 	}
+
+	/**
+	 * Whether logging is enabled or not
+	 *
+	 * @since 3.1.0
+	 * @return boolean
+	 */
+	protected function is_enabled() : bool {
+		if ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK ) {
+			$enabled = get_site_option( 'ep_enable_logging' );
+		} else {
+			$enabled = get_option( 'ep_enable_logging' );
+		}
+
+		return ! empty( $enabled );
+	}
+
+	/**
+	 * Whether the current context should or not be logged
+	 *
+	 * @since 3.1.0
+	 * @return boolean
+	 */
+	protected function should_log_by_context() {
+		if ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK ) {
+			$by_context = get_site_option( 'ep_query_log_by_context', [] );
+		} else {
+			$by_context = get_option( 'ep_query_log_by_context', [] );
+		}
+
+		return empty( $by_context ) || in_array( $this->get_current_context(), $by_context, true );
+	}
+
+	/**
+	 * Whether a query (and a type) should be logged or not
+	 *
+	 * @since 3.1.0
+	 * @param array  $query Remote request arguments
+	 * @param string $type  Query type
+	 * @return boolean
+	 */
+	protected function should_log_by_status( array $query, string $type ) : bool {
+		if ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK ) {
+			$by_status = get_site_option( 'ep_query_log_by_status', 'failed' );
+		} else {
+			$by_status = get_option( 'ep_query_log_by_status', 'failed' );
+		}
+
+		if ( 'all' === $by_status ) {
+			return true;
+		}
+
+		/**
+		 * This filter allows you to map query types to callables. If the callable returns true,
+		 * that query will be logged.
+		 *
+		 * @var   array
+		 * @since 1.3
+		 * @since 2.1.0 Added `bulk_index`
+		 */
+		$allowed_log_types = apply_filters(
+			'ep_debug_bar_allowed_log_types',
+			array(
+				'put_mapping'          => array( $this, 'is_query_error' ),
+				'delete_network_alias' => array( $this, 'is_query_error' ),
+				'create_network_alias' => array( $this, 'is_query_error' ),
+				'bulk_index'           => array( $this, 'is_bulk_index_error' ),
+				'bulk_index_posts'     => array( $this, 'is_query_error' ),
+				'delete_index'         => array( $this, 'maybe_log_delete_index' ),
+				'create_pipeline'      => array( $this, 'is_query_error' ),
+				'get_pipeline'         => array( $this, 'is_query_error' ),
+				'query'                => array( $this, 'is_query_error' ),
+			),
+			$query,
+			$type
+		);
+
+		if ( ! isset( $allowed_log_types[ $type ] ) ) {
+			return false;
+		}
+
+		return call_user_func( $allowed_log_types[ $type ], $query );
+	}
 }

From ad5854cf36b64378f56d38cf3d624c0efbde16d2 Mon Sep 17 00:00:00 2001
From: Felipe Elia <felipe.elia@get10up.com>
Date: Wed, 13 Sep 2023 13:16:54 -0300
Subject: [PATCH 08/22] Set limits for loggin

---
 classes/QueryLog.php | 160 +++++++++++++++++++++++++++++--------------
 1 file changed, 109 insertions(+), 51 deletions(-)

diff --git a/classes/QueryLog.php b/classes/QueryLog.php
index f61e442..4dd32c6 100644
--- a/classes/QueryLog.php
+++ b/classes/QueryLog.php
@@ -9,6 +9,8 @@
 
 namespace DebugBarElasticPress;
 
+use ElasticPress\Utils;
+
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -31,6 +33,7 @@ public function setup() {
 		add_action( 'ep_remote_request', array( $this, 'log_query' ), 10, 2 );
 		add_action( 'admin_init', array( $this, 'action_admin_init' ) );
 		add_action( 'admin_init', array( $this, 'maybe_clear_log' ) );
+		add_action( 'init', array( $this, 'maybe_disable' ) );
 
 		/**
 		 * Handle query storage as JSON strings.
@@ -57,7 +60,7 @@ public function action_admin_init() {
 		if ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK && isset( $_POST['ep_enable_logging'] ) ) {
 			check_admin_referer( 'ep-debug-options' );
 
-			update_site_option( 'ep_enable_logging', (int) $_POST['ep_enable_logging'] );
+			update_site_option( 'ep_enable_logging', $this->sanitize_enable_logging( $_POST['ep_enable_logging'] ) );
 			update_site_option( 'ep_query_log_by_status', sanitize_text_field( $_POST['ep_query_log_by_status'] ) );
 			if ( ! empty( $_POST['ep_query_log_by_context'] ) ) {
 				update_site_option( 'ep_query_log_by_context', array_map( 'sanitize_text_field', $_POST['ep_query_log_by_context'] ) );
@@ -68,21 +71,17 @@ public function action_admin_init() {
 			register_setting(
 				'ep-debug',
 				'ep_enable_logging',
-				[ 'sanitize_callback' => 'intval' ]
+				[ 'sanitize_callback' => [ $this, 'sanitize_enable_logging' ] ]
 			);
 			register_setting(
 				'ep-debug',
 				'ep_query_log_by_status',
-				[
-					'type'              => 'string',
-					'sanitize_callback' => 'sanitize_text_field',
-				]
+				[ 'sanitize_callback' => 'sanitize_text_field' ]
 			);
 			register_setting(
 				'ep-debug',
 				'ep_query_log_by_context',
 				[
-					'type'              => 'array',
 					'sanitize_callback' => function ( $value ) {
 						return ! empty( $value ) ? array_map( 'sanitize_text_field', $value ) : [];
 					},
@@ -101,11 +100,7 @@ public function maybe_clear_log() {
 			return;
 		}
 
-		if ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK ) {
-			delete_site_option( 'ep_query_log' );
-		} else {
-			delete_option( 'ep_query_log' );
-		}
+		Utils\delete_option( 'ep_query_log' );
 
 		wp_safe_redirect( remove_query_arg( 'ep_clear_query_log' ) );
 		exit();
@@ -187,22 +182,19 @@ public function log_query( $query, $type ) {
 			return;
 		}
 
-		if ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK ) {
-			$log = get_site_option( 'ep_query_log', array() );
-		} else {
-			$log = get_option( 'ep_query_log', array() );
-		}
+		$log = Utils\get_option( 'ep_query_log', [] );
 
 		$log[] = array(
 			'query' => $query,
 			'type'  => $type,
 		);
 
-		if ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK ) {
-			update_site_option( 'ep_query_log', $log );
-		} else {
-			update_option( 'ep_query_log', $log );
+		// Storing this log would exceed the limit
+		if ( mb_strlen( maybe_serialize( $log ) ) > $this->get_logging_storage_limit() ) {
+			return;
 		}
+
+		Utils\update_option( 'ep_query_log', $log );
 	}
 
 	/**
@@ -211,17 +203,10 @@ public function log_query( $query, $type ) {
 	 * @since 1.3
 	 */
 	public function screen_options() {
-		if ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK ) {
-			$log        = get_site_option( 'ep_query_log', array() );
-			$enabled    = get_site_option( 'ep_enable_logging' );
-			$by_status  = get_site_option( 'ep_query_log_by_status', 'failed' );
-			$by_context = get_site_option( 'ep_query_log_by_context', [] );
-		} else {
-			$log        = get_option( 'ep_query_log', array() );
-			$enabled    = get_option( 'ep_enable_logging' );
-			$by_status  = get_option( 'ep_query_log_by_status', 'failed' );
-			$by_context = get_option( 'ep_query_log_by_context', [] );
-		}
+		$log        = Utils\get_option( 'ep_query_log', array() );
+		$enabled    = Utils\get_option( 'ep_enable_logging' );
+		$by_status  = Utils\get_option( 'ep_query_log_by_status', 'failed' );
+		$by_context = Utils\get_option( 'ep_query_log_by_context', [] );
 
 		if ( is_array( $log ) ) {
 			$log = array_reverse( $log );
@@ -232,6 +217,8 @@ public function screen_options() {
 		if ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK ) {
 			$action = '';
 		}
+
+		$is_time_limit = ! empty( $enabled ) && ! in_array( $enabled, [ '0', 0, '-1' ], true );
 		?>
 
 		<div class="wrap">
@@ -244,14 +231,32 @@ public function screen_options() {
 				<table class="form-table">
 					<tbody>
 						<tr>
-							<th scope="row"><label for="ep_enable_logging"><?php esc_html_e( 'Enable or disable query logging:', 'debug-bar-elasticpress' ); ?></label></th>
+							<th scope="row">
+								<label for="ep_enable_logging">
+									<?php esc_html_e( 'Enable or disable query logging:', 'debug-bar-elasticpress' ); ?>
+								</label>
+							</th>
 							<td>
 								<select name="ep_enable_logging" id="ep_enable_logging">
 									<option value="0"><?php esc_html_e( 'Disable', 'debug-bar-elasticpress' ); ?></option>
-									<option <?php selected( 1, $enabled ); ?> value="1"><?php esc_html_e( 'Enable', 'debug-bar-elasticpress' ); ?></option>
+									<option <?php selected( $is_time_limit ); ?> value="time_limit"><?php esc_html_e( 'Enable for 5 minutes', 'debug-bar-elasticpress' ); ?></option>
+									<option <?php selected( '-1', $enabled ); ?> value="-1"><?php esc_html_e( 'Keep enabled', 'debug-bar-elasticpress' ); ?></option>
 								</select>
 								<br>
-								<span class="description"><?php echo wp_kses_post( __( 'Note that query logging can have <strong>severe</strong> performance implications on your website. We generally recommend only enabling logging during dashboard indexing and disabling after.', 'debug-bar-elasticpress' ) ); ?></span>
+								<span class="description">
+									<?php
+									echo wp_kses_post( __( 'Note that query logging can have <strong>severe</strong> performance implications on your website.', 'debug-bar-elasticpress' ) );
+									if ( $is_time_limit ) {
+										echo ' ' . wp_kses_post(
+											sprintf(
+												/* translators: date */
+												__( 'Logging queries until <strong>%s</strong>.', 'debug-bar-elasticpress' ),
+												wp_date( 'Y-m-d H:i:s', $enabled )
+											)
+										);
+									}
+									?>
+								</span>
 							</td>
 						</tr>
 						<tr>
@@ -287,6 +292,18 @@ public function screen_options() {
 					</tbody>
 				</table>
 
+				<p>
+					<?php
+					echo wp_kses_post(
+						sprintf(
+							/* translators: Current limit */
+							__( 'Please note that logs are stored until the storage limit is reached. The current limit is: <strong>%s</strong>', 'debug-bar-elasticpress' ),
+							size_format( $this->get_logging_storage_limit() )
+						)
+					);
+					?>
+				</p>
+
 				<p class="submit">
 					<input type="submit" name="submit" id="submit" class="button button-primary" value="<?php esc_attr_e( 'Save Changes', 'debug-bar-elasticpress' ); ?>">
 
@@ -477,11 +494,7 @@ protected function determine_request_query_type( array $request_args, string $pa
 	 * @return boolean
 	 */
 	protected function is_enabled() : bool {
-		if ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK ) {
-			$enabled = get_site_option( 'ep_enable_logging' );
-		} else {
-			$enabled = get_option( 'ep_enable_logging' );
-		}
+		$enabled = Utils\get_option( 'ep_enable_logging' );
 
 		return ! empty( $enabled );
 	}
@@ -493,11 +506,7 @@ protected function is_enabled() : bool {
 	 * @return boolean
 	 */
 	protected function should_log_by_context() {
-		if ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK ) {
-			$by_context = get_site_option( 'ep_query_log_by_context', [] );
-		} else {
-			$by_context = get_option( 'ep_query_log_by_context', [] );
-		}
+		$by_context = Utils\get_option( 'ep_query_log_by_context', [] );
 
 		return empty( $by_context ) || in_array( $this->get_current_context(), $by_context, true );
 	}
@@ -510,12 +519,8 @@ protected function should_log_by_context() {
 	 * @param string $type  Query type
 	 * @return boolean
 	 */
-	protected function should_log_by_status( array $query, string $type ) : bool {
-		if ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK ) {
-			$by_status = get_site_option( 'ep_query_log_by_status', 'failed' );
-		} else {
-			$by_status = get_option( 'ep_query_log_by_status', 'failed' );
-		}
+	protected function should_log_by_status( array $query, $type ) : bool {
+		$by_status = Utils\get_option( 'ep_query_log_by_status', 'failed' );
 
 		if ( 'all' === $by_status ) {
 			return true;
@@ -552,4 +557,57 @@ protected function should_log_by_status( array $query, string $type ) : bool {
 
 		return call_user_func( $allowed_log_types[ $type ], $query );
 	}
+
+	/**
+	 * Return the size limit for stored logs
+	 *
+	 * @since 3.1.0
+	 * @return integer
+	 */
+	protected function get_logging_storage_limit() : int {
+		/**
+		 * Filter the log size limit
+		 *
+		 * @since  3.1.0
+		 * @hook ep_debug_bar_log_size_limit
+		 * @param  {int} $number Log size limit
+		 * @return {int} New limit
+		 */
+		return apply_filters( 'ep_debug_bar_log_size_limit', MB_IN_BYTES );
+	}
+
+	/**
+	 * Conditionally disable logging based on period
+	 *
+	 * @since 3.1.0
+	 */
+	public function maybe_disable() {
+		$enabled = Utils\get_option( 'ep_enable_logging' );
+
+		$is_time_limit = ! empty( $enabled ) && ! in_array( $enabled, [ '0', 0, '-1' ], true );
+		if ( ! $is_time_limit || $enabled > wp_date( 'U' ) ) {
+			return;
+		}
+
+		Utils\update_option( 'ep_enable_logging', 0 );
+	}
+
+	/**
+	 * Sanitize the ep_enable_logging option, conditionally setting it as a time limit
+	 *
+	 * @since 3.1.0
+	 * @param mixed $value Value sent
+	 * @return mixed
+	 */
+	public function sanitize_enable_logging( $value ) {
+		$value = sanitize_text_field( $_POST['ep_enable_logging'] );
+
+		if ( 'time_limit' === $value ) {
+			$value = wp_date( 'U', strtotime( '+5 minutes' ) );
+		} else {
+			$value = (int) ! empty( $value );
+		}
+
+		return $value;
+	}
 }

From 760985a7cd5f8baef0095ad749b8a2c68e0a6e16 Mon Sep 17 00:00:00 2001
From: Felipe Elia <felipe.elia@get10up.com>
Date: Wed, 13 Sep 2023 18:01:42 -0300
Subject: [PATCH 09/22] Add support to Query Monitor

---
 assets/css/main.css                   |  35 ++++++---
 classes/CommonPanel.php               |  78 ++++++++++++++++++++
 classes/EP_Debug_Bar_ElasticPress.php |  29 +++-----
 classes/QueryMonitorCollector.php     |  23 ++++++
 classes/QueryMonitorOutput.php        | 101 ++++++++++++++++++++++++++
 debug-bar-elasticpress.php            |  45 +++++++++++-
 6 files changed, 281 insertions(+), 30 deletions(-)
 create mode 100644 classes/CommonPanel.php
 create mode 100644 classes/QueryMonitorCollector.php
 create mode 100644 classes/QueryMonitorOutput.php

diff --git a/assets/css/main.css b/assets/css/main.css
index 1d27389..f8f5d42 100755
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -69,17 +69,14 @@
 	clear: left;
 }
 
-#query-monitor-main .qm-debug-bar {
-	margin: 20px;
-}
-
 /* stylelint-disable selector-id-pattern */
 
 /* The giant list of selectors here is needed to
  * override QM's important rules
  */
 #debug-menu-target-EP_Debug_Bar_ElasticPress .button,
-#debug-menu-target-EP_Debug_Bar_ElasticPress a.button {
+#debug-menu-target-EP_Debug_Bar_ElasticPress a.button,
+#qm-elasticpress .button {
 	background: #f6f7f7 !important;
 	border: 1px solid #2271b1 !important;
 	border-radius: 3px !important;
@@ -97,7 +94,7 @@
 }
 
 #debug-menu-target-EP_Debug_Bar_ElasticPress .button:hover,
-#query-monitor-main #qm-debug_bar_ep_debug_bar_elasticpress .button:hover {
+#query-monitor-main #qm-elasticpress .button:hover {
 	background: #f0f0f1;
 	border-color: #0a4b78;
 	color: #0a4b78 !important;
@@ -105,29 +102,47 @@
 }
 
 #debug-menu-target-EP_Debug_Bar_ElasticPress .button:active,
-#query-monitor-main #qm-debug_bar_ep_debug_bar_elasticpress .button:hover {
+#query-monitor-main #qm-elasticpress .button:hover {
 	background: #f6f7f7 !important;
 	border-color: #8c8f94 !important;
 	box-shadow: none;
 }
 
-#debug-menu-target-EP_Debug_Bar_ElasticPress .button:focus {
+#debug-menu-target-EP_Debug_Bar_ElasticPress .button:focus,
+#query-monitor-main #qm-elasticpress .button:focus {
 	outline: none;
 }
 
 /* Overriding some Debug Bar "important" rules */
 #debug-menu-target-EP_Debug_Bar_ElasticPress .button-primary,
 #debug-menu-target-EP_Debug_Bar_ElasticPress a.button-primary,
-#debug-menu-target-EP_Debug_Bar_ElasticPress button.button-primary {
+#debug-menu-target-EP_Debug_Bar_ElasticPress button.button-primary,
+#query-monitor-main #qm-elasticpress .button-primary {
 	background: #007cba !important;
 	border: 1px solid #007cba !important;
 	color: #fff !important;
 }
 
 #debug-menu-target-EP_Debug_Bar_ElasticPress a.button-primary:hover,
-#debug-menu-target-EP_Debug_Bar_ElasticPress a.button-primary:focus {
+#debug-menu-target-EP_Debug_Bar_ElasticPress a.button-primary:focus,
+#query-monitor-main #qm-elasticpress a.button-primary:hover,
+#query-monitor-main #qm-elasticpress a.button-primary:focus {
+	background: #007cba !important;
 	color: #fff !important;
 	text-decoration: none !important;
 }
 
+#query-monitor-main #qm-elasticpress h3,
+#query-monitor-main #qm-elasticpress p {
+	margin: 0 !important;
+	padding: 0 !important;
+	text-align: center !important;
+}
+
+#query-monitor-main #qm-elasticpress li {
+	border-top: 1px solid var(--qm-panel-separator) !important;
+	line-height: 20px !important;
+	padding: 20px 0 !important;
+}
+
 /* stylelint-enable selector-id-pattern */
diff --git a/classes/CommonPanel.php b/classes/CommonPanel.php
new file mode 100644
index 0000000..af1142e
--- /dev/null
+++ b/classes/CommonPanel.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * CommonPanel class file.
+ *
+ * @since 3.1.0
+ * @package DebugBarElasticPress
+ */
+
+namespace DebugBarElasticPress;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * CommonPanel class.
+ */
+class CommonPanel {
+	/**
+	 * Panel menu title
+	 *
+	 * @var string
+	 */
+	public $title = '';
+
+	/**
+	 * Class constructor
+	 */
+	public function __construct() {
+		$this->title = esc_html__( 'ElasticPress', 'debug-bar-elasticpress' );
+	}
+
+	/**
+	 * Enqueue assets
+	 */
+	public function enqueue_assets() {
+		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts_styles' ) );
+		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts_styles' ) );
+	}
+
+	/**
+	 * Return the panel title
+	 *
+	 * @return string
+	 */
+	public function get_title() : string {
+		return $this->title;
+	}
+	/**
+	 * Enqueue scripts for front end and admin
+	 */
+	public function enqueue_scripts_styles() {
+		if ( ! is_user_logged_in() ) {
+			return;
+		}
+
+		wp_enqueue_script( 'debug-bar-elasticpress', EP_DEBUG_URL . 'assets/js/main.js', array( 'wp-dom-ready', 'clipboard' ), EP_DEBUG_VERSION, true );
+		wp_enqueue_style( 'debug-bar-elasticpress', EP_DEBUG_URL . 'assets/css/main.css', array(), EP_DEBUG_VERSION );
+	}
+
+	/**
+	 * Show the contents of the panel
+	 */
+	public function render() {
+		$queries = \ElasticPress\Elasticsearch::factory()->get_query_log();
+
+		if ( function_exists( '\ElasticPress\Utils\is_indexing' ) && \ElasticPress\Utils\is_indexing() ) {
+			?>
+			<div class="ep-debug-bar-warning">
+				<?php esc_html_e( 'ElasticPress is currently indexing.', 'debug-bar-elasticpress' ); ?>
+			</div>
+			<?php
+		}
+
+		$debug_bar_output = new \DebugBarElasticPress\QueryOutput( $queries );
+		$debug_bar_output->render_buttons();
+		$debug_bar_output->render_additional_buttons();
+		$debug_bar_output->render_queries();
+	}
+}
diff --git a/classes/EP_Debug_Bar_ElasticPress.php b/classes/EP_Debug_Bar_ElasticPress.php
index 61d3e5c..6536290 100755
--- a/classes/EP_Debug_Bar_ElasticPress.php
+++ b/classes/EP_Debug_Bar_ElasticPress.php
@@ -24,26 +24,28 @@ class EP_Debug_Bar_ElasticPress extends \Debug_Bar_Panel {
 	 */
 	public $title;
 
+	/**
+	 * Common panel instance
+	 *
+	 * @var \DebugBarElasticPress\CommonPanel
+	 */
+	protected $common_panel;
+
 	/**
 	 * Initial debug bar stuff
 	 */
 	public function init() {
 		$this->title( esc_html__( 'ElasticPress', 'debug-bar-elasticpress' ) );
 
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts_styles' ) );
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts_styles' ) );
+		$this->common_panel = \DebugBarElasticPress\get_common_panel();
+		$this->common_panel->enqueue_assets();
 	}
 
 	/**
 	 * Enqueue scripts for front end and admin
 	 */
 	public function enqueue_scripts_styles() {
-		if ( ! is_user_logged_in() ) {
-			return;
-		}
-
-		wp_enqueue_script( 'debug-bar-elasticpress', EP_DEBUG_URL . 'assets/js/main.js', array( 'wp-dom-ready', 'clipboard' ), EP_DEBUG_VERSION, true );
-		wp_enqueue_style( 'debug-bar-elasticpress', EP_DEBUG_URL . 'assets/css/main.css', array(), EP_DEBUG_VERSION );
+		_deprecated_function( __METHOD__, '3.1.0', 'DebugBarElasticPress\EP_Panel::enqueue_scripts_styles()' );
 	}
 
 	/**
@@ -85,16 +87,7 @@ public function render() {
 			?>
 		</h2>
 
-		<?php if ( function_exists( '\ElasticPress\Utils\is_indexing' ) && \ElasticPress\Utils\is_indexing() ) : ?>
-			<div class="ep-debug-bar-warning">
-				<?php esc_html_e( 'ElasticPress is currently indexing.', 'debug-bar-elasticpress' ); ?>
-			</div>
-		<?php endif; ?>
-
 		<?php
-		$debug_bar_output = new \DebugBarElasticPress\QueryOutput( $queries );
-		$debug_bar_output->render_buttons();
-		$debug_bar_output->render_additional_buttons();
-		$debug_bar_output->render_queries();
+		$this->common_panel->render();
 	}
 }
diff --git a/classes/QueryMonitorCollector.php b/classes/QueryMonitorCollector.php
new file mode 100644
index 0000000..0e177ce
--- /dev/null
+++ b/classes/QueryMonitorCollector.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * QueryMonitorCollector class file.
+ *
+ * @since 3.1.0
+ * @package DebugBarElasticPress
+ */
+
+namespace DebugBarElasticPress;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * QueryMonitorCollector class.
+ */
+class QueryMonitorCollector extends \QM_Collector {
+	/**
+	 * Collector ID
+	 *
+	 * @var string
+	 */
+	public $id = 'elasticpress';
+}
diff --git a/classes/QueryMonitorOutput.php b/classes/QueryMonitorOutput.php
new file mode 100644
index 0000000..1d32783
--- /dev/null
+++ b/classes/QueryMonitorOutput.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * QueryMonitorOutput class file.
+ *
+ * @since 3.1.0
+ * @package DebugBarElasticPress
+ */
+
+namespace DebugBarElasticPress;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * QueryMonitorOutput class.
+ */
+class QueryMonitorOutput extends \QM_Output_Html {
+	/**
+	 * Common panel instance
+	 *
+	 * @var CommonPanel
+	 */
+	protected $common_panel;
+
+	/**
+	 * Class constructor
+	 *
+	 * @param QueryMonitorCollector $collector Our QM Collector
+	 */
+	public function __construct( QueryMonitorCollector $collector ) {
+		parent::__construct( $collector );
+
+		$this->common_panel = \DebugBarElasticPress\get_common_panel();
+
+		add_filter( 'qm/output/menus', [ $this, 'admin_menu' ] );
+	}
+
+	/**
+	 * Panel title
+	 *
+	 * @return string
+	 */
+	public function name() : string {
+		return $this->common_panel->get_title();
+	}
+
+	/**
+	 * Echoes the output
+	 *
+	 * @return void
+	 */
+	public function output() {
+		?>
+		<div class="qm qm-non-tabular qm-debug-bar qm-panel-show" id="<?php echo esc_attr( $this->collector->id() ); ?>">
+			<?php $this->render_summary(); ?>
+			<?php $this->common_panel->render(); ?>
+		</div>
+		<?php
+	}
+
+	/**
+	 * Render the summary in Query Monitor format
+	 *
+	 * @return void
+	 */
+	protected function render_summary() {
+		$queries          = \ElasticPress\Elasticsearch::factory()->get_query_log();
+		$total_query_time = 0;
+
+		foreach ( $queries as $query ) {
+			if ( ! empty( $query['time_start'] ) && ! empty( $query['time_finish'] ) ) {
+				$total_query_time += ( $query['time_finish'] - $query['time_start'] );
+			}
+		}
+		?>
+		<div class="qm-boxed">
+			<section>
+				<h3>
+					<?php esc_html_e( 'Total ElasticPress Queries:', 'debug-bar-elasticpress' ); ?>
+				</h3>
+				<p><?php echo count( $queries ); ?></p>
+			</section>
+			<section>
+				<h3>
+					<?php esc_html_e( 'Total Blocking ElasticPress Query Time:', 'debug-bar-elasticpress' ); ?>
+				</h3>
+				<p>
+					<?php
+					echo esc_html(
+						sprintf(
+							/* translators: time spent */
+							__( '%d ms', 'debug-bar-elasticpress' ),
+							(int) ( $total_query_time * 1000 )
+						)
+					);
+					?>
+				</p>
+			</section>
+		</div>
+		<?php
+	}
+}
diff --git a/debug-bar-elasticpress.php b/debug-bar-elasticpress.php
index f3ed1d0..dfb40aa 100755
--- a/debug-bar-elasticpress.php
+++ b/debug-bar-elasticpress.php
@@ -48,6 +48,22 @@ function( $class ) {
 	}
 );
 
+/**
+ * Get the panel common to both Query Monitor and Debug Bar.
+ *
+ * @since 3.1.0
+ * @return CommonPanel
+ */
+function get_common_panel() {
+	static $common_panel = null;
+
+	if ( ! $common_panel ) {
+		$common_panel = new CommonPanel();
+	}
+
+	return $common_panel;
+}
+
 /**
  * Setup plugin
  *
@@ -63,8 +79,16 @@ function setup() {
 		return;
 	}
 
-	add_filter( 'debug_bar_panels', $n( 'add_debug_bar_panel' ) );
-	add_filter( 'debug_bar_statuses', $n( 'add_debug_bar_stati' ) );
+	// If Query Monitor is active, do not add the Debug Bar panel (it will be potentially duplicated otherwise)
+	if ( class_exists( '\QM_Collectors' ) ) {
+		\QM_Collectors::add( new QueryMonitorCollector() );
+		add_filter( 'qm/outputter/html', $n( 'register_qm_output' ) );
+		add_action( 'qm/output/enqueued-assets', [ get_common_panel(), 'enqueue_assets' ] );
+	} else {
+		add_filter( 'debug_bar_panels', $n( 'add_debug_bar_panel' ) );
+		add_filter( 'debug_bar_statuses', $n( 'add_debug_bar_stati' ) );
+	}
+
 	add_filter( 'ep_formatted_args', $n( 'add_explain_args' ), 10, 2 );
 
 	add_action( 'wp', $n( 'retrieve_raw_document_from_es' ) );
@@ -192,3 +216,20 @@ function retrieve_raw_document_from_es() {
 
 	\ElasticPress\Indexables::factory()->get( 'post' )->get( get_the_ID() );
 }
+
+/**
+ * Include our QM Output
+ *
+ * @since 3.1.0
+ * @param array $output Array of registered output
+ * @return array
+ */
+function register_qm_output( $output ) {
+	$collector = \QM_Collectors::get( 'elasticpress' );
+
+	if ( $collector ) {
+		$output['elasticpress'] = new QueryMonitorOutput( $collector );
+	}
+
+	return $output;
+}

From 12560aac304b5ee3c472be57dbaf1d8bc0724d77 Mon Sep 17 00:00:00 2001
From: Felipe Elia <felipe.elia@get10up.com>
Date: Thu, 14 Sep 2023 09:18:30 -0300
Subject: [PATCH 10/22] Adjust styles

---
 assets/css/main.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/assets/css/main.css b/assets/css/main.css
index f8f5d42..ea39970 100755
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -5,6 +5,10 @@
 	padding: 0.5em 10px;
 }
 
+.ep-queries-debug pre {
+	padding: 10px;
+}
+
 .ep-queries-debug .dashicons {
 	cursor: pointer;
 }

From 1b8726dae63cee8591463c26b4ec35ba058b533a Mon Sep 17 00:00:00 2001
From: Felipe Elia <felipe.elia@get10up.com>
Date: Thu, 14 Sep 2023 09:21:11 -0300
Subject: [PATCH 11/22] Simplify assets enqueue

---
 classes/CommonPanel.php               |  8 --------
 classes/EP_Debug_Bar_ElasticPress.php |  2 +-
 classes/QueryLog.php                  | 27 +++++++++++++++++++++++++--
 debug-bar-elasticpress.php            |  2 +-
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/classes/CommonPanel.php b/classes/CommonPanel.php
index af1142e..bdfd655 100644
--- a/classes/CommonPanel.php
+++ b/classes/CommonPanel.php
@@ -28,14 +28,6 @@ public function __construct() {
 		$this->title = esc_html__( 'ElasticPress', 'debug-bar-elasticpress' );
 	}
 
-	/**
-	 * Enqueue assets
-	 */
-	public function enqueue_assets() {
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts_styles' ) );
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts_styles' ) );
-	}
-
 	/**
 	 * Return the panel title
 	 *
diff --git a/classes/EP_Debug_Bar_ElasticPress.php b/classes/EP_Debug_Bar_ElasticPress.php
index 6536290..a4dd499 100755
--- a/classes/EP_Debug_Bar_ElasticPress.php
+++ b/classes/EP_Debug_Bar_ElasticPress.php
@@ -38,7 +38,7 @@ public function init() {
 		$this->title( esc_html__( 'ElasticPress', 'debug-bar-elasticpress' ) );
 
 		$this->common_panel = \DebugBarElasticPress\get_common_panel();
-		$this->common_panel->enqueue_assets();
+		$this->common_panel->enqueue_scripts_styles();
 	}
 
 	/**
diff --git a/classes/QueryLog.php b/classes/QueryLog.php
index 7b78b0d..81f2c97 100644
--- a/classes/QueryLog.php
+++ b/classes/QueryLog.php
@@ -31,6 +31,7 @@ public function setup() {
 		add_action( 'ep_remote_request', array( $this, 'log_query' ), 10, 2 );
 		add_action( 'admin_init', array( $this, 'action_admin_init' ) );
 		add_action( 'admin_init', array( $this, 'maybe_clear_log' ) );
+		add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
 
 		/**
 		 * Handle query storage as JSON strings.
@@ -86,11 +87,18 @@ public function maybe_clear_log() {
 	/**
 	 * Add options page
 	 *
-	 * @since  1.3
+	 * @since 1.3
 	 * @return void
 	 */
 	public function action_admin_menu() {
-		add_submenu_page( 'elasticpress', esc_html__( 'Query Log', 'debug-bar-elasticpress' ), esc_html__( 'Query Log', 'debug-bar-elasticpress' ), 'manage_options', 'ep-query-log', array( $this, 'screen_options' ) );
+		add_submenu_page(
+			'elasticpress',
+			esc_html__( 'Query Log', 'debug-bar-elasticpress' ),
+			esc_html__( 'Query Log', 'debug-bar-elasticpress' ),
+			'manage_options',
+			'ep-query-log',
+			array( $this, 'screen_options' )
+		);
 	}
 
 	/**
@@ -394,6 +402,21 @@ public function maybe_add_request_query_type( array $request_args, string $path,
 		return $request_args;
 	}
 
+	/**
+	 * Enqueue assets if we are in the correct admin screen
+	 *
+	 * @since 3.1.0
+	 */
+	public function admin_enqueue_scripts() {
+		$current_screen = get_current_screen();
+
+		if ( ! isset( $current_screen->id ) || 'elasticpress_page_ep-query-log' !== $current_screen->id ) {
+			return;
+		}
+
+		get_common_panel()->enqueue_scripts_styles();
+	}
+
 	/**
 	 * Conditionally add the request type to the request args (for query requests)
 	 *
diff --git a/debug-bar-elasticpress.php b/debug-bar-elasticpress.php
index dfb40aa..8b1baa4 100755
--- a/debug-bar-elasticpress.php
+++ b/debug-bar-elasticpress.php
@@ -83,7 +83,7 @@ function setup() {
 	if ( class_exists( '\QM_Collectors' ) ) {
 		\QM_Collectors::add( new QueryMonitorCollector() );
 		add_filter( 'qm/outputter/html', $n( 'register_qm_output' ) );
-		add_action( 'qm/output/enqueued-assets', [ get_common_panel(), 'enqueue_assets' ] );
+		add_action( 'qm/output/enqueued-assets', [ get_common_panel(), 'enqueue_scripts_styles' ] );
 	} else {
 		add_filter( 'debug_bar_panels', $n( 'add_debug_bar_panel' ) );
 		add_filter( 'debug_bar_statuses', $n( 'add_debug_bar_stati' ) );

From e146f0148eea339fd7ee25dcbca2df4d5fd559c0 Mon Sep 17 00:00:00 2001
From: Felipe Elia <felipe.elia@get10up.com>
Date: Thu, 14 Sep 2023 09:30:03 -0300
Subject: [PATCH 12/22] Remove get_common_panel()

---
 classes/EP_Debug_Bar_ElasticPress.php |  2 +-
 classes/QueryLog.php                  |  2 +-
 classes/QueryMonitorOutput.php        |  2 +-
 debug-bar-elasticpress.php            | 18 +-----------------
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/classes/EP_Debug_Bar_ElasticPress.php b/classes/EP_Debug_Bar_ElasticPress.php
index a4dd499..ed0ab2b 100755
--- a/classes/EP_Debug_Bar_ElasticPress.php
+++ b/classes/EP_Debug_Bar_ElasticPress.php
@@ -37,7 +37,7 @@ class EP_Debug_Bar_ElasticPress extends \Debug_Bar_Panel {
 	public function init() {
 		$this->title( esc_html__( 'ElasticPress', 'debug-bar-elasticpress' ) );
 
-		$this->common_panel = \DebugBarElasticPress\get_common_panel();
+		$this->common_panel = new \DebugBarElasticPress\CommonPanel();
 		$this->common_panel->enqueue_scripts_styles();
 	}
 
diff --git a/classes/QueryLog.php b/classes/QueryLog.php
index 81f2c97..99ca05e 100644
--- a/classes/QueryLog.php
+++ b/classes/QueryLog.php
@@ -414,7 +414,7 @@ public function admin_enqueue_scripts() {
 			return;
 		}
 
-		get_common_panel()->enqueue_scripts_styles();
+		( new CommonPanel() )->enqueue_scripts_styles();
 	}
 
 	/**
diff --git a/classes/QueryMonitorOutput.php b/classes/QueryMonitorOutput.php
index 1d32783..4a211bb 100644
--- a/classes/QueryMonitorOutput.php
+++ b/classes/QueryMonitorOutput.php
@@ -29,7 +29,7 @@ class QueryMonitorOutput extends \QM_Output_Html {
 	public function __construct( QueryMonitorCollector $collector ) {
 		parent::__construct( $collector );
 
-		$this->common_panel = \DebugBarElasticPress\get_common_panel();
+		$this->common_panel = new CommonPanel();
 
 		add_filter( 'qm/output/menus', [ $this, 'admin_menu' ] );
 	}
diff --git a/debug-bar-elasticpress.php b/debug-bar-elasticpress.php
index 8b1baa4..06a09d8 100755
--- a/debug-bar-elasticpress.php
+++ b/debug-bar-elasticpress.php
@@ -48,22 +48,6 @@ function( $class ) {
 	}
 );
 
-/**
- * Get the panel common to both Query Monitor and Debug Bar.
- *
- * @since 3.1.0
- * @return CommonPanel
- */
-function get_common_panel() {
-	static $common_panel = null;
-
-	if ( ! $common_panel ) {
-		$common_panel = new CommonPanel();
-	}
-
-	return $common_panel;
-}
-
 /**
  * Setup plugin
  *
@@ -83,7 +67,7 @@ function setup() {
 	if ( class_exists( '\QM_Collectors' ) ) {
 		\QM_Collectors::add( new QueryMonitorCollector() );
 		add_filter( 'qm/outputter/html', $n( 'register_qm_output' ) );
-		add_action( 'qm/output/enqueued-assets', [ get_common_panel(), 'enqueue_scripts_styles' ] );
+		add_action( 'qm/output/enqueued-assets', [ new CommonPanel(), 'enqueue_scripts_styles' ] );
 	} else {
 		add_filter( 'debug_bar_panels', $n( 'add_debug_bar_panel' ) );
 		add_filter( 'debug_bar_statuses', $n( 'add_debug_bar_stati' ) );

From dee5a365a937954bfe4658cbf250cedc0fcf9faa Mon Sep 17 00:00:00 2001
From: Felipe Elia <felipe.elia@get10up.com>
Date: Thu, 14 Sep 2023 13:48:48 -0300
Subject: [PATCH 13/22] Bump version (3.0.0 => 3.1.0)

---
 debug-bar-elasticpress.php | 4 ++--
 package-lock.json          | 4 ++--
 package.json               | 2 +-
 readme.txt                 | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debug-bar-elasticpress.php b/debug-bar-elasticpress.php
index 06a09d8..19b709e 100755
--- a/debug-bar-elasticpress.php
+++ b/debug-bar-elasticpress.php
@@ -4,7 +4,7 @@
  * Plugin URI:        https://wordpress.org/plugins/debug-bar-elasticpress
  * Description:       Extends the debug bar plugin for ElasticPress queries.
  * Author:            10up
- * Version:           3.0.0
+ * Version:           3.1.0
  * Author URI:        https://10up.com
  * Requires PHP:      7.0
  * Requires at least: 5.6
@@ -18,7 +18,7 @@
 
 namespace DebugBarElasticPress;
 
-define( 'EP_DEBUG_VERSION', '3.0.0' );
+define( 'EP_DEBUG_VERSION', '3.1.0' );
 define( 'EP_DEBUG_URL', plugin_dir_url( __FILE__ ) );
 define( 'EP_DEBUG_MIN_EP_VERSION', '4.4.0' );
 
diff --git a/package-lock.json b/package-lock.json
index ca61a74..9dc592b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "debug-bar-elasticpress",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "debug-bar-elasticpress",
-      "version": "3.0.0",
+      "version": "3.1.0",
       "license": "GPL-2.0-or-later",
       "devDependencies": {
         "@10up/stylelint-config": "2.0.2",
diff --git a/package.json b/package.json
index ea258ee..8336491 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "debug-bar-elasticpress",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Extends the Debug Bar plugin for ElasticPress queries.",
   "main": "index.js",
   "scripts": {
diff --git a/readme.txt b/readme.txt
index 3e65026..50d6493 100755
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: debug, debug bar, elasticpress, elasticsearch
 Requires at least: 4.6
 Tested up to: 6.1
 Requires PHP: 7.0
-Stable tag: 3.0.0
+Stable tag: 3.1.0
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 

From 45b8b0f881513f334361248190d90925793d9b68 Mon Sep 17 00:00:00 2001
From: Felipe Elia <felipe.elia@get10up.com>
Date: Thu, 14 Sep 2023 13:59:33 -0300
Subject: [PATCH 14/22] 3.1.0 Changelog

---
 CHANGELOG.md | 14 ++++++++++++++
 readme.txt   | 19 +++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa7a4e6..a9f2bc6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,19 @@ All notable changes to this project will be documented in this file, per [the Ke
 ### Security
 -->
 
+## [3.1.0] - 2023-09-XX
+
+### Added
+- New button to explain ES queries. Props [@burhandodhy](https://github.com/burhandodhy), [@felipeelia](https://github.com/felipeelia), and [@brandwaffle](https://github.com/brandwaffle) via [#79](https://github.com/10up/ElasticPress/pull/79).
+- New button to Reload and retrieve raw ES document. Props [@burhandodhy](https://github.com/burhandodhy), [@felipeelia](https://github.com/felipeelia), and [@brandwaffle](https://github.com/brandwaffle) via [#79](https://github.com/10up/ElasticPress/pull/79).
+- Query types (and context when listing queries in the Query Log admin screen.) Props [@felipeelia](https://github.com/felipeelia) and [@burhandodhy](https://github.com/burhandodhy) via [#82](https://github.com/10up/ElasticPress/pull/82).
+- Log query by context, status, and fixed time. Props [@felipeelia](https://github.com/felipeelia) via [#83](https://github.com/10up/ElasticPress/pull/83).
+- Official support to Query Monitor. Props [@felipeelia](https://github.com/felipeelia) via [#84](https://github.com/10up/ElasticPress/pull/84).
+
+### Security
+- Bumped `tough-cookie` from 4.1.2 to 4.1.3. Props [@dependabot](https://github.com/dependabot) via [#75](https://github.com/10up/debug-bar-elasticpress/pull/75).
+- Bumped `word-wrap` from 1.2.3 to 1.2.4. Props [@dependabot](https://github.com/dependabot) via [#76](https://github.com/10up/debug-bar-elasticpress/pull/76).
+
 ## [3.0.0] - 2023-03-23
 
 This release drops the support for older versions of ElasticPress and PHP.
@@ -83,6 +96,7 @@ This release drops the support for older versions of WordPress Core, ElasticPres
 * Initial release
 
 [Unreleased]: https://github.com/10up/debug-bar-elasticpress/compare/trunk...develop
+[3.0.0]: https://github.com/10up/debug-bar-elasticpress/compare/3.0.0...3.1.0
 [3.0.0]: https://github.com/10up/debug-bar-elasticpress/compare/2.1.1...3.0.0
 [2.1.1]: https://github.com/10up/debug-bar-elasticpress/compare/2.1.0...2.1.1
 [2.1.0]: https://github.com/10up/debug-bar-elasticpress/compare/2.0.0...2.1.0
diff --git a/readme.txt b/readme.txt
index 50d6493..ee7ca61 100755
--- a/readme.txt
+++ b/readme.txt
@@ -27,7 +27,22 @@ Adds an [ElasticPress](https://wordpress.org/plugins/elasticpress) panel to the
 
 == Changelog ==
 
-= [3.0.0] - 2023-03-23 =
+= 3.1.0 - 2023-09-XX =
+
+__Added:__
+
+* New button to explain ES queries. Props [@burhandodhy](https://github.com/burhandodhy), [@felipeelia](https://github.com/felipeelia), and [@brandwaffle](https://github.com/brandwaffle).
+* New button to Reload and retrieve raw ES document. Props [@burhandodhy](https://github.com/burhandodhy), [@felipeelia](https://github.com/felipeelia), and [@brandwaffle](https://github.com/brandwaffle).
+* Query types (and context when listing queries in the Query Log admin screen.) Props [@felipeelia](https://github.com/felipeelia) and [@burhandodhy](https://github.com/burhandodhy).
+* Log query by context, status, and fixed time. Props [@felipeelia](https://github.com/felipeelia).
+* Official support to Query Monitor. Props [@felipeelia](https://github.com/felipeelia).
+
+__Security:__
+
+* Bumped `tough-cookie` from 4.1.2 to 4.1.3. Props [@dependabot](https://github.com/dependabot).
+* Bumped `word-wrap` from 1.2.3 to 1.2.4. Props [@dependabot](https://github.com/dependabot).
+
+= 3.0.0 - 2023-03-23 =
 
 This release drops the support for older versions of ElasticPress and PHP.
 
@@ -55,7 +70,7 @@ __Security:__
 * Bumped `webpack` from 5.75.0 to 5.76.2. Props [@dependabot](https://github.com/dependabot).
 
 
-= [2.1.1] - 2022-08-04 =
+= 2.1.1 - 2022-08-04 =
 
 __Security:__
 

From f5b451e60851907a03c605df446d39fe2da26655 Mon Sep 17 00:00:00 2001
From: Felipe Elia <felipe.elia@get10up.com>
Date: Thu, 14 Sep 2023 13:59:43 -0300
Subject: [PATCH 15/22] Update maintainers

---
 CREDITS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CREDITS.md b/CREDITS.md
index bb9cace..23e839c 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -6,7 +6,7 @@ The following acknowledges the Maintainers for this repository, those who have C
 
 The following individuals are responsible for curating the list of issues, responding to pull requests, and ensuring regular releases happen.
 
-[Taylor Lovett (@tlovett1)](https://github.com/tlovett1) and [Vasken Hauri (@brandwaffle)](https://github.com/brandwaffle).
+[Vasken Hauri (@brandwaffle)](https://github.com/brandwaffle).
 
 ## Contributors
 

From d6e8a27607aec203463a35941e3761ed8cd7f993 Mon Sep 17 00:00:00 2001
From: Felipe Elia <felipe.elia@get10up.com>
Date: Thu, 14 Sep 2023 14:02:29 -0300
Subject: [PATCH 16/22] Change plugin name and description

---
 debug-bar-elasticpress.php | 4 ++--
 readme.txt                 | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debug-bar-elasticpress.php b/debug-bar-elasticpress.php
index 19b709e..a7297ef 100755
--- a/debug-bar-elasticpress.php
+++ b/debug-bar-elasticpress.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Plugin Name:       Debug Bar ElasticPress
+ * Plugin Name:       ElasticPress Debugging Add-On
  * Plugin URI:        https://wordpress.org/plugins/debug-bar-elasticpress
- * Description:       Extends the debug bar plugin for ElasticPress queries.
+ * Description:       Extends the Query Monitor and Debug Bar plugins for ElasticPress queries.
  * Author:            10up
  * Version:           3.1.0
  * Author URI:        https://10up.com
diff --git a/readme.txt b/readme.txt
index ee7ca61..dc5cc12 100755
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-=== Debug Bar ElasticPress ===
+=== ElasticPress Debugging Add-On ===
 Contributors: tlovett1, 10up
 Tags: debug, debug bar, elasticpress, elasticsearch
 Requires at least: 4.6
@@ -8,11 +8,11 @@ Stable tag: 3.1.0
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
-Extends the Debug Bar plugin for ElasticPress queries.
+Extends the Query Monitor and Debug Bar plugins for ElasticPress queries.
 
 == Description ==
 
-Adds an [ElasticPress](https://wordpress.org/plugins/elasticpress) panel to the [Debug Bar](https://wordpress.org/plugins/debug-bar/) plugin. Allows you to examine every ElasticPress query running on any given request.
+Adds an [ElasticPress](https://wordpress.org/plugins/elasticpress) panel to [Debug Bar](https://wordpress.org/plugins/debug-bar/) and/or [Query Monitor](https://wordpress.org/plugins/query-monitor/) plugins. Allows you to examine every ElasticPress query running on any given request.
 
 = Requirements: =
 

From 3d675a3420b7d8a014b7a4207796ec257e845e7d Mon Sep 17 00:00:00 2001
From: Felipe Elia <felipe.elia@get10up.com>
Date: Thu, 14 Sep 2023 14:06:16 -0300
Subject: [PATCH 17/22] Fix keep enabled logic

---
 classes/QueryLog.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/QueryLog.php b/classes/QueryLog.php
index a1a4868..a507f40 100644
--- a/classes/QueryLog.php
+++ b/classes/QueryLog.php
@@ -226,7 +226,7 @@ public function screen_options() {
 			$action = '';
 		}
 
-		$is_time_limit = ! empty( $enabled ) && ! in_array( $enabled, [ '0', 0, '-1' ], true );
+		$is_time_limit = ! empty( $enabled ) && ! in_array( $enabled, [ '0', 0, '-1', -1 ], true );
 		?>
 
 		<div class="wrap">
@@ -628,7 +628,7 @@ public function sanitize_enable_logging( $value ) {
 		if ( 'time_limit' === $value ) {
 			$value = wp_date( 'U', strtotime( '+5 minutes' ) );
 		} else {
-			$value = (int) ! empty( $value );
+			$value = ! empty( $value ) ? -1 : 0;
 		}
 
 		return $value;

From 7c0d1a92ff97540f1d1c0672c293ec8695e8009c Mon Sep 17 00:00:00 2001
From: Felipe Elia <felipe.elia@get10up.com>
Date: Thu, 14 Sep 2023 14:08:52 -0300
Subject: [PATCH 18/22] Add #86

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9f2bc6..981b434 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 - New button to explain ES queries. Props [@burhandodhy](https://github.com/burhandodhy), [@felipeelia](https://github.com/felipeelia), and [@brandwaffle](https://github.com/brandwaffle) via [#79](https://github.com/10up/ElasticPress/pull/79).
 - New button to Reload and retrieve raw ES document. Props [@burhandodhy](https://github.com/burhandodhy), [@felipeelia](https://github.com/felipeelia), and [@brandwaffle](https://github.com/brandwaffle) via [#79](https://github.com/10up/ElasticPress/pull/79).
 - Query types (and context when listing queries in the Query Log admin screen.) Props [@felipeelia](https://github.com/felipeelia) and [@burhandodhy](https://github.com/burhandodhy) via [#82](https://github.com/10up/ElasticPress/pull/82).
-- Log query by context, status, and fixed time. Props [@felipeelia](https://github.com/felipeelia) via [#83](https://github.com/10up/ElasticPress/pull/83).
+- Log query by context, status, and fixed time. Props [@felipeelia](https://github.com/felipeelia) via [#83](https://github.com/10up/ElasticPress/pull/83) and [#86](https://github.com/10up/ElasticPress/pull/86).
 - Official support to Query Monitor. Props [@felipeelia](https://github.com/felipeelia) via [#84](https://github.com/10up/ElasticPress/pull/84).
 
 ### Security

From bd644ebe5bb9125453db81ee8fe11c8c5c973a82 Mon Sep 17 00:00:00 2001
From: "mohammed.razzaq" <mohammed.razzaq@get10up.com>
Date: Wed, 20 Sep 2023 03:16:25 +0530
Subject: [PATCH 19/22] Update styling

---
 assets/css/main.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/css/main.css b/assets/css/main.css
index ea39970..4117da6 100755
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -80,7 +80,8 @@
  */
 #debug-menu-target-EP_Debug_Bar_ElasticPress .button,
 #debug-menu-target-EP_Debug_Bar_ElasticPress a.button,
-#qm-elasticpress .button {
+#qm-elasticpress .button,
+#qm-elasticpress a.button {
 	background: #f6f7f7 !important;
 	border: 1px solid #2271b1 !important;
 	border-radius: 3px !important;

From 9b5e911dfb702c58b6b6e4c2e9026b7f70af745c Mon Sep 17 00:00:00 2001
From: Felipe Elia <felipe.elia@get10up.com>
Date: Wed, 20 Sep 2023 08:46:15 -0300
Subject: [PATCH 20/22] Add #88

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 981b434..de56b8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 ## [3.1.0] - 2023-09-XX
 
 ### Added
-- New button to explain ES queries. Props [@burhandodhy](https://github.com/burhandodhy), [@felipeelia](https://github.com/felipeelia), and [@brandwaffle](https://github.com/brandwaffle) via [#79](https://github.com/10up/ElasticPress/pull/79).
+- New button to explain ES queries. Props [@burhandodhy](https://github.com/burhandodhy), [@felipeelia](https://github.com/felipeelia), [@MARQAS](https://github.com/MARQAS), and [@brandwaffle](https://github.com/brandwaffle) via [#79](https://github.com/10up/ElasticPress/pull/79) and [#88](https://github.com/10up/ElasticPress/pull/88).
 - New button to Reload and retrieve raw ES document. Props [@burhandodhy](https://github.com/burhandodhy), [@felipeelia](https://github.com/felipeelia), and [@brandwaffle](https://github.com/brandwaffle) via [#79](https://github.com/10up/ElasticPress/pull/79).
 - Query types (and context when listing queries in the Query Log admin screen.) Props [@felipeelia](https://github.com/felipeelia) and [@burhandodhy](https://github.com/burhandodhy) via [#82](https://github.com/10up/ElasticPress/pull/82).
 - Log query by context, status, and fixed time. Props [@felipeelia](https://github.com/felipeelia) via [#83](https://github.com/10up/ElasticPress/pull/83) and [#86](https://github.com/10up/ElasticPress/pull/86).

From 54d9ba09abfee123192d37f04e25928bd62ea954 Mon Sep 17 00:00:00 2001
From: Felipe Elia <felipe.elia@get10up.com>
Date: Wed, 20 Sep 2023 08:48:18 -0300
Subject: [PATCH 21/22] Update .pot file

---
 lang/debug-bar-elasticpress.pot | 193 ++++++++++++++++++++++++--------
 1 file changed, 145 insertions(+), 48 deletions(-)

diff --git a/lang/debug-bar-elasticpress.pot b/lang/debug-bar-elasticpress.pot
index d76b1bf..f1d009a 100644
--- a/lang/debug-bar-elasticpress.pot
+++ b/lang/debug-bar-elasticpress.pot
@@ -2,20 +2,20 @@
 # This file is distributed under the GPLv2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Debug Bar ElasticPress 3.0.0\n"
+"Project-Id-Version: ElasticPress Debugging Add-On 3.1.0\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/debug-bar-elasticpress\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2023-03-23T12:56:23+00:00\n"
+"POT-Creation-Date: 2023-09-20T11:47:36+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.7.1\n"
+"X-Generator: WP-CLI 2.8.1\n"
 "X-Domain: debug-bar-elasticpress\n"
 
 #. Plugin Name of the plugin
-msgid "Debug Bar ElasticPress"
+msgid "ElasticPress Debugging Add-On"
 msgstr ""
 
 #. Plugin URI of the plugin
@@ -23,7 +23,7 @@ msgid "https://wordpress.org/plugins/debug-bar-elasticpress"
 msgstr ""
 
 #. Description of the plugin
-msgid "Extends the debug bar plugin for ElasticPress queries."
+msgid "Extends the Query Monitor and Debug Bar plugins for ElasticPress queries."
 msgstr ""
 
 #. Author of the plugin
@@ -34,24 +34,25 @@ msgstr ""
 msgid "https://10up.com"
 msgstr ""
 
-#: classes/EP_Debug_Bar_ElasticPress.php:31
+#: classes/CommonPanel.php:28
+#: classes/EP_Debug_Bar_ElasticPress.php:38
 msgid "ElasticPress"
 msgstr ""
 
+#: classes/CommonPanel.php:60
+msgid "ElasticPress is currently indexing."
+msgstr ""
+
 #. translators: queries count.
-#: classes/EP_Debug_Bar_ElasticPress.php:75
+#: classes/EP_Debug_Bar_ElasticPress.php:77
 msgid "<span>Total ElasticPress Queries:</span> %d"
 msgstr ""
 
 #. translators: blocking query time.
-#: classes/EP_Debug_Bar_ElasticPress.php:83
+#: classes/EP_Debug_Bar_ElasticPress.php:85
 msgid "<span>Total Blocking ElasticPress Query Time:</span> %d ms"
 msgstr ""
 
-#: classes/EP_Debug_Bar_ElasticPress.php:90
-msgid "ElasticPress is currently indexing."
-msgstr ""
-
 #: classes/QueryFormatter.php:31
 msgid "Page URL"
 msgstr ""
@@ -88,46 +89,130 @@ msgstr ""
 msgid "Query Result"
 msgstr ""
 
-#: classes/QueryFormatter.php:50
+#: classes/QueryFormatter.php:51
 msgid "Error"
 msgstr ""
 
-#: classes/QueryFormatter.php:54
+#: classes/QueryFormatter.php:55
 msgid "Recommended Solution"
 msgstr ""
 
-#: classes/QueryLog.php:90
+#: classes/QueryLog.php:119
+#: classes/QueryLog.php:120
 msgid "Query Log"
 msgstr ""
 
-#: classes/QueryLog.php:236
+#: classes/QueryLog.php:233
 msgid "ElasticPress Query Log"
 msgstr ""
 
-#: classes/QueryLog.php:245
+#: classes/QueryLog.php:244
 msgid "Enable or disable query logging:"
 msgstr ""
 
-#: classes/QueryLog.php:248
+#: classes/QueryLog.php:249
 msgid "Disable"
 msgstr ""
 
-#: classes/QueryLog.php:249
-msgid "Enable"
+#: classes/QueryLog.php:250
+msgid "Enable for 5 minutes"
+msgstr ""
+
+#: classes/QueryLog.php:251
+msgid "Keep enabled"
+msgstr ""
+
+#: classes/QueryLog.php:256
+msgid "Note that query logging can have <strong>severe</strong> performance implications on your website."
+msgstr ""
+
+#. translators: date
+#: classes/QueryLog.php:261
+msgid "Logging queries until <strong>%s</strong>."
+msgstr ""
+
+#: classes/QueryLog.php:271
+msgid "Log by status:"
+msgstr ""
+
+#: classes/QueryLog.php:274
+msgid "Only failed queries"
+msgstr ""
+
+#: classes/QueryLog.php:275
+msgid "All queries"
+msgstr ""
+
+#: classes/QueryLog.php:280
+msgid "Log by context:"
+msgstr ""
+
+#: classes/QueryLog.php:284
+msgid "Public"
+msgstr ""
+
+#: classes/QueryLog.php:288
+msgid "Admin"
+msgstr ""
+
+#: classes/QueryLog.php:292
+msgid "AJAX"
+msgstr ""
+
+#: classes/QueryLog.php:296
+msgid "REST API"
 msgstr ""
 
-#: classes/QueryLog.php:252
-msgid "Note that query logging can have <strong>severe</strong> performance implications on your website. We generally recommend only enabling logging during dashboard indexing and disabling after."
+#. translators: Current limit
+#: classes/QueryLog.php:308
+msgid "Please note that logs are stored until the storage limit is reached. The current limit is: <strong>%s</strong>"
 msgstr ""
 
-#: classes/QueryLog.php:259
+#: classes/QueryLog.php:316
 msgid "Save Changes"
 msgstr ""
 
-#: classes/QueryLog.php:262
+#: classes/QueryLog.php:319
 msgid "Empty Log"
 msgstr ""
 
+#: classes/QueryLog.php:398
+msgid "Raw ES document"
+msgstr ""
+
+#: classes/QueryLog.php:403
+msgid "Elasticsearch check"
+msgstr ""
+
+#: classes/QueryLog.php:493
+msgid "Main query"
+msgstr ""
+
+#: classes/QueryLog.php:497
+msgid "Possible values for EP filter"
+msgstr ""
+
+#: classes/QueryLog.php:504
+msgid "Autosuggest template"
+msgstr ""
+
+#: classes/QueryLog.php:507
+msgid "Search"
+msgstr ""
+
+#: classes/QueryMonitorOutput.php:78
+msgid "Total ElasticPress Queries:"
+msgstr ""
+
+#: classes/QueryMonitorOutput.php:84
+msgid "Total Blocking ElasticPress Query Time:"
+msgstr ""
+
+#. translators: time spent
+#: classes/QueryMonitorOutput.php:91
+msgid "%d ms"
+msgstr ""
+
 #: classes/QueryOutput.php:53
 msgid "Download Requests Info"
 msgstr ""
@@ -137,103 +222,115 @@ msgid "Copy Requests Info to Clipboard"
 msgstr ""
 
 #: classes/QueryOutput.php:59
-#: classes/QueryOutput.php:247
+#: classes/QueryOutput.php:260
 msgid "Copied!"
 msgstr ""
 
-#: classes/QueryOutput.php:78
+#: classes/QueryOutput.php:79
 msgid "No queries to show"
 msgstr ""
 
 #. translators: Debug bar elasticpress error message
-#: classes/QueryOutput.php:138
+#: classes/QueryOutput.php:144
 msgid "<strong>Error:</strong> %s"
 msgstr ""
 
 #. translators: Debug bar elasticpress recommended solution for the error
-#: classes/QueryOutput.php:146
+#: classes/QueryOutput.php:152
 msgid "<strong>Recommended Solution:</strong> %s"
 msgstr ""
 
-#: classes/QueryOutput.php:153
+#: classes/QueryOutput.php:159
 msgid "Errors:"
 msgstr ""
 
-#: classes/QueryOutput.php:160
+#: classes/QueryOutput.php:166
 msgid "Type:"
 msgstr ""
 
-#: classes/QueryOutput.php:166
+#: classes/QueryOutput.php:173
+msgid "Context:"
+msgstr ""
+
+#: classes/QueryOutput.php:179
 msgid "Host:"
 msgstr ""
 
 #. translators: time spent running the query.
-#: classes/QueryOutput.php:175
+#: classes/QueryOutput.php:188
 msgid "<strong>Time Taken:</strong> %d ms"
 msgstr ""
 
-#: classes/QueryOutput.php:179
+#: classes/QueryOutput.php:192
 msgid "<strong>Time Taken:</strong> -"
 msgstr ""
 
-#: classes/QueryOutput.php:186
+#: classes/QueryOutput.php:199
 msgid "URL:"
 msgstr ""
 
-#: classes/QueryOutput.php:191
+#: classes/QueryOutput.php:204
 msgid "Method:"
 msgstr ""
 
-#: classes/QueryOutput.php:197
+#: classes/QueryOutput.php:210
 msgid "Headers:"
 msgstr ""
 
-#: classes/QueryOutput.php:204
+#: classes/QueryOutput.php:217
 msgid "Query Args:"
 msgstr ""
 
-#: classes/QueryOutput.php:211
+#: classes/QueryOutput.php:224
 msgid "Query Body:"
 msgstr ""
 
 #. translators: Query HTTP Code response
-#: classes/QueryOutput.php:230
+#: classes/QueryOutput.php:243
 msgid "<strong>Query Response Code:</strong> HTTP %d"
 msgstr ""
 
-#: classes/QueryOutput.php:235
+#: classes/QueryOutput.php:248
 msgid "Query Result:"
 msgstr ""
 
-#: classes/QueryOutput.php:240
+#: classes/QueryOutput.php:253
 msgid "Query Response Code:"
 msgstr ""
 
-#: classes/QueryOutput.php:240
+#: classes/QueryOutput.php:253
 msgid "Request Error"
 msgstr ""
 
-#: classes/QueryOutput.php:244
+#: classes/QueryOutput.php:257
 msgid "Copy cURL Request"
 msgstr ""
 
-#: classes/QueryOutput.php:262
+#: classes/QueryOutput.php:275
 msgid "Queries info"
 msgstr ""
 
-#: debug-bar-elasticpress.php:98
+#: classes/QueryOutput.php:377
+msgid "Explain queries"
+msgstr ""
+
+#: classes/QueryOutput.php:405
+msgid "Reload and retrieve raw ES document"
+msgstr ""
+
+#: debug-bar-elasticpress.php:108
 msgid "ElasticPress Version"
 msgstr ""
 
-#: debug-bar-elasticpress.php:110
+#: debug-bar-elasticpress.php:120
 msgid "ElasticPress.io Managed Platform"
 msgstr ""
 
-#: debug-bar-elasticpress.php:114
+#: debug-bar-elasticpress.php:124
 msgid "Elasticsearch Version"
 msgstr ""
 
 #. translators: Min. EP version
-#: debug-bar-elasticpress.php:147
+#: debug-bar-elasticpress.php:157
 msgid "Debug Bar ElasticPress needs at least ElasticPress %s to work properly."
 msgstr ""

From a13a86dfbf3df94200664cb5424d8a3bfcd766bf Mon Sep 17 00:00:00 2001
From: Felipe Elia <felipe.elia@get10up.com>
Date: Wed, 20 Sep 2023 08:52:44 -0300
Subject: [PATCH 22/22] Release date

---
 CHANGELOG.md | 4 ++--
 readme.txt   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de56b8a..41e733a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 ### Security
 -->
 
-## [3.1.0] - 2023-09-XX
+## [3.1.0] - 2023-09-20
 
 ### Added
 - New button to explain ES queries. Props [@burhandodhy](https://github.com/burhandodhy), [@felipeelia](https://github.com/felipeelia), [@MARQAS](https://github.com/MARQAS), and [@brandwaffle](https://github.com/brandwaffle) via [#79](https://github.com/10up/ElasticPress/pull/79) and [#88](https://github.com/10up/ElasticPress/pull/88).
@@ -96,7 +96,7 @@ This release drops the support for older versions of WordPress Core, ElasticPres
 * Initial release
 
 [Unreleased]: https://github.com/10up/debug-bar-elasticpress/compare/trunk...develop
-[3.0.0]: https://github.com/10up/debug-bar-elasticpress/compare/3.0.0...3.1.0
+[3.1.0]: https://github.com/10up/debug-bar-elasticpress/compare/3.0.0...3.1.0
 [3.0.0]: https://github.com/10up/debug-bar-elasticpress/compare/2.1.1...3.0.0
 [2.1.1]: https://github.com/10up/debug-bar-elasticpress/compare/2.1.0...2.1.1
 [2.1.0]: https://github.com/10up/debug-bar-elasticpress/compare/2.0.0...2.1.0
diff --git a/readme.txt b/readme.txt
index dc5cc12..932907a 100755
--- a/readme.txt
+++ b/readme.txt
@@ -27,11 +27,11 @@ Adds an [ElasticPress](https://wordpress.org/plugins/elasticpress) panel to [Deb
 
 == Changelog ==
 
-= 3.1.0 - 2023-09-XX =
+= 3.1.0 - 2023-09-20 =
 
 __Added:__
 
-* New button to explain ES queries. Props [@burhandodhy](https://github.com/burhandodhy), [@felipeelia](https://github.com/felipeelia), and [@brandwaffle](https://github.com/brandwaffle).
+* New button to explain ES queries. Props [@burhandodhy](https://github.com/burhandodhy), [@felipeelia](https://github.com/felipeelia), [@MARQAS](https://github.com/MARQAS), and [@brandwaffle](https://github.com/brandwaffle).
 * New button to Reload and retrieve raw ES document. Props [@burhandodhy](https://github.com/burhandodhy), [@felipeelia](https://github.com/felipeelia), and [@brandwaffle](https://github.com/brandwaffle).
 * Query types (and context when listing queries in the Query Log admin screen.) Props [@felipeelia](https://github.com/felipeelia) and [@burhandodhy](https://github.com/burhandodhy).
 * Log query by context, status, and fixed time. Props [@felipeelia](https://github.com/felipeelia).