Skip to content

Commit

Permalink
bugfix-3.11/FE-448: auto-repair collection JSON on save (#20895)
Browse files Browse the repository at this point in the history
* fix: repair the document on save

* chore: update changelog

* Rebuild UI

---------

Co-authored-by: Vadim Kondratev <vadim@arangodb.com>
  • Loading branch information
palashkaria and KVS85 committed May 10, 2024
1 parent 0af0def commit 4c24422
Show file tree
Hide file tree
Showing 11 changed files with 10 additions and 7 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
v3.11.9 (XXXX-XX-XX)
--------------------

* FE-448: auto-repair collection document JSON on save.

* Retry cluster query shutdown in case no connection can be made to the
DB-Servers for the shutdown request.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,7 @@
},

saveDocument: function () {
this.editor.repair();
if ($('#saveDocumentButton').attr('disabled') === undefined) {
if (this.collection.first().attributes._id.substr(0, 1) === '_') {
var buttons = []; var tableContent = [];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "./static/css/main.ea26cf36.css",
"main.js": "./static/js/main.d6a70a59.js",
"main.js": "./static/js/main.8966a14b.js",
"static/media/fontawesome-webfont.svg?v=4.4.0": "./static/media/fontawesome-webfont.ed6298903ae1554c7f3e.svg",
"static/media/fontawesome-webfont.ttf?v=4.4.0": "./static/media/fontawesome-webfont.f0af1680f082547a7aae.ttf",
"static/media/fontawesome-webfont.woff?v=4.4.0": "./static/media/fontawesome-webfont.f7f1738ca345185e0185.woff",
Expand Down Expand Up @@ -41,10 +41,10 @@
"index.html": "./index.html",
"static/media/favicon.ico": "./static/media/favicon.909457142f6be9dae418.ico",
"main.ea26cf36.css.map": "./static/css/main.ea26cf36.css.map",
"main.d6a70a59.js.map": "./static/js/main.d6a70a59.js.map"
"main.8966a14b.js.map": "./static/js/main.8966a14b.js.map"
},
"entrypoints": [
"static/css/main.ea26cf36.css",
"static/js/main.d6a70a59.js"
"static/js/main.8966a14b.js"
]
}
Binary file not shown.
2 changes: 1 addition & 1 deletion js/apps/system/_admin/aardvark/APP/react/build/index.html
Original file line number Diff line number Diff line change
@@ -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.d6a70a59.js"></script><link href="./static/css/main.ea26cf36.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>
<!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.8966a14b.js"></script><link href="./static/css/main.ea26cf36.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 modified js/apps/system/_admin/aardvark/APP/react/build/index.html.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.

0 comments on commit 4c24422

Please sign in to comment.