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

Query events should be fired after saving state

Browse source
This commit is contained in:
navaneeth 2021-09-08 12:42:28 +05:30
parent 1a63cb392a
commit 4c665f24fc
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -362,7 +362,6 @@ export function runQuery(_ref, queryId, queryName, confirmed = undefined) {
return new Promise(function (resolve, reject) {
_self.setState({ currentState: newState }, () => {
dataqueryService.run(queryId, options).then(data => {
resolve();
if (data.status === 'needs_oauth') {
const url = data.data.auth_url; // Backend generates and return sthe auth url
@ -372,12 +371,6 @@ export function runQuery(_ref, queryId, queryName, confirmed = undefined) {
if (data.status === 'failed') {
toast.error(data.message, { hideProgressBar: true, autoClose: 3000 });
onEvent(
_self,
'onDataQueryFailure',
{ definition: { events: dataQuery.options.events } }
)
return (
_self.setState({
currentState: {
@ -398,6 +391,13 @@ export function runQuery(_ref, queryId, queryName, confirmed = undefined) {
}
}
}
}, () => {
resolve();
onEvent(
_self,
'onDataQueryFailure',
{ definition: { events: dataQuery.options.events } }
)
})
)
}
@ -414,12 +414,6 @@ export function runQuery(_ref, queryId, queryName, confirmed = undefined) {
toast.success(dataQuery.options.successMessage, { hideProgressBar: true, autoClose: notificationDuration * 1000 });
}
onEvent(
_self,
'onDataQuerySuccess',
{ definition: { events: dataQuery.options.events } }
)
_self.setState({
currentState: {
..._self.state.currentState,
@ -433,6 +427,13 @@ export function runQuery(_ref, queryId, queryName, confirmed = undefined) {
}
}
}
}, () => {
resolve();
onEvent(
_self,
'onDataQuerySuccess',
{ definition: { events: dataQuery.options.events } }
)
});
}).catch(( { error } ) => {
toast.error(error, { hideProgressBar: true, autoClose: 3000 });
@ -446,6 +447,8 @@ export function runQuery(_ref, queryId, queryName, confirmed = undefined) {
}
}
}
}, () => {
resolve();
});
});
});