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

Fixing an issue that occurs when the table name and the primary display column are the same name.

This commit is contained in:
mike12345567 2021-09-03 14:49:56 +01:00
parent b14e085223
commit 2dd1e7f45e
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/api/rows.js
View File

@ -121,7 +121,7 @@ export const enrichRows = async (rows, tableId) => {
rows.forEach(row => { rows.forEach(row => {
for (let key of keys) { for (let key of keys) {
const type = schema[key].type const type = schema[key].type
if (type === "link") { if (type === "link" && Array.isArray(row[key])) {
// Enrich row a string join of relationship fields // Enrich row a string join of relationship fields
row[`${key}_text`] = row[`${key}_text`] =
row[key] row[key]

14
packages/server/src/db/linkedRows/index.js
View File

@ -203,19 +203,17 @@ exports.attachFullLinkedDocs = async (ctx, table, rows) => {
exports.squashLinksToPrimaryDisplay = async (appId, table, enriched) => { exports.squashLinksToPrimaryDisplay = async (appId, table, enriched) => {
const db = new CouchDB(appId) const db = new CouchDB(appId)
// will populate this as we find them // will populate this as we find them
const linkedTables = [] const linkedTables = [table]
for (let [column, schema] of Object.entries(table.schema)) { for (let row of enriched) {
if (schema.type !== FieldTypes.LINK) { // this only fetches the table if its not already in array
continue const rowTable = await getLinkedTable(db, row.tableId, linkedTables)
} for (let [column, schema] of Object.entries(rowTable.schema)) {
for (let row of enriched) { if (schema.type !== FieldTypes.LINK || !Array.isArray(row[column])) {
if (!row[column] || !row[column].length) {
continue continue
} }
const newLinks = [] const newLinks = []
for (let link of row[column]) { for (let link of row[column]) {
const linkTblId = link.tableId || getRelatedTableForField(table, column) const linkTblId = link.tableId || getRelatedTableForField(table, column)
// this only fetches the table if its not already in array
const linkedTable = await getLinkedTable(db, linkTblId, linkedTables) const linkedTable = await getLinkedTable(db, linkTblId, linkedTables)
const obj = { _id: link._id } const obj = { _id: link._id }
if (link[linkedTable.primaryDisplay]) { if (link[linkedTable.primaryDisplay]) {