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

Review updates

This commit is contained in:
Dean 2022-11-21 17:07:00 +00:00
parent 92525e7785
commit da089a5b7b
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/builder/src/builderStore/store/frontend.js
View File

@ -481,27 +481,13 @@ export const getFrontendStore = () => {
return null
}
let dataSourceField = definition.settings.find(
// Flattened settings
const settings = getComponentSettings(componentName)
let dataSourceField = settings.find(
setting => setting.type == "dataSource" || setting.type == "table"
)
if (!dataSourceField) {
// Check other visible sections for datasource/table elements.
const sections = definition.settings.filter(
item => item?.section && item.visible
)
for (let section of sections) {
let sectionSourceField = section.settings.find(
setting => setting.type == "dataSource" || setting.type == "table"
)
if (sectionSourceField) {
dataSourceField = sectionSourceField
break
}
}
}
let defaultDatasource
if (dataSourceField) {
const _tables = get(tables)
@ -533,7 +519,6 @@ export const getFrontendStore = () => {
}
// Generate default props
const settings = getComponentSettings(componentName)
let props = { ...presetProps }
settings.forEach(setting => {
if (setting.defaultValue !== undefined) {
@ -543,7 +528,7 @@ export const getFrontendStore = () => {
// Set a default datasource
if (dataSourceField && defaultDatasource) {
props["dataSource"] = {
props[dataSourceField.key] = {
label: defaultDatasource.name,
tableId: defaultDatasource._id,
type: "table",