From 6a2b76c5b22ce984b956053a8e90a7a7aae35efd Mon Sep 17 00:00:00 2001 From: Nakul Nagargade Date: Tue, 19 Nov 2024 12:10:33 +0530 Subject: [PATCH 1/5] Fix request, response, responseHeaders from resolved query not being part of dependency graph --- frontend/src/AppBuilder/_stores/slices/resolvedSlice.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/AppBuilder/_stores/slices/resolvedSlice.js b/frontend/src/AppBuilder/_stores/slices/resolvedSlice.js index 4c29226864..063fa026b0 100644 --- a/frontend/src/AppBuilder/_stores/slices/resolvedSlice.js +++ b/frontend/src/AppBuilder/_stores/slices/resolvedSlice.js @@ -183,7 +183,7 @@ export const createResolvedSlice = (set, get) => ({ ); Object.entries(details).forEach(([key, value]) => { - if (['isLoading', 'data', 'rawData'].includes(key)) { + if (['isLoading', 'data', 'rawData', 'request', 'response', 'responseHeaders'].includes(key)) { if (typeof value !== 'function') get().updateDependencyValues(`queries.${queryId}.${key}`); } }); From 8a3f89a19c8fff310f3be646d0fa290eb91e0f54 Mon Sep 17 00:00:00 2001 From: Nakul Nagargade Date: Tue, 19 Nov 2024 16:55:47 +0530 Subject: [PATCH 2/5] Add request, response,responseHeaders outside of metadata --- frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js | 5 ++++- frontend/src/AppBuilder/_stores/slices/resolvedSlice.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js b/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js index 5e96052f6f..eaae513bb7 100644 --- a/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js +++ b/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js @@ -441,7 +441,10 @@ export const createQueryPanelSlice = (set, get) => ({ isLoading: false, data: finalData, rawData, - metadata: data.metadata, + metadata: data?.metadata, + request: data?.request, + response: data?.response, + responseHeaders: data?.responseHeaders, }); resolve({ status: 'ok', data: finalData }); diff --git a/frontend/src/AppBuilder/_stores/slices/resolvedSlice.js b/frontend/src/AppBuilder/_stores/slices/resolvedSlice.js index 063fa026b0..dc6eb9cecc 100644 --- a/frontend/src/AppBuilder/_stores/slices/resolvedSlice.js +++ b/frontend/src/AppBuilder/_stores/slices/resolvedSlice.js @@ -183,7 +183,7 @@ export const createResolvedSlice = (set, get) => ({ ); Object.entries(details).forEach(([key, value]) => { - if (['isLoading', 'data', 'rawData', 'request', 'response', 'responseHeaders'].includes(key)) { + if (['isLoading', 'data', 'rawData', 'request', 'response', 'responseHeaders', 'metadata'].includes(key)) { if (typeof value !== 'function') get().updateDependencyValues(`queries.${queryId}.${key}`); } }); From 1cebfe039a4bd7746693c3d70fbcf4f7485b630c Mon Sep 17 00:00:00 2001 From: Nakul Nagargade Date: Tue, 19 Nov 2024 17:50:31 +0530 Subject: [PATCH 3/5] fix --- frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js b/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js index eaae513bb7..c989df9051 100644 --- a/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js +++ b/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js @@ -442,9 +442,8 @@ export const createQueryPanelSlice = (set, get) => ({ data: finalData, rawData, metadata: data?.metadata, - request: data?.request, - response: data?.response, - responseHeaders: data?.responseHeaders, + request: data?.metadata?.request, + response: data?.metadata?.response, }); resolve({ status: 'ok', data: finalData }); From 994e1a8c2fae9853e41f68205ab01b5008184e6f Mon Sep 17 00:00:00 2001 From: Nakul Nagargade Date: Thu, 21 Nov 2024 10:56:20 +0530 Subject: [PATCH 4/5] Add support for CSA setValue in codeeditor widget --- .../AppBuilder/WidgetManager/widgets/codeEditor.js | 7 +++++++ frontend/src/Editor/Components/CodeEditor.jsx | 12 +++++++++++- server/src/helpers/widget-config/codeEditor.js | 7 +++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/frontend/src/AppBuilder/WidgetManager/widgets/codeEditor.js b/frontend/src/AppBuilder/WidgetManager/widgets/codeEditor.js index d7ff03d9a8..eb76891af0 100644 --- a/frontend/src/AppBuilder/WidgetManager/widgets/codeEditor.js +++ b/frontend/src/AppBuilder/WidgetManager/widgets/codeEditor.js @@ -67,6 +67,13 @@ export const codeEditorConfig = { exposedVariables: { value: '', }, + actions: [ + { + handle: 'setValue', + displayName: 'Set value', + params: [{ handle: 'setValue', defaultValue: '' }], + }, + ], definition: { others: { showOnDesktop: { value: '{{true}}' }, diff --git a/frontend/src/Editor/Components/CodeEditor.jsx b/frontend/src/Editor/Components/CodeEditor.jsx index 50038c0645..e12e4f10ff 100644 --- a/frontend/src/Editor/Components/CodeEditor.jsx +++ b/frontend/src/Editor/Components/CodeEditor.jsx @@ -1,5 +1,5 @@ /* eslint-disable import/no-unresolved */ -import React, { useState } from 'react'; +import React, { useState, useEffect } from 'react'; import CodeMirror from '@uiw/react-codemirror'; import { okaidia } from '@uiw/codemirror-theme-okaidia'; import { githubLight } from '@uiw/codemirror-theme-github'; @@ -51,6 +51,16 @@ export const CodeEditor = ({ id, height, darkMode, properties, styles, setExpose return height || 'auto'; }, [height]); + useEffect(() => { + const _setValue = (value) => { + if (typeof value === 'string') { + codeChanged(value); + } + }; + setExposedVariable('setValue', _setValue); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []); + return (
Date: Thu, 21 Nov 2024 11:23:25 +0530 Subject: [PATCH 5/5] Bump version --- .version | 2 +- frontend/.version | 2 +- server/.version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.version b/.version index 99ba0ddace..09ce5a7d5a 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -3.0.2-ce-lts +3.0.3-ce-lts diff --git a/frontend/.version b/frontend/.version index 99ba0ddace..09ce5a7d5a 100644 --- a/frontend/.version +++ b/frontend/.version @@ -1 +1 @@ -3.0.2-ce-lts +3.0.3-ce-lts diff --git a/server/.version b/server/.version index 99ba0ddace..09ce5a7d5a 100644 --- a/server/.version +++ b/server/.version @@ -1 +1 @@ -3.0.2-ce-lts +3.0.3-ce-lts