Fixed an issue where pgAdmin failed to focus when previously unfocused and then quit. #8760

Author: adityatoshniwal

docs/en_US/release_notes_9_4.rst

@@ -40,4 +40,5 @@ Bug fixes
   | `Issue #8608 <https://github.com/pgadmin-org/pgadmin4/issues/8608>`_ -  Handle result grid data changes in View/Edit Data mode by automatically reconnecting to the server if a disconnection occurs.
   | `Issue #8668 <https://github.com/pgadmin-org/pgadmin4/issues/8668>`_ -  Implement API fetch error display for select dropdown.
   | `Issue #8711 <https://github.com/pgadmin-org/pgadmin4/issues/8711>`_ -  Fixed an issue where light theme briefly appears when pgAdmin loads or tools open, even when a dark or system UI theme is preferred.
-  | `Issue #8713 <https://github.com/pgadmin-org/pgadmin4/issues/8713>`_ -  Fixed issues related to column range selection using shift + click.
+  | `Issue #8713 <https://github.com/pgadmin-org/pgadmin4/issues/8713>`_ -  Fixed issues related to column range selection using shift + click.
+  | `Issue #8760 <https://github.com/pgadmin-org/pgadmin4/issues/8760>`_ -  Fixed an issue where pgAdmin failed to focus when previously unfocused and then quit.

runtime/src/js/pgadmin.js

@@ -406,9 +406,16 @@ ipcMain.on('restartApp', ()=>{
   app.relaunch();
   app.exit(0);
 });
-ipcMain.on('log', (text) => ()=>{
+ipcMain.on('log', (_e, text) => ()=>{
   misc.writeServerLog(text);
 });
+ipcMain.on('focus', (e) => {
+  const callerWindow = BrowserWindow.fromWebContents(e.sender)
+  if (callerWindow) {
+    if (callerWindow.isMinimized()) callerWindow.restore();
+    callerWindow.focus();
+  }
+});
 ipcMain.on('reloadApp', reloadApp);
 ipcMain.handle('checkPortAvailable', async (_e, fixedPort)=>{
   try {

web/pgadmin/static/js/custom_hooks.js

@@ -246,6 +246,7 @@ export function useBeforeUnload({ enabled, isNewTab, beforeClose, closePanel })
   const onBeforeUnloadElectron = useCallback((e)=>{
     e.preventDefault();
     e.returnValue = 'prevent';
+    window.electronUI?.focus();
     beforeClose?.(forceClose);
   }, []);