Call loadNextPage function only when it is required while loading the…

… table. Resolved delete object(shortcut key) affecting both text and Object Explorer items.pgadmin-org#7683
RohitBhati8269 · Jul 22, 2024 · d45a630 · d45a630
1 parent 9cbb9a3
commit d45a630
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/web/pgadmin/browser/static/js/keyboard.js b/web/pgadmin/browser/static/js/keyboard.js
@@ -264,8 +264,7 @@ _.extend(pgBrowser.keyboardNavigation, {
   },
   bindSubMenuDelete: function() {
     const tree = this.getTreeDetails();
-
-    if (!tree.d || pgAdmin.Browser.Nodes[tree.t.itemData(tree.i)._type].collection_node === true)
+    if (!tree.d || pgAdmin.Browser.Nodes[tree.t.itemData(tree.i)._type].collection_node === true || document.activeElement.className !== 'file-tree')
       return;
 
     // Call delete object callback

diff --git a/web/pgadmin/static/js/components/PgTable.jsx b/web/pgadmin/static/js/components/PgTable.jsx
@@ -123,7 +123,7 @@ export function Table({ columns, data, hasSelectRow, schema, sortOptions, tableP
     useInfiniteQuery({
       queryKey: ['logs'],
       queryFn: async () => {
-        const fetchedData = await loadNextPage();
+        const fetchedData = loadNextPage ? await loadNextPage() : [];
         return fetchedData;
       },
       initialPageParam: 0,