Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1515,10 +1515,11 @@ def is_valid(
"""
:param element: The element we're trying to use form data in.
:param value: The form data value, which may be invalid.
:param dispatch_context: The context the element is being used in.
:return: Whether the value is valid or not for this element.
"""

if not value:
if value == "":
if element.required:
raise ValueError("The value is required")

Expand Down Expand Up @@ -1919,6 +1920,7 @@ def is_valid(

:param element: The choice element.
:param value: The choice value we want to validate.
:param dispatch_context: The context this element was dispatched with.
:return: The value if it is valid for this element.
"""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -515,12 +515,16 @@ def test_choice_element_import_export_formula(data_fixture):
"required,type,value,result",
[
(True, "integer", "", ValueError),
(True, "integer", 0, 0),
(True, "integer", 42, 42),
(True, "integer", -42, -42),
(True, "integer", 3.14, 3.14),
(True, "integer", "4.2", 4.2),
(True, "integer", "4,2", TypeError),
(True, "integer", "42", 42),
(True, "integer", "horse", TypeError),
(False, "integer", "", ""),
(True, "email", "", ValueError),
(True, "email", "foo@bar.com", "foo@bar.com"),
(True, "email", "foobar.com", ValueError),
(False, "email", "", ""),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "bug",
"message": "Resolved a validation bug in the data input element which considered '0' an invalid number.",
"issue_origin": "github",
"issue_number": null,
"domain": "builder",
"bullet_points": [],
"created_at": "2025-12-30"
}
5 changes: 2 additions & 3 deletions web-frontend/modules/builder/elementTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -1397,11 +1397,10 @@ export class InputTextElementType extends FormElementType {
return 'input_text'
}

isValid(element, value, applicationContext) {
if (!value) {
isValid(element, value) {
if (value == null) {
return !element.required
}

switch (element.validation_type) {
case 'integer':
return isNumeric(value)
Expand Down
16 changes: 14 additions & 2 deletions web-frontend/test/unit/builder/elementTypes.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -545,14 +545,26 @@ describe('elementTypes tests', () => {
})
test('InputTextElementType | required | no value.', () => {
const elementType = new InputTextElementType()
expect(elementType.isValid({ required: true }, '')).toBe(false)
expect(elementType.isValid({ required: true }, null)).toBe(false)
})
test('InputTextElementType | required | integer | valid value.', () => {
test('InputTextElementType | required | integer | valid positive value.', () => {
const elementType = new InputTextElementType()
expect(
elementType.isValid({ required: true, validation_type: 'integer' }, 42)
).toBe(true)
})
test('InputTextElementType | required | integer | valid negative value.', () => {
const elementType = new InputTextElementType()
expect(
elementType.isValid({ required: true, validation_type: 'integer' }, -42)
).toBe(true)
})
test('InputTextElementType | required | integer | zero value.', () => {
const elementType = new InputTextElementType()
expect(
elementType.isValid({ required: true, validation_type: 'integer' }, 0)
).toBe(true)
})
test('InputTextElementType | required | integer | invalid value.', () => {
const elementType = new InputTextElementType()
expect(
Expand Down
Loading