CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-06-02 10:34:40 +12:00
Code Issues Projects Releases Wiki Activity

Update search component to work with new data bindings. Simplify manifest context entries for data bindings

Browse source
This commit is contained in:
Andrew Kingston 2021-03-29 16:37:17 +01:00
parent 88ae09a553
commit d26c20df31
2 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
packages/builder/src/builderStore/dataBinding.js
View file

@ -35,7 +35,7 @@ export const getDataProviderComponents = (asset, componentId) => {
// Filter by only data provider components
return path.filter(component => {
const def = store.actions.components.getDefinition(component._component)
return def?.dataContext != null
return def?.context != null
})
}
@ -113,32 +113,28 @@ const getContextBindings = (asset, componentId) => {
// Create bindings for each data provider
dataProviders.forEach(component => {
const def = store.actions.components.getDefinition(component._component)
const contextDefinition = def.dataContext
const contextDefinition = def.context
let schema
let readablePrefix
// Forms are an edge case which do not need table schemas
if (contextDefinition.type === "form") {
// Forms do not need table schemas
// Their schemas are built from their component field names
schema = buildFormSchema(component)
readablePrefix = "Fields"
} else if (contextDefinition.type === "static") {
// Static contexts are fully defined by the components
schema = {}
const values = contextDefinition.values || []
values.forEach(value => {
schema[value.key] = { name: value.label, type: "string" }
})
} else if (contextDefinition.type === "schema") {
let datasource
const setting = contextDefinition.dataProviderSetting
const settingValue = component[setting]
const providerId = extractLiteralHandlebarsID(settingValue)
const provider = findComponent(asset.props, providerId)
datasource = getDatasourceForProvider(asset, provider)
// Schema contexts are generated dynamically depending on their data
const datasource = getDatasourceForProvider(asset, component)
if (!datasource) {
return
}
// Get schema and table for the datasource
const info = getSchemaForDatasource(datasource)
schema = info.schema
readablePrefix = info.table?.name

19
packages/standard-components/manifest.json
View file

@ -61,9 +61,8 @@
"key": "filter"
}
],
"dataContext": {
"type": "schema",
"dataProviderSetting": "dataProvider"
"context": {
"type": "schema"
}
},
"search": {
@ -96,7 +95,10 @@
"key": "noRowsMessage",
"defaultValue": "No rows found."
}
]
],
"context": {
"type": "schema"
}
},
"stackedlist": {
"name": "Stacked List",
@ -1125,7 +1127,7 @@
"defaultValue": false
}
],
"dataContext": {
"context": {
"type": "form"
}
},
@ -1446,7 +1448,7 @@
"key": "limit"
}
],
"dataContext": {
"context": {
"type": "static",
"values": [
{
@ -1548,9 +1550,8 @@
"defaultValue": false
}
],
"dataContext": {
"type": "schema",
"dataProviderSetting": "dataProvider"
"context": {
"type": "schema"
}
}
}