Fix some more review comments.

Author: yogeshmahajan-1903

web/pgadmin/authenticate/__init__.py

@@ -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/browser/static/js/browser.js

@@ -299,26 +299,26 @@ 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)}`;
+            let tool_data_id = `${tool_name}-${getRandomInt(1, 9999999)}`;
 
             if (tool_name == 'sqleditor'){
-              localStorage.setItem(sql_id, tool_data);
-              showQueryTool.relaunchSqlTool(tool_state, sql_id);
+              localStorage.setItem(tool_data_id, tool_data);
+              showQueryTool.relaunchSqlTool(tool_state, tool_data_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);
+              localStorage.setItem(tool_data_id, tool_data);
+              pgAdmin.Tools.ERD.showErdTool(null, null, false, tool_data_id, tool_state);
             }else if(tool_name == 'schema_diff'){
-              localStorage.setItem(sql_id, tool_data);
-              pgAdmin.Tools.SchemaDiff.launchSchemaDiff(sql_id);
+              localStorage.setItem(tool_data_id, tool_data);
+              pgAdmin.Tools.SchemaDiff.launchSchemaDiff(tool_data_id);
             }
           });
 

web/pgadmin/preferences/__init__.py

@@ -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/settings/__init__.py

@@ -274,14 +274,14 @@ def save_application_state():
         did: database id
     """
     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)
@@ -335,10 +335,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 +360,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/static/ApplicationStateProvider.jsx

@@ -10,27 +10,50 @@ 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 save_app_state = preferencesStore?.getPreferencesForModule('misc')?.save_app_state;
+  const open_new_tab = preferencesStore?.getPreferencesForModule('browser')?.new_browser_tab_open;
+
+  const saveToolData = (toolName, connectionInfo, transId, tool_data) =>{
+    let data = {
+      'tool_name': toolName,
+      'connection_info': connectionInfo, 
+      'trans_id': transId,
+      'tool_data': tool_data
+    };
+    getApiInstance({'Content-Encoding': 'gzip'}).post(
       url_for('settings.save_application_state'),
       JSON.stringify(data),
     ).catch((error)=>{console.error(error);});
   };
 
+  const enableSaveToolData = (toolName)=>{
+    let tool_mapping = {'sqleditor': 'qt', 'schema_diff': 'schema_diff', 'psql': 'psql_tool', 'ERD': 'erd_tool'};
+    if(open_new_tab?.includes(tool_mapping[toolName])){
+      return save_app_state && getBrowser().name == 'Electron';
+    }
+    return save_app_state;
+  };
+
   const value = useMemo(()=>({
     saveToolData,
+    enableSaveToolData
   }), []);
 
   return <ApplicationStateContext.Provider value={value}>

web/pgadmin/static/js/ErrorView.jsx

@@ -0,0 +1,22 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import gettext from 'sources/gettext';
+
+export default function ErrorView({error, panelId, panelDocker, pgAdmin, toolName}){
+  let header = gettext('Error while restore');
+  let err_msg = gettext(`Unable to restore data for ${toolName} due to ${error}. On clicking the ok button, panel will be closed.`);
+  pgAdmin.Browser.notifier.alert(header, err_msg, () => {
+    if (panelId) {
+      panelDocker.close(panelId, true);
+    }
+  });
+  return <></>;
+}
+
+ErrorView.propTypes = {
+  error: PropTypes.string,
+  panelId: PropTypes.string,
+  panelDocker: PropTypes.object,
+  pgAdmin: PropTypes.object,
+  toolName: PropTypes.string,
+};

web/pgadmin/static/js/custom_hooks.js

@@ -78,13 +78,15 @@ export function usePrevious(value) {
 
 export function useDelayDebounce(callback, args, delay) {
   useEffect(() => {
+    if (args === undefined || args === null) return;
+    
     const delayDebounceFn = setTimeout(() => {
       if (args) {
         callback(args);
       }
     }, delay);
     return () => clearTimeout(delayDebounceFn);
-  }, [args]);
+  }, [args, callback, delay]);
 }
 
 export function useOnScreen(ref) {

web/pgadmin/tools/erd/static/js/ERDModule.js

@@ -87,12 +87,13 @@ export default class ERDModule {
   }
 
   // Callback to draw ERD Tool for objects
-  showErdTool(_data, treeIdentifier, gen=false, sqlId=null, tooState=null) {
+  showErdTool(_data, treeIdentifier, gen=false, sqlId=null, toolState=null) {
     let parentData = null;
     let panelTitle = null;
     if(sqlId){
-      let connection_info = tooState.connection_info;  
+      let connection_info = toolState.connection_info;  
       panelTitle = connection_info.title;
+      
       parentData = {
         server_group: {
           _id: connection_info.sgid || 0,

web/pgadmin/tools/erd/static/js/erd_tool/components/ERDTool.jsx

@@ -38,7 +38,7 @@ import { styled } from '@mui/material/styles';
 import BeforeUnload from './BeforeUnload';
 import { isMac } from '../../../../../../static/js/keyboard_shortcuts';
 import { downloadBase64UrlData } from '../../../../../../static/js/download_utils';
-import { retrieveDataFromLocalStorgae } from '../../../../../../settings/static/ApplicationStateProvider';
+import { getToolData } from '../../../../../../settings/static/ApplicationStateProvider';
 
 /* Custom react-diagram action for keyboard events */
 export class KeyboardShortcutAction extends Action {
@@ -194,13 +194,11 @@ export default class ERDTool extends React.Component {
       },
       'linksUpdated': () => {
         this.setState({dirty: true});
-        this.eventBus.fireEvent(ERD_EVENTS.DIRTY, true);
-        this.eventBus.fireEvent(ERD_EVENTS.SAVE_ERD_TOOL_DATA, {'tool_data':this.diagram.serialize(this.props.pgAdmin.Browser.utils.app_version_int)});
+        this.eventBus.fireEvent(ERD_EVENTS.DIRTY, true, this.diagram.serialize(this.props.pgAdmin.Browser.utils.app_version_int));
       },
       'nodesUpdated': ()=>{
         this.setState({dirty: true});
-        this.eventBus.fireEvent(ERD_EVENTS.DIRTY, true);
-        this.eventBus.fireEvent(ERD_EVENTS.SAVE_ERD_TOOL_DATA, {'tool_data':this.diagram.serialize(this.props.pgAdmin.Browser.utils.app_version_int)});
+        this.eventBus.fireEvent(ERD_EVENTS.DIRTY, true, this.diagram.serialize(this.props.pgAdmin.Browser.utils.app_version_int));
       },
       'showNote': (event)=>{
         this.showNote(event.node);
@@ -357,7 +355,7 @@ export default class ERDTool extends React.Component {
 
 
     if(this.props.params.sql_id){
-      let sqlValue = retrieveDataFromLocalStorgae(this.props.params.sql_id);
+      let sqlValue = getToolData(this.props.params.sql_id);
       if (sqlValue) {
         this.diagram.deserialize(sqlValue);
       }

web/pgadmin/tools/erd/static/js/erd_tool/components/MainToolBar.jsx

@@ -38,7 +38,7 @@ import { MagicIcon, SQLFileIcon } from '../../../../../../static/js/components/E
 import { useModal } from '../../../../../../static/js/helpers/ModalProvider';
 import { withColorPicker } from '../../../../../../static/js/helpers/withColorPicker';
 import { useApplicationState } from '../../../../../../settings/static/ApplicationStateProvider';
-import usePreferences from '../../../../../../preferences/static/js/store';
+import { useDelayDebounce } from '../../../../../../static/js/custom_hooks';
 
 const StyledBox = styled(Box)(({theme}) => ({
   padding: '2px 4px',
@@ -64,8 +64,7 @@ export function MainToolBar({preferences, eventBus, fillColor, textColor, notati
   });
   const [showDetails, setShowDetails] = useState(true);
 
-  const {saveToolData} = useApplicationState();
-  const preferencesStore = usePreferences();
+  const {saveToolData, enableSaveToolData} = useApplicationState();
   const {openMenuName, toggleMenu, onMenuClose} = usePgMenuGroup();
   const saveAsMenuRef = React.useRef(null);
   const sqlMenuRef = React.useRef(null);
@@ -134,17 +133,12 @@ export function MainToolBar({preferences, eventBus, fillColor, textColor, notati
       [ERD_EVENTS.ANY_ITEM_SELECTED, (selected)=>{
         setDisableButton('drop-table', !selected);
       }],
-      [ERD_EVENTS.DIRTY, (isDirty)=>{
+      [ERD_EVENTS.DIRTY, (isDirty, data)=>{
+        const save_app_state = enableSaveToolData('ERD');
         isDirtyRef.current = isDirty;
         setDisableButton('save', !isDirty);
-      }],
-      [ERD_EVENTS.SAVE_ERD_TOOL_DATA, (data)=>{
-        const save_app_state = preferencesStore?.getPreferencesForModule('misc')?.save_app_state;
         if(save_app_state){
-          saveToolData({'tool_name': 'ERD',
-            'trans_id': connectionInfo.trans_id,
-            'connection_info': connectionInfo, 
-            ...data});
+          setSaveData(data);
         }
       }],
     ];
@@ -158,6 +152,11 @@ export function MainToolBar({preferences, eventBus, fillColor, textColor, notati
     };
   }, []);
 
+  const [saveData, setSaveData] = useState(null);
+  useDelayDebounce((saveData)=>{
+    saveToolData('ERD', connectionInfo,  connectionInfo.trans_id, saveData);
+  }, saveData, 500);
+
   useEffect(()=>{
     const showSql = ()=>{
       eventBus.fireEvent(ERD_EVENTS.SHOW_SQL, checkedMenuItems['sql_with_drop']);