From 2cc8f5f272c2522f503affbe9b49e6abb90b0cd8 Mon Sep 17 00:00:00 2001
From: Yogesh Mahajan <yogesh.mahajan@enterprisedb.com>
Date: Mon, 14 Oct 2024 16:17:46 +0530
Subject: [PATCH] Ensure server connection is successful for sslrootcert=system
 in server configuration. #7907

---
 .../static/js/components/PgTree/FileTreeItem/index.tsx     | 2 +-
 web/pgadmin/utils/driver/psycopg3/server_manager.py        | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/web/pgadmin/static/js/components/PgTree/FileTreeItem/index.tsx b/web/pgadmin/static/js/components/PgTree/FileTreeItem/index.tsx
index 5876ea66e..4466d5246 100644
--- a/web/pgadmin/static/js/components/PgTree/FileTreeItem/index.tsx
+++ b/web/pgadmin/static/js/components/PgTree/FileTreeItem/index.tsx
@@ -65,7 +65,7 @@ export class FileTreeItem extends React.Component<IItemRendererXProps & IItemRen
               ? 'file'
               : 'directory';
 
-    if (this.props.item.parent?.path) {
+    if (this.props.item.parent?.parent && this.props.item.parent?.path) {
       this.props.item.resolvedPathCache = this.props.item.parent.path + '/' + this.props.item._metadata.data.id;
     }
 
diff --git a/web/pgadmin/utils/driver/psycopg3/server_manager.py b/web/pgadmin/utils/driver/psycopg3/server_manager.py
index 5659f6790..5e6d855a6 100644
--- a/web/pgadmin/utils/driver/psycopg3/server_manager.py
+++ b/web/pgadmin/utils/driver/psycopg3/server_manager.py
@@ -670,11 +670,14 @@ WHERE db.oid = {0}""".format(did))
                 with_complete_path = False
                 orig_value = value
                 # Getting complete file path if the key is one of the below.
-                if key in ['passfile', 'sslcert', 'sslkey', 'sslrootcert',
-                           'sslcrl', 'sslcrldir']:
+                if key in ['passfile', 'sslcert', 'sslkey','sslcrl',
+                           'sslcrldir']:
                     with_complete_path = True
                     value = get_complete_file_path(value)
 
+                if key == 'sslrootcert' and value != 'system':
+                    dsn_args[key] = get_complete_file_path(value)
+
                 # If key is hostaddr and ssh tunnel is in use don't overwrite.
                 if key == 'hostaddr' and self.use_ssh_tunnel:
                     continue