From f96653e9af794181cf976ffe3bfadeadd354d762 Mon Sep 17 00:00:00 2001
From: Yogesh Mahajan <yogesh.mahajan@enterprisedb.com>
Date: Tue, 9 Aug 2022 13:28:09 +0530
Subject: [PATCH] Fixed an issue with rendering geometry when selecting a
 complete column. Fixes #7586

---
 docs/en_US/release_notes_6_13.rst                          | 1 +
 .../sqleditor/static/js/components/sections/ResultSet.jsx  | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/en_US/release_notes_6_13.rst b/docs/en_US/release_notes_6_13.rst
index 6a67ab217..64380e12c 100644
--- a/docs/en_US/release_notes_6_13.rst
+++ b/docs/en_US/release_notes_6_13.rst
@@ -27,3 +27,4 @@ Bug fixes
   | `Issue #7527 <https://redmine.postgresql.org/issues/7527>`_ -  Fixed API test cases for Postgres 14.4.
   | `Issue #7563 <https://redmine.postgresql.org/issues/7563>`_ -  Fixed an issue where autocomplete is not working after clearing the query editor.
   | `Issue #7573 <https://redmine.postgresql.org/issues/7573>`_ -  Ensure that autocomplete does not appear when navigating code using arrow keys.
+  | `Issue #7586 <https://redmine.postgresql.org/issues/7586>`_ -  Fixed an issue with rendering geometry when selecting a complete column.
diff --git a/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx b/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
index c52a8d91b..b0d11c8fb 100644
--- a/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
+++ b/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
@@ -989,7 +989,7 @@ export function ResultSet() {
     try {
       /* Convert the added info to actual rows */
       let added = {...dataChangeStore.added};
-      Object.keys(added).map((clientPK)=>{
+      Object.keys(added).forEach((clientPK)=>{
         added[clientPK].data = _.find(rows, (r)=>rowKeyGetter(r)==clientPK);
       });
       let {data: respData} = await rsu.current.saveData({
@@ -1214,6 +1214,9 @@ export function ResultSet() {
       let selRowsData = rows;
       if(selectedRows.size != 0) {
         selRowsData = rows.filter((r)=>selectedRows.has(rowKeyGetter(r)));
+      } else if(selectedColumns.size > 0) {
+        let selectedCols = _.filter(columns, (_c, i)=>selectedColumns.has(i+1));
+        selRowsData = _.map(rows, (r)=>_.pick(r, _.map(selectedCols, (c)=>c.key)));
       } else if(selectedRange.current) {
         let [,, startRowIdx, endRowIdx] = getRangeIndexes();
         selRowsData = rows.slice(startRowIdx, endRowIdx+1);
@@ -1229,7 +1232,7 @@ export function ResultSet() {
     };
     eventBus.registerListener(QUERY_TOOL_EVENTS.TRIGGER_RENDER_GEOMETRIES, renderGeometries);
     return ()=>eventBus.deregisterListener(QUERY_TOOL_EVENTS.TRIGGER_RENDER_GEOMETRIES, renderGeometries);
-  }, [rows, columns, selectedRows.size]);
+  }, [rows, columns, selectedRows.size, selectedColumns.size]);
 
   const handleScroll = (e)=>{
     if (isLoadingMore || !rsu.current.isAtBottom(e)) return;