From 4221c200997e2922a01fa9cad89632509a956c43 Mon Sep 17 00:00:00 2001 From: Igor Gaponenko Date: Tue, 1 Aug 2023 00:28:45 +0000 Subject: [PATCH] Web Dashboard: migrated to follow changes in the REST API Changes affect the search for for the past queries. --- src/www/dashboard.html | 2 +- src/www/qserv/js/Common.js | 2 +- src/www/qserv/js/StatusUserQueries.js | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/www/dashboard.html b/src/www/dashboard.html index b9c9918fd5..a97b6e9d52 100644 --- a/src/www/dashboard.html +++ b/src/www/dashboard.html @@ -4,7 +4,7 @@ Qserv monitoring dashboard - + diff --git a/src/www/qserv/js/Common.js b/src/www/qserv/js/Common.js index 1988b14368..d74d31fb74 100644 --- a/src/www/qserv/js/Common.js +++ b/src/www/qserv/js/Common.js @@ -3,7 +3,7 @@ define([ function(sqlFormatter) { class Common { - static RestAPIVersion = 22; + static RestAPIVersion = 23; static query2text(query, expanded) { if (expanded) { return sqlFormatter.format(query, Common._sqlFormatterConfig); diff --git a/src/www/qserv/js/StatusUserQueries.js b/src/www/qserv/js/StatusUserQueries.js index 6648a7270d..760de893e5 100644 --- a/src/www/qserv/js/StatusUserQueries.js +++ b/src/www/qserv/js/StatusUserQueries.js @@ -154,8 +154,8 @@ function(CSSLoader,
@@ -224,7 +224,7 @@ function(CSSLoader, this._set_min_elapsed("0"); this._set_query_type(""); this._set_query_search_pattern(""); - this._set_query_search_mode("NATURAL"); + this._set_query_search_mode("LIKE"); this._set_max_queries("200"); this._load(); }); @@ -307,7 +307,7 @@ function(CSSLoader, min_elapsed_sec: this._get_min_elapsed(), query_type: this._get_query_type(), search_pattern: this._get_query_search_pattern(), - search_boolean_mode: this._get_query_search_mode() == "BOOLEAN" ? 1 : 0, + search_regexp_mode: this._get_query_search_mode() == "REGEXP" ? 1 : 0, limit4past: this._get_max_queries(), timeout_sec: StatusUserQueries._server_proc_timeout_sec() },