Merge master.

This commit is contained in:
Sam Rose 2024-04-04 15:28:50 +01:00
commit 621135bf7e
No known key found for this signature in database
3 changed files with 6 additions and 3 deletions

View File

@ -1,5 +1,5 @@
{ {
"version": "2.22.15", "version": "2.22.16",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*", "packages/*",

View File

@ -49,7 +49,10 @@
label: "Long Form Text", label: "Long Form Text",
value: FIELDS.LONGFORM.type, value: FIELDS.LONGFORM.type,
}, },
{
label: "Attachment",
value: FIELDS.ATTACHMENT.type,
},
{ {
label: "User", label: "User",
value: `${FIELDS.USER.type}${FIELDS.USER.subtype}`, value: `${FIELDS.USER.type}${FIELDS.USER.subtype}`,

View File

@ -54,7 +54,7 @@ export function validate(rows: Rows, schema: TableSchema): ValidationResults {
type: columnType, type: columnType,
subtype: columnSubtype, subtype: columnSubtype,
autocolumn: isAutoColumn, autocolumn: isAutoColumn,
} = schema[columnName] } = schema[columnName] || {}
// If the column had an invalid value we don't want to override it // If the column had an invalid value we don't want to override it
if (results.schemaValidation[columnName] === false) { if (results.schemaValidation[columnName] === false) {