IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-21 08:24:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that pgAdmin works when opened in an iframe. #7681

Browse Source
This commit is contained in:
Yogesh Mahajan 2024-07-16 16:32:52 +05:30 committed by GitHub
parent a06c13623d
commit c4a52687b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/pgadmin/static/js/BrowserComponent.jsx
View File

@ -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

8
web/pgadmin/static/js/helpers/Notifier.jsx
View File

@ -187,8 +187,9 @@ export function NotifierProvider({ pgAdmin, pgWindow, getInstance, children, onR
const modal = useModal();
useEffect(()=>{
// if open in an iframe then use top pgAdmin
if(window.self != window.top) {
// if opened in an iframe then use top pgAdmin
// pgAdmin itself can open in iframe, skip this in that case.
if(window.self != window.top && pgWindow != window ) {
pgAdmin.Browser.notifier = new Notifier(modal, pgWindow.pgAdmin.Browser.notifier.snackbar);
onReady?.();
getInstance?.(pgAdmin.Browser.notifier);
@ -196,7 +197,8 @@ export function NotifierProvider({ pgAdmin, pgWindow, getInstance, children, onR
}, []);
// if open in a window, then create your own Snackbar
if(window.self == window.top) {
// if pgAdmin is opened inside an iframe then it also same as new window.
if(window.self == window.top || (window.self != window.top && pgWindow != window )) {
return (
<Root>
<SnackbarProvider