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

Code review refactoring

This commit is contained in:
Rory Powell 2021-10-18 11:58:42 +01:00
parent 956a826b8c
commit f2b4ba2fb2
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/builder/src/components/design/PropertiesPanel/PropertyControls/FormFieldSelect.svelte
View File

@ -21,15 +21,18 @@
$: schema = getSchemaForDatasource($currentAsset, datasource, true).schema $: schema = getSchemaForDatasource($currentAsset, datasource, true).schema
$: options = getOptions(schema, type, fieldTypes) $: options = getOptions(schema, type, fieldTypes)
const getOptions = (schema, type, fieldTypes) => { const getOptions = (schema, type) => {
let entries = Object.entries(schema ?? {}) let entries = Object.entries(schema ?? {})
// fallback to using only field/options fields let types = []
if (!fieldTypes) { if (type === "field/options") {
fieldTypes = [type] // allow options to be used on both options and string fields
types = [type, "field/string"]
} else {
types = [type]
} }
const types = fieldTypes.map(fieldType => fieldType.split("/")[1]) types = types.map(type => type.split("/")[1])
entries = entries.filter(entry => types.includes(entry[1].type)) entries = entries.filter(entry => types.includes(entry[1].type))
return entries.map(entry => entry[0]) return entries.map(entry => entry[0])