Re: [pgAdmin][RM5287] Dark theme and other CSS related fixes

2020-07-03 Thread Aditya Toshniwal
Hi,

The jasmine test cases are failing with this commit. Attached is the patch
to fix the test cases.

On Fri, Jul 3, 2020 at 11:49 AM Akshay Joshi 
wrote:

> Thanks, patch applied.
>
> On Thu, Jul 2, 2020 at 5:54 PM Aditya Toshniwal <
> aditya.toshni...@enterprisedb.com> wrote:
>
>> Hi Hackers,
>>
>> Attached is the patch to:
>> 1) Change the way editable field is displayed in backgrid.
>> 2) Change colors for alerts in dark theme.
>> 3) Change the dashboard graph grid lines colors based on theme.
>> 4) Fix the backgrid hover background issue. Fixes #5470.
>> 5) Few other CSS improvements.
>>
>> Please review.
>>
>> --
>> Thanks and Regards,
>> Aditya Toshniwal
>> pgAdmin Hacker | Sr. Software Engineer | EnterpriseDB India | Pune
>> "Don't Complain about Heat, Plant a TREE"
>>
>
>
> --
> *Thanks & Regards*
> *Akshay Joshi*
>
> *Sr. Software Architect*
> *EnterpriseDB Software India Private Limited*
> *Mobile: +91 976-788-8246*
>


-- 
Thanks and Regards,
Aditya Toshniwal
pgAdmin Hacker | Sr. Software Engineer | EnterpriseDB India | Pune
"Don't Complain about Heat, Plant a TREE"


RM5287.jasmine.patch
Description: Binary data


Re: [pgAdmin][RM5287] Dark theme and other CSS related fixes

2020-07-03 Thread Akshay Joshi
Thanks, patch applied.

On Fri, Jul 3, 2020 at 12:47 PM Aditya Toshniwal <
aditya.toshni...@enterprisedb.com> wrote:

> Hi,
>
> The jasmine test cases are failing with this commit. Attached is the patch
> to fix the test cases.
>
> On Fri, Jul 3, 2020 at 11:49 AM Akshay Joshi <
> akshay.jo...@enterprisedb.com> wrote:
>
>> Thanks, patch applied.
>>
>> On Thu, Jul 2, 2020 at 5:54 PM Aditya Toshniwal <
>> aditya.toshni...@enterprisedb.com> wrote:
>>
>>> Hi Hackers,
>>>
>>> Attached is the patch to:
>>> 1) Change the way editable field is displayed in backgrid.
>>> 2) Change colors for alerts in dark theme.
>>> 3) Change the dashboard graph grid lines colors based on theme.
>>> 4) Fix the backgrid hover background issue. Fixes #5470.
>>> 5) Few other CSS improvements.
>>>
>>> Please review.
>>>
>>> --
>>> Thanks and Regards,
>>> Aditya Toshniwal
>>> pgAdmin Hacker | Sr. Software Engineer | EnterpriseDB India | Pune
>>> "Don't Complain about Heat, Plant a TREE"
>>>
>>
>>
>> --
>> *Thanks & Regards*
>> *Akshay Joshi*
>>
>> *Sr. Software Architect*
>> *EnterpriseDB Software India Private Limited*
>> *Mobile: +91 976-788-8246*
>>
>
>
> --
> Thanks and Regards,
> Aditya Toshniwal
> pgAdmin Hacker | Sr. Software Engineer | EnterpriseDB India | Pune
> "Don't Complain about Heat, Plant a TREE"
>


-- 
*Thanks & Regards*
*Akshay Joshi*

*Sr. Software Architect*
*EnterpriseDB Software India Private Limited*
*Mobile: +91 976-788-8246*


pgAdmin 4 commit: Fixed jasmin test cases failed due to last commit.

2020-07-03 Thread Akshay Joshi
Fixed jasmin test cases failed due to last commit.

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=3d5a2046c43514530e19a8a71235077b22886ff7
Author: Aditya Toshniwal 

Modified Files
--
web/regression/javascript/alerts/alertify_wrapper_spec.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)



