[pgAdmin][RM-6988]: Reset pgAdmin layout if the layout is in an inconsistent state.

2021-11-11 Thread Nikhil Mohite
Hi Hackers,

Please find the attached patch for RM-6988:
 Reset pgAdmin layout if the
layout is in an inconsistent state.


-- 
*Thanks & Regards,*
*Nikhil Mohite*
*Senior Software Engineer.*
*EDB Postgres* 
*Mob.No: +91-7798364578.*


RM-6988.patch
Description: Binary data


Re: [pgAdmin4][Patch] - RM 6905 - Impossible to load databases

2021-11-11 Thread Khushboo Vashi
Hi Ayad,


On Thu, Nov 11, 2021 at 12:56 PM Ayad Mohamed  wrote:

> Hi again
>
>
> now it tells
>
>
> yarn run bundle
> yarn run v1.22.15
> error Couldn't find a package.json file in "/usr/pgadmin4/web"
> info Visit https://yarnpkg.com/en/docs/cli/run for documentation about
> this command.
>
> We don't ship package.json file as the pgadmin4 package is not intended to
support in-line patching, but if you still want to do it, I have attached
the package.json file.
Place it at /usr/pgadmin4/web and do yarn install and yarn run bundle.
Also, if you come across the node js version error, please upgrade your
nodejs version.

Thanks,
Khushboo




>
>
>
>
>
>
>
>
>
>
> Med venlig hilsen
> Ayad Mohamed
> Seniorkonsulent
>
>
>
>
>
>   Børne- og Undervisningsministeriet
> Styrelsen for It og Læring
> Kontor for It-drift
> Vester Voldgade 123
> 1552 København V
> Tlf.: 3587 8889
>
> Direkte tlf.: +45 4172 7259
> E-mail: ayad.moha...@stil.dk
>
>
> --
> *From:* Khushboo Vashi 
> *Sent:* 11 November 2021 08:18
> *To:* Ayad Mohamed
> *Cc:* pgadmin-hack...@postgresql.org
> *Subject:* Re: [pgAdmin4][Patch] - RM 6905 - Impossible to load databases
>
>
>
> On Thu, Nov 11, 2021 at 12:15 PM Ayad Mohamed 
> wrote:
>
>> Hi Khushboo
>>
>>
>> Many thanks for your mail.
>>
>>
>> I am in /usr/pgadmin4/web the step yarn install says
>>
>>
>> yarn install
>> 00h00m00s 0/0: : ERROR: [Errno 2] No such file or directory: 'install'
>>
>>
>> Probably your yarn is not installed properly.
> Please refer:
> https://linuxize.com/post/how-to-install-yarn-on-ubuntu-20-04/
>
>
>>  ??
>>
>>
>>
>>
>>
>>
>>
>>
>>
>>
>>
>> Med venlig hilsen
>> Ayad Mohamed
>> Seniorkonsulent
>>
>>
>>
>>
>>
>>   Børne- og Undervisningsministeriet
>> Styrelsen for It og Læring
>> Kontor for It-drift
>> Vester Voldgade 123
>> 1552 København V
>> Tlf.: 3587 8889
>>
>> Direkte tlf.: +45 4172 7259
>> E-mail: ayad.moha...@stil.dk
>>
>>
>> --
>> *From:* Khushboo Vashi 
>> *Sent:* 11 November 2021 05:32
>> *To:* Ayad Mohamed
>> *Cc:* pgadmin-hack...@postgresql.org
>> *Subject:* Re: [pgAdmin4][Patch] - RM 6905 - Impossible to load databases
>>
>> Hi Ayad,
>>
>> On Wed, Nov 10, 2021 at 6:18 PM Ayad Mohamed 
>> wrote:
>>
>>> Hi Khushboo
>>>
>>>
>>> I have pgadmin4 on ubuntu server and installed via the official
>>> postgresql repos .
>>>
>>> and so I patched the file tree_nodes.ts with your patch file.
>>>
>>>
>>> Kindely tell me if I should do more.
>>>
>>>
>>>
>> To test this patch, you need to do following:
>>
>> - Install yarn and nodejs on the ubuntu machine
>> - Run below commands to activate virtual environment and do yarn bundle
>>
>>-  source /usr/pgadmin4/venv/bin/activate
>>-  cd /usr/pgadmin4/web
>>-  yarn install
>>-  yarn run bundle
>>
>> Now, clear the browser cache, browse the pgAdmin4 and check.
>>
>> Thanks,
>> Khushboo
>>
>>>
>>>
>>>
>>>
>>>
>>>
>>>
>>> Med venlig hilsen
>>> Ayad Mohamed
>>> Seniorkonsulent
>>>
>>>
>>>
>>>
>>>
>>>   Børne- og Undervisningsministeriet
>>> Styrelsen for It og Læring
>>> Kontor for It-drift
>>> Vester Voldgade 123
>>> 1552 København V
>>> Tlf.: 3587 8889
>>>
>>> Direkte tlf.: +45 4172 7259
>>> E-mail: ayad.moha...@stil.dk tree_nodes.ts
>>>
>>>
>>> --
>>> *From:* Khushboo Vashi 
>>> *Sent:* 10 November 2021 13:01
>>> *To:* Ayad Mohamed
>>> *Cc:* pgadmin-hack...@postgresql.org
>>> *Subject:* Re: [pgAdmin4][Patch] - RM 6905 - Impossible to load
>>> databases
>>>
>>> Hi,
>>>
>>> The change is in the typescript file, so yarn bundle will be required.
>>> Have you done that?
>>>
>>> Thanks,
>>> Khushboo
>>>
>>> On Wed, Nov 10, 2021 at 5:00 PM Ayad Mohamed 
>>> wrote:
>>>

 Hi Khushboo


 I patched our pgadmin4 6.1 with your patch but we still have the
 problem.


 regards

 Ayad Mohamed











 --


  Videresendt brev 
 *Fra*: Khushboo Vashi >>> >
 *Til*: pgadmin-hackers >>> >
 *Emne*: [pgAdmin4][Patch] - RM 6905 - Impossible to load databases
 *Dato*: Wed, 10 Nov 2021 11:06:00 +0530

 Hi,

 Please find the attached patch to fix the RM #6905 - Impossible to load
 databases.

 The database nodes are not getting loaded *behind* *reverse proxy with
 SSL*. This issue has been fixed in this patch.

 Note: Yogesh helped me to setup the apache server with reverse proxy
 with SSL and to reproduce the issue.

 Thanks,
 Khushboo




