Skip to content

Commit 0dc6fc8

Browse files
authored
fix: clear possible bad input when setting an empty value (#4431)
1 parent 12e2672 commit 0dc6fc8

7 files changed

Lines changed: 258 additions & 63 deletions

File tree

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package com.vaadin.flow.component.datetimepicker;
2+
3+
import com.vaadin.flow.component.html.Div;
4+
import com.vaadin.flow.component.html.NativeButton;
5+
import com.vaadin.flow.router.Route;
6+
7+
@Route("vaadin-date-time-picker/clear-value")
8+
public class ClearValuePage extends Div {
9+
public static final String CLEAR_BUTTON = "clear-button";
10+
11+
public ClearValuePage() {
12+
DateTimePicker datePicker = new DateTimePicker();
13+
14+
NativeButton clearButton = new NativeButton("Clear value");
15+
clearButton.setId(CLEAR_BUTTON);
16+
clearButton.addClickListener(event -> datePicker.clear());
17+
18+
add(datePicker, clearButton);
19+
}
20+
}

‎vaadin-date-time-picker-flow-parent/vaadin-date-time-picker-flow-integration-tests/src/main/java/com/vaadin/flow/component/datetimepicker/validation/BasicValidationPage.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public class BasicValidationPage
1212
public static final String REQUIRED_BUTTON = "required-button";
1313
public static final String MIN_INPUT = "min-input";
1414
public static final String MAX_INPUT = "max-input";
15+
public static final String CLEAR_VALUE_BUTTON = "clear-value-button";
1516

1617
public BasicValidationPage() {
1718
super();
@@ -29,6 +30,10 @@ public BasicValidationPage() {
2930
var value = LocalDateTime.parse(event.getValue());
3031
testField.setMax(value);
3132
}));
33+
34+
add(createButton(CLEAR_VALUE_BUTTON, "Clear value", event -> {
35+
testField.clear();
36+
}));
3237
}
3338

3439
protected DateTimePicker createTestField() {

‎vaadin-date-time-picker-flow-parent/vaadin-date-time-picker-flow-integration-tests/src/main/java/com/vaadin/flow/component/datetimepicker/validation/BinderValidationPage.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public class BinderValidationPage
1313
public static final String MIN_INPUT = "min-input";
1414
public static final String MAX_INPUT = "max-input";
1515
public static final String EXPECTED_VALUE_INPUT = "expected-value-input";
16+
public static final String CLEAR_VALUE_BUTTON = "clear-value-button";
1617

1718
public static final String REQUIRED_ERROR_MESSAGE = "The field is required";
1819
public static final String UNEXPECTED_VALUE_ERROR_MESSAGE = "The field doesn't match the expected value";
@@ -57,6 +58,10 @@ public BinderValidationPage() {
5758
var value = LocalDateTime.parse(event.getValue());
5859
testField.setMax(value);
5960
}));
61+
62+
add(createButton(CLEAR_VALUE_BUTTON, "Clear value", event -> {
63+
testField.clear();
64+
}));
6065
}
6166

