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

Fixes the arrow key issue in the preferences tree. Fixes #7274

Browse Source 
Ensure that the select folder dialog should be on top when selecting the binary path. Fixes #7276
This commit is contained in:
Nikhil Mohite 2022-03-31 11:46:34 +05:30 committed by Akshay Joshi
parent cb052f1988
commit 74c620e478
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/pgadmin/preferences/static/js/components/PreferencesComponent.jsx
View File

@ -358,33 +358,42 @@ export default function PreferencesComponent({ ...props }) {
useEffect(() => { useEffect(() => {
let initTreeTimeout = null; let initTreeTimeout = null;
let firstElement = null;
// Listen selected preferences tree node event and show the appropriate components in right panel. // Listen selected preferences tree node event and show the appropriate components in right panel.
pgAdmin.Browser.Events.on('preferences:tree:selected', (item) => { pgAdmin.Browser.Events.on('preferences:tree:selected', (event, item) => {
if (item.type == FileType.File) { if (item.type == FileType.File) {
prefSchema.current.schemaFields.forEach((field) => { prefSchema.current.schemaFields.forEach((field) => {
field.visible = field.parentId === item._metadata.data.id; field.visible = field.parentId === item._metadata.data.id;
if(field.visible && _.isNull(firstElement)) {
firstElement = field;
}
}); });
setLoadTree(Math.floor(Math.random() * 1000)); setLoadTree(Math.floor(Math.random() * 1000));
initTreeTimeout = setTimeout(() => { initTreeTimeout = setTimeout(() => {
prefTreeInit.current = true; prefTreeInit.current = true;
if(firstElement) {
//set focus on first element on right side panel.
document.getElementsByName(firstElement.id.toString())[0].focus();
firstElement = '';
}
}, 10); }, 10);
} }
else { else {
if (item.isExpanded && item._children && item._children.length > 0 && prefTreeInit.current) { if (item.isExpanded && item._children && item._children.length > 0 && prefTreeInit.current && event.code !== 'ArrowUp') {
pgAdmin.Browser.ptree.tree.setActiveFile(item._children[0], true); pgAdmin.Browser.ptree.tree.setActiveFile(item._children[0], true);
} }
} }
}); });
// Listen open preferences tree node event to default select first child node on parent node selection. // Listen open preferences tree node event to default select first child node on parent node selection.
pgAdmin.Browser.Events.on('preferences:tree:opened', (item) => { pgAdmin.Browser.Events.on('preferences:tree:opened', (event, item) => {
pgAdmin.Browser.ptree.tree.setActiveFile(item._children[0], true); pgAdmin.Browser.ptree.tree.setActiveFile(item._children[0], true);
}); });
// Listen added preferences tree node event to expand the newly added node on tree load. // Listen added preferences tree node event to expand the newly added node on tree load.
pgAdmin.Browser.Events.on('preferences:tree:added', (item) => { pgAdmin.Browser.Events.on('preferences:tree:added', (event, item) => {
if (item._parent._fileName == firstTreeElement.current && item._parent.isExpanded && !prefTreeInit.current) { if (item._parent._fileName == firstTreeElement.current && item._parent.isExpanded && !prefTreeInit.current) {
pgAdmin.Browser.ptree.tree.setActiveFile(item._parent._children[0], false); pgAdmin.Browser.ptree.tree.setActiveFile(item._parent._children[0], true);
} }
else if (item.type == FileType.Directory) { else if (item.type == FileType.Directory) {
// Check the if newely added node is Directoy and call toggle to expand the node. // Check the if newely added node is Directoy and call toggle to expand the node.
@ -593,7 +602,7 @@ export default function PreferencesComponent({ ...props }) {
<Box className={clsx(classes.preferences)}> <Box className={clsx(classes.preferences)}>
<Box className={clsx(classes.treeContainer)} > <Box className={clsx(classes.treeContainer)} >
<Box className={clsx('aciTree', classes.tree)} id={'treeContainer'}> <Box className={clsx('aciTree', classes.tree)} id={'treeContainer'} tabIndex={0}>
{ {
useMemo(() => (prefTreeData && props.renderTree(prefTreeData)), [prefTreeData]) useMemo(() => (prefTreeData && props.renderTree(prefTreeData)), [prefTreeData])
} }

2
web/pgadmin/static/js/tree/tree.js
View File

@ -26,7 +26,7 @@ function manageTreeEvents(event, eventName, item) {
if (node_metadata.parent && node_metadata.parent.includes('/preferences') && obj.ptree.tree.type == 'preferences') { if (node_metadata.parent && node_metadata.parent.includes('/preferences') && obj.ptree.tree.type == 'preferences') {
try { try {
obj.Events.trigger( obj.Events.trigger(
'preferences:tree:' + eventName, item, d 'preferences:tree:' + eventName, event, item, d
); );
} catch (e) { } catch (e) {
console.warn(e.stack || e); console.warn(e.stack || e);

2
web/pgadmin/static/scss/_alertify.overrides.scss
View File

@ -1,6 +1,6 @@
/* Overrides alertify js headers */ /* Overrides alertify js headers */
.alertify { .alertify {
z-index: 3000; z-index: 3002;
position: fixed; position: fixed;
.ajs-header { .ajs-header {

BIN
web/pgadmin/static/scss/resources/high_contrast/high_contrast_preview.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 42 KiB