Merge branch 'fix/runQueryTwice' into 'release'

Use isExecutionSuccess flag to handle query execution errors

See merge request theappsmith/internal-tools-client!684
This commit is contained in:
Arpit Mohan 2020-06-10 12:25:54 +00:00
commit 4322555d16

View File

@ -251,25 +251,29 @@ export function* executeQuerySaga(
}, },
timeout, timeout,
); );
const isValidResponse = yield validateResponse(response);
const isExecutionSuccess = response.data.isExecutionSuccess;
if (response.responseMeta && response.responseMeta.error) { if (!isExecutionSuccess) {
throw response.responseMeta.error; throw Error(response.data.body.toString());
} }
yield put({ if (isValidResponse) {
type: ReduxActionTypes.RUN_QUERY_SUCCESS, yield put({
payload: { type: ReduxActionTypes.RUN_QUERY_SUCCESS,
data: response.data, payload: {
actionId: actionPayload.payload.actionId, data: response.data,
}, actionId: actionPayload.payload.actionId,
}); },
AppToaster.show({ });
message: "Query ran successfully", AppToaster.show({
type: ToastType.SUCCESS, message: "Query ran successfully",
}); type: ToastType.SUCCESS,
AnalyticsUtil.logEvent("RUN_QUERY", { });
queryName: actionPayload.payload.action.name, AnalyticsUtil.logEvent("RUN_QUERY", {
}); queryName: actionPayload.payload.action.name,
});
}
} catch (error) { } catch (error) {
yield put({ yield put({
type: ReduxActionErrorTypes.RUN_QUERY_ERROR, type: ReduxActionErrorTypes.RUN_QUERY_ERROR,