6267
protected DateTimePicker createTestField() {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
package com.vaadin.flow.component.datetimepicker;
2+
3+
import org.junit.Assert;
4+
import org.junit.Before;
5+
import org.junit.Test;
6+
import org.openqa.selenium.Keys;
7+
8+
import com.vaadin.flow.component.datetimepicker.testbench.DateTimePickerElement;
9+
import com.vaadin.flow.testutil.TestPath;
10+
import com.vaadin.testbench.TestBenchElement;
11+
import com.vaadin.tests.AbstractComponentIT;
12+
13+
import static com.vaadin.flow.component.datetimepicker.ClearValuePage.CLEAR_BUTTON;
14+
15+
@TestPath("vaadin-date-time-picker/clear-value")
16+
public class ClearValueIT extends AbstractComponentIT {
17+
private DateTimePickerElement dateTimePicker;
18+
private TestBenchElement dateInput;
19+
private TestBenchElement timeInput;
20+
21+
@Before
22+
public void init() {
23+
open();
24+
dateTimePicker = $(DateTimePickerElement.class).first();
25+
dateInput = dateTimePicker.$("input").first();
26+
timeInput = dateTimePicker.$("input").last();
27+
}
28+
29+
@Test
30+
public void setDateInputValue_clearValue_inputValueIsEmpty() {
31+
dateInput.sendKeys("1/1/2022", Keys.ENTER);
32+
Assert.assertEquals("1/1/2022", dateInput.getPropertyString("value"));
33+
34+
$("button").id(CLEAR_BUTTON).click();
35+
Assert.assertEquals("", dateInput.getPropertyString("value"));
36+
}
37+
38+
@Test
39+
public void setTimeInputValue_clearValue_inputValueIsEmpty() {
40+
timeInput.sendKeys("12:00 PM", Keys.ENTER);
41+
Assert.assertEquals("12:00 PM", timeInput.getPropertyString("value"));
42+
43+
$("button").id(CLEAR_BUTTON).click();
44+
Assert.assertEquals("", timeInput.getPropertyString("value"));
45+
}
46+
47+
@Test
48+
public void setDateAndTimeInputValue_clearValue_inputValueIsEmpty() {
49+
dateInput.sendKeys("1/1/2022", Keys.ENTER);
50+
timeInput.sendKeys("12:00 PM", Keys.ENTER);
51+
Assert.assertEquals("1/1/2022", dateInput.getPropertyString("value"));
52+
Assert.assertEquals("12:00 PM", timeInput.getPropertyString("value"));
53+
54+
$("button").id(CLEAR_BUTTON).click();
55+
Assert.assertEquals("", dateInput.getPropertyString("value"));
56+
Assert.assertEquals("", timeInput.getPropertyString("value"));
57+
}
58+
59+
@Test
60+
public void badInput_setDateInputValue_clearValue_inputValueIsEmpty() {
61+
dateInput.sendKeys("INVALID", Keys.ENTER);
62+
Assert.assertEquals("INVALID", dateInput.getPropertyString("value"));
63+
64+
$("button").id(CLEAR_BUTTON).click();
65+
Assert.assertEquals("", dateInput.getPropertyString("value"));
66+
}
67+
68+
@Test
69+
public void badInput_setTimeInputValue_clearValue_inputValueIsEmpty() {
70+
timeInput.sendKeys("INVALID", Keys.ENTER);
71+
Assert.assertEquals("INVALID", timeInput.getPropertyString("value"));
72+
73+
$("button").id(CLEAR_BUTTON).click();
74+
Assert.assertEquals("", timeInput.getPropertyString("value"));
75+
}
76+
77+
@Test
78+
public void badInput_setDateAndTimeInputValue_clearValue_inputValueIsEmpty() {
79+
dateInput.sendKeys("INVALID", Keys.ENTER);
80+
timeInput.sendKeys("INVALID", Keys.ENTER);
81+
Assert.assertEquals("INVALID", dateInput.getPropertyString("value"));
82+
Assert.assertEquals("INVALID", timeInput.getPropertyString("value"));
83+
84+
$("button").id(CLEAR_BUTTON).click();
85+
Assert.assertEquals("", dateInput.getPropertyString("value"));
86+
Assert.assertEquals("", timeInput.getPropertyString("value"));
87+
}
88+
}

‎vaadin-date-time-picker-flow-parent/vaadin-date-time-picker-flow-integration-tests/src/test/java/com/vaadin/flow/component/datetimepicker/validation/BasicValidationIT.java‎

Lines changed: 73 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import static com.vaadin.flow.component.datetimepicker.validation.BasicValidationPage.MIN_INPUT;
1313
import static com.vaadin.flow.component.datetimepicker.validation.BasicValidationPage.MAX_INPUT;
1414
import static com.vaadin.flow.component.datetimepicker.validation.BasicValidationPage.REQUIRED_BUTTON;
15+
import static com.vaadin.flow.component.datetimepicker.validation.BasicValidationPage.CLEAR_VALUE_BUTTON;
1516

1617
@TestPath("vaadin-date-time-picker/validation/basic")
1718
public class BasicValidationIT
@@ -68,24 +69,6 @@ public void required_changeValue_assertValidity() {
6869
assertClientInvalid();
6970
}
7071

71-
@Test
72-
public void badInput_changeValue_assertValidity() {
73-
setInputValue(dateInput, "INVALID");
74-
setInputValue(timeInput, "INVALID");
75-
assertServerInvalid();
76-
assertClientInvalid();
77-
78-
setInputValue(dateInput, "1/1/2000");
79-
setInputValue(timeInput, "10:00");
80-
assertServerValid();
81-
assertClientValid();
82-
83-
setInputValue(dateInput, "INVALID");
84-
setInputValue(timeInput, "INVALID");
85-
assertServerInvalid();
86-
assertClientInvalid();
87-
}
88-
8972
@Test
9073
public void min_changeValue_assertValidity() {
9174
$("input").id(MIN_INPUT).sendKeys("2000-02-02T12:00", Keys.ENTER);
@@ -146,6 +129,78 @@ public void max_changeDateInputValue_assertValidity() {
146129
assertServerValid();
147130
}
148131

132+
@Test
133+
public void badInput_changeValue_assertValidity() {
134+
setInputValue(dateInput, "INVALID");
135+
setInputValue(timeInput, "INVALID");
136+
assertServerInvalid();
137+
assertClientInvalid();
138+
139+
setInputValue(dateInput, "1/1/2000");
140+
setInputValue(timeInput, "10:00");
141+
assertServerValid();
142+
assertClientValid();
143+
144+
setInputValue(dateInput, "INVALID");
145+
setInputValue(timeInput, "INVALID");
146+
assertServerInvalid();
147+
assertClientInvalid();
148+
}
149+
150+
@Test
151+
public void badInput_setDateInputValue_blur_assertValidity() {
152+
setInputValue(dateInput, "INVALID");
153+
dateInput.sendKeys(Keys.TAB);
154+
timeInput.sendKeys(Keys.TAB);
155+
assertServerInvalid();
156+
assertClientInvalid();
157+
}
158+
159+
@Test
160+
public void badInput_setTimeInputValue_blur_assertValidity() {
161+
setInputValue(timeInput, "INVALID");
162+
timeInput.sendKeys(Keys.TAB);
163+
assertServerInvalid();
164+
assertClientInvalid();
165+
}
166+
167+
@Test
168+
public void badInput_setValue_clearValue_assertValidity() {
169+
setInputValue(dateInput, "INVALID");
170+
setInputValue(timeInput, "INVALID");
171+
assertServerInvalid();
172+
assertClientInvalid();
173+
174+
$("button").id(CLEAR_VALUE_BUTTON).click();
175+
assertServerValid();
176+
assertClientValid();
177+
}
178+
179+
@Test
180+
public void badInput_setDateInputValue_blur_clearValue_assertValidity() {
181+
setInputValue(dateInput, "INVALID");
182+
dateInput.sendKeys(Keys.TAB);
183+
timeInput.sendKeys(Keys.TAB);
184+
assertServerInvalid();
185+
assertClientInvalid();
186+
187+
$("button").id(CLEAR_VALUE_BUTTON).click();
188+
assertServerValid();
189+
assertClientValid();
190+
}
191+
192+
@Test
193+
public void badInput_setTimeInputValue_blur_clearValue_assertValidity() {
194+
setInputValue(timeInput, "INVALID");
195+
timeInput.sendKeys(Keys.TAB);
196+
assertServerInvalid();
197+
assertClientInvalid();
198+
199+
$("button").id(CLEAR_VALUE_BUTTON).click();
200+
assertServerValid();
201+
assertClientValid();
202+
}
203+
149204
@Test
150205
public void detach_attach_preservesInvalidState() {
151206
// Make field invalid

‎vaadin-date-time-picker-flow-parent/vaadin-date-time-picker-flow-integration-tests/src/test/java/com/vaadin/flow/component/datetimepicker/validation/BinderValidationIT.java‎

Lines changed: 38 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import static com.vaadin.flow.component.datetimepicker.validation.BinderValidationPage.MIN_INPUT;
1313
import static com.vaadin.flow.component.datetimepicker.validation.BinderValidationPage.MAX_INPUT;
1414
import static com.vaadin.flow.component.datetimepicker.validation.BinderValidationPage.EXPECTED_VALUE_INPUT;
15+
import static com.vaadin.flow.component.datetimepicker.validation.BinderValidationPage.CLEAR_VALUE_BUTTON;
1516
import static com.vaadin.flow.component.datetimepicker.validation.BinderValidationPage.REQUIRED_ERROR_MESSAGE;
1617
import static com.vaadin.flow.component.datetimepicker.validation.BinderValidationPage.UNEXPECTED_VALUE_ERROR_MESSAGE;
1718

@@ -73,48 +74,6 @@ public void required_changeValue_assertValidity() {
7374
assertErrorMessage(REQUIRED_ERROR_MESSAGE);
7475
}
7576

76-
@Test
77-
public void required_badInput_setDateInputValue_blur_assertValidity() {
78-
setInputValue(dateInput, "INVALID");
79-
dateInput.sendKeys(Keys.TAB);
80-
timeInput.sendKeys(Keys.TAB);
81-
assertServerInvalid();
82-
assertClientInvalid();
83-
assertErrorMessage("");
84-
}
85-
86-
@Test
87-
public void required_badInput_setTimeInputValue_blur_assertValidity() {
88-
setInputValue(timeInput, "INVALID");
89-
timeInput.sendKeys(Keys.TAB);
90-
assertServerInvalid();
91-
assertClientInvalid();
92-
assertErrorMessage("");
93-
}
94-
95-
@Test
96-
public void badInput_changeValue_assertValidity() {
97-
$("input").id(EXPECTED_VALUE_INPUT).sendKeys("2000-01-01T10:00",
98-
Keys.ENTER);
99-
100-
setInputValue(dateInput, "INVALID");
101-
setInputValue(timeInput, "INVALID");
102-
assertServerInvalid();
103-
assertClientInvalid();
104-
assertErrorMessage("");
105-
106-
setInputValue(dateInput, "1/1/2000");
107-
setInputValue(timeInput, "10:00");
108-
assertServerValid();
109-
assertClientValid();
110-
111-
setInputValue(dateInput, "INVALID");
112-
setInputValue(timeInput, "INVALID");
113-
assertServerInvalid();
114-
assertClientInvalid();
115-
assertErrorMessage("");
116-
}
117-
11877
@Test
11978
public void min_changeValue_assertValidity() {
12079
$("input").id(MIN_INPUT).sendKeys("2000-02-02T12:00", Keys.ENTER);
@@ -187,6 +146,43 @@ public void max_changeValue_assertValidity() {
187146
assertServerValid();
188147
}
189148

149+
@Test
150+
public void badInput_changeValue_assertValidity() {
151+
$("input").id(EXPECTED_VALUE_INPUT).sendKeys("2000-01-01T10:00",
152+
Keys.ENTER);
153+
154+
setInputValue(dateInput, "INVALID");
155+
setInputValue(timeInput, "INVALID");
156+
assertServerInvalid();
157+
assertClientInvalid();
158+
assertErrorMessage("");
159+
160+
setInputValue(dateInput, "1/1/2000");
161+
setInputValue(timeInput, "10:00");
162+
assertServerValid();
163+
assertClientValid();
164+
165+
setInputValue(dateInput, "INVALID");
166+
setInputValue(timeInput, "INVALID");
167+
assertServerInvalid();
168+
assertClientInvalid();
169+
assertErrorMessage("");
170+
}
171+
172+
@Test
173+
public void badInput_setValue_clearValue_assertValidity() {
174+
setInputValue(dateInput, "INVALID");
175+
setInputValue(timeInput, "INVALID");
176+
assertServerInvalid();
177+
assertClientInvalid();
178+
assertErrorMessage("");
179+
180+
$("button").id(CLEAR_VALUE_BUTTON).click();
181+
assertServerInvalid();
182+
assertClientInvalid();
183+
assertErrorMessage(REQUIRED_ERROR_MESSAGE);
184+
}
185+
190186
protected DateTimePickerElement getTestField() {
191187
return $(DateTimePickerElement.class).first();
192188
}

0 commit comments

Comments
 (0)