pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Display errors during CSV download from the Query Tool in the UI rather than putting them in the CSV file. Fixes #4085 

Ensure the toolbar buttons are properly reset following a CSV download in the Query Tool. Fixes #4096
pull/22/head
Aditya Toshniwal 2019-03-29 14:31:33 +00:00 committed by Dave Page
parent 4d45a3cb24
commit 7627e9c699
4 changed files with 101 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/en_US/release_notes_4_4.rst
View File

@ -59,7 +59,9 @@ Bug fixes
| `Bug #4073 <https://redmine.postgresql.org/issues/4073>`_ - Change the CodeMirror active line background colour to $color-danger-lighter so it doesn't conflict with the selection colour.
| `Bug #4081 <https://redmine.postgresql.org/issues/4081>`_ - Fix the RE-SQL syntax for roles with a VALID UNTIL clause.
| `Bug #4084 <https://redmine.postgresql.org/issues/4084>`_ - Overhaul the layout saving code so it includes the Query Tool and Debugger, and stores the layout when change events are detected rather than (unreliably) on exit.
| `Bug #4085 <https://redmine.postgresql.org/issues/4085>`_ - Display errors during CSV download from the Query Tool in the UI rather than putting them in the CSV file.
| `Bug #4090 <https://redmine.postgresql.org/issues/4090>`_ - Improve the German translation for Backup Server.
| `Bug #4096 <https://redmine.postgresql.org/issues/4096>`_ - Ensure the toolbar buttons are properly reset following a CSV download in the Query Tool.
| `Bug #4099 <https://redmine.postgresql.org/issues/4099>`_ - Fix SQL help for EPAS 10+, and refactor the URL generation code into a testable function.
| `Bug #4100 <https://redmine.postgresql.org/issues/4100>`_ - Ensure sequences can be created with increment, start, minimum and maximum options set.
| `Bug #4105 <https://redmine.postgresql.org/issues/4105>`_ - Fix an issue where JSON data would not be rendered in the Query Tool.

16
web/pgadmin/tools/sqleditor/__init__.py
View File

