Web Dashboard: migrated to follow changes in the REST API

Changes affect the search for for the past queries.
lsst · Aug 1, 2023 · 4221c20 · 4221c20
1 parent f8e1c8c
commit 4221c20
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/www/dashboard.html b/src/www/dashboard.html
@@ -4,7 +4,7 @@
 <title>Qserv monitoring dashboard</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<script data-main="qserv/js/QservMonitoringDashboard.js?bust=66" src="https://requirejs.org/docs/release/2.3.6/minified/require.js"></script>
+<script data-main="qserv/js/QservMonitoringDashboard.js?bust=67" src="https://requirejs.org/docs/release/2.3.6/minified/require.js"></script>
 </head>
 <body></body>
 </html>
diff --git 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
@@ -154,8 +154,8 @@ function(CSSLoader,
       <div class="form-group col-md-1">
         <label for="query-search-mode">Search mode:</label>
         <select id="query-search-mode" class="form-control form-control-selector">
-          <option value="NATURAL" selected>NATURAL</option>
-          <option value="BOOLEAN">BOOLEAN</option>
+          <option value="LIKE" selected>LIKE</option>
+          <option value="REGEXP">REGEXP</option>
         </select>
       </div>
       <div class="form-group col-md-1">
@@ -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()
                 },