Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 09:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add Proxy changes fix

Browse source
This commit is contained in:
Vijaykant Yadav 2025-04-01 15:25:44 +05:30
parent 1722238feb
commit 4ef2f69bda
1 changed files with 65 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js
View file

@ -392,10 +392,10 @@ export const createQueryPanelSlice = (set, get) => ({
error: error:
query.kind === 'restapi' query.kind === 'restapi'
? { ? {
substitutedVariables: options, substitutedVariables: options,
request: data?.data?.requestObject, request: data?.data?.requestObject,
response: data?.data?.responseObject, response: data?.data?.responseObject,
} }
: errorData, : errorData,
isQuerySuccessLog: false, isQuerySuccessLog: false,
}); });
@ -404,10 +404,10 @@ export const createQueryPanelSlice = (set, get) => ({
isLoading: false, isLoading: false,
...(query.kind === 'restapi' ...(query.kind === 'restapi'
? { ? {
request: data.data.requestObject, request: data.data.requestObject,
response: data.data.responseObject, response: data.data.responseObject,
responseHeaders: data.data.responseHeaders, responseHeaders: data.data.responseHeaders,
} }
: {}), : {}),
}); });
@ -565,35 +565,35 @@ export const createQueryPanelSlice = (set, get) => ({
queryStatusCode === 400 || queryStatusCode === 400 ||
queryStatusCode === 404 || queryStatusCode === 404 ||
queryStatusCode === 422: { queryStatusCode === 422: {
let errorData = {}; let errorData = {};
switch (query.kind) { switch (query.kind) {
case 'runpy': case 'runpy':
errorData = data.data; errorData = data.data;
break; break;
case 'tooljetdb': case 'tooljetdb':
if (data?.error) { if (data?.error) {
errorData = { errorData = {
message: data?.error?.message || 'Something went wrong', message: data?.error?.message || 'Something went wrong',
description: data?.error?.message || 'Something went wrong', description: data?.error?.message || 'Something went wrong',
status: data?.statusText || 'Failed', status: data?.statusText || 'Failed',
data: data?.error || {}, data: data?.error || {},
}; };
} else { } else {
errorData = data;
errorData.description = data.errorMessage || 'Something went wrong';
}
break;
default:
errorData = data; errorData = data;
break; errorData.description = data.errorMessage || 'Something went wrong';
} }
break;
onEvent('onDataQueryFailure', queryEvents); default:
errorData = data;
if (!calledFromQuery) setPreviewData(errorData); break;
break;
} }
onEvent('onDataQueryFailure', queryEvents);
if (!calledFromQuery) setPreviewData(errorData);
break;
}
case queryStatus === 'needs_oauth': { case queryStatus === 'needs_oauth': {
const url = data.data.auth_url; // Backend generates and return sthe auth url const url = data.data.auth_url; // Backend generates and return sthe auth url
const kind = data.data?.kind; const kind = data.data?.kind;
@ -610,31 +610,31 @@ export const createQueryPanelSlice = (set, get) => ({
queryStatus === 'Created' || queryStatus === 'Created' ||
queryStatus === 'Accepted' || queryStatus === 'Accepted' ||
queryStatus === 'No Content': { queryStatus === 'No Content': {
toast(`Query ${'(' + query.name + ') ' || ''}completed.`, { toast(`Query ${'(' + query.name + ') ' || ''}completed.`, {
icon: '🚀', icon: '🚀',
}); });
if (query.options.enableTransformation) { if (query.options.enableTransformation) {
finalData = await runTransformation( finalData = await runTransformation(
finalData, finalData,
query.options.transformation, query.options.transformation,
query.options.transformationLanguage, query.options.transformationLanguage,
query, query,
'edit' 'edit'
); );
if (finalData.status === 'failed') { if (finalData.status === 'failed') {
onEvent('onDataQueryFailure', queryEvents); onEvent('onDataQueryFailure', queryEvents);
setPreviewLoading(false); setPreviewLoading(false);
setIsPreviewQueryLoading(false); setIsPreviewQueryLoading(false);
resolve({ status: data.status, data: finalData }); resolve({ status: data.status, data: finalData });
if (!calledFromQuery) setPreviewData(finalData); if (!calledFromQuery) setPreviewData(finalData);
return; return;
}
} }
if (!calledFromQuery) setPreviewData(finalData);
onEvent('onDataQuerySuccess', queryEvents, 'edit');
break;
} }
if (!calledFromQuery) setPreviewData(finalData);
onEvent('onDataQuerySuccess', queryEvents, 'edit');
break;
}
} }
setPreviewLoading(false); setPreviewLoading(false);
setIsPreviewQueryLoading(false); setIsPreviewQueryLoading(false);
@ -955,20 +955,13 @@ export const createQueryPanelSlice = (set, get) => ({
//Proxy Func required to get current execution line number from stack to log in debugger //Proxy Func required to get current execution line number from stack to log in debugger
// const proxiedComponents = createProxy(resolvedState?.components); const proxiedComponents = createProxy(deepClone(resolvedState?.components));
// const proxiedGlobals = createProxy(resolvedState?.globals); const proxiedGlobals = createProxy(deepClone(resolvedState?.globals));
// const proxiedConstants = createProxy(resolvedState?.constants); const proxiedConstants = createProxy(deepClone(resolvedState?.constants));
// const proxiedVariables = createProxy(resolvedState?.variables); const proxiedVariables = createProxy(deepClone(resolvedState?.variables));
// const proxiedPage = createProxy(deepClone(resolvedState?.page)); const proxiedPage = createProxy(deepClone(resolvedState?.page));
// const proxiedQueriesInResolvedState = createProxy(queriesInResolvedState); const proxiedQueriesInResolvedState = createProxy(deepClone(queriesInResolvedState));
// const proxiedFormattedParams = createProxy(!_.isEmpty(proxiedFormattedParams) ? [proxiedFormattedParams] : []); const proxiedFormattedParams = createProxy(!_.isEmpty(proxiedFormattedParams) ? [proxiedFormattedParams] : []);
const proxiedComponents = resolvedState?.components;
const proxiedGlobals = resolvedState?.globals;
const proxiedConstants = resolvedState?.constants;
const proxiedVariables = resolvedState?.variables;
const proxiedPage = deepClone(resolvedState?.page);
const proxiedQueriesInResolvedState = queriesInResolvedState;
const proxiedFormattedParams = [formattedParams];
const fnParams = [ const fnParams = [
'moment', 'moment',