@ -1362,11 +1362,11 @@ def start_query_download_tool(trans_id):
)
if not status:
r = Response('"{0}"'.format(gen), mimetype='text/csv')
r.headers[
"Content-Disposition"
] = "attachment;filename=error.csv"
return r
return make_json_response(
data={
'status': status, 'result': gen
}
)
r = Response(
gen(
@ -1398,11 +1398,9 @@ def start_query_download_tool(trans_id):
] = "attachment;filename={0}".format(filename)
return r
except Exception as e:
r = Response('"{0}"'.format(e), mimetype='text/csv')
r.headers["Content-Disposition"] = "attachment;filename=error.csv"
return r
err_msg = "Error: {0}".format(e.strerror)
return internal_server_error(errormsg=err_msg)
else:
return internal_server_error(
errormsg=gettext("Transaction status check failed.")

146
web/pgadmin/tools/sqleditor/static/js/sqleditor.js
View File

@ -2095,6 +2095,7 @@ define('tools.querytool', [
self.server_type = server_type;
self.url_params = url_params;
self.script_type_url = script_type_url;
self.is_transaction_buttons_disabled = true;
// We do not allow to call the start multiple times.
if (self.gridView)
@ -2604,6 +2605,19 @@ define('tools.querytool', [
history.total_time = '-';
},
set_sql_message(msg, append=false) {
if(append) {
$('.sql-editor-message').append(msg);
} else {
$('.sql-editor-message').text(msg);
}
// Scroll automatically when msgs appends to element
setTimeout(function() {
$('.sql-editor-message').scrollTop($('.sql-editor-message')[0].scrollHeight);
}, 10);
},
// This function is used to raise appropriate message.
update_msg_history: function(status, msg, clear_grid) {
var self = this;
@ -2622,17 +2636,11 @@ define('tools.querytool', [
self.columns = undefined;
self.collection = undefined;
$('.sql-editor-message').text(msg);
self.set_sql_message(msg);
} else {
$('.sql-editor-message').append(_.escape(msg));
self.set_sql_message(_.escape(msg), true);
}
// Scroll automatically when msgs appends to element
setTimeout(function() {
$('.sql-editor-message').scrollTop($('.sql-editor-message')[0].scrollHeight);
}, 10);
if (status != 'Busy') {
$('#btn-flash').prop('disabled', false);
$('#btn-download').prop('disabled', false);
@ -2909,14 +2917,14 @@ define('tools.querytool', [
self.primary_keys_data = {};
// Clear msgs after successful save
$('.sql-editor-message').html('');
self.set_sql_message('');
alertify.success(gettext('Data saved successfully.'));
} else {
// Something went wrong while saving data on the db server
$('#btn-flash').prop('disabled', false);
$('#btn-download').prop('disabled', false);
$('.sql-editor-message').text(res.data.result);
self.set_sql_message(res.data.result);
var err_msg = S(gettext('%s.')).sprintf(res.data.result).value();
alertify.error(err_msg, 20);
grid.setSelectedRows([]);
@ -3516,22 +3524,33 @@ define('tools.querytool', [
// This function is used to enable/disable buttons
disable_tool_buttons: function(disabled) {
$('#btn-clear-dropdown').prop('disabled', disabled);
$('#btn-explain').prop('disabled', disabled);
$('#btn-explain-analyze').prop('disabled', disabled);
$('#btn-explain-options-dropdown').prop('disabled', disabled);
$('#btn-edit-dropdown').prop('disabled', disabled);
$('#btn-load-file').prop('disabled', disabled);
$('#btn-save').prop('disabled', disabled);
$('#btn-file-menu-dropdown').prop('disabled', disabled);
$('#btn-find').prop('disabled', disabled);
$('#btn-find-menu-dropdown').prop('disabled', disabled);
let mode_disabled = disabled;
/* Buttons be always disabled in view/edit mode */
if(!this.is_query_tool) {
mode_disabled = true;
}
$('#btn-clear-dropdown').prop('disabled', mode_disabled);
$('#btn-explain').prop('disabled', mode_disabled);
$('#btn-explain-analyze').prop('disabled', mode_disabled);
$('#btn-explain-options-dropdown').prop('disabled', mode_disabled);
$('#btn-edit-dropdown').prop('disabled', mode_disabled);
$('#btn-load-file').prop('disabled', mode_disabled);
$('#btn-save').prop('disabled', mode_disabled);
$('#btn-file-menu-dropdown').prop('disabled', mode_disabled);
$('#btn-find').prop('disabled', mode_disabled);
$('#btn-find-menu-dropdown').prop('disabled', mode_disabled);
if (this.is_query_tool) {
// Cancel query tool needs opposite behaviour
$('#btn-cancel-query').prop('disabled', !disabled);
$('#btn-query-dropdown').prop('disabled', !this.is_transaction_buttons_disabled);
if(this.is_transaction_buttons_disabled) {
$('#btn-query-dropdown').prop('disabled', disabled);
} else {
$('#btn-query-dropdown').prop('disabled', true);
}
} else {
$('#btn-query-dropdown').prop('disabled', disabled);
$('#btn-query-dropdown').prop('disabled', mode_disabled);
}
},
@ -3677,31 +3696,33 @@ define('tools.querytool', [
}),
data = { query: query, filename: filename };
// Disable the Execute button
$('#btn-flash').prop('disabled', true);
$('#btn-download').prop('disabled', true);
self.disable_tool_buttons(true);
self.set_sql_message('');
self.trigger(
'pgadmin-sqleditor:loading-icon:show',
gettext('Downloading CSV...')
);
// Get the CSV file
self.download_csv_obj = $.ajax({
type: 'POST',
url: url,
data: data,
cache: false,
async: true,
xhrFields: {
responseType: 'blob',
},
beforeSend: function() {
// Disable the Execute button
$('#btn-flash').prop('disabled', true);
$('#btn-download').prop('disabled', true);
self.disable_tool_buttons(true);
self.trigger(
'pgadmin-sqleditor:loading-icon:show',
gettext('Downloading CSV...')
);
},
})
.done(function(response) {
let urlCreator = window.URL || window.webkitURL,
url = urlCreator.createObjectURL(response),
}).done(function(response) {
// if response.data present, extract the message
if(!_.isUndefined(response.data)) {
if(!response.status) {
self._highlight_error(response.data.result);
self.set_sql_message(response.data.result);
}
} else {
let respBlob = new Blob([response], {type : 'text/csv'}),
urlCreator = window.URL || window.webkitURL,
url = urlCreator.createObjectURL(respBlob),
current_browser = pgAdmin.Browser.get_browser(),
link = document.createElement('a');
@ -3709,7 +3730,7 @@ define('tools.querytool', [
if (current_browser.name === 'IE' && window.navigator.msSaveBlob) {
// IE10+ : (has Blob, but not a[download] or URL)
window.navigator.msSaveBlob(response, filename);
window.navigator.msSaveBlob(respBlob, filename);
} else {
link.setAttribute('href', url);
link.setAttribute('download', filename);
@ -3718,27 +3739,32 @@ define('tools.querytool', [
document.body.removeChild(link);
self.download_csv_obj = undefined;
// Enable the execute button
$('#btn-flash').prop('disabled', false);
$('#btn-download').prop('disabled', false);
self.disable_tool_buttons(false);
self.trigger(
'pgadmin-sqleditor:loading-icon:hide');
}
})
.fail(function(err) {
let msg = '';
// Enable the execute button
$('#btn-flash').prop('disabled', false);
$('#btn-download').prop('disabled', false);
self.disable_tool_buttons(false);
self.trigger('pgadmin-sqleditor:loading-icon:hide');
}).fail(function(err) {
let msg = '';
if (err.statusText == 'abort') {
msg = gettext('CSV Download cancelled.');
} else {
msg = httpErrorHandler.handleQueryToolAjaxError(
pgAdmin, self, err, gettext('Download CSV'), [], true
);
}
alertify.alert(gettext('Download CSV error'), msg);
});
// Enable the execute button
$('#btn-flash').prop('disabled', false);
$('#btn-download').prop('disabled', false);
self.disable_tool_buttons(false);
self.trigger('pgadmin-sqleditor:loading-icon:hide');
if (err.statusText == 'abort') {
msg = gettext('CSV Download cancelled.');
} else {
msg = httpErrorHandler.handleQueryToolAjaxError(
pgAdmin, self, err, gettext('Download CSV'), [], true
);
}
alertify.alert(gettext('Download CSV error'), msg);
});
},
call_cache_preferences: function() {

6
web/pgadmin/utils/driver/psycopg2/connection.py
View File

@ -705,6 +705,12 @@ WHERE
)
return False, errmsg
# http://initd.org/psycopg/docs/cursor.html#cursor.description
# to avoid no-op
if cur.description is None:
return False, \
gettext('The query executed did not return any data.')
def handle_json_data(json_columns, results):
"""
[ This is only for Python2.x]