[pgAdmin4][Patch] - SonarQube Fixes

2020-07-03 Thread Khushboo Vashi
Hi,

Please find the attached patch to fix the SonarQube Code smells having Rule
"*Functions, methods and lambdas should not have too many parameters*".

In this patch, I have covered sql and delete functions of all the reported
nodes.

Thanks,
Khushboo


Sonar_Qube_Fixes.patch
Description: Binary data


[pgAdmin4][Patch] - SonarQube Issues - 8 (Variables should not be shadowed)

2020-07-03 Thread Yogesh Mahajan
Hi,

Please find a patch which fixes issues related to rule- 'Variables should
not be shadowed'.

Thanks,
Yogesh Mahajan
QA - Team
EnterpriseDB Corporation

Phone: +91-9741705709
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js
index 6d8cf7398..3d2b34614 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js
@@ -347,11 +347,11 @@ define('pgadmin.node.fts_configuration', [
   idx = -1;
 
 // Find if token exists in grid
-self.collection.each(function(m) {
+self.collection.each(function(local_model) {
   _.each(checkVars, function(v) {
-var val = m.get(v);
+var val = local_model.get(v);
 if(val == token) {
-  idx = coll.indexOf(m);
+  idx = coll.indexOf(local_model);
 }
   });
 });
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js
index 6ccb59526..0af5ca0b0 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js
@@ -203,29 +203,29 @@ define('pgadmin.node.foreign_key', [
   formatter: Backform.ControlFormatter,
   template: headerSelectControlTemplate,
   render: function() {
-var self = this,
-  url = self.field.get('url') || self.defaults.url,
-  m = self.model,
+var self_referenced = this,
+  url = self_referenced.field.get('url') || self_referenced.defaults.url,
+  m = self_referenced.model,
   tid = m.get('references');
 // Store name for selected table
 var a = $('select[name="references"]').find(':selected').text();
 this.model.set('references_table_name', a,{silent: true});
 
 // Clear any existing value before setting new options.
-m.set(self.field.get('name'), null, {silent: true});
+m.set(self_referenced.field.get('name'), null, {silent: true});
 
 if (url && !_.isUndefined(tid) && !_.isNull(tid) && tid != '') {
-  var node = this.field.get('schema_node'),
+  var schema_node = this.field.get('schema_node'),
 node_info = this.field.get('node_info'),
-full_url = node.generate_url.apply(
-  node, [
+full_url = schema_node.generate_url.apply(
+  schema_node, [
 null, url, this.field.get('node_data'),
 this.field.get('url_with_id') || false, node_info,
   ]),
 data = [];
 
   if (this.field.get('version_compatible')) {
-m.trigger('pgadmin:view:fetching', m, self.field);
+m.trigger('pgadmin:view:fetching', m, self_referenced.field);
 $.ajax({
   async: false,
   data : {tid:tid},
@@ -235,24 +235,24 @@ define('pgadmin.node.foreign_key', [
 data = res.data;
   })
   .fail(function() {
-m.trigger('pgadmin:view:fetch:error', m, self.field);
+m.trigger('pgadmin:view:fetch:error', m, self_referenced.field);
   });
-m.trigger('pgadmin:view:fetched', m, self.field);
+m.trigger('pgadmin:view:fetched', m, self_referenced.field);
   }
   /*
  * Transform the data
  */
-  var transform = this.field.get('transform') || self.defaults.transform;
+  var transform = this.field.get('transform') || self_referenced.defaults.transform;
   if (transform && _.isFunction(transform)) {
 // We will transform the data later, when rendering.
 // It will allow us to generate different data based on the
 // dependencies.
-self.field.set('options', transform.bind(self, data));
+self_referenced.field.set('options', transform.bind(self_referenced, data));
   } else {
-   

pgAdmin 4 commit: Fixed the SonarQube Code smells having Rule 'Function

2020-07-03 Thread Akshay Joshi
Fixed the SonarQube Code smells having Rule 'Functions, methods and lambdas 
should not have too many parameters'.

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=b5f0190799dfc8617ba9b6cfda62ee91be51ed97
Author: Khushboo Vashi 

Modified Files
--
.../servers/databases/schemas/collations/__init__.py   |  6 --
.../servers/databases/schemas/domains/__init__.py  |  5 +++--
.../servers/databases/schemas/foreign_tables/__init__.py   |  6 --
.../servers/databases/schemas/fts_configurations/__init__.py   |  6 --
.../servers/databases/schemas/fts_dictionaries/__init__.py |  5 +++--
.../servers/databases/schemas/fts_parsers/__init__.py  |  6 --
.../servers/databases/schemas/fts_templates/__init__.py|  6 --
.../servers/databases/schemas/functions/__init__.py|  6 --
.../servers/databases/schemas/packages/__init__.py |  6 --
.../servers/databases/schemas/sequences/__init__.py|  5 +++--
.../servers/databases/schemas/synonyms/__init__.py |  6 --
.../databases/schemas/tables/compound_triggers/__init__.py |  5 -
.../servers/databases/schemas/tables/indexes/__init__.py   |  6 --
.../servers/databases/schemas/tables/partitions/__init__.py|  2 +-
.../servers/databases/schemas/tables/rules/__init__.py |  5 -
.../servers/databases/schemas/tables/triggers/__init__.py  |  5 -
.../server_groups/servers/databases/schemas/types/__init__.py  |  6 --
.../server_groups/servers/databases/schemas/views/__init__.py  | 10 ++
web/pgadmin/static/vendor/backgrid/backgrid.js |  2 +-
19 files changed, 69 insertions(+), 35 deletions(-)



pgAdmin 4 commit: Fixed the SoanrQube code smell 'Variables should not

2020-07-03 Thread Akshay Joshi
Fixed the SoanrQube code smell 'Variables should not be shadowed'.

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=80ab5969920b1b258c4bb52020badbc67cf805ab
Author: Yogesh Mahajan 

Modified Files
--
.../static/js/fts_configuration.js |  6 ++--
.../foreign_key/static/js/foreign_key.js   | 32 +++---
.../databases/schemas/tables/static/js/table.js|  4 +--
.../static/js/select2/configure_show_on_scroll.js  |  6 ++--
.../static/js/selection/xcell_selection_model.js   |  8 +++---
web/pgadmin/static/js/sqleditor/filter_dialog.js   |  6 ++--
web/pgadmin/static/js/window.js| 14 +-
.../static/vendor/backgrid/backgrid-select-all.js  |  6 ++--
.../tools/grant_wizard/static/js/grant_wizard.js   |  2 +-
.../tools/schema_diff/static/js/schema_diff_ui.js  | 16 +--
.../user_management/static/js/user_management.js   | 18 ++--
.../javascript/selection/column_selector_spec.js   |  6 ++--
.../javascript/sqleditor/execute_query_spec.js | 10 +++
.../sqleditor/query_tool_actions_spec.js   |  8 +++---
14 files changed, 71 insertions(+), 71 deletions(-)



Re: [pgAdmin4][Patch] - SonarQube Issues - 8 (Variables should not be shadowed)

2020-07-03 Thread Akshay Joshi
Thanks, patch applied.

On Fri, Jul 3, 2020 at 1:40 PM Yogesh Mahajan <
yogesh.maha...@enterprisedb.com> wrote:

> Hi,
>
> Please find a patch which fixes issues related to rule- 'Variables should
> not be shadowed'.
>
> Thanks,
> Yogesh Mahajan
> QA - Team
> EnterpriseDB Corporation
>
> Phone: +91-9741705709
>


-- 
*Thanks & Regards*
*Akshay Joshi*

*Sr. Software Architect*
*EnterpriseDB Software India Private Limited*
*Mobile: +91 976-788-8246*


Re: [pgAdmin4][Patch] - SonarQube Fixes

2020-07-03 Thread Akshay Joshi
Thanks, patch applied.

On Fri, Jul 3, 2020 at 1:12 PM Khushboo Vashi <
khushboo.va...@enterprisedb.com> wrote:

> Hi,
>
> Please find the attached patch to fix the SonarQube Code smells having
> Rule "*Functions, methods and lambdas should not have too many parameters*
> ".
>
> In this patch, I have covered sql and delete functions of all the reported
> nodes.
>
> Thanks,
> Khushboo
>
>
>

-- 
*Thanks & Regards*
*Akshay Joshi*

*Sr. Software Architect*
*EnterpriseDB Software India Private Limited*
*Mobile: +91 976-788-8246*


Reg - [RM-3814] Backup dialog does not show details of error if file name box kept empty

2020-07-03 Thread Satish V
Hi Hackers,

Please find the patch in the attachment which resolves the issue of error
messages not getting displayed in the dialog boxes of *backup, restore *and
*import/export.*

Kindly review the patch.

Thanks,
Sathish V


RM3814vs1.patch
Description: Binary data


Re: pgAdmin 4 commit: Added support for schema level restriction. Fixes #55

2020-07-03 Thread Murtuza Zabuawala
Hi Akshay,

PFA patch to add the same changes for EPAS templates as well.


--
Regards,
Murtuza Zabuawala
*EDB*
*POWER TO POSTGRES*
https://www.edbpostgres.com


On Tue, Jun 30, 2020 at 7:16 PM Akshay Joshi 
wrote:

> Added support for schema level restriction. Fixes #5583
>
> Allow user to edit the connection properties when the database server
> is already connected.
>
> Branch
> --
> master
>
> Details
> ---
>
> https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=c873218c3279a12d97852f06d3d64fd33f6346d8
> Author: Nikhil Mohite 
>
> Modified Files
> --
> docs/en_US/database_dialog.rst |  13 +
> docs/en_US/images/database_advanced.png| Bin 0 -> 51645 bytes
> docs/en_US/release_notes_4_24.rst  |   1 +
> web/migrations/versions/84700139beb0_.py   |  32 +++
> .../browser/server_groups/servers/__init__.py  |   3 +-
> .../server_groups/servers/databases/__init__.py| 175 
> .../servers/databases/schemas/__init__.py  |  41 ++-
> .../templates/schemas/pg/9.2_plus/sql/nodes.sql|   6 +
> .../schemas/pg/9.2_plus/sql/properties.sql |   4 +
> .../servers/databases/static/js/database.js| 315
> -
> .../servers/databases/tests/test_db_put.py |   3 +-
> .../server_groups/servers/databases/tests/utils.py |   3 +-
> .../server_groups/servers/static/js/server.js  |  62 +++-
> web/pgadmin/browser/static/js/node.js  |  23 +-
> web/pgadmin/model/__init__.py  |  15 +
> 15 files changed, 487 insertions(+), 209 deletions(-)
>
>


epas_schem_res.diff
Description: Binary data


pgAdmin 4 commit: Modified EPAS templates to support schema restriction

2020-07-03 Thread Akshay Joshi
Modified EPAS templates to support schema restriction.

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=cb1cdd1b23176e40b8cb6a491a840fd1f853e4c3
Author: Murtuza Zabuawala 

Modified Files
--
.../databases/schemas/templates/schemas/ppas/9.1_plus/sql/nodes.sql   | 4 
.../schemas/templates/schemas/ppas/9.1_plus/sql/properties.sql| 4 
.../databases/schemas/templates/schemas/ppas/9.2_plus/sql/nodes.sql   | 4 
.../schemas/templates/schemas/ppas/9.2_plus/sql/properties.sql| 4 
4 files changed, 16 insertions(+)



pgAdmin 4 commit: Fixed code smells having rule 'Functions, methods and

2020-07-03 Thread Akshay Joshi
Fixed code smells having rule 'Functions, methods and lambdas should not have 
too many parameters'.

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=0d920591552a21f918e0fbfe5a1a2519e4d118f1

Modified Files
--
.../foreign_servers/user_mappings/__init__.py  | 17 +++
.../databases/schemas/collations/__init__.py   | 22 -
.../servers/databases/schemas/domains/__init__.py  | 22 -
.../databases/schemas/foreign_tables/__init__.py   | 51 +++-
.../schemas/fts_configurations/__init__.py | 22 -
.../databases/schemas/fts_dictionaries/__init__.py | 22 -
.../databases/schemas/fts_parsers/__init__.py  | 22 -
.../databases/schemas/fts_templates/__init__.py| 22 -
.../databases/schemas/functions/__init__.py| 52 +
.../servers/databases/schemas/packages/__init__.py | 54 +++---
.../databases/schemas/sequences/__init__.py| 21 +
.../servers/databases/schemas/synonyms/__init__.py | 22 -
.../schemas/tables/compound_triggers/__init__.py   | 18 +++-
.../tables/row_security_policies/__init__.py   | 23 +++--
.../databases/schemas/tables/rules/__init__.py | 19 ++--
.../databases/schemas/tables/triggers/__init__.py  | 18 +++-
.../servers/databases/schemas/types/__init__.py| 22 -
.../servers/databases/schemas/views/__init__.py| 18 ++--
18 files changed, 275 insertions(+), 192 deletions(-)



Re: pgAdmin 4 commit: Added support for schema level restriction. Fixes #55

2020-07-03 Thread Akshay Joshi
Thanks, patch applied.

On Fri, Jul 3, 2020 at 5:07 PM Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:

> Hi Akshay,
>
> PFA patch to add the same changes for EPAS templates as well.
>
>
> --
> Regards,
> Murtuza Zabuawala
> *EDB*
> *POWER TO POSTGRES*
> https://www.edbpostgres.com
>
>
> On Tue, Jun 30, 2020 at 7:16 PM Akshay Joshi <
> akshay.jo...@enterprisedb.com> wrote:
>
>> Added support for schema level restriction. Fixes #5583
>>
>> Allow user to edit the connection properties when the database server
>> is already connected.
>>
>> Branch
>> --
>> master
>>
>> Details
>> ---
>>
>> https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=c873218c3279a12d97852f06d3d64fd33f6346d8
>> Author: Nikhil Mohite 
>>
>> Modified Files
>> --
>> docs/en_US/database_dialog.rst |  13 +
>> docs/en_US/images/database_advanced.png| Bin 0 -> 51645 bytes
>> docs/en_US/release_notes_4_24.rst  |   1 +
>> web/migrations/versions/84700139beb0_.py   |  32 +++
>> .../browser/server_groups/servers/__init__.py  |   3 +-
>> .../server_groups/servers/databases/__init__.py| 175 
>> .../servers/databases/schemas/__init__.py  |  41 ++-
>> .../templates/schemas/pg/9.2_plus/sql/nodes.sql|   6 +
>> .../schemas/pg/9.2_plus/sql/properties.sql |   4 +
>> .../servers/databases/static/js/database.js| 315
>> -
>> .../servers/databases/tests/test_db_put.py |   3 +-
>> .../server_groups/servers/databases/tests/utils.py |   3 +-
>> .../server_groups/servers/static/js/server.js  |  62 +++-
>> web/pgadmin/browser/static/js/node.js  |  23 +-
>> web/pgadmin/model/__init__.py  |  15 +
>> 15 files changed, 487 insertions(+), 209 deletions(-)
>>
>>

-- 
*Thanks & Regards*
*Akshay Joshi*

*Sr. Software Architect*
*EnterpriseDB Software India Private Limited*
*Mobile: +91 976-788-8246*


Re- SonarQube[Variables should not be shadowed]

2020-07-03 Thread Satish V
Hi Hackers,

Please find the patch which fixes some of the sonar qube issues related to
variable shadowing.

Thanks,
Sathish V


variable_shadow1.patch
Description: Binary data


[pgAdmin][RM5569] [SQL] Bad display of tables storage parameters in the "SQL" tab (correction of bug #5398 not complete)

2020-07-03 Thread Rahul Shirsat
Hi Hackers,

Please find the attached patch which fixes the issue related to the
partition table with storage parameters.

-- 
*Rahul Shirsat*
Software Engineer | EnterpriseDB Corporation.


RM5569.patch
Description: Binary data