Merge master.
This commit is contained in:
commit
621135bf7e
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"version": "2.22.15",
|
"version": "2.22.16",
|
||||||
"npmClient": "yarn",
|
"npmClient": "yarn",
|
||||||
"packages": [
|
"packages": [
|
||||||
"packages/*",
|
"packages/*",
|
||||||
|
|
|
@ -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}`,
|
||||||
|
|
|
@ -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) {
|
||||||
|
|
Loading…
Reference in New Issue