From ecb82a6a305a746dceb9f32bc6f21b9ee2610d25 Mon Sep 17 00:00:00 2001 From: razelos Date: Sat, 8 Jun 2024 13:03:11 +0300 Subject: [PATCH 1/3] change valid TLD from 4 letters to 6 --- app/client/src/widgets/InputWidgetV2/widget/derived.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/client/src/widgets/InputWidgetV2/widget/derived.js b/app/client/src/widgets/InputWidgetV2/widget/derived.js index 40e6ae1b176d..8d28394d3f7c 100644 --- a/app/client/src/widgets/InputWidgetV2/widget/derived.js +++ b/app/client/src/widgets/InputWidgetV2/widget/derived.js @@ -72,7 +72,7 @@ export default { * https://stackoverflow.com/questions/15017052/understanding-email-validation-using-javascript * */ const emailRegex = new RegExp( - /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/, + /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,6})+$/, ); if (!emailRegex.test(value)) { /* email should conform to generic email regex */ From 16772d88c7c90bb5f12df3f26b60bd4946494651 Mon Sep 17 00:00:00 2001 From: razelos Date: Sat, 8 Jun 2024 13:04:20 +0300 Subject: [PATCH 2/3] add test for test@test.school --- app/client/src/widgets/InputWidgetV2/widget/derived.test.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/client/src/widgets/InputWidgetV2/widget/derived.test.ts b/app/client/src/widgets/InputWidgetV2/widget/derived.test.ts index ac6e9c4fc21b..b49f5a0db434 100644 --- a/app/client/src/widgets/InputWidgetV2/widget/derived.test.ts +++ b/app/client/src/widgets/InputWidgetV2/widget/derived.test.ts @@ -168,6 +168,11 @@ describe("Derived property - ", () => { inputText: "test@appsmith.com", isRequired: true, }, + { + inputType: InputTypes.EMAIL, + inputText: "test@test.school", + isRequired: true, + }, null, _, ); From f680c9ef8776d87386838b0e1321c74de01ac61a Mon Sep 17 00:00:00 2001 From: razelos Date: Sat, 8 Jun 2024 16:04:46 +0300 Subject: [PATCH 3/3] fix test for .school --- .../src/widgets/InputWidgetV2/widget/derived.test.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/client/src/widgets/InputWidgetV2/widget/derived.test.ts b/app/client/src/widgets/InputWidgetV2/widget/derived.test.ts index b49f5a0db434..d37427c092d8 100644 --- a/app/client/src/widgets/InputWidgetV2/widget/derived.test.ts +++ b/app/client/src/widgets/InputWidgetV2/widget/derived.test.ts @@ -168,6 +168,14 @@ describe("Derived property - ", () => { inputText: "test@appsmith.com", isRequired: true, }, + null, + _, + ); + + expect(isValid).toBeFalsy(); + + //Email input with required true and valid value + isValid = derivedProperty.isValid( { inputType: InputTypes.EMAIL, inputText: "test@test.school",