From 6f87d3890aa26801dcff7116d6765c166f9a3247 Mon Sep 17 00:00:00 2001 From: Vijaykant Yadav Date: Thu, 3 Apr 2025 11:54:35 +0530 Subject: [PATCH] fix: transformation lines on restapi --- .../AppBuilder/_stores/slices/eventsSlice.js | 18 +++++++++--------- .../_stores/slices/queryPanelSlice.js | 12 +++++++++--- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/frontend/src/AppBuilder/_stores/slices/eventsSlice.js b/frontend/src/AppBuilder/_stores/slices/eventsSlice.js index bb1374af2e..8ab0909d0a 100644 --- a/frontend/src/AppBuilder/_stores/slices/eventsSlice.js +++ b/frontend/src/AppBuilder/_stores/slices/eventsSlice.js @@ -1103,15 +1103,15 @@ export const createEventsSlice = (set, get) => ({ return executeAction(event, mode, {}); }; - const logInfo = (log) => { + const logInfo = (log, isFromTransformation) => { const query = dataQuery.queries.modules['canvas'].find((query) => query.id == queryId); const error = new Error(); - const stackLine = error.stack.split('\n')[2]; + const stackLine = error.stack.split('\n')[isFromTransformation ? 3 : 2]; const lineNumberMatch = stackLine.match(/:(\d+):\d+\)$/); const lineNumber = lineNumberMatch ? lineNumberMatch[1] : 'unknown'; const event = { actionId: 'log-info', - key: `${query.name}, Line ${lineNumber - 2}`, + key: `${query.name}${isFromTransformation && ', transformation'}, line ${lineNumber - 2}`, description: log, eventType: 'customLog', query, @@ -1119,15 +1119,15 @@ export const createEventsSlice = (set, get) => ({ return executeAction(event, mode, {}); }; - const logError = (log) => { + const logError = (log, isFromTransformation = false) => { const query = dataQuery.queries.modules['canvas'].find((query) => query.id == queryId); const error = new Error(); - const stackLine = error.stack.split('\n')[2]; + const stackLine = error.stack.split('\n')[isFromTransformation ? 3 : 2]; const lineNumberMatch = stackLine.match(/:(\d+):\d+\)$/); const lineNumber = lineNumberMatch ? lineNumberMatch[1] : 'unknown'; const event = { actionId: 'log-error', - key: `${query.name}, Line ${lineNumber - 2}`, + key: `${query.name}${isFromTransformation && ', transformation'}, line ${lineNumber - 2}`, description: log, eventType: 'customLog', query, @@ -1135,15 +1135,15 @@ export const createEventsSlice = (set, get) => ({ return executeAction(event, mode, {}); }; - const log = (log) => { + const log = (log, isFromTransformation = false) => { const query = dataQuery.queries.modules['canvas'].find((query) => query.id == queryId); const error = new Error(); - const stackLine = error.stack.split('\n')[2]; + const stackLine = error.stack.split('\n')[isFromTransformation ? 3 : 2]; const lineNumberMatch = stackLine.match(/:(\d+):\d+\)$/); const lineNumber = lineNumberMatch ? lineNumberMatch[1] : 'unknown'; const event = { actionId: 'log', - key: `${query.name}, Line ${lineNumber - 2}`, + key: `${query.name}${isFromTransformation && ', transformation'}, line ${lineNumber - 2}`, description: log, eventType: 'customLog', query, diff --git a/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js b/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js index ab29ed5b39..d2f3bc4dff 100644 --- a/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js +++ b/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js @@ -787,9 +787,15 @@ export const createQueryPanelSlice = (set, get) => ({ proxiedPage, proxiedConstants, { - logError: actions.logError, - logInfo: actions.logInfo, - log: actions.log, + logError: function (log) { + return actions.logError.call(actions, log, true); + }, + logInfo: function (log) { + return actions.logInfo.call(actions, log, true); + }, + log: function (log) { + return actions.log.call(actions, log, true); + }, } ); } catch (err) {