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

Merge pull request #5369 from Budibase/fix-query-block-search 

Fixes for custom queries
This commit is contained in:
Andrew Kingston 2022-04-13 14:13:46 +01:00 committed by GitHub
parent 0197b96be4 cb90b872f5
commit 5e19a93726
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
View File

@ -52,7 +52,6 @@
.map(query => ({ .map(query => ({
label: query.name, label: query.name,
name: query.name, name: query.name,
tableId: query._id,
...query, ...query,
type: "query", type: "query",
})) }))

6
packages/builder/src/components/design/PropertiesPanel/PropertyControls/SearchFieldSelect.svelte
View File

@ -15,16 +15,14 @@
const dispatch = createEventDispatcher() const dispatch = createEventDispatcher()
$: datasource = getDatasourceForProvider($currentAsset, componentInstance) $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
$: schema = getSchemaForDatasource($currentAsset, datasource, { $: schema = getSchemaForDatasource($currentAsset, datasource).schema
searchableSchema: true,
}).schema
$: options = getOptions(datasource, schema || {}) $: options = getOptions(datasource, schema || {})
$: boundValue = getSelectedOption(value, options) $: boundValue = getSelectedOption(value, options)
function getOptions(ds, dsSchema) { function getOptions(ds, dsSchema) {
let base = Object.values(dsSchema) let base = Object.values(dsSchema)
if (!ds?.tableId) { if (!ds?.tableId) {
return base return base.map(field => field.name)
} }
const currentTable = $tables.list.find(table => table._id === ds.tableId) const currentTable = $tables.list.find(table => table._id === ds.tableId)
return getFields(base, { allowLinks: currentTable?.sql }).map( return getFields(base, { allowLinks: currentTable?.sql }).map(

2
packages/client/src/components/app/forms/Form.svelte
View File

@ -80,7 +80,7 @@
} }
const fetchTable = async dataSource => { const fetchTable = async dataSource => {
if (dataSource?.tableId) { if (dataSource?.tableId && dataSource?.type !== "query") {
try { try {
table = await API.fetchTableDefinition(dataSource.tableId) table = await API.fetchTableDefinition(dataSource.tableId)
} catch (error) { } catch (error) {