CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-09-28 15:21:28 +12:00
Code Issues Projects Releases Wiki Activity

Format strings

Browse source
This commit is contained in:
Adria Navarro 2024-09-25 17:42:21 +02:00
parent 58a51207f3
commit cbd82bcf6a
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/frontend-core/src/components/grid/stores/rows.js
View file

@ -56,11 +56,11 @@ export const deriveStores = context => {
...row,
__idx: idx,
...customColumns.reduce((acc, c) => {
const isSingle =
const fromSingle =
$enrichedSchema[c.related.field].relationshipType ===
RelationshipType.ONE_TO_MANY
acc[c.name] = getRelatedTableValues(row, c, isSingle)
acc[c.name] = getRelatedTableValues(row, c, fromSingle)
return acc
}, {}),
}))

17
packages/frontend-core/src/utils/relatedColumns.js
View file

@ -61,10 +61,10 @@ export function enrichSchemaWithRelColumns(schema) {
return result
}
export function getRelatedTableValues(row, field, isSingle) {
export function getRelatedTableValues(row, field, fromSingle) {
let result = ""
try {
if (isSingle) {
if (fromSingle) {
result = row[field.related.field]?.[0]?.[field.related.subField]
} else {
const parser =
@ -75,7 +75,18 @@ export function getRelatedTableValues(row, field, isSingle) {
parser(r[field.related.subField], field)
)
)
).join(", ")
)
if (
[
FieldType.STRING,
FieldType.NUMBER,
FieldType.BIGINT,
FieldType.BOOLEAN,
].includes(field.type)
) {
result = result.join(", ")
}
}
} catch (e) {
result = "Not rendable"