IPC event and some functions and UpdateCheckNotify.jsx file renamed

anilsahoo20 · anilsahoo20 · commit efbd443e43c5 · 2025-06-12T12:04:08.000+05:30
diff --git a/runtime/src/js/pgadmin.js b/runtime/src/js/pgadmin.js
@@ -49,7 +49,7 @@ let [pythonPath, pgadminFile] = misc.getAppPaths(__dirname);
 
 const menuCallbacks = {
   'check_for_updates': ()=>{
-    pgAdminMainScreen.webContents.send('appUpdateNotifier', {check_version_update: true});
+    pgAdminMainScreen.webContents.send('notifyAppAutoUpdate', {check_version_update: true});
   },
   'restart_to_update': ()=>{
     forceQuitAndInstallUpdate();
@@ -451,11 +451,11 @@ function notifyUpdateInstalled() {
     configStore.set('update_installed', false);
     // Notify renderer
     if (pgAdminMainScreen) {
-      pgAdminMainScreen.webContents.send('appUpdateNotifier', {update_installed: true});
+      pgAdminMainScreen.webContents.send('notifyAppAutoUpdate', {update_installed: true});
     } else {
       // If main screen not ready, wait and send after it's created
       app.once('browser-window-created', (event, window) => {
-        window.webContents.send('appUpdateNotifier', {update_installed: true});
+        window.webContents.send('notifyAppAutoUpdate', {update_installed: true});
       });
     }
   }
@@ -510,25 +510,25 @@ if (process.platform === 'darwin') {
   autoUpdater.on('update-available', () => {
     setConfigAndRefreshMenu('update-available');
     misc.writeServerLog('[Auto-Updater]: Update downloading...');
-    pgAdminMainScreen.webContents.send('appUpdateNotifier', {update_downloading: true});
+    pgAdminMainScreen.webContents.send('notifyAppAutoUpdate', {update_downloading: true});
   });
 
   autoUpdater.on('update-not-available', () => {
     setConfigAndRefreshMenu('update-not-available');
     misc.writeServerLog('[Auto-Updater]: No update available...');
-    pgAdminMainScreen.webContents.send('appUpdateNotifier', {no_update_available: true});
+    pgAdminMainScreen.webContents.send('notifyAppAutoUpdate', {no_update_available: true});
   });
 
   autoUpdater.on('update-downloaded', () => {
     setConfigAndRefreshMenu('update-downloaded');
     misc.writeServerLog('[Auto-Updater]: Update downloaded...');
-    pgAdminMainScreen.webContents.send('appUpdateNotifier', {update_downloaded: true});
+    pgAdminMainScreen.webContents.send('notifyAppAutoUpdate', {update_downloaded: true});
   });
 
   autoUpdater.on('error', (message) => {
     setConfigAndRefreshMenu('error-close');
     misc.writeServerLog(`[Auto-Updater]: ${message}`);
-    pgAdminMainScreen.webContents.send('appUpdateNotifier', {error: true, errMsg: message});
+    pgAdminMainScreen.webContents.send('notifyAppAutoUpdate', {error: true, errMsg: message});
   });
 
   ipcMain.on('sendDataForAppUpdate', (_, data) => {
@@ -552,7 +552,7 @@ if (process.platform === 'darwin') {
       } catch (err) {
         misc.writeServerLog('[Auto-Updater]: Error setting autoUpdater feed URL: ' + err.message);
         if (pgAdminMainScreen) {
-          pgAdminMainScreen.webContents.send('appUpdateNotifier', {error: true, errMsg: 'Failed to check for updates. Please try again later.'});
+          pgAdminMainScreen.webContents.send('notifyAppAutoUpdate', {error: true, errMsg: 'Failed to check for updates. Please try again later.'});
         }
         return;
       }
diff --git a/runtime/src/js/pgadmin_preload.js b/runtime/src/js/pgadmin_preload.js
@@ -33,8 +33,8 @@ contextBridge.exposeInMainWorld('electronUI', {
   downloadBase64UrlData: (...args) => ipcRenderer.invoke('download-base64-url-data', ...args),
   downloadTextData: (...args) => ipcRenderer.invoke('download-text-data', ...args),
   sendDataForAppUpdate: (data) => ipcRenderer.send('sendDataForAppUpdate', data),
-  appUpdateNotifier: (callback) => {
-    ipcRenderer.removeAllListeners('appUpdateNotifier'); // Clean up previous listeners
-    ipcRenderer.on('appUpdateNotifier', (_, data) => callback(data));
+  notifyAppAutoUpdate: (callback) => {
+    ipcRenderer.removeAllListeners('notifyAppAutoUpdate'); // Clean up previous listeners
+    ipcRenderer.on('notifyAppAutoUpdate', (_, data) => callback(data));
   },
 });
diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js
@@ -17,7 +17,7 @@ import usePreferences, { setupPreferenceBroadcast } from '../../../preferences/s
 import checkNodeVisibility from '../../../static/js/check_node_visibility';
 import * as showQueryTool from '../../../tools/sqleditor/static/js/show_query_tool';
 import {getRandomInt} from 'sources/utils';
-import {appUpdateNotifier} from './UpdateCheckNotify';
+import {appAutoUpdateNotifier} from '../../../static/js/helpers/appAutoUpdateNotifier';
 
 define('pgadmin.browser', [
   'sources/gettext', 'sources/url_for', 'sources/pgadmin',
@@ -301,7 +301,7 @@ define('pgadmin.browser', [
               'platform':data.platform,
             });
           }
-          appUpdateNotifier(message, 'warning', downloadUpdate, null, 'Update available', 'download_update');
+          appAutoUpdateNotifier(message, 'warning', downloadUpdate, null, 'Update available', 'download_update');
         } else if(data.outdated) {
           //This is for server mode or auto-update not supported desktop installer or not mentioned auto_update_url
           pgAdmin.Browser.notifier.warning(
@@ -316,7 +316,7 @@ define('pgadmin.browser', [
         // If the user manually triggered a check for updates (trigger_update_check is true)
         // and no update is available (data.outdated is false), show an info notification.
         if (!data.outdated && trigger_update_check){
-          appUpdateNotifier('No update available.....', 'info', null, 10000);
+          appAutoUpdateNotifier('No update available.....', 'info', null, 10000);
         }
       }).catch((error)=>{
         console.error('Error during version check', error);
diff --git a/web/pgadmin/static/js/BrowserComponent.jsx b/web/pgadmin/static/js/BrowserComponent.jsx
@@ -33,7 +33,7 @@ import pgWindow from 'sources/window';
 import WorkspaceToolbar from '../../misc/workspaces/static/js/WorkspaceToolbar';
 import { useWorkspace, WorkspaceProvider } from '../../misc/workspaces/static/js/WorkspaceProvider';
 import { PgAdminProvider, usePgAdmin } from './PgAdminProvider';
-import { appUpdateNotifier } from '../../browser/static/js/UpdateCheckNotify';
+import { appAutoUpdateNotifier } from './helpers/appAutoUpdateNotifier';
 
 const objectExplorerGroup  = {
   tabLocked: true,
@@ -179,22 +179,22 @@ export default function BrowserComponent({pgAdmin}) {
   
   // Listen for auto-update events from the Electron main process and display notifications
   // to the user based on the update status (e.g., update available, downloading, downloaded, installed, or error).
-  if (window.electronUI && typeof window.electronUI.appUpdateNotifier === 'function') {
-    window.electronUI.appUpdateNotifier((data)=>{
+  if (window.electronUI && typeof window.electronUI.notifyAppAutoUpdate === 'function') {
+    window.electronUI.notifyAppAutoUpdate((data)=>{
       if (data?.check_version_update) {
         pgAdmin.Browser.check_version_update(true);
       } else if (data.update_downloading) {
-        appUpdateNotifier('Update downloading...', 'info', null, 10000);
+        appAutoUpdateNotifier('Update downloading...', 'info', null, 10000);
       } else if (data.no_update_available) {
-        appUpdateNotifier('No update available.....', 'info', null, 10000);
+        appAutoUpdateNotifier('No update available.....', 'info', null, 10000);
       } else if (data.update_downloaded) {
         const UPDATE_DOWNLOADED_MESSAGE = gettext('An update is ready. Restart the app now to install it, or later to keep using the current version.');
-        appUpdateNotifier(UPDATE_DOWNLOADED_MESSAGE, 'warning', installUpdate, null, 'Update downloaded', 'update_downloaded');
+        appAutoUpdateNotifier(UPDATE_DOWNLOADED_MESSAGE, 'warning', installUpdate, null, 'Update downloaded', 'update_downloaded');
       } else if (data.error) {
-        appUpdateNotifier(`${data.errMsg}`, 'error');
+        appAutoUpdateNotifier(`${data.errMsg}`, 'error');
       } else if (data.update_installed) {
         const UPDATE_INSTALLED_MESSAGE = gettext('Update installed successfully!');
-        appUpdateNotifier(UPDATE_INSTALLED_MESSAGE, 'success');
+        appAutoUpdateNotifier(UPDATE_INSTALLED_MESSAGE, 'success');
       }
     });
   }
diff --git a/web/pgadmin/static/js/helpers/appAutoUpdateNotifier.jsx b/web/pgadmin/static/js/helpers/appAutoUpdateNotifier.jsx
@@ -12,7 +12,7 @@ import { Box } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import CloseIcon from '@mui/icons-material/CloseRounded';
 import PropTypes from 'prop-types';
-import { DefaultButton, PgIconButton } from '../../../static/js/components/Buttons';
+import { DefaultButton, PgIconButton } from '../components/Buttons';
 import pgAdmin from 'sources/pgadmin';
 
 const StyledBox = styled(Box)(({theme}) => ({
@@ -21,23 +21,23 @@ const StyledBox = styled(Box)(({theme}) => ({
   minWidth: '325px',
   maxWidth: '400px',
   ...theme.mixins.panelBorder.all,
-  '&.UpdateCheckNotify-containerWarning': {
+  '&.UpdateWarningNotifier-containerWarning': {
     borderColor: theme.palette.warning.main,
     backgroundColor: theme.palette.warning.light,
   },
-  '& .UpdateCheckNotify-containerHeader': {
+  '& .UpdateWarningNotifier-containerHeader': {
     height: '32px',
     display: 'flex',
     justifyContent: 'space-between',
     fontWeight: 'bold',
     alignItems: 'center',
     borderTopLeftRadius: 'inherit',
     borderTopRightRadius: 'inherit',
-    '& .UpdateCheckNotify-iconWarning': {
+    '& .UpdateWarningNotifier-iconWarning': {
       color: theme.palette.warning.main,
     },
   },
-  '&.UpdateCheckNotify-containerBody': {
+  '&.UpdateWarningNotifier-containerBody': {
     marginTop: '1rem',
     overflowWrap: 'break-word',
   },
@@ -53,12 +53,12 @@ function UpdateWarningNotifier({desc, title, onClose, onClick, status, uniqueKey
     }
   };
   return (
-    <StyledBox className={'UpdateCheckNotify-containerWarning'} data-test={'Update-popup-warning'}>
-      <Box display="flex" justifyContent="space-between" className='UpdateCheckNotify-containerHeader'>
+    <StyledBox className={'UpdateWarningNotifier-containerWarning'} data-test={'Update-popup-warning'}>
+      <Box display="flex" justifyContent="space-between" className='UpdateWarningNotifier-containerHeader'>
         <Box marginRight={'1rem'}>{title}</Box>
-        <PgIconButton size="xs" noBorder icon={<CloseIcon />} onClick={handleClose} title={'Close'} className={'UpdateCheckNotify-iconWarning'} />
+        <PgIconButton size="xs" noBorder icon={<CloseIcon />} onClick={handleClose} title={'Close'} className={'UpdateWarningNotifier-iconWarning'} />
       </Box>
-      <Box className='UpdateCheckNotify-containerBody'>
+      <Box className='UpdateWarningNotifier-containerBody'>
         {desc && <Box>{desc}</Box>}
         <Box display="flex">
           {onClick && <Box marginTop={'1rem'} display="flex">
@@ -86,7 +86,7 @@ UpdateWarningNotifier.propTypes = {
   uniqueKey: PropTypes.string,
 };
 
-export function appUpdateNotifier(desc, type, onClick, hideDuration=null, title='', status='download_update') {
+export function appAutoUpdateNotifier(desc, type, onClick, hideDuration=null, title='', status='download_update') {
   const uniqueKey = `${title}::${desc}`;
 
   // Check if this warning is already active except error type
