MIME-Version: 1.0
From: Khushboo Vashi <khushboo.vashi@enterprisedb.com>
Date: Sat, 2 Oct 2021 13:32:45 +0530
Message-ID: 
 <CAFOhELdzpvqRiouoYHS-6R6vZ9mEXOJE3-haay+F3MrHrFh75w@mail.gmail.com>
Subject: [pgAdmin4][Patch] - Fixes for RM #6839 & RM #6852
To: pgadmin-hackers <pgadmin-hackers@postgresql.org>
Content-Type: multipart/mixed; boundary="00000000000080263e05cd5a1b85"
Archived-At: 
 <https://www.postgresql.org/message-id/CAFOhELdzpvqRiouoYHS-6R6vZ9mEXOJE3-haay%2BF3MrHrFh75w%40mail.gmail.com>
Precedence: bulk

--00000000000080263e05cd5a1b85
Content-Type: multipart/alternative; boundary="00000000000080263d05cd5a1b83"

--00000000000080263d05cd5a1b83
Content-Type: text/plain; charset="UTF-8"

Hi,

Please find the attached patch to fix the below RMs:

RM #6839 - Newly added server/server group is not visible in tree unless
pgAdmin refreshed
RM #6852 - Internal server error displayed if disconnect the server

Thanks,
Khushboo

--00000000000080263d05cd5a1b83
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><font face=3D"arial, sans-serif" color=3D"#000000">Hi,</fo=
nt><div><font face=3D"arial, sans-serif" color=3D"#000000"><br></font></div=
><div><font face=3D"arial, sans-serif" color=3D"#000000">Please find the at=
tached=C2=A0patch to fix the below RMs:</font></div><div><font face=3D"aria=
l, sans-serif" color=3D"#000000"><br></font></div><div><font face=3D"arial,=
 sans-serif" color=3D"#000000">RM #6839 -=C2=A0</font><span style=3D"color:=
rgb(0,0,0);font-family:arial,sans-serif">Newly added server/server group is=
 not visible in tree unless pgAdmin refreshed</span></div><div><font face=
=3D"arial, sans-serif" color=3D"#000000">RM #6852 -=C2=A0</font><span style=
=3D"color:rgb(0,0,0);font-family:arial,sans-serif">Internal server error di=
splayed if disconnect the server</span></div><div><span style=3D"color:rgb(=
0,0,0);font-family:arial,sans-serif"><br></span></div><div><span style=3D"c=
olor:rgb(0,0,0);font-family:arial,sans-serif">Thanks,</span></div><div><spa=
n style=3D"color:rgb(0,0,0);font-family:arial,sans-serif">Khushboo</span></=
div><br class=3D"gmail-Apple-interchange-newline"></div>

--00000000000080263d05cd5a1b83--

--00000000000080263e05cd5a1b85
Content-Type: application/octet-stream; name="RM_6839_6852.patch"
Content-Disposition: attachment; filename="RM_6839_6852.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_ku9ib3iy0>
X-Attachment-Id: f_ku9ib3iy0

