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

Allowing formula fields to be display columns.

This commit is contained in:
mike12345567 2021-06-22 11:49:35 +01:00
parent bdf2d3f529
commit c531a02725
4 changed files with 1014 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,10 +72,7 @@
field.subtype !== AUTO_COLUMN_SUB_TYPES.CREATED_BY && field.subtype !== AUTO_COLUMN_SUB_TYPES.CREATED_BY &&
field.subtype !== AUTO_COLUMN_SUB_TYPES.UPDATED_BY && field.subtype !== AUTO_COLUMN_SUB_TYPES.UPDATED_BY &&
field.type !== FORMULA_TYPE field.type !== FORMULA_TYPE
$: canBeDisplay = $: canBeDisplay = field.type !== LINK_TYPE && field.type !== AUTO_TYPE
field.type !== LINK_TYPE &&
field.type !== AUTO_TYPE &&
field.type !== FORMULA_TYPE
$: canBeRequired = $: canBeRequired =
field.type !== LINK_TYPE && !uneditable && field.type !== AUTO_TYPE field.type !== LINK_TYPE && !uneditable && field.type !== AUTO_TYPE
$: relationshipOptions = getRelationshipOptions(field) $: relationshipOptions = getRelationshipOptions(field)

1011
packages/builder/yarn.lock
View File

File diff suppressed because it is too large Load Diff

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

@ -14,6 +14,7 @@ const { FieldTypes } = require("../../constants")
const { getMultiIDParams, USER_METDATA_PREFIX } = require("../../db/utils") const { getMultiIDParams, USER_METDATA_PREFIX } = require("../../db/utils")
const { partition } = require("lodash") const { partition } = require("lodash")
const { getGlobalUsers } = require("../../utilities/global") const { getGlobalUsers } = require("../../utilities/global")
const processor = require("../../utilities/rowProcessor")
/** /**
* This functionality makes sure that when rows with links are created, updated or deleted they are processed * This functionality makes sure that when rows with links are created, updated or deleted they are processed
@ -201,7 +202,9 @@ exports.attachFullLinkedDocs = async (appId, table, rows) => {
if (!linkedRow || !linkedTable) { if (!linkedRow || !linkedTable) {
continue continue
} }
row[link.fieldName].push(linkedRow) row[link.fieldName].push(
processor.processFormulas(linkedTable, linkedRow)
)
} }
} }
return rows return rows

7
packages/server/src/utilities/rowProcessor.js
View File

@ -127,6 +127,10 @@ function processAutoColumn(user, table, row) {
* Looks through the rows provided and finds formulas - which it then processes. * Looks through the rows provided and finds formulas - which it then processes.
*/ */
function processFormulas(table, rows) { function processFormulas(table, rows) {
const single = !Array.isArray(rows)
if (single) {
rows = [rows]
}
for (let [column, schema] of Object.entries(table.schema)) { for (let [column, schema] of Object.entries(table.schema)) {
if (schema.type !== FieldTypes.FORMULA) { if (schema.type !== FieldTypes.FORMULA) {
continue continue
@ -137,8 +141,9 @@ function processFormulas(table, rows) {
[column]: processStringSync(schema.formula, row), [column]: processStringSync(schema.formula, row),
})) }))
} }
return rows return single ? rows[0] : rows
} }
exports.processFormulas = processFormulas
/** /**
* This will coerce a value to the correct types based on the type transform map * This will coerce a value to the correct types based on the type transform map