Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui - cacheable explain

This commit is contained in:
hkernbach 2016-09-29 13:34:58 +02:00
parent 49b200aab4
commit c288e65a06
1 changed files with 82 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js
View File

@ -526,6 +526,9 @@
self.removeOutputEditor(counter); self.removeOutputEditor(counter);
arangoHelper.arangoError('Explain', data.msg); arangoHelper.arangoError('Explain', data.msg);
} else { } else {
// cache explain results
self.cachedQueries[counter] = data;
outputEditor.setValue(data.msg, 1); outputEditor.setValue(data.msg, 1);
self.deselect(outputEditor); self.deselect(outputEditor);
$.noty.clearQueue(); $.noty.clearQueue();
@ -699,7 +702,10 @@
self.renderQueryResultBox(counter, null, true); self.renderQueryResultBox(counter, null, true);
self.renderQueryResult(query, counter, true); self.renderQueryResult(query, counter, true);
self.fillSentQueryValue(counter); self.fillSentQueryValue(counter);
if (query.sentQuery) {
self.bindQueryResultButtons(null, counter); self.bindQueryResultButtons(null, counter);
}
}); });
} }
}, },
@ -1590,9 +1596,9 @@
var self = this; var self = this;
var outputEditor = ace.edit('outputEditor' + counter); var outputEditor = ace.edit('outputEditor' + counter);
self.warningsFunc(data, outputEditor); // handle explain query case
window.progressView.hide(); if (!data.msg) {
// handle usual query
var result = self.analyseQuery(data.result); var result = self.analyseQuery(data.result);
// console.log('Using ' + result.defaultType + ' as data format.'); // console.log('Using ' + result.defaultType + ' as data format.');
if (result.defaultType === 'table') { if (result.defaultType === 'table') {
@ -1627,8 +1633,6 @@
); );
}; };
$('#outputEditorWrapper' + counter + ' .pull-left #spinner').remove();
var time = '-'; var time = '-';
if (data && data.extra && data.extra.stats) { if (data && data.extra && data.extra.stats) {
time = data.extra.stats.executionTime.toFixed(3) + ' s'; time = data.extra.stats.executionTime.toFixed(3) + ' s';
@ -1661,13 +1665,22 @@
} }
} }
} }
}
$('#outputEditorWrapper' + counter + ' .pull-left #spinner').remove();
$('#outputEditorWrapper' + counter + ' #cancelCurrentQuery').remove();
self.warningsFunc(data, outputEditor);
window.progressView.hide();
$('#outputEditorWrapper' + counter + ' .switchAce').show(); $('#outputEditorWrapper' + counter + ' .switchAce').show();
$('#outputEditorWrapper' + counter + ' .fa-close').show(); $('#outputEditorWrapper' + counter + ' .fa-close').show();
$('#outputEditor' + counter).css('opacity', '1'); $('#outputEditor' + counter).css('opacity', '1');
if (!data.msg) {
$('#outputEditorWrapper' + counter + ' #downloadQueryResult').show(); $('#outputEditorWrapper' + counter + ' #downloadQueryResult').show();
$('#outputEditorWrapper' + counter + ' #copy2aqlEditor').show(); $('#outputEditorWrapper' + counter + ' #copy2aqlEditor').show();
$('#outputEditorWrapper' + counter + ' #cancelCurrentQuery').remove(); }
self.setEditorAutoHeight(outputEditor); self.setEditorAutoHeight(outputEditor);
self.deselect(outputEditor); self.deselect(outputEditor);
@ -1687,6 +1700,11 @@
// cache the original sent aql string // cache the original sent aql string
this.cachedQueries[counter].sentQuery = self.aqlEditor.getValue(); this.cachedQueries[counter].sentQuery = self.aqlEditor.getValue();
} }
if (data.msg) {
$('#outputEditorWrapper' + counter + ' .toolbarType').html('Explain');
outputEditor.setValue(data.msg, 1);
}
}, },
bindQueryResultButtons: function (queryID, counter) { bindQueryResultButtons: function (queryID, counter) {