public inbox for [email protected]
help / color / mirror / Atom feedFrom: Pramod Ahire <[email protected]>
To: Akshay Joshi <[email protected]>
Cc: Dave Page <[email protected]>
Cc: pgadmin-hackers <[email protected]>
Subject: Re: Quick search for menu items & help articles
Date: Wed, 03 Feb 2021 11:26:53 +0530
Message-ID: <[email protected]> (raw)
In-Reply-To: <CANxoLDdFo4xTrYkWfk5mdHsJWKvzHHZ45giYBeGmqgy6DDVWhg@mail.gmail.com>
References: <[email protected]>
<CA+OCxozgWnBkzORFfLD1o0X4Zq9izG26a+LZUZ8encP-Qn6mew@mail.gmail.com>
<[email protected]>
<CA+OCxoweuRoV-NC8Q3Go1oU_MSKy2+ntHF7h_Sinrr9um=XwRw@mail.gmail.com>
<CANxoLDe2APE-=h3+8NUuoj+ArH_R6U4vUepRWna5gwxaq2MK2Q@mail.gmail.com>
<CA+OCxozwzdBa5OBj_=gTNo0V6F0M_Ne3H-q9GHPgfP7ZqSF+cQ@mail.gmail.com>
<CANxoLDfF+-EoPpwC0F-Fh0rJKihaiv9Q1n5r7V0A9_vfqUudyQ@mail.gmail.com>
<[email protected]>
<[email protected]>
<CANxoLDc3yh3B0MtKVjaN5wAWTM_1UaoCsCmmUVp4vFBR6KdECw@mail.gmail.com>
<[email protected]>
<CANxoLDdFo4xTrYkWfk5mdHsJWKvzHHZ45giYBeGmqgy6DDVWhg@mail.gmail.com>
Hi Akshay,
As reported jasmine test case failure for quick search, had fixed issue & attached here in email.
Kindly also find below updates in the patch:
1. Jasmine test cases fixed
2. Added missing messages for disabled menu items
3. Removed single quotes from ‘data_disabled’ -> data_disabled
Please review & do let me know if missed anything.
Thanks!
Pramod Ahire
Software Engineer
C: +91-020-66449600/601
D: +91-9028697679
edbpostgres.com
From: Akshay Joshi <[email protected]>
Date: Tuesday, 2 February 2021 at 2:48 PM
To: Pramod Ahire <[email protected]>
Cc: Dave Page <[email protected]>, pgadmin-hackers <[email protected]>
Subject: Re: Quick search for menu items & help articles
Thanks, patch applied with some string modifications.
On Mon, Feb 1, 2021 at 1:32 PM Pramod Ahire <[email protected]> wrote:
Hi Akshay,
Please find the rebased patch as attached with this email.
Please do let me know if need anything else.
Pramod Ahire
Software Engineer
C: +91-020-66449600/601
D: +91-9028697679
edbpostgres.com
From: Akshay Joshi <[email protected]>
Date: Monday, 25 January 2021 at 3:53 PM
To: Pramod Ahire <[email protected]>
Cc: Dave Page <[email protected]>, pgadmin-hackers <[email protected]>
Subject: Re: Quick search for menu items & help articles
Hi Pramod
The patch is not applied, maybe you need to rebase and send the patch again.
On Wed, Jan 20, 2021 at 4:36 PM Pramod Ahire <[email protected]> wrote:
Hi Team,
Sorry for the inconvenience, kindly please discard previous email.
Please review patch attached to this email.
Changes as below :
1. Added complete quick search menu to help dropdown
2. Added message to each disabled menu item to describe why it can be disabled
3. Info icon design to menu items results if disabled
4. Standard/dark/high contrast theme supports
NOTE: “Initial backend search mechanism patch by: Murtuza Zabuawala”
Thanks !
Pramod Ahire
Software Engineer
C: +91-020-66449600/601
D: +91-9028697679
edbpostgres.com
From: Pramod Ahire <[email protected]>
Date: Wednesday, 20 January 2021 at 4:19 PM
To: Akshay Joshi <[email protected]>, Dave Page <[email protected]>
Cc: pgadmin-hackers <[email protected]>
Subject: Re: Quick search for menu items & help articles
Hi Team,
As per inputs from you all, made changes & attached patch with this email.
Kindly please have a review & do let me know if missed anything.
Thanks !
Pramod Ahire
Software Engineer
C: +91-020-66449600/601
D: +91-9028697679
edbpostgres.com
From: Akshay Joshi <[email protected]>
Date: Friday, 15 January 2021 at 3:34 PM
To: Dave Page <[email protected]>
Cc: Pramod Ahire <[email protected]>, pgadmin-hackers <[email protected]>
Subject: Re: Quick search for menu items & help articles
On Fri, Jan 15, 2021 at 3:15 PM Dave Page <[email protected]> wrote:
On Fri, Jan 15, 2021 at 9:43 AM Akshay Joshi <[email protected]> wrote:
Hi Dave
On Fri, Jan 15, 2021 at 2:46 PM Dave Page <[email protected]> wrote:
Hi
On Fri, Jan 15, 2021 at 7:23 AM Pramod Ahire <[email protected]> wrote:
Hi Dave,
Thank you for comments ! I had described points below. Please do let me know if anything missing.
From: Dave Page <[email protected]>
Date: Thursday, 14 January 2021 at 10:26 PM
To: Pramod Ahire <[email protected]>
Cc: pgadmin-hackers <[email protected]>
Subject: Re: Quick search for menu items & help articles
Hi
On Thu, Jan 14, 2021 at 4:48 PM Pramod Ahire <[email protected]> wrote:
Hi Team,
Please find the attached designs & patch that contains complete functionality except below to do for quick search.
To Do:
Unit test cases are not that sufficient to cover complete code, but will be working in background to cover up those one
In pgadmin, for disabled menu items we need to add info that will describe why menu has disabled & how it will be enabled. Either another way to enable all of them & show respective reason in popup that menu is disabled for.
Please do let me know if I missed anything or suggestion of yours.
Looks very good. I haven't done an extensive code review/test, but two things spring to mind immediately:
1) I think the search box should be the top item on the Help menu. I do not think it should be on the far end of the menu bar, as it looks too much like it will search for data (think of search on a website).
- As we are showing menu items as well in search results, it can be redundant for end user & increase duplications of menu items. Please advise your thoughts on this.
The search box could be on the Help menu, with results shown in a sub-menu under it.
Another more simple option would be to move the search icon to be directly after the Help menu (which would hint that it's related to the menus), but I'm also concerned about the number of items on the top menu - we're getting to the point that 'common' window sizes would show the hamburger menu by default.
I personally feel we should not add the search box on the Help menu, it should be kept separate with a placeholder indicating what is it for. We can move the search icon after the Help menu.
What is your reasoning? It is, after all, specifically designed to help people.
OK, I have seen a couple of applications where the search box is inside the Help menu, agree with your point.
2) Do we need another loading icon? Surely there's one in the source tree already that we can use?
- As we are loading help articles count in background, so I have added background loading icon to show near to count of results. Our existing icon is of blue & white circle combination, which will be more useful to show foreground loading.
Hmm, OK.
Please do let me know your valuable inputs on this.
Pramod Ahire
Software Engineer
C: +91-020-66449600/601
D: +91-9028697679
edbpostgres.com
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EDB: http://www.enterprisedb.com
--
Thanks & Regards
Akshay Joshi
pgAdmin Hacker | Principal Software Architect
EDB Postgres
Mobile: +91 976-788-8246
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EDB: http://www.enterprisedb.com
--
Thanks & Regards
Akshay Joshi
pgAdmin Hacker | Principal Software Architect
EDB Postgres
Mobile: +91 976-788-8246
--
Thanks & Regards
Akshay Joshi
pgAdmin Hacker | Principal Software Architect
EDB Postgres
Mobile: +91 976-788-8246
--
Thanks & Regards
Akshay Joshi
pgAdmin Hacker | Principal Software Architect
EDB Postgres
Mobile: +91 976-788-8246
Attachments:
[application/octet-stream] quick_search_jasmine_fixes_v1.patch (26.6K, 3-quick_search_jasmine_fixes_v1.patch)
download | inline diff:
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js
index ccdf46d90..52bcd8386 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js
@@ -49,21 +49,21 @@ define('pgadmin.node.package', [
applies: ['object', 'context'], callback: 'show_obj_properties',
category: 'create', priority: 4, label: gettext('Package...'),
icon: 'wcTabIcon icon-package', data: {action: 'create', check: true,
- 'data_disabled': gettext('This option is only available on EPAS servers.')},
+ data_disabled: gettext('This option is only available on EPAS servers.')},
enable: 'canCreate',
},{
name: 'create_package', node: 'package', module: this,
applies: ['object', 'context'], callback: 'show_obj_properties',
category: 'create', priority: 4, label: gettext('Package...'),
icon: 'wcTabIcon icon-package', data: {action: 'create', check: true,
- 'data_disabled': gettext('This option is only available on EPAS servers.')},
+ data_disabled: gettext('This option is only available on EPAS servers.')},
enable: 'canCreate',
},{
name: 'create_package', node: 'schema', module: this,
applies: ['object', 'context'], callback: 'show_obj_properties',
category: 'create', priority: 4, label: gettext('Package...'),
icon: 'wcTabIcon icon-package', data: {action: 'create', check: true,
- 'data_disabled': gettext('This option is only available on EPAS servers.')},
+ data_disabled: gettext('This option is only available on EPAS servers.')},
enable: 'canCreate',
},
]);
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js
index 4addef5e6..3ce6129b1 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js
@@ -48,21 +48,21 @@ define('pgadmin.node.synonym', [
applies: ['object', 'context'], callback: 'show_obj_properties',
category: 'create', priority: 4, label: gettext('Synonym...'),
icon: 'wcTabIcon icon-synonym', data: {action: 'create', check: true,
- 'data_disabled': gettext('This option is only available on EPAS servers.')},
+ data_disabled: gettext('This option is only available on EPAS servers.')},
enable: 'canCreate',
},{
name: 'create_synonym', node: 'synonym', module: this,
applies: ['object', 'context'], callback: 'show_obj_properties',
category: 'create', priority: 4, label: gettext('Synonym...'),
icon: 'wcTabIcon icon-synonym', data: {action: 'create', check: true,
- 'data_disabled': gettext('This option is only available on EPAS servers.')},
+ data_disabled: gettext('This option is only available on EPAS servers.')},
enable: 'canCreate',
},{
name: 'create_synonym', node: 'schema', module: this,
applies: ['object', 'context'], callback: 'show_obj_properties',
category: 'create', priority: 4, label: gettext('Synonym...'),
icon: 'wcTabIcon icon-synonym', data: {action: 'create', check: true,
- 'data_disabled': gettext('This option is only available on EPAS servers.')},
+ data_disabled: gettext('This option is only available on EPAS servers.')},
enable: 'canCreate',
},
]);
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js
index 55d3119f6..e46f53a25 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js
@@ -55,28 +55,28 @@ define('pgadmin.node.compound_trigger', [
applies: ['object', 'context'], callback: 'show_obj_properties',
category: 'create', priority: 4, label: gettext('Compound Trigger...'),
icon: 'wcTabIcon icon-compound_trigger', data: {action: 'create', check: true,
- 'data_disabled': gettext('This option is only available on EPAS servers.')},
+ data_disabled: gettext('This option is only available on EPAS servers.')},
enable: 'canCreate',
},{
name: 'create_compound_trigger', node: 'compound_trigger', module: this,
applies: ['object', 'context'], callback: 'show_obj_properties',
category: 'create', priority: 4, label: gettext('Compound Trigger...'),
icon: 'wcTabIcon icon-compound_trigger', data: {action: 'create', check: true,
- 'data_disabled': gettext('This option is only available on EPAS servers.')},
+ data_disabled: gettext('This option is only available on EPAS servers.')},
enable: 'canCreate',
},{
name: 'create_compound_trigger_onTable', node: 'table', module: this,
applies: ['object', 'context'], callback: 'show_obj_properties',
category: 'create', priority: 4, label: gettext('Compound Trigger...'),
icon: 'wcTabIcon icon-compound_trigger', data: {action: 'create', check: true,
- 'data_disabled': gettext('This option is only available on EPAS servers.')},
+ data_disabled: gettext('This option is only available on EPAS servers.')},
enable: 'canCreate',
},{
name: 'create_compound_trigger_onPartition', node: 'partition', module: this,
applies: ['object', 'context'], callback: 'show_obj_properties',
category: 'create', priority: 4, label: gettext('Compound Trigger...'),
icon: 'wcTabIcon icon-compound_trigger', data: {action: 'create', check: true,
- 'data_disabled': gettext('This option is only available on EPAS servers.')},
+ data_disabled: gettext('This option is only available on EPAS servers.')},
enable: 'canCreate',
},{
name: 'enable_compound_trigger', node: 'compound_trigger', module: this,
@@ -93,7 +93,7 @@ define('pgadmin.node.compound_trigger', [
applies: ['object', 'context'], callback: 'show_obj_properties',
category: 'create', priority: 4, label: gettext('Compound Trigger...'),
icon: 'wcTabIcon icon-compound_trigger', data: {action: 'create', check: true,
- 'data_disabled': gettext('This option is only available on EPAS servers.')},
+ data_disabled: gettext('This option is only available on EPAS servers.')},
enable: 'canCreate',
},
]);
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js
index 02ea36571..e236230a3 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js
@@ -73,11 +73,17 @@ function(
applies: ['object', 'context'], callback: 'enable_triggers_on_table',
category: gettext('Trigger(s)'), priority: 4, label: gettext('Enable All'),
icon: 'fa fa-check', enable : 'canCreate_with_trigger_enable',
+ data: {
+ data_disabled: gettext('The selected tree node does not support this option.'),
+ },
},{
name: 'disable_all_triggers', node: 'partition', module: this,
applies: ['object', 'context'], callback: 'disable_triggers_on_table',
category: gettext('Trigger(s)'), priority: 4, label: gettext('Disable All'),
icon: 'fa fa-times', enable : 'canCreate_with_trigger_disable',
+ data: {
+ data_disabled: gettext('The selected tree node does not support this option.'),
+ },
},{
name: 'reset_table_stats', node: 'partition', module: this,
applies: ['object', 'context'], callback: 'reset_table_stats',
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
index b4a23c4ee..9cf9cf451 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
@@ -95,11 +95,17 @@ define('pgadmin.node.table', [
applies: ['object', 'context'], callback: 'enable_triggers_on_table',
category: gettext('Trigger(s)'), priority: 4, label: gettext('Enable All'),
icon: 'fa fa-check', enable : 'canCreate_with_trigger_enable',
+ data: {
+ data_disabled: gettext('The selected tree node does not support this option.'),
+ },
},{
name: 'disable_all_triggers', node: 'table', module: this,
applies: ['object', 'context'], callback: 'disable_triggers_on_table',
category: gettext('Trigger(s)'), priority: 4, label: gettext('Disable All'),
icon: 'fa fa-times', enable : 'canCreate_with_trigger_disable',
+ data: {
+ data_disabled: gettext('The selected tree node does not support this option.'),
+ },
},{
name: 'reset_table_stats', node: 'table', module: this,
applies: ['object', 'context'], callback: 'reset_table_stats',
diff --git a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
index 9334edcd7..c53f04429 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
@@ -77,14 +77,14 @@ define('pgadmin.node.database', [
applies: ['object', 'context'], callback: 'connect_database',
category: 'connect', priority: 4, label: gettext('Connect Database...'),
icon: 'fa fa-link', enable : 'is_not_connected', data: {
- 'data_disabled': gettext('Selected database is already connected.'),
+ data_disabled: gettext('Selected database is already connected.'),
},
},{
name: 'disconnect_database', node: 'database', module: this,
applies: ['object', 'context'], callback: 'disconnect_database',
category: 'drop', priority: 5, label: gettext('Disconnect Database...'),
icon: 'fa fa-unlink', enable : 'is_connected',data: {
- 'data_disabled': gettext('Selected database is already disconnected.'),
+ data_disabled: gettext('Selected database is already disconnected.'),
},
},{
name: 'generate_erd', node: 'database', module: this,
diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js b/web/pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js
index 2752761d2..2087c8ffc 100644
--- a/web/pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js
+++ b/web/pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js
@@ -49,7 +49,7 @@ define('pgadmin.node.resource_group', [
applies: ['object', 'context'], callback: 'show_obj_properties',
category: 'create', priority: 4, label: gettext('Resource Group...'),
icon: 'wcTabIcon icon-resource_group', data: {action: 'create',
- 'data_disabled': gettext('This option is only available on EPAS servers.')},
+ data_disabled: gettext('This option is only available on EPAS servers.')},
/* Function is used to check the server type and version.
* Resource Group only supported in PPAS 9.4 and above.
*/
@@ -64,13 +64,13 @@ define('pgadmin.node.resource_group', [
applies: ['object', 'context'], callback: 'show_obj_properties',
category: 'create', priority: 4, label: gettext('Resource Group...'),
icon: 'wcTabIcon icon-resource_group', data: {action: 'create',
- 'data_disabled': gettext('This option is only available on EPAS servers.')},
+ data_disabled: gettext('This option is only available on EPAS servers.')},
},{
name: 'create_resource_group', node: 'resource_group', module: this,
applies: ['object', 'context'], callback: 'show_obj_properties',
category: 'create', priority: 4, label: gettext('Resource Group...'),
icon: 'wcTabIcon icon-resource_group', data: {action: 'create',
- 'data_disabled': gettext('This option is only available on EPAS servers.')},
+ data_disabled: gettext('This option is only available on EPAS servers.')},
},
]);
},
diff --git a/web/pgadmin/browser/server_groups/servers/static/js/server.js b/web/pgadmin/browser/server_groups/servers/static/js/server.js
index 72da6ca2d..074077069 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/server.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/server.js
@@ -90,44 +90,50 @@ define('pgadmin.node.server', [
name: 'connect_server', node: 'server', module: this,
applies: ['object', 'context'], callback: 'connect_server',
category: 'connect', priority: 4, label: gettext('Connect Server'),
- icon: 'fa fa-link', enable : 'is_not_connected',
+ icon: 'fa fa-link', enable : 'is_not_connected',data: {
+ data_disabled: gettext('Database is already connected.'),
+ },
},{
name: 'disconnect_server', node: 'server', module: this,
applies: ['object', 'context'], callback: 'disconnect_server',
category: 'drop', priority: 5, label: gettext('Disconnect Server'),
- icon: 'fa fa-unlink', enable : 'is_connected',
+ icon: 'fa fa-unlink', enable : 'is_connected',data: {
+ data_disabled: gettext('Database is already disconnected.'),
+ },
},{
name: 'reload_configuration', node: 'server', module: this,
applies: ['tools', 'context'], callback: 'reload_configuration',
category: 'reload', priority: 6, label: gettext('Reload Configuration'),
icon: 'fa fa-redo-alt', enable : 'enable_reload_config',data: {
- 'data_disabled': gettext('Please select a server from the browser tree to reload the configuration files.'),
+ data_disabled: gettext('Please select a server from the browser tree to reload the configuration files.'),
},
},{
name: 'restore_point', node: 'server', module: this,
applies: ['tools', 'context'], callback: 'restore_point',
category: 'restore', priority: 9, label: gettext('Add Named Restore Point...'),
icon: 'fa fa-anchor', enable : 'is_applicable',data: {
- 'data_disabled': gettext('Please select any server from the browser tree to Add Named Restore Point.'),
+ data_disabled: gettext('Please select any server from the browser tree to Add Named Restore Point.'),
},
},{
name: 'change_password', node: 'server', module: this,
applies: ['object'], callback: 'change_password',
label: gettext('Change Password...'), priority: 10,
- icon: 'fa fa-lock', enable : 'is_connected',
+ icon: 'fa fa-lock', enable : 'is_connected',data: {
+ data_disabled: gettext('Please connect server to enable change password. '),
+ },
},{
name: 'wal_replay_pause', node: 'server', module: this,
applies: ['tools', 'context'], callback: 'pause_wal_replay',
category: 'wal_replay_pause', priority: 7, label: gettext('Pause Replay of WAL'),
icon: 'fa fa-pause-circle', enable : 'wal_pause_enabled',data: {
- 'data_disabled': gettext('Please select a connected database as a Super user and run in Recovery mode to Pause Replay of WAL.'),
+ data_disabled: gettext('Please select a connected database as a Super user and run in Recovery mode to Pause Replay of WAL.'),
},
},{
name: 'wal_replay_resume', node: 'server', module: this,
applies: ['tools', 'context'], callback: 'resume_wal_replay',
category: 'wal_replay_resume', priority: 8, label: gettext('Resume Replay of WAL'),
icon: 'fa fa-play-circle', enable : 'wal_resume_enabled',data: {
- 'data_disabled': gettext('Please select a connected database as a Super user and run in Recovery mode to Resume Replay of WAL.'),
+ data_disabled: gettext('Please select a connected database as a Super user and run in Recovery mode to Resume Replay of WAL.'),
},
},{
name: 'clear_saved_password', node: 'server', module: this,
@@ -154,7 +160,7 @@ define('pgadmin.node.server', [
return false;
},
data: {
- 'data_disabled': gettext('SSH Tunnel password is not saved for selected server.'),
+ data_disabled: gettext('SSH Tunnel password is not saved for selected server.'),
},
}]);
diff --git a/web/pgadmin/browser/static/js/node.js b/web/pgadmin/browser/static/js/node.js
index 21ff1bf87..201dfbfcf 100644
--- a/web/pgadmin/browser/static/js/node.js
+++ b/web/pgadmin/browser/static/js/node.js
@@ -150,7 +150,7 @@ define('pgadmin.browser.node', [
label: (self.dropAsRemove) ? gettext('Remove %s', self.label) : gettext('Delete/Drop'),
data: {
'url': 'drop',
- 'data_disabled': gettext('The selected tree node does not support this option.'),
+ data_disabled: gettext('The selected tree node does not support this option.'),
},
icon: 'fa fa-trash-alt',
enable: _.isFunction(self.canDrop) ?
@@ -233,7 +233,7 @@ define('pgadmin.browser.node', [
category: gettext('Scripts'),
data: {
'script': stype,
- 'data_disabled': gettext('The selected tree node does not support this option.'),
+ data_disabled: gettext('The selected tree node does not support this option.'),
},
icon: 'fa fa-pencil-alt',
enable: self.check_user_permission,
diff --git a/web/pgadmin/browser/static/js/quick_search/trigger_search.js b/web/pgadmin/browser/static/js/quick_search/trigger_search.js
index e1019899a..07951d954 100644
--- a/web/pgadmin/browser/static/js/quick_search/trigger_search.js
+++ b/web/pgadmin/browser/static/js/quick_search/trigger_search.js
@@ -167,6 +167,9 @@ export function Search() {
function handleClickOutside(event) {
if (ref.current && !ref.current.contains(event.target)) {
let input_element = document.getElementById('live-search-field');
+ if(input_element == null){
+ return;
+ }
let input_value = input_element.value;
if(input_value && input_value.length > 0){
toggleDropdownMenu();
diff --git a/web/pgadmin/tools/backup/static/js/backup.js b/web/pgadmin/tools/backup/static/js/backup.js
index 15b49cefc..9bb32f172 100644
--- a/web/pgadmin/tools/backup/static/js/backup.js
+++ b/web/pgadmin/tools/backup/static/js/backup.js
@@ -583,7 +583,7 @@ define([
icon: 'fa fa-save',
enable: menuUtils.menuEnabledServer,
data: {
- 'data_disabled': gettext('Please select any server from the browser tree to take Backup of global objects.'),
+ data_disabled: gettext('Please select any server from the browser tree to take Backup of global objects.'),
},
}, {
name: 'backup_server',
@@ -595,7 +595,7 @@ define([
icon: 'fa fa-save',
enable: menuUtils.menuEnabledServer,
data: {
- 'data_disabled': gettext('Please select any server from the browser tree to take Server Backup.'),
+ data_disabled: gettext('Please select any server from the browser tree to take Server Backup.'),
},
}, {
name: 'backup_global_ctx',
@@ -608,7 +608,7 @@ define([
icon: 'fa fa-save',
enable: menuUtils.menuEnabledServer,
data: {
- 'data_disabled': gettext('Please select any database or schema or table from the browser tree to take Backup.'),
+ data_disabled: gettext('Please select any database or schema or table from the browser tree to take Backup.'),
},
}, {
name: 'backup_server_ctx',
@@ -621,7 +621,7 @@ define([
icon: 'fa fa-save',
enable: menuUtils.menuEnabledServer,
data: {
- 'data_disabled': gettext('Please select any server from the browser tree to take Server Backup.'),
+ data_disabled: gettext('Please select any server from the browser tree to take Server Backup.'),
},
}, {
name: 'backup_object',
@@ -635,7 +635,7 @@ define([
null, pgBrowser.treeMenu, menuUtils.backupSupportedNodes
),
data: {
- 'data_disabled': gettext('Please select any database or schema or table from the browser tree to take Backup.'),
+ data_disabled: gettext('Please select any database or schema or table from the browser tree to take Backup.'),
},
}];
diff --git a/web/pgadmin/tools/datagrid/static/js/datagrid.js b/web/pgadmin/tools/datagrid/static/js/datagrid.js
index 6db4c9922..adc6651bf 100644
--- a/web/pgadmin/tools/datagrid/static/js/datagrid.js
+++ b/web/pgadmin/tools/datagrid/static/js/datagrid.js
@@ -114,7 +114,7 @@ define('pgadmin.datagrid', [
label: gettext('Query Tool'),
icon: 'pg-font-icon icon-query-tool',
data:{
- 'data_disabled': gettext('Please select a database from the browser tree to access Query Tool.'),
+ data_disabled: gettext('Please select a database from the browser tree to access Query Tool.'),
},
}];
diff --git a/web/pgadmin/tools/erd/static/js/erd_module.js b/web/pgadmin/tools/erd/static/js/erd_module.js
index fd93b3125..3c1946aa4 100644
--- a/web/pgadmin/tools/erd/static/js/erd_module.js
+++ b/web/pgadmin/tools/erd/static/js/erd_module.js
@@ -40,6 +40,9 @@ export function initialize(gettext, url_for, $, _, pgAdmin, csrfToken, pgBrowser
priority: 1,
label: gettext('New ERD Project (Beta)'),
enable: this.erdToolEnabled,
+ data: {
+ data_disabled: gettext('The selected tree node does not support this option.'),
+ },
}];
pgBrowser.add_menus(menus);
diff --git a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
index c7c7c459c..8e7a067f2 100644
--- a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
+++ b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
@@ -178,7 +178,7 @@ define([
null, pgBrowser.treeMenu, menuUtils.supportedNodes
),
data: {
- 'data_disabled': gettext('Please select any database, schema or schema objects from the browser tree to access Grant Wizard Tool.'),
+ data_disabled: gettext('Please select any database, schema or schema objects from the browser tree to access Grant Wizard Tool.'),
},
}];
diff --git a/web/pgadmin/tools/import_export/static/js/import_export.js b/web/pgadmin/tools/import_export/static/js/import_export.js
index d225183ce..fa3570ace 100644
--- a/web/pgadmin/tools/import_export/static/js/import_export.js
+++ b/web/pgadmin/tools/import_export/static/js/import_export.js
@@ -413,7 +413,7 @@ define([
null, pgBrowser.treeMenu, ['table']
),
data: {
- 'data_disabled': gettext('Please select any table from the browser tree to Import/Export data.'),
+ data_disabled: gettext('Please select any table from the browser tree to Import/Export data.'),
},
}]);
},
diff --git a/web/pgadmin/tools/maintenance/static/js/maintenance.js b/web/pgadmin/tools/maintenance/static/js/maintenance.js
index cf850c76d..e23d07d7b 100644
--- a/web/pgadmin/tools/maintenance/static/js/maintenance.js
+++ b/web/pgadmin/tools/maintenance/static/js/maintenance.js
@@ -168,6 +168,9 @@ define([
enable: supportedNodes.enabled.bind(
null, pgBrowser.treeMenu, menuUtils.maintenanceSupportedNodes
),
+ data: {
+ data_disabled: gettext('Please select any database from the browser tree to do Maintenance.'),
+ },
}];
// Add supported menus into the menus list
@@ -185,7 +188,7 @@ define([
null, pgBrowser.treeMenu, menuUtils.maintenanceSupportedNodes
),
data: {
- 'data_disabled': gettext('Please select any database from the browser tree to do Maintenance.'),
+ data_disabled: gettext('Please select any database from the browser tree to do Maintenance.'),
},
});
}
diff --git a/web/pgadmin/tools/restore/static/js/restore.js b/web/pgadmin/tools/restore/static/js/restore.js
index bdd250bb5..b0d43f9e5 100644
--- a/web/pgadmin/tools/restore/static/js/restore.js
+++ b/web/pgadmin/tools/restore/static/js/restore.js
@@ -399,7 +399,7 @@ define('tools.restore', [
null, pgBrowser.treeMenu, menuUtils.restoreSupportedNodes
),
data: {
- 'data_disabled': gettext('Please select any schema or table from the browser tree to Restore data.'),
+ data_disabled: gettext('Please select any schema or table from the browser tree to Restore data.'),
},
}];
diff --git a/web/pgadmin/tools/search_objects/static/js/search_objects.js b/web/pgadmin/tools/search_objects/static/js/search_objects.js
index ab898bf38..0f04e9c4a 100644
--- a/web/pgadmin/tools/search_objects/static/js/search_objects.js
+++ b/web/pgadmin/tools/search_objects/static/js/search_objects.js
@@ -37,7 +37,7 @@ define([
priority: 1,
label: gettext('Search Objects...'),
data: {
- 'data_disabled': gettext('Please select a database from the browser tree to search the database objects.'),
+ data_disabled: gettext('Please select a database from the browser tree to search the database objects.'),
},
}, {
name: 'search_objects',
[image/png] image001.png (68.4K, 4-image001.png)
download | view image
[image/png] image002.png (68.4K, 5-image002.png)
download | view image
[image/png] image003.png (68.4K, 6-image003.png)
download | view image
[image/png] image004.png (68.4K, 7-image004.png)
download | view image
[image/png] image005.png (68.4K, 8-image005.png)
download | view image
view thread (17+ messages) latest in thread
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: [email protected]
Cc: [email protected], [email protected], [email protected]
Subject: Re: Quick search for menu items & help articles
In-Reply-To: <[email protected]>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox