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

Fix data binding not generating bindable properties for components referencing a data provider ID wrapped for handlebars

This commit is contained in:
Andrew Kingston 2021-03-22 17:57:19 +00:00
parent a3d57b3f82
commit 2d6bc0c998
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/builder/src/builderStore/dataBinding.js
View File

@ -74,13 +74,9 @@ export const getDatasourceForProvider = (asset, component) => {
}) })
if (dataProviderSetting) { if (dataProviderSetting) {
const settingValue = component[dataProviderSetting.key] const settingValue = component[dataProviderSetting.key]
const providerId = settingValue?.match(/{{\s*literal\s+(\S+)\s*}}/)[1] const providerId = extractLiteralHandlebarsID(settingValue)
if (providerId) { const provider = findComponent(asset.props, providerId)
const provider = findComponent(asset.props, providerId) return getDatasourceForProvider(asset, provider)
return getDatasourceForProvider(asset, provider)
} else {
return null
}
} }
// Extract datasource from component instance // Extract datasource from component instance
@ -135,11 +131,9 @@ const getContextBindings = (asset, componentId) => {
let datasource let datasource
const setting = contextDefinition.dataProviderSetting const setting = contextDefinition.dataProviderSetting
const settingValue = component[setting] const settingValue = component[setting]
if (settingValue) { const providerId = extractLiteralHandlebarsID(settingValue)
const providerId = settingValue.match(/{{\s*literal\s+(\S+)\s*}}/)[1] const provider = findComponent(asset.props, providerId)
const provider = findComponent(asset.props, providerId) datasource = getDatasourceForProvider(asset, provider)
datasource = getDatasourceForProvider(asset, provider)
}
if (!datasource) { if (!datasource) {
return return
} }
@ -367,6 +361,17 @@ function bindingReplacement(bindableProperties, textWithBindings, convertTo) {
return result return result
} }
/**
* Extracts a component ID from a handlebars expression setting of
* {{ literal [componentId] }}
*/
function extractLiteralHandlebarsID(value) {
if (!value) {
return null
}
return value.match(/{{\s*literal[\s\[]+([a-fA-F0-9]+)[\s\]]*}}/)[1]
}
/** /**
* Converts a readable data binding into a runtime data binding * Converts a readable data binding into a runtime data binding
*/ */