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

Ensure that when pasting rows the rows are added right below the selected rows for copying. #5921

pull/5985/head
Aditya Toshniwal 2023-03-23 18:49:15 +05:30 committed by GitHub
parent a026353df8
commit 319701dbbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
View File

@ -781,6 +781,7 @@ export function ResultSet() {
dispatchDataChange({type: 'reset'}); dispatchDataChange({type: 'reset'});
setSelectedRows(new Set()); setSelectedRows(new Set());
setSelectedColumns(new Set()); setSelectedColumns(new Set());
rsu.current.resetClientPKIndex();
setLoaderText(gettext('Waiting for the query to complete...')); setLoaderText(gettext('Waiting for the query to complete...'));
return await rsu.current.startExecution( return await rsu.current.startExecution(
query, explainObject, query, explainObject,
@ -1207,8 +1208,18 @@ export function ResultSet() {
useEffect(()=>{ useEffect(()=>{
const triggerAddRows = (_rows, fromClipboard)=>{ const triggerAddRows = (_rows, fromClipboard)=>{
let insPosn = 0;
if(selectedRows.size > 0) {
let selectedRowsSorted = Array.from(selectedRows);
selectedRowsSorted.sort();
insPosn = _.findIndex(rows, (r)=>rowKeyGetter(r)==selectedRowsSorted[selectedRowsSorted.length-1])+1;
}
let newRows = rsu.current.processRows(_rows, columns, fromClipboard); let newRows = rsu.current.processRows(_rows, columns, fromClipboard);
setRows((prev)=>[...newRows, ...prev]); setRows((prev)=>[
...prev.slice(0, insPosn),
...newRows,
...prev.slice(insPosn)
]);
let add = {}; let add = {};
newRows.forEach((row)=>{ newRows.forEach((row)=>{
add[rowKeyGetter(row)] = { add[rowKeyGetter(row)] = {
@ -1222,7 +1233,7 @@ export function ResultSet() {
}; };
eventBus.registerListener(QUERY_TOOL_EVENTS.TRIGGER_ADD_ROWS, triggerAddRows); eventBus.registerListener(QUERY_TOOL_EVENTS.TRIGGER_ADD_ROWS, triggerAddRows);
return ()=>eventBus.deregisterListener(QUERY_TOOL_EVENTS.TRIGGER_ADD_ROWS, triggerAddRows); return ()=>eventBus.deregisterListener(QUERY_TOOL_EVENTS.TRIGGER_ADD_ROWS, triggerAddRows);
}, [columns]); }, [columns, selectedRows.size]);
useEffect(()=>{ useEffect(()=>{
const renderGeometries = (column)=>{ const renderGeometries = (column)=>{