From bbef00a151d04d2a92245663aa369bfbd2aaf124 Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Mon, 7 Apr 2025 13:31:00 +0530 Subject: [PATCH] Fixed an issue where the scroll position in the Object Explorer was not retained when switching workspaces. #8497 --- docs/en_US/release_notes_9_3.rst | 1 + web/pgadmin/misc/workspaces/static/js/WorkspaceProvider.jsx | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/en_US/release_notes_9_3.rst b/docs/en_US/release_notes_9_3.rst index 41528fe29..3f3b58eb0 100644 --- a/docs/en_US/release_notes_9_3.rst +++ b/docs/en_US/release_notes_9_3.rst @@ -31,4 +31,5 @@ Bug fixes ********* | `Issue #8443 `_ - Fixed an issue where the debugger hangs when stepping into nested function/procedure. + | `Issue #8497 `_ - Fixed an issue where the scroll position in the Object Explorer was not retained when switching workspaces. | `Issue #8556 `_ - Ensure that graph data is updated even when the Dashboard tab is inactive. \ No newline at end of file diff --git a/web/pgadmin/misc/workspaces/static/js/WorkspaceProvider.jsx b/web/pgadmin/misc/workspaces/static/js/WorkspaceProvider.jsx index 2f86eafed..14678b48d 100644 --- a/web/pgadmin/misc/workspaces/static/js/WorkspaceProvider.jsx +++ b/web/pgadmin/misc/workspaces/static/js/WorkspaceProvider.jsx @@ -72,9 +72,9 @@ export function WorkspaceProvider({children}) { pgAdmin.Browser.docker.currentWorkspace = newVal; if (newVal == WORKSPACES.DEFAULT) { setTimeout(() => { - pgAdmin.Browser.tree.selectNode(lastSelectedTreeItem.current); + pgAdmin.Browser.tree.selectNode(lastSelectedTreeItem.current, true, 'center'); lastSelectedTreeItem.current = null; - }, 0); + }, 250); } else { // Get the selected tree node and save it into the state variable. let selItem = pgAdmin.Browser.tree.selected(); @@ -92,7 +92,7 @@ export function WorkspaceProvider({children}) { if (wsConfig?.enableOnNoTabs) { return true; } - + if(wsConfig) { return Boolean(pgAdmin.Browser.docker[wsConfig.docker]?.layoutObj?.getLayout()?.dockbox?.children?.[0]?.tabs?.length); }