Skip to content

Fix query tool auto execution after session restore #10055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dev-hari-prasad wants to merge 4 commits into
base: master
Choose a base branch
from
+28 −6
Open

Fix query tool auto execution after session restore #10055

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d9c38d
Fix query auto execution on session restore
dev-hari-prasad Jun 9, 2026
29433f2
Clean up QueryToolComponent state and URL handling
dev-hari-prasad Jun 10, 2026
aefee3f
Update QueryToolComponent.jsx
dev-hari-prasad Jun 10, 2026
b8a2a4e
Refactoring: Clean up state initialization and URL checks
dev-hari-prasad Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions web/pgadmin/tools/sqleditor/static/js/components/QueryToolComponent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ const FIXED_PREF = {
export default function QueryToolComponent({params, pgWindow, pgAdmin, selectedNodeInfo, qtPanelDocker, qtPanelId, eventBusObj}) {
const containerRef = React.useRef(null);
const preferencesStore = usePreferences();
const isQueryTool = params.is_query_tool === true || params.is_query_tool === 'true';
const [qtState, setQtState] = useState({
preferences: {
browser: preferencesStore.getPreferencesForModule('browser'),
Expand All @@ -138,7 +139,8 @@ export default function QueryToolComponent({params, pgWindow, pgAdmin, selectedN
params: {
...params,
title: _.unescape(params.title),
is_query_tool: params.is_query_tool == 'true',
is_query_tool: isQueryTool,
restore: params.restore === true || params.restore === 'true',
node_name: retrieveNodeName(selectedNodeInfo),
dbname: _.unescape(params.database_name) || getDatabaseLabel(selectedNodeInfo),
server_cursor: preferencesStore.getPreferencesForModule('sqleditor').server_cursor === true,
Expand All @@ -154,7 +156,7 @@ export default function QueryToolComponent({params, pgWindow, pgAdmin, selectedN
bgcolor: params.bgcolor,
conn_title: getTitle(
pgAdmin, null, selectedNodeInfo, true, _.unescape(params.server_name), _.unescape(params.database_name) || getDatabaseLabel(selectedNodeInfo),
_.unescape(params.role) || _.unescape(params.user), params.is_query_tool == 'true'),
_.unescape(params.role) || _.unescape(params.user), isQueryTool),
server_name: _.unescape(params.server_name),
database_name: _.unescape(params.database_name) || getDatabaseLabel(selectedNodeInfo),
is_selected: true,
Expand Down Expand Up @@ -290,14 +292,14 @@ export default function QueryToolComponent({params, pgWindow, pgAdmin, selectedN
eventBus.current.fireEvent(QUERY_TOOL_EVENTS.HANDLE_API_ERROR, err);
setQtStatePartial({ editor_disabled: true });
});
} else if (qtState.params.sql_id && qtState.params.restore != 'true') {
} else if (qtState.params.sql_id && qtState.params.restore !== true) {
let sqlValue = localStorage.getItem(qtState.params.sql_id);
localStorage.removeItem(qtState.params.sql_id);
if (sqlValue) {
eventBus.current.fireEvent(QUERY_TOOL_EVENTS.EDITOR_SET_SQL, sqlValue);
}
setQtStatePartial({ editor_disabled: false });
} else if (qtState.params.restore == 'true') {
} else if (qtState.params.restore === true) {

@mzabuawala mzabuawala Jun 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes looks good.
I observed that restoreToolContent() is async but is called without await here, can you fix that also?

restoreToolContent();
} else {
setQtStatePartial({ editor_disabled: false });
Expand Down Expand Up @@ -342,7 +344,14 @@ export default function QueryToolComponent({params, pgWindow, pgAdmin, selectedN
if(toolContent?.fileName)eventBus.current.fireEvent(QUERY_TOOL_EVENTS.LOAD_FILE_DONE, toolContent.fileName, true);
}
}
setQtStatePartial({ editor_disabled: false });
setQtStatePartial(prev => ({
...prev,
editor_disabled: false,
params: {
...prev.params,
restore: false
}
}));
};

const initializeQueryTool = (password, explainObject=null, macroSQL='', executeCursor=false, executeServerCursor=false, reexecute=false)=>{
Expand Down Expand Up @@ -380,7 +389,7 @@ export default function QueryToolComponent({params, pgWindow, pgAdmin, selectedN
obtaining_conn: false,
});
//this condition works if user is in View/Edit Data or user does not saved server or tunnel password and disconnected the server and executing the query
if(!qtState.params.is_query_tool || reexecute) {
if((!qtState.params.is_query_tool || reexecute) && qtState.params.restore !== true) {
eventBus.current.fireEvent(QUERY_TOOL_EVENTS.TRIGGER_EXECUTION, explainObject, macroSQL, executeCursor, executeServerCursor);
let msg = `${selectedConn['server_name']}/${selectedConn['database_name']} - Database connected`;
pgAdmin.Browser.notifier.success(_.escape(msg));
Expand Down Expand Up @@ -907,6 +916,18 @@ export default function QueryToolComponent({params, pgWindow, pgAdmin, selectedN
connection_list: qtState.connection_list,
current_file: qtState.current_file,
toggleQueryTool: () => setQtStatePartial((prev)=>{
let panel = qtPanelDocker?.find(qtPanelId);
if (panel?.metaData?.toolUrl) {
try {
const toolUrl = panel.metaData.toolUrl;
const isAbsolute = toolUrl.includes('://');

@mzabuawala mzabuawala Jun 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO This check is not required

const url = isAbsolute ? new URL(toolUrl) : new URL(toolUrl, window.location.origin);
url.searchParams.set('is_query_tool', 'true');
panel.metaData = Object.assign({}, panel.metaData, {toolUrl: url.toString()});
Comment on lines +925 to +926
} catch (e) {
console.warn(`Failed to update is_query_tool parameter for toolUrl "${panel?.metaData?.toolUrl}" using origin "${window.location.origin}":`, e);
}
}
return {
...prev,
params: {
Expand Down Expand Up @@ -1000,6 +1021,7 @@ QueryToolComponent.propTypes = {
bgcolor: PropTypes.string,
fgcolor: PropTypes.string,
is_query_tool: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]).isRequired,
restore: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
server_cursor: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
user: PropTypes.string,
role: PropTypes.string,
Expand Down
Loading