e6fea1d132
The `localized` properly was not stripped out of referenced block fields, if any parent was localized. For normal fields, this is done in sanitizeConfig. As the same referenced block config can be used in both a localized and non-localized config, we are not able to strip it out inside sanitizeConfig by modifying the block config. Instead, this PR had to bring back tedious logic to handle it everywhere the `field.localized` property is accessed. For backwards-compatibility, we need to keep the existing sanitizeConfig logic. In 4.0, we should remove it to benefit from better test coverage of runtime field.localized handling - for now, this is done for our test suite using the `PAYLOAD_DO_NOT_SANITIZE_LOCALIZED_PROPERTY` flag.
124 lines
3.0 KiB
TypeScript
124 lines
3.0 KiB
TypeScript
import type { FlattenedArrayField } from 'payload'
|
|
|
|
import { fieldShouldBeLocalized } from 'payload/shared'
|
|
|
|
import type { DrizzleAdapter } from '../../types.js'
|
|
import type { ArrayRowToInsert, BlockRowToInsert, RelationshipToDelete } from './types.js'
|
|
|
|
import { isArrayOfRows } from '../../utilities/isArrayOfRows.js'
|
|
import { traverseFields } from './traverseFields.js'
|
|
|
|
type Args = {
|
|
adapter: DrizzleAdapter
|
|
arrayTableName: string
|
|
baseTableName: string
|
|
blocks: {
|
|
[blockType: string]: BlockRowToInsert[]
|
|
}
|
|
blocksToDelete: Set<string>
|
|
data: unknown
|
|
field: FlattenedArrayField
|
|
locale?: string
|
|
numbers: Record<string, unknown>[]
|
|
parentIsLocalized: boolean
|
|
path: string
|
|
relationships: Record<string, unknown>[]
|
|
relationshipsToDelete: RelationshipToDelete[]
|
|
selects: {
|
|
[tableName: string]: Record<string, unknown>[]
|
|
}
|
|
texts: Record<string, unknown>[]
|
|
/**
|
|
* Set to a locale code if this set of fields is traversed within a
|
|
* localized array or block field
|
|
*/
|
|
withinArrayOrBlockLocale?: string
|
|
}
|
|
|
|
export const transformArray = ({
|
|
adapter,
|
|
arrayTableName,
|
|
baseTableName,
|
|
blocks,
|
|
blocksToDelete,
|
|
data,
|
|
field,
|
|
locale,
|
|
numbers,
|
|
parentIsLocalized,
|
|
path,
|
|
relationships,
|
|
relationshipsToDelete,
|
|
selects,
|
|
texts,
|
|
withinArrayOrBlockLocale,
|
|
}: Args) => {
|
|
const newRows: ArrayRowToInsert[] = []
|
|
|
|
const hasUUID = adapter.tables[arrayTableName]._uuid
|
|
|
|
if (isArrayOfRows(data)) {
|
|
data.forEach((arrayRow, i) => {
|
|
const newRow: ArrayRowToInsert = {
|
|
arrays: {},
|
|
locales: {},
|
|
row: {
|
|
_order: i + 1,
|
|
},
|
|
}
|
|
|
|
// If we have declared a _uuid field on arrays,
|
|
// that means the ID has to be unique,
|
|
// and our ids within arrays are not unique.
|
|
// So move the ID to a uuid field for storage
|
|
// and allow the database to generate a serial id automatically
|
|
if (hasUUID) {
|
|
newRow.row._uuid = arrayRow.id
|
|
delete arrayRow.id
|
|
}
|
|
|
|
if (locale) {
|
|
newRow.locales[locale] = {
|
|
_locale: locale,
|
|
}
|
|
}
|
|
|
|
if (fieldShouldBeLocalized({ field, parentIsLocalized }) && locale) {
|
|
newRow.row._locale = locale
|
|
}
|
|
|
|
if (withinArrayOrBlockLocale) {
|
|
newRow.row._locale = withinArrayOrBlockLocale
|
|
}
|
|
|
|
traverseFields({
|
|
adapter,
|
|
arrays: newRow.arrays,
|
|
baseTableName,
|
|
blocks,
|
|
blocksToDelete,
|
|
columnPrefix: '',
|
|
data: arrayRow,
|
|
fieldPrefix: '',
|
|
fields: field.flattenedFields,
|
|
insideArrayOrBlock: true,
|
|
locales: newRow.locales,
|
|
numbers,
|
|
parentIsLocalized: parentIsLocalized || field.localized,
|
|
parentTableName: arrayTableName,
|
|
path: `${path || ''}${field.name}.${i}.`,
|
|
relationships,
|
|
relationshipsToDelete,
|
|
row: newRow.row,
|
|
selects,
|
|
texts,
|
|
withinArrayOrBlockLocale,
|
|
})
|
|
|
|
newRows.push(newRow)
|
|
})
|
|
}
|
|
|
|
return newRows
|
|
}
|