IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-08 15:13:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

1. Fixed an issue where all rows and filter rows buttons of object explorer toolbar were disabled for views and other supported nodes. #7011

Browse Source 
2. Fixed an issue where View/Edit data -> Filter dialog was not editable for catalog objects.
This commit is contained in:
Pravesh Sharma 2023-12-04 17:19:05 +05:30 committed by GitHub
parent 4b71519b80
commit e64f4f632d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,6 @@ function UtilityViewContent({panelId, schema, treeNodeInfo, actionType, formType
const pgAdmin = usePgAdmin(); const pgAdmin = usePgAdmin();
const serverInfo = treeNodeInfo && ('server' in treeNodeInfo) && const serverInfo = treeNodeInfo && ('server' in treeNodeInfo) &&
pgAdmin.Browser.serverInfo && pgAdmin.Browser.serverInfo[treeNodeInfo.server._id]; pgAdmin.Browser.serverInfo && pgAdmin.Browser.serverInfo[treeNodeInfo.server._id];
const inCatalog = treeNodeInfo && ('catalog' in treeNodeInfo);
const api = getApiInstance(); const api = getApiInstance();
const url = ()=>{ const url = ()=>{
return urlBase; return urlBase;
@ -144,7 +143,7 @@ function UtilityViewContent({panelId, schema, treeNodeInfo, actionType, formType
type: serverInfo.server_type, type: serverInfo.server_type,
version: serverInfo.version, version: serverInfo.version,
}: undefined, }: undefined,
inCatalog: inCatalog, inCatalog: false,
}; };
let initData = ()=>new Promise((resolve, reject)=>{ let initData = ()=>new Promise((resolve, reject)=>{

12
web/pgadmin/static/js/helpers/ObjectExplorerToolbar.jsx
View File

@ -23,8 +23,8 @@ ToolbarButton.propTypes = {
export default function ObjectExplorerToolbar() { export default function ObjectExplorerToolbar() {
const [menus, setMenus] = useState({ const [menus, setMenus] = useState({
'query_tool': undefined, 'query_tool': undefined,
'view_all_rows_context_table': undefined, 'view_all_rows_context': undefined,
'view_filtered_rows_context_table': undefined, 'view_filtered_rows_context': undefined,
'search_objects': undefined, 'search_objects': undefined,
'psql': undefined, 'psql': undefined,
}); });
@ -42,8 +42,8 @@ export default function ObjectExplorerToolbar() {
setMenus({ setMenus({
'query_tool': toolsMenus?.find((m)=>(m.name=='query_tool')), 'query_tool': toolsMenus?.find((m)=>(m.name=='query_tool')),
'view_all_rows_context_table': viewMenus?.find((m)=>(m.name=='view_all_rows_context_table')), 'view_all_rows_context': viewMenus?.find((m)=>(m.name=='view_all_rows_context_' + m.node)),
'view_filtered_rows_context_table': viewMenus?.find((m)=>(m.name=='view_filtered_rows_context_table')), 'view_filtered_rows_context': viewMenus?.find((m)=>(m.name=='view_filtered_rows_context_' + m.node)),
'search_objects': toolsMenus?.find((m)=>(m.name=='search_objects')), 'search_objects': toolsMenus?.find((m)=>(m.name=='search_objects')),
'psql': toolsMenus?.find((m)=>(m.name=='psql')) 'psql': toolsMenus?.find((m)=>(m.name=='psql'))
}); });
@ -61,8 +61,8 @@ export default function ObjectExplorerToolbar() {
<Box display="flex" alignItems="center" gridGap={'2px'}> <Box display="flex" alignItems="center" gridGap={'2px'}>
<PgButtonGroup size="small"> <PgButtonGroup size="small">
<ToolbarButton icon={<QueryToolIcon />} menuItem={menus['query_tool']} /> <ToolbarButton icon={<QueryToolIcon />} menuItem={menus['query_tool']} />
<ToolbarButton icon={<ViewDataIcon />} menuItem={menus['view_all_rows_context_table']} /> <ToolbarButton icon={<ViewDataIcon />} menuItem={menus['view_all_rows_context']} />
<ToolbarButton icon={<RowFilterIcon />} menuItem={menus['view_filtered_rows_context_table']} /> <ToolbarButton icon={<RowFilterIcon />} menuItem={menus['view_filtered_rows_context']} />
<ToolbarButton icon={<SearchOutlinedIcon style={{height: '1.4rem'}} />} menuItem={menus['search_objects']} /> <ToolbarButton icon={<SearchOutlinedIcon style={{height: '1.4rem'}} />} menuItem={menus['search_objects']} />
{!_.isUndefined(menus['psql']) && <ToolbarButton icon={<TerminalIcon />} menuItem={menus['psql']} />} {!_.isUndefined(menus['psql']) && <ToolbarButton icon={<TerminalIcon />} menuItem={menus['psql']} />}
</PgButtonGroup> </PgButtonGroup>