mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-01-26 16:26:48 -06:00
Fixed copy-paste row issues in View/Edit Data. Fixes #3947
1) Copy table rows across two or more active query tool sessions. 2) Copied rows can be pasted multiple times without selecting a row in the query tool grid. 3) Adds an empty row at the end in the query tool grid after pasting rows.
This commit is contained in:
Nagesh Dhope
Akshay Joshi
parent
dc1e32a632
commit
0ce4f49e08
@ -28,6 +28,7 @@ Bug fixes
|
||||
| `Issue #2813 <https://redmine.postgresql.org/issues/2813>`_ - Ensure that the password prompt should not be visible if the database server is in trust authentication mode.
|
||||
| `Issue #3523 <https://redmine.postgresql.org/issues/3523>`_ - Fixed an issue where right-clicking a browser object does not apply to the object on which right-click was fired.
|
||||
| `Issue #3645 <https://redmine.postgresql.org/issues/3645>`_ - Ensure that the start and end date should be deleted when clear the selection for pgAgent Job.
|
||||
| `Issue #3947 <https://redmine.postgresql.org/issues/3947>`_ - Fixed copy-paste row issues in View/Edit Data.
|
||||
| `Issue #3972 <https://redmine.postgresql.org/issues/3972>`_ - Modified keyboard shortcuts in Query Tool for OSX native support.
|
||||
| `Issue #3988 <https://redmine.postgresql.org/issues/3988>`_ - Fixed cursor disappeared issue in the query editor for some of the characters when zoomed out.
|
||||
| `Issue #4206 <https://redmine.postgresql.org/issues/4206>`_ - Ensure that the grant wizard should be closed on pressing the ESC key.
|
||||
|
||||
@ -64,6 +64,9 @@ define(['sources/gettext', 'alertify'], function (gettext, alertify) {
|
||||
|
||||
if (clipboardData) {
|
||||
clipboardData.setData('text', text);
|
||||
// As there no uniform way to read data from clipboard
|
||||
// storing copied data into main window object, so it is accessible from anywhere in the application
|
||||
window.parent.window.clipboardData = text;
|
||||
// We want our data, not data from any selection, to be written to the clipboard
|
||||
e.preventDefault();
|
||||
}
|
||||
@ -83,6 +86,9 @@ define(['sources/gettext', 'alertify'], function (gettext, alertify) {
|
||||
|
||||
document.body.removeChild(textArea);
|
||||
},
|
||||
getTextFromClipboard: function() {
|
||||
return window.parent.window.clipboardData || '';
|
||||
},
|
||||
};
|
||||
return clipboard;
|
||||
});
|
||||
|
||||
@ -48,6 +48,10 @@ function ($, _, clipboard, RangeSelectionHelper, rangeBoundaryNavigator) {
|
||||
var setPasteRowButtonEnablement = function (canEditFlag, isEnabled) {
|
||||
if (canEditFlag) {
|
||||
$('#btn-paste-row').prop('disabled', !isEnabled);
|
||||
if(isEnabled && window.parent.$) {
|
||||
// trigger copied event to all sessions
|
||||
window.parent.$(window.parent.document).trigger('pgadmin-sqleditor:rows-copied', copyWithHeader());
|
||||
}
|
||||
}
|
||||
};
|
||||
return copyData;
|
||||
|
||||
@ -2379,6 +2379,8 @@ define('tools.querytool', [
|
||||
// Indentation related
|
||||
self.on('pgadmin-sqleditor:indent_selected_code', self._indent_selected_code, self);
|
||||
self.on('pgadmin-sqleditor:unindent_selected_code', self._unindent_selected_code, self);
|
||||
|
||||
window.parent.$(window.parent.document).on('pgadmin-sqleditor:rows-copied', self._copied_in_other_session);
|
||||
},
|
||||
|
||||
// Checks if there is any dirty data in the grid before executing a query
|
||||
@ -3706,33 +3708,36 @@ define('tools.querytool', [
|
||||
$('.copy-with-header').toggleClass('visibility-hidden');
|
||||
},
|
||||
|
||||
// This function will enable Paste button if data is copied in some other active session
|
||||
_copied_in_other_session: function(e, copiedWithHeaders) {
|
||||
pgAdmin.SqlEditor.copiedInOtherSessionWithHeaders = copiedWithHeaders;
|
||||
$('#btn-paste-row').prop('disabled', false);
|
||||
},
|
||||
|
||||
// This function will paste the selected row.
|
||||
_paste_row: function() {
|
||||
var self = this,
|
||||
grid = self.slickgrid,
|
||||
dataView = grid.getData(),
|
||||
data = dataView.getItems(),
|
||||
count = dataView.getLength(),
|
||||
rows = grid.getSelectedRows().sort(
|
||||
function(a, b) {
|
||||
return a - b;
|
||||
}
|
||||
),
|
||||
copied_rows = rows.map(function(rowIndex) {
|
||||
return data[rowIndex];
|
||||
}),
|
||||
array_types = [];
|
||||
|
||||
// for quick look up create list of array data types
|
||||
for (var k in self.columns) {
|
||||
if (self.columns[k].is_array) {
|
||||
array_types.push(self.columns[k].name);
|
||||
}
|
||||
var self = this;
|
||||
let rowsText = clipboard.getTextFromClipboard();
|
||||
let copied_rows = rowsText.split('\n');
|
||||
// Do not parse row if rows are copied with headers
|
||||
if(pgAdmin.SqlEditor.copiedInOtherSessionWithHeaders) {
|
||||
copied_rows = copied_rows.slice(1);
|
||||
}
|
||||
|
||||
rows = rows.length == 0 ? self.last_copied_rows : rows;
|
||||
|
||||
self.last_copied_rows = rows;
|
||||
copied_rows = copied_rows.reduce((partial, item) => {
|
||||
// split each row with field separator character
|
||||
const values = item.split(self.preferences.results_grid_field_separator);
|
||||
let row = {};
|
||||
for (let k in self.columns) {
|
||||
let v = null;
|
||||
if (values.length > k) {
|
||||
v = values[k].replace(new RegExp(`^\\${self.preferences.results_grid_quote_char}`), '').replace(new RegExp(`\\${self.preferences.results_grid_quote_char}$`), '');
|
||||
}
|
||||
row[self.columns[k].name] = v;
|
||||
}
|
||||
partial.push(row);
|
||||
return partial;
|
||||
}, []);
|
||||
|
||||
// If there are rows to paste?
|
||||
if (copied_rows.length > 0) {
|
||||
@ -3740,10 +3745,21 @@ define('tools.querytool', [
|
||||
// save newly pasted rows on server
|
||||
$('#btn-save-data').prop('disabled', false);
|
||||
|
||||
var arr_to_object = function(arr) {
|
||||
var grid = self.slickgrid,
|
||||
dataView = grid.getData(),
|
||||
count = dataView.getLength(),
|
||||
array_types = [];
|
||||
// for quick look up create list of array data types
|
||||
for (var k in self.columns) {
|
||||
if (self.columns[k].is_array) {
|
||||
array_types.push(self.columns[k].name);
|
||||
}
|
||||
}
|
||||
|
||||
var arr_to_object = function (arr) {
|
||||
var obj = {};
|
||||
|
||||
_.each(arr, function(val, i) {
|
||||
_.each(arr, function (val, i) {
|
||||
if (arr[i] !== undefined) {
|
||||
// Do not stringify array types.
|
||||
if (_.isObject(arr[i]) && array_types.indexOf(i) == -1) {
|
||||
@ -3765,13 +3781,13 @@ define('tools.querytool', [
|
||||
// Reset selection
|
||||
|
||||
dataView.beginUpdate();
|
||||
_.each(copied_rows, function(row) {
|
||||
_.each(copied_rows, function (row) {
|
||||
var new_row = arr_to_object(row),
|
||||
_key = (self.gridView.client_primary_key_counter++).toString();
|
||||
new_row.is_row_copied = true;
|
||||
self.temp_new_rows.push(count);
|
||||
new_row[self.client_primary_key] = _key;
|
||||
if(self.has_oids && new_row.oid) {
|
||||
if (self.has_oids && new_row.oid) {
|
||||
new_row.oid = null;
|
||||
}
|
||||
|
||||
@ -3784,7 +3800,9 @@ define('tools.querytool', [
|
||||
count++;
|
||||
});
|
||||
dataView.endUpdate();
|
||||
grid.invalidateRow(grid.getSelectedRows());
|
||||
grid.updateRowCount();
|
||||
grid.render();
|
||||
// Pasted row/s always append so bring last row in view port.
|
||||
grid.scrollRowIntoView(dataView.getLength());
|
||||
grid.setSelectedRows([]);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user