public inbox for [email protected]
help / color / mirror / Atom feedFrom: Khushboo Vashi <[email protected]>
To: pgadmin-hackers <[email protected]>
Subject: [pgAdmin4][Patch] - Server Disconnect Issue
Date: Tue, 26 Apr 2022 16:59:33 +0530
Message-ID: <CAFOhELdPxF=PzTWAhQPYMk-OfvaudNTMEX459dt4bDfFmmknNQ@mail.gmail.com> (raw)
Hi,
Please find the attached patch to fix the Server Disconnect Issue.
Steps to reproduce the issue:
Connect the server -> Refresh the page -> Disconnect the server.
Password popup will appear on disconnection.
Thanks,
Khushboo
Attachments:
[application/octet-stream] server_disconnect_issue.patch (2.5K, 3-server_disconnect_issue.patch)
download | inline diff:
diff --git a/web/package.json b/web/package.json
index ff59c9251..3237935e5 100644
--- a/web/package.json
+++ b/web/package.json
@@ -144,7 +144,7 @@
"path-fx": "^2.0.0",
"pathfinding": "^0.4.18",
"paths-js": "^0.4.9",
- "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613",
+ "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#2c288ccc0ae0c98b41e56e79abf1204be3861702",
"postcss": "^8.2.15",
"raf": "^3.4.1",
"rc-dock": "^3.2.9",
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 3e3e4346a..aa85fe919 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/server.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/server.js
@@ -267,7 +267,7 @@ define('pgadmin.node.server', [
t.addIcon(i, {icon: d.icon});
obj.callbacks.refresh.apply(obj, [null, i]);
setTimeout(() => {
- t.toggle(i);
+ t.close(i);
}, 10);
if (pgBrowser.serverInfo && d._id in pgBrowser.serverInfo) {
delete pgBrowser.serverInfo[d._id];
diff --git a/web/pgadmin/static/js/tree/tree.js b/web/pgadmin/static/js/tree/tree.js
index 804eaad60..839016adf 100644
--- a/web/pgadmin/static/js/tree/tree.js
+++ b/web/pgadmin/static/js/tree/tree.js
@@ -166,7 +166,7 @@ export class Tree {
}
async close(item) {
- await this.tree.closeDirectory(item);
+ await this.tree.closeDir(item);
}
async toggle(item) {
diff --git a/web/yarn.lock b/web/yarn.lock
index c87f3b0e1..022cfe632 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -8179,9 +8179,9 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613":
+"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#2c288ccc0ae0c98b41e56e79abf1204be3861702":
version "1.0.0"
- resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613"
+ resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#2c288ccc0ae0c98b41e56e79abf1204be3861702"
dependencies:
"@types/classnames" "^2.2.6"
"@types/react" "^16.7.18"
view thread (2+ 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]
Subject: Re: [pgAdmin4][Patch] - Server Disconnect Issue
In-Reply-To: <CAFOhELdPxF=PzTWAhQPYMk-OfvaudNTMEX459dt4bDfFmmknNQ@mail.gmail.com>
* 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