Fix some more review comments.

Author: yogeshmahajan-1903

docs/en_US/images/preferences_misc_user_interface.png

@@ -309,12 +309,21 @@ Use the fields on the *User Interface* panel to set the user interface related p
   this setting is False, meaning that Query Tool/PSQL tabs will open in the currently
   active workspace (either the default or the workspace selected at the time of opening).
 
+* When the *Save the application state?* option is enabled  the current state of various
+  tools—such as Query Tool, ERD, Schema Diff, and PSQL—will be saved in the encrypted
+  format.If the application is closed unexpectedly, the tab is accidentally closed,
+  or the page is refreshed, the saved state will be automatically restored for
+  each respective tool.**Note:**
+
 * Use the *Themes* drop-down listbox to select the theme for pgAdmin. You'll also get a preview just below the
   drop down. You can also submit your own themes,
   check `here <https://github.com/pgadmin-org/pgadmin4/blob/master/README.md>`_ how.
   Currently we support Light, Dark, High Contrast and System theme. Selecting System option will follow
   your computer's settings.
 
+**Note:** Saving the application state will not preserve data for tool tabs opened in
+separate browser tabs when running in server mode..
+
 The Paths Node
 **************
 

docs/en_US/preferences.rst

@@ -285,8 +285,6 @@ def authenticate(self):
                 source.get_source_name())
 
             status, msg = source.authenticate(self.form)
-            print(status)
-            print(msg)
 
             if status:
                 self.set_current_source(source.get_source_name())
@@ -297,17 +295,6 @@ def authenticate(self):
                 current_app.logger.debug(
                     "Authentication initiated via source: %s is failed." %
                     source.get_source_name())
-                current_user = User.query.filter_by(username=username,
-                                                    auth_source=src).first()
-                # get list with auth source src
-                # iterate over it and find if user present with that
-                if len(users) > 0 and current_user:
-                    print('User may be coming first time so continue with all possible')
-                    break
-                elif len(users) > 0:
-                    print('User already present with other aut source break it')
-                    break
-
         return status, msg
 
     def login(self):

web/pgadmin/authenticate/__init__.py

