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

fix: query handler issue - query success message is also showing with error toast

Browse source
This commit is contained in:
Muhsin Shah 2023-04-10 16:11:40 +05:30
parent 869c1daa5c
commit 4836874d68
1 changed files with 80 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1011,97 +1011,97 @@ export function runQuery(_ref, queryId, queryName, confirmed = undefined, mode =
}
);
});
}
} else {
let rawData = data.data;
let finalData = data.data;
let rawData = data.data;
let finalData = data.data;
if (dataQuery.options.enableTransformation) {
finalData = await runTransformation(
_ref,
finalData,
query.options.transformation,
query.options.transformationLanguage,
query,
'edit'
);
if (finalData.status === 'failed') {
flushSync(() => {
return _self.setState(
{
currentState: {
..._self.state.currentState,
queries: {
..._self.state.currentState.queries,
[queryName]: {
..._self.state.currentState.queries[queryName],
isLoading: false,
if (dataQuery.options.enableTransformation) {
finalData = await runTransformation(
_ref,
finalData,
query.options.transformation,
query.options.transformationLanguage,
query,
'edit'
);
if (finalData.status === 'failed') {
flushSync(() => {
return _self.setState(
{
currentState: {
..._self.state.currentState,
queries: {
..._self.state.currentState.queries,
[queryName]: {
..._self.state.currentState.queries[queryName],
isLoading: false,
},
},
},
errors: {
..._self.state.currentState.errors,
[queryName]: {
type: 'transformations',
data: finalData,
options: options,
errors: {
..._self.state.currentState.errors,
[queryName]: {
type: 'transformations',
data: finalData,
options: options,
},
},
},
},
},
() => {
resolve(finalData);
onEvent(_self, 'onDataQueryFailure', {
definition: { events: dataQuery.options.events },
});
}
);
() => {
resolve(finalData);
onEvent(_self, 'onDataQueryFailure', {
definition: { events: dataQuery.options.events },
});
}
);
});
}
}
if (dataQuery.options.showSuccessNotification) {
const notificationDuration = dataQuery.options.notificationDuration * 1000 || 5000;
toast.success(dataQuery.options.successMessage, {
duration: notificationDuration,
});
}
}
if (dataQuery.options.showSuccessNotification) {
const notificationDuration = dataQuery.options.notificationDuration * 1000 || 5000;
toast.success(dataQuery.options.successMessage, {
duration: notificationDuration,
});
}
flushSync(() => {
_self.setState(
{
currentState: {
..._self.state.currentState,
queries: {
..._self.state.currentState.queries,
[queryName]: _.assign(
{
..._self.state.currentState.queries[queryName],
isLoading: false,
data: finalData,
rawData,
},
query.kind === 'restapi'
? {
request: data.request,
response: data.response,
responseHeaders: data.responseHeaders,
}
: {}
),
flushSync(() => {
_self.setState(
{
currentState: {
..._self.state.currentState,
queries: {
..._self.state.currentState.queries,
[queryName]: _.assign(
{
..._self.state.currentState.queries[queryName],
isLoading: false,
data: finalData,
rawData,
},
query.kind === 'restapi'
? {
request: data.request,
response: data.response,
responseHeaders: data.responseHeaders,
}
: {}
),
},
},
},
},
() => {
resolve({ status: 'ok', data: finalData });
onEvent(_self, 'onDataQuerySuccess', { definition: { events: dataQuery.options.events } }, mode);
() => {
resolve({ status: 'ok', data: finalData });
onEvent(_self, 'onDataQuerySuccess', { definition: { events: dataQuery.options.events } }, mode);
if (mode !== 'view') {
toast(`Query (${queryName}) completed.`, {
icon: '🚀',
});
if (mode !== 'view') {
toast(`Query (${queryName}) completed.`, {
icon: '🚀',
});
}
}
}
);
});
);
});
}
})
.catch(({ error }) => {
if (mode !== 'view') toast.error(error ?? 'Unknown error');