MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

do not make query execution a requirement

This commit is contained in:
Martin McKeaveney 2021-06-08 14:26:06 +01:00
parent 499583ff22
commit eeaca8fc82
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/builder/src/components/integration/QueryViewer.svelte
View File

@ -33,7 +33,7 @@
{ label: "Datetime", value: "DATETIME" }, { label: "Datetime", value: "DATETIME" },
] ]
$: datasource = $datasources.list.find(ds => ds._id === query.datasourceId) $: datasource = $datasources.list.find(ds => ds._id === query.datasourceId)
$: query.schema = fields.reduce( $: query.schema = fields.reduce(
(acc, next) => ({ (acc, next) => ({
...acc, ...acc,
@ -48,6 +48,8 @@
$: integrationInfo = $integrations[datasourceType] $: integrationInfo = $integrations[datasourceType]
$: queryConfig = integrationInfo?.query $: queryConfig = integrationInfo?.query
$: shouldShowQueryConfig = queryConfig && query.queryVerb $: shouldShowQueryConfig = queryConfig && query.queryVerb
$: readQuery = query.queryVerb === "read" || query.readable
$: queryInvalid = !query.name || (readQuery && data.length === 0)
function newField() { function newField() {
fields = [...fields, {}] fields = [...fields, {}]
@ -152,7 +154,7 @@
<ButtonGroup> <ButtonGroup>
<Button <Button
cta cta
disabled={data.length === 0 || !query.name} disabled={queryInvalid}
on:click={saveQuery} on:click={saveQuery}
> >
Save Query Save Query

2
packages/server/src/api/controllers/query.js
View File

@ -60,7 +60,7 @@ exports.save = async function (ctx) {
ctx.message = `Query ${query.name} saved successfully.` ctx.message = `Query ${query.name} saved successfully.`
} }
async function enrichQueryFields(fields, parameters) { async function enrichQueryFields(fields, parameters = {}) {
const enrichedQuery = {} const enrichedQuery = {}
// enrich the fields with dynamic parameters // enrich the fields with dynamic parameters