Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 17:08:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fixes: query confirmations popup

Browse source
This commit is contained in:
arpitnath 2023-09-27 16:20:57 +05:30
parent 2dd0160dd4
commit d61dd120fc
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frontend/src/Editor/EditorFunc.jsx
View file

@ -1428,6 +1428,15 @@ const EditorComponent = (props) => {
return (
<div className="editor wrapper">
<Confirm
show={queryConfirmationList?.length > 0}
message={`Do you want to run this query - ${queryConfirmationList[0]?.queryName}?`}
onConfirm={(queryConfirmationData) => onQueryConfirmOrCancel(editorRef, queryConfirmationData, true)}
onCancel={() => onQueryConfirmOrCancel(editorRef, queryConfirmationList[0])}
queryConfirmationData={queryConfirmationList[0]}
darkMode={props.darkMode}
key={queryConfirmationList[0]?.queryName}
/>
<Confirm
show={showPageDeletionConfirmation?.isOpen ?? false}
title={'Delete Page'}

10
frontend/src/_helpers/appUtils.js
View file

@ -337,13 +337,11 @@ export function onComponentClick(_ref, id, component, mode = 'edit') {
}
export function onQueryConfirmOrCancel(_ref, queryConfirmationData, isConfirm = false, mode = 'edit') {
const filtertedQueryConfirmation = _ref.state?.queryConfirmationList.filter(
const filtertedQueryConfirmation = _ref?.queryConfirmationList.filter(
(query) => query.queryId !== queryConfirmationData.queryId
);
_ref.setState({
queryConfirmationList: filtertedQueryConfirmation,
});
_ref.updateQueryConfirmationList(filtertedQueryConfirmation);
isConfirm && runQuery(_ref, queryConfirmationData.queryId, queryConfirmationData.queryName, true, mode);
}
@ -938,9 +936,7 @@ export function runQuery(_ref, queryId, queryName, confirmed = undefined, mode =
if (confirmed === undefined) {
//!check
_ref.setState({
queryConfirmationList,
});
_ref.updateQueryConfirmationList(queryConfirmationList);
return;
}
}