10000 Sort list of queries in web UI for display by jsteemann · Pull Request #14429 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Sort list of queries in web UI for display #14429

New issue

Have a question about this project? Sign up for a 8000 free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 28, 2021
Merged

Sort list of queries in web UI for display #14429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f5ad2da
Sort list of queries in web UI for display
jsteemann Jun 29, 2021
d528e96
Fix display of queries in web UI
jsteemann Jun 29, 2021
5f0922a
Update js/apps/system/_admin/aardvark/APP/frontend/js/views/queryMana…
jsteemann Jun 30, 2021
3c2d153
Merge branch '3.8' into bug-fix-3.8/fix-bumpy-queries-in-ui
KVS85 Jul 28, 2021
be0f49e
Rebuild UI
KVS85 Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
v3.8.1 (XXXX-XX-XX)
-------------------

* Fix display of running and slow queries in web UI when there are multiple
coordinators. Previously, the display order of queries was undefined, which
could lead to queries from one coordinator being display on top once and then
the queries from another. That made using this UI harder than necessary.

Now queries are sorted for display, according to their query IDs.

* Fixed an issue in index selection, when the selectivty estimate of another
prefix index was used without checking if the other index covered the FILTER
condition.
Expand Down
12 changes: 12 additions & 0 deletions js/apps/system/_admin/aardvark/APP/frontend/js/views/queryManagementView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,18 @@
'',
''
]);
} else {
// sort by query id, descending
rowsArray = rowsArray.sort(function(l, r) {
// normalize both inputs to strings (in case they are numbers)
l = String(l[0]).padStart(20, "0");
r = String(r[0]).padStart(20, "0");

if (l === r) {
return 0;
}
return l < r ? 1 : -1;
});
}

