CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-08-14 17:42:01 +12:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9829 from Budibase/fix/9602

Browse source 
Query schema - keep changes when running query again
This commit is contained in:
Michael Drury 2023-03-01 13:06:51 +00:00 committed by GitHub
commit f25fe7d5b8
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
packages/builder/src/components/integration/QueryViewer.svelte
View file

@ -35,6 +35,7 @@
let parameters let parameters
let data = [] let data = []
let saveId let saveId
let currentTab = "JSON"
$: datasource = $datasources.list.find(ds => ds._id === query.datasourceId) $: datasource = $datasources.list.find(ds => ds._id === query.datasourceId)
$: query.schema = fieldsToSchema(fields) $: query.schema = fieldsToSchema(fields)
@ -84,7 +85,16 @@
return return
} }
data = response.rows data = response.rows
// need to merge fields that already exist/might have changed
if (fields) {
for (let key of Object.keys(response.schema)) {
if (fields[key]) {
response.schema[key] = fields[key]
}
}
}
fields = response.schema fields = response.schema
currentTab = "JSON"
notifications.success("Query executed successfully") notifications.success("Query executed successfully")
} catch (error) { } catch (error) {
notifications.error(`Query Error: ${error.message}`) notifications.error(`Query Error: ${error.message}`)
@ -205,7 +215,7 @@
</Body> </Body>
<section class="viewer"> <section class="viewer">
{#if data} {#if data}
<Tabs selected="JSON"> <Tabs bind:selected={currentTab}>
<Tab title="JSON"> <Tab title="JSON">
<JSONPreview data={data[0]} minHeight="120" /> <JSONPreview data={data[0]} minHeight="120" />
</Tab> </Tab>