ZGlmZiAtLWdpdCBhL3dlYi9wYWNrYWdlLmpzb24gYi93ZWIvcGFja2FnZS5qc29uCmluZGV4IDJi
YzViNTk4MS4uMDQ2MTI2YzY2IDEwMDY0NAotLS0gYS93ZWIvcGFja2FnZS5qc29uCisrKyBiL3dl
Yi9wYWNrYWdlLmpzb24KQEAgLTEzNiw3ICsxMzYsNyBAQAogICAgICJwYXRoLWZ4IjogIl4yLjAu
MCIsCiAgICAgInBhdGhmaW5kaW5nIjogIl4wLjQuMTgiLAogICAgICJwYXRocy1qcyI6ICJeMC40
LjkiLAotICAgICJwZ2FkbWluNC10cmVlIjogImdpdCtodHRwczovL2dpdGh1Yi5jb20vRW50ZXJw
cmlzZURCL3BnYWRtaW40LXRyZWV2aWV3LyM1MWQ0MDI0NzgwNzkzY2RiOGM3Y2VhOGVjNmVjM2Ji
NGNmNDM4MzMxIiwKKyAgICAicGdhZG1pbjQtdHJlZSI6ICJnaXQraHR0cHM6Ly9naXRodWIuY29t
L0VudGVycHJpc2VEQi9wZ2FkbWluNC10cmVldmlldy8jZWM1OGY0ODBmNDNhYTZkZWI4NjI3Nzhk
NDlkNmYyZmI3OTdhN2QxMyIsCiAgICAgInBvc3Rjc3MiOiAiXjguMi4xNSIsCiAgICAgInJhZiI6
ICJeMy40LjEiLAogICAgICJyZWFjdCI6ICJeMTcuMC4xIiwKZGlmZiAtLWdpdCBhL3dlYi9wZ2Fk
bWluL2Jyb3dzZXIvc3RhdGljL2pzL2Jyb3dzZXIuanMgYi93ZWIvcGdhZG1pbi9icm93c2VyL3N0
YXRpYy9qcy9icm93c2VyLmpzCmluZGV4IDU4Nzk0MDgyZS4uMDliMTBlZDgyIDEwMDY0NAotLS0g
YS93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9icm93c2VyLmpzCisrKyBiL3dlYi9wZ2Fk
bWluL2Jyb3dzZXIvc3RhdGljL2pzL2Jyb3dzZXIuanMKQEAgLTQ2OSw2ICs0NjksNyBAQCBkZWZp
bmUoJ3BnYWRtaW4uYnJvd3NlcicsIFsKICAgICAgICAgICAgICRkaXYgPSAkKCc8ZGl2PjwvZGl2
PicpLAogICAgICAgICAgICAgY29udGV4dF9tZW51ID0ge307CiAKKyAgICAgICAgICBpZihpdGVt
KSBvYmoudHJlZS5zZWxlY3QoaXRlbSk7CiAgICAgICAgICAgcGdBZG1pbi5Ccm93c2VyLk1lbnVD
cmVhdG9yKAogICAgICAgICAgICAgb2JqLk5vZGVzLCAkZGl2LCBtZW51cywgb2JqLm1lbnVfY2F0
ZWdvcmllcywgZCwgaXRlbSwgY29udGV4dF9tZW51CiAgICAgICAgICAgKTsKQEAgLTEwOTUsNyAr
MTA5Niw2IEBAIGRlZmluZSgncGdhZG1pbi5icm93c2VyJywgWwogICAgICAgICAgICAgICB9IGVs
c2UgewogICAgICAgICAgICAgICAgIHZhciBfYXBwZW5kID0gZnVuY3Rpb24oKSB7CiAgICAgICAg
ICAgICAgICAgICB2YXIgX19fY3R4ID0gdGhpcywKLSAgICAgICAgICAgICAgICAgICAgaXNfcGFy
ZW50X2xvYWRlZF9iZWZvcmUgPSBfX19jdHgudC53YXNMb2FkKF9fX2N0eC5pKSwKICAgICAgICAg
ICAgICAgICAgICAgX3BhcmVudF9kYXRhID0gX19fY3R4LnQuaXRlbURhdGEoX19fY3R4LmkpOwog
CiAgICAgICAgICAgICAgICAgICBfX19jdHgudC5hcHBlbmQoX19fY3R4LmksIF9kYXRhKS50aGVu
KApAQCAtMTEwMyw3ICsxMTAzLDcgQEAgZGVmaW5lKCdwZ2FkbWluLmJyb3dzZXInLCBbCiAgICAg
ICAgICAgICAgICAgICAgICAgLy8gT3BlbiB0aGUgaXRlbSBwYXRoIG9ubHkgaWYgaXRzIHBhcmVu
dCBpcyBsb2FkZWQKICAgICAgICAgICAgICAgICAgICAgICAvLyBvciBwYXJlbnQgdHlwZSBpcyBz
YW1lIGFzIG5vZGVzCiAgICAgICAgICAgICAgICAgICAgICAgaWYoCi0gICAgICAgICAgICAgICAg
ICAgICAgICBpc19wYXJlbnRfbG9hZGVkX2JlZm9yZSAmJgorICAgICAgICAgICAgICAgICAgICAg
ICAgX19fY3R4LnQud2FzTG9hZChfX19jdHguaSkgJiYKICAgICAgICAgICAgICAgICAgICAgICAg
ICAgX3BhcmVudF9kYXRhICYmICBfcGFyZW50X2RhdGEuX3R5cGUuc2VhcmNoKAogICAgICAgICAg
ICAgICAgICAgICAgICAgICBfZGF0YS5fdHlwZQogICAgICAgICAgICAgICAgICAgICAgICAgKSA+
IC0xCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvdHJlZS90cmVlLmpzIGIvd2Vi
L3BnYWRtaW4vc3RhdGljL2pzL3RyZWUvdHJlZS5qcwppbmRleCBjOTA0NTlkNjEuLjQxODM1YjNi
ZiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3RyZWUvdHJlZS5qcworKysgYi93
ZWIvcGdhZG1pbi9zdGF0aWMvanMvdHJlZS90cmVlLmpzCkBAIC0xNDAsMTIgKzE0MCwxMiBAQCBl
eHBvcnQgY2xhc3MgVHJlZSB7CiAgICAgYXdhaXQgdGhpcy50cmVlLnRvZ2dsZURpcmVjdG9yeShp
dGVtKTsKICAgfQogCi0gIGFzeW5jIHNlbGVjdChpdGVtKSB7Ci0gICAgYXdhaXQgdGhpcy50cmVl
LnNldEFjdGl2ZUZpbGUoaXRlbSk7CisgIGFzeW5jIHNlbGVjdChpdGVtLCBlbnN1cmVWaXNpYmxl
PWZhbHNlKSB7CisgICAgYXdhaXQgdGhpcy50cmVlLnNldEFjdGl2ZUZpbGUoaXRlbSwgZW5zdXJl
VmlzaWJsZSk7CiAgIH0KIAotICBhc3luYyBzZWxlY3ROb2RlKGl0ZW0pIHsKLSAgICB0aGlzLnRy
ZWUuc2V0QWN0aXZlRmlsZShpdGVtKTsKKyAgYXN5bmMgc2VsZWN0Tm9kZShpdGVtLCBlbnN1cmVW
aXNpYmxlPWZhbHNlKSB7CisgICAgdGhpcy50cmVlLnNldEFjdGl2ZUZpbGUoaXRlbSwgZW5zdXJl
VmlzaWJsZSk7CiAgIH0KIAogICBhc3luYyB1bmxvYWQoaXRlbSkgewpAQCAtMTk0LDcgKzE5NCw3
IEBAIGV4cG9ydCBjbGFzcyBUcmVlIHsKIAogICB3YXNMb2FkKGl0ZW0pIHsKICAgICBpZiAoaXRl
bSAmJiBpdGVtLnR5cGUgPT09IEZpbGVUeXBlLkRpcmVjdG9yeSkgewotICAgICAgcmV0dXJuIGl0
ZW0uaXNFeHBhbmRlZDsKKyAgICAgIHJldHVybiBpdGVtLmlzRXhwYW5kZWQgJiYgaXRlbS5jaGls
ZHJlbiAhPSBudWxsICYmIGl0ZW0uY2hpbGRyZW4ubGVuZ3RoID4gMDsKICAgICB9CiAgICAgcmV0
dXJuIHRydWU7CiAgIH0KQEAgLTI3MCw3ICsyNzAsNyBAQCBleHBvcnQgY2xhc3MgVHJlZSB7CiAg
IH0KIAogICBpdGVtRGF0YShpdGVtKSB7Ci0gICAgcmV0dXJuIChpdGVtICE9PSB1bmRlZmluZWQg
JiYgaXRlbS5nZXRNZXRhZGF0YSgnZGF0YScpICE9PSB1bmRlZmluZWQpID8gaXRlbS5fbWV0YWRh
dGEuZGF0YSA6IFtdOworICAgIHJldHVybiAoaXRlbSAhPT0gdW5kZWZpbmVkICYmIGl0ZW0gIT09
IG51bGwgICYmIGl0ZW0uZ2V0TWV0YWRhdGEoJ2RhdGEnKSAhPT0gdW5kZWZpbmVkKSA/IGl0ZW0u
X21ldGFkYXRhLmRhdGEgOiBbXTsKICAgfQogCiAgIGdldERhdGEoaXRlbSkgewpkaWZmIC0tZ2l0
IGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3RyZWUvdHJlZV9pbml0LnRzeCBiL3dlYi9wZ2FkbWlu
L3N0YXRpYy9qcy90cmVlL3RyZWVfaW5pdC50c3gKaW5kZXggNGQ2N2VjZjIxLi4wNTg3ZjFkYzgg
MTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy90cmVlL3RyZWVfaW5pdC50c3gKKysr
IGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3RyZWUvdHJlZV9pbml0LnRzeApAQCAtNzYsNyArNzYs
NyBAQCB2YXIgaW5pdEJyb3dzZXJUcmVlID0gYXN5bmMgKHBnQnJvd3NlcikgPT4gewogICAvLyBS
ZW5kZXIgQnJvd3NlciBUcmVlCiAgIGF3YWl0IHJlbmRlcigKICAgICA8ZGl2PgotICAgICAgPEZp
bGVUcmVlWCBoZWlnaHQ9ezk5OX0gd2lkdGg9eycxMDAlJ30gbW9kZWw9e3RyZWVNb2RlbFh9Cisg
ICAgICA8RmlsZVRyZWVYIGhlaWdodD17OTUwfSB3aWR0aD17JzEwMCUnfSBtb2RlbD17dHJlZU1v
ZGVsWH0KICAgICAgICAgb25SZWFkeT17aXRlbUhhbmRsZX0gY3JlYXRlPXtjcmVhdGV9IHJlbW92
ZT17cmVtb3ZlfSB1cGRhdGU9e3VwZGF0ZX0vPgogICAgICA8L2Rpdj4sIGRvY3VtZW50LmdldEVs
ZW1lbnRCeUlkKCd0cmVlJykpOwogfQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL3Nj
c3MvX3BnYWRtaW40LXRyZWUub3ZlcnJpZGVzLnNjc3MgYi93ZWIvcGdhZG1pbi9zdGF0aWMvc2Nz
cy9fcGdhZG1pbjQtdHJlZS5vdmVycmlkZXMuc2NzcwppbmRleCBhZjA5MGJjMzQuLjk5YTY4ZGVj
MSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvX3BnYWRtaW40LXRyZWUub3Zl
cnJpZGVzLnNjc3MKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvX3BnYWRtaW40LXRyZWUu
b3ZlcnJpZGVzLnNjc3MKQEAgLTU0LDcgKzU0LDcgQEAKICAgICAgICAgZm9udC1zaXplOiAxOHB4
OwogICAgICAgICB0ZXh0LWFsaWduOiBjZW50ZXI7CiAgICAgICAgIGhlaWdodDogMjFweCAhaW1w
b3J0YW50OwotICAgICAgICB3aWR0aDogMjBweDsKKyAgICAgICAgd2lkdGg6IDIwcHggIWltcG9y
dGFudDsKICAgICAgICAgJjpiZWZvcmUgewogICAgICAgICAgICAgaGVpZ2h0OiBpbmhlcml0Owog
ICAgICAgICAgICAgd2lkdGg6IGluaGVyaXQ7Cg==
--00000000000080263e05cd5a1b85--