MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into BUDI-8279/prevent-changing-date-or-time-only-when-fetched

This commit is contained in:
Adria Navarro 2024-05-23 13:00:27 +02:00 committed by GitHub
parent 028afd9cca 366dc26be9
commit c7a4179c40
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/bbui/src/helpers.js
View File

@ -168,7 +168,11 @@ export const stringifyDate = (
// Ensure we use the correct offset for the date // Ensure we use the correct offset for the date
const referenceDate = value.toDate() const referenceDate = value.toDate()
const offset = referenceDate.getTimezoneOffset() * 60000 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 // For date-only fields, construct a manual timestamp string without a time

4
packages/server/src/sdk/app/rows/utils.ts
View File

@ -205,6 +205,10 @@ export async function validate({
} catch (err) { } catch (err) {
errors[fieldName] = [`Contains invalid JSON`] 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 { } else {
res = validateJs.single(row[fieldName], constraints) res = validateJs.single(row[fieldName], constraints)
} }