CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-07-02 13:01:09 +12:00
Code Issues Projects Releases Wiki Activity

bugfix: datetime fields usable

Browse source
This commit is contained in:
Michael Shanks 2020-03-29 07:28:44 +01:00
parent dfe797015b
commit 90b3ca54e0
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
packages/core/src/types/datetime.js
View file

@ -6,7 +6,7 @@ import {
parsedSuccess,
getDefaultExport,
} from "./typeHelpers"
import { switchCase, defaultCase, toDateOrNull } from "../common"
import { switchCase, defaultCase, toDateOrNull, isNonEmptyArray } from "../common"
const dateFunctions = typeFunctions({
default: constant(null),
@ -21,23 +21,32 @@ const parseStringToDate = s =>
[defaultCase, parsedFailed]
)(new Date(s))
const isNullOrEmpty = d =>
isNull(d)
|| (d || "").toString() === ""
const isDateOrEmpty = d =>
isDate(d)
|| isNullOrEmpty(d)
const dateTryParse = switchCase(
[isDate, parsedSuccess],
[isDateOrEmpty, parsedSuccess],
[isString, parseStringToDate],
[isNull, parsedSuccess],
[defaultCase, parsedFailed]
)
const options = {
maxValue: {
defaultValue: new Date(32503680000000),
isValid: isDate,
defaultValue: null,
//defaultValue: new Date(32503680000000),
isValid: isDateOrEmpty,
requirementDescription: "must be a valid date",
parse: toDateOrNull,
},
minValue: {
defaultValue: new Date(-8520336000000),
isValid: isDate,
defaultValue: null,
//defaultValue: new Date(-8520336000000),
isValid: isDateOrEmpty,
requirementDescription: "must be a valid date",
parse: toDateOrNull,
},
@ -46,7 +55,7 @@ const options = {
const typeConstraints = [
makerule(
async (val, opts) =>
val === null || opts.minValue === null || val >= opts.minValue,
val === null || isNullOrEmpty(opts.minValue) || val >= opts.minValue,
(val, opts) =>
`value (${val.toString()}) must be greater than or equal to ${
opts.minValue
@ -54,7 +63,7 @@ const typeConstraints = [
),
makerule(
async (val, opts) =>
val === null || opts.maxValue === null || val <= opts.maxValue,
val === null || isNullOrEmpty(opts.maxValue) || val <= opts.maxValue,
(val, opts) =>
`value (${val.toString()}) must be less than or equal to ${
opts.minValue

4
packages/core/test/templateApi.heirarchyValidation.spec.js
View file

@ -331,7 +331,7 @@ describe("hierarchy validation", () => {
let validationResult = validateAll(hierarchy.root)
expectInvalidField(validationResult, "typeOptions.maxValue", invalidField)
invalidField.typeOptions.maxValue = null
invalidField.typeOptions.maxValue = "hello"
validationResult = validateAll(hierarchy.root)
expectInvalidField(validationResult, "typeOptions.maxValue", invalidField)
})
@ -343,7 +343,7 @@ describe("hierarchy validation", () => {
let validationResult = validateAll(hierarchy.root)
expectInvalidField(validationResult, "typeOptions.minValue", invalidField)
invalidField.typeOptions.minValue = null
invalidField.typeOptions.minValue = "hello"
validationResult = validateAll(hierarchy.root)
expectInvalidField(validationResult, "typeOptions.minValue", invalidField)
})