Ensure pgadmin works when embded in iframe.pgadmin-org#7681

yogeshmahajan-1903 · Jul 16, 2024 · 2b44616 · 2b44616
1 parent b303693
commit 2b44616
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/web/pgadmin/static/js/BrowserComponent.jsx b/web/pgadmin/static/js/BrowserComponent.jsx
@@ -22,6 +22,7 @@ import { getBrowser } from './utils';
 import PropTypes from 'prop-types';
 import Processes from '../../misc/bgprocess/static/js/Processes';
 import { useBeforeUnload } from './custom_hooks';
+import pgWindow from 'sources/window';
 
 
 const objectExplorerGroup  = {
@@ -125,7 +126,7 @@ export default function BrowserComponent({pgAdmin}) {
   return (
     <PgAdminContext.Provider value={pgAdmin}>
       <ModalProvider>
-        <NotifierProvider pgAdmin={pgAdmin} onReady={()=>setUiReady(true)}/>
+        <NotifierProvider pgAdmin={pgAdmin} pgWindow={pgWindow} onReady={()=>setUiReady(true)}/>
         {browser != 'Electron' && <AppMenuBar />}
         <div style={{height: (browser != 'Electron' ? 'calc(100% - 30px)' : '100%')}}>
           <Layout

diff --git a/web/pgadmin/static/js/helpers/Notifier.jsx b/web/pgadmin/static/js/helpers/Notifier.jsx
@@ -188,15 +188,15 @@ export function NotifierProvider({ pgAdmin, pgWindow, getInstance, children, onR
 
   useEffect(()=>{
     // if open in an iframe then use top pgAdmin
-    if(window.self != window.top) {
+    if(window.self != window.top && pgWindow != window ) {
       pgAdmin.Browser.notifier = new Notifier(modal, pgWindow.pgAdmin.Browser.notifier.snackbar);
       onReady?.();
       getInstance?.(pgAdmin.Browser.notifier);
     }
   }, []);
 
   // if open in a window, then create your own Snackbar
-  if(window.self == window.top) {
+  if(window.self == window.top || (window.self != window.top && pgWindow == window )) {
     return (
       <Root>
         <SnackbarProvider