Skip to content

Commit 31d1dbc

Browse files
authored
Ensure that the tooltip is disabled for a password cell in a dialog grid. #9552
1 parent 0cac007 commit 31d1dbc

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

docs/en_US/release_notes_9_12.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Bundled PostgreSQL Utilities
2626
New features
2727
************
2828

29+
| `Issue #6451 <https://github.com/pgadmin-org/pgadmin4/issues/6451>`_ - Add new options like INHERIT and SET to the Role's membership tab.
2930
| `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.
3031
| `Issue #9292 <https://github.com/pgadmin-org/pgadmin4/issues/9292>`_ - Enhance OAUTH2 and OIDC authentication support with improved claims handling and configuration options.
3132
@@ -52,3 +53,4 @@ Bug fixes
5253
| `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.
5354
| `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.
5455
| `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.
56+
| `Issue #9552 <https://github.com/pgadmin-org/pgadmin4/issues/9552>`_ - Ensure that the tooltip for the password cell is not visible.

web/pgadmin/browser/server_groups/servers/static/js/server.ui.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export function getConnectionParameters() {
9898
}, {
9999
'value': 'sslkey', 'label': gettext('Client certificate key'), 'vartype': 'file'
100100
}, {
101-
'value': 'sslpassword', 'label': gettext('SSL password'), 'vartype': 'string',
101+
'value': 'sslpassword', 'label': gettext('SSL password'), 'vartype': 'password',
102102
'min_server_version': '13'
103103
}, {
104104
'value': 'sslrootcert', 'label': gettext('Root certificate'), 'vartype': 'file'

web/pgadmin/static/js/SchemaView/DataGridView/row.jsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import { useContext, useMemo, useRef } from 'react';
1111
import Draggable from 'react-draggable';
12+
import { evalFunc } from 'sources/utils';
1213

1314
import { flexRender } from '@tanstack/react-table';
1415

@@ -71,9 +72,10 @@ export function DataGridRow({row, isResizing}) {
7172
getValue: cell.getValue,
7273
}
7374
);
74-
75+
let cellObj = evalFunc(null, columnDef?.field?.cell, row.original);
7576
return (
76-
<PgReactTableCell cell={cell} row={row} key={cell.id}>
77+
<PgReactTableCell cell={cell} row={row} key={cell.id}
78+
disableTooltip={cellObj?.cell === 'password'}>
7779
{content}
7880
</PgReactTableCell>
7981
);

web/pgadmin/static/js/components/PgReactTableStyled.jsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ export function PgReactTableCell(
167167
row,
168168
cell,
169169
children,
170-
className
170+
className,
171+
disableTooltip
171172
}
172173
) {
173174
let classNames = ['pgrd-row-cell'];
@@ -199,7 +200,9 @@ export function PgReactTableCell(
199200
...(cell.column.columnDef.maxSize ? { maxWidth: `${cell.column.columnDef.maxSize}px` } : {})
200201
}}
201202
className={classNames.join(' ')}
202-
title={typeof(cell.getValue()) === 'object' ? '' : String(cell.getValue() ?? '')}>
203+
title={
204+
disableTooltip ? '' : typeof(cell.getValue()) === 'object' ? '' : String(cell.getValue() ?? '')
205+
}>
203206
<div className='pgrd-row-cell-content'>{children}</div>
204207
</div>
205208
);
@@ -211,6 +214,7 @@ PgReactTableCell.propTypes = {
211214
cell: PropTypes.object,
212215
children: CustomPropTypes.children,
213216
className: PropTypes.any,
217+
disableTooltip: PropTypes.bool,
214218
};
215219

216220
export function PgReactTableRow (

0 commit comments

Comments
 (0)