Reduce frequency of column formatter invocation by caching formatted display values into rows
This commit is contained in:
parent
d37fedaae7
commit
12f9d7efb6
|
@ -115,12 +115,10 @@
|
|||
}
|
||||
|
||||
const createFormatter = column => {
|
||||
if (!column.format?.length) {
|
||||
if (typeof column.format !== "string" || !column.format.trim().length) {
|
||||
return null
|
||||
}
|
||||
return row => {
|
||||
return processStringSync(column.format, { [id]: row })
|
||||
}
|
||||
return row => processStringSync(column.format, { [id]: row })
|
||||
}
|
||||
|
||||
const enrichButtons = buttons => {
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
// Get the appropriate cell renderer and value
|
||||
$: hasCustomFormat = column.format && !row._isNewRow
|
||||
$: renderer = hasCustomFormat ? TextCell : getCellRenderer(column)
|
||||
$: value = hasCustomFormat ? column.format(row) : row[column.name]
|
||||
$: value = hasCustomFormat ? row.__formatted?.[column.name] : row[column.name]
|
||||
|
||||
// Get the error for this cell if the cell is focused or selected
|
||||
$: error = getErrorStore(rowFocused, cellId)
|
||||
|
|
|
@ -16,6 +16,7 @@ import { Store as StoreContext } from "."
|
|||
|
||||
interface IndexedUIRow extends UIRow {
|
||||
__idx: number
|
||||
__formatted: Record<string, any>
|
||||
}
|
||||
|
||||
interface RowStore {
|
||||
|
@ -114,26 +115,44 @@ export const createStores = (): RowStore => {
|
|||
export const deriveStores = (context: StoreContext): RowDerivedStore => {
|
||||
const { rows, enrichedSchema } = context
|
||||
|
||||
// Enrich rows with an index property and any pending changes
|
||||
// Enrich rows with an index property and additional values
|
||||
const enrichedRows = derived(
|
||||
[rows, enrichedSchema],
|
||||
([$rows, $enrichedSchema]) => {
|
||||
const customColumns = Object.values($enrichedSchema || {}).filter(
|
||||
f => f.related
|
||||
)
|
||||
return $rows.map<IndexedUIRow>((row, idx) => ({
|
||||
...row,
|
||||
__idx: idx,
|
||||
...customColumns.reduce<Record<string, string>>((map, column) => {
|
||||
const fromField = $enrichedSchema![column.related!.field]
|
||||
map[column.name] = getRelatedTableValues(
|
||||
row,
|
||||
{ ...column, related: column.related! },
|
||||
fromField
|
||||
)
|
||||
return map
|
||||
}, {}),
|
||||
}))
|
||||
// Find columns which require additional processing
|
||||
const cols = Object.values($enrichedSchema || {})
|
||||
const relatedColumns = cols.filter(col => col.related)
|
||||
const formattedColumns = cols.filter(col => col.format)
|
||||
|
||||
return $rows.map<IndexedUIRow>((row, idx) => {
|
||||
// Derive any values that need enriched from related rows
|
||||
const relatedValues = relatedColumns.reduce<Record<string, string>>(
|
||||
(map, column) => {
|
||||
const fromField = $enrichedSchema![column.related!.field]
|
||||
map[column.name] = getRelatedTableValues(
|
||||
row,
|
||||
{ ...column, related: column.related! },
|
||||
fromField
|
||||
)
|
||||
return map
|
||||
},
|
||||
{}
|
||||
)
|
||||
// Derive any display-only formatted values for this row
|
||||
const formattedValues = formattedColumns.reduce<Record<string, any>>(
|
||||
(map, column) => {
|
||||
map[column.name] = column.format!(row)
|
||||
return map
|
||||
},
|
||||
{}
|
||||
)
|
||||
return {
|
||||
...row,
|
||||
...relatedValues,
|
||||
__formatted: formattedValues,
|
||||
__idx: idx,
|
||||
}
|
||||
})
|
||||
}
|
||||
)
|
||||
|
||||
|
@ -791,6 +810,7 @@ export const createActions = (context: StoreContext): RowActionStore => {
|
|||
let clone: Row = { ...row }
|
||||
delete clone.__idx
|
||||
delete clone.__metadata
|
||||
delete clone.__formatted
|
||||
if (!get(hasBudibaseIdentifiers) && isGeneratedRowID(clone._id!)) {
|
||||
delete clone._id
|
||||
}
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
import { CalculationType, FieldSchema, FieldType } from "@budibase/types"
|
||||
import { CalculationType, FieldSchema, FieldType, UIRow } from "@budibase/types"
|
||||
|
||||
export type UIColumn = FieldSchema & {
|
||||
label: string
|
||||
readonly: boolean
|
||||
conditions: any
|
||||
format?: () => any
|
||||
format?: (row: UIRow) => any
|
||||
related?: {
|
||||
field: string
|
||||
subField: string
|
||||
|
|
|
@ -5,6 +5,7 @@ import {
|
|||
RelationSchemaField,
|
||||
SortOrder,
|
||||
Table,
|
||||
UIRow,
|
||||
UISearchFilter,
|
||||
} from "@budibase/types"
|
||||
|
||||
|
@ -24,9 +25,10 @@ export interface UITable extends Table {
|
|||
export type UIFieldSchema = FieldSchema &
|
||||
BasicViewFieldMetadata & {
|
||||
related?: { field: string; subField: string }
|
||||
columns?: Record<string, UIRelationSchemaField>
|
||||
columns?: Record<string, UIRelationSchFemaField>
|
||||
cellRenderType?: string
|
||||
disabled?: boolean
|
||||
format?: (row: UIRow) => any
|
||||
}
|
||||
|
||||
interface UIRelationSchemaField extends RelationSchemaField {
|
||||
|
|
Loading…
Reference in New Issue