10000 Bug fix 3.5/issue 10470 (#10497) · arangodb/arangodb@e575a94 · GitHub
[go: up one dir, main page]
Skip to content

Commit e575a94

Browse files
hkernbachKVS85
hkernbach
authored and
KVS85
committed
Bug fix 3.5/issue 10470 (#10497)
* fixing issue #10470 * changelog * Update CHANGELOG * Rebuild UI * updated grunt-contrib-imagemin * add package-lock.json
1 parent 0977d3d commit e575a94

File tree

10 files changed

+9134
-18
lines changed

10 files changed

+9134
-18
lines changed

‎CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
v3.5.3 (XXXX-XX-XX)
22
-------------------
33

4+
* Fixed issue #10470: The WebUI now shows potential errors and details which
5+
occured using _api/import (e.g. unique constraint violated).
6+
47
* Fixed issue #10440: Incorrect sorting with sort criteria partially covered
58
by index.
69

‎js/apps/system/_admin/aardvark/APP/frontend/build/app.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/apps/system/_admin/aardvark/APP/frontend/build/app.min.js.gz

19 Bytes
Binary file not shown.

‎js/apps/system/_admin/aardvark/APP/frontend/build/index-min.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang="en" xmlns="http://www.w3.org/1999/html"><head><meta charset="utf-8"><title>ArangoDB Web Interface</title><meta name="description" content="ArangoDB Admin Web Interface"><meta name="author" content="Heiko Kernbach, Michael Hackstein"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="css/style.css" rel="stylesheet"><link href="css/sass.css" rel="stylesheet"><link rel="shortcut icon" type="image/x-icon" href="favicon.ico"><script src="config.js"></script></head><body><nav class="navbar" style="display: none"><div class="primary"><div class="navlogo"><a class="logo big" href="#"><img id="ArangoDBLogo" class="arangodbLogo" src="img/arangodb-edition-optimized.svg"></a><a class="logo small" href="#"><img class="arangodbLogo" src="img/arangodb_logo_small.png"></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><footer class="footer"><div id="footerBar"></div></footer></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" style=""><div class="outerDiv"><div class="innerDiv"></div></div></div><script src="libs.js?version=1570130114582"></script><script src="app.js?version=1570130114582"></script><script src="templates.js?version=1570130114582"></script></body></html>
1+
<!DOCTYPE html><html lang="en" xmlns="http://www.w3.org/1999/html"><head><meta charset="utf-8"><title>ArangoDB Web Interface</title><meta name="description" content="ArangoDB Admin Web Interface"><meta name="author" content="Heiko Kernbach, Michael Hackstein"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="css/style.css" rel="stylesheet"><link href="css/sass.css" rel="stylesheet"><link rel="shortcut icon" type="image/x-icon" href="favicon.ico"><script src="config.js"></script></head><body><nav class="navbar" style="display: none"><div class="primary"><div class="navlogo"><a class="logo big" href="#"><img id="ArangoDBLogo" class="arangodbLogo" src="img/arangodb-edition-optimized.svg"></a><a class="logo small" href="#"><img class="arangodbLogo" src="img/arangodb_logo_small.png"></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><footer class="footer"><div id="footerBar"></div></footer></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" style=""><div class="outerDiv"><div class="innerDiv"></div></div></div><script src="libs.js?version=1574342051103"></script><script src="app.js?version=1574342051103"></script><script src="templates.js?version=1574342051103"></script></body></html>

‎js/apps/system/_admin/aardvark/APP/frontend/build/index-min.html.gz

0 Bytes
Binary file not shown.

‎js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocuments.js

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -360,28 +360,30 @@
360360
},
361361

362362
uploadDocuments: function (file, callback) {
363+
var analyzeResponse = function (data) {
364+
if (data.hasOwnProperty('error')) {
365+
delete data.error;
366+
}
367+
368+
if (data.errors > 0) {
369+
callback(true, 'Info: ' + JSON.stringify(data));
370+
} else {
371+
callback(false, 'Info: ' + JSON.stringify(data));
372+
}
373+
};
374+
363375
$.ajax({
364376
type: 'POST',
365-
url: arangoHelper.databaseUrl('/_api/import?type=auto&collection=' +
377+
url: arangoHelper.databaseUrl('/_api/import?type=auto&details=true&collection=' +
366378
encodeURIComponent(this.collectionID) +
367379
'&createCollection=false'),
368380
data: file,
369381
processData: false,
370382
contentType: 'json',
371383
dataType: 'json',
372384
complete: function (xhr) {
373-
if (xhr.readyState === 4 && xhr.status === 201) {
374-
callback(false);
375-
} else {
376-
try {
377-
var data = JSON.parse(xhr.responseText);
378-
if (data.errors > 0) {
379-
var result = 'At least one error occurred during upload';
380-
callback(false, result);
381-
}
382-
} catch (err) {
383-
console.log(err);
384-
}
385+
if (xhr.responseJSON) {
386+
analyzeResponse(xhr.responseJSON);
385387
}
386388
},
387389
error: function (msg) {

‎js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
$('#documents_first').css('visibility', 'visible');
221221
this.addDocumentSwitch = true;
222222
this.collection.resetFilter();
223-
this.collection.loadTotal(callback);
223+
this.collection.loadCollectionConfig(callback);
224224
this.restoredFilters = [];
225225

226226
// for resetting json upload
@@ -249,6 +249,7 @@
249249
if (error) {
250250
arangoHelper.arangoError('Upload', msg);
251251
} else {
252+
arangoHelper.arangoMessage('Upload', msg);
252253
this.hideImportModal();
253254
this.resetView();
254255
}

‎j 489B s/apps/system/_admin/aardvark/APP/frontend/src/ace.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
0