@@ -212,6 +212,7 @@ define('pgadmin.browser', [
       let save_the_workspace = prefStore.getPreferencesForModule('misc').save_app_state;
       if(save_the_workspace){
         this.restore_pgadmin_state();
+        pgBrowser.docker.default_workspace.focus();
       }
     },
     check_corrupted_db_file: function() {
@@ -299,33 +300,33 @@ define('pgadmin.browser', [
     },
 
     restore_pgadmin_state: function () {
-      getApiInstance().get(
+      getApiInstance({'Content-Encoding': 'gzip'}).get(
         url_for('settings.get_application_state')
       ).then((res)=> {
         if(res.data.success && res.data.data.result.length > 0){
-          _.each(res.data.data.result, function(tool_state){
-            let tool_name = tool_state.tool_name;
-            let tool_data = tool_state.tool_data;
-            let sql_id = `${tool_name}-${getRandomInt(1, 9999999)}`;
-
-            if (tool_name == 'sqleditor'){
-              localStorage.setItem(sql_id, tool_data);
-              showQueryTool.relaunchSqlTool(tool_state, sql_id);
-            }else if(tool_name == 'psql'){
-              pgAdmin.Tools.Psql.openPsqlTool(null, null, tool_state);
-            }else if(tool_name == 'ERD'){
-              localStorage.setItem(sql_id, tool_data);
-              pgAdmin.Tools.ERD.showErdTool(null, null, false, sql_id, tool_state);
-            }else if(tool_name == 'schema_diff'){
-              localStorage.setItem(sql_id, tool_data);
-              pgAdmin.Tools.SchemaDiff.launchSchemaDiff(sql_id);
+          _.each(res.data.data.result, function(toolState){
+            let toolNme = toolState.tool_name;
+            let toolData = toolState.tool_data;
+            let toolDataId = `${toolNme}-${getRandomInt(1, 9999999)}`;
+            let connectionInfo = toolState.connection_info;
+
+            if (toolNme == 'sqleditor'){
+              localStorage.setItem(toolDataId, toolData);
+              showQueryTool.relaunchSqlTool(connectionInfo, toolDataId);
+            }else if(toolNme == 'psql'){
+              pgAdmin.Tools.Psql.openPsqlTool(null, null, connectionInfo);
+            }else if(toolNme == 'ERD'){
+              localStorage.setItem(toolDataId, toolData);
+              pgAdmin.Tools.ERD.showErdTool(null, null, false, connectionInfo, toolDataId);
+            }else if(toolNme == 'schema_diff'){
+              localStorage.setItem(toolDataId, toolData);
+              pgAdmin.Tools.SchemaDiff.launchSchemaDiff(toolDataId);
             }
           });
 
           // call clear application state data.
           try {
-            getApiInstance().delete(url_for('settings.delete_application_state'), {
-            });
+            getApiInstance().delete(url_for('settings.delete_application_state'), {});
           } catch (error) {
             console.error(error);
             pgAdmin.Browser.notifier.error(gettext('Failed to remove query data.') + parseApiError(error));

web/pgadmin/browser/static/js/browser.js

@@ -455,7 +455,7 @@ export default function AdHocConnection({mode}) {
       'pgadmin:tool:show',
       `${BROWSER_PANELS.PSQL_TOOL}_${transId}`,
       openUrl,
-      {title: escapedTitle, db: db_name},
+      {title: escapedTitle, db: db_name, server_name: formData.server_name, 'user': user_name},
       {title: panelTitle, icon: 'pg-font-icon icon-terminal', manualClose: false, renamable: true},
       Boolean(open_new_tab?.includes('psql_tool'))
     );

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

@@ -16,6 +16,8 @@
 import json
 from flask import render_template, Response, request, session, current_app
 from flask_babel import gettext
+
+from pgadmin.settings import delete_tool_data
 from pgadmin.user_login_check import pga_login_required
 from pgadmin.utils import PgAdminModule
 from pgadmin.utils.ajax import success_return, \
@@ -238,6 +240,9 @@ def save():
             data['mid'], data['category_id'], data['id'], data['value'])
         sgm.get_nodes(sgm)
 
+        if data['name'] == 'save_app_state' and not data['value']:
+            delete_tool_data()
+
         if not res:
             return internal_server_error(errormsg=msg)
 

web/pgadmin/preferences/__init__.py

@@ -269,19 +269,18 @@ def get_file_format_setting():
 @pga_login_required
 def save_application_state():
     """
-    Args:
-        sid: server id
-        did: database id
+    Expose an api to save the application state which stores the data from
+    query tool, ERD, schema-diff, psql
     """
     data = json.loads(request.data)
-    id = data['trans_id']
+    trans_id = data['trans_id']
     fernet = Fernet(current_app.config['SECRET_KEY'].encode())
     tool_data = fernet.encrypt(json.dumps(data['tool_data']).encode())
     connection_info = data['connection_info'] \
         if 'connection_info' in data else None
     try:
         data_entry = ApplicationState(
-            uid=current_user.id, id=id,connection_info=connection_info,
+            uid=current_user.id, id=trans_id,connection_info=connection_info,
             tool_name=data['tool_name'], tool_data=tool_data)
 
         db.session.merge(data_entry)
@@ -304,6 +303,9 @@ def save_application_state():
 )
 @pga_login_required
 def get_application_state():
+    """
+    Returns application state if any stored.
+    """
     fernet = Fernet(current_app.config['SECRET_KEY'].encode())
     result = db.session \
         .query(ApplicationState) \
@@ -335,10 +337,16 @@ def delete_application_state():
     if request.data:
         data = json.loads(request.data)
         trans_id = int(data['panelId'].split('_')[-1])
-    return delete_tool_data(trans_id)
+    status, msg = delete_tool_data(trans_id)
+    return make_json_response(
+        data={
+            'status': status,
+            'msg': msg,
+        }
+    )
 
 
-def delete_tool_data(trans_id):
+def delete_tool_data(trans_id=None):
     try:
         if trans_id:
             results = db.session \
@@ -354,17 +362,7 @@ def delete_tool_data(trans_id):
         for result in results:
             db.session.delete(result)
         db.session.commit()
-        return make_json_response(
-            data={
-                'status': True,
-                'msg': 'Success',
-            }
-        )
+        return True, 'Success'
     except Exception as e:
         db.session.rollback()
-        return make_json_response(
-            data={
-                'status': False,
-                'msg': str(e),
-            }
-        )
+        return False, str(e)

web/pgadmin/settings/__init__.py

@@ -10,27 +10,48 @@ import React, { useContext, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import getApiInstance from '../../static/js/api_instance';
 import url_for from 'sources/url_for';
+import { getBrowser } from '../../static/js/utils';
+import usePreferences from '../../preferences/static/js/store';
 
 const ApplicationStateContext = React.createContext();
 
 export const useApplicationState = ()=>useContext(ApplicationStateContext);
 
-export function retrieveDataFromLocalStorgae(sqlId){
-  let sqlValue = JSON.parse(localStorage.getItem(sqlId));
-  localStorage.removeItem(sqlId);   
-  return sqlValue;
+export function getToolData(localStorageId){
+  let toolDataJson = JSON.parse(localStorage.getItem(localStorageId));
+  localStorage.removeItem(localStorageId);   
+  return toolDataJson;
 }
 
 export function ApplicationStateProvider({children}){
-  const saveToolData = (data) =>{
-    getApiInstance().post(
+  const preferencesStore = usePreferences();
+  const saveAppState = preferencesStore?.getPreferencesForModule('misc')?.save_app_state;
+  const openNewTab = preferencesStore?.getPreferencesForModule('browser')?.new_browser_tab_open;
+
+  const saveToolData = (toolName, connectionInfo, transId, toolData) =>{
+    let data = {
+      'tool_name': toolName,
+      'connection_info': connectionInfo, 
+      'trans_id': transId,
+      'tool_data': toolData
+    };
+    getApiInstance({'Content-Encoding': 'gzip'}).post(
       url_for('settings.save_application_state'),
       JSON.stringify(data),
     ).catch((error)=>{console.error(error);});
   };
 
+  const enableSaveToolData = (toolName)=>{
+    let toolMapping = {'sqleditor': 'qt', 'schema_diff': 'schema_diff', 'psql': 'psql_tool', 'ERD': 'erd_tool'};
+    if(openNewTab?.includes(toolMapping[toolName])){
+      return saveAppState && getBrowser().name == 'Electron';
+    }
+    return saveAppState;
+  };
+
   const value = useMemo(()=>({
     saveToolData,
+    enableSaveToolData
   }), []);
 
   return <ApplicationStateContext.Provider value={value}>

web/pgadmin/settings/static/ApplicationStateProvider.jsx

@@ -0,0 +1,25 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import gettext from 'sources/gettext';
+import { LAYOUT_EVENTS } from './helpers/Layout';
+import EmptyPanelMessage from './components/EmptyPanelMessage';
+
+export default function ToolErrorView({error, panelId, panelDocker}){
+
+  panelDocker.eventBus.registerListener(LAYOUT_EVENTS.CLOSING, (id)=>{
+    if(panelId == id) {
+      panelDocker.close(panelId, true);
+    }
+  });
+
+  let err_msg = gettext(`Unable to restore data due to error: ${error}`);
+  return <EmptyPanelMessage error={gettext(err_msg)}/>;
+}
+
+ToolErrorView.propTypes = {
+  error: PropTypes.string,
+  panelId: PropTypes.string,
+  panelDocker: PropTypes.object,
+  pgAdmin: PropTypes.object,
+  toolName: PropTypes.string,
+};

web/pgadmin/static/js/ToolErrorView.jsx

@@ -12,6 +12,8 @@ import { styled } from '@mui/material/styles';
 import { Box } from '@mui/material';
 import InfoRoundedIcon from '@mui/icons-material/InfoRounded';
 import PropTypes from 'prop-types';
+import { FormHelperText } from '@mui/material';
+import HTMLReactParse from 'html-react-parser';
 
 const StyledBox = styled(Box)(({theme}) => ({
   color: theme.palette.text.primary,
@@ -23,16 +25,20 @@ const StyledBox = styled(Box)(({theme}) => ({
   height: '100%',
 }));
 
-export default function EmptyPanelMessage({text, style}) {
+export default function EmptyPanelMessage({text, style, error}) {
 
   return (
     <StyledBox style={style}>
-      <InfoRoundedIcon style={{height: '1.2rem'}}/>
-      <span style={{marginLeft: '4px'}}>{text}</span>
+      { error ? <FormHelperText variant="outlined" error= {true}  style={{marginLeft: '4px'}} >{HTMLReactParse(error)}</FormHelperText> :
+        <div>
+          <InfoRoundedIcon style={{height: '1.2rem'}}/>
+          <span style={{marginLeft: '4px'}}>{text}</span>
+        </div>}
     </StyledBox>
   );
 }
 EmptyPanelMessage.propTypes = {
   text: PropTypes.string,
   style: PropTypes.object,
+  error: PropTypes.string,
 };