Skip to content

Commit 9984dfe

Browse files
authored
FE-418: fix query tab crash due to missing document version (arangodb#20400)
1 parent 20ad9f0 commit 9984dfe

File tree

13 files changed

+17
-13
lines changed

13 files changed

+17
-13
lines changed

js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,11 @@
5151
return version;
5252
},
5353
getDocuVersion: function () {
54-
return this.toDocuVersion(window.frontendConfig.version.version);
54+
var version =
55+
window.frontendConfig &&
56+
window.frontendConfig.version &&
57+
window.frontendConfig.version.version;
58+
return this.toDocuVersion(version || "");
5559
}
5660
};
5761

js/apps/system/_admin/aardvark/APP/react/build/asset-manifest.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"files": {
3-
"main.css": "./static/css/main.712b2faa.css",
4-
"main.js": "./static/js/main.c465bad9.js",
3+
"main.css": "./static/css/main.57b2e8d7.css",
4+
"main.js": "./static/js/main.548df020.js",
55
"static/media/fontawesome-webfont.svg?v=4.4.0": "./static/media/fontawesome-webfont.ed6298903ae1554c7f3e.svg",
66
"static/media/fontawesome-webfont.ttf?v=4.4.0": "./static/media/fontawesome-webfont.f0af1680f082547a7aae.ttf",
77
"static/media/fontawesome-webfont.woff?v=4.4.0": "./static/media/fontawesome-webfont.f7f1738ca345185e0185.woff",
@@ -44,11 +44,11 @@
4444
"static/media/arangodb-icon.svg": "./static/media/arangodb-icon.35807d6e11925bd44973.svg",
4545
"index.html": "./index.html",
4646
"static/media/favicon.ico": "./static/media/favicon.909457142f6be9dae418.ico",
47-
"main.712b2faa.css.map": "./static/css/main.712b2faa.css.map",
48-
"main.c465bad9.js.map": "./static/js/main.c465bad9.js.map"
47+
"main.57b2e8d7.css.map": "./static/css/main.57b2e8d7.css.map",
48+
"main.548df020.js.map": "./static/js/main.548df020.js.map"
4949
},
5050
"entrypoints": [
51-
"static/css/main.712b2faa.css",
52-
"static/js/main.c465bad9.js"
51+
"static/css/main.57b2e8d7.css",
52+
"static/js/main.548df020.js"
5353
]
5454
}
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en"><head><meta charset="utf-8"><link rel="shortcut icon" href="./static/media/favicon.909457142f6be9dae418.ico"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><title>ArangoDB Web Interface</title><meta name="description" content="ArangoDB Admin Web Interface"><meta name="author" content="Heiko Kernbach, Michael Hackstein"><script src="config.js"></script><script>window.addEventListener("error",(function(e){"ResizeObserver loop limit exceeded"===e.message&&(console.error(e.message),e.stopImmediatePropagation(),e.preventDefault())}))</script><script defer="defer" src="./static/js/main.c465bad9.js"></script><link href="./static/css/main.712b2faa.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><nav class="navbar" style="display:none"><div class="primary"><div class="navlogo"><a class="logo big" href="#"><img id="ArangoDBLogo" class="arangodbLogo" src="./static/media/arangodb-dark.994d1553f409200f5901.svg"/></a><a class="logo small" href="#"><img class="arangodbLogo" src="./static/media/arangodb-icon.35807d6e11925bd44973.svg"/></a><a class="version"><span id="currentVersion"></span></a></div><div class="statmenu" id="statisticBar"></div><div class="navmenu" id="navigationBar"></div></div></nav><div id="modalPlaceholder"></div><div class="bodyWrapper" style="display:none"><div class="centralRow"><div id="navbar2" class="navbarWrapper secondary"><div class="subnavmenu" id="subNavigationBar"></div></div><div class="resizecontainer contentWrapper"><div id="loadingScreen" class="loadingScreen" style="display:none"><i class="fa fa-circle-o-notch fa-spin fa-3x fa-fw margin-bottom"></i> <span class="sr-only">Loading...</span></div><div id="content" class="centralContent"></div></div><div id="content-react" class="reactContainer"></div></div></div><div id="progressPlaceholder" style="display:none"></div><div id="spotlightPlaceholder" style="display:none"></div><div id="graphSettingsContent" style="display:none"></div><div id="filterSelectDiv" style="display:none"></div><div id="offlinePlaceholder" style="display:none"><div class="offline-div"><div class="pure-u"><div class="pure-u-1-4"></div><div class="pure-u-1-2 offline-window"><div class="offline-header"><h3>You have been disconnected from the server</h3></div><div class="offline-body"><p>The connection to the server has been lost. The server may be under heavy load.</p><p>Trying to reconnect in <span id="offlineSeconds">10</span> seconds.</p><p class="animation_state"><span><button class="button-success">Reconnect now</button></span></p></div></div><div class="pure-u-1-4"></div></div></div></div><div class="arangoFrame"><div class="outerDiv"><div class="innerDiv"></div></div></div><div id="root"></div></body></html>
1+
<!doctype html><html lang="en"><head><meta charset="utf-8"><link rel="shortcut icon" href="./static/media/favicon.909457142f6be9dae418.ico"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><title>ArangoDB Web Interface</title><meta name="description" content="ArangoDB Admin Web Interface"><meta name="author" content="Heiko Kernbach, Michael Hackstein"><script src="config.js"></script><script>window.addEventListener("error",(function(e){"ResizeObserver loop limit exceeded"===e.message&&(console.error(e.message),e.stopImmediatePropagation(),e.preventDefault())}))</script><script defer="defer" src="./static/js/main.548df020.js"></script><link href="./static/css/main.57b2e8d7.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><nav class="navbar" style="display:none"><div class="primary"><div class="navlogo"><a class="logo big" href="#"><img id="ArangoDBLogo" class="arangodbLogo" src="./static/media/arangodb-dark.994d1553f409200f5901.svg"/></a><a class="logo small" href="#"><img class="arangodbLogo" src="./static/media/arangodb-icon.35807d6e11925bd44973.svg"/></a><a class="version"><span id="currentVersion"></span></a></div><div class="statmenu" id="statisticBar"></div><div class="navmenu" id="navigationBar"></div></div></nav><div id="modalPlaceholder"></div><div class="bodyWrapper" style="display:none"><div class="centralRow"><div id="navbar2" class="navbarWrapper secondary"><div class="subnavmenu" id="subNavigationBar"></div></div><div class="resizecontainer contentWrapper"><div id="loadingScreen" class="loadingScreen" style="display:none"><i class="fa fa-circle-o-notch fa-spin fa-3x fa-fw margin-bottom"></i> <span class="sr-only">Loading...</span></div><div id="content" class="centralContent"></div></div><div id="content-react" class="reactContainer"></div></div></div><div id="progressPlaceholder" style="display:none"></div><div id="spotlightPlaceholder" style="display:none"></div><div id="graphSettingsContent" style="display:none"></div><div id="filterSelectDiv" style="display:none"></div><div id="offlinePlaceholder" style="display:none"><div class="offline-div"><div class="pure-u"><div class="pure-u-1-4"></div><div class="pure-u-1-2 offline-window"><div class="offline-header"><h3>You have been disconnected from the server</h3></div><div class="offline-body"><p>The connection to the server has been lost. The server may be under heavy load.</p><p>Trying to reconnect in <span id="offlineSeconds">10</span> seconds.</p><p class="animation_state"><span><button class="button-success">Reconnect now</button></span></p></div></div><div class="pure-u-1-4"></div></div></div></div><div class="arangoFrame"><div class="outerDiv"><div class="innerDiv"></div></div></div><div id="root"></div></body></html>
Binary file not shown.

js/apps/system/_admin/aardvark/APP/react/build/static/css/main.712b2faa.css renamed to js/apps/system/_admin/aardvark/APP/react/build/static/css/main.57b2e8d7.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/apps/system/_admin/aardvark/APP/react/build/static/js/main.548df020.js

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

js/apps/system/_admin/aardvark/APP/react/build/static/js/main.c465bad9.js

Lines changed: 0 additions & 3 deletions
This file was deleted.
Binary file not shown.

0 commit comments

Comments
 (0)