Ensure that disabling "Save Application State" in Preferences prevents tool data from being saved and stops it from being restored on application restart. #9067

web/pgadmin/misc/workspaces/static/js/AdHocConnection.jsx

@@ -215,11 +215,11 @@ class AdHocConnectionSchema extends BaseUISchema {
         disabled: (state) => state.sid,
       },{
         id: 'did', label: gettext('Database'), deps: ['sid', 'connected'],
-        controlProps: {creatable: true},
         type: (state) => {
           if (state?.sid) {
             return {
               type: 'select',
+              controlProps: {creatable: true},
               options: () => this.getOtherOptions(
                 state.sid, 'get_new_connection_database'
               ),
@@ -238,11 +238,11 @@ class AdHocConnectionSchema extends BaseUISchema {
         }
       }, {
         id: 'user', label: gettext('User'), deps: ['sid', 'connected'],
-        controlProps: {creatable: true},
         type: (state) => {
           if (state?.sid) {
             return {
               type: 'select',
+              controlProps: {creatable: true},
               options: () => this.getOtherOptions(
                 state.sid, 'get_new_connection_user'
               ),
@@ -266,9 +266,9 @@ class AdHocConnectionSchema extends BaseUISchema {
         }
       },{
         id: 'role', label: gettext('Role'), deps: ['sid', 'connected'],
-        controlProps: {creatable: true},
         type: (state)=>({
           type: 'select',
+          controlProps: {creatable: true},
           options: () => this.getOtherOptions(
             state.sid, 'get_new_connection_role'
           ),

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

@@ -396,6 +396,7 @@ export default function Layout({groups, noContextGroups, getLayoutInstance, layo
   const layoutDockerObj = React.useMemo(()=>new LayoutDocker(layoutId, props.defaultLayout, resetToTabPanel, noContextGroups), []);
   const prefStore = usePreferences();
   const dynamicTabsStyleRef = useRef();
+  const saveAppStateRef = useRef(prefStore?.getPreferencesForModule('misc')?.save_app_state);
   const { deleteToolData } = useApplicationState();
 
   useEffect(()=>{
@@ -411,6 +412,8 @@ export default function Layout({groups, noContextGroups, getLayoutInstance, layo
 
   useEffect(()=>{
     const dynamicTabs = prefStore.getPreferencesForModule('browser')?.dynamic_tabs;
+    const saveAppState = prefStore?.getPreferencesForModule('misc')?.save_app_state;
+
     // Add a class to set max width for non dynamic Tabs
     if(!dynamicTabs && !dynamicTabsStyleRef.current) {
       const css = '.dock-tab:not(div.dock-tab-active) { max-width: 180px; }',
@@ -423,6 +426,12 @@ export default function Layout({groups, noContextGroups, getLayoutInstance, layo
       dynamicTabsStyleRef.current.remove();
       dynamicTabsStyleRef.current = null;
     }
+
+    if(!saveAppState && saveAppStateRef.current){
+      layoutDockerObj.saveLayout();
+    }
+    saveAppStateRef.current = saveAppState;
+
   }, [prefStore]);
 
   const getTabMenuItems = (panelId)=>{
@@ -470,10 +479,8 @@ export default function Layout({groups, noContextGroups, getLayoutInstance, layo
   const saveTab = (tab) => {
   // 'tab' here is the full TabData object, potentially with 'title', 'content', etc.
   // We only want to save the 'id' and any custom properties needed by loadTab.
-    const savedTab = {
-      id: tab.id,
-    };
-    if (tab.metaData && !BROWSER_PANELS.DEBUGGER_TOOL.includes(tab.id.split('_')[0])) {
+    const savedTab = { id: tab.id };
+    if (saveAppStateRef.current && tab.metaData && !BROWSER_PANELS.DEBUGGER_TOOL.includes(tab.id.split('_')[0])) {
     // add custom properties that were part of the original TabBase
       const updatedMetaData = {
         ...tab.metaData,