mirror of
https://github.com/ToolJet/ToolJet
synced 2026-05-23 17:08:34 +00:00
Merge pull request #11360 from ToolJet/fix-resolved-query-headers
Fix request, response, responseHeaders from resolved query not being part of dependency graph
This commit is contained in:
commit
eea5af776c
8 changed files with 32 additions and 6 deletions
2
.version
2
.version
|
|
@ -1 +1 @@
|
|||
3.0.2-ce-lts
|
||||
3.0.3-ce-lts
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
3.0.2-ce-lts
|
||||
3.0.3-ce-lts
|
||||
|
|
|
|||
|
|
@ -67,6 +67,13 @@ export const codeEditorConfig = {
|
|||
exposedVariables: {
|
||||
value: '',
|
||||
},
|
||||
actions: [
|
||||
{
|
||||
handle: 'setValue',
|
||||
displayName: 'Set value',
|
||||
params: [{ handle: 'setValue', defaultValue: '' }],
|
||||
},
|
||||
],
|
||||
definition: {
|
||||
others: {
|
||||
showOnDesktop: { value: '{{true}}' },
|
||||
|
|
|
|||
|
|
@ -441,7 +441,9 @@ export const createQueryPanelSlice = (set, get) => ({
|
|||
isLoading: false,
|
||||
data: finalData,
|
||||
rawData,
|
||||
metadata: data.metadata,
|
||||
metadata: data?.metadata,
|
||||
request: data?.metadata?.request,
|
||||
response: data?.metadata?.response,
|
||||
});
|
||||
|
||||
resolve({ status: 'ok', data: finalData });
|
||||
|
|
|
|||
|
|
@ -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', 'metadata'].includes(key)) {
|
||||
if (typeof value !== 'function') get().updateDependencyValues(`queries.${queryId}.${key}`);
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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 (
|
||||
<div data-disabled={disabledState} style={editorStyles} data-cy={dataCy}>
|
||||
<div
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
3.0.2-ce-lts
|
||||
3.0.3-ce-lts
|
||||
|
|
|
|||
|
|
@ -67,6 +67,13 @@ export const codeEditorConfig = {
|
|||
exposedVariables: {
|
||||
value: '',
|
||||
},
|
||||
actions: [
|
||||
{
|
||||
handle: 'setValue',
|
||||
displayName: 'Set value',
|
||||
params: [{ handle: 'setValue', defaultValue: '' }],
|
||||
},
|
||||
],
|
||||
definition: {
|
||||
others: {
|
||||
showOnDesktop: { value: '{{true}}' },
|
||||
|
|
|
|||
Loading…
Reference in a new issue