package.json
Description: application/json


Re: Feature Test Fix - React porting

2021-11-11 Thread Yogesh Mahajan
Hi,

Please find the attached patch which uses selenium 4.0.0a6 which works with
python 3.6.8.
Selenium 4.0.0 requires python 3.7+

Thanks,
Yogesh Mahajan
EnterpriseDB


On Wed, Nov 10, 2021 at 11:59 AM Akshay Joshi 
wrote:

> Thanks, the patch applied. but Jenkins is failing with the below error:
> ERROR: No matching distribution found for selenium==4.0.0
> ERROR: Failed to install Python requirements.
>
> On Tue, Nov 9, 2021 at 2:48 PM Yogesh Mahajan <
> yogesh.maha...@enterprisedb.com> wrote:
>
>> Hi,
>>
>> Please find the attached patch which fixes feature tests broken due to
>> react porting changes.
>>
>> Thanks,
>> Yogesh Mahajan
>> EnterpriseDB
>>
>
>
> --
> *Thanks & Regards*
> *Akshay Joshi*
> *pgAdmin Hacker | Principal Software Architect*
> *EDB Postgres *
>
> *Mobile: +91 976-788-8246*
>


Feature_Test_Fix_React_Porting_v2.patch
Description: Binary data


pgAdmin 4 commit: Reset the layout if pgAdmin4 detects the layout is in

2021-11-11 Thread Akshay Joshi
Reset the layout if pgAdmin4 detects the layout is in an inconsistent state. 
Fixes #6988

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=8bf178b0a354d867bfeeadb71908ff3eb55be304
Author: Nikhil Mohite 

Modified Files
--
docs/en_US/release_notes_6_2.rst|  1 +
web/pgadmin/browser/static/js/layout.js | 19 +++
2 files changed, 20 insertions(+)



pgAdmin 4 commit: Uses selenium 4.0.0a6 which works with python 3.6

2021-11-11 Thread Akshay Joshi
Uses selenium 4.0.0a6 which works with python 3.6

Branch
--
master

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

Modified Files
--
.../copy_selected_query_results_feature_test.py|  3 ++-
.../feature_tests/pg_datatype_validation_test.py   |  6 +++---
.../pg_utilities_backup_restore_test.py| 24 --
.../feature_tests/pg_utilities_maintenance_test.py |  8 
web/pgadmin/feature_tests/query_tool_tests.py  | 10 +
.../feature_tests/test_copy_sql_to_query_tool.py   | 10 -
.../xss_checks_panels_and_query_tool_test.py   | 11 +-
.../xss_checks_pgadmin_debugger_test.py|  2 +-
web/regression/feature_utils/pgadmin_page.py   | 10 -
web/regression/python_test_utils/test_utils.py |  6 +-
web/regression/requirements.txt|  2 +-
11 files changed, 47 insertions(+), 45 deletions(-)



Re: Feature Test Fix - React porting

2021-11-11 Thread Akshay Joshi
Thanks, the patch applied.

On Thu, Nov 11, 2021 at 10:04 PM Yogesh Mahajan <
yogesh.maha...@enterprisedb.com> wrote:

> Hi,
>
> Please find the attached patch which uses selenium 4.0.0a6 which works
> with python 3.6.8.
> Selenium 4.0.0 requires python 3.7+
>
> Thanks,
> Yogesh Mahajan
> EnterpriseDB
>
>
> On Wed, Nov 10, 2021 at 11:59 AM Akshay Joshi <
> akshay.jo...@enterprisedb.com> wrote:
>
>> Thanks, the patch applied. but Jenkins is failing with the below error:
>> ERROR: No matching distribution found for selenium==4.0.0
>> ERROR: Failed to install Python requirements.
>>
>> On Tue, Nov 9, 2021 at 2:48 PM Yogesh Mahajan <
>> yogesh.maha...@enterprisedb.com> wrote:
>>
>>> Hi,
>>>
>>> Please find the attached patch which fixes feature tests broken due to
>>> react porting changes.
>>>
>>> Thanks,
>>> Yogesh Mahajan
>>> EnterpriseDB
>>>
>>
>>
>> --
>> *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*


Re: [pgAdmin][RM-6988]: Reset pgAdmin layout if the layout is in an inconsistent state.

2021-11-11 Thread Akshay Joshi
Thanks, the patch applied.

On Thu, Nov 11, 2021 at 3:05 PM Nikhil Mohite <
nikhil.moh...@enterprisedb.com> wrote:

> Hi Hackers,
>
> Please find the attached patch for RM-6988:
>  Reset pgAdmin layout if the
> layout is in an inconsistent state.
>
>
> --
> *Thanks & Regards,*
> *Nikhil Mohite*
> *Senior Software Engineer.*
> *EDB Postgres* 
> *Mob.No: +91-7798364578.*
>


-- 
*Thanks & Regards*
*Akshay Joshi*
*pgAdmin Hacker | Principal Software Architect*
*EDB Postgres *

*Mobile: +91 976-788-8246*