From 31d1dbc6972af5521773fe4170968a4e50058db3 Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Thu, 22 Jan 2026 15:15:13 +0530
Subject: [PATCH] Ensure that the tooltip is disabled for a password cell in a
 dialog grid. #9552

---
 docs/en_US/release_notes_9_12.rst                         | 2 ++
 .../browser/server_groups/servers/static/js/server.ui.js  | 2 +-
 web/pgadmin/static/js/SchemaView/DataGridView/row.jsx     | 6 ++++--
 web/pgadmin/static/js/components/PgReactTableStyled.jsx   | 8 ++++++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/docs/en_US/release_notes_9_12.rst b/docs/en_US/release_notes_9_12.rst
index 27fdd9eec..d0da1bcf9 100644
--- a/docs/en_US/release_notes_9_12.rst
+++ b/docs/en_US/release_notes_9_12.rst
@@ -26,6 +26,7 @@ Bundled PostgreSQL Utilities
 New features
 ************
 
+  | `Issue #6451 <https://github.com/pgadmin-org/pgadmin4/issues/6451>`_ - Add new options like INHERIT and SET to the Role's membership tab.
   | `Issue #8890 <https://github.com/pgadmin-org/pgadmin4/issues/8890>`_ - Add a new button in the query tool data output toolbar to get entire range of data.
   | `Issue #9292 <https://github.com/pgadmin-org/pgadmin4/issues/9292>`_ - Enhance OAUTH2 and OIDC authentication support with improved claims handling and configuration options.
 
@@ -52,3 +53,4 @@ Bug fixes
   | `Issue #9380 <https://github.com/pgadmin-org/pgadmin4/issues/9380>`_ - Fixed an issue where the Query History panel would auto-scroll to the top and did not preserve the scroll bar position for the selected entry.
   | `Issue #9500 <https://github.com/pgadmin-org/pgadmin4/issues/9500>`_ - Fixed an issue where connection parameters were using localized values instead of literal values, causing connection failures.
   | `Issue #9518 <https://github.com/pgadmin-org/pgadmin4/issues/9518>`_ - Mask the secret key for restrict option in the process watcher when restoring plain SQL file.
+  | `Issue #9552 <https://github.com/pgadmin-org/pgadmin4/issues/9552>`_ - Ensure that the tooltip for the password cell is not visible.
diff --git a/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js b/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js
index 8c17c68ca..d7b11cfb8 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js
@@ -98,7 +98,7 @@ export function getConnectionParameters() {
   }, {
     'value': 'sslkey', 'label': gettext('Client certificate key'), 'vartype': 'file'
   }, {
-    'value': 'sslpassword', 'label': gettext('SSL password'), 'vartype': 'string',
+    'value': 'sslpassword', 'label': gettext('SSL password'), 'vartype': 'password',
     'min_server_version': '13'
   }, {
     'value': 'sslrootcert', 'label': gettext('Root certificate'), 'vartype': 'file'
diff --git a/web/pgadmin/static/js/SchemaView/DataGridView/row.jsx b/web/pgadmin/static/js/SchemaView/DataGridView/row.jsx
index 17a35f062..27b24ede1 100644
--- a/web/pgadmin/static/js/SchemaView/DataGridView/row.jsx
+++ b/web/pgadmin/static/js/SchemaView/DataGridView/row.jsx
@@ -9,6 +9,7 @@
 
 import { useContext, useMemo, useRef } from 'react';
 import Draggable from 'react-draggable';
+import { evalFunc } from 'sources/utils';
 
 import { flexRender } from '@tanstack/react-table';
 
@@ -71,9 +72,10 @@ export function DataGridRow({row, isResizing}) {
                     getValue: cell.getValue,
                   }
                 );
-
+                let cellObj = evalFunc(null, columnDef?.field?.cell, row.original);
                 return (
-                  <PgReactTableCell cell={cell} row={row} key={cell.id}>
+                  <PgReactTableCell cell={cell} row={row} key={cell.id}
+                    disableTooltip={cellObj?.cell === 'password'}>
                     {content}
                   </PgReactTableCell>
                 );
diff --git a/web/pgadmin/static/js/components/PgReactTableStyled.jsx b/web/pgadmin/static/js/components/PgReactTableStyled.jsx
index e1fd5a773..6e18e1b33 100644
--- a/web/pgadmin/static/js/components/PgReactTableStyled.jsx
+++ b/web/pgadmin/static/js/components/PgReactTableStyled.jsx
@@ -167,7 +167,8 @@ export function PgReactTableCell(
     row,
     cell,
     children,
-    className
+    className,
+    disableTooltip
   }
 ) {
   let classNames = ['pgrd-row-cell'];
@@ -199,7 +200,9 @@ export function PgReactTableCell(
       ...(cell.column.columnDef.maxSize ? { maxWidth: `${cell.column.columnDef.maxSize}px` } : {})
     }}
     className={classNames.join(' ')}
-    title={typeof(cell.getValue()) === 'object' ? '' : String(cell.getValue() ?? '')}>
+    title={
+      disableTooltip ? '' : typeof(cell.getValue()) === 'object' ? '' : String(cell.getValue() ?? '')
+    }>
       <div className='pgrd-row-cell-content'>{children}</div>
     </div>
   );
@@ -211,6 +214,7 @@ PgReactTableCell.propTypes = {
   cell: PropTypes.object,
   children: CustomPropTypes.children,
   className: PropTypes.any,
+  disableTooltip: PropTypes.bool,
 };
 
 export function PgReactTableRow (