Skip to content

Commit 6ce2843

Browse files
author
Rohit Bhati
committed
1. Fix SQL formatting issue where line breaks are not treated as whitespace in Filter Rows. #8254
2. Fix issue where tooltips persist, blocking access to UI controls. #8255
1 parent 9cd8492 commit 6ce2843

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ export const PgIconButton = forwardRef(({icon, title, shortcut, className, split
197197
}
198198
} else if(color == 'primary') {
199199
return (
200-
<Tooltip title={shortcutTitle || title || ''} aria-label={title || ''} enterDelay={isDropdown ? 1500 : undefined} placement={tooltipPlacement}>
200+
<Tooltip title={shortcutTitle || title || ''} aria-label={title || ''} enterDelay={isDropdown ? 1500 : undefined} placement={tooltipPlacement} disableInteractive>
201201
<PrimaryButton ref={ref} style={style}
202202
className={['Buttons-iconButton', (splitButton ? 'Buttons-splitButton' : ''), className].join(' ')}
203203
accessKey={accesskey} data-label={title || ''} {...props}>
@@ -208,7 +208,7 @@ export const PgIconButton = forwardRef(({icon, title, shortcut, className, split
208208
);
209209
} else {
210210
return (
211-
<Tooltip title={shortcutTitle || title || ''} aria-label={title || ''} enterDelay={isDropdown ? 1500 : undefined} placement={tooltipPlacement}>
211+
<Tooltip title={shortcutTitle || title || ''} aria-label={title || ''} enterDelay={isDropdown ? 1500 : undefined} placement={tooltipPlacement} disableInteractive>
212212
<DefaultButton ref={ref} style={style}
213213
className={['Buttons-iconButton', 'Buttons-iconButtonDefault',(splitButton ? 'Buttons-splitButton' : ''), className].join(' ')}
214214
accessKey={accesskey} data-label={title || ''} {...props}>

web/pgadmin/tools/sqleditor/static/js/components/QueryToolComponent.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ export default function QueryToolComponent({params, pgWindow, pgAdmin, selectedN
365365
role: selectedConn.role,
366366
password: password,
367367
dbname: selectedConn.database_name
368-
} : JSON.stringify(qtState.params.sql_filter))
368+
} : qtState.params.sql_filter)
369369
.then(()=>{
370370
setQtStatePartial({
371371
connected: true,

web/pgadmin/tools/sqleditor/static/js/components/sections/ConnectionBar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ export function ConnectionBar({connected, connecting, connectionStatus, connecti
110110
onClick={queryToolCtx.params.is_query_tool ? ()=>setConnDropdownOpen(true) : undefined}
111111
style={{backgroundColor: queryToolCtx.params.bgcolor, color: queryToolCtx.params.fgcolor}}
112112
>
113-
<Tooltip title={queryToolCtx.params.is_query_tool ? '' : connTitle}>
113+
<Tooltip title={queryToolCtx.params.is_query_tool ? '' : connTitle} disableInteractive>
114114
<Box display="flex" width="100%">
115115
<Box textOverflow="ellipsis" overflow="hidden" marginRight="auto">{connecting && gettext('(Obtaining connection)')}{connTitle}</Box>
116116
{queryToolCtx.params.is_query_tool && <Box display="flex" alignItems="center"><KeyboardArrowDownIcon /></Box>}

web/pgadmin/tools/sqleditor/static/js/show_view_data.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ function showFilterDialog(pgBrowser, item, queryToolMod, transId,
188188
let helpUrl = url_for('help.static', {'filename': 'viewdata_filter.html'});
189189

190190
let okCallback = function() {
191-
queryToolMod.launch(transId, gridUrl, false, queryToolTitle, {sql_filter: schema.sessData.filter_sql});
191+
queryToolMod.launch(transId, gridUrl, false, queryToolTitle, {sql_filter: JSON.stringify(schema.sessData.filter_sql)});
192192
};
193193

194194
pgBrowser.Events.trigger('pgadmin:utility:show', item,

0 commit comments

Comments
 (0)