Merge branch 'master' of github.com:Budibase/budibase into grid-ux-improvements

This commit is contained in:
Andrew Kingston 2024-05-23 14:08:27 +01:00
commit a9d9c170ce
2 changed files with 9 additions and 1 deletions

View File

@ -168,7 +168,11 @@ export const stringifyDate = (
// Ensure we use the correct offset for the date
const referenceDate = value.toDate()
const offset = referenceDate.getTimezoneOffset() * 60000
return new Date(value.valueOf() - offset).toISOString().slice(0, -1)
const date = new Date(value.valueOf() - offset)
if (timeOnly) {
return date.toISOString().slice(11, 19)
}
return date.toISOString().slice(0, -1)
}
// For date-only fields, construct a manual timestamp string without a time

View File

@ -205,6 +205,10 @@ export async function validate({
} catch (err) {
errors[fieldName] = [`Contains invalid JSON`]
}
} else if (type === FieldType.DATETIME && column.timeOnly) {
if (row[fieldName] && !row[fieldName].match(/^(\d+)(:[0-5]\d){1,2}$/)) {
errors[fieldName] = [`${fieldName} is not a valid time`]
}
} else {
res = validateJs.single(row[fieldName], constraints)
}