Skip to content

Commit d838849

Browse files
Ensure scratch pad in the query tool does not restore after closing.pgadmin-org#9007
1 parent 6db0cc5 commit d838849

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

web/pgadmin/browser/templates/browser/js/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ define('pgadmin.browser.utils',
8282
];
8383

8484
pgBrowser.utils = {
85-
layout: {{ layout }},
85+
layout: {{ layout|tojson }},
8686
theme: '{{ theme }}',
8787
pg_help_path: '{{ pg_help_path }}',
8888
app_name: '{{ app_name }}',

web/pgadmin/static/js/BrowserComponent.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ function Layouts({browser}) {
122122
}}
123123
defaultLayout={defaultLayout}
124124
layoutId='Browser/Layout'
125-
savedLayout={pgAdmin.Browser.utils.layout}
125+
savedLayout={pgAdmin.Browser.utils.layout['Browser/Layout']}
126126
groups={{
127127
'object-explorer': objectExplorerGroup,
128128
'playground': getMorePanelGroup(defaultTabsData),
@@ -141,7 +141,7 @@ function Layouts({browser}) {
141141
}}
142142
defaultLayout={item.layout}
143143
layoutId={`Workspace/Layout-${item.workspace}`}
144-
savedLayout={pgAdmin.Browser.utils.layout}
144+
savedLayout={pgAdmin.Browser.utils.layout[`Workspace/Layout-${item.workspace}`]}
145145
groups={{
146146
'playground': item?.tabsData ? getMorePanelGroup(item?.tabsData) : {...getDefaultGroup()},
147147
}}

web/pgadmin/static/js/helpers/Layout/index.jsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@ export class LayoutDocker {
219219
}
220220
}
221221

222-
loadLayout(savedLayout, layoutId) {
222+
loadLayout(savedLayout) {
223223
try {
224-
this.layoutObj.loadLayout(JSON.parse(savedLayout[layoutId]));
224+
this.layoutObj.loadLayout(JSON.parse(savedLayout));
225225
} catch {
226226
/* Fallback to default */
227227
this.layoutObj.loadLayout(this.defaultLayout);
@@ -505,7 +505,7 @@ export default function Layout({groups, noContextGroups, getLayoutInstance, layo
505505
flattenLayout(props.defaultLayout.dockbox);
506506
return flat;
507507
}, [props.defaultLayout]);
508-
508+
509509
const loadTab = (tab)=>{
510510
const tabData = flatDefaultLayout.find((t)=>t.id == tab.id);
511511
if(!tabData && tab.metaData) {
@@ -529,7 +529,7 @@ export default function Layout({groups, noContextGroups, getLayoutInstance, layo
529529
if(obj) {
530530
layoutDockerObj.layoutObj = obj;
531531
getLayoutInstance?.(layoutDockerObj);
532-
layoutDockerObj.loadLayout(savedLayout, layoutId);
532+
layoutDockerObj.loadLayout(savedLayout);
533533
}
534534
}}
535535
loadTab={loadTab}
@@ -565,7 +565,7 @@ Layout.propTypes = {
565565
noContextGroups: PropTypes.array,
566566
getLayoutInstance: PropTypes.func,
567567
layoutId: PropTypes.string,
568-
savedLayout: PropTypes.any,
568+
savedLayout: PropTypes.string,
569569
resetToTabPanel: PropTypes.string,
570570
enableToolEvents: PropTypes.bool,
571571
isLayoutVisible: PropTypes.bool

0 commit comments

Comments
 (0)