Ensure browser toolbar are enabled only on database object selection.p…

…gadmin-org#8281
yogeshmahajan-1903 · Jan 8, 2025 · 2ebec27 · 2ebec27
1 parent bac50e1
commit 2ebec27
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/web/pgadmin/static/js/components/PgTree/FileTreeItem/index.tsx b/web/pgadmin/static/js/components/PgTree/FileTreeItem/index.tsx
@@ -93,7 +93,6 @@ export class FileTreeItem extends React.Component<IItemRendererXProps & IItemRen
         data-depth={item.depth}
         onContextMenu={this.handleContextMenu}
         onClick={this.handleClick}
-        onDoubleClick={this.handleDoubleClick}
         onDragStart={this.handleDragStartItem}
         onMouseEnter={this.handleMouseEnter}
         onMouseLeave={this.handleMouseLeave}
@@ -107,7 +106,7 @@ export class FileTreeItem extends React.Component<IItemRendererXProps & IItemRen
           : null
         }
 
-        <span className='file-label'>
+        <span className='file-label'  onDoubleClick={this.handleDoubleClick}>
           {
             item._metadata?.data?.icon ?
               <i className={cn('file-icon', item._metadata?.data?.icon ? item._metadata.data.icon : fileOrDir)} /> : null

diff --git a/web/pgadmin/tools/psql/static/js/PsqlModule.js b/web/pgadmin/tools/psql/static/js/PsqlModule.js
@@ -56,7 +56,10 @@ export default class Psql {
     let isEnabled = (() => {
       if (!_.isUndefined(obj) && !_.isNull(obj) && pgAdmin['enable_psql']) {
         if (_.indexOf(pgAdmin.unsupported_nodes, obj._type) == -1) {
-          if (obj._type == 'database' && obj.allowConn) {
+          let t = pgBrowser.tree,
+            selected_item = t.selected(),
+            selected_item_type = t.findNodeByDomElement(selected_item).getData()._type;
+          if (selected_item_type == 'database' && obj._type == 'database' && obj.allowConn) {
             return true;
           } else if (obj._type != 'database') {
             return true;

diff --git a/web/pgadmin/tools/search_objects/static/js/index.js b/web/pgadmin/tools/search_objects/static/js/index.js
@@ -56,7 +56,10 @@ export default class SearchObjectModule {
     let isEnabled = (() => {
       if (!_.isUndefined(obj) && !_.isNull(obj)) {
         if (_.indexOf(pgAdmin.unsupported_nodes, obj._type) == -1) {
-          if (obj._type == 'database' && obj.allowConn) {
+          let t = pgBrowser.tree,
+            selected_item = t.selected(),
+            selected_item_type = t.findNodeByDomElement(selected_item).getData()._type;
+          if (selected_item_type == 'database' && obj._type == 'database' && obj.allowConn) {
             return true;
           } else if (obj._type != 'database') {
             return true;

diff --git a/web/pgadmin/tools/sqleditor/static/js/SQLEditorModule.js b/web/pgadmin/tools/sqleditor/static/js/SQLEditorModule.js
@@ -68,7 +68,10 @@ export default class SQLEditor {
     let isEnabled = (() => {
       if (!_.isUndefined(obj) && !_.isNull(obj)) {
         if (_.indexOf(pgAdmin.unsupported_nodes, obj._type) == -1) {
-          if (obj._type == 'database' && obj.allowConn) {
+          let t = pgBrowser.tree,
+            selected_item = t.selected(),
+            selected_item_type = t.findNodeByDomElement(selected_item).getData()._type;
+          if ( selected_item_type == 'database' && obj._type == 'database' && obj.allowConn) {
             return true;
           } else if (obj._type != 'database') {
             return true;