IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

More fixes related to rc-dock changes. #6479

Browse Source
This commit is contained in:
Aditya Toshniwal 2023-11-20 17:45:17 +05:30
parent d8bcc11a95
commit 19cbe8c39f
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/misc/sql/static/js/SQL.jsx
View File

@ -79,7 +79,7 @@ function SQL({nodeData, node, treeNodeInfo, isActive, isStale, setIsStale}) {
gettext(e.response.data.errormsg) gettext(e.response.data.errormsg)
); );
// show failed message. // show failed message.
setNodeSQL([gettext('Failed to retrieve data from the server.'), true]); setNodeSQL(gettext('Failed to retrieve data from the server.'));
setLoaderText(''); setLoaderText('');
}).then(()=>{ }).then(()=>{
setLoaderText(''); setLoaderText('');

23
web/pgadmin/static/js/helpers/Layout/index.jsx
View File

@ -33,19 +33,16 @@ function TabTitle({id, closable, defaultInternal}) {
}, []); }, []);
useEffect(()=>{ useEffect(()=>{
let deregister; const deregister = layoutDocker.eventBus.registerListener(LAYOUT_EVENTS.REFRESH_TITLE, _.debounce((panelId)=>{
if(internal.renamable) { if(panelId == id) {
deregister = layoutDocker.eventBus.registerListener(LAYOUT_EVENTS.REFRESH_TITLE, _.debounce((panelId)=>{ const internal = layoutDocker?.find(id)?.internal??{};
if(panelId == id) { setAttrs({
const internal = layoutDocker?.find(id)?.internal??{}; icon: internal.icon,
setAttrs({ title: internal.title,
icon: internal.icon, tooltip: internal.tooltip ?? internal.title,
title: internal.title, });
tooltip: internal.tooltip ?? internal.title, }
}); }, 100));
}
}, 100));
}
return ()=>deregister?.(); return ()=>deregister?.();
}, []); }, []);

23
web/pgadmin/static/js/helpers/withStandardTabInfo.jsx
View File

@ -11,6 +11,7 @@ import React, { useContext, useEffect, useState } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { LayoutDockerContext, LAYOUT_EVENTS } from './Layout'; import { LayoutDockerContext, LAYOUT_EVENTS } from './Layout';
import { usePgAdmin } from '../../../static/js/BrowserComponent'; import { usePgAdmin } from '../../../static/js/BrowserComponent';
import ErrorBoundary from './ErrorBoundary';
export default function withStandardTabInfo(Component, tabId) { export default function withStandardTabInfo(Component, tabId) {
// eslint-disable-next-line react/display-name // eslint-disable-next-line react/display-name
@ -63,16 +64,18 @@ export default function withStandardTabInfo(Component, tabId) {
}, []); }, []);
return ( return (
<Component <ErrorBoundary>
{...props} <Component
nodeItem={nodeItem} {...props}
nodeData={nodeData} nodeItem={nodeItem}
node={node} nodeData={nodeData}
treeNodeInfo={treeNodeInfo} node={node}
isActive={isActive} treeNodeInfo={treeNodeInfo}
isStale={isStale} isActive={isActive}
setIsStale={(v)=>setNodeInfo((prev)=>[v, prev[1], prev[2]])} isStale={isStale}
/> setIsStale={(v)=>setNodeInfo((prev)=>[v, prev[1], prev[2]])}
/>
</ErrorBoundary>
); );
}; };