self.tableDescription.rows = rowsArray;
Expand Down
16 changes: 8 additions & 8 deletions js/apps/system/_admin/aardvark/APP/react/build/asset-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"main.css": "static/css/main.1b75fc5c.chunk.css",
"main.js": "static/js/main.c9dea35d.chunk.js",
"main.js.map": "static/js/main.c9dea35d.chunk.js.map",
"main.js": "static/js/main.9af65f3a.chunk.js",
"main.js.map": "static/js/main.9af65f3a.chunk.js.map",
"runtime~main.js": "static/js/runtime~main.b7f3a89c.js",
"runtime~main.js.map": "static/js/runtime~main.b7f3a89c.js.map",
"static/css/2.e82a467a.chunk.css": "static/css/2.e82a467a.chunk.css",
"static/js/2.7d06878b.chunk.js": "static/js/2.7d06878b.chunk.js",
"static/js/2.7d06878b.chunk.js.map": "static/js/2.7d06878b.chunk.js.map",
"index.html": "index.html",
"index.html.gz": "index.html.gz",
"precache-manifest.1cba6228fb377742801a92e743ecdbf0.js": "precache-manifest.1cba6228fb377742801a92e743ecdbf0.js",
"precache-manifest.1cba6228fb377742801a92e743ecdbf0.js.gz": "precache-manifest.1cba6228fb377742801a92e743ecdbf0.js.gz",
"precache-manifest.26dac10729203038f09b3ab118e4732d.js": "precache-manifest.26dac10729203038f09b3ab118e4732d.js",
"precache-manifest.26dac10729203038f09b3ab118e4732d.js.gz": "precache-manifest.26dac10729203038f09b3ab118e4732d.js.gz",
"service-worker.js": "service-worker.js",
"service-worker.js.gz": "service-worker.js.gz",
"static/css/2.e82a467a.chunk.css.gz": "static/css/2.e82a467a.chunk.css.gz",
Expand All @@ -23,10 +23,10 @@
"static/js/2.7d06878b.chunk.js.LICENSE.txt.gz": "static/js/2.7d06878b.chunk.js.LICENSE.txt.gz",
"static/js/2.7d06878b.chunk.js.gz": "static/js/2.7d06878b.chunk.js.gz",
"static/js/2.7d06878b.chunk.js.map.gz": "static/js/2.7d06878b.chunk.js.map.gz",
"static/js/main.c9dea35d.chunk.js.LICENSE.txt": "static/js/main.c9dea35d.chunk.js.LICENSE.txt",
"static/js/main.c9dea35d.chunk.js.LICENSE.txt.gz": "static/js/main.c9dea35d.chunk.js.LICENSE.txt.gz",
"static/js/main.c9dea35d.chunk.js.gz": "static/js/main.c9dea35d.chunk.js.gz",
"static/js/main.c9dea35d.chunk.js.map.gz": "static/js/main.c9dea35d.chunk.js.map.gz",
"static/js/main.9af65f3a.chunk.js.LICENSE.txt": "static/js/main.9af65f3a.chunk.js.LICENSE.txt",
"static/js/main.9af65f3a.chunk.js.LICENSE.txt.gz": "static/js/main.9af65f3a.chunk.js.LICENSE.txt.gz",
"static/js/main.9af65f3a.chunk.js.gz": "static/js/main.9af65f3a.chunk.js.gz",
"static/js/main.9af65f3a.chunk.js.map.gz": "static/js/main.9af65f3a.chunk.js.map.gz",
"static/js/runtime~main.b7f3a89c.js.gz": "static/js/runtime~main.b7f3a89c.js.gz",
"static/js/runtime~main.b7f3a89c.js.map.gz": "static/js/runtime~main.b7f3a89c.js.map.gz",
"static/media/style.scss": "static/media/fontawesome-webfont.e6cf7c6e.woff2",
Expand Down
2 changes: 1 addition & 1 deletion js/apps/system/_admin/aardvark/APP/react/build/index.html
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified js/apps/system/_admin/aardvark/APP/react/build/index.html.gz
View file
Open in desktop
Binary file not shown.
Binary file removed .../_admin/aardvark/APP/react/build/precache-manifest.1cba6228fb377742801a92e743ecdbf0.js.gz
View file
Open in desktop
Binary file not shown.
58 changes: 29 additions & 29 deletions ...ifest.1cba6228fb377742801a92e743ecdbf0.js → ...ifest.26dac10729203038f09b3ab118e4732d.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
self.__precacheManifest = [
{
"revision": "c9dea35d46b211401a4b",
"revision": "9af65f3a7df6170636f4",
"url": "static/css/main.1b75fc5c.chunk.css"
},
{
"revision": "c9dea35d46b211401a4b",
"url": "static/js/main.c9dea35d.chunk.js"
"revision": "9af65f3a7df6170636f4",
"url": "static/js/main.9af65f3a.chunk.js"
},
{
"revision": "b7f3a89c186b069a4989",
Expand Down Expand Up @@ -35,10 +35,6 @@ self.__precacheManifest = [
"revision": "d961fdfabbe512d2675de09af09f598b",
"url": "static/media/jsoneditor-icons.d961fdfa.svg"
},
{
"revision": "11bbcff6f99be028bf04e2e200299b31",
"url": "static/media/OpenSansLight.11bbcff6.woff"
},
{
"revision": "f71094988de2d6567eb9caba78f61041",
"url": "static/media/OpenSans.f7109498.woff"
Expand All @@ -48,36 +44,40 @@ self.__precacheManifest = [
"url": "static/media/OpenSansBold.2af7a710.woff"
},
{
"revision": "05f81795ee61b18a60d5be1b40714e01",
"url": "static/media/OpenSansLightItalic.05f81795.woff"
},
{
"revision": "403dee4359ca42b1d096976fda3ef95c",
"url": "static/media/OpenSansItalic.403dee43.woff"
"revision": "11bbcff6f99be028bf04e2e200299b31",
"url": "static/media/OpenSansLight.11bbcff6.woff"
},
{
"revision": "84b1d9bb65b585d4b4a72ee9cefb2ac2",
"url": "static/media/OpenSansBoldItalic.84b1d9bb.woff"
},
{
"revision": "05f81795ee61b18a60d5be1b40714e01",
"url": "static/media/OpenSansLightItalic.05f81795.woff"
},
{
"revision": "25a32416abee198dd821b0b17a198a8f",
"url": "static/media/fontawesome-webfont.25a32416.eot"
},
{
"revision": "e6cf7c6ec7c2d6f670ae9d762604cb0b",
"url": "static/media/fontawesome-webfont.e6cf7c6e.woff2"
"revision": "403dee4359ca42b1d096976fda3ef95c",
"url": "static/media/OpenSansItalic.403dee43.woff"
},
{
"revision": "c8ddf1e5e5bf3682bc7bebf30f394148",
"url": "static/media/fontawesome-webfont.c8ddf1e5.woff"
"revision": "d7c639084f684d66a1bc66855d193ed8",
"url": "static/media/fontawesome-webfont.d7c63908.svg"
},
{
"revision": "1dc35d25e61d819a9c357074014867ab",
"url": "static/media/fontawesome-webfont.1dc35d25.ttf"
},
{
"revision": "d7c639084f684d66a1bc66855d193ed8",
"url": "static/media/fontawesome-webfont.d7c63908.svg"
"revision": "c8ddf1e5e5bf3682bc7bebf30f394148",
"url": "static/media/fontawesome-webfont.c8ddf1e5.woff"
},
{
"revision": "e6cf7c6ec7c2d6f670ae9d762604cb0b",
"url": "static/media/fontawesome-webfont.e6cf7c6e.woff2"
},
{
"revision": "c3547b2ec6f5eb324b44d8a0c6b2dd31",
Expand Down Expand Up @@ -115,10 +115,6 @@ self.__precacheManifest = [
"revision": "38861cba61c66739c1452c3a71e39852",
"url": "static/media/Roboto-regular.38861cba.ttf"
},
{
"revision": "3d3a53586bd78d1069ae4b89a3b9aa98",
"url": "static/media/Roboto-regular.3d3a5358.svg"
},
{
"revision": "2a52a20f9a56010ec5d985abe9bebcc9",
"url": "static/media/Roboto-500.2a52a20f.eot"
Expand All @@ -127,6 +123,10 @@ self.__precacheManifest = [
"revision": "1afbee5a09a022fe0287f16e9a48da1f",
"url": "static/media/Roboto-500.1afbee5a.woff2"
},
{
"revision": "3d3a53586bd78d1069ae4b89a3b9aa98",
"url": "static/media/Roboto-regular.3d3a5358.svg"
},
{
"revision": "0f3b7101a8adc1afe1fbe89775553c32",
"url": "static/media/Roboto-500.0f3b7101.woff"
Expand All @@ -135,6 +135,10 @@ self.__precacheManifest = [
"revision": "88f29ea5a372d06f521395134f62ab91",
"url": "static/media/Roboto-500.88f29ea5.ttf"
},
{
"revision": "128879da78c6c8eb4e2c07fa3732cea7",
"url": "static/media/Roboto-700.128879da.eot"
},
{
"revision": "f1d811cdfaea49c969500d4bbe52251b",
"url": "static/media/Roboto-500.f1d811cd.svg"
Expand All @@ -143,10 +147,6 @@ self.__precacheManifest = [
"revision": "3b38c16e4b39e5fd4017cd5055b0d505",
"url": "static/media/Roboto-700.3b38c16e.woff2"
},
{
"revision": "128879da78c6c8eb4e2c07fa3732cea7",
"url": "static/media/Roboto-700.128879da.eot"
},
{
"revision": "43183beef21370d8a4b0d64152287eba",
"url": "static/media/Roboto-700.43183bee.woff"
Expand Down Expand Up @@ -181,14 +181,14 @@ self.__precacheManifest = [
},
{
"revision": "6f627a0f557156e94eefe1aa36b7648f",
"url": "static/js/main.c9dea35d.chunk.js.LICENSE.txt"
"url": "static/js/main.9af65f3a.chunk.js.LICENSE.txt"
},
{
"revision": "81cb54606affc57af54ff40d24be2596",
"url": "static/js/2.7d06878b.chunk.js.LICENSE.txt"
},
{
"revision": "bf89e73f3167331bf898136b731b5b54",
"revision": "ccffbd75c67a7b030feb67c2106818d9",
"url": "index.html"
}
];
Binary file added .../_admin/aardvark/APP/react/build/precache-manifest.26dac10729203038f09b3ab118e4732d.js.gz
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion js/apps/system/_admin/aardvark/APP/react/build/service-worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");

importScripts(
"precache-manifest.1cba6228fb377742801a92e743ecdbf0.js"
"precache-manifest.26dac10729203038f09b3ab118e4732d.js"
);

workbox.clientsClaim();
Expand Down
Binary file modified js/apps/system/_admin/aardvark/APP/react/build/service-worker.js.gz
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions js/apps/system/_admin/aardvark/APP/react/build/static/js/main.9af65f3a.chunk.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...tic/js/main.c9dea35d.chunk.js.LICENSE.txt → ...tic/js/main.9af65f3a.chunk.js.LICENSE.txt
View file
Open in desktop
File renamed without changes.
0 .../js/main.c9dea35d.chunk.js.LICENSE.txt.gz → .../js/main.9af65f3a.chunk.js.LICENSE.txt.gz
View file
Open in desktop
File renamed without changes.
Binary file added js/apps/system/_admin/aardvark/APP/react/build/static/js/main.9af65f3a.chunk.js.gz
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions js/apps/system/_admin/aardvark/APP/react/build/static/js/main.9af65f3a.chunk.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added js/apps/system/_admin/aardvark/APP/react/build/static/js/main.9af65f3a.chunk.js.map.gz
View file
Open in desktop
Binary file not shown.
3 changes: 0 additions & 3 deletions js/apps/system/_admin/aardvark/APP/react/build/static/js/main.c9dea35d.chunk.js
View file
Open in desktop
6D

This file was deleted.

Binary file removed js/apps/system/_admin/aardvark/APP/react/build/static/js/main.c9dea35d.chunk.js.gz
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion js/apps/system/_admin/aardvark/APP/react/build/static/js/main.c9dea35d.chunk.js.map
View file
Open in desktop

This file was deleted.

Binary file removed js/apps/system/_admin/aardvark/APP/react/build/static/js/main.c9dea35d.chunk.js.map.gz
View file
Open in desktop
Binary file not shown.
0