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

Merge branch 'develop' into fix/BUDI-7084

This commit is contained in:
Michael Drury 2023-09-29 15:20:04 +01:00 committed by GitHub
parent c498f39f2a ade8b8eec8
commit 47775aa824
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.10.16-alpha.13", "version": "2.10.16-alpha.15",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

4
packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
View File

@ -85,7 +85,7 @@
} }
let relationshipMap = { let relationshipMap = {
[RelationshipType.MANY_TO_ONE]: { [RelationshipType.ONE_TO_MANY]: {
part1: PrettyRelationshipDefinitions.MANY, part1: PrettyRelationshipDefinitions.MANY,
part2: PrettyRelationshipDefinitions.ONE, part2: PrettyRelationshipDefinitions.ONE,
}, },
@ -93,7 +93,7 @@
part1: PrettyRelationshipDefinitions.MANY, part1: PrettyRelationshipDefinitions.MANY,
part2: PrettyRelationshipDefinitions.MANY, part2: PrettyRelationshipDefinitions.MANY,
}, },
[RelationshipType.ONE_TO_MANY]: { [RelationshipType.MANY_TO_ONE]: {
part1: PrettyRelationshipDefinitions.ONE, part1: PrettyRelationshipDefinitions.ONE,
part2: PrettyRelationshipDefinitions.MANY, part2: PrettyRelationshipDefinitions.MANY,
}, },

6
packages/client/src/components/app/forms/RelationshipField.svelte
View File

@ -60,6 +60,12 @@
// even if they are not in the inital fetch results // even if they are not in the inital fetch results
initialValuesProcessed = true initialValuesProcessed = true
optionsObj = (fieldState?.value || []).reduce((accumulator, value) => { optionsObj = (fieldState?.value || []).reduce((accumulator, value) => {
// fieldState has to be an array of strings to be valid for an update
// therefore we cannot guarantee value will be an object
// https://linear.app/budibase/issue/BUDI-7577/refactor-the-relationshipfield-component-to-have-better-support-for
if (!value._id) {
return accumulator
}
accumulator[value._id] = { accumulator[value._id] = {
_id: value._id, _id: value._id,
[primaryDisplay]: value.primaryDisplay, [primaryDisplay]: value.primaryDisplay,